April 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8/tests: Make the sanity test a normal test.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: ef5e4c794da5616b79173c9c54da14a19bc2e362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5e4c794da5616b79173c9c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:21 2014 +0200 d3d8/tests: Make the sanity test a normal test. --- dlls/d3d8/tests/visual.c | 137 +++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 76 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4b743a8..a421579 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -38,20 +38,6 @@ struct vec4 float x, y, z, w; }; -static HWND create_window(void) -{ - WNDCLASSA wc = {0}; - HWND ret; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d8_test_wc"; - RegisterClassA(&wc); - - ret = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_POPUP | WS_SYSMENU, - 20, 20, 640, 480, 0, 0, 0, 0); - ShowWindow(ret, SW_SHOW); - return ret; -} - static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; @@ -126,22 +112,13 @@ out: return ret; } -static IDirect3DDevice8 *init_d3d8(void) +static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { - D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice8 *device = NULL; - IDirect3D8 *d3d8; - HRESULT hr; + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice8 *device; - if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION))) - { - skip("could not create D3D8\n"); - return NULL; - } - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); + present_parameters.Windowed = windowed; + present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -149,12 +126,11 @@ static IDirect3DDevice8 *init_d3d8(void) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), - "IDirect3D_CreateDevice returned: %#08x\n", hr); + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + return device; - return device; + return NULL; } struct vertex @@ -176,6 +152,28 @@ struct nvertex DWORD diffuse; }; +static void test_sanity(IDirect3DDevice8 *device) +{ + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 639, 479); + ok(color == 0x0000ddee, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); +} + static void lighting_test(IDirect3DDevice8 *device) { HRESULT hr; @@ -4651,51 +4649,43 @@ static void add_dirty_rect_test(IDirect3DDevice8 *device) START_TEST(visual) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device_ptr; - HRESULT hr; - DWORD color; + IDirect3D8 *d3d; + ULONG refcount; D3DCAPS8 caps; + HWND window; + HRESULT hr; - if (!(device_ptr = init_d3d8())) + if (!(d3d = Direct3DCreate8(D3D_SDK_VERSION))) { - win_skip("Could not initialize direct3d\n"); + skip("Failed to create D3D8 object.\n"); return; } - IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); - - /* Check for the reliability of the returned data */ - hr = IDirect3DDevice8_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - if(FAILED(hr)) - { - skip("Clear failed, can't assure correctness of the test results\n"); - goto cleanup; - } - - color = getPixelColor(device_ptr, 1, 1); - if(color !=0x00ff0000) - { - skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests\n", color); + memset(&identifier, 0, sizeof(identifier)); + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + trace("Driver string: \"%s\"\n", identifier.Driver); + trace("Description string: \"%s\"\n", identifier.Description); + /* Only Windows XP's default VGA driver should have an empty description */ + ok(identifier.Description[0] || broken(!strcmp(identifier.Driver, "vga.dll")), "Empty driver description.\n"); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), + HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if (!(device_ptr = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); goto cleanup; } - IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 0.0, 0); - if(FAILED(hr)) - { - skip("Clear failed, can't assure correctness of the test results\n"); - goto cleanup; - } - - color = getPixelColor(device_ptr, 639, 479); - if(color != 0x0000ddee) - { - skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests\n", color); - goto cleanup; - } - IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); + hr = IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - /* Now run the real test */ + test_sanity(device_ptr); depth_clamp_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr); @@ -4733,14 +4723,9 @@ START_TEST(visual) volume_v16u16_test(device_ptr); add_dirty_rect_test(device_ptr); + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left.\n", refcount); cleanup: - if(device_ptr) { - D3DDEVICE_CREATION_PARAMETERS creation_parameters; - ULONG refcount; - - IDirect3DDevice8_GetCreationParameters(device_ptr, &creation_parameters); - DestroyWindow(creation_parameters.hFocusWindow); - refcount = IDirect3DDevice8_Release(device_ptr); - ok(!refcount, "Device has %u references left\n", refcount); - } + IDirect3D8_Release(d3d); + DestroyWindow(window); }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for volume_v16u16_test() .
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 554871ea81116e0142e6a2c765abed918b4dcfc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=554871ea81116e0142e6a2c76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:23 2014 +0200 d3d8/tests: Use a separate device for volume_v16u16_test(). --- dlls/d3d8/tests/visual.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c395355..ce4de4a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4142,17 +4142,21 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) IDirect3DVolumeTexture8_Release(texture); } -static void volume_v16u16_test(IDirect3DDevice8 *device) +static void volume_v16u16_test(void) { - HRESULT hr; - IDirect3D8 *d3d8; IDirect3DVolumeTexture8 *texture; - DWORD shader; + IDirect3DDevice8 *device; D3DLOCKED_BOX box; + IDirect3D8 *d3d; unsigned int i; - DWORD color; - SHORT *texel; + D3DCOLOR color; + ULONG refcount; D3DCAPS8 caps; + DWORD shader; + SHORT *texel; + HWND window; + HRESULT hr; + static const struct { struct vec3 position; @@ -4161,13 +4165,13 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD shader_code[] = @@ -4180,22 +4184,30 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) 0x0000ffff /* end */ }; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); - IDirect3D8_Release(d3d8); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 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"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16))) { skip("Volume V16U16 textures are not supported, skipping test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) { skip("No pixel shader 1.1 support, skipping test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); @@ -4258,7 +4270,7 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -4288,12 +4300,13 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) IDirect3DVolumeTexture8_Release(texture); } - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, shader); ok(SUCCEEDED(hr), "Failed delete pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void fill_surface(IDirect3DSurface8 *surface, DWORD color, DWORD flags) @@ -4736,7 +4749,6 @@ START_TEST(visual) resz_test(device_ptr); fog_special_test(device_ptr); volume_dxt5_test(device_ptr); - volume_v16u16_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4744,5 +4756,6 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + volume_v16u16_test(); add_dirty_rect_test(); }

1 0

Nikolay Sivov : wininet: Remove some dead code (Coverity).
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: d87724e626e48ff2b380d270325cd9e3e3e01321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87724e626e48ff2b380d2703… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 09:07:40 2014 +0400 wininet: Remove some dead code (Coverity). --- dlls/wininet/http.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 934af3a..07b4787 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3289,7 +3289,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; - DWORD len, res = ERROR_SUCCESS; + DWORD len; TRACE("-->\n"); @@ -3378,13 +3378,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, INTERNET_STATUS_HANDLE_CREATED, &request->hdr.hInternet, sizeof(HINTERNET)); - TRACE("<-- %u (%p)\n", res, request); - - if(res != ERROR_SUCCESS) { - WININET_Release( &request->hdr ); - *ret = NULL; - return res; - } + TRACE("<-- (%p)\n", request); *ret = request->hdr.hInternet; return ERROR_SUCCESS;

