May 2015 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Allow specifying a different depth stencil location.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 90d8896826043bdf8c294018acc663c5d6684935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d8896826043bdf8c294018a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 22 10:11:22 2015 +0200 wined3d: Allow specifying a different depth stencil location. This is for drivers that do not support depth stencil textures, but happily support depth stencil renderbuffers. --- dlls/wined3d/context.c | 60 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 38 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90d8896826043bdf8c294…

1 0

Nikolay Sivov : setupapi/tests: Skip a test if user is not allowed to open logging.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 98b991fdcf3f2cdbdae7d61203367ce9728a5e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b991fdcf3f2cdbdae7d6120… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 12:39:34 2015 +0300 setupapi/tests: Skip a test if user is not allowed to open logging. --- dlls/setupapi/tests/misc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index d5cfa01..09e0fb8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -789,6 +789,11 @@ static void test_SetupLogError(void) SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("SetupOpenLog() failed on insufficient permissions\n"); + return; + } ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

André Hentschel : Add WWN 391
by Jeremy Newman 22 May '15

22 May '15

Module: website Branch: master Commit: 541599da59f39fec48f00bfb95693d2b66abb50d URL: http://source.winehq.org/git/website.git/?a=commit;h=541599da59f39fec48f00b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 22 16:37:11 2015 +0200 Add WWN 391 --- news/de/2015052201.xml | 10 + news/en/2015052201.xml | 10 + wwn/en/wn20150522_391.xml | 556 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 576 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=541599da59f39fec48…

1 0

Austin English : api-ms-win-core-misc-l1-1-0: New dll.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 6bb558034cebb457d3cd5f80f1322104f87f933f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb558034cebb457d3cd5f80f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 13:37:07 2015 -0500 api-ms-win-core-misc-l1-1-0: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-misc-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-misc-l1-1-0.spec | 34 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 39 insertions(+) diff --git a/configure b/configure index de5f942..28e6c19 100755 --- a/configure +++ b/configure @@ -885,6 +885,7 @@ enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 +enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_1_0 @@ -17033,6 +17034,7 @@ wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_wi wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 +wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 diff --git a/configure.ac b/configure.ac index 7a48000..88eb77b 100644 --- a/configure.ac +++ b/configure.ac @@ -2722,6 +2722,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) diff --git a/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in b/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in new file mode 100644 index 0000000..2e97ef9 --- /dev/null +++ b/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-misc-l1-1-0.dll diff --git a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec new file mode 100644 index 0000000..0d45e0d --- /dev/null +++ b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec @@ -0,0 +1,34 @@ +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall IsProcessInJob(long long ptr) kernel32.IsProcessInJob +@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalUnlock(long) kernel32.LocalUnlock +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpi(str str) kernel32.lstrcmpi +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcmp(str str) kernel32.lstrcmp +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlen(str) kernel32.lstrlen +@ stdcall lstrlenW(wstr) kernel32.lstrlenW +@ stdcall NeedCurrentDirectoryForExePathA(str) kernel32.NeedCurrentDirectoryForExePathA +@ stdcall NeedCurrentDirectoryForExePathW(wstr) kernel32.NeedCurrentDirectoryForExePathW +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall Sleep(long) kernel32.Sleep +@ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection +@ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/tools/make_specfiles b/tools/make_specfiles index 164d4f0..0184a9e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -146,6 +146,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-1-0", "api-ms-win-core-interlocked-l1-2-0", + "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0",

1 0

