wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Józef Kucia : wined3d: Fix driver version check.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 53370ec5d0d560bc8e998c92616098cb8dfcd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53370ec5d0d560bc8e998c926… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:46 2016 +0100 wined3d: Fix driver version check. The previous check didn't catch older Windows versions for which dwMinorVersion > 2. Spotted by Michael Müller. 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 97c70c86be26e02a398411877d6e6a26367d3ab8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 07ceed6..254102e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1511,8 +1511,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * In order to avoid this application bug we limit the amount of video memory * to LONG_MAX for older Windows versions. */ - if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 - && driver_info->vram_bytes > LONG_MAX) + if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) { TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); driver_info->vram_bytes = LONG_MAX;

1 0

Józef Kucia : wined3d: Limit amount of video memory for older Windows versions.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: ab5d004f1dd3a3c48d4bc11ce51f87f60f58d352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5d004f1dd3a3c48d4bc11ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 11 13:28:03 2016 +0100 wined3d: Limit amount of video memory for older Windows versions. This should affect only 32-bit applications when the emulated Windows version is set to "Windows 2003" or older. 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 565a5715468fa990cf9e7cbfe38ac59ddcde1e76) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 76fc04a..07ceed6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,6 +1506,18 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver = DRIVER_UNKNOWN; } + /** + * Diablo 2 crashes when the amount of video memory is greater than 0x7fffffff. + * In order to avoid this application bug we limit the amount of video memory + * to LONG_MAX for older Windows versions. + */ + if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 + && driver_info->vram_bytes > LONG_MAX) + { + TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); + driver_info->vram_bytes = LONG_MAX; + } + if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with 0x%s bytes.\n",

1 0

Alexandre Julliard : server: Implement serial port read interval timeouts.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 32a387e9b03c776ef258a16957f02c893b13fb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a387e9b03c776ef258a1695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 23:18:31 2016 -0700 server: Implement serial port read interval timeouts. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc0bf9e505922b81df1c317d6493665bbe946554) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/serial.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/server/serial.c b/server/serial.c index 164a4b1..7beb8ff 100644 --- a/server/serial.c +++ b/server/serial.c @@ -62,12 +62,15 @@ static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial { struct object obj; struct fd *fd; + struct timeout_user *read_timer; + /* timeout values */ unsigned int readinterval; unsigned int readconst; @@ -115,7 +118,7 @@ static const struct fd_ops serial_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ + serial_reselect_async, /* reselect_async */ default_fd_cancel_async /* cancel_async */ }; @@ -134,6 +137,7 @@ struct object *create_serial( struct fd *fd ) if (!(serial = alloc_object( &serial_ops ))) return NULL; + serial->read_timer = NULL; serial->readinterval = 0; serial->readmult = 0; serial->readconst = 0; @@ -157,6 +161,7 @@ static struct fd *serial_get_fd( struct object *obj ) static void serial_destroy( struct object *obj) { struct serial *serial = (struct serial *)obj; + if (serial->read_timer) remove_timeout_user( serial->read_timer ); release_object( serial->fd ); } @@ -203,6 +208,34 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ } } +static void serial_read_timeout( void *arg ) +{ + struct serial *serial = arg; + + serial->read_timer = NULL; + fd_async_wake_up( serial->fd, ASYNC_TYPE_READ, STATUS_TIMEOUT ); +} + +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct serial *serial = get_fd_user( fd ); + + if (serial->read_timer) + { + if (!(default_fd_get_poll_events( fd ) & POLLIN)) + { + remove_timeout_user( serial->read_timer ); + serial->read_timer = NULL; + } + } + else if (serial->readinterval && (default_fd_get_poll_events( fd ) & POLLIN)) + { + serial->read_timer = add_timeout_user( (timeout_t)serial->readinterval * -10000, + serial_read_timeout, serial ); + } + default_fd_reselect_async( fd, queue ); +} + DECL_HANDLER(get_serial_info) { struct serial *serial;

1 0

Matteo Bruni : wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 621a1e2670b9367483747445ab60b6bc6edc2852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621a1e2670b9367483747445a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 11 16:10:46 2016 +0100 wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM. Signed-off-by: Matteo Bruni <mbruni(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 1061969eb6e291566591f37a5ea5e48af3a48297) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4406067..47ad93c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1026,7 +1026,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G5R5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0

Austin English : kernel32: Add GetConsoleScreenBufferInfoEx/ SetConsoleScreenBufferInfoEx stubs.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: c35293060ecde4656499fd757ac0ecfe96f71a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35293060ecde4656499fd757… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 26 21:56:10 2015 -0600 kernel32: Add GetConsoleScreenBufferInfoEx/SetConsoleScreenBufferInfoEx stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57d1171208b2114d82422c1d1af2be9b3c86495b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 51d6e60..99f2061 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3321,3 +3321,17 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) return get_console_font_size(hConsole, index); } #endif /* !defined(__i386__) */ + +BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) +{ + FIXME("(%p %p): stub!\n", hConsole, csbix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) +{ + FIXME("(%p %p): stub!\n", hConsole, csbix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 80a4e79..9cb5ca3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -615,7 +615,7 @@ @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) @ stdcall GetConsoleScreenBufferInfo(long ptr) -# @ stub GetConsoleScreenBufferInfoEx +@ stdcall GetConsoleScreenBufferInfoEx(long ptr) # @ stub GetConsoleSelectionInfo @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @@ -1362,7 +1362,7 @@ @ stub SetConsoleOS2OemFormat @ stdcall SetConsoleOutputCP(long) @ stub SetConsolePalette -# @ stub SetConsoleScreenBufferInfoEx +@ stdcall SetConsoleScreenBufferInfoEx(long ptr) @ stdcall SetConsoleScreenBufferSize(long long) @ stdcall SetConsoleTextAttribute(long long) @ stdcall SetConsoleTitleA(str)

