May 2019 - Wine-Commits - list.winehq.org

David Adam : ddraw/tests: Add tests for the "dwMipMapCount" field of texture sub-levels.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 2b941ca0c37b3e3cbd9b2cd606725abebef2b794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b941ca0c37b3e3cbd9b2cd6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jan 23 21:36:41 2019 +0330 ddraw/tests: Add tests for the "dwMipMapCount" field of texture sub-levels. Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ec69f0ee3d08a9fc4c037895d8d5868a9c58ee5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 49 ++++++++++++++++++++++++++++++++++------------- 4 files changed, 144 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b941ca0c37b3e3cbd9b…

1 0

Zhiyi Zhang : msacm32: Reference count local drivers.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 7483a38d4c4eb823362f093a3e721335b5854365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7483a38d4c4eb823362f093a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Jan 26 16:20:10 2019 +0800 msacm32: Reference count local drivers. One local driver can be assigned to multiple driver ids. When releasing the driver id, check if the reference count of a local driver is one before actually releasing the local driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46520 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bbdf6d5e21cfe1ef5e317d01978310bac614e6a0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/internal.c | 12 +++++++++++- dlls/msacm32/wineacm.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index aad071e..7d324a8 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -737,12 +737,17 @@ static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) { PWINE_ACMLOCALDRIVER pNextACMLocalDriver; + LONG ref; if (paldrv->pACMInstList) { ERR("local driver instances still present after closing all drivers - memory leak\n"); return NULL; } + ref = InterlockedDecrement(&paldrv->ref); + if (ref) + return paldrv; + if (paldrv == MSACM_pFirstACMLocalDriver) MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; if (paldrv == MSACM_pLastACMLocalDriver) @@ -883,7 +888,11 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri /* look up previous instance of local driver module */ for (paldrv = MSACM_pFirstACMLocalDriver; paldrv; paldrv = paldrv->pNextACMLocalDrv) { - if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) return paldrv; + if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) + { + InterlockedIncrement(&paldrv->ref); + return paldrv; + } } paldrv = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER)); @@ -892,6 +901,7 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri paldrv->hModule = hModule; paldrv->lpDrvProc = lpDriverProc; paldrv->pACMInstList = NULL; + paldrv->ref = 1; paldrv->pNextACMLocalDrv = NULL; paldrv->pPrevACMLocalDrv = MSACM_pLastACMLocalDriver; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 406e01b..98d1ab5 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -52,6 +52,7 @@ typedef struct _WINE_ACMLOCALDRIVER PWINE_ACMLOCALDRIVERINST pACMInstList; PWINE_ACMLOCALDRIVER pNextACMLocalDrv; PWINE_ACMLOCALDRIVER pPrevACMLocalDrv; + LONG ref; } WINE_ACMLOCALDRIVER; typedef struct _WINE_ACMLOCALDRIVERINST

1 0

Jacek Caban : ntoskrnl.exe: Add __C_specific_handler entry.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 1ddfedd051dc82360a8a9a3e57fa07901fc1371a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ddfedd051dc82360a8a9a3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 16:12:39 2019 +0100 ntoskrnl.exe: Add __C_specific_handler entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 496447f03b8dc92ea1d2af8bea6e63680e6bcc7d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a30459a..7a58683 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,6 +1407,7 @@ @ stdcall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos @ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin

1 0

Józef Kucia : ddraw: Pass correct box when mapping system memory vertex buffers.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 8cb1de4d06ab978e65fd8c8e10a029e2c57ac292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb1de4d06ab978e65fd8c8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 18:29:43 2019 +0330 ddraw: Pass correct box when mapping system memory vertex buffers. This fixes a regression introduced by commit 5a8e430b96ab429a85f82f26ba9d2de4729954c2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46536 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 445b97b2a26d9d4d9cf9fcbb9fa7e15bb068fe20) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 48803f8..af403b0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4410,6 +4410,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); wined3d_mutex_lock(); + wined3d_box.left = start_vertex * stride; + wined3d_box.right = wined3d_box.left + vertex_count * stride; wined3d_resource = wined3d_buffer_get_resource(vb_impl->wined3d_buffer); if (FAILED(hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, WINED3D_MAP_READ))) @@ -4417,8 +4419,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_unlock(); return D3DERR_VERTEXBUFFERLOCKED; } - hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, wined3d_map_desc.data, - start_vertex + vertex_count, indices, index_count, flags); + hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, + wined3d_map_desc.data, vertex_count, indices, index_count, flags); wined3d_resource_unmap(wined3d_resource, 0); wined3d_mutex_unlock(); return hr;

1 0

Nikolay Sivov : api-ms-win-core-libraryloader-l1-2-1: Add missing FindResourceW() forward.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 4843534b28a3e9e5f8ad88c9fadaef4ecad2c39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4843534b28a3e9e5f8ad88c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 23 08:26:40 2019 +0300 api-ms-win-core-libraryloader-l1-2-1: Add missing FindResourceW() forward. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e094fa9bd22b09c1ed4ae5435a5f57b724c5654) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-libraryloader-l1-2-1.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec index 4cc3358..5e28421 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec @@ -7,6 +7,7 @@ @ stub EnumResourceTypesExA @ stub EnumResourceTypesExW @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW @ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal @ stdcall FreeLibrary(long) kernel32.FreeLibrary @ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread

