January 2014 - Wine-Commits

Ken Thomases : winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 30dbd70dd5cb95021f5de05522ff81a6f52c6e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30dbd70dd5cb95021f5de0552… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:54:49 2013 -0500 winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support. (cherry picked from commit c7f8e71ab6e766003faaf0bde9edee64c1f1b3e4) --- dlls/winemac.drv/clipboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 80fd689..9cfe283 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1007,7 +1007,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); + data_len = CFDataGetLength(data) / sizeof(WCHAR); for (i = 0; i < data_len; i++) { if (src[i] == '\n') @@ -1358,13 +1358,13 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) dst_len = GlobalSize(data) / sizeof(WCHAR); if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len); + ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len); + CFDataSetLength(ret, dst_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ @@ -1375,7 +1375,7 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) continue; dst[j++] = src[i]; } - CFDataSetLength(ret, j); + CFDataSetLength(ret, j * sizeof(WCHAR)); } GlobalUnlock(data);

1 0

Ken Thomases : winemac: Rename some confusingly-named variables.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 5e372cdaee65b7a12027aaaef246c834d2d8e660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e372cdaee65b7a12027aaaef… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:00 2013 -0500 winemac: Rename some confusingly-named variables. (cherry picked from commit 49197e811bb1f1cbf5f0a669db464060a1bcec91) --- dlls/winemac.drv/clipboard.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9cfe283..73c4dfa 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -918,25 +918,25 @@ static HANDLE import_utf8_to_text(CFDataRef data) static HANDLE import_utf8_to_unicodetext(CFDataRef data) { const BYTE *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPSTR dst; unsigned long i, j; HANDLE unicode_handle = NULL; src = CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((dst = HeapAlloc(GetProcessHeap(), 0, data_len + new_lines + 1))) + if ((dst = HeapAlloc(GetProcessHeap(), 0, src_len + new_lines + 1))) { UINT count; - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1000,25 +1000,25 @@ static HANDLE import_utf16_to_text(CFDataRef data) static HANDLE import_utf16_to_unicodetext(CFDataRef data) { const WCHAR *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPWSTR dst; unsigned long i, j; HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data) / sizeof(WCHAR); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data) / sizeof(WCHAR); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (data_len + new_lines + 1) * sizeof(WCHAR)))) + if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (src_len + new_lines + 1) * sizeof(WCHAR)))) { dst = GlobalLock(unicode_handle); - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1351,27 +1351,27 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) { CFMutableDataRef ret; const WCHAR *src; - INT dst_len; + INT src_len; src = GlobalLock(data); if (!src) return NULL; - dst_len = GlobalSize(data) / sizeof(WCHAR); - if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); + src_len = GlobalSize(data) / sizeof(WCHAR); + if (src_len) src_len--; /* Leave off null terminator. */ + ret = CFDataCreateMutable(NULL, src_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len * sizeof(WCHAR)); + CFDataSetLength(ret, src_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ - for (i = 0, j = 0; i < dst_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\r' && - (i + 1 >= dst_len || src[i + 1] == '\n' || src[i + 1] == '\0')) + (i + 1 >= src_len || src[i + 1] == '\n' || src[i + 1] == '\0')) continue; dst[j++] = src[i]; }

1 0

Ken Thomases : winemac: Fix a leak in macdrv_CountClipboardFormats(). ( Clang).
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 4f6faca93282bf6199265f178e7c7e6a81c1addd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6faca93282bf6199265f178… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:21 2013 -0500 winemac: Fix a leak in macdrv_CountClipboardFormats(). (Clang). (cherry picked from commit 3ececfd2a5dd5d183511425f24cfbd0aeb9e58f8) --- dlls/winemac.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 73c4dfa..ee63c10 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1716,6 +1716,7 @@ INT CDECL macdrv_CountClipboardFormats(void) } } + CFRelease(types); CFRelease(seen_formats); TRACE(" -> %d\n", ret); return ret;

1 0

