February 2016 - Wine-Commits

Francois Gouget : schedsvc/tests: Recognize Windows 10's RPC version.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: d03c5b483c2465bcc4bfbe451b0cecfce40152b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03c5b483c2465bcc4bfbe451… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 18 03:14:22 2016 +0100 schedsvc/tests: Recognize Windows 10's RPC version. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 0220641..7aeea17 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -114,7 +114,8 @@ START_TEST(rpcapi) version = 0; hr = SchRpcHighestVersion(&version); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || version == 0x10004 /* win8 */, + ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || + version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */, "wrong version %#x\n", version); SetUnhandledExceptionFilter(old_exception_filter);

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_check_block_align().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 58719f60d5dca15f0f0de625bc307e04b01fc6d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58719f60d5dca15f0f0de625b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 17 18:35:35 2016 +0100 wined3d: Introduce wined3d_texture_check_block_align(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 31 ++----------------------------- dlls/wined3d/texture.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 31 ++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 35 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c1d7b18..7858d15 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1538,38 +1538,11 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } } -static BOOL surface_check_block_align(struct wined3d_surface *surface, const struct wined3d_box *box) -{ - UINT width_mask, height_mask; - - if (!box->left && !box->top - && box->right == surface->resource.width - && box->bottom == surface->resource.height) - return TRUE; - - if ((box->left >= box->right) - || (box->top >= box->bottom) - || (box->right > surface->resource.width) - || (box->bottom > surface->resource.height)) - return FALSE; - - /* This assumes power of two block sizes, but NPOT block sizes would be - * silly anyway. */ - width_mask = surface->resource.format->block_width - 1; - height_mask = surface->resource.format->block_height - 1; - - if (!(box->left & width_mask) && !(box->top & height_mask) - && !(box->right & width_mask) && !(box->bottom & height_mask)) - return TRUE; - - return FALSE; -} - static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, const RECT *rect) { struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - return surface_check_block_align(surface, &box); + return wined3d_texture_check_block_align(surface->container, surface->texture_level, &box); } HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, @@ -2301,7 +2274,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box - && !surface_check_block_align(surface, box)) + && !wined3d_texture_check_block_align(surface->container, surface->texture_level, box)) { WARN("Map box %s is misaligned for %ux%u blocks.\n", debug_box(box), format->block_width, format->block_height); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7a24ff0..804856b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1201,6 +1201,35 @@ static const struct wined3d_texture_ops texture3d_ops = texture3d_prepare_texture, }; +BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, + unsigned int level, const struct wined3d_box *box) +{ + const struct wined3d_format *format = texture->resource.format; + unsigned int height = max(1, texture->resource.height >> level); + unsigned int width = max(1, texture->resource.width >> level); + unsigned int width_mask, height_mask; + + if ((box->left >= box->right) + || (box->top >= box->bottom) + || (box->right > width) + || (box->bottom > height)) + return FALSE; + + /* This assumes power of two block sizes, but NPOT block sizes would be + * silly anyway. + * + * This also assumes that the format's block depth is 1. */ + width_mask = format->block_width - 1; + height_mask = format->block_height - 1; + + if ((box->left & width_mask) || (box->top & height_mask) + || (box->right & width_mask && box->right != width) + || (box->bottom & height_mask && box->bottom != height)) + return FALSE; + + return TRUE; +} + static HRESULT texture3d_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 75585d8..6f5de73 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -433,34 +433,6 @@ static void volume_unload(struct wined3d_resource *resource) resource_unload(resource); } -static BOOL volume_check_block_align(const struct wined3d_volume *volume, - const struct wined3d_box *box) -{ - UINT width_mask, height_mask; - const struct wined3d_format *format = volume->resource.format; - - if (!box) - return TRUE; - - /* This assumes power of two block sizes, but NPOT block sizes would be - * silly anyway. - * - * This also assumes that the format's block depth is 1. */ - width_mask = format->block_width - 1; - height_mask = format->block_height - 1; - - if (box->left & width_mask) - return FALSE; - if (box->top & height_mask) - return FALSE; - if (box->right & width_mask && box->right != volume->resource.width) - return FALSE; - if (box->bottom & height_mask && box->bottom != volume->resource.height) - return FALSE; - - return TRUE; -} - static BOOL wined3d_volume_check_box_dimensions(const struct wined3d_volume *volume, const struct wined3d_box *box) { @@ -512,7 +484,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, WARN("Map box is invalid.\n"); return WINED3DERR_INVALIDCALL; } - if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !volume_check_block_align(volume, box)) + if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box + && !wined3d_texture_check_block_align(volume->container, volume->texture_level, box)) { WARN("Map box %s is misaligned for %ux%u blocks.\n", debug_box(box), format->block_width, format->block_height); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a243727..a20bc65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2405,6 +2405,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, + unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_swapchain_GetBackBuffer().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 1e6951cbfc029ce01068ed20bfda3955dcb65ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6951cbfc029ce01068ed20b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:31 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_swapchain_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 8efdd0a..70abae9 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -112,7 +112,6 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; HRESULT hr = D3D_OK; @@ -131,8 +130,7 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, wined3d_mutex_lock(); if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*backbuffer); }

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: bdc31c99c48a7cef587895488a2e855338b53f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc31c99c48a7cef587895488… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:30 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5bc39a6..13de8ec 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3042,7 +3042,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - d3d_surface = wined3d_resource_get_parent(wined3d_texture_get_sub_resource(*texture, 0)); + d3d_surface = wined3d_texture_get_sub_resource_parent(*texture, 0); d3d_surface->parent_device = &device->IDirect3DDevice8_iface; return hr;

