October 2015 - Wine-commits

Aric Stewart : hidclass.sys: Implement IOCTL_GET(SET) _NUM_DEVICE_INPUT_BUFFERS.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: b95027f0481b164cec2fbc45cca2da4c3d1dcb14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95027f0481b164cec2fbc45c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 8 14:35:27 2015 -0500 hidclass.sys: Implement IOCTL_GET(SET)_NUM_DEVICE_INPUT_BUFFERS. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 35 +++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 28 ++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 2 ++ 3 files changed, 65 insertions(+) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index d7770f6..23636e0 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); #define BASE_BUFFER_SIZE 32 +#define MIN_BUFFER_SIZE 2 +#define MAX_BUFFER_SIZE 512 struct ReportRingBuffer { @@ -85,6 +87,39 @@ UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) return ring->buffer_size; } +UINT RingBuffer_GetSize(struct ReportRingBuffer *ring) +{ + return ring->size; +} + +NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) +{ + BYTE* new_buffer; + int i; + + if (size < MIN_BUFFER_SIZE || size > MAX_BUFFER_SIZE || size == ring->size) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection(&ring->lock); + ring->start = ring->end = 0; + for (i = 0; i < ring->pointer_alloc; i++) + { + if (ring->pointers[i] != 0xffffffff) + ring->pointers[i] = 0; + } + new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); + if (!new_buffer) + { + LeaveCriticalSection(&ring->lock); + return STATUS_NO_MEMORY; + } + HeapFree(GetProcessHeap(), 0, ring->buffer); + ring->buffer = new_buffer; + ring->size = size; + LeaveCriticalSection(&ring->lock); + return STATUS_SUCCESS; +} + void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) { void *ret = NULL; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index f2f5f06..e7e7e11 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -512,6 +512,34 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.u.Status = STATUS_SUCCESS; break; } + case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: + { + irp->IoStatus.Information = 0; + + if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG)) + { + irp->IoStatus.u.Status = rc = STATUS_BUFFER_OVERFLOW; + } + else + { + rc = RingBuffer_SetSize(extension->ring_buffer, *(ULONG*)irp->AssociatedIrp.SystemBuffer); + irp->IoStatus.u.Status = rc; + } + break; + } + case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: + { + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + irp->IoStatus.u.Status = rc = STATUS_BUFFER_TOO_SMALL; + } + else + { + *(ULONG*)irp->AssociatedIrp.SystemBuffer = RingBuffer_GetSize(extension->ring_buffer); + rc = irp->IoStatus.u.Status = STATUS_SUCCESS; + } + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 1fccc5b..0dcc3a6 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -61,8 +61,10 @@ UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; +UINT RingBuffer_GetSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; +NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *buffer, UINT size) DECLSPEC_HIDDEN; typedef struct _minidriver {

1 0

Huw Davies : setupapi/tests: Use RegQueryValueEx so that tests run on Win XP.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 45c987d962e18637b916057e783f864f51e90f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c987d962e18637b916057e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 12:45:14 2015 +0100 setupapi/tests: Use RegQueryValueEx so that tests run on Win XP. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 10161f0..d12d683 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -732,7 +732,8 @@ static void check_dirid(int dirid, LPCSTR expected) char buffer[sizeof(dirid_inf)+11]; char path[MAX_PATH], actual[MAX_PATH]; LONG ret; - DWORD size; + DWORD size, type; + HKEY key; sprintf(buffer, dirid_inf, dirid); @@ -742,8 +743,16 @@ static void check_dirid(int dirid, LPCSTR expected) run_cmdline("DefaultInstall", 128, path); size = sizeof(actual); - ret = RegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", "dirid", - RRF_RT_REG_SZ|RRF_ZEROONFAILURE, NULL, &actual, &size); + actual[0] = '\0'; + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); + if (ret == ERROR_SUCCESS) + { + ret = RegQueryValueExA(key, "dirid", NULL, &type, (BYTE*)&actual, &size); + RegCloseKey(key); + if (type != REG_SZ) + ret = ERROR_FILE_NOT_FOUND; + } + ok(ret == ERROR_SUCCESS, "Failed getting value for dirid %i, err=%d\n", dirid, ret); ok(!strcmp(actual, expected), "Expected path for dirid %i was \"%s\", got \"%s\"\n", dirid, expected, actual);

1 0

