November 2014 - Wine-Commits

Nikolay Sivov : dwrite: Handle Unicode platform when looking for name record codepage.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: c457d0f107e3893bccf3dc6d9254ec8fba197f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c457d0f107e3893bccf3dc6d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 13:52:09 2014 +0300 dwrite: Handle Unicode platform when looking for name record codepage. --- dlls/dwrite/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c893227..1f5e178 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -930,6 +930,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT UINT codepage = 0; switch (platform) { + case OPENTYPE_PLATFORM_UNICODE: + break; case OPENTYPE_PLATFORM_MAC: switch (encoding) {

1 0

Sebastian Lackner : comctl32: Allow broken behaviour in StrRStr functions.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 735e2cd7749b4d4aa1b46a6d2c6f4b54bd4efb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735e2cd7749b4d4aa1b46a6d2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:36:22 2014 +0100 comctl32: Allow broken behaviour in StrRStr functions. --- dlls/comctl32/string.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 5e28b8f..112d9d3 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -674,18 +674,20 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; - if (!lpszEnd) - lpszEnd = lpszStr + lstrlenA(lpszStr); - if (IsDBCSLeadByte(*lpszSearch)) - ch1 = *lpszSearch << 8 | lpszSearch[1]; + ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); + if (!lpszEnd) + lpszEnd = lpszStr + lstrlenA(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenA(lpszEnd)); + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; + ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | (UCHAR)lpszStr[1] : *lpszStr; if (!COMCTL32_ChrCmpIA(ch1, ch2)) { if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) @@ -711,10 +713,13 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; + iLen = strlenW(lpszSearch); + if (!lpszEnd) lpszEnd = lpszStr + strlenW(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenW(lpszEnd)); - iLen = strlenW(lpszSearch); while (lpszStr + iLen <= lpszEnd && *lpszStr) {

1 0

Stefan Dösinger : d3d8/tests: Test mode restoration on focus loss.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: b30901415aee1dcd2da8ebda8beffe3bd2d518de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30901415aee1dcd2da8ebda8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:55 2014 +0100 d3d8/tests: Test mode restoration on focus loss. --- dlls/d3d8/tests/device.c | 112 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3b2d4ac..8dcd163 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2237,7 +2237,13 @@ static void test_wndproc(void) ULONG ref; DWORD res, tid; HWND tmp; + UINT i, adapter_mode_count; HRESULT hr; + D3DDISPLAYMODE d3ddm; + DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; + DEVMODEW devmode; + LONG change_ret; + BOOL ret; static const struct message create_messages[] = { @@ -2258,6 +2264,9 @@ static void test_wndproc(void) * not reliable on X11 WMs. When the window focus follows the * mouse pointer the message is not sent. * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ + {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0}, + /* WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * not deterministic. */ {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, /* Windows sends WM_ACTIVATE to the device window, indicating that * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards @@ -2277,6 +2286,57 @@ static void test_wndproc(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); + adapter_mode_count = IDirect3D8_GetAdapterModeCount(d3d8, D3DADAPTER_DEFAULT); + for (i = 0; i < adapter_mode_count; ++i) + { + hr = IDirect3D8_EnumAdapterModes(d3d8, D3DADAPTER_DEFAULT, i, &d3ddm); + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); + + if (d3ddm.Format != D3DFMT_X8R8G8B8) + continue; + if (d3ddm.Width == registry_mode.dmPelsWidth && d3ddm.Height == registry_mode.dmPelsHeight) + continue; + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but + * refuses to create a device at these sizes. */ + if (d3ddm.Width < 640 || d3ddm.Height < 480) + continue; + + if (!user32_width) + { + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + continue; + } + + /* Make sure the d3d mode is smaller in width or height and at most + * equal in the other dimension than the mode passed to + * ChangeDisplaySettings. Otherwise Windows shrinks the window to + * the ChangeDisplaySettings parameters + 12. */ + if (d3ddm.Width == user32_width && d3ddm.Height == user32_height) + continue; + if (d3ddm.Width <= user32_width && d3ddm.Height <= user32_height) + { + d3d_width = d3ddm.Width; + d3d_height = d3ddm.Height; + break; + } + if (user32_width <= d3ddm.Width && user32_height <= d3ddm.Height) + { + d3d_width = user32_width; + d3d_height = user32_height; + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + break; + } + } + + if (!d3d_width) + { + skip("Could not find adequate modes, skipping mode tests.\n"); + IDirect3D8_Release(d3d8); + return; + } + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d8_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -2286,12 +2346,18 @@ static void test_wndproc(void) thread_params.test_finished = CreateEventA(NULL, FALSE, FALSE, NULL); ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, registry_mode.dmPelsWidth, - registry_mode.dmPelsHeight, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, user32_width, user32_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, registry_mode.dmPelsWidth, - registry_mode.dmPelsHeight, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, user32_width, user32_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -2324,8 +2390,8 @@ static void test_wndproc(void) expect_messages = create_messages; device_desc.device_window = device_window; - device_desc.width = registry_mode.dmPelsWidth; - device_desc.height = registry_mode.dmPelsHeight; + device_desc.width = d3d_width; + device_desc.height = d3d_height; device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { @@ -2354,6 +2420,22 @@ static void test_wndproc(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); + /* Change the mode while the device is in use and then drop focus. */ + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i); + + /* Wine doesn't (yet) mark the device not reset when the mode is changed, thus the todo_wine. + * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes + * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ + hr = IDirect3DDevice8_TestCooperativeLevel(device); + if (hr == D3DERR_DEVICENOTRESET) + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + else + todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + expect_messages = focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or * manually changing the focus. It generates the same messages, but the task @@ -2361,7 +2443,7 @@ static void test_wndproc(void) * an inactive titlebar if reactivated with SetForegroundWindow. Reactivating * the device is difficult, see below. */ SetForegroundWindow(GetDesktopWindow()); - ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; tmp = GetFocus(); @@ -2378,6 +2460,12 @@ static void test_wndproc(void) else ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + devmode.dmPelsWidth, devmode.dmPelsHeight); + /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ @@ -2392,6 +2480,12 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + devmode.dmPelsWidth, devmode.dmPelsHeight); + /* Releasing a device in lost state breaks follow-up tests on native. */ hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); @@ -2400,6 +2494,10 @@ static void test_wndproc(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + /* Fix up the mode until Wine's device release behavior is fixed. */ + change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc);