Piotr Caban : msvcp120: Added _Call_once implementation.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: a7a3cd84b5581ccb1ac06a7788b4982c0deecde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a3cd84b5581ccb1ac06a778… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 20 22:18:58 2015 +0200 msvcp120: Added _Call_once implementation. --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 35 +++++++++++++++++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3be4944..c87eb66 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3727,8 +3727,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) +@ cdecl _Call_onceEx(ptr ptr ptr) @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index d8187d5..b84a380 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3668,8 +3668,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) +@ cdecl _Call_onceEx(ptr ptr ptr) @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 32ca437..f89543f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -43,6 +43,8 @@ static int (__cdecl *p_isleadbyte)(int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); +static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); +static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static HMODULE msvcp; @@ -60,6 +62,8 @@ static BOOL init(void) p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); + p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); + p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -190,12 +194,63 @@ static void test__Getcvt(void) } } +static int cnt; +static int once; + +static void __cdecl call_once_func(void) +{ + ok(!once, "once != 0\n"); + cnt += 0x10000; +} + +static void __cdecl call_once_ex_func(void *arg) +{ + int *i = arg; + + ok(!once, "once != 0\n"); + (*i)++; +} + +DWORD WINAPI call_once_thread(void *arg) +{ + p__Call_once(&once, call_once_func); + return 0; +} + +DWORD WINAPI call_once_ex_thread(void *arg) +{ + p__Call_onceEx(&once, call_once_ex_func, &cnt); + return 0; +} + +static void test__Call_once(void) +{ + HANDLE h[4]; + int i; + + for(i=0; i<4; i++) + h[i] = CreateThread(NULL, 0, call_once_thread, &once, 0, NULL); + ok(WaitForMultipleObjects(4, h, TRUE, INFINITE) == WAIT_OBJECT_0, + "error waiting for all threads to finish\n"); + ok(cnt == 0x10000, "cnt = %x\n", cnt); + ok(once == 1, "once = %x\n", once); + + once = cnt = 0; + for(i=0; i<4; i++) + h[i] = CreateThread(NULL, 0, call_once_ex_thread, &once, 0, NULL); + ok(WaitForMultipleObjects(4, h, TRUE, INFINITE) == WAIT_OBJECT_0, + "error waiting for all threads to finish\n"); + ok(cnt == 1, "cnt = %x\n", cnt); + ok(once == 1, "once = %x\n", once); +} + START_TEST(msvcp120) { if(!init()) return; test__Xtime_diff_to_millis2(); test_xtime_get(); test__Getcvt(); + test__Call_once(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bd949be..bdfea8b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3668,8 +3668,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z(ptr wstr int64) msvcp120.?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) msvcp120.?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) msvcp120.?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) msvcp120._Call_once +@ cdecl _Call_onceEx(ptr ptr ptr) msvcp120._Call_onceEx @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 51b2a67..22f90c8 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -630,6 +630,41 @@ void __asm_dummy_vtables(void) { #endif #endif +#if _MSVCP_VER >= 110 +static CRITICAL_SECTION call_once_cs; +static CRITICAL_SECTION_DEBUG call_once_cs_debug = +{ + 0, 0, &call_once_cs, + { &call_once_cs_debug.ProcessLocksList, &call_once_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": call_once_cs") } +}; +static CRITICAL_SECTION call_once_cs = { &call_once_cs_debug, -1, 0, 0, 0, 0 }; + +void __cdecl _Call_onceEx(int *once, void (__cdecl *func)(void*), void *argv) +{ + TRACE("%p %p %p\n", once, func, argv); + + EnterCriticalSection(&call_once_cs); + if(!*once) { + /* FIXME: handle exceptions */ + func(argv); + *once = 1; + } + LeaveCriticalSection(&call_once_cs); +} + +void __cdecl call_once_func_wrapper(void *func) +{ + ((void (__cdecl*)(void))func)(); +} + +void __cdecl _Call_once(int *once, void (__cdecl *func)(void)) +{ + TRACE("%p %p\n", once, func); + _Call_onceEx(once, call_once_func_wrapper, func); +} +#endif + void init_misc(void *base) { #ifdef __x86_64__

1 0

Piotr Caban : msvcp120: Add _Do_call implementation.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: d20c5965f1a29a2469125beb36bda03e995d583d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20c5965f1a29a2469125beb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 20 22:19:06 2015 +0200 msvcp120: Add _Do_call implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c87eb66..f43ed92 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3742,7 +3742,7 @@ @ extern _Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b84a380..f2330df 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3683,7 +3683,7 @@ @ extern _Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f89543f..b5b4301 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -45,6 +45,7 @@ static int (__cdecl *p_xtime_get)(xtime*, int); static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); +static void (CDECL *p__Do_call)(void *this); static HMODULE msvcp; @@ -64,6 +65,7 @@ static BOOL init(void) p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); + p__Do_call = (void*)GetProcAddress(msvcp, "_Do_call"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -244,6 +246,31 @@ static void test__Call_once(void) ok(once == 1, "once = %x\n", once); } +static void **vtbl_func0; +#ifdef __i386__ +/* TODO: this should be a __thiscall function */ +static void __stdcall thiscall_func(void) +{ + cnt = 1; +} +#else +static void __cdecl thiscall_func(void *this) +{ + ok(this == &vtbl_func0, "incorrect this value\n"); + cnt = 1; +} +#endif + +static void test__Do_call(void) +{ + void *pfunc = thiscall_func; + + cnt = 0; + vtbl_func0 = &pfunc; + p__Do_call(&vtbl_func0); + ok(cnt == 1, "func was not called\n"); +} + START_TEST(msvcp120) { if(!init()) return; @@ -251,6 +278,7 @@ START_TEST(msvcp120) test_xtime_get(); test__Getcvt(); test__Call_once(); + test__Do_call(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bdfea8b..dd3f6df 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3683,7 +3683,7 @@ @ extern _Denorm msvcp120._Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) msvcp120._Do_call @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 22f90c8..c8bb2bd 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -663,6 +663,11 @@ void __cdecl _Call_once(int *once, void (__cdecl *func)(void)) TRACE("%p %p\n", once, func); _Call_onceEx(once, call_once_func_wrapper, func); } + +void __cdecl _Do_call(void *this) +{ + CALL_VTBL_FUNC(this, 0, void, (void*), (this)); +} #endif void init_misc(void *base)

