September 2016 - Wine-Commits

Michael Stefaniuc : jscript: Add more jsdisp_t to Instance helpers.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 7af3f651888944a9d9df4636e273814bbb066ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af3f651888944a9d9df4636e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 22 10:00:36 2016 +0200 jscript: Add more jsdisp_t to Instance helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/bool.c | 14 ++++++++++++-- dlls/jscript/vbarray.c | 9 +++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 7cd0c21..75c98c2 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -34,15 +34,25 @@ typedef struct { static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; +static inline BoolInstance *bool_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, BoolInstance, dispex); +} + +static inline BoolInstance *bool_from_vdisp(vdisp_t *vdisp) +{ + return bool_from_jsdisp(vdisp->u.jsdisp); +} + static inline BoolInstance *bool_this(vdisp_t *jsthis) { - return is_vclass(jsthis, JSCLASS_BOOLEAN) ? (BoolInstance*)jsthis->u.jsdisp : NULL; + return is_vclass(jsthis, JSCLASS_BOOLEAN) ? bool_from_vdisp(jsthis) : NULL; } BOOL bool_obj_value(jsdisp_t *obj) { assert(is_class(obj, JSCLASS_BOOLEAN)); - return ((BoolInstance*)obj)->val; + return bool_from_jsdisp(obj)->val; } /* ECMA-262 3rd Edition 15.6.4.2 */ diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index f374fb0..2312228 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -34,9 +34,14 @@ static const WCHAR lboundW[] = {'l','b','o','u','n','d',0}; static const WCHAR toArrayW[] = {'t','o','A','r','r','a','y',0}; static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; +static inline VBArrayInstance *vbarray_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, VBArrayInstance, dispex); +} + static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp) { - return CONTAINING_RECORD(vdisp->u.jsdisp, VBArrayInstance, dispex); + return vbarray_from_jsdisp(vdisp->u.jsdisp); } static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis) @@ -236,7 +241,7 @@ static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns static void VBArray_destructor(jsdisp_t *dispex) { - VBArrayInstance *vbarray = (VBArrayInstance*)dispex; + VBArrayInstance *vbarray = vbarray_from_jsdisp(dispex); SafeArrayDestroy(vbarray->safearray); heap_free(vbarray);

1 0

Alexandre Julliard : winex11: Store the list of X11 formats when retrieving the TARGETS property.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: a502a36af8a45ce355bf21c0df0360b2cf422c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a502a36af8a45ce355bf21c0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 20:28:28 2016 +0900 winex11: Store the list of X11 formats when retrieving the TARGETS property. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 93 +++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f139586..9e1c8a3 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -118,8 +118,6 @@ typedef struct tagWINE_CLIPDATA { struct list entry; UINT wFormatID; HANDLE hData; - UINT drvData; - LPWINE_CLIPFORMAT lpFormat; } WINE_CLIPDATA, *LPWINE_CLIPDATA; static int selectionAcquired = 0; /* Contains the current selection masks */ @@ -216,6 +214,9 @@ static struct list format_list = LIST_INIT( format_list ); #define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) +static struct clipboard_format **current_x11_formats; +static unsigned int nb_current_x11_formats; + /* * Cached clipboard data. @@ -523,16 +524,11 @@ static BOOL X11DRV_CLIPBOARD_ReleaseOwnership(void) * * Caller *must* have the clipboard open and be the owner. */ -static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE hData, - LPWINE_CLIPFORMAT lpFormat, BOOL override) +static BOOL X11DRV_CLIPBOARD_InsertClipboardData( UINT wFormatID, HANDLE hData ) { LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormatID); - TRACE("format=%04x lpData=%p hData=%p lpFormat=%p override=%d\n", - wFormatID, lpData, hData, lpFormat, override); - - if (lpData && !override) - return TRUE; + TRACE("format=%04x lpData=%p hData=%p\n", wFormatID, lpData, hData); if (lpData) { @@ -546,8 +542,6 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE hData, lpData->wFormatID = wFormatID; lpData->hData = hData; - lpData->lpFormat = lpFormat; - lpData->drvData = 0; list_add_tail( &data_list, &lpData->entry ); ClipDataCount++; @@ -575,10 +569,6 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) case CF_PALETTE: DeleteObject(lpData->hData); break; - case CF_DIB: - if (lpData->drvData) XFreePixmap(gdi_display, lpData->drvData); - GlobalFree(lpData->hData); - break; case CF_METAFILEPICT: case CF_DSPMETAFILEPICT: DeleteMetaFile(((METAFILEPICT *)GlobalLock( lpData->hData ))->hMF ); @@ -593,7 +583,6 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) break; } lpData->hData = 0; - lpData->drvData = 0; } @@ -1245,14 +1234,19 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) */ static HANDLE import_targets( Atom type, const void *data, size_t size ) { - UINT i, count = size / sizeof(Atom); + UINT i, pos, count = size / sizeof(Atom); const Atom *properties = data; - struct clipboard_format *format; + struct clipboard_format *format, **formats; if (type != XA_ATOM && type != x11drv_atom(TARGETS)) return 0; register_x11_formats( properties, count ); + /* the builtin formats contain duplicates, so allocate some extra space */ + if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*formats )))) + return 0; + + pos = 0; LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) { for (i = 0; i < count; i++) if (properties[i] == format->atom) break; @@ -1261,10 +1255,15 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) { TRACE( "property %s -> format %s\n", debugstr_xatom( properties[i] ), debugstr_format( format->id )); - X11DRV_CLIPBOARD_InsertClipboardData( format->id, 0, format, FALSE ); + X11DRV_CLIPBOARD_InsertClipboardData( format->id, 0 ); + formats[pos++] = format; } else TRACE( "property %s (ignoring)\n", debugstr_xatom( properties[i] )); } + + HeapFree( GetProcessHeap(), 0, current_x11_formats ); + current_x11_formats = formats; + nb_current_x11_formats = pos; return (HANDLE)1; } @@ -1344,6 +1343,25 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select /************************************************************************** + * render_format + */ +static BOOL render_format( Display *display, Window win, Atom selection, UINT id ) +{ + unsigned int i; + HANDLE handle = 0; + + for (i = 0; i < nb_current_x11_formats; i++) + { + if (current_x11_formats[i]->id != id) continue; + handle = import_selection( display, win, selection, current_x11_formats[i] ); + break; + } + if (handle) X11DRV_CLIPBOARD_InsertClipboardData( id, handle ); + return handle != 0; +} + + +/************************************************************************** * export_data * * Generic export clipboard data routine. @@ -1944,12 +1962,12 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) /* Selection Owner doesn't understand TARGETS, try retrieving XA_STRING */ if (use_primary_selection && (handle = import_selection( display, w, XA_PRIMARY, format ))) { - X11DRV_CLIPBOARD_InsertClipboardData( format->id, handle, format, TRUE ); + X11DRV_CLIPBOARD_InsertClipboardData( format->id, handle ); selectionCacheSrc = XA_PRIMARY; } else if ((handle = import_selection( display, w, x11drv_atom(CLIPBOARD), format ))) { - X11DRV_CLIPBOARD_InsertClipboardData( format->id, handle, format, TRUE ); + X11DRV_CLIPBOARD_InsertClipboardData( format->id, handle ); selectionCacheSrc = x11drv_atom(CLIPBOARD); } else @@ -1974,37 +1992,14 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) */ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData) { - BOOL bRet = FALSE; - HANDLE hData; + Window w = thread_selection_wnd(); - if (!lpData->lpFormat) + if (!w) { - ERR("Requesting format %04x but no source format linked to data.\n", - lpData->wFormatID); + ERR("No window available to read selection data!\n"); return FALSE; } - - if (!selectionAcquired) - { - Window w = thread_selection_wnd(); - if(!w) - { - ERR("No window available to read selection data!\n"); - return FALSE; - } - - hData = import_selection( display, w, selectionCacheSrc, lpData->lpFormat ); - if (hData) - bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, lpData->lpFormat, TRUE); - } - else - { - ERR("Received request to cache selection data but process is owner\n"); - } - - TRACE("Returning %d\n", bRet); - - return bRet; + return render_format( display, w, selectionCacheSrc, lpData->wFormatID ); } @@ -2386,7 +2381,7 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) { if (!owner) X11DRV_CLIPBOARD_UpdateCache(); - return X11DRV_CLIPBOARD_InsertClipboardData(wFormat, hData, NULL, TRUE); + return X11DRV_CLIPBOARD_InsertClipboardData( wFormat, hData ); }

1 0

Akihiro Sagawa : kernel32: Implement LCMAP_HIRAGANA.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: c4af6088452deb0429ee66d637abfd1482795753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4af6088452deb0429ee66d63… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:18 2016 +0900 kernel32: Implement LCMAP_HIRAGANA. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 18 ++++++++++++++++-- dlls/kernel32/tests/locale.c | 8 ++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 97a22ba..de1a28c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3192,8 +3192,10 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW SetLastError(ERROR_INVALID_FLAGS); return 0; } - if ((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && - (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) + if (((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && + (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) || + ((flags & LCMAP_HIRAGANA) && + (flags & (LCMAP_SIMPLIFIED_CHINESE | LCMAP_TRADITIONAL_CHINESE)))) { SetLastError(ERROR_INVALID_FLAGS); return 0; @@ -3268,6 +3270,18 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW srclen -= len; } + if (flags & LCMAP_HIRAGANA) + { + /* map katakana to hiragana, e.g. U+30A1 -> U+3041. + we can't use C3_KATAKANA as some characters can't map to hiragana */ + for (len = dst_ptr - dst, dst_ptr = dst; len; len--, dst_ptr++) + { + if ((*dst_ptr >= 0x30A1 && *dst_ptr <= 0x30F6) || + *dst_ptr == 0x30FD || *dst_ptr == 0x30FE) + *dst_ptr -= 0x60; + } + } + done: if (srclen) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5e149d8..94d3d8a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2206,6 +2206,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_LOWERCASE | NORM_IGNORESYMBOLS, LCMAP_UPPERCASE | NORM_IGNORENONSPACE, LCMAP_LOWERCASE | NORM_IGNORENONSPACE, + LCMAP_HIRAGANA | NORM_IGNORENONSPACE, + LCMAP_HIRAGANA | NORM_IGNORESYMBOLS, + LCMAP_HIRAGANA | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_HIRAGANA | LCMAP_TRADITIONAL_CHINESE, }; static void test_LCMapStringA(void) @@ -2433,14 +2437,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, ret, GetLastError(), lstrlenW(hiragana_text) + 1); - todo_wine ok(!lstrcmpW(buf, hiragana_text), "%s string compare mismatch\n", func_name); + ok(!lstrcmpW(buf, hiragana_text), "%s string compare mismatch\n", func_name); buf[0] = 0x30f5; /* KATAKANA LETTER SMALL KA */ ret = func_ptr(LCMAP_HIRAGANA, buf, 1, buf2, 1); ok(ret == 1, "%s ret %d, error %d, expected value 1\n", func_name, ret, GetLastError()); /* U+3095: HIRAGANA LETTER SMALL KA was added in Unicode 3.2 */ - todo_wine ok(buf2[0] == 0x3095 || broken(buf2[0] == 0x30f5 /* Vista and earlier versions */), + ok(buf2[0] == 0x3095 || broken(buf2[0] == 0x30f5 /* Vista and earlier versions */), "%s expected %04x, got %04x\n", func_name, 0x3095, buf2[0]); /* test LCMAP_KATAKANA | LCMAP_LOWERCASE */

1 0

Akihiro Sagawa : kernel32/tests: Add LCMAP_TITLECASE test.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 6a50e362f49b4a765b35256a5c20507a2b503565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a50e362f49b4a765b35256a5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:12 2016 +0900 kernel32/tests: Add LCMAP_TITLECASE test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a37d367..3783c9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -38,6 +38,7 @@ static const WCHAR upper_case[] = {'\t','J','U','S','T','!',' ','A',',',' ','T','E','S','T',';',' ','S','T','R','I','N','G',' ','1','/','*','+','-','.','\r','\n',0}; static const WCHAR lower_case[] = {'\t','j','u','s','t','!',' ','a',',',' ','t','e','s','t',';',' ','s','t','r','i','n','g',' ','1','/','*','+','-','.','\r','\n',0}; +static const WCHAR title_case[] = {'\t','J','u','s','t','!',' ','A',',',' ','T','e','s','t',';',' ','S','t','r','i','n','g',' ','1','/','*','+','-','.','\r','\n',0}; static const WCHAR symbols_stripped[] = {'j','u','s','t','a','t','e','s','t','s','t','r','i','n','g','1',0}; static const WCHAR localeW[] = {'e','n','-','U','S',0}; static const WCHAR fooW[] = {'f','o','o',0}; @@ -2375,16 +2376,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; + /* LCMAP_LOWERCASE | LCMAP_UPPERCASE makes LCMAP_TITLECASE, so it's valid now. */ ret = func_ptr(LCMAP_LOWERCASE | LCMAP_UPPERCASE, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - if (broken(ret)) - ok(lstrcmpW(buf, upper_case) == 0, "Expected upper case string\n"); - else - { - ok(!ret, "%s LCMAP_LOWERCASE and LCMAP_UPPERCASE are mutually exclusive\n", func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - } + lower_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(title_case) + 1 || broken(!ret), + "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(title_case) + 1); + todo_wine ok(lstrcmpW(buf, title_case) == 0 || broken(!ret), + "Expected title case string\n"); /* test invalid flag combinations */ for (i = 0; i < sizeof(lcmap_invalid_flags)/sizeof(lcmap_invalid_flags[0]); i++) {

1 0

Akihiro Sagawa : kernel32: Zero is an invalid flag value.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 5fbdd644d6493c19eb3e2634fd2101b54661f336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbdd644d6493c19eb3e2634f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:10 2016 +0900 kernel32: Zero is an invalid flag value. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 3 ++- dlls/kernel32/tests/locale.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ce64fe6..24911e8 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3154,7 +3154,8 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW if ((flags & (LCMAP_LOWERCASE | LCMAP_UPPERCASE)) == (LCMAP_LOWERCASE | LCMAP_UPPERCASE) || (flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA)) == (LCMAP_HIRAGANA | LCMAP_KATAKANA) || (flags & (LCMAP_HALFWIDTH | LCMAP_FULLWIDTH)) == (LCMAP_HALFWIDTH | LCMAP_FULLWIDTH) || - (flags & (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) == (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) + (flags & (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) == (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE) || + !flags) { SetLastError(ERROR_INVALID_FLAGS); return 0; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c1dee00..a37d367 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2196,6 +2196,7 @@ static void test_CompareStringEx(void) } static const DWORD lcmap_invalid_flags[] = { + 0, LCMAP_HIRAGANA | LCMAP_KATAKANA, LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE,

1 0

Akihiro Sagawa : kernel32/tests: Consolidate duplicated code for invalid LCMapString flag tests.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 138dc2716e42a029edd476d11cb6362616fda6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=138dc2716e42a029edd476d11… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:07 2016 +0900 kernel32/tests: Consolidate duplicated code for invalid LCMapString flag tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 85 +++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 52 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 701f8d7..da33ff1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2195,9 +2195,16 @@ static void test_CompareStringEx(void) } +static const DWORD lcmap_invalid_flags[] = { + LCMAP_HIRAGANA | LCMAP_KATAKANA, + LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, + LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_LOWERCASE | SORT_STRINGSORT, +}; + static void test_LCMapStringA(void) { - int ret, ret2; + int ret, ret2, i; char buf[256], buf2[256]; static const char upper_case[] = "\tJUST! A, TEST; STRING 1/*+-.\r\n"; static const char lower_case[] = "\tjust! a, test; string 1/*+-.\r\n"; @@ -2217,30 +2224,18 @@ static void test_LCMapStringA(void) ok(GetLastError() == ERROR_INVALID_FLAGS, "unexpected error code %d\n", GetLastError()); - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_HIRAGANA | LCMAP_KATAKANA, - upper_case, -1, buf, sizeof(buf)); - ok(!ret, "LCMAP_HIRAGANA and LCMAP_KATAKANA are mutually exclusive\n"); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, - upper_case, -1, buf, sizeof(buf)); - ok(!ret, "LCMAP_HALFWIDTH | LCMAP_FULLWIDTH are mutually exclusive\n"); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, - upper_case, -1, buf, sizeof(buf)); - ok(!ret, "LCMAP_TRADITIONAL_CHINESE and LCMAP_SIMPLIFIED_CHINESE are mutually exclusive\n"); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - - /* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */ - SetLastError(0xdeadbeef); - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE | SORT_STRINGSORT, - upper_case, -1, buf, sizeof(buf)); - ok(GetLastError() == ERROR_INVALID_FLAGS, "expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - ok(!ret, "SORT_STRINGSORT without LCMAP_SORTKEY must fail\n"); + /* test invalid flag combinations */ + for (i = 0; i < sizeof(lcmap_invalid_flags)/sizeof(lcmap_invalid_flags[0]); i++) { + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret = LCMapStringA(LOCALE_USER_DEFAULT, lcmap_invalid_flags[i], + lower_case, -1, buf, sizeof(buf)); + ok(GetLastError() == ERROR_INVALID_FLAGS, + "LCMapStringA (flag %08x) unexpected error code %d\n", + lcmap_invalid_flags[i], GetLastError()); + ok(!ret, "LCMapStringA (flag %08x) should return 0, got %d\n", + lcmap_invalid_flags[i], ret); + } /* test LCMAP_LOWERCASE */ ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, @@ -2363,7 +2358,7 @@ typedef INT (*lcmapstring_wrapper)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *func_name) { - int ret, ret2; + int ret, ret2, i; WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; @@ -2378,32 +2373,18 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f func_name, GetLastError()); } - ret = func_ptr(LCMAP_HIRAGANA | LCMAP_KATAKANA, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(!ret, "%s LCMAP_HIRAGANA and LCMAP_KATAKANA are mutually exclusive\n", func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - - ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(!ret, "%s LCMAP_HALFWIDTH | LCMAP_FULLWIDTH are mutually exclusive\n", func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - - ret = func_ptr(LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(!ret, "%s LCMAP_TRADITIONAL_CHINESE and LCMAP_SIMPLIFIED_CHINESE are mutually exclusive\n", - func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - - /* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */ - SetLastError(0xdeadbeef); - ret = func_ptr(LCMAP_LOWERCASE | SORT_STRINGSORT, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s expected ERROR_INVALID_FLAGS, got %d\n", - func_name, GetLastError()); - ok(!ret, "%s SORT_STRINGSORT without LCMAP_SORTKEY must fail\n", func_name); + /* test invalid flag combinations */ + for (i = 0; i < sizeof(lcmap_invalid_flags)/sizeof(lcmap_invalid_flags[0]); i++) { + lstrcpyW(buf, fooW); + SetLastError(0xdeadbeef); + ret = func_ptr(lcmap_invalid_flags[i], + lower_case, -1, buf, sizeof(buf)); + ok(GetLastError() == ERROR_INVALID_FLAGS, + "%s (flag %08x) unexpected error code %d\n", + func_name, lcmap_invalid_flags[i], GetLastError()); + ok(!ret, "%s (flag %08x) should return 0, got %d\n", + func_name, lcmap_invalid_flags[i], ret); + } /* test LCMAP_LOWERCASE */ ret = func_ptr(LCMAP_LOWERCASE,

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 690 ( GK104) to the GPU list.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 7c261059d4f676fd16f98275b3432e38089ed932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c261059d4f676fd16f98275b… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Thu Sep 22 05:56:42 2016 +0200 wined3d: Add NVIDIA GTX 690 (GK104) to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a9a2922..783cd45 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1282,6 +1282,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1803,6 +1804,7 @@ cards_nvidia_binary[] = {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ + {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2166,7 +2168,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b47384..f1440ba 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1918,6 +1918,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0

Matteo Bruni : wined3d: Use unsigned constants in shifts.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: da7d53782f4f44d0cba2ae7bb9bd764db53d1478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7d53782f4f44d0cba2ae7bb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 22 20:39:39 2016 +0200 wined3d: Use unsigned constants in shifts. 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> --- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/utils.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fbba284..1c37e1c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9163,7 +9163,7 @@ static void glsl_vertex_pointsprite_core(struct wined3d_context *context, static void glsl_vertex_pipe_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; } static void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, @@ -9591,7 +9591,7 @@ static void glsl_fragment_pipe_color_key(struct wined3d_context *context, static void glsl_fragment_pipe_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_PIXEL; + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa654ff..0dae0d0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4953,10 +4953,10 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, case WINED3DFMT_R8G8B8X8_UNORM: case WINED3DFMT_R16G16_UNORM: case WINED3DFMT_B10G10R10A2_UNORM: - slop.r = 0.5f / ((1 << format->red_size) - 1); - slop.g = 0.5f / ((1 << format->green_size) - 1); - slop.b = 0.5f / ((1 << format->blue_size) - 1); - slop.a = 0.5f / ((1 << format->alpha_size) - 1); + slop.r = 0.5f / ((1u << format->red_size) - 1); + slop.g = 0.5f / ((1u << format->green_size) - 1); + slop.b = 0.5f / ((1u << format->blue_size) - 1); + slop.a = 0.5f / ((1u << format->alpha_size) - 1); float_colors[0].r = color_to_float(key->color_space_low_value, format->red_size, format->red_offset) - slop.r;

1 0

Huw Davies : wordpad: Only read up to the maximum number of recent files from the menu.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 9b701eb7eb2fad167516e1759591eb2233977a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b701eb7eb2fad167516e1759… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 23 12:01:28 2016 +0100 wordpad: Only read up to the maximum number of recent files from the menu. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 6f7f14b..1381116 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -283,7 +283,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) for(i = 0; i < FILELIST_ENTRIES; i++) pFiles[i] = NULL; - for(i = 0; GetMenuItemInfoW(hMenu, ID_FILE_RECENT1+i, FALSE, &mi); i++) + for(i = 0; i < FILELIST_ENTRIES && GetMenuItemInfoW(hMenu, ID_FILE_RECENT1+i, FALSE, &mi); i++) pFiles[i] = (LPWSTR)mi.dwItemData; if(lstrcmpiW(newFile, pFiles[0]))

1 0

Alexandre Julliard : server: Get rid of the clipboard sequence number update hack.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 99408d78597027e709fba465f3effd4bbdf2740f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99408d78597027e709fba465f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 14:16:56 2016 +0900 server: Get rid of the clipboard sequence number update hack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 43172ae..189bef2 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -46,7 +46,6 @@ struct clipboard user_handle_t viewer; /* first window in clipboard viewer list */ unsigned int seqno; /* clipboard change sequence number */ unsigned int open_seqno; /* sequence number at open time */ - timeout_t seqno_timestamp; /* time stamp of last seqno increment */ unsigned int listen_size; /* size of listeners array */ unsigned int listen_count; /* count of listeners */ user_handle_t *listeners; /* array of listener windows */ @@ -78,8 +77,6 @@ static const struct object_ops clipboard_ops = }; -#define MINUPDATELAPSE (2 * TICKS_PER_SEC) - /* dump a clipboard object */ static void clipboard_dump( struct object *obj, int verbose ) { @@ -115,7 +112,6 @@ static struct clipboard *get_process_clipboard(void) clipboard->owner_win = 0; clipboard->viewer = 0; clipboard->seqno = 0; - clipboard->seqno_timestamp = 0; clipboard->listen_size = 0; clipboard->listen_count = 0; clipboard->listeners = NULL; @@ -244,17 +240,6 @@ static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t w } -static int get_seqno( struct clipboard *clipboard ) -{ - if (!clipboard->owner_thread && (current_time - clipboard->seqno_timestamp > MINUPDATELAPSE)) - { - clipboard->seqno_timestamp = current_time; - clipboard->seqno++; - } - return clipboard->seqno; -} - - /* open the clipboard */ DECL_HANDLER(open_clipboard) { @@ -314,7 +299,7 @@ DECL_HANDLER(set_clipboard_info) if (req->flags & SET_CB_SEQNO) clipboard->seqno++; - reply->seqno = get_seqno( clipboard ); + reply->seqno = clipboard->seqno; if (clipboard->open_thread) reply->flags |= CB_OPEN_ANY; if (clipboard->open_thread == current) reply->flags |= CB_OPEN; @@ -371,7 +356,7 @@ DECL_HANDLER(get_clipboard_info) reply->window = clipboard->open_win; reply->owner = clipboard->owner_win; reply->viewer = clipboard->viewer; - reply->seqno = get_seqno( clipboard ); + reply->seqno = clipboard->seqno; }

1 0