Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
83cc0110
Commit
83cc0110
authored
May 20, 2021
by
Piotr Caban
Committed by
Alexandre Julliard
May 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp90: Depend on compiler in _Getcoll implementation if possible.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
24f7abaf
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
31 additions
and
31 deletions
+31
-31
msvcp100.spec
dlls/msvcp100/msvcp100.spec
+1
-1
msvcp110.spec
dlls/msvcp110/msvcp110.spec
+1
-1
msvcp120.spec
dlls/msvcp120/msvcp120.spec
+1
-1
msvcp120_app.spec
dlls/msvcp120_app/msvcp120_app.spec
+1
-1
msvcp140.spec
dlls/msvcp140/msvcp140.spec
+1
-1
msvcp60.spec
dlls/msvcp60/msvcp60.spec
+1
-1
msvcp70.spec
dlls/msvcp70/msvcp70.spec
+1
-1
msvcp71.spec
dlls/msvcp71/msvcp71.spec
+1
-1
msvcp80.spec
dlls/msvcp80/msvcp80.spec
+1
-1
locale.c
dlls/msvcp90/locale.c
+8
-5
msvcp90.spec
dlls/msvcp90/msvcp90.spec
+1
-1
misc.c
dlls/msvcp90/tests/misc.c
+13
-16
No files found.
dlls/msvcp100/msvcp100.spec
View file @
83cc0110
...
...
@@ -2915,7 +2915,7 @@
@ extern _FSnan
# extern _FXbig
@ stub _GetLocaleForCP
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getdateorder()
...
...
dlls/msvcp110/msvcp110.spec
View file @
83cc0110
...
...
@@ -3778,7 +3778,7 @@
@ stub _FXp_sqrtx
@ stub _FXp_subx
# extern _FZero
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getdateorder()
...
...
dlls/msvcp120/msvcp120.spec
View file @
83cc0110
...
...
@@ -3721,7 +3721,7 @@
@ stub _FXp_sqrtx
@ stub _FXp_subx
# extern _FZero
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getdateorder()
...
...
dlls/msvcp120_app/msvcp120_app.spec
View file @
83cc0110
...
...
@@ -3721,7 +3721,7 @@
@ stub _FXp_sqrtx
@ stub _FXp_subx
# extern _FZero
@ cdecl -
ret64
_Getcoll() msvcp120._Getcoll
@ cdecl -
norelay
_Getcoll() msvcp120._Getcoll
@ cdecl _Getctype(ptr) msvcp120._Getctype
@ cdecl -norelay _Getcvt() msvcp120._Getcvt
@ cdecl _Getdateorder() msvcp120._Getdateorder
...
...
dlls/msvcp140/msvcp140.spec
View file @
83cc0110
...
...
@@ -3649,7 +3649,7 @@
@ stub _FSinh
@ extern _FSnan
@ cdecl _File_size(wstr)
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getdateorder()
...
...
dlls/msvcp60/msvcp60.spec
View file @
83cc0110
...
...
@@ -4274,7 +4274,7 @@
@ stub _FSinh
@ extern _FSnan _FSnan
# extern _FXbig
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ extern _Hugeval _Hugeval
...
...
dlls/msvcp70/msvcp70.spec
View file @
83cc0110
...
...
@@ -5061,7 +5061,7 @@
@ extern _FSnan
# extern _FXbig
# extern _FZero
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ extern _Hugeval
...
...
dlls/msvcp71/msvcp71.spec
View file @
83cc0110
...
...
@@ -5115,7 +5115,7 @@
@ extern _FSnan
# extern _FXbig
# extern _FZero
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getwctype(long ptr)
...
...
dlls/msvcp80/msvcp80.spec
View file @
83cc0110
...
...
@@ -5724,7 +5724,7 @@
@ stub _FSinh
@ extern _FSnan
# extern _FXbig
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getdateorder()
...
...
dlls/msvcp90/locale.c
View file @
83cc0110
...
...
@@ -669,20 +669,23 @@ static _Collvec* getcoll(_Collvec *ret)
}
/* _Getcoll */
#if defined(__i386__) || _MSVCP_VER<110
#if defined(__i386__)
/* Work around a gcc bug */
ULONGLONG
__cdecl
_Getcoll
(
void
)
{
C_ASSERT
(
sizeof
(
_Collvec
)
==
sizeof
(
ULONGLONG
));
ULONGLONG
ret
;
C_ASSERT
(
sizeof
(
_Collvec
)
<=
sizeof
(
ULONGLONG
));
getcoll
((
_Collvec
*
)
&
ret
);
return
ret
;
}
#else
_Collvec
*
__cdecl
_Getcoll
(
_Collvec
*
ret
)
_Collvec
__cdecl
_Getcoll
(
void
)
{
return
getcoll
(
ret
);
_Collvec
ret
;
getcoll
(
&
ret
);
return
ret
;
}
#endif
...
...
dlls/msvcp90/msvcp90.spec
View file @
83cc0110
...
...
@@ -6500,7 +6500,7 @@
@ stub _FSinh
@ extern _FSnan
# extern _FXbig
@ cdecl -
ret64
_Getcoll()
@ cdecl -
norelay
_Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -norelay _Getcvt()
@ cdecl _Getdateorder()
...
...
dlls/msvcp90/tests/misc.c
View file @
83cc0110
...
...
@@ -101,7 +101,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t);
static
unsigned
short
(
__cdecl
*
p_wctype
)(
const
char
*
);
static
MSVCP__Ctypevec
*
(
__cdecl
*
p__Getctype
)(
MSVCP__Ctypevec
*
);
static
/*MSVCP__Collvec*/
ULONGLONG
(
__cdecl
*
p__Getcoll
)(
void
);
static
MSVCP__Collvec
(
__cdecl
*
p__Getcoll
)(
void
);
static
wctrans_t
(
__cdecl
*
p_wctrans
)(
const
char
*
);
static
wint_t
(
__cdecl
*
p_towctrans
)(
wint_t
,
wctrans_t
);
static
void
(
__cdecl
*
p_locale__Locimp__Locimp_Addfac
)(
locale__Locimp
*
,
locale_facet
*
,
size_t
);
...
...
@@ -604,26 +604,23 @@ static void test__Getctype(void)
static
void
test__Getcoll
(
void
)
{
ULONGLONG
(
__cdecl
*
p__Getcoll_arg
)(
MSVCP__Collvec
*
);
#ifdef __i386__
/* Workaround a gcc bug */
ULONGLONG
tmp
;
#define call__Getcoll(ret) tmp = ((ULONGLONG (__cdecl*)(void))p__Getcoll)(); \
memcpy(&ret, &tmp, sizeof(tmp))
#else
#define call__Getcoll(ret) ret = p__Getcoll()
#endif
_locale_t
locale
;
union
{
MSVCP__Collvec
collvec
;
ULONGLONG
ull
;
}
ret
;
MSVCP__Collvec
ret
;
locale
=
p__get_current_locale
();
locale
->
locinfo
->
lc_handle
[
LC_COLLATE
]
=
0x7654321
;
p__free_locale
(
locale
);
ret
.
ull
=
0
;
p__Getcoll_arg
=
(
void
*
)
p__Getcoll
;
p__Getcoll_arg
(
&
ret
.
collvec
);
ok
(
ret
.
collvec
.
handle
==
0
,
"ret.handle = %x
\n
"
,
ret
.
collvec
.
handle
);
ok
(
ret
.
collvec
.
page
==
0
,
"ret.page = %x
\n
"
,
ret
.
collvec
.
page
);
ret
.
ull
=
p__Getcoll
();
ok
(
ret
.
collvec
.
handle
==
0x7654321
,
"ret.collvec.handle = %x
\n
"
,
ret
.
collvec
.
handle
);
ok
(
ret
.
collvec
.
page
==
0
,
"ret.page = %x
\n
"
,
ret
.
collvec
.
page
);
call__Getcoll
(
ret
);
ok
(
ret
.
handle
==
0x7654321
,
"ret.handle = %x
\n
"
,
ret
.
handle
);
ok
(
ret
.
page
==
0
,
"ret.page = %x
\n
"
,
ret
.
page
);
}
static
void
test_towctrans
(
void
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment