September 2016 - Wine-Commits

Alexandre Julliard : winex11: If multiple clipboard formats can be exported, use the first available one.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: df9ff6872cf36f4f025d81c329ec5ac709d1bfef URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9ff6872cf36f4f025d81c32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 12:20:32 2016 +0900 winex11: If multiple clipboard formats can be exported, use the first available one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0850448..f557c80 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1793,27 +1793,37 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target */ static BOOL export_selection( Display *display, Window win, Atom prop, Atom target ) { - struct clipboard_format *format = X11DRV_CLIPBOARD_LookupProperty( NULL, target ); + struct clipboard_format *format; HANDLE handle = 0; - BOOL ret = FALSE; - - if (!format || !format->export) return FALSE; - - TRACE( "win %lx prop %s target %s exporting %s\n", win, - debugstr_xatom( prop ), debugstr_xatom( target ), debugstr_format( format->id ) ); - - if (!format->id) return format->export( display, win, prop, target, 0 ); + BOOL open = FALSE, ret = FALSE; - if (!OpenClipboard( 0 )) + LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) { - ERR( "failed to open clipboard for %s\n", debugstr_format( format->id )); - return FALSE; - } - - if ((handle = GetClipboardData( format->id ))) - ret = format->export( display, win, prop, target, handle ); + if (format->atom != target) continue; + if (!format->export) continue; + if (!format->id) + { + TRACE( "win %lx prop %s target %s\n", win, debugstr_xatom( prop ), debugstr_xatom( target )); + ret = format->export( display, win, prop, target, 0 ); + break; + } + if (!open && !(open = OpenClipboard( 0 ))) + { + ERR( "failed to open clipboard for %s\n", debugstr_xatom( target )); + return FALSE; + } + if ((handle = GetClipboardData( format->id ))) + { + TRACE( "win %lx prop %s target %s exporting %s %p\n", + win, debugstr_xatom( prop ), debugstr_xatom( target ), + debugstr_format( format->id ), handle ); - CloseClipboard(); + ret = format->export( display, win, prop, target, handle ); + break; + } + /* keep looking for another Win32 format mapping to the same target */ + } + if (open) CloseClipboard(); return ret; }

1 0

Huw Davies : riched20: Don' t clear the existing mask when reading a \ltrpar .
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 8d8895bfac0367e2dd4e30490d3522aed9c976d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8895bfac0367e2dd4e30490… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 23 15:15:49 2016 +0100 riched20: Don't clear the existing mask when reading a \ltrpar . Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9c54623..e74b7ee 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -864,7 +864,7 @@ void ME_RTFParAttrHook(RTF_Info *info) info->fmt.wEffects |= PFE_RTLPARA; break; case rtfLTRPar: - info->fmt.dwMask = PFM_RTLPARA; + info->fmt.dwMask |= PFM_RTLPARA; info->fmt.wEffects &= ~PFE_RTLPARA; break; }

1 0

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

Sept. 23, 2016

