Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
2929a0e7
Commit
2929a0e7
authored
12 years ago
by
Piotr Caban
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msvcp80: Added _Getcat implementation for supported facets.
parent
2c156eae
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msvcp80/msvcp80.c
+123
-0
123 additions, 0 deletions
dlls/msvcp80/msvcp80.c
dlls/msvcp80/msvcp80.spec
+20
-20
20 additions, 20 deletions
dlls/msvcp80/msvcp80.spec
with
143 additions
and
20 deletions
dlls/msvcp80/msvcp80.c
+
123
−
0
View file @
2929a0e7
...
...
@@ -23,6 +23,57 @@
#include
"windef.h"
#include
"winbase.h"
typedef
SIZE_T
MSVCP_size_t
;
struct
locale_facet
;
struct
locale
;
const
struct
locale
*
(
CDECL
*
plocale_classic
)(
void
);
MSVCP_size_t
(
CDECL
*
pcollate_char__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pcollate_wchar__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pcollate_short__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pctype_char__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pctype_wchar__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pctype_short__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pcodecvt_char__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pnumpunct_char__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pnumpunct_wchar__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
MSVCP_size_t
(
CDECL
*
pnumpunct_short__Getcat
)(
const
struct
locale_facet
**
,
const
struct
locale
*
);
static
BOOL
init_funcs
(
void
)
{
HMODULE
hmod
=
GetModuleHandleA
(
"msvcp90.dll"
);
if
(
!
hmod
)
return
FALSE
;
if
(
sizeof
(
void
*
)
>
sizeof
(
int
))
{
/* 64-bit has different names */
plocale_classic
=
(
void
*
)
GetProcAddress
(
hmod
,
"?classic@locale@std@@SAAEBV12@XZ"
);
pcollate_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pcollate_wchar__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pcollate_short__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pctype_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pctype_wchar__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pctype_short__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pcodecvt_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pnumpunct_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pnumpunct_wchar__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
pnumpunct_short__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z"
);
}
else
{
plocale_classic
=
(
void
*
)
GetProcAddress
(
hmod
,
"?classic@locale@std@@SAABV12@XZ"
);
pcollate_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pcollate_wchar__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pcollate_short__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pctype_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pctype_wchar__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pctype_short__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr"
);
pcodecvt_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pnumpunct_char__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pnumpunct_wchar__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
pnumpunct_short__Getcat
=
(
void
*
)
GetProcAddress
(
hmod
,
"?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"
);
}
return
TRUE
;
}
BOOL
WINAPI
DllMain
(
HINSTANCE
hdll
,
DWORD
reason
,
LPVOID
reserved
)
{
switch
(
reason
)
...
...
@@ -32,6 +83,78 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
case
DLL_PROCESS_ATTACH
:
DisableThreadLibraryCalls
(
hdll
);
if
(
!
init_funcs
())
return
FALSE
;
}
return
TRUE
;
}
/* ?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
collate_char__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pcollate_char__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
collate_wchar__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pcollate_wchar__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
collate_short__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pcollate_short__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
ctype_char__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pctype_char__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
ctype_wchar__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pctype_wchar__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
ctype_short__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pctype_short__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
codecvt_char__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pcodecvt_char__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
numpunct_char__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pnumpunct_char__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
numpunct_wchar__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pnumpunct_wchar__Getcat
(
facet
,
plocale_classic
());
}
/* ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z */
/* ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z */
MSVCP_size_t
__cdecl
numpunct_short__Getcat
(
const
struct
locale_facet
**
facet
)
{
return
pnumpunct_short__Getcat
(
facet
,
plocale_classic
());
}
This diff is collapsed.
Click to expand it.
dlls/msvcp80/msvcp80.spec
+
20
−
20
View file @
2929a0e7
...
...
@@ -2218,24 +2218,24 @@
@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA
@ cdecl -arch=win32 ?_Fpz_func@std@@YAAA_JXZ() msvcp90.?_Fpz_func@std@@YAAA_JXZ
@ cdecl -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ() msvcp90.?_Fpz_func@std@@YAAEA_JXZ
@
stub
-arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
cdecl
-arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) codecvt_char__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) codecvt_char__Getcat
@ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$codecvt@GDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$codecvt@_WDH@std@@SAIPAPBVfacet@locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$codecvt@_WDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
cdecl
-arch=win32 ?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) collate_char__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) collate_char__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) collate_short__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) collate_short__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) collate_wchar__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) collate_wchar__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) ctype_char__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) ctype_char__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) ctype_short__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) ctype_short__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) ctype_wchar__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) ctype_wchar__Getcat
@ stub -arch=win32 ?_Getcat@?$messages@D@std@@SAIPAPBVfacet@locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$messages@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$messages@G@std@@SAIPAPBVfacet@locale@2@@Z
...
...
@@ -2278,12 +2278,12 @@
@ stub -arch=win64 ?_Getcat@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SAIPAPBVfacet@locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
stub
-arch=win32 ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z
@
stub
-arch=win64 ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z
@
cdecl
-arch=win32 ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) numpunct_char__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) numpunct_char__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) numpunct_short__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) numpunct_short__Getcat
@
cdecl
-arch=win32 ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z
(ptr) numpunct_wchar__Getcat
@
cdecl
-arch=win64 ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z
(ptr) numpunct_wchar__Getcat
@ stub -arch=win32 ?_Getcat@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SAIPAPBVfacet@locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@SAIPAPBVfacet@locale@2@@Z
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment