July 2014 - Wine-commits - list.winehq.org

Sebastian Lackner : shell32: Return NULL-terminated list of arguments in CommandLineToArgvW.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: d892239f5ab913b1418bff63652c09528bac936e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d892239f5ab913b1418bff636… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 22:43:01 2014 +0200 shell32: Return NULL-terminated list of arguments in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 15 +++++++++------ dlls/shell32/tests/shlexec.c | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 679ebec..3bf442e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -101,11 +101,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Return the path to the executable */ DWORD len, deslen=MAX_PATH, size; - size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + size = sizeof(LPWSTR)*2 + deslen*sizeof(WCHAR); for (;;) { if (!(argv = LocalAlloc(LMEM_FIXED, size))) return NULL; - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); + len = GetModuleFileNameW(0, (LPWSTR)(argv+2), deslen); if (!len) { LocalFree(argv); @@ -113,10 +113,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } if (len < deslen) break; deslen*=2; - size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + size = sizeof(LPWSTR)*2 + deslen*sizeof(WCHAR); LocalFree( argv ); } - argv[0]=(LPWSTR)(argv+1); + argv[0]=(LPWSTR)(argv+2); + argv[1]=NULL; *numargs=1; return argv; @@ -194,10 +195,10 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) * with it. This way the caller can make a single LocalFree() call to free * both, as per MSDN. */ - argv=LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); + argv=LocalAlloc(LMEM_FIXED, (argc+1)*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); + cmdline=(LPWSTR)(argv+argc+1); strcpyW(cmdline, lpCmdline); /* --- Then split and copy the arguments */ @@ -235,6 +236,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (!*s) { /* There are no parameters so we are all done */ + argv[argc]=NULL; *numargs=argc; return argv; } @@ -306,6 +308,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } } *d='\0'; + argv[argc]=NULL; *numargs=argc; return argv; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7f07c70..f81794e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1159,6 +1159,8 @@ static BOOL test_one_cmdline(const cmdline_tests_t* test) win_skip("CommandLineToArgvW not implemented, skipping\n"); return FALSE; } + ok(!argsW[cl2a_count] || broken(argsW[cl2a_count] != NULL) /* before Vista */, + "expected NULL-terminated list of commandline arguments\n"); count = 0; while (test->args[count]) @@ -1218,6 +1220,8 @@ static void test_commandline2argv(void) *strW = 0; args = CommandLineToArgvW(strW, &numargs); ok(numargs == 1, "expected 1 args, got %d\n", numargs); + ok(!args || (!args[numargs] || broken(args[numargs] != NULL) /* before Vista */), + "expected NULL-terminated list of commandline arguments\n"); if (numargs == 1) { GetModuleFileNameW(NULL, strW, sizeof(strW)/sizeof(*strW));

1 0

Huw Davies : comctl32: Propagate the return value of WM_ERASEBKGND.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 552ad2d93e9a457855d6281c97bba213c885e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=552ad2d93e9a457855d6281c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 08:46:57 2014 +0100 comctl32: Propagate the return value of WM_ERASEBKGND. --- dlls/comctl32/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 3b2c11c..74bca5e 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -985,16 +985,17 @@ PAGER_EraseBackground (const PAGER_INFO* infoPtr, HDC hdc) { POINT pt, ptorig; HWND parent; + LRESULT ret; pt.x = 0; pt.y = 0; parent = GetParent(infoPtr->hwndSelf); MapWindowPoints(infoPtr->hwndSelf, parent, &pt, 1); OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig); - SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); + ret = SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0); - return 0; + return ret; }

1 0

