wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Piotr Caban : comctl32: Set listview focus in WM_LBUTTONDOWN.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: ddcab8aceada5ee7df8bbd3d9c04de4ce5a25725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcab8aceada5ee7df8bbd3d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 19:12:41 2015 +0100 comctl32: Set listview focus in WM_LBUTTONDOWN. This patch reverts commit 098dc7b3302f39c5500d644615a6f4c37d328ce0 and moves focus setting after LVN_ITEMCHANGED notification is sent. Writing tests for it is tricky because native blocks inside WM_LBUTTONDOWN message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e479dca..68a5515 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10266,6 +10266,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN } } + if (!infoPtr->bFocus) + SetFocus(infoPtr->hwndSelf); + if (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) if(lvHitTestInfo.iItem != -1) notify_itemactivate(infoPtr,&lvHitTestInfo); } @@ -10352,9 +10355,6 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT LISTVIEW_DelayedEditItem); } - if (!infoPtr->bFocus) - SetFocus(infoPtr->hwndSelf); - return 0; }

1 0

Jacek Caban : ieframe: Fixed tests on some VMs.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: a4fb95d7b5e005184d0b1d82fd010d41069023f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fb95d7b5e005184d0b1d82f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 18:24:28 2015 +0100 ieframe: Fixed tests on some VMs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3584647..1cd8f75 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1024,6 +1024,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe case DISPID_BEFORESCRIPTEXECUTE: /* FIXME: IE10 */ break; + case DISPID_PRIVACYIMPACTEDSTATECHANGE: + break; + default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); }

1 0

