wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 9205f02ac589681cb53b8ead56a08550811aa920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9205f02ac589681cb53b8ead5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:19 2012 +0000 netapi32: Remove unused variable. --- dlls/netapi32/netapi32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f6c6d20..a24320c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); -static HMODULE NETAPI32_hModule; - BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -37,7 +35,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - NETAPI32_hModule = hinstDLL; NetBIOSInit(); NetBTInit(); break;

1 0

Andrew Talbot : sensapi: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c562b0e1488c3fe36c8e09122486e22a365db610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c562b0e1488c3fe36c8e09122… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:22 2012 +0000 sensapi: Remove unused variable. --- dlls/sensapi/sensapi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 86e4a92..75d07a8 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -static HMODULE SENSAPI_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -54,7 +52,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - SENSAPI_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Andrew Talbot : wineps.drv: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 393514c11941f8425936eaea506831d466e6bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=393514c11941f8425936eaea5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:24 2012 +0000 wineps.drv: Remove unused variable. --- dlls/wineps.drv/driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 358f088..70ee2b0 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -333,7 +333,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, } -static void (WINAPI *pInitCommonControls) (void); static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); @@ -456,8 +455,6 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, static const WCHAR SetupW[] = {'S','e','t','u','p','\0'}; hinstComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControls = (void*)GetProcAddress(hinstComctl32, - "InitCommonControls"); pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, "CreatePropertySheetPageW"); pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW");

1 0

Piotr Caban : msvcp60: Added seekoff exports.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: ca88f3624d38cf74747bb5990f02b7725836c7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca88f3624d38cf74747bb5990… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:16:05 2012 +0000 msvcp60: Added seekoff exports. --- dlls/msvcp60/ios.c | 34 ++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca88f3624d38cf74747bb…

1 0

Piotr Caban : msvcp60: Added basic_filebuf<short>::_Initcvt export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: dea74b4da36dfe37d2eb54debdcad724ecd00e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea74b4da36dfe37d2eb54deb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:15:48 2012 +0000 msvcp60: Added basic_filebuf<short>::_Initcvt export. --- dlls/msvcp60/msvcp60.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e8f2ccc..ec7380d 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2285,8 +2285,8 @@ @ extern ?_Init_cnt@_Winit@std@@0HA _Winit__Init_cnt @ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ(ptr) basic_filebuf_char__Initcvt @ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ(ptr) basic_filebuf_char__Initcvt -@ stub -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ -@ stub -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ +@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ(ptr) basic_filebuf_wchar__Initcvt +@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_wchar__Initcvt @ stub -arch=win32 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DPADI@Z @ stub -arch=win64 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DPEAD_K@Z @ stub -arch=win32 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPADI@Z

1 0