1 0

Stefan Dösinger : d3d9/tests: Test mode restoration on focus loss.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 1851e2618bc9510de1ca184774d69e2c2231ecec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1851e2618bc9510de1ca18477… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:54 2014 +0100 d3d9/tests: Test mode restoration on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 118 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 112 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 214 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1851e2618bc9510de1ca1…

1 0

Stefan Dösinger : ddraw/tests: Test focus loss style changes.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: a0715873734bb4036caa300d64f3a2bd51e03474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0715873734bb4036caa300d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:53 2014 +0100 ddraw/tests: Test focus loss style changes. --- dlls/ddraw/tests/ddraw1.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 37 ++++++++++++++++++++++++++++++++++++- 4 files changed, 144 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0715873734bb4036caa3…

1 0

Stefan Dösinger : ddraw/tests: Test messages on focus loss.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: be01a7637dd823b99d113d1e80e51ecc60e086fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be01a7637dd823b99d113d1e8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:52 2014 +0100 ddraw/tests: Test messages on focus loss. --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 104 ++++++++++++++++++++++++++++++++-------------- 4 files changed, 290 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be01a7637dd823b99d113…

1 0

Stefan Dösinger : wined3d: Restore the display mode on focus change.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: f6dde7062413a1dfdd71acc92c5178ac66f3ade0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dde7062413a1dfdd71acc92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:57 2014 +0100 wined3d: Restore the display mode on focus change. --- dlls/d3d8/tests/device.c | 6 +-- dlls/d3d9/directx.c | 3 ++ dlls/d3d9/tests/d3d9ex.c | 6 +-- dlls/d3d9/tests/device.c | 6 +-- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++-- dlls/ddraw/tests/ddraw4.c | 8 ++-- dlls/ddraw/tests/ddraw7.c | 8 ++-- dlls/wined3d/device.c | 4 +- dlls/wined3d/directx.c | 92 +++++++++++++++++++++++++----------------- dlls/wined3d/swapchain.c | 36 ++++++++++++----- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 1 + 14 files changed, 115 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6dde7062413a1dfdd71a…

