September 2014 - Wine-Commits

Henri Verbeet : ddraw: Move the pitch / linear size validation from ddraw_surface_init() to ddraw_surface_create( ).
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: e28800c6a41b766a61c94001c593753bcf59e519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28800c6a41b766a61c94001c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:52 2014 +0200 ddraw: Move the pitch / linear size validation from ddraw_surface_init() to ddraw_surface_create(). --- dlls/ddraw/surface.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0214a7f..0006126 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5943,6 +5943,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } + + if ((desc->dwFlags & DDSD_LINEARSIZE) + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) + { + WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } } else { @@ -5952,6 +5961,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } + + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) + { + WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } } } @@ -6177,13 +6194,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { if (desc->dwFlags & DDSD_LPSURFACE) { - if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4)) - { - WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); - return DDERR_INVALIDPARAMS; - } - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, 0))) @@ -6207,13 +6217,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { if (desc->dwFlags & DDSD_LPSURFACE) { - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, - wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) - { - WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); - return DDERR_INVALIDPARAMS; - } - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, desc->u1.lPitch)))

1 0

Francois Gouget : d2d1: Add a trailing '\n' to a FIXME().
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 9f9743364144a90631b71c7aaf5d54531524c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9743364144a90631b71c7aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:51:59 2014 +0200 d2d1: Add a trailing '\n' to a FIXME(). --- dlls/d2d1/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 10c4296..43c4881 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -123,7 +123,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *iface, const D2D1_POINT_2U *dst_point, ID2D1RenderTarget *render_target, const D2D1_RECT_U *src_rect) { - FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!", iface, dst_point, render_target, src_rect); + FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!\n", iface, dst_point, render_target, src_rect); return E_NOTIMPL; }

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: d83f2ac0eca3569c73fcdd13b546c36a55692225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83f2ac0eca3569c73fcdd13b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:52:03 2014 +0200 dpnet/tests: Add a trailing '\n' to some ok() calls. --- dlls/dpnet/tests/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 4d825bb..0f0b8ce 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -189,14 +189,14 @@ static void address_setsp(void) hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 0, "components=%d", components); + ok(components == 0, "components=%d\n", components); hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 1, "components=%d", components); + ok(components == 1, "components=%d\n", components); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr);

1 0

