February 2014 - Wine-Commits

Jacek Caban : atl110: Share sources with atl100.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 5a311d693fb5e3fc6fb8e6f8fe003e2b380ab709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a311d693fb5e3fc6fb8e6f8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 12:32:05 2014 +0100 atl110: Share sources with atl100. --- dlls/atl110/Makefile.in | 7 +++--- dlls/atl110/atl110.c | 42 -------------------------------- dlls/atl110/atl110.spec | 62 +++++++++++++++++++++++------------------------ tools/make_specfiles | 2 -- 4 files changed, 35 insertions(+), 78 deletions(-) diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index e8d340f..3b6ccfe 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,8 +1,9 @@ MODULE = atl110.dll -IMPORTS = atl100 oleaut32 ole32 user32 uuid +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_110 PARENTSRC = ../atl100 C_SRCS = \ - atl110.c \ - atl_ax.c + atl.c \ + atl_ax.c \ + registrar.c diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c deleted file mode 100644 index 9386812..0000000 --- a/dlls/atl110/atl110.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2013 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "atlbase.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/*********************************************************************** - * AtlGetVersion [atl110.@] - */ -DWORD WINAPI AtlGetVersion(void *pReserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, pReserved); - return _ATL_VER; -} diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 35facf8..0d41c1e 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -1,22 +1,22 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -26,27 +26,27 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration -68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) +68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/tools/make_specfiles b/tools/make_specfiles index e88cc11..2ae321a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -120,9 +120,7 @@ my @dll_groups = ], [ "atl100", - "atl110", "atl", - "atl80", ], [ "advapi32",

1 0