1 0

Stefan Dösinger : ddraw/tests: Test mode changes on focus loss and restore.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: a9e0ece68a5f0fe65910c80d30ab55e928d1a6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e0ece68a5f0fe65910c80d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:56 2014 +0100 ddraw/tests: Test mode changes on focus loss and restore. --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 20 ++++++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9e0ece68a5f0fe65910c…

1 0

Sebastian Lackner : reg.exe: Fix incorrect usage of CompareString in get_rootkey.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: f6b552324ee619d943d6caa659b5426c77c0faf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b552324ee619d943d6caa65… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:54:41 2014 +0100 reg.exe: Fix incorrect usage of CompareString in get_rootkey. --- programs/reg/reg.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index d299cbf..e9c7d16 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -67,6 +67,22 @@ static int reg_message(int msg) return reg_printfW(formatW, msg_buffer); } +static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) +{ + int i; + + for (i = 0; i < len; i++) + { + if (!str[i]) + { + len = i + 1; + break; + } + } + + return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, len) - CSTR_EQUAL; +} + static HKEY get_rootkey(LPWSTR key) { static const WCHAR szHKLM[] = {'H','K','L','M',0}; @@ -80,20 +96,20 @@ static HKEY get_rootkey(LPWSTR key) static const WCHAR szHKCC[] = {'H','K','C','C',0}; static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL) + if (!reg_StrCmpNIW(key, szHKLM, 4) || + !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKCU, 4) || + !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKCR, 4) || + !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKU, 3) || + !reg_StrCmpNIW(key, szHKEY_USERS, 10)) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKCC, 4) || + !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) return HKEY_CURRENT_CONFIG; else return NULL; }

1 0