Piotr Caban : user32/tests: Add cross-process mouse click test.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 0b273d279beaa8dd5df387b2c79adfa0d43deed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b273d279beaa8dd5df387b2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 29 18:03:07 2014 +0200 user32/tests: Add cross-process mouse click test. --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1392c9b..ad983df 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7216,12 +7216,45 @@ todo_wine ok(ret, "UnregisterClass(my_window) failed\n"); } +static void simulate_click(int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = MOUSEEVENTF_LEFTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static WNDPROC def_static_proc; +static BOOL got_hittest; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if(msg == WM_NCHITTEST) + got_hittest = TRUE; + if(msg == WM_LBUTTONDOWN) + ok(0, "unexpected call\n"); + + return def_static_proc(hwnd, msg, wp, lp); +} + static void window_from_point_proc(HWND parent) { HANDLE start_event, end_event; HANDLE win, child_static, child_button; + BOOL got_click; DWORD ret; POINT pt; + MSG msg; start_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_start"); ok(start_event != 0, "OpenEvent failed\n"); @@ -7242,8 +7275,28 @@ static void window_from_point_proc(HWND parent) win = WindowFromPoint(pt); ok(win == child_button, "WindowFromPoint returned %p, expected %p\n", win, child_button); + /* without this window simulate click test keeps sending WM_NCHITTEST + * message to child_static in an infinite loop */ + win = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, 0, NULL, NULL); + ok(win != 0, "CreateWindowEx failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(child_static, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + flush_events(TRUE); SetEvent(start_event); + got_hittest = FALSE; + got_click = FALSE; + while(!got_click && wait_for_message(&msg)) { + if(msg.message == WM_LBUTTONUP) { + ok(msg.hwnd == win, "msg.hwnd = %p, expected %p\n", msg.hwnd, win); + got_click = TRUE; + } + DispatchMessageA(&msg); + } + ok(got_hittest, "transparent window didn't get WM_NCHITTEST message\n"); + todo_wine ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); + ret = WaitForSingleObject(end_event, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); @@ -7306,6 +7359,9 @@ static void test_window_from_point(const char *argv0) win = WindowFromPoint(pt); ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + simulate_click(150, 150); + flush_events(TRUE); + child = GetWindow(child, GW_HWNDNEXT); pt.x = 250; win = WindowFromPoint(pt); @@ -7838,20 +7894,7 @@ START_TEST(win) if(!SetForegroundWindow(hwndMain)) { /* workaround for foreground lock timeout */ - INPUT input[2]; - UINT events_no; - - memset(input, 0, sizeof(input)); - input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = 101; - U(input[0]).mi.dy = 101; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; - input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = 101; - U(input[0]).mi.dy = 101; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTUP; - events_no = SendInput(2, input, sizeof(input[0])); - ok(events_no == 2, "SendInput returned %d\n", events_no); + simulate_click(101, 101); ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n"); }

1 0

Piotr Caban : user32/tests: Add cross-process WindowFromPoint tests.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: c86bd676c7c5ca2c4fed82e8cc804dc23309c85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86bd676c7c5ca2c4fed82e8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 29 18:02:48 2014 +0200 user32/tests: Add cross-process WindowFromPoint tests. --- dlls/user32/tests/win.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f59c1dc..1392c9b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -103,6 +103,22 @@ static void flush_events( BOOL remove_messages ) } } +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; +} + /* check the values returned by the various parent/owner functions on a given window */ static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_parent, HWND gw_owner, HWND ga_root, HWND ga_root_owner ) @@ -7200,10 +7216,49 @@ todo_wine ok(ret, "UnregisterClass(my_window) failed\n"); } -static void test_window_from_point(void) +static void window_from_point_proc(HWND parent) +{ + HANDLE start_event, end_event; + HANDLE win, child_static, child_button; + DWORD ret; + POINT pt; + + start_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_start"); + ok(start_event != 0, "OpenEvent failed\n"); + end_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_end"); + ok(end_event != 0, "OpenEvent failed\n"); + + child_static = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, 0, NULL, NULL); + ok(child_static != 0, "CreateWindowEx failed\n"); + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + ok(win == parent, "WindowFromPoint returned %p, expected %p\n", win, parent); + + child_button = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 100, 0, 100, 100, parent, 0, NULL, NULL); + ok(child_button != 0, "CreateWindowEx failed\n"); + pt.x = 250; + win = WindowFromPoint(pt); + ok(win == child_button, "WindowFromPoint returned %p, expected %p\n", win, child_button); + + SetEvent(start_event); + + ret = WaitForSingleObject(end_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + CloseHandle(start_event); + CloseHandle(end_event); +} + +static void test_window_from_point(const char *argv0) { HWND hwnd, child, win; POINT pt; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + HANDLE start_event, end_event; hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 200, 100, 0, 0, NULL, NULL); @@ -7235,6 +7290,34 @@ static void test_window_from_point(void) ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); DestroyWindow(child); + start_event = CreateEventA(NULL, FALSE, FALSE, "test_wfp_start"); + ok(start_event != 0, "CreateEvent failed\n"); + end_event = CreateEventA(NULL, FALSE, FALSE, "test_wfp_end"); + ok(start_event != 0, "CreateEvent failed\n"); + + sprintf(cmd, "%s win create_children %p\n", argv0, hwnd); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + ok(wait_for_event(start_event, 1000), "didn't get start_event\n"); + + child = GetWindow(hwnd, GW_CHILD); + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + + child = GetWindow(child, GW_HWNDNEXT); + pt.x = 250; + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + + SetEvent(end_event); + winetest_wait_child_process(info.hProcess); + CloseHandle(start_event); + CloseHandle(end_event); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + DestroyWindow(hwnd); } @@ -7713,6 +7796,8 @@ static void test_smresult(void) START_TEST(win) { + char **argv; + int argc = winetest_get_mainargs( &argv ); HMODULE user32 = GetModuleHandleA( "user32.dll" ); HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pGetAncestor = (void *)GetProcAddress( user32, "GetAncestor" ); @@ -7733,6 +7818,15 @@ START_TEST(win) pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); + if (argc==4 && !strcmp(argv[2], "create_children")) + { + HWND hwnd; + + sscanf(argv[3], "%p", &hwnd); + window_from_point_proc(hwnd); + return; + } + if (!RegisterWindowClasses()) assert(0); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", @@ -7783,7 +7877,7 @@ START_TEST(win) /* Add the tests below this line */ test_child_window_from_point(); - test_window_from_point(); + test_window_from_point(argv[0]); test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message();

1 0