Nikolay Sivov : ole32: Implement CoGetInstanceFromIStorage().
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 62d9b5a0e079b6db8c16444d92fe85cfa8e10f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d9b5a0e079b6db8c16444d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 08:55:13 2014 +0400 ole32: Implement CoGetInstanceFromIStorage(). --- dlls/ole32/compobj.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4149ecb..3e99097 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3330,6 +3330,69 @@ HRESULT WINAPI CoGetInstanceFromFile( } /*********************************************************************** + * CoGetInstanceFromIStorage [OLE32.@] + */ +HRESULT WINAPI CoGetInstanceFromIStorage( + COSERVERINFO *server_info, + CLSID *rclsid, + IUnknown *outer, + DWORD cls_context, + IStorage *storage, + DWORD count, + MULTI_QI *results +) +{ + IPersistStorage *ps = NULL; + IUnknown* unk = NULL; + STATSTG stat; + HRESULT hr; + + if (count == 0 || !results || !storage) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results); + + /* optionaly get CLSID from a file */ + if (!rclsid) + { + memset(&stat.clsid, 0, sizeof(stat.clsid)); + hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); + if (FAILED(hr)) + { + ERR("failed to get CLSID from a file\n"); + return hr; + } + + rclsid = &stat.clsid; + } + + hr = CoCreateInstance(rclsid, + outer, + cls_context, + &IID_IUnknown, + (void**)&unk); + + if (hr != S_OK) + return hr; + + /* init from IStorage */ + hr = IUnknown_QueryInterface(unk, &IID_IPersistStorage, (void**)&ps); + if (FAILED(hr)) + ERR("failed to get IPersistStorage\n"); + + if (ps) + { + IPersistStorage_Load(ps, storage); + IPersistStorage_Release(ps); + } + + return return_multi_qi(unk, count, results); +} + +/*********************************************************************** * CoLoadLibrary (OLE32.@) * * Loads a library. diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 28a84a1..00d5696 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -30,7 +30,7 @@ @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) -@ stub CoGetInstanceFromIStorage #@ stdcall (ptr ptr ptr long ptr long ptr) return 0,ERR_NOTIMPLEMENTED +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long)

1 0

Piotr Caban : msvcp70: Share the source code with msvcp90.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 40a6749ffdefcdfa7c2edb88c08f45d488a72a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a6749ffdefcdfa7c2edb88c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 6 14:33:37 2014 +0100 msvcp70: Share the source code with msvcp90. --- dlls/msvcp70/Makefile.in | 13 +- dlls/msvcp70/msvcp70.c | 37 - dlls/msvcp70/msvcp70.spec | 7433 ++++++++++++++++++++++----------------------- 3 files changed, 3728 insertions(+), 3755 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40a6749ffdefcdfa7c2ed…

1 0

Alexandre Julliard : msvcp71: Fix argument types for some fstream constructors.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 8d963b3e19e8626a8400e9c7f7282e3fdb7c7c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d963b3e19e8626a8400e9c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 11:44:45 2014 +0100 msvcp71: Fix argument types for some fstream constructors. --- dlls/msvcp71/msvcp71.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 8e21fb7..13fb5fe 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -548,14 +548,14 @@ @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z(ptr ptr long) basic_fstream_short_ctor_file @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr long) basic_fstream_short_ctor_file -@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name -@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDHH@Z(ptr str long long long) basic_fstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDHH@Z(ptr str long long long) basic_fstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z(ptr ptr long) basic_fstream_wchar_ctor_file @ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr long) basic_fstream_wchar_ctor_file -@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name -@ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name +@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_wchar_ctor @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z(ptr ptr long) basic_ifstream_char_ctor_file

1 0

Nikolay Sivov : inetmib1/tests: Cleanup tests a bit, fix a crash on Win8 64bit.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 1faa3d4e5214124cfc327a6693473e2298c6c7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1faa3d4e5214124cfc327a669… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 08:55:33 2014 +0400 inetmib1/tests: Cleanup tests a bit, fix a crash on Win8 64bit. --- dlls/inetmib1/tests/main.c | 94 +++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 80b3618..29876b1 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -23,38 +23,63 @@ #include "wine/test.h" -static HMODULE inetmib1; +static BOOL (WINAPI *pSnmpExtensionInit)(DWORD, HANDLE*, AsnObjectIdentifier*); +static BOOL (WINAPI *pSnmpExtensionQuery)(BYTE, SnmpVarBindList*, AsnInteger32*, AsnInteger32*); + +static HMODULE init_test_functions(void) +{ + HMODULE mod = LoadLibraryA("inetmib1"); + + ok(mod != NULL, "failed to load inetmib1.dll"); + + if (!mod) return NULL; + + pSnmpExtensionInit = (void *)GetProcAddress(mod, "SnmpExtensionInit"); + pSnmpExtensionQuery = (void *)GetProcAddress(mod, "SnmpExtensionQuery"); + + return mod; +} + +static void uninit_test_functions(HMODULE mod) +{ + FreeLibrary(mod); +} static void testInit(void) { - BOOL (WINAPI *pInit)(DWORD, HANDLE *, AsnObjectIdentifier *); BOOL ret; HANDLE event; AsnObjectIdentifier oid; - pInit = (void *)GetProcAddress(inetmib1, "SnmpExtensionInit"); - if (!pInit) + if (!pSnmpExtensionInit) { win_skip("no SnmpExtensionInit\n"); return; } - /* Crash - ret = pInit(0, NULL, NULL); - ret = pInit(0, NULL, &oid); - ret = pInit(0, &event, NULL); - */ - ret = pInit(0, &event, &oid); + +if (0) /* crashes on native */ +{ + ret = pSnmpExtensionInit(0, NULL, NULL); + ret = pSnmpExtensionInit(0, NULL, &oid); + ret = pSnmpExtensionInit(0, &event, NULL); +} + + ret = pSnmpExtensionInit(0, &event, &oid); ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); + +if (0) +{ + /* Fails when called on win8, documentation suggests that + extension itself is resposible of freeing this oid */ SnmpUtilOidFree(&oid); } +} static void testQuery(void) { - BOOL (WINAPI *pQuery)(BYTE, SnmpVarBindList *, AsnInteger32 *, - AsnInteger32 *); BOOL ret, moreData, noChange; SnmpVarBindList list; AsnInteger32 error, index; @@ -71,25 +96,25 @@ static void testQuery(void) SnmpVarBind vars[3], vars2[3], vars3[3]; UINT entry; - pQuery = (void *)GetProcAddress(inetmib1, "SnmpExtensionQuery"); - if (!pQuery) + if (!pSnmpExtensionQuery) { win_skip("couldn't find SnmpExtensionQuery\n"); return; } - /* Crash - ret = pQuery(0, NULL, NULL, NULL); - ret = pQuery(0, NULL, &error, NULL); - ret = pQuery(0, NULL, NULL, &index); - ret = pQuery(0, &list, NULL, NULL); - ret = pQuery(0, &list, &error, NULL); - */ +if (0) /* crashes on native */ +{ + ret = pSnmpExtensionQuery(0, NULL, NULL, NULL); + ret = pSnmpExtensionQuery(0, NULL, &error, NULL); + ret = pSnmpExtensionQuery(0, NULL, NULL, &index); + ret = pSnmpExtensionQuery(0, &list, NULL, NULL); + ret = pSnmpExtensionQuery(0, &list, &error, NULL); +} /* An empty list succeeds */ list.len = 0; error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -106,7 +131,7 @@ static void testQuery(void) SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR || broken(error == ERROR_FILE_NOT_FOUND) /* NT4 */, @@ -126,7 +151,7 @@ static void testQuery(void) SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); @@ -148,7 +173,7 @@ static void testQuery(void) SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); @@ -170,7 +195,7 @@ static void testQuery(void) SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -252,7 +277,7 @@ static void testQuery(void) list.len = 1; list.list = vars2; noChange = FALSE; - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -274,7 +299,7 @@ static void testQuery(void) list.list = vars2; moreData = TRUE; do { - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -340,7 +365,7 @@ static void testQuery(void) moreData = TRUE; noChange = FALSE; do { - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -406,7 +431,7 @@ static void testQuery(void) moreData = TRUE; noChange = FALSE; do { - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); /* FIXME: error and index aren't checked here because the UDP table is * the last OID currently supported by Wine, so the last GetNext fails. @@ -471,8 +496,13 @@ static void testQuery(void) START_TEST(main) { - inetmib1 = LoadLibraryA("inetmib1"); + HMODULE mod; + + if (!(mod = init_test_functions())) + return; + testInit(); testQuery(); - FreeLibrary(inetmib1); + + uninit_test_functions(mod); }

1 0

Dmitry Timoshkov : taskschd/tests: Add some tests for IRegisteredTask interface.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: ae8683953636cae518417a4ff07c453ba3da6e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8683953636cae518417a4ff… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 18:28:39 2014 +0900 taskschd/tests: Add some tests for IRegisteredTask interface. --- dlls/taskschd/tests/scheduler.c | 195 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index df00eb2..ac1eb98 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -659,6 +659,200 @@ static void test_FolderCollection(void) ITaskService_Release(service); } +static void test_GetTask(void) +{ + static WCHAR Wine[] = { '\\','W','i','n','e',0 }; + static WCHAR Wine_Task1[] = { '\\','W','i','n','e','\\','T','a','s','k','1',0 }; + static WCHAR Wine_Task2[] = { '\\','W','i','n','e','\\','T','a','s','k','2',0 }; + static WCHAR Task1[] = { 'T','a','s','k','1',0 }; + static WCHAR Task2[] = { 'T','a','s','k','2',0 }; + static const char xml1[] = + "<?xml version=\"1.0\"?>\n" + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static const char xml2[] = + "<?xml version=\"1.0\"?>\n" + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task2\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>true</Enabled>\n" + " <Hidden>true</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task2.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + WCHAR xmlW[sizeof(xml1)]; + HRESULT hr; + BSTR bstr; + TASK_STATE state; + VARIANT_BOOL vbool; + VARIANT v_null; + ITaskService *service; + ITaskFolder *root, *folder; + IRegisteredTask *task1, *task2; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + V_VT(&v_null) = VT_NULL; + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + + hr = ITaskService_GetFolder(service, NULL, &root); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + /* Just in case something was left from previous runs */ + ITaskFolder_DeleteTask(root, Wine_Task1, 0); + ITaskFolder_DeleteTask(root, Wine_Task2, 0); + ITaskFolder_DeleteFolder(root, Wine, 0); + + hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); +todo_wine + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +todo_wine + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + /* FIXME: Remove once implemented */ + if (hr != S_OK) goto failed; + + hr = IRegisteredTask_get_Name(task1, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = IRegisteredTask_get_Name(task1, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_Path(task1, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_State(task1, &state); + ok(hr == S_OK, "get_State error %#x\n", hr); + ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); + hr = IRegisteredTask_get_Enabled(task1, &vbool); + ok(hr == S_OK, "get_Enabled error %#x\n", hr); + ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + + IRegisteredTask_Release(task1); + + hr = ITaskFolder_RegisterTask(folder, Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + + hr = ITaskFolder_RegisterTask(folder, Task2, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + + hr = IRegisteredTask_get_Name(task2, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Task2), "expected Task2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_Path(task2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Task2), "expected \\Wine\\Task2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_State(task2, &state); + ok(hr == S_OK, "get_State error %#x\n", hr); + ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); + hr = IRegisteredTask_get_Enabled(task2, &vbool); + ok(hr == S_OK, "get_Enabled error %#x\n", hr); + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + + IRegisteredTask_Release(task2); + + hr = ITaskFolder_GetTask(root, NULL, &task1); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolder_GetTask(root, Wine_Task1, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskFolder_GetTask(root, Wine_Task1, &task1); + ok(hr == S_OK, "GetTask error %#x\n", hr); + + hr = IRegisteredTask_get_Name(task1, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_Path(task1, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_State(task1, &state); + ok(hr == S_OK, "get_State error %#x\n", hr); + ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); + hr = IRegisteredTask_get_Enabled(task1, &vbool); + ok(hr == S_OK, "get_Enabled error %#x\n", hr); + ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + + IRegisteredTask_Release(task1); + + hr = ITaskFolder_GetTask(folder, Task2, &task2); + ok(hr == S_OK, "GetTask error %#x\n", hr); + + hr = IRegisteredTask_get_Name(task2, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Task2), "expected Task2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_Path(task2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Task2), "expected \\Wine\\Task2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_State(task2, &state); + ok(hr == S_OK, "get_State error %#x\n", hr); + ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); + hr = IRegisteredTask_get_Enabled(task2, &vbool); + ok(hr == S_OK, "get_Enabled error %#x\n", hr); + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + + IRegisteredTask_Release(task2); + + hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); + ok(hr == S_OK, "DeleteTask error %#x\n", hr); + hr = ITaskFolder_DeleteTask(folder, Task2, 0); + ok(hr == S_OK, "DeleteTask error %#x\n", hr); + +failed: + ITaskFolder_Release(folder); + + hr = ITaskFolder_DeleteFolder(root, Wine, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + + ITaskFolder_Release(root); + ITaskService_Release(service); +} + START_TEST(scheduler) { OleInitialize(NULL); @@ -666,6 +860,7 @@ START_TEST(scheduler) test_Connect(); test_GetFolder(); test_FolderCollection(); + test_GetTask(); OleUninitialize(); }

1 0

Piotr Caban : msvcp70: Don't forward bad_alloc implementation to msvcrt.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 2b1e2e64da244969748148fe31f66569cd307316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1e2e64da244969748148fe3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 7 10:35:10 2014 +0100 msvcp70: Don't forward bad_alloc implementation to msvcrt. --- dlls/msvcp70/msvcp70.spec | 20 ++++++------ dlls/msvcp90/exception.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index fbff36a..88c6328 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -446,10 +446,10 @@ @ stub -arch=win64 ??0__non_rtti_object(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0__non_rtti_object(a)std@@QAE(a)PBD@Z @ stub -arch=win64 ??0__non_rtti_object(a)std@@QEAA(a)PEBD@Z -@ thiscall -arch=i386 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE(a)ABV0@@Z -@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA(a)AEBV0@@Z -@ thiscall -arch=i386 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE(a)PBD@Z -@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA(a)PEBD@Z +@ thiscall -arch=i386 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_bad_cast_copy_ctor +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_bad_cast_copy_ctor +@ thiscall -arch=i386 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) MSVCP_bad_cast_ctor +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) MSVCP_bad_cast_ctor @ stub -arch=win32 ??0bad_typeid(a)std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0bad_typeid(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0bad_typeid(a)std@@QAE(a)PBD@Z @@ -672,8 +672,8 @@ @ cdecl -arch=win64 ??1_Winit(a)std@@QEAA(a)XZ(ptr) _Winit_dtor @ stub -arch=win32 ??1__non_rtti_object(a)std@@UAE(a)XZ @ stub -arch=win64 ??1__non_rtti_object(a)std@@UEAA(a)XZ -@ thiscall -arch=i386 ??1bad_cast(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ -@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ +@ thiscall -arch=i386 ??1bad_cast(a)std@@UAE(a)XZ(ptr) MSVCP_bad_cast_dtor +@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) MSVCP_bad_cast_dtor @ stub -arch=win32 ??1bad_typeid(a)std@@UAE(a)XZ @ stub -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ @ thiscall -arch=i386 ??1codecvt_base(a)std@@UAE(a)XZ(ptr) codecvt_base_dtor @@ -812,8 +812,8 @@ @ cdecl -arch=win64 ??4_Winit(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _Winit_op_assign @ stub -arch=win32 ??4__non_rtti_object(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z -@ thiscall -arch=i386 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z -@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=i386 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_bad_cast_opequals +@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_bad_cast_opequals @ stub -arch=win32 ??4bad_typeid(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4ios_base(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) ios_base_assign @@ -1726,8 +1726,8 @@ @ cdecl -arch=win64 ??_F_Locinfo(a)std@@QEAAXXZ(ptr) _Locinfo_ctor @ thiscall -arch=i386 ??_F_Timevec(a)std@@QAEXXZ(ptr) _Timevec_ctor @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) _Timevec_ctor -@ thiscall -arch=i386 ??_Fbad_cast(a)std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ -@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ +@ thiscall -arch=i386 ??_Fbad_cast(a)std@@QAEXXZ(ptr) MSVCP_bad_cast_default_ctor +@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) MSVCP_bad_cast_default_ctor @ stub -arch=win32 ??_Fbad_typeid(a)std@@QAEXXZ @ stub -arch=win64 ??_Fbad_typeid(a)std@@QEAAXXZ @ thiscall -arch=i386 ??_Fcodecvt_base(a)std@@QAEXXZ(ptr) codecvt_base_ctor diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index dfd35d9..da3a4bf 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -41,6 +41,7 @@ extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; extern const vtable_ptr MSVCP_runtime_error_vtable; extern const vtable_ptr MSVCP_failure_vtable; +extern const vtable_ptr MSVCP_bad_cast_vtable; static void MSVCP_type_info_dtor(type_info * _this) { @@ -447,6 +448,75 @@ const char* __thiscall MSVCP_failure_what(failure *this) DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@") DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) +/* bad_cast class data */ +typedef exception bad_cast; + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_ctor, 8) +bad_cast* __thiscall MSVCP_bad_cast_ctor(bad_cast *this, const char *name) +{ + TRACE("%p %s\n", this, name); + MSVCP_exception_ctor(this, &name); + this->vtable = &MSVCP_bad_cast_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_default_ctor,4) +bad_cast* __thiscall MSVCP_bad_cast_default_ctor(bad_cast *this) +{ + return MSVCP_bad_cast_ctor(this, "bad cast"); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_copy_ctor, 8) +bad_cast* __thiscall MSVCP_bad_cast_copy_ctor(bad_cast *this, const bad_cast *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_exception_copy_ctor(this, rhs); + this->vtable = &MSVCP_bad_cast_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_dtor, 4) +void __thiscall MSVCP_bad_cast_dtor(bad_cast *this) +{ + TRACE("%p\n", this); + MSVCP_exception_dtor(this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_vector_dtor, 8) +void * __thiscall MSVCP_bad_cast_vector_dtor(bad_cast *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_bad_cast_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_bad_cast_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_opequals, 8) +bad_cast* __thiscall MSVCP_bad_cast_opequals(bad_cast *this, const bad_cast *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + + if(this != rhs) { + MSVCP_exception_dtor(this); + MSVCP_exception_copy_ctor(this, rhs); + } + return this; +} + +DEFINE_RTTI_DATA1(bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@") +DEFINE_CXX_DATA1(bad_cast, &exception_cxx_type_info, MSVCP_bad_cast_dtor) + /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void) { @@ -528,6 +598,9 @@ void __asm_dummy_vtables(void) { __ASM_VTABLE(failure, VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) VTABLE_ADD_FUNC(MSVCP_failure_what)); + __ASM_VTABLE(bad_cast, + VTABLE_ADD_FUNC(MSVCP_bad_cast_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_what_exception)); #ifndef __GNUC__ } #endif @@ -595,6 +668,7 @@ void init_exception(void *base) init_invalid_argument_rtti(base); init_runtime_error_rtti(base); init_failure_rtti(base); + init_bad_cast_rtti(base); init_exception_cxx(base); init_bad_alloc_cxx(base); @@ -604,5 +678,6 @@ void init_exception(void *base) init_invalid_argument_cxx(base); init_runtime_error_cxx(base); init_failure_cxx(base); + init_bad_cast_cxx(base); #endif }

1 0

Alexandre Julliard : msvcp71: Export some already implemented Getcat functions.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 21920f9f9c793b7c3e3a8201426b3352da628395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21920f9f9c793b7c3e3a82014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 11:45:17 2014 +0100 msvcp71: Export some already implemented Getcat functions. --- dlls/msvcp71/msvcp71.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 13fb5fe..3dc82a7 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2049,18 +2049,18 @@ @ stub -arch=win64 ?_Getcat@?$moneypunct(a)_W$00(a)std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$moneypunct(a)_W$0A@@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$moneypunct(a)_W$0A@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_get_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_get_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_get_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_get_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_get_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_get_wchar__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_put_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_put_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_put_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_put_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_put_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_put_wchar__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) numpunct_char__Getcat_old @ cdecl -arch=win64 ?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) numpunct_char__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) numpunct_short__Getcat_old @@ -2073,12 +2073,12 @@ @ stub -arch=win64 ?_Getcat@?$time_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old @ stub -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z @ stub -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z @ thiscall -arch=win32 ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll

1 0

Alexandre Julliard : msvcp90: Export _Xmem.
by Alexandre Julliard Feb. 7, 2014

Feb. 7, 2014

Module: wine Branch: master Commit: 01efe3f48f4dcdffa17ace07d8610b1092de31b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01efe3f48f4dcdffa17ace07d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 11:39:53 2014 +0100 msvcp90: Export _Xmem. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 8017819..a5116fa 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3192,7 +3192,7 @@ @ stub -arch=win64 ?_Xinvalid(a)tr1@std@@YAXPEBD(a)Z @ cdecl ?_Xinvarg(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xinvarg @ cdecl ?_Xlen(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xlen -@ stub ?_Xmem(a)tr1@std@@YAXXZ +@ cdecl ?_Xmem(a)tr1@std@@YAXXZ() _Xmem @ stub ?_Xoutrange(a)tr1@std@@YAXXZ @ cdecl ?_Xran(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xran @ cdecl ?_Xran(a)ctype_base@std@@KAXXZ() ctype_base__Xran

1 0

Dmitry Timoshkov : server: Add THREAD_[SET|QUERY] _LIMITED_INFORMATION to generic access mappings and appropriately change THREAD_ALL_ACCESS.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 383f7ba0024ef8722cebf80fc2b9832b095065ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=383f7ba0024ef8722cebf80fc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 20:48:49 2014 +0900 server: Add THREAD_[SET|QUERY]_LIMITED_INFORMATION to generic access mappings and appropriately change THREAD_ALL_ACCESS. --- include/winnt.h | 4 +++- server/thread.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index ded7600..f785d33 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4553,7 +4553,9 @@ typedef enum tagSID_NAME_USE { #define THREAD_SET_THREAD_TOKEN 0x0080 #define THREAD_IMPERSONATE 0x0100 #define THREAD_DIRECT_IMPERSONATION 0x0200 -#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3ff) +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) #define THREAD_BASE_PRIORITY_LOWRT 15 #define THREAD_BASE_PRIORITY_MAX 2 diff --git a/server/thread.c b/server/thread.c index dd0b6b0..896ce0f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -331,9 +331,10 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) static unsigned int thread_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | THREAD_TERMINATE | THREAD_SUSPEND_RESUME; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT | THREAD_QUERY_LIMITED_INFORMATION; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | + THREAD_TERMINATE | THREAD_SUSPEND_RESUME | THREAD_SET_LIMITED_INFORMATION; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | THREAD_QUERY_LIMITED_INFORMATION; if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0