Sebastian Lackner : shlwapi: Fix incorrect usage of CompareString in StrRStrIA.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 80d98683d02977f93def88254414b3210af558c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d98683d02977f93def88254… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:17:58 2014 +0100 shlwapi: Fix incorrect usage of CompareString in StrRStrIA. --- dlls/shlwapi/string.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index eaaaf3b..316dd3f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -585,6 +585,7 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch) */ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) { + LPSTR lpszRet = NULL; WORD ch1, ch2; INT iLen; @@ -593,28 +594,28 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; - if (!lpszEnd) - lpszEnd = lpszStr + lstrlenA(lpszStr); - if (lpszEnd == lpszStr) - return NULL; - if (IsDBCSLeadByte(*lpszSearch)) ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - do + if (!lpszEnd) + lpszEnd = lpszStr + lstrlenA(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenA(lpszEnd)); + + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - lpszEnd = CharPrevA(lpszStr, lpszEnd); - ch2 = IsDBCSLeadByte(*lpszEnd)? *lpszEnd << 8 | (UCHAR)lpszEnd[1] : *lpszEnd; + ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | (UCHAR)lpszStr[1] : *lpszStr; if (!ChrCmpIA(ch1, ch2)) { - if (!StrCmpNIA(lpszEnd, lpszSearch, iLen)) - return (LPSTR)lpszEnd; + if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) + lpszRet = (LPSTR)lpszStr; } - } while (lpszEnd > lpszStr); - return NULL; + lpszStr = CharNextA(lpszStr); + } + return lpszRet; } /*************************************************************************

1 0

Nikolay Sivov : ole32/tests: Release() doesn't return HRESULT code.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: f7fdaf1c9fbced30b5145d43f036fccb5329c1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fdaf1c9fbced30b5145d43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 09:40:37 2014 +0300 ole32/tests: Release() doesn't return HRESULT code. --- dlls/ole32/tests/moniker.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1ff7159..695f67a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2022,9 +2022,7 @@ static void test_save_load_filemoniker(void) hr = IMoniker_Save(pMk, pStm, TRUE); ok_ole_success(hr, "IMoniker_Save"); - - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); + IMoniker_Release(pMk); /* overwrite the constants with various values */ hr = IStream_Seek(pStm, zero_pos, STREAM_SEEK_SET, NULL); @@ -2055,11 +2053,8 @@ static void test_save_load_filemoniker(void) hr = IMoniker_Load(pMk, pStm); ok_ole_success(hr, "IMoniker_Load"); - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); - - hr = IStream_Release(pStm); - ok_ole_success(hr, "IStream_Release"); + IMoniker_Release(pMk); + IStream_Release(pStm); } START_TEST(moniker)

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase::get_src implementation.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 516ed8e71297e105ee71c7a48f88cd5e2803388f URL: http://source.winehq.org/git/wine.git/?a=commit;h=516ed8e71297e105ee71c7a48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:01:10 2014 +0100 mshtml: Added IHTMLFrameBase::get_src implementation. --- dlls/mshtml/htmlframebase.c | 18 ++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index e0c64f4..bd5c1de 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -157,8 +157,22 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached frame object\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetSrc(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetSrc(This->nsiframe, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 978b79c..f0896f6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5283,6 +5283,27 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const ch IHTMLFrameBase_Release(fbase); } +#define test_framebase_src(a,b) _test_framebase_src(__LINE__,a,b) +static void _test_framebase_src(unsigned line, IHTMLElement *elem, const char *src) +{ + BSTR str = (void*)0xdeadbeef; + IHTMLFrameBase *fbase; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + hres = IHTMLFrameBase_get_src(fbase, &str); + ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_src failed: 0x%08x\n", hres); + if(src) + ok_(__FILE__,line)(!strcmp_wa(str, src), "src = %s, expected %s\n", wine_dbgstr_w(str), src); + else + ok_(__FILE__,line)(!str, "src = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFrameBase_Release(fbase); +} + #define test_framebase_marginheight(a,b) _test_framebase_marginheight(__LINE__,a,b) static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *exval) { @@ -6890,6 +6911,7 @@ static void test_iframe_elem(IHTMLElement *elem) set_iframe_width(elem, "150px"); set_iframe_width(elem, "70%"); test_iframe_width(elem, "70%"); + test_framebase_src(elem, "about:blank"); str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; @@ -8636,6 +8658,7 @@ static void test_frameset(IHTMLDocument2 *doc) test_framebase_put_name(elem, "frame name"); test_framebase_put_name(elem, NULL); test_framebase_put_name(elem, "nm1"); + test_framebase_src(elem, "about:blank"); IHTMLElement_Release(elem); /* get_name with no name attr */

1 0