1 0

Charles Davis : mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: fdeaf812e2d0d5bd26146325272892f1b3d8d1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeaf812e2d0d5bd261463252… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 18:14:19 2016 -0700 mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 238 +++++++++++++++++++++++++++++++++++++---- dlls/mscoree/metahost.c | 4 + dlls/mscoree/mscoree_private.h | 2 + dlls/mscoree/tests/mscoree.c | 98 ++++++++++++++++- 4 files changed, 317 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdeaf812e2d0d5bd26146…

1 0

Ken Thomases : winemac: Wrap performing requests from background threads in an autorelease pool.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: e5c120893dc164a0ce387ea10228b1a2f8094eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c120893dc164a0ce387ea10… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 17 13:42:54 2016 -0600 winemac: Wrap performing requests from background threads in an autorelease pool. Cocoa manages an autorelease pool on the main thread, but it only drains it when it processes an event. Our requests come through a run loop source, which doesn't count as an event. So, autoreleased objects can accumulate when the app is not being interacted with. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fb9edc2..176d35c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2295,6 +2295,7 @@ static void PerformRequest(void *info) for (;;) { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; __block dispatch_block_t block; dispatch_sync(controller->requestsManipQueue, ^{ @@ -2308,10 +2309,14 @@ static void PerformRequest(void *info) }); if (!block) + { + [pool release]; break; + } block(); [block release]; + [pool release]; } }

1 0