Stefan Dösinger : d3d9: Ignore SetPriority and GetPriority calls on surfaces.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: eb0daf08c69b8b3e0eeb74cb76e2521a53cf90dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0daf08c69b8b3e0eeb74cb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:42 2014 +0200 d3d9: Ignore SetPriority and GetPriority calls on surfaces. --- dlls/d3d9/surface.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index bf8b41a..ef5f648 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -169,30 +169,14 @@ static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REF static DWORD WINAPI d3d9_surface_SetPriority(IDirect3DSurface9 *iface, DWORD priority) { - struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - DWORD ret; - - TRACE("iface %p, priority %u.\n", iface, priority); - - wined3d_mutex_lock(); - ret = wined3d_surface_set_priority(surface->wined3d_surface, priority); - wined3d_mutex_unlock(); - - return ret; + TRACE("iface %p, priority %u. Ignored on surfaces.\n", iface, priority); + return 0; } static DWORD WINAPI d3d9_surface_GetPriority(IDirect3DSurface9 *iface) { - struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - DWORD ret; - - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - ret = wined3d_surface_get_priority(surface->wined3d_surface); - wined3d_mutex_unlock(); - - return ret; + TRACE("iface %p. Ignored on surfaces.\n", iface); + return 0; } static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface)

1 0