1 0

Sebastian Lackner : wbemprox/tests: Add tests for Win32_SystemEnclosure.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 856b03501a2ff896aad58a43dad272bd2aa7005e URL: http://source.winehq.org/git/wine.git/?a=commit;h=856b03501a2ff896aad58a43d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 22 07:55:14 2015 +0200 wbemprox/tests: Add tests for Win32_SystemEnclosure. --- dlls/wbemprox/tests/query.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 56c97ff..bc85e62 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -412,6 +412,120 @@ out: SysFreeString( wql ); } +static void test_Win32_SystemEnclosure( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; + static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; + static const WCHAR chassistypesW[] = {'C','h','a','s','s','i','s','T','y','p','e','s',0}; + static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR tagW[] = {'T','a','g',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + CIMTYPE type; + ULONG count; + VARIANT val; + DWORD *data; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + todo_wine + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + if (hr != S_OK) + goto done; + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); + ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); + ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + if (SUCCEEDED(hr)) + { + LONG i, lower, upper; + + hr = SafeArrayGetLBound( V_ARRAY( &val ), 1, &lower ); + ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); + hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); + ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); + for (i = 0; i < upper - lower + 1; i++) + trace( "chassis type: %u\n", data[i] ); + hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + } + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, descriptionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get description %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "description: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, lockpresentW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get lockpresent %08x\n", hr ); + ok( V_VT( &val ) == VT_BOOL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_BOOLEAN, "unexpected type 0x%x\n", type ); + trace( "lockpresent: %u\n", V_BOOL( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get manufacturer %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "manufacturer: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, tagW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get tag %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "tag: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); +done: + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -828,6 +942,7 @@ START_TEST(query) test_Win32_Process( services ); test_Win32_Service( services ); test_Win32_ComputerSystem( services ); + test_Win32_SystemEnclosure( services ); test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services );

1 0