Frédéric Delanoy : ieframe/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 0d6ed1b6679d32849b8cbb7e219ea7d63bf2cfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6ed1b6679d32849b8cbb7e2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 21:13:30 2016 +0100 ieframe/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/intshcut.c | 5 +---- dlls/ieframe/tests/webbrowser.c | 9 ++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 2a5f2df..0959a61 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -147,10 +147,7 @@ static void _check_string_transform(unsigned line, IUniformResourceLocatorA *url output = (void*)0xdeadbeef; hr = urlA->lpVtbl->GetURL(urlA, &output); if(expectedOutput) { - if(is_todo) { - todo_wine - ok_(__FILE__,line)(hr == S_OK, "GetUrl failed, hr=0x%x\n", hr); - }else { + todo_wine_if(is_todo) { ok_(__FILE__,line)(hr == S_OK, "GetUrl failed, hr=0x%x\n", hr); } todo_wine diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3201499..032faef 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2806,10 +2806,7 @@ static void test_QueryStatusWB(IWebBrowser2 *webbrowser, BOOL has_document) if (use_container_olecmd) SET_EXPECT(QueryStatus_STOP); hres = IWebBrowser2_QueryStatusWB(webbrowser, OLECMDID_STOP, &status); ok(hres == success_state, "QueryStatusWB failed: %08x %08x\n", hres, success_state); - if (!use_container_olecmd && has_document) - todo_wine ok((has_document && status == success_flags) || (!has_document && status == 0xdeadbeef), - "OLECMDID_STOP not enabled/supported: %08x %08x\n", status, success_flags); - else + todo_wine_if (!use_container_olecmd && has_document) ok((has_document && status == success_flags) || (!has_document && status == 0xdeadbeef), "OLECMDID_STOP not enabled/supported: %08x %08x\n", status, success_flags); status = 0xdeadbeef; @@ -3312,9 +3309,7 @@ static void test_UIActivate(IWebBrowser2 *unk, BOOL activate) } hres = IOleDocumentView_UIActivate(docview, activate); - if(activate) - todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); - else + todo_wine_if(activate) ok(hres == S_OK, "Got 0x%08x\n", hres); if(activate) {

1 0

Francois Gouget : shell32/tests: Only look for Explorer windows for the progman tests.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: bd111803d289eb6e6b82473a3d8641563237ea5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd111803d289eb6e6b82473a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 18 03:18:13 2016 +0100 shell32/tests: Only look for Explorer windows for the progman tests. In the Spanish locale the 'Startup' folder is called 'Inicio' which matches another window. Closing that window causes the shutdown dialog to pop up, resulting in a test timeout. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index a3faa83..4c9116e 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -372,7 +372,13 @@ static HWND CheckWindowCreated(const char *winName, BOOL closeWindow, int testPa for (i = 0; window == NULL && i < PDDE_POLL_NUM; i++) { Sleep(PDDE_POLL_TIME); - window = FindWindowA(NULL, winName); + /* Specify the window class name to make sure what we find is really an + * Explorer window. Explorer used two different window classes so try + * both. + */ + window = FindWindowA("ExplorerWClass", winName); + if (!window) + window = FindWindowA("CabinetWClass", winName); } ok (window != NULL, "Window \"%s\" was not created in %i seconds - assumed failure.%s\n", winName, PDDE_POLL_NUM*PDDE_POLL_TIME/1000, GetStringFromTestParams(testParams));

1 0

Francois Gouget : msvcrt/tests: Fix the Norwegian locale tests on Windows 10.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 981c16e4e60fd03673ae0ed933b5f7aa7df3bf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981c16e4e60fd03673ae0ed93… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 18 03:15:20 2016 +0100 msvcrt/tests: Fix the Norwegian locale tests on Windows 10. Also add comments to indicate which Windows version returns what. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f4d86bc..89761dd 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -148,11 +148,11 @@ todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) { + trace("Chinese_China.936=%s\n", ret); todo_wine - ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") - || !strcmp(ret, "Chinese (Simplified)_China.936") + ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") /* Vista - Win7 */ + || !strcmp(ret, "Chinese (Simplified)_China.936") /* Win8 - Win10 */ || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); - trace("ret is %s\n", ret); } ret = setlocale(LC_ALL, "csy"); @@ -450,33 +450,39 @@ todo_wine ret = setlocale(LC_ALL, "non"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp( ret, "Norwegian-Nynorsk_Norway.1252") + ok(!strcmp( ret, "Norwegian-Nynorsk_Norway.1252") /* XP - Win10 */ || !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252") || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")) - || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Norwegian_Norway.1252")), /* WinME */ + "ret = %s\n", ret); ret = setlocale(LC_ALL, "nor"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252") + ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252") /* XP - Win8 */ + || !strcmp(ret, "Norwegian Bokm\xe5l_Norway.1252") /* Win10 */ || !strcmp(ret, "Norwegian (Bokmal)_Norway.1252") - || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Norwegian_Norway.1252")), /* WinME */ + "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252") + ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252") /* XP - Win8 */ + || !strcmp(ret, "Norwegian Bokm\xe5l_Norway.1252") /* Win10 */ || !strcmp(ret, "Norwegian (Bokmal)_Norway.1252") - || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Norwegian_Norway.1252")), /* WinME */ + "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-nynorsk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") + ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") /* Vista - Win10 */ || !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252") - || broken(!strcmp(ret, "Norwegian_Norway.1252")) + || broken(!strcmp(ret, "Norwegian_Norway.1252")) /* WinME */ || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) - || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")) /* XP & 2003 */, + "ret = %s\n", ret); ret = setlocale(LC_ALL, "plk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_GetSurfaceLevel().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: b162e29c07f492f80c6ea8d07a8666ff00545173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b162e29c07f492f80c6ea8d07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:34 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_GetSurfaceLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c4b986d..1636536 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -274,19 +274,17 @@ static HRESULT WINAPI d3d8_texture_2d_GetSurfaceLevel(IDirect3DTexture8 *iface, UINT level, IDirect3DSurface8 **surface) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); wined3d_mutex_unlock();

1 0