wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Vincent Povirk : user32/tests: Add tests for MonitorFromRect.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: ef5341b4d72db206b7baa7cf2b5251a543c32b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5341b4d72db206b7baa7cf2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 15:16:38 2014 -0600 user32/tests: Add tests for MonitorFromRect. --- dlls/user32/tests/monitor.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f442338..a2df20e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -31,6 +31,7 @@ static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD) static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); static void init_function_pointers(void) @@ -48,6 +49,7 @@ static void init_function_pointers(void) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) GET_PROC(MonitorFromPoint) + GET_PROC(MonitorFromRect) GET_PROC(MonitorFromWindow) #undef GET_PROC @@ -291,12 +293,13 @@ static void test_ChangeDisplaySettingsEx(void) static void test_monitors(void) { - HMONITOR monitor, primary; + HMONITOR monitor, primary, nearest; POINT pt; + RECT rc; - if (!pMonitorFromPoint || !pMonitorFromWindow) + if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) { - win_skip("MonitorFromPoint or MonitorFromWindow are not available\n"); + win_skip("MonitorFromPoint, MonitorFromWindow, or MonitorFromRect is not available\n"); return; } @@ -310,6 +313,65 @@ static void test_monitors(void) ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary ); monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); + + SetRect( &rc, 0, 0, 1, 1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* Empty rect at 0,0 is considered inside the primary monitor */ + SetRect( &rc, 0, 0, -1, -1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* Even if there is a monitor left of the primary, the primary will have the most overlapping area */ + SetRect( &rc, -1, 0, 2, 1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* But the width of the rect doesn't matter if it's empty. */ + SetRect( &rc, -1, 0, 2, -1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor != primary, "got primary %p\n", monitor ); + + if (!pGetMonitorInfoA) + { + win_skip("GetMonitorInfoA is not available\n"); + return; + } + + /* Search for a monitor that has no others equally near to (left, top-1) */ + SetRect( &rc, -1, -2, 2, 0 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + nearest = primary; + while (monitor != NULL) + { + MONITORINFO mi; + BOOL ret; + ok( monitor != primary, "got primary %p\n", monitor ); + nearest = monitor; + mi.cbSize = sizeof(mi); + ret = pGetMonitorInfoA( monitor, &mi ); + ok( ret, "GetMonitorInfo failed\n" ); + SetRect( &rc, mi.rcMonitor.left-1, mi.rcMonitor.top-2, mi.rcMonitor.left+2, mi.rcMonitor.top ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + } + + SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == NULL, "got %p\n", monitor ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + ok( monitor == nearest, "got %p, should get nearest %p\n", monitor, nearest ); } static BOOL CALLBACK find_primary_mon(HMONITOR hmon, HDC hdc, LPRECT rc, LPARAM lp)

1 0