Sebastian Lackner : wbemprox: Fix handling of arrays as query results.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 37b1048bd21204c222feef1f61767feecb2fc4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b1048bd21204c222feef1f6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 09:38:15 2015 +0200 wbemprox: Fix handling of arrays as query results. --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++------ dlls/wbemprox/table.c | 7 ++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8ba2642..f1f51c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -938,7 +938,7 @@ struct record_service struct record_sid { const WCHAR *accountname; - const UINT8 *binaryrepresentation; + const struct array *binaryrepresentation; const WCHAR *referenceddomainname; const WCHAR *sid; UINT32 sidlength; @@ -2614,12 +2614,22 @@ static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) if (!name || !name->Name.Buffer) return NULL; return heap_strdupW( name->Name.Buffer ); } -static UINT8 *get_binaryrepresentation( PSID sid, UINT len ) +static struct array *get_binaryrepresentation( PSID sid, UINT len ) { - UINT8 *ret = heap_alloc( len ); - if (!ret) return NULL; - memcpy( ret, sid, len ); - return ret; + struct array *array = heap_alloc( sizeof(struct array) ); + if (array) + { + UINT8 *ret = heap_alloc( len ); + if (ret) + { + memcpy( ret, sid, len ); + array->count = len; + array->ptr = ret; + return array; + } + heap_free( array ); + } + return NULL; } static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) { diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 0c57f26..273b8cb 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -288,10 +288,15 @@ void free_row_values( const struct table *table, UINT row ) if (!(table->columns[i].type & COL_FLAG_DYNAMIC)) continue; type = table->columns[i].type & COL_TYPE_MASK; - if (type == CIM_STRING || type == CIM_DATETIME || (type & CIM_FLAG_ARRAY)) + if (type == CIM_STRING || type == CIM_DATETIME) { if (get_value( table, row, i, &val ) == S_OK) heap_free( (void *)(INT_PTR)val ); } + else if (type & CIM_FLAG_ARRAY) + { + if (get_value( table, row, i, &val ) == S_OK) + destroy_array( (void *)(INT_PTR)val, type & CIM_TYPE_MASK ); + } } }

1 0