1 0

Sebastian Lackner : wtsapi32: Improve WTSQueryUserToken stub.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: e98f71163995f5e70727170d9771f1b7e9096bec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e98f71163995f5e70727170d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 23 03:22:56 2019 +0100 wtsapi32: Improve WTSQueryUserToken stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39663 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e89c840a6c8227b387aadac539e5f6edf3dbd16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 1 - dlls/wtsapi32/wtsapi32.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index c24bd49..67f56bb 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -112,7 +112,6 @@ static void test_WTSQueryUserToken(void) SetLastError(0xdeadbeef); ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); ok(!ret, "expected WTSQueryUserToken to fail\n"); - todo_wine ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 5569502..3edf921 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -254,8 +254,17 @@ BOOL WINAPI WTSQuerySessionInformationW( */ BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) { - FIXME("%u %p\n", session_id, token); - return FALSE; + FIXME("%u %p semi-stub!\n", session_id, token); + + if (!token) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return DuplicateHandle(GetCurrentProcess(), GetCurrentProcessToken(), + GetCurrentProcess(), token, + 0, FALSE, DUPLICATE_SAME_ACCESS); } /************************************************************

1 0

Zhiyi Zhang : user32: Check for null handle in GetRawInputData().
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: b357d44e9efcef300c481f1182fc01aaf6bc201c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b357d44e9efcef300c481f11… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:27:09 2019 +0800 user32: Check for null handle in GetRawInputData(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd730a5f412c1e3b8a05b3b297ca0642e23fb92b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a..4bfccdf 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8..ffdd4b7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Piotr Caban : msvcrt: Optimize tolower function when locale was never changed.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: a6debb6796853e557a980ba0a293e6a8a6bbfc74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6debb6796853e557a980ba0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:05 2019 +0100 msvcrt: Optimize tolower function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e867af3bfeb5fc50d76cf26816d294d5342fe48c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/ctype.c | 4 +++- dlls/msvcrt/locale.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 758411a..17b12e2 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -458,7 +458,9 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_tolower(int c) { - return MSVCRT__tolower_l(c, NULL); + if(initial_locale) + return c>='A' && c<='Z' ? c-'A'+'a' : c; + return MSVCRT__tolower_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1e56395..a1e827d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -48,6 +48,7 @@ int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; static unsigned char charmax = CHAR_MAX; +BOOL initial_locale = TRUE; #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 @@ -1780,6 +1781,9 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) _lock_locales(); + if(locale[0] != 'C' || locale[1] != '\0') + initial_locale = FALSE; + if(locinfo->lc_handle[MSVCRT_LC_COLLATE]!=newlocinfo->lc_handle[MSVCRT_LC_COLLATE] || locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage!=newlocinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage) { locinfo->lc_collate_cp = newlocinfo->lc_collate_cp; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fc91066..02b8628 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,6 +283,7 @@ extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; +extern BOOL initial_locale DECLSPEC_HIDDEN; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e80a518..a159132 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2788,13 +2788,19 @@ static void test_tolower(void) errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xD0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + setlocale(LC_ALL, "C"); + errno = 0xdeadbeef; + ret = p_tolower((char)0xF4); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); /* test C locale after setting locale */ if(!setlocale(LC_ALL, "us")) {

1 0

David Adam : ddraw: Fix the "dwMipMapCount" field of texture sub-levels.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 6b5088b371536b481d89c110eebb9d38776e05c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5088b371536b481d89c110… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jan 23 21:36:42 2019 +0330 ddraw: Fix the "dwMipMapCount" field of texture sub-levels. Instead of the total count, it indicates the count starting from the current level. Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f5d7d9cccc941024f1532a9ac23427d07810f337) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/surface.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 16 +++++++--------- dlls/ddraw/tests/ddraw2.c | 16 +++++++--------- dlls/ddraw/tests/ddraw4.c | 16 +++++++--------- dlls/ddraw/tests/ddraw7.c | 16 +++++++--------- 5 files changed, 30 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b5088b371536b481d89…

1 0

Piotr Caban : hid: Fix error handling in HidP_SetUsages.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 2b5efe1b1ce9def223cdc6abad4618b1e1dfbfdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5efe1b1ce9def223cdc6ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 14 12:43:45 2019 +0200 hid: Fix error handling in HidP_SetUsages. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 0416426..8c04670 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -599,12 +599,12 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH { rc = set_report_data((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, -1); + } - if (rc != HIDP_STATUS_SUCCESS) - { - *UsageLength = i; - return rc; - } + if (rc != HIDP_STATUS_SUCCESS) + { + *UsageLength = i; + return rc; } }

1 0