Andrew Eikum : advapi32: Don' t cache HKCR if WOW64 redirection flags are set.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9f992d7766af012aeaf32b674bd6a055db14f5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f992d7766af012aeaf32b674… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:28 2013 -0500 advapi32: Don't cache HKCR if WOW64 redirection flags are set. (cherry picked from commit 0d1526bf4a6178063486c517e38141705ba85b2b) --- dlls/advapi32/registry.c | 69 +++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f992d7766af012aeaf32…

1 0

Piotr Caban : comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 2f4df65c29db2b1637d99756034b1015f27c0ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4df65c29db2b1637d997560… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 15:52:30 2013 +0200 comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set. (cherry picked from commit 26c751ea2968cb1ec63025a4f19567e7cafe86de) --- dlls/comctl32/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2cc7e47..a325bcc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -626,7 +626,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TOOLTIPS_CalcTipSize (infoPtr, &size); TRACE("size %d x %d\n", size.cx, size.cy); - if (track_activate) + if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { rect.left = infoPtr->xTrackPos; rect.top = infoPtr->yTrackPos;

1 0

Piotr Caban : comctl32: Fix UDM_SETPOS behavior on out of range values.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 6b8ecd8fd51672e5366700b4193e0cf6c167e758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8ecd8fd51672e5366700b41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:39 2013 +0200 comctl32: Fix UDM_SETPOS behavior on out of range values. (cherry picked from commit ac31df438acf325fa10ab0cc6e2683e16f81d5ae) --- dlls/comctl32/updown.c | 49 +++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a42b40f..2373031 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -482,6 +482,32 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) return 0; } +static int UPDOWN_SetPos(UPDOWN_INFO *infoPtr, int pos) +{ + int ret = infoPtr->CurVal; + + if(!UPDOWN_InBounds(infoPtr, pos)) { + if((infoPtr->MinVal < infoPtr->MaxVal && pos < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && pos > infoPtr->MinVal)) + pos = infoPtr->MinVal; + else + pos = infoPtr->MaxVal; + } + + infoPtr->CurVal = pos; + UPDOWN_SetBuddyInt(infoPtr); + + if(!UPDOWN_InBounds(infoPtr, ret)) { + if((infoPtr->MinVal < infoPtr->MaxVal && ret < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && ret > infoPtr->MinVal)) + ret = infoPtr->MinVal; + else + ret = infoPtr->MaxVal; + } + return ret; +} + + /*********************************************************************** * UPDOWN_SetRange * @@ -1069,17 +1095,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } case UDM_SETPOS: { - int temp = (short)LOWORD(lParam); - - TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd); - if(!UPDOWN_InBounds(infoPtr, temp)) { - if(temp < infoPtr->MinVal) temp = infoPtr->MinVal; - if(temp > infoPtr->MaxVal) temp = infoPtr->MaxVal; - } - wParam = infoPtr->CurVal; - infoPtr->CurVal = temp; - UPDOWN_SetBuddyInt (infoPtr); - return wParam; /* return prev value */ + return UPDOWN_SetPos(infoPtr, (short)LOWORD(lParam)); } case UDM_GETRANGE: return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal); @@ -1109,16 +1125,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } case UDM_SETPOS32: { - int temp; - - if(!UPDOWN_InBounds(infoPtr, (int)lParam)) { - if((int)lParam < infoPtr->MinVal) lParam = infoPtr->MinVal; - if((int)lParam > infoPtr->MaxVal) lParam = infoPtr->MaxVal; - } - temp = infoPtr->CurVal; /* save prev value */ - infoPtr->CurVal = (int)lParam; /* set the new value */ - UPDOWN_SetBuddyInt (infoPtr); - return temp; /* return prev value */ + return UPDOWN_SetPos(infoPtr, (int)lParam); } case UDM_GETUNICODEFORMAT: /* we lie a bit here, we're always using Unicode internally */

1 0