Vincent Povirk : user32: Treat empty rects as 1x1 in MonitorFromRect.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 2fef984ed5e85cd04ddcaf7b5a6ddefdbf50a627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fef984ed5e85cd04ddcaf7b5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 8 16:02:23 2014 -0600 user32: Treat empty rects as 1x1 in MonitorFromRect. --- dlls/user32/misc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index eb2631f..41b2b16 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -359,6 +359,13 @@ HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) info.primary = 0; info.nearest = 0; info.ret = 0; + + if (IsRectEmpty(&info.rect)) + { + info.rect.right = info.rect.left + 1; + info.rect.bottom = info.rect.top + 1; + } + if (!EnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; if (!info.ret) {

1 0

André Hentschel : user32/tests: Remove #if 1.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: fc185ccd9bebf2de9857136abd859ceac38d4bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc185ccd9bebf2de9857136ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:22:27 2014 +0100 user32/tests: Remove #if 1. --- dlls/user32/tests/msg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dffaa8d..8cc431c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14329,7 +14329,6 @@ START_TEST(msg) test_winevents(); /* Fix message sequences before removing 4 lines below */ -#if 1 if (pUnhookWinEvent && hEvent_hook) { ret = pUnhookWinEvent(hEvent_hook); @@ -14337,7 +14336,6 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; -#endif test_SetFocus(); test_SetParent();

1 0

André Hentschel : user32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: c855459a403d7cff8446ffd057372f4682b6b66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c855459a403d7cff8446ffd05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:21:43 2014 +0100 user32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/user32/tests/broadcast.c | 18 ++++++++++-------- dlls/user32/tests/menu.c | 12 ++++++------ dlls/user32/tests/win.c | 5 +++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 0476c99..322fbd0 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -119,7 +119,8 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ok(!ret || broken(ret), "Returned: %d\n", ret); if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); -#if 0 /* TODO: Check the hang flags */ +if (0) /* TODO: Check the hang flags */ +{ SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0 ); @@ -143,7 +144,7 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ret = broadcast( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0 ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); -#endif +} recips = BSM_APPLICATIONS; ResetEvent(hevent); @@ -204,31 +205,32 @@ static void test_parametersEx(PBROADCASTEX broadcastex) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); ok(!ret, "Returned: %d\n", ret); -#if 0 /* TODO: Check the hang flags */ +if (0) /* TODO: Check the hang flags */ +{ SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_NOTIMEOUTIFNOTHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOHANG|BSF_NOTIMEOUTIFNOTHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); -#endif +} recips = BSM_APPLICATIONS; ResetEvent(hevent); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index d02eb91..3334a8a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2498,10 +2498,10 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); -#endif + if (mii.hSubMenu) { ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); @@ -2657,10 +2657,10 @@ static void test_menu_resource_layout(void) mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); -#endif + ok(mii.fType == menu_data[i].type, "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); ok(mii.fState == menu_data[i].state, @@ -2763,10 +2763,10 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); -#endif + ok(mii.fType == item[i].type, "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); ok(mii.wID == item[i].id, diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dfcad52..3c63c8a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -895,14 +895,15 @@ static void verify_window_info(const char *hook, HWND hwnd, const WINDOWINFO *in /* win2k and XP return broken border info in GetWindowInfo most of * the time, so there is no point in testing it. */ -#if 0 +if (0) +{ UINT border; ok(info->cxWindowBorders == (unsigned)(rcClient.left - rcWindow.left), "wrong cxWindowBorders %d != %d\n", info->cxWindowBorders, rcClient.left - rcWindow.left); border = min(rcWindow.bottom - rcClient.bottom, rcClient.top - rcWindow.top); ok(info->cyWindowBorders == border, "wrong cyWindowBorders %d != %d\n", info->cyWindowBorders, border); -#endif +} ok(info->atomWindowType == GetClassLongA(hwnd, GCW_ATOM), "wrong atomWindowType for %p in hook %s\n", hwnd, hook); ok(info->wCreatorVersion == 0x0400 /* NT4, Win2000, XP, Win2003 */ ||

1 0

Vincent Povirk : winsta: Stub WinStationVirtualOpen.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 1be9e3fe10a7c9a1ea0a575df4ec573129d003f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be9e3fe10a7c9a1ea0a575df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 13:57:16 2014 -0600 winsta: Stub WinStationVirtualOpen. --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 71e1dda..46a4ce7 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -83,3 +83,10 @@ BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, P SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) +{ + FIXME( "%p %p %p\n", a, b, c ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 9505615..5854d83 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -70,7 +70,7 @@ @ stub WinStationShutdownSystem @ stub WinStationTerminateProcess @ stub WinStationUnRegisterConsoleNotification -@ stub WinStationVirtualOpen +@ stdcall WinStationVirtualOpen(ptr ptr ptr) @ stub WinStationWaitSystemEvent @ stub _NWLogonQueryAdmin @ stub _NWLogonSetAdmin

1 0

Vincent Povirk : setupapi: Stub SetupDiDestroyDriverInfoList.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: bdadd760a3b0685d828a3cfa09ed8a82df72e48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdadd760a3b0685d828a3cfa0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 13:12:41 2014 -0600 setupapi: Stub SetupDiDestroyDriverInfoList. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 16cd339..4349055 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -307,7 +307,7 @@ @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) @ stdcall SetupDiDestroyDeviceInfoList(long) -@ stub SetupDiDestroyDriverInfoList +@ stdcall SetupDiDestroyDriverInfoList(ptr ptr long) @ stdcall SetupDiDrawMiniIcon(ptr int128 long long) @ stdcall SetupDiEnumDeviceInfo(long long ptr) @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 76dc410..fad9d23 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -525,6 +525,18 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA } /*********************************************************************** + * SetupDiDestroyDriverInfoList (SETUPAPI.@) + */ + +BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) +{ + FIXME("%p %p %d\n", DeviceInfoSet, DeviceInfoData, DriverType); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiDeleteDeviceInfo (SETUPAPI.@) */

1 0

Martin Storsjo : api-ms-win-core-synch-l1-2-0: Add stub dll.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 81425436543c79a6c1018df0b575d8f7c261eb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81425436543c79a6c1018df0b… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 27 12:34:18 2014 +0200 api-ms-win-core-synch-l1-2-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-synch-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-synch-l1-2-0.spec | 58 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 63 insertions(+) diff --git a/configure b/configure index 312c19f..9939a69 100755 --- a/configure +++ b/configure @@ -859,6 +859,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 @@ -16517,6 +16518,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 diff --git a/configure.ac b/configure.ac index fbfbb5c..81bdb81 100644 --- a/configure.ac +++ b/configure.ac @@ -2640,6 +2640,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) diff --git a/dlls/api-ms-win-core-synch-l1-2-0/Makefile.in b/dlls/api-ms-win-core-synch-l1-2-0/Makefile.in new file mode 100644 index 0000000..ac092b6 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-l1-2-0.dll diff --git a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec new file mode 100644 index 0000000..43be0c8 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec @@ -0,0 +1,58 @@ +@ stdcall AcquireSRWLockExclusive(ptr) kernel32.AcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) kernel32.AcquireSRWLockShared +@ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer +@ stdcall CreateEventA(ptr long long str) kernel32.CreateEventA +@ stdcall CreateEventExA(ptr str long long) kernel32.CreateEventExA +@ stdcall CreateEventExW(ptr wstr long long) kernel32.CreateEventExW +@ stdcall CreateEventW(ptr long long wstr) kernel32.CreateEventW +@ stdcall CreateMutexA(ptr long str) kernel32.CreateMutexA +@ stdcall CreateMutexExA(ptr str long long) kernel32.CreateMutexExA +@ stdcall CreateMutexExW(ptr wstr long long) kernel32.CreateMutexExW +@ stdcall CreateMutexW(ptr long wstr) kernel32.CreateMutexW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW +@ stdcall CreateWaitableTimerExW(ptr wstr long long) kernel32.CreateWaitableTimerExW +@ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection +@ stub DeleteSynchronizationBarrier +@ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection +@ stub EnterSynchronizationBarrier +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernel32.InitOnceBeginInitialize +@ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernel32.InitOnceExecuteOnce +@ stdcall InitOnceInitialize(ptr) kernel32.InitOnceInitialize +@ stdcall InitializeConditionVariable(ptr) kernel32.InitializeConditionVariable +@ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount +@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeSRWLock(ptr) kernel32.InitializeSRWLock +@ stub InitializeSynchronizationBarrier +@ stdcall LeaveCriticalSection(ptr) kernel32.LeaveCriticalSection +@ stdcall OpenEventA(long long str) kernel32.OpenEventA +@ stdcall OpenEventW(long long wstr) kernel32.OpenEventW +@ stdcall OpenMutexW(long long wstr) kernel32.OpenMutexW +@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenWaitableTimerW(long long wstr) kernel32.OpenWaitableTimerW +@ stdcall ReleaseMutex(long) kernel32.ReleaseMutex +@ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared +@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ResetEvent(long) kernel32.ResetEvent +@ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount +@ stdcall SetEvent(long) kernel32.SetEvent +@ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer +@ stub SetWaitableTimerEx +@ stdcall SignalObjectAndWait(long long long long) kernel32.SignalObjectAndWait +@ stdcall Sleep(long) kernel32.Sleep +@ stdcall SleepConditionVariableCS(ptr ptr long) kernel32.SleepConditionVariableCS +@ stdcall SleepConditionVariableSRW(ptr ptr long long) kernel32.SleepConditionVariableSRW +@ stdcall SleepEx(long long) kernel32.SleepEx +@ stdcall TryAcquireSRWLockExclusive(ptr) kernel32.TryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) kernel32.TryAcquireSRWLockShared +@ stdcall TryEnterCriticalSection(ptr) kernel32.TryEnterCriticalSection +@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject +@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx +@ stub WaitOnAddress +@ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable +@ stub WakeByAddressAll +@ stub WakeByAddressSingle +@ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/tools/make_specfiles b/tools/make_specfiles index 38917eb..31449b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -144,6 +144,7 @@ my @dll_groups = "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-core-synch-l1-2-0", ], [ "ole32",

1 0

Frédéric Delanoy : hlink/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 3e8fa4c7641a0a862ccc44ebba64883ac60db370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8fa4c7641a0a862ccc44ebb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:31 2014 +0100 hlink/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/hlink/tests/hlink.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index f4e3d5c..0b01aef 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -79,18 +79,6 @@ DEFINE_EXPECT(HLF_UpdateHlink); DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static void test_HlinkIsShortcut(void) { UINT i; @@ -707,7 +695,7 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -729,7 +717,7 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa return S_OK; } - ok(0, "unexpected interface %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -820,7 +808,7 @@ static HRESULT WINAPI HlinkBrowseContext_QueryInterface( return E_NOINTERFACE; } - ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -964,7 +952,7 @@ static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID rii return S_OK; } - ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1037,7 +1025,7 @@ static HRESULT WINAPI Moniker_QueryInterface(IMoniker *iface, REFIID riid, void { *ppv = NULL; - ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1089,7 +1077,7 @@ static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoni ok(pbc != _bctx, "pbc != _bctx\n"); ok(pmkToLeft == NULL, "pmkToLeft = %p\n", pmkToLeft); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); ok(*ppv == NULL, "*ppv = %p\n", *ppv); @@ -1109,7 +1097,7 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon ok(pbc == _bctx, "pbc != _bctx\n"); ok(pmkToLeft == NULL, "pmkToLeft=%p\n", pmkToLeft); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); ok(*ppv == NULL, "*ppv=%p\n", *ppv); @@ -1832,7 +1820,7 @@ static IMoniker hls_ref_Moniker = { &hls_ref_MonikerVtbl }; static HRESULT WINAPI hls_QueryInterface(IHlinkSite *iface, REFGUID iid, void **obj) { - ok(0, "QI: %p %s %p\n", iface, debugstr_guid(iid), obj); + ok(0, "QI: %p %s %p\n", iface, wine_dbgstr_guid(iid), obj); return E_NOTIMPL; } @@ -1849,8 +1837,8 @@ static ULONG WINAPI hls_Release(IHlinkSite *iface) static HRESULT WINAPI hls_QueryService(IHlinkSite *iface, DWORD siteData, REFGUID service, REFIID riid, IUnknown **punk) { - ok(0, "QS: %p %x %s %s %p\n", iface, siteData, debugstr_guid(service), - debugstr_guid(riid), punk); + ok(0, "QS: %p %x %s %s %p\n", iface, siteData, wine_dbgstr_guid(service), + wine_dbgstr_guid(riid), punk); return E_NOTIMPL; }

1 0

Frédéric Delanoy : dplayx/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 5332d0e5abe5fd0705df42b9245c06c2c9b35244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5332d0e5abe5fd0705df42b92… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:30 2014 +0100 dplayx/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/dplayx/tests/dplayx.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index fb76c37..7b6c0c0 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -87,8 +87,6 @@ static LPSTR get_temp_buffer(void) static LPCSTR Guid2str(const GUID *guid) { - LPSTR buffer = get_temp_buffer(); - if (!guid) return "(null)"; /* Service providers */ @@ -124,12 +122,7 @@ static LPCSTR Guid2str(const GUID *guid) if (IsEqualGUID(guid, &DPAID_ComPort)) return "DPAID_ComPort"; - sprintf( buffer, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - return buffer; - + return wine_dbgstr_guid(guid); }

1 0

Frédéric Delanoy : dmusic/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 5e6f0e93fa3e97aac4593a63bc81ee7eb9e0779f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6f0e93fa3e97aac4593a63b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:29 2014 +0100 dmusic/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/dmusic/tests/dmusic.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 4291d71..528d182 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -29,16 +29,6 @@ #include "dmusici.h" #include "dmksctrl.h" -static inline const char* debugstr_guid(const GUID *id) -{ - static char string[39]; - sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return string; -} - static inline const char* debugstr_longlong(ULONGLONG ll) { static char string[17]; @@ -67,7 +57,7 @@ static void test_dmusic(void) hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); ok(clock != NULL, "No clock returned\n"); - trace(" guidPort = %s\n", debugstr_guid(&guid_clock)); + trace(" guidPort = %s\n", wine_dbgstr_guid(&guid_clock)); if (clock) IReferenceClock_Release(clock); @@ -103,7 +93,7 @@ static void test_dmusic(void) ok(port_caps.dwSize == sizeof(port_caps), "DMUS_PORTCAPS dwSize member is wrong (%u)\n", port_caps.dwSize); trace("Port %u:\n", index); trace(" dwFlags = %x\n", port_caps.dwFlags); - trace(" guidPort = %s\n", debugstr_guid(&port_caps.guidPort)); + trace(" guidPort = %s\n", wine_dbgstr_guid(&port_caps.guidPort)); trace(" dwClass = %u\n", port_caps.dwClass); trace(" dwType = %u\n", port_caps.dwType); trace(" dwMemorySize = %u\n", port_caps.dwMemorySize); @@ -122,7 +112,7 @@ static void test_dmusic(void) ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); trace("Clock %u:\n", index); trace(" ctType = %u\n", clock_info.ctType); - trace(" guidClock = %s\n", debugstr_guid(&clock_info.guidClock)); + trace(" guidClock = %s\n", wine_dbgstr_guid(&clock_info.guidClock)); trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); index++; } @@ -157,7 +147,7 @@ static void test_dmbuffer(void) hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format); ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr); - ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); + ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", wine_dbgstr_guid(&format)); hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size); ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
82
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 January 2014