Stefan Dösinger : wined3d: Ignore set_priority calls on non-managed resources.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 4cecbaa54d71742c6705af4be7ea6b07485489b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cecbaa54d71742c6705af4be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:43 2014 +0200 wined3d: Ignore set_priority calls on non-managed resources. --- dlls/wined3d/resource.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3a54dd8..caec580 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -163,7 +163,15 @@ void resource_unload(struct wined3d_resource *resource) DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) { - DWORD prev = resource->priority; + DWORD prev; + + if (resource->pool != WINED3D_POOL_MANAGED) + { + WARN("Called on non-managed resource %p, ignoring.\n", resource); + return 0; + } + + prev = resource->priority; resource->priority = priority; TRACE("resource %p, new priority %u, returning old priority %u.\n", resource, priority, prev); return prev;

1 0

Stefan Dösinger : d3d9/tests: Add a test for SetPriority and GetPriority.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 509c49bdb5f9bf2b24d1ec5daa3245e73bf8256d URL: http://source.winehq.org/git/wine.git/?a=commit;h=509c49bdb5f9bf2b24d1ec5da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:44 2014 +0200 d3d9/tests: Add a test for SetPriority and GetPriority. --- dlls/d3d9/tests/device.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b11771f..14b68b3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8987,6 +8987,135 @@ done: DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *surface; + IDirect3DTexture9 *texture; + IDirect3DVertexBuffer9 *buffer; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct + { + D3DPOOL pool; + const char *name; + BOOL can_set_priority; + } + test_data[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM", FALSE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", FALSE} + }; + unsigned int i; + DWORD priority; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 0, 0, D3DFMT_X8R8G8B8, + test_data[i].pool, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x, pool %s.\n", hr, test_data[i].name); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + + priority = IDirect3DTexture9_GetPriority(texture); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture9_SetPriority(texture, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture9_GetPriority(texture); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture9_SetPriority(texture, 2); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_SetPriority(surface, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + + if (test_data[i].pool != D3DPOOL_MANAGED) + { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 16, 16, D3DFMT_X8R8G8B8, + test_data[i].pool, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_SetPriority(surface, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DSurface9_Release(surface); + } + + if (test_data[i].pool != D3DPOOL_SCRATCH) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, 256, 0, 0, + test_data[i].pool, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DVertexBuffer9_GetPriority(buffer); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer9_SetPriority(buffer, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer9_GetPriority(buffer); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer9_SetPriority(buffer, 0); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DVertexBuffer9_Release(buffer); + } + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 16, 16, D3DFMT_X8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &surface, NULL); + + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u.\n", priority); + priority = IDirect3DSurface9_SetPriority(surface, 1); + ok(priority == 0, "Got unexpected priority %u.\n", priority); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u.\n", priority); + + IDirect3DSurface9_Release(surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -9086,6 +9215,7 @@ START_TEST(device) test_mipmap_lock(); test_writeonly_resource(); test_lost_device(); + test_resource_priority(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d8/tests: Add a test for SetPriority and GetPriority.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 0b61e22fd3fd7a3ac3ad8530fbd01af940ef74ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b61e22fd3fd7a3ac3ad8530f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:45 2014 +0200 d3d8/tests: Add a test for SetPriority and GetPriority. --- dlls/d3d8/tests/device.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 971ef91..f6fa169 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6336,6 +6336,95 @@ done: DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirect3DDevice8 *device; + IDirect3DTexture8 *texture; + IDirect3DVertexBuffer8 *buffer; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct + { + D3DPOOL pool; + const char *name; + BOOL can_set_priority; + } + test_data[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM", FALSE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", FALSE} + }; + unsigned int i; + DWORD priority; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 0, 0, D3DFMT_X8R8G8B8, + test_data[i].pool, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DTexture8_GetPriority(texture); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture8_SetPriority(texture, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture8_GetPriority(texture); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture8_SetPriority(texture, 0); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DTexture8_Release(texture); + + if (test_data[i].pool != D3DPOOL_SCRATCH) + { + hr = IDirect3DDevice8_CreateVertexBuffer(device, 256, 0, 0, + test_data[i].pool, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DVertexBuffer8_GetPriority(buffer); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer8_SetPriority(buffer, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer8_GetPriority(buffer); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer8_SetPriority(buffer, 0); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DVertexBuffer8_Release(buffer); + } + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6422,6 +6511,7 @@ START_TEST(device) test_mipmap_lock(); test_writeonly_resource(); test_lost_device(); + test_resource_priority(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Fix some ok() call style issues.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 9329e996b4726187c3b3a5477ee58985e3c7b931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9329e996b4726187c3b3a5477… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:46 2014 +0200 d3d9/tests: Fix some ok() call style issues. --- dlls/d3d9/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 14b68b3..f3771d9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7279,7 +7279,7 @@ static void test_volume_locking(void) } else { - ok (locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); + ok(locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); } IDirect3DVolumeTexture9_Release(texture); } @@ -8885,13 +8885,13 @@ static void test_writeonly_resource(void) hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, 0); ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); - ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + ok(!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, D3DLOCK_READONLY); ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); - ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + ok(!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr);

1 0

Huw Davies : tools: Only allow the absolute difference in bracket pairs to be less than 128, since we need the sign.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 4ac5d66dfea809d87cc4cb1c50f082878174d110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac5d66dfea809d87cc4cb1c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 15:12:30 2014 +0100 tools: Only allow the absolute difference in bracket pairs to be less than 128, since we need the sign. --- tools/make_unicode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index be81ec7..c8365cd 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1345,7 +1345,7 @@ sub dump_bracket($) { my $type = $3; die "unknown bracket $type" unless defined $bracket_types{$type}; - die "characters too distant $1 and $2" if abs(hex($2) - hex($1)) >= 256; + die "characters too distant $1 and $2" if abs(hex($2) - hex($1)) >= 128; $bracket_table[hex $1] = (hex($2) - hex($1)) % 255; $bracket_table[hex $1] += $bracket_types{$type} << 8; next;

1 0

Aric Stewart : usp10: Implement N0: bracketing pairs.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 710e23797f76dd71d84655571f466aefad7647ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=710e23797f76dd71d84655571… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 9 08:57:21 2014 -0500 usp10: Implement N0: bracketing pairs. --- dlls/usp10/bidi.c | 281 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 216 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=710e23797f76dd71d8465…

1 0

Austin English : advapi32: Fix a memory leak in test_process_security.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 718f1bf1b9c63a5e42a9cf6217a76f130e2c5611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f1bf1b9c63a5e42a9cf621… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 9 11:41:34 2014 -0700 advapi32: Fix a memory leak in test_process_security. --- dlls/advapi32/tests/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b1dc3fe..b44496a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2665,6 +2665,7 @@ static void test_process_security(void) STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); + FreeSid(EveryoneSid); CloseHandle( info.hProcess ); CloseHandle( info.hThread ); CloseHandle( event );

1 0