Akihiro Sagawa : ntdll/tests: Add KeyNameInformation tests.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: e47ff906597bf38dbc439da8e4d48b59c2334655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47ff906597bf38dbc439da8e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 30 00:13:50 2014 +0900 ntdll/tests: Add KeyNameInformation tests. --- dlls/ntdll/tests/reg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index db608af..22048f9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -129,11 +129,13 @@ static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, PULONG dispos ); +static NTSTATUS (WINAPI * pNtQueryKey)(HANDLE,KEY_INFORMATION_CLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, ULONG, const void*, ULONG ); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); +static LONG (WINAPI * pRtlCompareUnicodeString)(const PUNICODE_STRING,const PUNICODE_STRING,BOOLEAN); static BOOLEAN (WINAPI * pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); @@ -174,11 +176,13 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtCreateKey) NTDLL_GET_PROC(NtFlushKey) NTDLL_GET_PROC(NtDeleteKey) + NTDLL_GET_PROC(NtQueryKey) NTDLL_GET_PROC(NtQueryValueKey) NTDLL_GET_PROC(NtQueryInformationProcess) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) + NTDLL_GET_PROC(RtlCompareUnicodeString) NTDLL_GET_PROC(RtlReAllocateHeap) NTDLL_GET_PROC(RtlAppendUnicodeToString) NTDLL_GET_PROC(RtlUnicodeStringToAnsiString) @@ -1276,6 +1280,42 @@ static void test_long_value_name(void) pNtClose(key); } +static void test_NtQueryKey(void) +{ + HANDLE key; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + ULONG len; + KEY_NAME_INFORMATION *info = NULL; + UNICODE_STRING str; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &len); + if (status == STATUS_INVALID_PARAMETER) { + win_skip("KeyNameInformation is not supported\n"); + pNtClose(key); + return; + } + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08x\n", status); + + info = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQueryKey(key, KeyNameInformation, info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + + str.Buffer = info->Name; + str.Length = info->NameLength; + todo_wine ok(pRtlCompareUnicodeString(&winetestpath, &str, TRUE) == 0, + "got %s, expected %s\n", + wine_dbgstr_wn(str.Buffer, str.Length/sizeof(WCHAR)), + wine_dbgstr_wn(winetestpath.Buffer, winetestpath.Length/sizeof(WCHAR))); + + HeapFree(GetProcessHeap(), 0, info); + pNtClose(key); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1296,6 +1336,7 @@ START_TEST(reg) test_RtlQueryRegistryValues(); test_RtlpNtQueryValueKey(); test_NtFlushKey(); + test_NtQueryKey(); test_NtQueryValueKey(); test_long_value_name(); test_NtDeleteKey();

1 0

Akihiro Sagawa : ntdll/tests: Remove duplicated entry.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 2be3df3c32c799b29c8a0e0c89f246ba272ca165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be3df3c32c799b29c8a0e0c8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 30 00:13:48 2014 +0900 ntdll/tests: Remove duplicated entry. --- dlls/ntdll/tests/reg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1594665..db608af 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -166,7 +166,6 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) NTDLL_GET_PROC(RtlCreateUnicodeString) NTDLL_GET_PROC(RtlFreeUnicodeString) - NTDLL_GET_PROC(NtDeleteValueKey) NTDLL_GET_PROC(RtlQueryRegistryValues) NTDLL_GET_PROC(RtlCheckRegistryKey) NTDLL_GET_PROC(RtlOpenCurrentUser)

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address Duplicate.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 7dcfb9d3e55bab5a3422c85e85221e5279689d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dcfb9d3e55bab5a3422c85e8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 13 12:57:47 2014 +1000 dpnet: Implement IDirectPlay8Address Duplicate. --- dlls/dpnet/address.c | 33 ++++++++++++++++++++++++++++++--- dlls/dpnet/dpnet_private.h | 1 + dlls/dpnet/tests/address.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 2cea1ea..7df7ad6 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -179,9 +179,35 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLA(IDirectPlay8Address static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *iface, IDirectPlay8Address **ppdpaNewAddress) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p, %p): stub\n", This, ppdpaNewAddress); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + IDirectPlay8Address *dup; + HRESULT hr; + + TRACE("(%p, %p)\n", This, ppdpaNewAddress); + + if(!ppdpaNewAddress) + return E_POINTER; + + hr = DPNET_CreateDirectPlay8Address(NULL, NULL, &IID_IDirectPlay8Address, (LPVOID*)&dup); + if(hr == S_OK) + { + IDirectPlay8AddressImpl *DupThis = impl_from_IDirectPlay8Address(dup); + struct component *entry; + + DupThis->SP_guid = This->SP_guid; + DupThis->init = This->init; + + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + { + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type); + if(hr != S_OK) + ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); + } + + *ppdpaNewAddress = dup; + } + + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_SetEqual(IDirectPlay8Address *iface, @@ -338,6 +364,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * list_add_tail(&This->components, &entry->entry); } + entry->size = dwDataSize; switch (dwDataType) { case DPNA_DATATYPE_DWORD: diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 61e2200..1ed4f25 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -68,6 +68,7 @@ struct component WCHAR *name; DWORD type; + DWORD size; union { diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 0f0b8ce..ad35954 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -214,6 +214,44 @@ static void address_setsp(void) } } +static void address_duplicate(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + IDirectPlay8Address *duplicate = NULL; + DWORD components, dupcomps; + GUID guid = IID_Random; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == 1, "components=%d\n", components); + + hr = IDirectPlay8Address_Duplicate(localaddr, &duplicate); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirectPlay8Address_GetSP(duplicate, &guid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); + + hr = IDirectPlay8Address_GetNumComponents(duplicate, &dupcomps); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == dupcomps, "expected %d got %d\n", components, dupcomps); + + IDirectPlay8Address_Release(duplicate); + } + + IDirectPlay8Address_Release(localaddr); + } +} + START_TEST(address) { HRESULT hr; @@ -226,6 +264,7 @@ START_TEST(address) create_directplay_address(); address_addcomponents(); address_setsp(); + address_duplicate(); CoUninitialize(); }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 0dd5cb1cef2d50653377e304ac76693792e48aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd5cb1cef2d50653377e304a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:53:46 2014 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/button.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 2 +- dlls/d3d8/tests/device.c | 2 +- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/dpvoice/tests/voice.c | 12 ++++++------ dlls/dwrite/analyzer.c | 2 +- dlls/kernel32/tests/pipe.c | 4 ++-- dlls/mshtml/tests/dom.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/qcap/avimux.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wmp/oleobj.c | 2 +- dlls/wmp/tests/oleobj.c | 2 +- dlls/xmllite/writer.c | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dd5cb1cef2d50653377e…