1 0

Andrew Eikum : xaudio2: Handle openal source allocation failure.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 094d3c7cfbb370ce2d48e5639d06b1960f5bde3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=094d3c7cfbb370ce2d48e5639… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 9 10:39:23 2016 -0600 xaudio2: Handle openal source allocation failure. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ecadabe25b11bbd2bb41facf40dfc592e12632ad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 04f975c..73e6db1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -34,6 +34,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); @@ -1399,11 +1400,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; return hr; } alGenSources(1, &src->al_src); + if(!src->al_src){ + static int once = 0; + if(!once++) + ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); + HeapFree(GetProcessHeap(), 0, src->fmt); + src->in_use = FALSE; + return E_OUTOFMEMORY; + } + alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); alSourcePlay(src->al_src);

1 0

Kira Backes : user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: cfa2c8702677435798fc67638235f10359a69479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa2c8702677435798fc67638… Author: Kira Backes <kira.backes(a)nrwsoft.de> Date: Wed Feb 3 23:58:17 2016 -0700 user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support. Signed-off-by: Kira Backes <kira.backes(a)nrwsoft.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 94aee7a738751194969b5cf7f055c4f3727fbf1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 20 +++++++++++--------- include/winuser.h | 11 +++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 96e7f2e..3e419ee 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2488,7 +2488,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H INT hittest; EVENTMSG event; GUITHREADINFO info; - MOUSEHOOKSTRUCT hook; + MOUSEHOOKSTRUCTEX hook; BOOL eatMsg; /* find the window to dispatch this mouse message to */ @@ -2584,17 +2584,19 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H /* message is accepted now (but may still get dropped) */ - hook.pt = msg->pt; - hook.hwnd = msg->hwnd; - hook.wHitTestCode = hittest; - hook.dwExtraInfo = extra_info; + hook.s.pt = msg->pt; + hook.s.hwnd = msg->hwnd; + hook.s.wHitTestCode = hittest; + hook.s.dwExtraInfo = extra_info; + hook.mouseData = msg->wParam; if (HOOK_CallHooks( WH_MOUSE, remove ? HC_ACTION : HC_NOREMOVE, message, (LPARAM)&hook, TRUE )) { - hook.pt = msg->pt; - hook.hwnd = msg->hwnd; - hook.wHitTestCode = hittest; - hook.dwExtraInfo = extra_info; + hook.s.pt = msg->pt; + hook.s.hwnd = msg->hwnd; + hook.s.wHitTestCode = hittest; + hook.s.dwExtraInfo = extra_info; + hook.mouseData = msg->wParam; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); accept_hardware_message( hw_id, TRUE ); return FALSE; diff --git a/include/winuser.h b/include/winuser.h index 50821f4..cbd592c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -385,6 +385,17 @@ typedef struct ULONG_PTR dwExtraInfo; } MOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT, *LPMOUSEHOOKSTRUCT; +typedef struct +{ + struct { /* MOUSEHOOKSTRUCT */ + POINT pt; + HWND hwnd; + UINT wHitTestCode; + ULONG_PTR dwExtraInfo; + } DUMMYSTRUCTNAME; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX; + /* Hardware hook structure */

1 0

Sebastian Lackner : kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 5ef43d434c68d5da29c709f7e562d84080b38e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef43d434c68d5da29c709f7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:06 2016 +0100 kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1bebee9c1b119d727991aee50451e36e0865f927) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7b0212e..cf003d4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1782,6 +1782,36 @@ static void test_CompareStringA(void) "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } +static void test_CompareStringW(void) +{ + WCHAR *str1, *str2; + SYSTEM_INFO si; + DWORD old_prot; + BOOL success; + char *buf; + int ret; + + GetSystemInfo(&si); + buf = VirtualAlloc(NULL, si.dwPageSize * 4, MEM_COMMIT, PAGE_READWRITE); + ok(buf != NULL, "VirtualAlloc failed with %u\n", GetLastError()); + success = VirtualProtect(buf + si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + success = VirtualProtect(buf + 3 * si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + + str1 = (WCHAR *)(buf + si.dwPageSize - sizeof(WCHAR)); + str2 = (WCHAR *)(buf + 3 * si.dwPageSize - sizeof(WCHAR)); + *str1 = 'A'; + *str2 = 'B'; + + /* CompareStringW should abort on the first non-matching character */ + ret = CompareStringW(CP_ACP, 0, str1, 100, str2, 100); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + + success = VirtualFree(buf, 0, MEM_RELEASE); + ok(success, "VirtualFree failed with %u\n", GetLastError()); +} + struct comparestringex_test { const char *locale; DWORD flags; @@ -4577,6 +4607,7 @@ START_TEST(locale) test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ test_CompareStringA(); + test_CompareStringW(); test_CompareStringEx(); test_LCMapStringA(); test_LCMapStringW();