Jacek Caban : mshtml: Added support for IHTMLFrameBase:: put_src call on detached element.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 49c7277505edfad6488a05d66f593bb5e03f87d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c7277505edfad6488a05d66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:00:58 2014 +0100 mshtml: Added support for IHTMLFrameBase::put_src call on detached element. --- dlls/mshtml/htmlframebase.c | 17 +++++++++++++++-- dlls/mshtml/tests/nav_test.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 9808379..e0c64f4 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -134,8 +134,21 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->content_window || !This->element.node.doc || !This->element.node.doc->basedoc.window) { - FIXME("detached element\n"); - return E_FAIL; + nsAString nsstr; + nsresult nsres; + + nsAString_InitDepend(&nsstr, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetSrc(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetSrc(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri, BINDING_NAVIGATED); diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index 536b238..11c4c0c 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -43,9 +43,24 @@ function window_navigate_test() { iframe.contentWindow.navigate("about:blank"); } +function detached_src_test() { + var iframe = document.createElement("iframe"); + var onload_called = false; + + iframe.onload = function() { + onload_called = true; + next_test(); + } + + iframe.src = "blank.html"; + document.body.appendChild(iframe); + ok(onload_called === false, "called onload too early?"); +} + var tests = [ nav_back_test, window_navigate_test, + detached_src_test, function() { external.reportSuccess(); } ];

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheet::cssText tests.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 90017fb3d80898c7b53520c96182f7a6bb590db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90017fb3d80898c7b53520c96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:04:17 2014 +0100 mshtml: Added IHTMLStyleSheet::cssText tests. --- dlls/mshtml/tests/dom.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 39c3a7d..978b79c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -478,6 +478,20 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) +{ + int len, prefix_len; + CHAR buf[512]; + + len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL)-1; + prefix_len = lstrlenA(prefix); + if(len < prefix_len) + return FALSE; + + buf[prefix_len] = 0; + return !lstrcmpA(buf, prefix); +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -2155,8 +2169,8 @@ static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const ch HRESULT hres; hres = IHTMLTxtRange_pasteHTML(range, str); - ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); - SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); + SysFreeString(str); } #define test_range_parent(r,t) _test_range_parent(__LINE__,r,t) @@ -6911,6 +6925,43 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLDocument2_Release(content_doc); } +#define test_stylesheet_csstext(a,b,c) _test_stylesheet_csstext(__LINE__,a,b,c) +static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *exstr, BOOL is_todo) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLStyleSheet_get_cssText(stylesheet, &str); + ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); + if(!is_todo) { + if(exstr) + ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); + }else todo_wine { + if(exstr) + ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); + } + + SysFreeString(str); +} + +#define set_stylesheet_csstext(a,b,c) _set_stylesheet_csstext(__LINE__,a,b,c) +static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *csstext, BOOL is_todo) +{ + BSTR str = a2bstr(csstext); + HRESULT hres; + + hres = IHTMLStyleSheet_put_cssText(stylesheet, str); + if(!is_todo) + ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + else + todo_wine ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + SysFreeString(str); +} + static void test_stylesheet(IDispatch *disp) { IHTMLStyleSheetRulesCollection *col = NULL; @@ -6936,6 +6987,14 @@ static void test_stylesheet(IDispatch *disp) ok(href == NULL, "got href != NULL\n"); SysFreeString(href); + test_stylesheet_csstext(stylesheet, ".body {", FALSE); + set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); + test_stylesheet_csstext(stylesheet, ".div {", TRUE); + set_stylesheet_csstext(stylesheet, "", FALSE); + test_stylesheet_csstext(stylesheet, NULL, FALSE); + set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }", FALSE); + test_stylesheet_csstext(stylesheet, ".div {", FALSE); + IHTMLStyleSheet_Release(stylesheet); }

1 0

Nikolay Sivov : dwrite/tests: Some tests for ReadFileFragment().
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: e6cd0f7d8c4ad51135e0d56161258beb90905fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cd0f7d8c4ad51135e0d5616… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 13:18:46 2014 +0300 dwrite/tests: Some tests for ReadFileFragment(). --- dlls/dwrite/tests/font.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba916a9..ed43839 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2412,6 +2412,77 @@ static void test_CreateStreamFromKey(void) DeleteFileW(test_fontfile); } +static void test_ReadFileFragment(void) +{ + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileStream *stream; + IDWriteFontFileLoader *loader; + IDWriteFactory *factory; + IDWriteFontFile *file; + const void *fragment, *fragment2; + void *key, *context, *context2; + UINT64 filesize; + UINT32 size; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFileStream_GetFileSize(stream, &filesize); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* reading past the end of the stream */ + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize+1, &context); +todo_wine { + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(context == NULL, "got %p\n", context); + ok(fragment == NULL, "got %p\n", fragment); +} + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(context == NULL, "got %p\n", context); + ok(fragment != NULL, "got %p\n", fragment); + + fragment2 = (void*)0xdeadbeef; + context2 = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment2, 0, filesize, &context2); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(context2 == NULL, "got %p\n", context2); + ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); +} + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_ReleaseFileFragment(stream, context2); + + IDWriteFontFileStream_Release(stream); + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2444,6 +2515,7 @@ START_TEST(font) test_TryGetFontTable(); test_ConvertFontToLOGFONT(); test_CreateStreamFromKey(); + test_ReadFileFragment(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetLastWriteTime() for local stream.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: f16960aeb827037bd933e4d61e0fc9f3dc06c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16960aeb827037bd933e4d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 12:43:10 2014 +0300 dwrite: Implement GetLastWriteTime() for local stream. --- dlls/dwrite/font.c | 26 ++++++++++++++++---------- dlls/dwrite/tests/font.c | 7 +++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 91aca96..ed38a6f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1973,11 +1973,17 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + struct local_cached_stream { struct list entry; IDWriteFontFileStream *stream; - void *key; + struct local_refkey *key; UINT32 key_size; }; @@ -1990,12 +1996,6 @@ struct dwrite_localfontfilestream HANDLE handle; }; -struct local_refkey -{ - FILETIME writetime; - WCHAR name[1]; -}; - struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; @@ -2106,9 +2106,15 @@ static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *ifa static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream *iface, UINT64 *last_writetime) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - FIXME("(%p)->(%p): stub\n",This, last_writetime); - *last_writetime = 0; - return E_NOTIMPL; + ULARGE_INTEGER li; + + TRACE("(%p)->(%p)\n", This, last_writetime); + + li.LowPart = This->entry->key->writetime.dwLowDateTime; + li.HighPart = This->entry->key->writetime.dwHighDateTime; + *last_writetime = li.QuadPart; + + return S_OK; } static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b8ff22d..ba916a9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2362,6 +2362,7 @@ static void test_CreateStreamFromKey(void) IDWriteFontFileLoader *loader; IDWriteFactory *factory; IDWriteFontFile *file; + UINT64 writetime; void *key; UINT32 size; HRESULT hr; @@ -2398,6 +2399,12 @@ static void test_CreateStreamFromKey(void) hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(stream, 1); + + writetime = 0; + hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(writetime != 0, "got %08x%08x\n", (UINT)(writetime >> 32), (UINT)writetime); + IDWriteFontFileStream_Release(stream); IDWriteLocalFontFileLoader_Release(localloader);