1 0

Henri Verbeet : ddraw: Set user memory in ddraw_surface_create() instead of ddraw_surface_init().
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 5000eba6d094a39f82c6814e829c0a03f2ebaf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5000eba6d094a39f82c6814e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:53 2014 +0200 ddraw: Set user memory in ddraw_surface_create() instead of ddraw_surface_init(). --- dlls/ddraw/ddraw.c | 9 +------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 54 +++++++++++++++------------------------------- 3 files changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 18c30da..36eb679 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4726,7 +4726,6 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *ddraw_surface; - HRESULT hr; TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", device_parent, container_parent, surface, parent, parent_ops); @@ -4746,13 +4745,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent return DDERR_OUTOFVIDEOMEMORY; } - if (FAILED(hr = ddraw_surface_init(ddraw_surface, ddraw, container_parent, surface, parent_ops))) - { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, ddraw_surface); - return hr; - } - + ddraw_surface_init(ddraw_surface, ddraw, container_parent, surface, parent_ops); *parent = ddraw_surface; list_add_head(&ddraw->surface_list, &ddraw_surface->surface_list_entry); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7d028dd..a2eee1a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -207,7 +207,7 @@ struct ddraw_texture HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN; -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, +void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0006126..8c48140 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5605,6 +5605,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ DDSURFACEDESC2 *desc, *mip_desc; struct ddraw_texture *texture; UINT layers, levels, i, j; + unsigned int pitch = 0; HRESULT hr; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p, version %u.\n", @@ -5969,6 +5970,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } + + pitch = desc->u1.lPitch; } } @@ -6073,6 +6076,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } + if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_surface_update_desc(root->wined3d_surface, + wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, + WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) + { + ERR("Failed to set surface memory, hr %#x.\n", hr); + goto fail; + } + if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) { unsigned int count = desc->dwBackBufferCount; @@ -6148,13 +6159,12 @@ fail: return hr; } -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, +void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { DDSURFACEDESC2 *desc = &surface->surface_desc; struct wined3d_resource_desc wined3d_desc; unsigned int version = texture->version; - HRESULT hr; surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; @@ -6193,46 +6203,18 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s if (format_is_compressed(&desc->u4.ddpfPixelFormat)) { if (desc->dwFlags & DDSD_LPSURFACE) - { - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, - wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, - desc->lpSurface, 0))) - { - ERR("Failed to set surface memory, hr %#x.\n", hr); - return hr; - } - - desc->dwFlags |= DDSD_LINEARSIZE; - desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); desc->u1.dwLinearSize = ~0u; - } else - { - desc->dwFlags |= DDSD_LINEARSIZE; - desc->dwFlags &= ~DDSD_PITCH; desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); - } + desc->dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); } else { - if (desc->dwFlags & DDSD_LPSURFACE) - { - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, - wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, - desc->lpSurface, desc->u1.lPitch))) - { - ERR("Failed to set surface memory, hr %#x.\n", hr); - return hr; - } - - desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); - } - else - { - desc->dwFlags |= DDSD_PITCH; - desc->dwFlags &= ~DDSD_LINEARSIZE; + if (!(desc->dwFlags & DDSD_LPSURFACE)) desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); - } + desc->dwFlags |= DDSD_PITCH; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } desc->lpSurface = NULL; @@ -6241,8 +6223,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s *parent_ops = &ddraw_surface_wined3d_parent_ops; wined3d_private_store_init(&surface->private_store); - - return DD_OK; } static void STDMETHODCALLTYPE view_wined3d_object_destroyed(void *parent)

1 0