Module: wine Branch: master Commit: 12c547919f2760595a7bbf8566da6e45a89344e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c547919f2760595a7bbf856… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:19 2016 +0900 kernel32: Implement LCMAP_KATAKANA. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 13 ++++++++++++- dlls/kernel32/tests/locale.c | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index de1a28c..842922a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3194,7 +3194,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW } if (((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) || - ((flags & LCMAP_HIRAGANA) && + ((flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA)) && (flags & (LCMAP_SIMPLIFIED_CHINESE | LCMAP_TRADITIONAL_CHINESE)))) { SetLastError(ERROR_INVALID_FLAGS); @@ -3281,6 +3281,17 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW *dst_ptr -= 0x60; } } + else if (flags & LCMAP_KATAKANA) + { + /* map hiragana to katakana, e.g. U+3041 -> U+30A1. + we can't use C3_HIRAGANA as some characters can't map to katakana */ + for (len = dst_ptr - dst, dst_ptr = dst; len; len--, dst_ptr++) + { + if ((*dst_ptr >= 0x3041 && *dst_ptr <= 0x3096) || + *dst_ptr == 0x309D || *dst_ptr == 0x309E) + *dst_ptr += 0x60; + } + } done: if (srclen) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 94d3d8a..5721979 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2210,6 +2210,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_HIRAGANA | NORM_IGNORESYMBOLS, LCMAP_HIRAGANA | LCMAP_SIMPLIFIED_CHINESE, LCMAP_HIRAGANA | LCMAP_TRADITIONAL_CHINESE, + LCMAP_KATAKANA | NORM_IGNORENONSPACE, + LCMAP_KATAKANA | NORM_IGNORESYMBOLS, + LCMAP_KATAKANA | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_KATAKANA | LCMAP_TRADITIONAL_CHINESE, }; static void test_LCMapStringA(void) @@ -2452,7 +2456,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(katakana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, ret, GetLastError(), lstrlenW(katakana_text) + 1); - todo_wine ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); + ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); /* test LCMAP_FULLWIDTH */ ret = func_ptr(LCMAP_FULLWIDTH,

1 0

Akihiro Sagawa : kernel32: Short circuit required length calculation.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 5d907050e235e7545c0c7f8fc0f041726e3db5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d907050e235e7545c0c7f8fc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:15 2016 +0900 kernel32: Short circuit required length calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 24911e8..422d63f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3207,17 +3207,22 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { INT len; - for (len = 0; srclen; src++, srclen--) + if (flags & NORM_IGNORESYMBOLS) { - WCHAR wch = *src; - /* tests show that win2k just ignores NORM_IGNORENONSPACE, - * and skips white space and punctuation characters for - * NORM_IGNORESYMBOLS. - */ - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - len++; + for (len = 0; srclen; src++, srclen--) + { + WCHAR wch = *src; + /* tests show that win2k just ignores NORM_IGNORENONSPACE, + * and skips white space and punctuation characters for + * NORM_IGNORESYMBOLS. + */ + if (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE)) + continue; + len++; + } } + else + len = srclen; return len; }

1 0