1 0

Dmitry Timoshkov : kernel32: Handle memory allocation failure in ReadConsoleA.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 2451d263de91bbde461a64d8627c7159bb4dc3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2451d263de91bbde461a64d86… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 15 11:20:21 2014 +0900 kernel32: Handle memory allocation failure in ReadConsoleA. --- dlls/kernel32/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 67c353b..9d47bf4 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1607,6 +1607,12 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfC DWORD ncr = 0; BOOL ret; + if (!ptr) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL);

1 0

Bruno Jesus : ws2_32: Use the correct address family in gethostbyaddr.
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: c33e7308ad8a6ff29c103fb31289931ba59cf75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33e7308ad8a6ff29c103fb31… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 15 00:43:53 2014 -0300 ws2_32: Use the correct address family in gethostbyaddr. --- dlls/ws2_32/socket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe85356..54e7e2f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5084,6 +5084,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) { struct WS_hostent *retval = NULL; struct hostent* host; + int unixtype = convert_af_w2u(type); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; @@ -5093,7 +5094,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) host = NULL; extrabuf=HeapAlloc(GetProcessHeap(),0,ebufsize) ; while(extrabuf) { - int res = gethostbyaddr_r(addr, len, type, + int res = gethostbyaddr_r(addr, len, unixtype, &hostentry, extrabuf, ebufsize, &host, &locerr); if( res != ERANGE) break; ebufsize *=2; @@ -5102,7 +5103,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) if (!host) SetLastError((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); #else EnterCriticalSection( &csWSgetXXXbyYYY ); - host = gethostbyaddr(addr, len, type); + host = gethostbyaddr(addr, len, unixtype); if (!host) SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); #endif if( host != NULL ) retval = WS_dup_he(host); @@ -6408,7 +6409,7 @@ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) p_to = WS_create_he(p_he->h_name, i + 1, alias_size, addresses + 1, p_he->h_length); if (!p_to) return NULL; - p_to->h_addrtype = p_he->h_addrtype; + p_to->h_addrtype = convert_af_u2w(p_he->h_addrtype); p_to->h_length = p_he->h_length; for(i = 0, p = p_to->h_addr_list[0]; p_he->h_addr_list[i]; i++, p += p_to->h_length)

1 0

Nikolay Sivov : shell32: Use a proper deallocator (Coverity).
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 3cadbbb4b0016ea7d00b0f44337c5ea8ecd1043b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cadbbb4b0016ea7d00b0f443… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 01:53:05 2014 +0400 shell32: Use a proper deallocator (Coverity). --- dlls/shell32/trash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index a5d53a1..043ae5b 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -562,7 +562,7 @@ static HDPA enum_bucket_trashinfos(const TRASH_BUCKET *bucket, int *count) goto failed; if (DPA_InsertPtr(ret, DPA_APPEND, filename) == -1) { - SHFree(filename); + LocalFree(filename); goto failed; } (*count)++;

1 0

Nikolay Sivov : kernel32/tests: Added missing comma (Coverity).
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 00ff2ed81e13d289641b1ba2c2ac7d2067877287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ff2ed81e13d289641b1ba2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 02:00:05 2014 +0400 kernel32/tests: Added missing comma (Coverity). --- dlls/kernel32/tests/toolhelp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index af67688..ed76c9c 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -204,17 +204,19 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) static const char* curr_expected_modules[] = { - "kernel32_test.exe" + "kernel32_test.exe", "kernel32.dll", - "ntdll.dll", + "ntdll.dll" }; + static const char* sub_expected_modules[] = { "kernel32_test.exe", "kernel32.dll", "shell32.dll", - "ntdll.dll", + "ntdll.dll" }; + #define NUM_OF(x) (sizeof(x) / sizeof(x[0])) static void test_module(DWORD pid, const char* expected[], unsigned num_expected)

1 0

Nikolay Sivov : shlwapi: Use a proper deallocator (Coverity).
by Alexandre Julliard April 15, 2014

April 15, 2014

Module: wine Branch: master Commit: 0cb52a9cfa25a5ed2ee989e55bda58b442fefcc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb52a9cfa25a5ed2ee989e55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 01:52:49 2014 +0400 shlwapi: Use a proper deallocator (Coverity). --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 1a4ad14..b4b5b8a 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2821,7 +2821,7 @@ HRESULT WINAPI SHLoadIndirectString(LPCWSTR src, LPWSTR dst, UINT dst_len, void TRACE("returning %s\n", debugstr_w(dst)); end: if(hmod) FreeLibrary(hmod); - HeapFree(GetProcessHeap(), 0, dllname); + LocalFree(dllname); return hr; }

1 0

Nikolay Sivov : winhttp: Use proper deallocator (Coverity).
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: wine Branch: master Commit: 2c880e52714bed424cbf44fd9d2e14776bfce9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c880e52714bed424cbf44fd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 19:10:23 2014 +0400 winhttp: Use proper deallocator (Coverity). --- dlls/winhttp/session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 97e763e..ebbec2e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1612,11 +1612,11 @@ done: heap_free( hdr ); if (!ret) { - heap_free( config->lpszAutoConfigUrl ); + GlobalFree( config->lpszAutoConfigUrl ); config->lpszAutoConfigUrl = NULL; - heap_free( config->lpszProxy ); + GlobalFree( config->lpszProxy ); config->lpszProxy = NULL; - heap_free( config->lpszProxyBypass ); + GlobalFree( config->lpszProxyBypass ); config->lpszProxyBypass = NULL; } return ret;

1 0

Dmitry Timoshkov : secur32: Also recognize samba4 failure message if ntlm_auth could not connect to winbindd.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: wine Branch: master Commit: 8df047987012ff290a789911692a23d9a248dc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df047987012ff290a7899116… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Apr 12 15:24:20 2014 +0900 secur32: Also recognize samba4 failure message if ntlm_auth could not connect to winbindd. --- dlls/secur32/ntlm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index fdd88c0..5914fbc 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1226,11 +1226,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( } else { - size_t ntlm_pipe_err_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + size_t ntlm_pipe_err_v3_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + size_t ntlm_pipe_err_v4_len = strlen("BH NT_STATUS_UNSUCCESSFUL"); - if( (buffer_len >= ntlm_pipe_err_len) && - (strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", - ntlm_pipe_err_len) == 0)) + if( (buffer_len >= ntlm_pipe_err_v3_len && + strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", ntlm_pipe_err_v3_len) == 0) || + (buffer_len >= ntlm_pipe_err_v4_len && + strncmp(buffer, "BH NT_STATUS_UNSUCCESSFUL", ntlm_pipe_err_v4_len) == 0) ) { TRACE("Connection to winbindd failed\n"); ret = SEC_E_LOGON_DENIED;

1 0