1 0

Dmitry Timoshkov : kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 46a2aea3d154e086bd0f8416856c7b847010c197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a2aea3d154e086bd0f84168… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 12 08:52:50 2016 +0100 kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dfbbd55af7e625968473d233671d9aa63ec33f83) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c index 17b5537..7280501 100644 --- a/libs/wine/sortkey.c +++ b/libs/wine/sortkey.c @@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } -static inline int real_length(const WCHAR *str, int len) -{ - while (len && !str[len - 1]) len--; - return len; -} - int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2) { int ret; - len1 = real_length(str1, len1); - len2 = real_length(str2, len2); - ret = compare_unicode_weights(flags, str1, len1, str2, len2); if (!ret) {

1 0

Alex Henrie : ntdll: Finish serial reads of size 0 immediately.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: e0752ba0fe3875a8329541e7a0bff59bd8d6e5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0752ba0fe3875a8329541e7a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 24 22:55:35 2016 -0700 ntdll: Finish serial reads of size 0 immediately. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f35c1b2dc123a834d365e0ddb441370b22b97cbc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/comm.c | 4 ---- dlls/ntdll/file.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97ec794..6b0c3ed 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2151,13 +2151,9 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); - /* FIXME: Remove once Wine is fixed */ - if (status == STATUS_PENDING) WaitForSingleObject(hcom, TIMEOUT); if (i >= 0) { -todo_wine ok(status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, U(iob).Status); ok(iob.Information == 0, "%d: expected 0, got %lu\n", i, iob.Information); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1027b54..e03d860 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -891,6 +891,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; goto done; case FD_TYPE_SERIAL: + if (!length) + { + status = STATUS_SUCCESS; + goto done; + } break; default: status = STATUS_PIPE_BROKEN;

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016