Akihiro Sagawa : kernel32/tests: Add more mapping tests for LCMapString.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: a901b68f5995deca4a7dc4b2fb2a20ee04d810d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a901b68f5995deca4a7dc4b2f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:13 2016 +0900 kernel32/tests: Add more mapping tests for LCMapString. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3783c9e..5e149d8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2372,6 +2372,22 @@ typedef INT (*lcmapstring_wrapper)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *func_name) { + const static WCHAR japanese_text[] = { + 0x3044, 0x309d, 0x3084, 0x3001, 0x30a4, 0x30fc, 0x30cf, + 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x306e, 0x2026, 0 + }; + const static WCHAR hiragana_text[] = { + 0x3044, 0x309d, 0x3084, 0x3001, 0x3044, 0x30fc, 0x306f, + 0x3068, 0x30fc, 0x3094, 0x3049, 0x306e, 0x2026, 0 + }; + const static WCHAR katakana_text[] = { + 0x30a4, 0x30fd, 0x30e4, 0x3001, 0x30a4, 0x30fc, 0x30cf, + 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x30ce, 0x2026, 0 + }; + const static WCHAR halfwidth_text[] = { + 0x3044, 0x309d, 0x3084, 0xff64, 0xff72, 0xff70, 0xff8a, + 0xff84, 0xff70, 0xff73, 0xff9e, 0xff6b, 0x306e, 0x2026, 0 + }; int ret, ret2, i; WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; @@ -2412,6 +2428,59 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ret, GetLastError(), lstrlenW(lower_case) + 1); ok(!lstrcmpW(buf, upper_case), "%s string compare mismatch\n", func_name); + /* test LCMAP_HIRAGANA */ + ret = func_ptr(LCMAP_HIRAGANA, + 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); + + 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 */), + "%s expected %04x, got %04x\n", func_name, 0x3095, buf2[0]); + + /* test LCMAP_KATAKANA | LCMAP_LOWERCASE */ + ret = func_ptr(LCMAP_KATAKANA | LCMAP_LOWERCASE, + japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == lstrlenW(katakana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(katakana_text) + 1); + todo_wine ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); + + /* test LCMAP_FULLWIDTH */ + ret = func_ptr(LCMAP_FULLWIDTH, + halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(japanese_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(japanese_text) + 1); + todo_wine ok(!lstrcmpW(buf, japanese_text), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_FULLWIDTH, halfwidth_text, -1, NULL, 0); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret2, ret); + + /* test LCMAP_FULLWIDTH | LCMAP_HIRAGANA + (half-width katakana is converted into full-wdith hiragana) */ + ret = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, + halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine 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); + + ret2 = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, halfwidth_text, -1, NULL, 0); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + + /* test LCMAP_HALFWIDTH */ + ret = func_ptr(LCMAP_HALFWIDTH, + japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(halfwidth_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(halfwidth_text) + 1); + todo_wine ok(!lstrcmpW(buf, halfwidth_text), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, NULL, 0); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* test buffer overflow */ SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_UPPERCASE, @@ -2419,6 +2488,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + /* KATAKANA LETTER GA (U+30AC) is converted into two half-width characters. + Thus, it requires two WCHARs. */ + buf[0] = 0x30ac; + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH, buf, 1, buf2, 1); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */ lstrcpyW(buf, lower_case); ret = func_ptr(LCMAP_UPPERCASE,

1 0

Akihiro Sagawa : kernel32: Do not allow to combine NORM_IGNORENONSPACE and /or NORM_IGNORESYMBOLS with other LCMAP flags.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 70a6546753ba5140a6c8d0358895168dd4614462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a6546753ba5140a6c8d0358… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:09 2016 +0900 kernel32: Do not allow to combine NORM_IGNORENONSPACE and/or NORM_IGNORESYMBOLS with other LCMAP flags. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 16 ++++++++-------- dlls/kernel32/tests/locale.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b04d190..ce64fe6 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3190,6 +3190,12 @@ 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))) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } if (srclen < 0) srclen = strlenW(src) + 1; @@ -3218,10 +3224,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { for (dst_ptr = dst; srclen && dstlen; src++, srclen--) { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = toupperW(wch); + *dst_ptr++ = toupperW(*src); dstlen--; } } @@ -3229,10 +3232,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { for (dst_ptr = dst; srclen && dstlen; src++, srclen--) { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = tolowerW(wch); + *dst_ptr++ = tolowerW(*src); dstlen--; } } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index da33ff1..c1dee00 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2200,6 +2200,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, LCMAP_LOWERCASE | SORT_STRINGSORT, + LCMAP_UPPERCASE | NORM_IGNORESYMBOLS, + LCMAP_LOWERCASE | NORM_IGNORESYMBOLS, + LCMAP_UPPERCASE | NORM_IGNORENONSPACE, + LCMAP_LOWERCASE | NORM_IGNORENONSPACE, }; static void test_LCMapStringA(void) @@ -2346,6 +2350,14 @@ static void test_LCMapStringA(void) lstrlenA(symbols_stripped) + 1, ret); ok(!lstrcmpA(buf, symbols_stripped), "LCMapStringA should return %s, but not %s\n", lower_case, buf); + /* test NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE */ + lstrcpyA(buf, "foo"); + ret = LCMapStringA(LOCALE_USER_DEFAULT, NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE, + lower_case, -1, buf, sizeof(buf)); + ok(ret == lstrlenA(symbols_stripped) + 1, "LCMapStringA should return %d, ret = %d\n", + lstrlenA(symbols_stripped) + 1, ret); + ok(!lstrcmpA(buf, symbols_stripped), "LCMapStringA should return %s, but not %s\n", lower_case, buf); + /* test srclen = 0 */ SetLastError(0xdeadbeef); ret = LCMapStringA(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf)); @@ -2480,6 +2492,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(symbols_stripped) + 1, ret); ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + /* test NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE */ + lstrcpyW(buf, fooW); + ret = func_ptr(NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE, + lower_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == lstrlenW(symbols_stripped) + 1, "%s func_ptr should return %d, ret = %d\n", func_name, + lstrlenW(symbols_stripped) + 1, ret); + ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + /* test srclen = 0 */ SetLastError(0xdeadbeef); ret = func_ptr(0, upper_case, 0, buf, sizeof(buf)/sizeof(WCHAR));

1 0