Michael Müller : wbemprox: Add support for Win32_SystemEnclosure.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 96b5d9aa973dade6d93b504ee19c536cb10e5e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b5d9aa973dade6d93b504ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 16 21:46:13 2015 +0200 wbemprox: Add support for Win32_SystemEnclosure. From: Michael Müller <michael(a)fds-team.de> --- dlls/wbemprox/builtin.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 12 +++++----- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1f51c5..b55e9ad 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -98,6 +98,8 @@ static const WCHAR class_sidW[] = {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; +static const WCHAR class_systemenclosureW[] = + {'W','i','n','3','2','_','S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; @@ -133,6 +135,8 @@ static const WCHAR prop_capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; +static const WCHAR prop_chassistypesW[] = + {'C','h','a','s','s','i','s','T','y','p','e','s',0}; static const WCHAR prop_classW[] = {'C','l','a','s','s',0}; static const WCHAR prop_codesetW[] = @@ -225,6 +229,8 @@ static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; +static const WCHAR prop_lockpresentW[] = + {'L','o','c','k','P','r','e','s','e','n','t',0}; static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = @@ -590,6 +596,16 @@ static const struct column col_stdregprov[] = { method_enumvaluesW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_getstringvalueW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; +static const struct column col_systemenclosure[] = +{ + { prop_captionW, CIM_STRING }, + { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY }, + { prop_descriptionW, CIM_STRING }, + { prop_lockpresentW, CIM_BOOLEAN }, + { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING }, + { prop_tagW, CIM_STRING }, +}; static const struct column col_systemsecurity[] = { { method_getsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, @@ -702,6 +718,12 @@ static const WCHAR physicalmedia_tagW[] = {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; +static const WCHAR systemenclosure_systemenclosureW[] = + {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',0}; +static const WCHAR systemenclosure_tagW[] = + {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',' ','0',0}; +static const WCHAR systemenclosure_manufacturerW[] = + {'W','i','n','e',0}; static const WCHAR videocontroller_dactypeW[] = {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = @@ -960,6 +982,16 @@ struct record_systemsecurity class_method *getsd; class_method *setsd; }; +struct record_systemenclosure +{ + const WCHAR *caption; + const struct array *chassistypes; + const WCHAR *description; + int lockpresent; + const WCHAR *manufacturer; + const WCHAR *name; + const WCHAR *tag; +}; struct record_videocontroller { const WCHAR *adapter_dactype; @@ -1044,6 +1076,27 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_enum_key, reg_enum_values, reg_get_stringvalue } }; +static UINT16 systemenclosure_chassistypes[] = +{ + 1, +}; +static const struct array systemenclosure_chassistypes_array = +{ + SIZEOF(systemenclosure_chassistypes), + &systemenclosure_chassistypes +}; +static const struct record_systemenclosure data_systemenclosure[] = +{ + { + systemenclosure_systemenclosureW, + &systemenclosure_chassistypes_array, + systemenclosure_systemenclosureW, + FALSE, + systemenclosure_manufacturerW, + systemenclosure_systemenclosureW, + systemenclosure_tagW, + } +}; static const struct record_systemsecurity data_systemsecurity[] = { { security_get_sd, security_set_sd } @@ -2817,6 +2870,7 @@ static struct table builtin_classes[] = { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, + { class_systemenclosureW, SIZEOF(col_systemenclosure), col_systemenclosure, SIZEOF(data_systemenclosure), 0, (BYTE *)data_systemenclosure }, { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, 0, NULL, fill_videocontroller } }; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index bc85e62..a7bf201 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -437,10 +437,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - todo_wine ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - if (hr != S_OK) - goto done; type = 0xdeadbeef; VariantInit( &val ); @@ -455,6 +452,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantInit( &val ); hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); @@ -467,8 +465,11 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); - for (i = 0; i < upper - lower + 1; i++) - trace( "chassis type: %u\n", data[i] ); + if (V_VT( &val ) == (VT_I4|VT_ARRAY)) + { + for (i = 0; i < upper - lower + 1; i++) + trace( "chassis type: %u\n", data[i] ); + } hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); } @@ -520,7 +521,6 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantClear( &val ); IWbemClassObject_Release( obj ); -done: IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Bruno Jesus : ws2_32: Simplify select() to make its code more reusable.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 2a1ae98b5545b6e3c1b29b8a2c9a8fd10f7b16cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1ae98b5545b6e3c1b29b8a2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 21 23:55:03 2015 -0300 ws2_32: Simplify select() to make its code more reusable. --- dlls/ws2_32/socket.c | 61 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index de391c9..fdf68a3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4789,6 +4789,34 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd } } +static int do_poll(struct pollfd *pollfds, int count, int timeout) +{ + struct timeval tv1, tv2; + int ret, torig = timeout; + + if (timeout > 0) gettimeofday( &tv1, 0 ); + + while ((ret = poll( pollfds, count, timeout )) < 0) + { + if (errno != EINTR) break; + if (timeout < 0) continue; + + gettimeofday( &tv2, 0 ); + + tv2.tv_sec -= tv1.tv_sec; + tv2.tv_usec -= tv1.tv_usec; + if (tv2.tv_usec < 0) + { + tv2.tv_usec += 1000000; + tv2.tv_sec -= 1; + } + + timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; + if (timeout <= 0) return 0; + } + return ret; +} + /* map the poll results back into the Windows fd sets */ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds, const struct pollfd *fds ) @@ -4830,7 +4858,6 @@ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set return total; } - /*********************************************************************** * select (WS2_32.18) */ @@ -4839,8 +4866,6 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, const struct WS_timeval* ws_timeout) { struct pollfd *pollfds; - struct timeval tv1, tv2; - int torig = 0; int count, ret, timeout = -1; TRACE("read %p, write %p, excp %p timeout %p\n", @@ -4850,35 +4875,9 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return SOCKET_ERROR; if (ws_timeout) - { - torig = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; - timeout = torig; - gettimeofday( &tv1, 0 ); - } - - while ((ret = poll( pollfds, count, timeout )) < 0) - { - if (errno == EINTR) - { - if (!ws_timeout) continue; - gettimeofday( &tv2, 0 ); + timeout = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; - tv2.tv_sec -= tv1.tv_sec; - tv2.tv_usec -= tv1.tv_usec; - if (tv2.tv_usec < 0) - { - tv2.tv_usec += 1000000; - tv2.tv_sec -= 1; - } - - timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; - if (timeout <= 0) - { - ret = 0; - break; - } - } else break; - } + ret = do_poll(pollfds, count, timeout); release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds ); if (ret == -1) SetLastError(wsaErrno());

1 0