1 0

Sebastian Lackner : comctl32: Fix invalid usage of CompareString in StrRStr functions.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 194b7cd5ae69e8243f3fbd653b31417b45e23252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194b7cd5ae69e8243f3fbd653… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 06:51:00 2014 +0100 comctl32: Fix invalid usage of CompareString in StrRStr functions. --- dlls/comctl32/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 8d41508..5e28b8f 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -683,7 +683,7 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; if (!COMCTL32_ChrCmpIA(ch1, ch2)) @@ -716,7 +716,7 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) iLen = strlenW(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { if (!COMCTL32_ChrCmpIW(*lpszSearch, *lpszStr)) {

1 0

Sebastian Lackner : comctl32: Fix incorrect usage of CompareString in SYSLINK_ParseText.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: e2c0694901638c803aaa88d5c49164e8e4802f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0694901638c803aaa88d5c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 07:05:05 2014 +0100 comctl32: Fix incorrect usage of CompareString in SYSLINK_ParseText. --- dlls/comctl32/syslink.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index a5ba3dd..eeb46b9 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -184,6 +184,26 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) } /*********************************************************************** + * SYSLINK_StrCmpNIW + * Wrapper for StrCmpNIW to ensure 'len' is not too big. + */ +static INT SYSLINK_StrCmpNIW (LPCWSTR str, LPCWSTR comp, INT len) +{ + INT i; + + for(i = 0; i < len; i++) + { + if(!str[i]) + { + len = i + 1; + break; + } + } + + return StrCmpNIW(str, comp, len); +} + +/*********************************************************************** * SYSLINK_ParseText * Parses the window text string and creates a document. Returns the * number of document items created. @@ -203,7 +223,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) + if(!SYSLINK_StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -231,14 +251,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!StrCmpNIW(tmp, SL_HREF, 6)) + if(!SYSLINK_StrCmpNIW(tmp, SL_HREF, 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!StrCmpNIW(tmp, SL_ID, 4)) + else if(!SYSLINK_StrCmpNIW(tmp, SL_ID, 4)) { taglen += 4; ValidParam = TRUE; @@ -312,7 +332,7 @@ CheckParameter: } } } - else if(!StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) + else if(!SYSLINK_StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)

1 0

Sebastian Lackner : user32/tests: Add multi-threaded tests for [Get|Set] WindowText.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: c56ba461a2560c581ff8a792b220e5ae67e82d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56ba461a2560c581ff8a792b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:13:27 2014 +0100 user32/tests: Add multi-threaded tests for [Get|Set]WindowText. --- dlls/user32/tests/win.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6922cd0..5ed0a06 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5693,13 +5693,47 @@ static void test_ShowWindow(void) ok(!IsWindow(hwnd), "window should not exist\n"); } +static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) +{ + HWND hwnd = arg; + char buf[32]; + INT buf_len; + + /* test GetWindowTextA */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + return 0; +} + +static DWORD CALLBACK settext_msg_thread( LPVOID arg ) +{ + HWND hwnd = arg; + BOOL success; + + /* test SetWindowTextA */ + num_settext_msgs = 0; + success = SetWindowTextA( hwnd, "thread_caption" ); + ok( success, "SetWindowTextA failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + return 0; +} + static void test_gettext(void) { + DWORD tid, num_msgs; + HANDLE thread; BOOL success; char buf[32]; INT buf_len; HWND hwnd; LRESULT r; + MSG msg; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); @@ -5746,6 +5780,42 @@ static void test_gettext(void) ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + + /* test interthread GetWindowTextA */ + num_msgs = 0; + thread = CreateThread( NULL, 0, gettext_msg_thread, hwnd, 0, &tid ); + ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0) + { + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + num_msgs++; + } + CloseHandle( thread ); + ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + + /* test interthread SetWindowText */ + num_msgs = 0; + thread = CreateThread( NULL, 0, settext_msg_thread, hwnd, 0, &tid ); + ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0) + { + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + num_msgs++; + } + CloseHandle( thread ); + ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "thread_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + /* seems to crash on every modern Windows version */ if (0) {

1 0

Sebastian Lackner : user32/tests: Add single-threaded tests for WM_[ GET|SET]TEXT and [Get|Set]WindowText.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: d6bdae11df7a4481a68082e54d75360ecbd82236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bdae11df7a4481a68082e54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:11:10 2014 +0100 user32/tests: Add single-threaded tests for WM_[GET|SET]TEXT and [Get|Set]WindowText. --- dlls/user32/tests/win.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 24cbd78..6922cd0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -64,6 +64,7 @@ static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; static DWORD num_gettext_msgs; +static DWORD num_settext_msgs; static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; @@ -798,6 +799,9 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_GETTEXT: num_gettext_msgs++; break; + case WM_SETTEXT: + num_settext_msgs++; + break; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -5691,12 +5695,57 @@ static void test_ShowWindow(void) static void test_gettext(void) { + BOOL success; + char buf[32]; + INT buf_len; HWND hwnd; LRESULT r; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + /* test GetWindowTextA */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test WM_GETTEXT */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + r = SendMessageA( hwnd, WM_GETTEXT, sizeof(buf), (LONG_PTR)buf ); + ok( r != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test SetWindowTextA */ + num_settext_msgs = 0; + success = SetWindowTextA( hwnd, "new_caption" ); + ok( success, "SetWindowTextA failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "new_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test WM_SETTEXT */ + num_settext_msgs = 0; + r = SendMessageA( hwnd, WM_SETTEXT, 0, (ULONG_PTR)"another_caption" ); + ok( r != 0, "WM_SETTEXT failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + /* seems to crash on every modern Windows version */ if (0) {

1 0

Caron Wills : wined3d: Add NVIDIA GeForce GTX 970 to supported device list.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 9f36db8fa5a863971542e524c7546ed88def61dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f36db8fa5a863971542e524c… Author: Caron Wills <caron(a)codeweavers.com> Date: Mon Nov 17 10:12:58 2014 -0600 wined3d: Add NVIDIA GeForce GTX 970 to supported device list. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index abb25a1..d5dbd3d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1293,6 +1293,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1720,6 +1721,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ @@ -2074,6 +2076,7 @@ cards_amd_mesa[] = cards_nvidia_mesa[] = { /* Maxwell */ + {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7803c9..193f10a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1524,6 +1524,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheet:: cssText property partial implementation.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: cc8d9f238d701b6f69d28d321f0bb9f39557e2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8d9f238d701b6f69d28d321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:03:01 2014 +0100 mshtml: Added IHTMLStyleSheet::cssText property partial implementation. --- dlls/mshtml/htmlstylesheet.c | 64 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 6480975..d2960d2 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -629,15 +630,70 @@ static HRESULT WINAPI HTMLStyleSheet_get_media(IHTMLStyleSheet *iface, BSTR *p) static HRESULT WINAPI HTMLStyleSheet_put_cssText(IHTMLStyleSheet *iface, BSTR v) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + do { + nsres = nsIDOMCSSStyleSheet_DeleteRule(This->nsstylesheet, 0); + }while(NS_SUCCEEDED(nsres)); + + if(v && *v) { + nsAString nsstr; + UINT32 idx; + + /* FIXME: This won't work for multiple rules in the string. */ + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMCSSStyleSheet_InsertRule(This->nsstylesheet, &nsstr, 0, &idx); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + FIXME("InsertRule failed for string %s. Probably multiple rules passed.\n", debugstr_w(v)); + return E_FAIL; + } + } + + return S_OK; } static HRESULT WINAPI HTMLStyleSheet_get_cssText(IHTMLStyleSheet *iface, BSTR *p) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMCSSRuleList *nslist = NULL; + nsIDOMCSSRule *nsrule; + nsAString nsstr; + UINT32 len; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMCSSStyleSheet_GetCssRules(This->nsstylesheet, &nslist); + if(NS_FAILED(nsres)) { + ERR("GetCssRules failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMCSSRuleList_GetLength(nslist, &len); + assert(nsres == NS_OK); + + if(len) { + nsres = nsIDOMCSSRuleList_Item(nslist, 0, &nsrule); + if(NS_FAILED(nsres)) + ERR("Item failed: %08x\n", nsres); + } + + nsIDOMCSSRuleList_Release(nslist); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!len) { + *p = NULL; + return S_OK; + } + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMCSSRule_GetCssText(nsrule, &nsstr); + nsIDOMCSSRule_Release(nsrule); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface,

1 0

Michael Stefaniuc : regedit: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: a542a13a02ac0e7de3c2c9706333cb7366d9f669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a542a13a02ac0e7de3c2c9706… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:25:22 2014 +0100 regedit: Simplify check for an empty string (PVS-Studio). --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 1635b50..0a56f94 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -286,7 +286,7 @@ static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, W BOOL export_branch = FALSE; WCHAR* path = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); - if (path && strlenW(path) > 0) + if (path && path[0]) export_branch = TRUE; HeapFree(GetProcessHeap(), 0, path); CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, export_branch ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL);

1 0

Michael Stefaniuc : winemapi: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 2beb5518c5afd9ca0028c04ba74532b5f5687d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2beb5518c5afd9ca0028c04ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:23:53 2014 +0100 winemapi: Simplify check for an empty string (PVS-Studio). --- dlls/winemapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 8cd6b6d..b627d49 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -100,7 +100,7 @@ ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, TRACE("(0x%08lx 0x%08lx %s 0x%08x 0x%08x %p)\n", session, uiparam, debugstr_a(name), flags, reserved, recip); - if (!name || !strlen(name)) + if (!name || !name[0]) return MAPI_E_FAILURE; scode = MAPIAllocateBuffer(sizeof(**recip) + sizeof(smtp) + strlen(name),

1 0

Sebastian Lackner : user32: Avoid sending window messages in FindWindowExW.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: d5ba7451a34bcdd1af5734cfc320f52abc957258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ba7451a34bcdd1af5734cfc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:15:52 2014 +0100 user32: Avoid sending window messages in FindWindowExW. --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5ed0a06..404017f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7055,7 +7055,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); num_gettext_msgs = 0; @@ -7066,7 +7065,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); @@ -7077,7 +7075,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); num_gettext_msgs = 0; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 73cad0c..0516193 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1941,7 +1941,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (GetWindowTextW( list[i], buffer, len + 1 )) + if (InternalGetWindowText( list[i], buffer, len + 1 )) { if (!strcmpiW( buffer, title )) break; }

1 0