Matteo Bruni : wined3d: Fix a bunch of typos.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: d1bc192b294a16a3ded1f64d350e31b8a92e27e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bc192b294a16a3ded1f64d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 22 20:39:37 2016 +0200 wined3d: Fix a bunch of typos. 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/context.c | 6 +++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/utils.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f5311af..b5a4589 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -551,7 +551,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, rt_texture = render_targets[i]->container; TRACE(" Color attachment %u: %p format %s, %s %u, %ux%u, %u samples.\n", i, render_targets[i], debug_d3dformat(rt_texture->resource.format->id), - context->fbo_key->rb_namespace & (1 << (i + 1)) ? "renderbuffer" : "texure", + context->fbo_key->rb_namespace & (1 << (i + 1)) ? "renderbuffer" : "texture", context->fbo_key->objects[i + 1].object, wined3d_texture_get_level_pow2_width(rt_texture, render_targets[i]->texture_level), wined3d_texture_get_level_pow2_height(rt_texture, render_targets[i]->texture_level), @@ -563,7 +563,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, ds_texture = depth_stencil->container; TRACE(" Depth attachment: %p format %s, %s %u, %ux%u, %u samples.\n", depth_stencil, debug_d3dformat(ds_texture->resource.format->id), - context->fbo_key->rb_namespace & (1 << 0) ? "renderbuffer" : "texure", + context->fbo_key->rb_namespace & (1 << 0) ? "renderbuffer" : "texture", context->fbo_key->objects[0].object, wined3d_texture_get_level_pow2_width(ds_texture, depth_stencil->texture_level), wined3d_texture_get_level_pow2_height(ds_texture, depth_stencil->texture_level), @@ -1920,7 +1920,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment); checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);"); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"); + checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 1);"); if (gl_info->supported[ARB_VERTEX_BLEND]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9bdc773..1b0d018 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3662,7 +3662,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state { /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest - * mimap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL + * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL * corresponds to GL_TEXTURE_BASE_LEVEL. */ gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); gl_tex->base_level = base_level; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cf909de..aa654ff 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1882,8 +1882,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info case WINED3D_GL_RES_TYPE_TEX_3D: gl_info->gl_ops.gl.p_glGenTextures(1, object); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, *object); - GL_EXTCALL(glTexImage3D)(GL_TEXTURE_3D, 0, internal, 16, 16, 16, 0, - format, type, NULL); + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, 0, internal, 16, 16, 16, 0, format, type, NULL)); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -2321,7 +2320,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for } delete_fbo_attachment(gl_info, type, object); - checkGLcall("Framebuffer format check cleaup"); + checkGLcall("Framebuffer format check cleanup"); } if (fallback_fmt_used && regular_fmt_used)

1 0