Andrew Eikum : advapi32: Attempt to open WOW64 key before the lowest level key, too.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 151c003c22d28cc809d4e1d4b2d3bb437769dad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151c003c22d28cc809d4e1d4b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:21 2013 -0500 advapi32: Attempt to open WOW64 key before the lowest level key, too. Without this, we'll fail to open the correct key for e.g. <Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to <Machine\Software\Wow6432Node\Classes>. (cherry picked from commit 8cb7f877d7406065074183ae8541355f0090e6db) --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c01e125..9012254 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len && !force_wow32) return status; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES force_wow32 = FALSE; } } - status = NtCreateKey( &subkey, access, attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); + if (i == len) + { + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); } return status; } @@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a force_wow32 = FALSE; } } - status = NtOpenKey( &subkey, access, attr ); + if (i == len) + { + attr->Attributes = attrs; + status = NtOpenKey( (PHANDLE)retkey, access, attr ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtOpenKey( &subkey, access, attr ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); return status; - } /* create one of the HKEY_* special root keys */

1 0

Kohei Takahashi : msi: Return -1 on open failure in FDI callbacks.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 96501bd4bc1a8906ce98a033b1c074a1edddfbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96501bd4bc1a8906ce98a033b… Author: Kohei Takahashi <flast(a)flast.jp> Date: Wed Oct 16 01:08:38 2013 +0900 msi: Return -1 on open failure in FDI callbacks. (cherry picked from commit 953359c73f5c609132e6d7caea0947d164a3d4b4) --- dlls/msi/media.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d97f4bd..8646069 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -137,7 +137,6 @@ static void CDECL cabinet_free(void *pv) static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { - HANDLE handle; DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; @@ -163,12 +162,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) else if (oflag & _O_CREAT) dwCreateDisposition = CREATE_ALWAYS; - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - if (handle == INVALID_HANDLE_VALUE) - return 0; - - return (INT_PTR)handle; + return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); } static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) @@ -225,12 +220,12 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) if (!cab) { WARN("failed to get cabinet stream\n"); - return 0; + return -1; } if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) { WARN("failed to encode stream name\n"); - return 0; + return -1; } if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { @@ -239,7 +234,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) { WARN("failed to open stream 0x%08x\n", hr); msi_free( encoded ); - return 0; + return -1; } } msi_free( encoded );

1 0

Andrew Eikum : oleaut32: For 64-bit, fallback on the win32 key if win64 key is empty for typelibs.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 00b459a9e5a3c292f422b24a4804948b942d2bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b459a9e5a3c292f422b24a4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 16 08:21:13 2013 -0500 oleaut32: For 64-bit, fallback on the win32 key if win64 key is empty for typelibs. (cherry picked from commit a8ebda980122423008e47d728a776bb408536f1c) --- dlls/oleaut32/tmarshal.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 2324fbb..3856f32 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -303,8 +303,16 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win%u",tlguid,ver,(sizeof(void*) == 8) ? 64 : 32); tlfnlen = sizeof(tlfn); if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { - ERR("Could not get typelib fn?\n"); - return E_FAIL; +#ifdef _WIN64 + sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver); + tlfnlen = sizeof(tlfn); + if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { +#endif + ERR("Could not get typelib fn?\n"); + return E_FAIL; +#ifdef _WIN64 + } +#endif } MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0])); hres = LoadTypeLib(tlfnW,&tl);

1 0

Piotr Caban : comctl32: Set updown control value to min or max in out of range case.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 57a8e345fc0d629410ab159089ae65ffdbb1e92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a8e345fc0d629410ab15908… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:19 2013 +0200 comctl32: Set updown control value to min or max in out of range case. (cherry picked from commit e6fce2de4ad783cf21318128f950eae2f28a6914) --- dlls/comctl32/updown.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 390f829..a42b40f 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,11 +150,16 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } else return FALSE; + } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { + delta = infoPtr->MaxVal - infoPtr->CurVal; + } else { + delta = infoPtr->MinVal - infoPtr->CurVal; + } } infoPtr->CurVal += delta; - return TRUE; + return delta != 0; } /***********************************************************************

1 0