Jacek Caban : exdisp.idl: Added new DWebBrowserEvents2 members declarations.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: c7b85c893ef061ca4edb4efdc44b57151fe7eea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b85c893ef061ca4edb4efdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 18:24:21 2015 +0100 exdisp.idl: Added new DWebBrowserEvents2 members declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 12 ++++++------ include/exdisp.idl | 11 +++++++++++ include/exdispid.h | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1617dcb..3584647 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -114,7 +114,7 @@ DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); DEFINE_EXPECT(Invoke_PROGRESSCHANGE); DEFINE_EXPECT(Invoke_DOCUMENTCOMPLETE); DEFINE_EXPECT(Invoke_WINDOWCLOSING); -DEFINE_EXPECT(Invoke_282); +DEFINE_EXPECT(Invoke_SETPHISHINGFILTERSTATUS); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); DEFINE_EXPECT(GetHostInfo); @@ -1017,11 +1017,11 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe return S_OK; } - case 282: /* FIXME */ - CHECK_EXPECT2(Invoke_282); + case DISPID_SETPHISHINGFILTERSTATUS: /* FIXME */ + CHECK_EXPECT2(Invoke_SETPHISHINGFILTERSTATUS); break; - case 290: /* FIXME: IE10 */ + case DISPID_BEFORESCRIPTEXECUTE: /* FIXME: IE10 */ break; default: @@ -2891,7 +2891,7 @@ static void test_download(DWORD flags) SET_EXPECT(DocHost_EnableModeless_FALSE); SET_EXPECT(DocHost_EnableModeless_TRUE); SET_EXPECT(Invoke_SETSECURELOCKICON); - SET_EXPECT(Invoke_282); + SET_EXPECT(Invoke_SETPHISHINGFILTERSTATUS); SET_EXPECT(EnableModeless_FALSE); if(!(flags & DWL_REFRESH)) { @@ -2960,7 +2960,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */ CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */ todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); - CLEAR_CALLED(Invoke_282); /* IE 7 */ + CLEAR_CALLED(Invoke_SETPHISHINGFILTERSTATUS); /* IE 7 */ if(is_first_load) todo_wine CHECK_CALLED(EnableModeless_FALSE); else diff --git a/include/exdisp.idl b/include/exdisp.idl index 7b5d921..5ee9960 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -476,6 +476,17 @@ dispinterface DWebBrowserEvents2 [in] VARIANT *RedirectURL, [in] VARIANT *Frame, [in] VARIANT *StatusCode); + + [id(DISPID_BEFORESCRIPTEXECUTE)] + void BeforeScriptExecute([in] IDispatch *pDispWindow); + + [id(DISPID_WEBWORKERSTARTED)] + void WebWorkerStarted( + [in] DWORD dwUniqueID, + [in] BSTR bstrWorkerLabel); + + [id(DISPID_WEBWORKERFINISHED)] + void WebWorkerFinsihed([in] DWORD dwUniqueID); } [ diff --git a/include/exdispid.h b/include/exdispid.h index 012f704..6902f99 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -70,6 +70,9 @@ #define DISPID_NEWPROCESS 284 #define DISPID_THIRDPARTYURLBLOCKED 285 #define DISPID_REDIRECTXDOMAINBLOCKED 286 +#define DISPID_WEBWORKERSTARTED 288 +#define DISPID_WEBWORKERFINISHED 289 +#define DISPID_BEFORESCRIPTEXECUTE 290 #define DISPID_PRINTTEMPLATEINSTANTIATION 225 #define DISPID_PRINTTEMPLATETEARDOWN 226

1 0

Nikolay Sivov : advapi32: Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable (Clang).
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: f611fcafd8610155b5fe1d97a779ed5bdc94bb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f611fcafd8610155b5fe1d97a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 19:27:06 2015 +0300 advapi32: Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 09dfdec..c64981e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -871,7 +871,7 @@ BOOL WINAPI CreateRestrictedToken( PHANDLE newToken) { TOKEN_TYPE type; - SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous; DWORD size; FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",

1 0

Bruno Jesus : krnl386.exe16: Skip invalid entries in GetPrivateProfileString16.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 90eb14a6c4d4d2549894a04655a6f38ceb6998d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb14a6c4d4d2549894a0465… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Nov 28 22:47:38 2015 +0100 krnl386.exe16: Skip invalid entries in GetPrivateProfileString16. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/file.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 77908c2..b66b753 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -539,6 +539,9 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, UINT16 len, LPCSTR filename ) { + TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_a(section), debugstr_a(entry), + debugstr_a(def_val), buffer, len, debugstr_a(filename)); + if (!section) { if (buffer && len) buffer[0] = 0; @@ -572,7 +575,12 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, { char *p = strchr( src, '=' ); - if (!p) p = src + strlen(src); + /* A valid entry is formed by name = value */ + if (!p) + { + src += strlen(src) + 1; + continue; + } if (p - src < len) { memcpy( buffer, src, p - src );

1 0

Hugh McMaster : user32/tests: Add tests for VK_SPACE, Shift-Space and Ctrl-Space.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: c87a78bc949c5b497e58364053d29e18c305d3ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87a78bc949c5b497e5836405… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 1 21:38:01 2015 +1100 user32/tests: Add tests for VK_SPACE, Shift-Space and Ctrl-Space. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d662d6f..0d7c6d6 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1635,6 +1635,9 @@ static const struct tounicode_tests { 0, ctrl, '^', 1, {0x1e}}, { 0, ctrl, '_', 1, {0x1f}}, { 0, ctrl, '`', 0, {}}, + { VK_SPACE, 0, 0, 1, {' ',0}}, + { VK_SPACE, shift, 0, 1, {' ',0}}, + { VK_SPACE, ctrl, 0, 1, {' ',0}}, }; static void test_ToUnicode(void)

1 0

Hugh McMaster : winex11.drv: Ctrl-Space should generate space, not 0.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 598d334e73784ab686d460a59301bf9cdeff5719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598d334e73784ab686d460a59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 1 21:38:00 2015 +1100 winex11.drv: Ctrl-Space should generate space, not 0. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3d68d66..47a9872 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2566,6 +2566,14 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); } + /* Ctrl-Space generates space on Windows */ + if (e.state == ControlMask && virtKey == VK_SPACE) + { + bufW[0] = ' '; + ret = 1; + goto found; + } + if (!e.keycode && virtKey != VK_NONAME) { WARN_(key)("Unknown virtual key %X !!!\n", virtKey);

1 0

Henri Verbeet : ddraw/tests: 64-bit ddraw doesn't support textures.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 2dca999e3393cb039d2aabebf7c83328925ab30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dca999e3393cb039d2aabebf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:25:43 2015 +0100 ddraw/tests: 64-bit ddraw doesn't support textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 345550d..8ab0972 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -24,6 +24,7 @@ #include "d3d.h" static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *guid, void **ddraw, REFIID iid, IUnknown *outer_unknown); +static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; struct vec2 @@ -4669,7 +4670,10 @@ static void test_texturemanage(void) ddsd.dwHeight = 4; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (tests[i].hr == DD_OK && is_ddraw64 && (tests[i].caps_in & DDSCAPS_TEXTURE)) + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, tests[i].hr); if (FAILED(hr)) continue; @@ -6379,13 +6383,12 @@ static void test_set_surface_desc(void) } hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr); + if (is_ddraw64 && (invalid_caps_tests[i].caps & DDSCAPS_TEXTURE)) + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) - { - skip("Cannot create a %s surface, skipping vidmem SetSurfaceDesc test.\n", - invalid_caps_tests[i].name); - goto done; - } + continue; reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_LPSURFACE; @@ -6410,7 +6413,6 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); } -done: ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); DestroyWindow(window); @@ -7058,7 +7060,8 @@ static void test_private_data(void) hal_caps.dwSize = sizeof(hal_caps); hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP) + && !is_ddraw64) { reset_ddsd(&surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT; @@ -7378,7 +7381,8 @@ static void test_mipmap_lock(void) hal_caps.dwSize = sizeof(hal_caps); hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP) + || is_ddraw64) { skip("Mipmapped textures not supported, skipping mipmap lock test.\n"); IDirectDraw7_Release(ddraw); @@ -7442,7 +7446,8 @@ static void test_palette_complex(void) hal_caps.dwSize = sizeof(hal_caps); hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP) + || is_ddraw64) { skip("Mipmapped textures not supported, skipping mipmap palette test.\n"); IDirectDraw7_Release(ddraw); @@ -8381,6 +8386,13 @@ static void test_resource_priority(void) surface_desc.ddsCaps.dwCaps = test_data[i].caps; surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + if (is_ddraw64 && (test_data[i].caps & DDSCAPS_TEXTURE)) + { + todo_wine ok(hr == E_NOINTERFACE, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(hr)) + IDirectDrawSurface7_Release(surface); + continue; + } ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, type %s.\n", hr, test_data[i].name); /* Priority == NULL segfaults. */ @@ -8411,6 +8423,9 @@ static void test_resource_priority(void) IDirectDrawSurface7_Release(surface); } + if (is_ddraw64) + goto done; + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT;

1 0

Stefan Dösinger : ddraw/tests: Test color keys on cube map surfaces.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 7e01f865ab092b4293800e7de7e2b57040f2db0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e01f865ab092b4293800e7de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 30 21:06:29 2015 +0100 ddraw/tests: Test color keys on cube map surfaces. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 24e7fc8..345550d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1613,6 +1613,7 @@ static void test_ck_default(void) static void test_ck_complex(void) { IDirectDrawSurface7 *surface, *mipmap, *tmp; + D3DDEVICEDESC7 device_desc; DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, {0}}; DDSURFACEDESC2 surface_desc; IDirect3DDevice7 *device; @@ -1632,6 +1633,8 @@ static void test_ck_complex(void) DestroyWindow(window); return; } + hr = IDirect3DDevice7_GetCaps(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); hr = IDirect3DDevice7_GetDirect3D(device, &d3d); ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); @@ -1728,6 +1731,72 @@ static void test_ck_complex(void) refcount = IDirectDrawSurface7_Release(surface); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + if (!(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Device does not support cubemaps.\n"); + goto cleanup; + } + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetColorKey(surface, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + color_key.dwColorSpaceLowValue = 0x0000ff00; + color_key.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface7_SetColorKey(surface, DDCKEY_SRCBLT, &color_key); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); + ok(SUCCEEDED(hr), "Failed to get attached surface, i %u, hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + color_key.dwColorSpaceLowValue = 0x000000ff; + color_key.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface7_SetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); + todo_wine ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + + color_key.dwColorSpaceLowValue = 0; + color_key.dwColorSpaceHighValue = 0; + hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); + todo_wine ok(SUCCEEDED(hr), "Failed to get color key, hr %#x.\n", hr); + todo_wine ok(color_key.dwColorSpaceLowValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + color_key.dwColorSpaceLowValue); + todo_wine ok(color_key.dwColorSpaceHighValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + color_key.dwColorSpaceHighValue); + + IDirectDrawSurface_AddRef(mipmap); + for (i = 0; i < 7; ++i) + { + hr = IDirectDrawSurface7_GetAttachedSurface(mipmap, &caps, &tmp); + ok(SUCCEEDED(hr), "Failed to get attached surface, i %u, hr %#x.\n", i, hr); + hr = IDirectDrawSurface7_GetColorKey(tmp, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x, i %u.\n", hr, i); + + color_key.dwColorSpaceLowValue = 0x000000ff; + color_key.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface7_SetColorKey(tmp, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x, i %u.\n", hr, i); + + IDirectDrawSurface_Release(mipmap); + mipmap = tmp; + } + + IDirectDrawSurface7_Release(mipmap); + + refcount = IDirectDrawSurface7_Release(surface); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + +cleanup: IDirectDraw7_Release(ddraw); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Alexandre Julliard : kernel32: Also check OS version to detect old binaries in GlobalMemoryStatus.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 5468e37508661ab0740f0066f9e1d4eaaca78cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5468e37508661ab0740f0066f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 21:02:19 2015 +0900 kernel32: Also check OS version to detect old binaries in GlobalMemoryStatus. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 0c05de6..eeed785 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1436,7 +1436,8 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPageFile = 2U*1024*1024*1024 - lpBuffer->dwAvailPhys - 1; /* limit page file size for really old binaries */ - if (nt->OptionalHeader.MajorSubsystemVersion < 4) + if (nt->OptionalHeader.MajorSubsystemVersion < 4 || + nt->OptionalHeader.MajorOperatingSystemVersion < 4) { if (lpBuffer->dwTotalPageFile > MAXLONG) lpBuffer->dwTotalPageFile = MAXLONG; if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG;

1 0

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 December 2015