Michael Stefaniuc : jscript: Use the existing helpers to get from a jsdisp_t to an Instance.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 55f6e3c350e35d6bdbadf58bdbacd97b9f26075e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f6e3c350e35d6bdbadf58bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 22 09:56:28 2016 +0200 jscript: Use the existing helpers to get from a jsdisp_t to an Instance. 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/array.c | 6 +++--- dlls/jscript/date.c | 2 +- dlls/jscript/function.c | 14 +++++++------- dlls/jscript/jsregexp.c | 10 +++++----- dlls/jscript/string.c | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index eda49cb..d17b605 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -103,7 +103,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, static HRESULT set_length(jsdisp_t *obj, DWORD length) { if(is_class(obj, JSCLASS_ARRAY)) { - ((ArrayInstance*)obj)->length = length; + array_from_jsdisp(obj)->length = length; return S_OK; } @@ -191,7 +191,7 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len) jsobj = iface_to_jsdisp(obj); if(jsobj) { if(is_class(jsobj, JSCLASS_ARRAY)) { - hres = concat_array(array, (ArrayInstance*)jsobj, len); + hres = concat_array(array, array_from_jsdisp(jsobj), len); jsdisp_release(jsobj); return hres; } @@ -1022,7 +1022,7 @@ static void Array_destructor(jsdisp_t *dispex) static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) { - ArrayInstance *array = (ArrayInstance*)dispex; + ArrayInstance *array = array_from_jsdisp(dispex); const WCHAR *ptr = name; DWORD id = 0; diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index a66a286..21a359a 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2424,7 +2424,7 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(FAILED(hres)) return hres; - di = (DateInstance*)date; + di = date_from_jsdisp(date); di->time = utc(di->time, di); } } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 04dcb18..8480a3b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -81,7 +81,7 @@ static HRESULT Arguments_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static void Arguments_destructor(jsdisp_t *jsdisp) { - ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); TRACE("(%p)\n", arguments); @@ -98,7 +98,7 @@ static void Arguments_destructor(jsdisp_t *jsdisp) static unsigned Arguments_idx_length(jsdisp_t *jsdisp) { - ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); return arguments->argc; } @@ -113,7 +113,7 @@ static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx) static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) { - ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); jsval_t *ref; TRACE("%p[%u]\n", arguments, idx); @@ -127,7 +127,7 @@ static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val) { - ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); jsval_t *ref; HRESULT hres; @@ -327,7 +327,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi TRACE("func %p this %p\n", func_this, jsthis); assert(is_class(func_this, JSCLASS_FUNCTION)); - function = (FunctionInstance*)func_this; + function = function_from_jsdisp(func_this); flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(function->value_proc) @@ -530,7 +530,7 @@ HRESULT Function_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return E_FAIL; } - function = (FunctionInstance*)jsthis->u.jsdisp; + function = function_from_jsdisp(jsthis->u.jsdisp); assert(function->value_proc != NULL); return invoke_value_proc(ctx, function, NULL, flags, argc, argv, r); @@ -577,7 +577,7 @@ static HRESULT Function_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval static void Function_destructor(jsdisp_t *dispex) { - FunctionInstance *This = (FunctionInstance*)dispex; + FunctionInstance *This = function_from_jsdisp(dispex); if(This->code) release_bytecode(This->code); diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index a9924ee..5798635 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -125,7 +125,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, jsstr_t *jsstr, match_state_t **ret) { - RegExpInstance *regexp = (RegExpInstance*)dispex; + RegExpInstance *regexp = regexp_from_jsdisp(dispex); match_state_t *match; heap_pool_t *mark; const WCHAR *str; @@ -182,7 +182,7 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *jsstr, BOOL gflag, match_result_t **match_result, DWORD *result_cnt) { - RegExpInstance *This = (RegExpInstance*)dispex; + RegExpInstance *This = regexp_from_jsdisp(dispex); match_result_t *ret = NULL; match_state_t *result; DWORD i=0, ret_size = 0; @@ -596,7 +596,7 @@ static HRESULT RegExp_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi static void RegExp_destructor(jsdisp_t *dispex) { - RegExpInstance *This = (RegExpInstance*)dispex; + RegExpInstance *This = regexp_from_jsdisp(dispex); if(This->jsregexp) regexp_destroy(This->jsregexp); @@ -708,7 +708,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg obj = iface_to_jsdisp(get_object(src_arg)); if(obj) { if(is_class(obj, JSCLASS_REGEXP)) { - RegExpInstance *regexp = (RegExpInstance*)obj; + RegExpInstance *regexp = regexp_from_jsdisp(obj); hres = create_regexp(ctx, regexp->str, regexp->jsregexp->flags, ret); jsdisp_release(obj); @@ -754,7 +754,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsv static const WCHAR inputW[] = {'i','n','p','u','t',0}; static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; - RegExpInstance *regexp = (RegExpInstance*)re; + RegExpInstance *regexp = regexp_from_jsdisp(re); match_result_t *match_result; unsigned match_cnt, i; const WCHAR *str; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b5c0197..ad978f2 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -111,7 +111,7 @@ static HRESULT get_string_flat_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t * static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { - StringInstance *string = (StringInstance*)jsthis; + StringInstance *string = string_from_jsdisp(jsthis); TRACE("%p\n", jsthis); @@ -1480,7 +1480,7 @@ static HRESULT String_localeCompare(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla static HRESULT String_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { - StringInstance *This = (StringInstance*)jsthis; + StringInstance *This = string_from_jsdisp(jsthis); TRACE("\n"); @@ -1490,7 +1490,7 @@ static HRESULT String_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) static void String_destructor(jsdisp_t *dispex) { - StringInstance *This = (StringInstance*)dispex; + StringInstance *This = string_from_jsdisp(dispex); jsstr_release(This->str); heap_free(This); @@ -1498,7 +1498,7 @@ static void String_destructor(jsdisp_t *dispex) static unsigned String_idx_length(jsdisp_t *jsdisp) { - StringInstance *string = (StringInstance*)jsdisp; + StringInstance *string = string_from_jsdisp(jsdisp); /* * NOTE: For invoke version < 2, indexed array is not implemented at all. @@ -1512,7 +1512,7 @@ static unsigned String_idx_length(jsdisp_t *jsdisp) static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) { - StringInstance *string = (StringInstance*)jsdisp; + StringInstance *string = string_from_jsdisp(jsdisp); jsstr_t *ret; ret = jsstr_substr(string->str, idx, 1);

1 0

Alexandre Julliard : winex11: Implement the UpdateClipboard entry point to refresh the cache.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: adf96003a50a42b074ddb8c33c79052414d73db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf96003a50a42b074ddb8c33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 14:07:59 2016 +0900 winex11: Implement the UpdateClipboard entry point to refresh the cache. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 74 +++++++++++---------------------------- dlls/winex11.drv/winex11.drv.spec | 1 + 2 files changed, 22 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9e1c8a3..cc4f92f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -95,6 +95,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define SELECTION_RETRIES 500 /* wait for .5 seconds */ #define SELECTION_WAIT 1000 /* us */ +#define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ + /* Selection masks */ #define S_NOSELECTION 0 #define S_PRIMARY 1 @@ -224,10 +226,6 @@ static unsigned int nb_current_x11_formats; static struct list data_list = LIST_INIT( data_list ); static UINT ClipDataCount = 0; -/* - * Clipboard sequence number - */ -static UINT wSeqNo = 0; /************************************************************************** * Internal Clipboard implementation methods @@ -587,39 +585,6 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) /************************************************************************** - * X11DRV_CLIPBOARD_UpdateCache - */ -static BOOL X11DRV_CLIPBOARD_UpdateCache(void) -{ - BOOL bret = TRUE; - - if (!selectionAcquired) - { - DWORD seqno = GetClipboardSequenceNumber(); - - if (!seqno) - { - ERR("Failed to retrieve clipboard information.\n"); - bret = FALSE; - } - else if (wSeqNo < seqno) - { - empty_clipboard(); - - if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) - { - ERR("Failed to cache clipboard data owned by another process.\n"); - bret = FALSE; - } - wSeqNo = seqno; - } - } - - return bret; -} - - -/************************************************************************** * X11DRV_CLIPBOARD_RenderFormat */ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData) @@ -2379,8 +2344,6 @@ void CDECL X11DRV_EmptyClipboard(void) */ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) { - if (!owner) X11DRV_CLIPBOARD_UpdateCache(); - return X11DRV_CLIPBOARD_InsertClipboardData( wFormat, hData ); } @@ -2390,10 +2353,6 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) */ INT CDECL X11DRV_CountClipboardFormats(void) { - X11DRV_CLIPBOARD_UpdateCache(); - - TRACE(" count=%d\n", ClipDataCount); - return ClipDataCount; } @@ -2405,10 +2364,6 @@ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) { struct list *ptr = NULL; - TRACE("(%04X)\n", wFormat); - - X11DRV_CLIPBOARD_UpdateCache(); - if (!wFormat) { ptr = list_head( &data_list ); @@ -2431,10 +2386,6 @@ BOOL CDECL X11DRV_IsClipboardFormatAvailable(UINT wFormat) { BOOL bRet = FALSE; - TRACE("(%04X)\n", wFormat); - - X11DRV_CLIPBOARD_UpdateCache(); - if (wFormat != 0 && X11DRV_CLIPBOARD_LookupData(wFormat)) bRet = TRUE; @@ -2453,8 +2404,6 @@ HANDLE CDECL X11DRV_GetClipboardData(UINT wFormat) TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(); - if ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat))) { if ( !lpRender->hData ) @@ -2469,6 +2418,25 @@ HANDLE CDECL X11DRV_GetClipboardData(UINT wFormat) /************************************************************************** + * X11DRV_UpdateClipboard + */ +void CDECL X11DRV_UpdateClipboard(void) +{ + static ULONG last_update; + ULONG now; + + if (selectionAcquired) return; + now = GetTickCount(); + if ((int)(now - last_update) <= SELECTION_UPDATE_DELAY) return; + last_update = now; + + empty_clipboard(); + if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) + ERR("Failed to cache clipboard data owned by another process.\n"); +} + + +/************************************************************************** * ResetSelectionOwner * * Called when the thread owning the selection is destroyed and we need to diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 54afd83..a3e847c 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -47,6 +47,7 @@ @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl ShowWindow(long long ptr long) X11DRV_ShowWindow @ cdecl SysCommand(long long long) X11DRV_SysCommand +@ cdecl UpdateClipboard() X11DRV_UpdateClipboard @ cdecl UpdateLayeredWindow(long ptr ptr) X11DRV_UpdateLayeredWindow @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanging

1 0

Alexandre Julliard : user32: Add an UpdateClipboard entry point to allow the driver to refresh the clipboard before it 's open.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 11c3867349be49768f1364453fff8b7e4f912098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c3867349be49768f1364453… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 14:07:08 2016 +0900 user32: Add an UpdateClipboard entry point to allow the driver to refresh the clipboard before it's open. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 14 ++++++++++++-- dlls/user32/driver.c | 12 ++++++++++++ dlls/user32/user_private.h | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 1693aae..43729e6 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -523,6 +523,8 @@ BOOL WINAPI OpenClipboard( HWND hwnd ) TRACE( "%p\n", hwnd ); + USER_Driver->pUpdateClipboard(); + SERVER_START_REQ( open_clipboard ) { req->window = wine_server_user_handle( hwnd ); @@ -759,7 +761,11 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) */ INT WINAPI CountClipboardFormats(void) { - INT count = USER_Driver->pCountClipboardFormats(); + INT count; + + USER_Driver->pUpdateClipboard(); + + count = USER_Driver->pCountClipboardFormats(); TRACE("returning %d\n", count); return count; } @@ -790,7 +796,11 @@ UINT WINAPI EnumClipboardFormats( UINT format ) */ BOOL WINAPI IsClipboardFormatAvailable( UINT format ) { - BOOL ret = USER_Driver->pIsClipboardFormatAvailable( format ); + BOOL ret; + + USER_Driver->pUpdateClipboard(); + + ret = USER_Driver->pIsClipboardFormatAvailable( format ); TRACE( "%s -> %u\n", debugstr_format( format ), ret ); return ret; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 32acf28..1745b50 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -128,6 +128,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(EnumClipboardFormats); GET_USER_FUNC(IsClipboardFormatAvailable); GET_USER_FUNC(EndClipboardUpdate); + GET_USER_FUNC(UpdateClipboard); GET_USER_FUNC(ChangeDisplaySettingsEx); GET_USER_FUNC(EnumDisplayMonitors); GET_USER_FUNC(EnumDisplaySettingsEx); @@ -369,6 +370,10 @@ static BOOL CDECL nulldrv_SetClipboardData( UINT format, HANDLE handle, BOOL own return FALSE; } +static void CDECL nulldrv_UpdateClipboard(void) +{ +} + static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode, HWND hwnd, DWORD flags, LPVOID lparam ) { @@ -548,6 +553,7 @@ static USER_DRIVER null_driver = nulldrv_GetClipboardData, nulldrv_IsClipboardFormatAvailable, nulldrv_SetClipboardData, + nulldrv_UpdateClipboard, /* display modes */ nulldrv_ChangeDisplaySettingsEx, nulldrv_EnumDisplayMonitors, @@ -716,6 +722,11 @@ static BOOL CDECL loaderdrv_SetClipboardData( UINT format, HANDLE handle, BOOL o return load_driver()->pSetClipboardData( format, handle, owner ); } +static void CDECL loaderdrv_UpdateClipboard(void) +{ + load_driver()->pUpdateClipboard(); +} + static LONG CDECL loaderdrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode, HWND hwnd, DWORD flags, LPVOID lparam ) { @@ -805,6 +816,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_GetClipboardData, loaderdrv_IsClipboardFormatAvailable, loaderdrv_SetClipboardData, + loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, loaderdrv_EnumDisplayMonitors, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c8b283a..3b9b200 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -87,6 +87,7 @@ typedef struct tagUSER_DRIVER { HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ BOOL (CDECL *pIsClipboardFormatAvailable)(UINT); /* Check if specified format is available */ BOOL (CDECL *pSetClipboardData)(UINT, HANDLE, BOOL); /* Set specified selection data */ + void (CDECL *pUpdateClipboard)(void); /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); BOOL (CDECL *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM);

1 0