Piotr Caban : msvcp60: Added locale::Iscloc implementation.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 81853405b12ad0125c678a8894bf08615c36fc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81853405b12ad0125c678a889… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:19 2012 +0000 msvcp60: Added locale::Iscloc implementation. --- dlls/msvcp60/locale.c | 9 +++++++++ dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index d6bd542..2517326 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -7396,6 +7396,15 @@ locale__Locimp* __cdecl locale__Init(void) return global_locale; } +/* ?_Iscloc@locale@std@@QBE_NXZ */ +/* ?_Iscloc@locale@std@@QEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(locale__Iscloc, 4) +MSVCP_bool __thiscall locale__Iscloc(const locale *this) +{ + TRACE("(%p)\n", this); + return this->ptr == locale__Locimp__Clocptr; +} + /* ??0locale@std@@QAE@ABV01@0H@Z */ /* ??0locale@std@@QEAA@AEBV01@0H@Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 6e8bddd..e8f2ccc 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2291,8 +2291,8 @@ @ stub -arch=win64 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DPEAD_K@Z @ stub -arch=win32 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPADI@Z @ stub -arch=win64 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEAD_K@Z -@ stub -arch=win32 ?_Iscloc@locale@std@@QBE_NXZ -@ stub -arch=win64 ?_Iscloc@locale@std@@QEBA_NXZ +@ thiscall -arch=win32 ?_Iscloc@locale@std@@QBE_NXZ(ptr) locale__Iscloc +@ cdecl -arch=win64 ?_Iscloc@locale@std@@QEBA_NXZ(ptr) locale__Iscloc @ stub ?_Isinf@?$_Ctr@M@std@@SA_NM@Z @ stub ?_Isinf@?$_Ctr@N@std@@SA_NN@Z @ stub ?_Isinf@?$_Ctr@O@std@@SA_NO@Z

1 0

Piotr Caban : msvcp60: Added locale::_Getfacet export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 08280758dd84a7bfac239371896201b65c0b06ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=08280758dd84a7bfac2393718… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:04 2012 +0000 msvcp60: Added locale::_Getfacet export. --- dlls/msvcp60/locale.c | 42 ++++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index f225b4d..d6bd542 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -42,7 +42,7 @@ char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); -static const locale_facet* locale__Getfacet(const locale*, MSVCP_size_t); +const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t, MSVCP_bool); typedef int category; @@ -1318,7 +1318,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -1965,7 +1965,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -1993,7 +1993,7 @@ ctype_wchar* ctype_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2460,7 +2460,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -2698,7 +2698,7 @@ static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -2750,7 +2750,7 @@ codecvt_wchar* codecvt_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -3120,7 +3120,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3456,7 +3456,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3504,7 +3504,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3866,7 +3866,7 @@ static num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -3906,7 +3906,7 @@ num_get* num_get_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -4878,7 +4878,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5632,7 +5632,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6242,7 +6242,7 @@ static num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6270,7 +6270,7 @@ num_put* num_put_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -7559,16 +7559,18 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_ return this; } -/* ?_Getfacet@locale@std@@QBEPBVfacet@12@I@Z */ -/* ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K@Z */ -static const locale_facet* locale__Getfacet(const locale *this, MSVCP_size_t id) +/* ?_Getfacet@locale@std@@QBEPBVfacet@12@I_N@Z */ +/* ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K_N@Z */ +DEFINE_THISCALL_WRAPPER(locale__Getfacet, 12) +const locale_facet* __thiscall locale__Getfacet(const locale *this, + MSVCP_size_t id, MSVCP_bool allow_transparent) { locale_facet *fac; TRACE("(%p %lu)\n", this, id); fac = id < this->ptr->facet_cnt ? this->ptr->facetvec[id] : NULL; - if(fac || !this->ptr->transparent) + if(fac || !this->ptr->transparent || !allow_transparent) return fac; return id < global_locale->facet_cnt ? global_locale->facetvec[id] : NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 121cf11..6e8bddd 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2148,8 +2148,8 @@ @ cdecl -arch=win64 ?_Getcvt@_Locinfo@std@@QEBA?AU_Cvtvec@@XZ(ptr ptr) _Locinfo__Getcvt @ thiscall -arch=win32 ?_Getdays@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getdays @ cdecl -arch=win64 ?_Getdays@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getdays -@ stub -arch=win32 ?_Getfacet@locale@std@@QBEPBVfacet@12@I_N@Z -@ stub -arch=win64 ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K_N@Z +@ thiscall -arch=win32 ?_Getfacet@locale@std@@QBEPBVfacet@12@I_N@Z(ptr long long) locale__Getfacet +@ cdecl -arch=win64 ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K_N@Z(ptr long long) locale__Getfacet @ thiscall -arch=win32 ?_Getfalse@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getfalse @ cdecl -arch=win64 ?_Getfalse@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getfalse @ stub -arch=win32 ?_Getffld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@CAHPADAAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1ABVlocale@2@@Z

1 0

Piotr Caban : msvcp60: Added locale::_Locimp::_Global export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 200cb7d3ac19fb1b1105228e1508471691c5d3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200cb7d3ac19fb1b1105228e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:47 2012 +0000 msvcp60: Added locale::_Locimp::_Global export. --- dlls/msvcp60/locale.c | 5 ++++- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 9b71334..f225b4d 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -98,9 +98,12 @@ typedef struct { /* ?_Id_cnt@id@locale@std@@0HA */ int locale_id__Id_cnt = 0; -static locale__Locimp *global_locale; static locale classic_locale; +/* ?_Global@_Locimp@locale@std@@0PAV123@A */ +/* ?_Global@_Locimp@locale@std@@0PEAV123@EA */ +locale__Locimp *global_locale = NULL; + /* ?_Clocptr@_Locimp@locale@std@@0PAV123@A */ /* ?_Clocptr@_Locimp@locale@std@@0PEAV123@EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 27cae4b..121cf11 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2184,8 +2184,8 @@ @ cdecl -arch=win64 ?_Gettrue@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Gettrue @ stub -arch=win32 ?_Getyes@_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getyes@_Locinfo@std@@QEBAPEBDXZ -# extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A -# extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA +@ extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A global_locale +@ extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA global_locale @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEPADXZ(ptr) basic_streambuf_char__Gndec @ cdecl -arch=win64 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAPEADXZ(ptr) basic_streambuf_char__Gndec @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IAEPAGXZ(ptr) basic_streambuf_wchar__Gndec

1 0

Piotr Caban : msvcp60: Forward bad_cast functions to msvcrt.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: e6e0da609da495e739f5123d5bb3bb8327c13b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0da609da495e739f5123d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:22 2012 +0000 msvcp60: Forward bad_cast functions to msvcrt. --- dlls/msvcp60/exception.c | 2 ++ dlls/msvcp60/msvcp60.spec | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index b8c6921..1dcce4e 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -149,6 +149,8 @@ DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* ?_Doraise@out_of_range@std@@MEBAXXZ */ /* ?_Doraise@runtime_error@std@@MBEXXZ */ /* ?_Doraise@runtime_error@std@@MEBAXXZ */ +/* ?_Doraise@bad_cast@std@@MBEXXZ */ +/* ?_Doraise@bad_cast@std@@MEBAXXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4) void __thiscall MSVCP_exception__Doraise(exception *this) { diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 137f09c..27cae4b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -845,10 +845,10 @@ @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@PEBD@Z(ptr str) MSVCP_bad_alloc_ctor @ thiscall -arch=win32 ??0bad_alloc@std@@QAE@XZ(ptr) MSVCP_bad_alloc_default_ctor @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@XZ(ptr) MSVCP_bad_alloc_default_ctor -@ stub -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z -@ stub -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z -@ stub -arch=win32 ??0bad_cast@std@@QAE@PBD@Z -@ stub -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z +@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE@PBD@Z +@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA@PEBD@Z @ stub -arch=win32 ??0bad_exception@std@@QAE@ABV01@@Z @ stub -arch=win64 ??0bad_exception@std@@QEAA@AEBV01@@Z @ stub -arch=win32 ??0bad_exception@std@@QAE@PBD@Z @@ -1049,8 +1049,8 @@ @ stub -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ @ thiscall -arch=win32 ??1bad_alloc@std@@UAE@XZ(ptr) MSVCP_bad_alloc_dtor @ cdecl -arch=win64 ??1bad_alloc@std@@UEAA@XZ(ptr) MSVCP_bad_alloc_dtor -@ stub -arch=win32 ??1bad_cast@std@@UAE@XZ -@ stub -arch=win64 ??1bad_cast@std@@UEAA@XZ +@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ +@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ @ stub -arch=win32 ??1bad_exception@std@@UAE@XZ @ stub -arch=win64 ??1bad_exception@std@@UEAA@XZ @ stub -arch=win32 ??1bad_typeid@std@@UAE@XZ @@ -1235,8 +1235,8 @@ @ stub -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z @ thiscall -arch=win32 ??4bad_alloc@std@@QAEAAV01@ABV01@@Z(ptr ptr) MSVCP_bad_alloc_assign @ cdecl -arch=win64 ??4bad_alloc@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_assign -@ stub -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z -@ stub -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4bad_exception@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4bad_exception@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z @@ -1815,7 +1815,7 @@ # extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ # extern ??_7__non_rtti_object@std@@6B@ @ extern ??_7bad_alloc@std@@6B@ MSVCP_bad_alloc_vtable -# extern ??_7bad_cast@std@@6B@ +@ extern ??_7bad_cast@std@@6B@ msvcrt.??_7bad_cast@@6B@ # extern ??_7bad_exception@std@@6B@ # extern ??_7bad_typeid@std@@6B@ @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @@ -1979,8 +1979,8 @@ @ cdecl -arch=win64 ??_F_Locinfo@std@@QEAAXXZ(ptr) _Locinfo_ctor @ thiscall -arch=win32 ??_F_Timevec@std@@QAEXXZ(ptr) _Timevec_ctor @ cdecl -arch=win64 ??_F_Timevec@std@@QEAAXXZ(ptr) _Timevec_ctor -@ stub -arch=win32 ??_Fbad_cast@std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast@std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_exception@std@@QAEXXZ @ stub -arch=win64 ??_Fbad_exception@std@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid@std@@QAEXXZ @@ -2029,8 +2029,8 @@ @ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref @ thiscall -arch=win32 ?_Doraise@bad_alloc@std@@MBEXXZ(ptr) MSVCP_exception__Doraise @ cdecl -arch=win64 ?_Doraise@bad_alloc@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise -@ stub -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ -@ stub -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ +@ thiscall -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise +@ cdecl -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise@bad_exception@std@@MBEXXZ @ stub -arch=win64 ?_Doraise@bad_exception@std@@MEBAXXZ @ stub -arch=win32 ?_Doraise@bad_typeid@std@@MBEXXZ

1 0

Henri Verbeet : d3d10core/tests: Use the correct enum in test_create_shader_resource_view().
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 7c722bea2866b274c47f97006de937934273fc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c722bea2866b274c47f97006… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:11:00 2012 +0100 d3d10core/tests: Use the correct enum in test_create_shader_resource_view(). --- dlls/d3d10core/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0dd96f1..a0df22a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -383,7 +383,7 @@ static void test_create_shader_resource_view(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; - srv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; U(srv_desc).Buffer.ElementOffset = 0; U(srv_desc).Buffer.ElementWidth = 64;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012