Nikolay Sivov : comctl32/tests: Fix function prototype (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 490b4eec4bc2f169633e3e660e924e2276751e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=490b4eec4bc2f169633e3e660… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:15:32 2015 +0300 comctl32/tests: Fix function prototype (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 6f13846..7e8108a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1254,7 +1254,7 @@ static void test_imagelist_storage(void) static void test_shell_imagelist(void) { - BOOL (WINAPI *pSHGetImageList)(INT, REFIID, void**); + HRESULT (WINAPI *pSHGetImageList)(INT, REFIID, void**); IImageList *iml = NULL; HMODULE hShell32; HRESULT hr; @@ -1274,8 +1274,7 @@ static void test_shell_imagelist(void) } /* Get system image list */ - hr = (pSHGetImageList)(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); - + hr = pSHGetImageList(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); if (hr != S_OK) {

1 0

Nikolay Sivov : ddraw/tests: Use proper type for return values (PVS-Studio ).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 8cd2d5df202ec290f0ffbad2efbbc3e0ed71b0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd2d5df202ec290f0ffbad2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:40:29 2015 +0300 ddraw/tests: Use proper type for return values (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index a325f86..13e2732 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -567,13 +567,13 @@ static void setdisplaymode(int i) scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); if (!EqualRect(&scrn, &orig_rect)) { - HRESULT rect_result; + BOOL rect_result, ret; /* Check that the client rect was resized */ - rc = GetClientRect(hwnd, &test); - ok(rc!=0, "GetClientRect returned %x\n", rc); - rc = EqualRect(&scrn, &test); - todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); + ret = GetClientRect(hwnd, &test); + ok(ret, "GetClientRect returned %d\n", ret); + ret = EqualRect(&scrn, &test); + todo_wine ok(ret, "Fullscreen window has wrong size\n"); /* Check that switching to normal cooperative level does not restore the display mode */

1 0

Nikolay Sivov : d3d8/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 6410e8a7712315bea07fcbf9325b93f6fb268d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6410e8a7712315bea07fcbf93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:32:11 2015 +0300 d3d8/tests: Use BOOL variable for ShowCursor return value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ccc16c6..827f144 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -834,12 +834,12 @@ static void test_cursor(void) ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr); /* Initially hidden */ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Not enabled without a surface*/ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Fails */ hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, NULL); @@ -857,12 +857,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Enabled now*/ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info);

1 0

Nikolay Sivov : d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 6c2bda6e339fde134c2ee3e191f4e38b560f50de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2bda6e339fde134c2ee3e19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:32:11 2015 +0300 d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3bf0ff2..326e789 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1638,12 +1638,12 @@ static void test_cursor(void) ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr); /* Initially hidden */ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Not enabled without a surface*/ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Fails */ hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, NULL); @@ -1661,12 +1661,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Enabled now*/ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info);

1 0

Nikolay Sivov : wmiutils: Don't return HRESULT codes for BOOL retval ( PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: afd1e40e824a3f2d49531b4fcf47375e943b7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1e40e824a3f2d49531b4fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:44:46 2015 +0300 wmiutils: Don't return HRESULT codes for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7977416..61386d9 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -1211,7 +1211,7 @@ static BOOL WINAPI path_IsRelative( LPWSTR wszNamespace) { FIXME("%p, %s, %s\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsRelativeOrChild( @@ -1221,7 +1221,7 @@ static BOOL WINAPI path_IsRelativeOrChild( LONG lFlags) { FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsLocal( @@ -1229,7 +1229,7 @@ static BOOL WINAPI path_IsLocal( LPCWSTR wszMachine) { FIXME("%p, %s\n", iface, debugstr_w(wszMachine)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsSameClassName( @@ -1237,7 +1237,7 @@ static BOOL WINAPI path_IsSameClassName( LPCWSTR wszClass) { FIXME("%p, %s\n", iface, debugstr_w(wszClass)); - return E_NOTIMPL; + return FALSE; } static const struct IWbemPathVtbl path_vtbl =

1 0

Michael Stefaniuc : msacm32/tests: Remove always true condition ( PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: baf0af67ae60cadb5a47f1cd3376514d2d2c32e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf0af67ae60cadb5a47f1cd3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 23:58:37 2015 +0200 msacm32/tests: Remove always true condition (PVS-Studio). dd.szShortName is an array of CHAR and not an arbitrary pointer. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 0defb33..4c9dca0 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -145,7 +145,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); for (iter = expected_ids; iter->shortname; ++iter) { - if (dd.szShortName && !strcmp(iter->shortname, dd.szShortName)) { + if (!strcmp(iter->shortname, dd.szShortName)) { /* try alternative product id on mismatch */ if (iter->pid_alt && iter->pid != dd.wPid) ok(iter->mid == dd.wMid && iter->pid_alt == dd.wPid,

1 0

Michael Stefaniuc : winemenubuilder: Simplify an if-condition (PVS-Studio) .
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 915bdcbdcada4c3f0b6841e79135375a14c58933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915bdcbdcada4c3f0b6841e79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 00:00:18 2015 +0200 winemenubuilder: Simplify an if-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 76d8f3a..e6fd042 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3427,7 +3427,7 @@ static void cleanup_menus(void) if (data == NULL) break; lret = RegEnumValueW(hkey, i, value, &valueSize, NULL, NULL, (BYTE*)data, &dataSize); - if (lret == ERROR_SUCCESS || lret != ERROR_MORE_DATA) + if (lret != ERROR_MORE_DATA) break; valueSize *= 2; dataSize *= 2;

1 0

Michael Stefaniuc : schedsvc: Simplify an if-condition (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: b39b37c0aec1bd0f3e82e5b6af3cbb5f4a70ccfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39b37c0aec1bd0f3e82e5b6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 00:04:59 2015 +0200 schedsvc: Simplify an if-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 3f11d16..8be8c0d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -87,8 +87,7 @@ static HRESULT create_directory(const WCHAR *path) WCHAR *slash; DWORD last_error = GetLastError(); - if (last_error == ERROR_ALREADY_EXISTS || last_error != ERROR_PATH_NOT_FOUND || - !(slash = strrchrW(new_path, '\\'))) + if (last_error != ERROR_PATH_NOT_FOUND || !(slash = strrchrW(new_path, '\\'))) { hr = HRESULT_FROM_WIN32(last_error); break;

1 0