wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Nikolay Sivov : kernel32/tests: Some more tests for SearchPath().
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 48c97ad0bc599c09be779eaf1ec762b94905bcf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c97ad0bc599c09be779eaf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 22 18:12:37 2013 +0400 kernel32/tests: Some more tests for SearchPath(). --- dlls/kernel32/tests/path.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7cfa19c..724beae 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1568,6 +1568,7 @@ static const char manifest_dep[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" " <file name=\"testdep.dll\" />" +" <file name=\"ole32\" />" " <file name=\"kernel32.dll\" />" "</assembly>"; @@ -1727,7 +1728,9 @@ static void test_SearchPathW(void) static const WCHAR testdeprelW[] = {'.','/','t','e','s','t','d','e','p','.','d','l','l',0}; static const WCHAR testdepW[] = {'t','e','s','t','d','e','p','.','d','l','l',0}; static const WCHAR testdep1W[] = {'t','e','s','t','d','e','p',0}; - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + static const WCHAR kernel32dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; static const WCHAR extW[] = {'.','e','x','t',0}; static const WCHAR dllW[] = {'.','d','l','l',0}; static const WCHAR fileW[] = { 0 }; @@ -1772,9 +1775,16 @@ if (0) ret = pSearchPathW(NULL, testdepW, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathW(NULL, kernel32W, NULL, sizeof(path2W)/sizeof(WCHAR), path2W, NULL); + ret = pSearchPathW(NULL, kernel32dllW, NULL, sizeof(path2W)/sizeof(WCHAR), path2W, NULL); ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); + /* full path, name without 'dll' extension */ + GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ret = pSearchPathW(pathW, kernel32W, NULL, sizeof(path2W)/sizeof(WCHAR), path2W, NULL); + ok(ret == 0, "got %d\n", ret); + + GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ret = pActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); @@ -1799,11 +1809,15 @@ if (0) ret = pSearchPathW(pathW, testdepW, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); ok(!ret, "got %d\n", ret); - /* path is redirect for wellknown names too */ - ret = pSearchPathW(NULL, kernel32W, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); + /* path is redirected for wellknown names too, meaning it takes precedence over normal search order */ + ret = pSearchPathW(NULL, kernel32dllW, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ok(lstrcmpW(buffW, path2W), "got wrong path %s, %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(path2W)); + /* path is built using on manifest file name */ + ret = pSearchPathW(NULL, ole32W, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, NULL); + ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); + ret = pDeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); pReleaseActCtx(handle);

1 0

Nikolay Sivov : kernel32/tests: Test for LoadLibraryEx() with full path without extension.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 2ab000267488076ce0c0c9e018e57ec5294f640b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab000267488076ce0c0c9e01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 22 18:12:56 2013 +0400 kernel32/tests: Test for LoadLibraryEx() with full path without extension. --- dlls/kernel32/tests/module.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 992f0ec..0d140a4 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -348,7 +348,7 @@ static void testLoadLibraryEx(void) if (!hmodule) /* succeeds on xp and older */ ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); - CloseHandle(hmodule); + FreeLibrary(hmodule); /* load kernel32.dll with no path */ SetLastError(0xdeadbeef); @@ -358,7 +358,7 @@ static void testLoadLibraryEx(void) GetLastError() == ERROR_SUCCESS, /* win9x */ "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); - CloseHandle(hmodule); + FreeLibrary(hmodule); GetCurrentDirectoryA(MAX_PATH, path); if (path[lstrlenA(path) - 1] != '\\') @@ -376,7 +376,7 @@ static void testLoadLibraryEx(void) broken(GetLastError() == ERROR_INVALID_HANDLE), /* nt4 */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - /* Free the loaded dll when its the first time this dll is loaded + /* Free the loaded dll when it's the first time this dll is loaded in process - First time should pass, second fail */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("comctl32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); @@ -389,8 +389,19 @@ static void testLoadLibraryEx(void) ret = FreeLibrary(hmodule); ok(!ret, "Unexpected ability to free the module, failed with %d\n", GetLastError()); - CloseHandle(hmodule); - + /* load with full path, name without extension */ + GetSystemDirectoryA(path, MAX_PATH); + if (path[lstrlenA(path) - 1] != '\\') + lstrcatA(path, "\\"); + lstrcatA(path, "kernel32"); + hmodule = LoadLibraryExA(path, NULL, 0); + ok(hmodule != NULL, "got %p\n", hmodule); + FreeLibrary(hmodule); + + /* same with alterate search path */ + hmodule = LoadLibraryExA(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + ok(hmodule != NULL, "got %p\n", hmodule); + FreeLibrary(hmodule); } static void testGetDllDirectory(void)

1 0

Jacek Caban : urlmon: Fixed tests on IE10.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 9c7057c226d10986dee59eb3ee225fb26e2aa943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7057c226d10986dee59eb3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 22 14:35:55 2013 +0100 urlmon: Fixed tests on IE10. --- dlls/urlmon/tests/uri.c | 14 ++++++++------ dlls/urlmon/uri.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 2aeb05d..7bd1e03 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4607,8 +4607,6 @@ static const invalid_uri invalid_uri_tests[] = { {"http://[::192.0]",0,FALSE}, /* Can't have elision of 1 h16 at beginning of address. */ {"http://[::2:3:4:5:6:7:8]",0,FALSE}, - /* Can't have elision of 1 h16 at end of address. */ - {"http://[1:2:3:4:5:6:7::]",0,FALSE}, /* Expects a valid IP Literal. */ {"ftp://[not.valid.uri]/",0,FALSE}, /* Expects valid port for a known scheme type. */ @@ -7420,10 +7418,14 @@ static void test_IUri_GetPropertyBSTR(void) { /* Make sure it handles a invalid Uri_PROPERTY's correctly. */ hr = IUri_GetPropertyBSTR(uri, Uri_PROPERTY_PORT, &received, 0); - ok(hr == S_OK, "Error: GetPropertyBSTR returned 0x%08x, expected 0x%08x.\n", hr, S_OK); - ok(received != NULL, "Error: Expected the string not to be NULL.\n"); - ok(!SysStringLen(received), "Error: Expected the string to be of len=0 but it was %d instead.\n", SysStringLen(received)); - SysFreeString(received); + ok(hr == E_INVALIDARG /* IE10 */ || broken(hr == S_OK), "Error: GetPropertyBSTR returned 0x%08x, expected E_INVALIDARG or S_OK.\n", hr); + if(SUCCEEDED(hr)) { + ok(received != NULL, "Error: Expected the string not to be NULL.\n"); + ok(!SysStringLen(received), "Error: Expected the string to be of len=0 but it was %d instead.\n", SysStringLen(received)); + SysFreeString(received); + }else { + ok(!received, "received = %s\n", wine_dbgstr_w(received)); + } /* Make sure it handles the ZONE property correctly. */ received = NULL; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 72e9053..963e60e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4279,16 +4279,16 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST return E_POINTER; if(uriProp > Uri_PROPERTY_STRING_LAST) { - /* Windows allocates an empty BSTR for invalid Uri_PROPERTY's. */ - *pbstrProperty = SysAllocStringLen(NULL, 0); - if(!(*pbstrProperty)) - return E_OUTOFMEMORY; - /* It only returns S_FALSE for the ZONE property... */ - if(uriProp == Uri_PROPERTY_ZONE) + if(uriProp == Uri_PROPERTY_ZONE) { + *pbstrProperty = SysAllocStringLen(NULL, 0); + if(!(*pbstrProperty)) + return E_OUTOFMEMORY; return S_FALSE; - else - return S_OK; + } + + *pbstrProperty = NULL; + return E_INVALIDARG; } /* Don't have support for flags yet. */

1 0

Piotr Caban : qcap: Fix ICaptureGraphBuilder2::RenderStream test failures.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 5a69b888f7a9d2e6fcad6f2a9d5d7977ffa14642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a69b888f7a9d2e6fcad6f2a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 12:17:27 2013 +0100 qcap: Fix ICaptureGraphBuilder2::RenderStream test failures. --- dlls/qcap/tests/qcap.c | 54 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index ecace3e..0d84d49 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -154,6 +154,8 @@ static const struct { filter_type filter_type; BOOL wine_missing; BOOL wine_extra; + BOOL optional; /* fails on wine if missing */ + BOOL broken; } renderstream_cat_media[] = { {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER}, {BASEFILTER_ENUMPINS, SOURCE_FILTER}, @@ -189,15 +191,20 @@ static const struct { {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, {KSPROPERTYSET_GET, SOURCE_FILTER, TRUE}, {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, - {PIN_ENUMMEDIATYPES, SOURCE_FILTER, TRUE}, - {ENUMMEDIATYPES_NEXT, SOURCE_FILTER, TRUE}, + {PIN_ENUMMEDIATYPES, SOURCE_FILTER, TRUE, FALSE, TRUE}, + {ENUMMEDIATYPES_NEXT, SOURCE_FILTER, TRUE, FALSE, TRUE}, {BASEFILTER_QUERYINTERFACE, SINK_FILTER, FALSE, TRUE}, {BASEFILTER_ENUMPINS, SINK_FILTER}, {ENUMPINS_NEXT, SINK_FILTER}, {PIN_QUERYDIRECTION, SINK_FILTER}, {PIN_CONNECTEDTO, SINK_FILTER}, {GRAPHBUILDER_CONNECT, NOT_FILTER}, - {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE}, + {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {PIN_QUERYDIRECTION, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {PIN_CONNECTEDTO, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, {END, NOT_FILTER} }, renderstream_intermediate[] = { {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER}, @@ -234,8 +241,8 @@ static const struct { {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, {KSPROPERTYSET_GET, SOURCE_FILTER, TRUE}, {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, - {PIN_ENUMMEDIATYPES, SOURCE_FILTER, TRUE}, - {ENUMMEDIATYPES_NEXT, SOURCE_FILTER, TRUE}, + {PIN_ENUMMEDIATYPES, SOURCE_FILTER, TRUE, FALSE, TRUE}, + {ENUMMEDIATYPES_NEXT, SOURCE_FILTER, TRUE, FALSE, TRUE}, {BASEFILTER_QUERYINTERFACE, SINK_FILTER, FALSE, TRUE}, {BASEFILTER_ENUMPINS, SINK_FILTER}, {ENUMPINS_NEXT, SINK_FILTER}, @@ -256,31 +263,56 @@ static const struct { {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, {GRAPHBUILDER_CONNECT, NOT_FILTER}, - {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE}, + {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {PIN_QUERYDIRECTION, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {PIN_CONNECTEDTO, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, FALSE, FALSE, FALSE, TRUE}, {END, NOT_FILTER} }, *current_calls_list; int call_no; static void check_calls_list(const char *func, call_id id, filter_type type) { - while(current_calls_list[call_no].wine_missing || current_calls_list[call_no].wine_extra) { + while(current_calls_list[call_no].wine_missing || current_calls_list[call_no].wine_extra || + current_calls_list[call_no].optional || current_calls_list[call_no].broken) { if(current_calls_list[call_no].wine_missing) { - todo_wine ok(current_calls_list[call_no].call_id == id && current_calls_list[call_no].filter_type == type, - "missing call, got %s(%d), expected %d\n", func, id, current_calls_list[call_no].call_id); + todo_wine ok((current_calls_list[call_no].call_id == id && current_calls_list[call_no].filter_type == type) || + broken(current_calls_list[call_no].optional && (current_calls_list[call_no].call_id != id || + current_calls_list[call_no].filter_type != type)), + "missing call, got %s(%d), expected %d (%d)\n", func, id, current_calls_list[call_no].call_id, call_no); if(current_calls_list[call_no].call_id != id || current_calls_list[call_no].filter_type != type) call_no++; else break; - }else { + }else if(current_calls_list[call_no].wine_extra) { todo_wine ok(current_calls_list[call_no].call_id != id || current_calls_list[call_no].filter_type != type, - "extra call, got %s(%d)\n", func, id); + "extra call, got %s(%d) (%d)\n", func, id, call_no); if(current_calls_list[call_no].call_id == id && current_calls_list[call_no].filter_type == type) { call_no++; return; } call_no++; + }else if(current_calls_list[call_no].optional) { + ok((current_calls_list[call_no].call_id == id && current_calls_list[call_no].filter_type == type) || + broken(current_calls_list[call_no].call_id != id || current_calls_list[call_no].filter_type != type), + "unexpected call: %s on %s (%d)\n", func, debugstr_filter_type(type), call_no); + + if(current_calls_list[call_no].call_id != id || current_calls_list[call_no].filter_type != type) + call_no++; + else + break; + }else if(current_calls_list[call_no].broken) { + ok(broken(current_calls_list[call_no].call_id == id && current_calls_list[call_no].filter_type == type) || + (current_calls_list[call_no].call_id != id || current_calls_list[call_no].filter_type != type), + "unexpected call: %s on %s (%d)\n", func, debugstr_filter_type(type), call_no); + + if(current_calls_list[call_no].call_id == id && current_calls_list[call_no].filter_type == type) + break; + call_no++; } }

1 0

Piotr Caban : qcap: Add AVI Mux QueryInterface tests.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 6702f445006e3f4806d7f6dc8d132f50c7b5bc8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6702f445006e3f4806d7f6dc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 12:17:05 2013 +0100 qcap: Add AVI Mux QueryInterface tests. --- dlls/qcap/tests/qcap.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index a710c03..ecace3e 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -993,12 +993,53 @@ static void test_CaptureGraphBuilder_RenderStream(void) ICaptureGraphBuilder2_Release(cgb); } +static void test_AviMux_QueryInterface(void) +{ + IUnknown *avimux, *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_AviDest, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&avimux); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), + "couldn't create AVI Mux filter, hr = %08x\n", hr); + if(hr != S_OK) { + win_skip("AVI Mux filter is not registered\n"); + return; + } + + hr = IUnknown_QueryInterface(avimux, &IID_IBaseFilter, (void**)&unk); + ok(hr == S_OK, "QueryInterface(IID_IBaseFilter) failed: %x\n", hr); + IUnknown_Release(unk); + + hr = IUnknown_QueryInterface(avimux, &IID_IConfigAviMux, (void**)&unk); + ok(hr == S_OK, "QueryInterface(IID_IConfigAviMux) failed: %x\n", hr); + IUnknown_Release(unk); + + hr = IUnknown_QueryInterface(avimux, &IID_IConfigInterleaving, (void**)&unk); + ok(hr == S_OK, "QueryInterface(IID_IConfigInterleaving) failed: %x\n", hr); + IUnknown_Release(unk); + + hr = IUnknown_QueryInterface(avimux, &IID_IMediaSeeking, (void**)&unk); + ok(hr == S_OK, "QueryInterface(IID_IMediaSeeking) failed: %x\n", hr); + IUnknown_Release(unk); + + hr = IUnknown_QueryInterface(avimux, &IID_IPersistMediaPropertyBag, (void**)&unk); + ok(hr == S_OK, "QueryInterface(IID_IPersistMediaPropertyBag) failed: %x\n", hr); + IUnknown_Release(unk); + + hr = IUnknown_QueryInterface(avimux, &IID_ISpecifyPropertyPages, (void**)&unk); + ok(hr == S_OK, "QueryInterface(IID_ISpecifyPropertyPages) failed: %x\n", hr); + IUnknown_Release(unk); + + IUnknown_Release(avimux); +} + START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) { test_smart_tee_filter(); test_CaptureGraphBuilder_RenderStream(); + test_AviMux_QueryInterface(); CoUninitialize(); } else

1 0

Ken Thomases : winemac: Put clipboard formats synthesized from other standard clipboard formats at the end of the list .
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: eac789c6dad79ef017a298e403292cf908af5809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac789c6dad79ef017a298e40… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:48 2013 -0600 winemac: Put clipboard formats synthesized from other standard clipboard formats at the end of the list. --- dlls/winemac.drv/clipboard.c | 77 +++++++++++++++++++++++++++++++++++------ 1 files changed, 65 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 0b13df9..fe42023 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1724,6 +1724,7 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) CFIndex count; CFMutableArrayRef formats; CFIndex i; + WINE_CLIPFORMAT* format; TRACE("pasteboard %p\n", pasteboard); @@ -1754,29 +1755,81 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) for (i = 0; i < count; i++) { CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; + BOOL found = FALSE; format = NULL; while ((format = format_for_type(format, type))) { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + /* Suppose type is "public.utf8-plain-text". format->format_id will be each of + CF_TEXT, CF_OEMTEXT, and CF_UNICODETEXT in turn. We want to look up the natural + type for each of those IDs (e.g. CF_TEXT -> "org.winehq.builtin.text") and then see + if that type is present in the pasteboard. If it is, then we don't want to add the + format to the list yet because it would be out of order. + + For example, if a Mac app put "public.utf8-plain-text" and "public.tiff" on the + pasteboard, then we want the Win32 clipboard formats to be CF_TEXT, CF_OEMTEXT, and + CF_UNICODETEXT, and CF_TIFF, in that order. All of the text formats belong before + CF_TIFF because the Mac app expressed that text was "better" than the TIFF. In + this case, as soon as we encounter "public.utf8-plain-text" we should add all of + the associated text format IDs. + + But if a Wine process put "org.winehq.builtin.unicodetext", + "public.utf8-plain-text", "public.utf16-plain-text", and "public.tiff", then we + want the clipboard formats to be CF_UNICODETEXT, CF_TIFF, CF_TEXT, and CF_OEMTEXT, + in that order. The Windows program presumably added CF_UNICODETEXT and CF_TIFF. + We're synthesizing CF_TEXT and CF_OEMTEXT from CF_UNICODETEXT but we want them to + come after the non-synthesized CF_TIFF. In this case, we don't want to add the + text formats upon encountering "public.utf8-plain-text", + + We tell the two cases apart by seeing that one of the natural types for the text + formats (i.e. "org.winehq.builtin.unicodetext") is present on the pasteboard. + "found" indicates that. */ + + if (!format->synthesized) + { + TRACE("for type %s got primary format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + CFArrayAppendValue(formats, (void*)format->format_id); + found = TRUE; + } + else if (!found && format->natural_format && + CFArrayContainsValue(types, CFRangeMake(0, count), format->natural_format->type)) + { + TRACE("for type %s deferring synthesized formats because type %s is also present\n", + debugstr_cf(type), debugstr_cf(format->natural_format->type)); + found = TRUE; + } + } - if (format->synthesized) + if (!found) + { + while ((format = format_for_type(format, type))) { /* Don't override a real value with a synthesized value. */ if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + { + TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); CFArrayAppendValue(formats, (void*)format->format_id); + } } - else + } + } + + /* Now go back through the types adding the synthesized formats that we deferred before. */ + for (i = 0; i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((format = format_for_type(format, type))) + { + if (format->synthesized) { - /* If the type was already in the array, it must have been synthesized - because this one's real. Remove the synthesized entry in favor of - this one. */ - CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), - (void*)format->format_id); - if (index != kCFNotFound) - CFArrayRemoveValueAtIndex(formats, index); - CFArrayAppendValue(formats, (void*)format->format_id); + /* Don't override a real value with a synthesized value. */ + if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + { + TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + CFArrayAppendValue(formats, (void*)format->format_id); + } } } }

1 0

Ken Thomases : winemac: Make macdrv_EnumClipboardFormats() always use macdrv_copy_pasteboard_formats().
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: f2640745b33dfab362f86d60a25e4ef3ba810957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2640745b33dfab362f86d60a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:46 2013 -0600 winemac: Make macdrv_EnumClipboardFormats() always use macdrv_copy_pasteboard_formats(). This makes sure that the formats are enumerated in a consistent order. --- dlls/winemac.drv/clipboard.c | 43 +++++++++++------------------------------ 1 files changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index b65391d..0b13df9 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1921,6 +1921,7 @@ void CDECL macdrv_EndClipboardUpdate(void) */ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) { + CFArrayRef formats; CFIndex count; CFIndex i; UINT ret = 0; @@ -1928,43 +1929,23 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - if (prev_format) + formats = macdrv_copy_pasteboard_formats(NULL); + if (formats) { - CFArrayRef formats = macdrv_copy_pasteboard_formats(NULL); - if (formats) + count = CFArrayGetCount(formats); + if (prev_format) { - count = CFArrayGetCount(formats); i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); - if (i != kCFNotFound && i + 1 < count) - ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - - CFRelease(formats); + if (i != kCFNotFound) + i++; } - } - else - { - CFArrayRef types = macdrv_copy_pasteboard_types(NULL); - if (types) - { - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - for (i = 0; i < count; i++) - { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT *format = format_for_type(NULL, type); + else + i = 0; - if (format) - { - ret = format->format_id; - break; - } - } + if (i != kCFNotFound && i < count) + ret = (UINT)CFArrayGetValueAtIndex(formats, i); - CFRelease(types); - } - else - WARN("Failed to copy pasteboard types\n"); + CFRelease(formats); } TRACE(" -> %u\n", ret);

1 0

Ken Thomases : winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup .
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: b28a014c44e71f2be71daac62006e48fccd840fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a014c44e71f2be71daac62… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:44 2013 -0600 winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup. --- dlls/winemac.drv/clipboard.c | 51 +++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 039cccd..b65391d 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -49,14 +49,15 @@ typedef struct typedef HANDLE (*DRVIMPORTFUNC)(CFDataRef data); typedef CFDataRef (*DRVEXPORTFUNC)(HANDLE data); -typedef struct -{ - struct list entry; - UINT format_id; - CFStringRef type; - DRVIMPORTFUNC import_func; - DRVEXPORTFUNC export_func; - BOOL synthesized; +typedef struct _WINE_CLIPFORMAT +{ + struct list entry; + UINT format_id; + CFStringRef type; + DRVIMPORTFUNC import_func; + DRVEXPORTFUNC export_func; + BOOL synthesized; + struct _WINE_CLIPFORMAT *natural_format; } WINE_CLIPFORMAT; @@ -300,6 +301,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) format->import_func = import_clipboard_data; format->export_func = export_clipboard_data; format->synthesized = FALSE; + format->natural_format = NULL; if (type) format->type = CFStringCreateCopy(NULL, type); @@ -2109,23 +2111,31 @@ void macdrv_clipboard_process_attach(void) for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = builtin_format_ids[i].id; - format->type = CFRetain(builtin_format_ids[i].type); - format->import_func = builtin_format_ids[i].import; - format->export_func = builtin_format_ids[i].export; - format->synthesized = builtin_format_ids[i].synthesized; + format->format_id = builtin_format_ids[i].id; + format->type = CFRetain(builtin_format_ids[i].type); + format->import_func = builtin_format_ids[i].import; + format->export_func = builtin_format_ids[i].export; + format->synthesized = builtin_format_ids[i].synthesized; + format->natural_format = NULL; list_add_tail(&format_list, &format->entry); } + LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) + { + if (format->synthesized) + format->natural_format = natural_format_for_format(format->format_id); + } + /* Register known mappings between Windows formats and Mac types */ for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); - format->type = CFRetain(builtin_format_names[i].type); - format->import_func = builtin_format_names[i].import; - format->export_func = builtin_format_names[i].export; - format->synthesized = FALSE; + format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); + format->type = CFRetain(builtin_format_names[i].type); + format->import_func = builtin_format_names[i].import; + format->export_func = builtin_format_names[i].export; + format->synthesized = FALSE; + format->natural_format = NULL; list_add_tail(&format_list, &format->entry); } } @@ -2150,8 +2160,6 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) format = NULL; while ((format = format_for_type(format, type))) { - WINE_CLIPFORMAT* base_format; - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); if (!format->synthesized) @@ -2182,8 +2190,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) pasteboard would also have data for "public.utf8-plain-text" and we wouldn't be here.) If "org.winehq.builtin.text" is not on the pasteboard, then one of the other text formats is presumably responsible for the promise that we're trying to satisfy, so we keep looking. */ - if ((base_format = natural_format_for_format(format->format_id)) && - CFArrayContainsValue(types, range, base_format->type)) + if (format->natural_format && CFArrayContainsValue(types, range, format->natural_format->type)) { TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(format->format_id), hwnd); SendMessageW(hwnd, WM_RENDERFORMAT, format->format_id, 0);

1 0

Ken Thomases : winemac: Add a function to find the "natural" clipboard format entry for a format ID.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: ee53ea4b933f1c794d236d5424a3c6ded124a9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee53ea4b933f1c794d236d542… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:42 2013 -0600 winemac: Add a function to find the "natural" clipboard format entry for a format ID. --- dlls/winemac.drv/clipboard.c | 44 +++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f428ab6..039cccd 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -394,6 +394,27 @@ done: /************************************************************************** + * natural_format_for_format + * + * Find the "natural" format for this format_id (the one which isn't + * synthesized from another type). + */ +static WINE_CLIPFORMAT* natural_format_for_format(UINT format_id) +{ + WINE_CLIPFORMAT *format; + + LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) + if (format->format_id == format_id && !format->synthesized) break; + + if (&format->entry == &format_list) + format = NULL; + + TRACE("%s -> %p/%s\n", debugstr_format(format_id), format, debugstr_cf(format ? format->type : NULL)); + return format; +} + + +/************************************************************************** * convert_text * * Convert string data between code pages or to/from wide characters. The @@ -1984,12 +2005,8 @@ BOOL CDECL macdrv_SetClipboardData(UINT format_id, HANDLE data, BOOL owner) window = macdrv_get_cocoa_window(GetAncestor(hwnd_owner, GA_ROOT), FALSE); TRACE("format_id %s data %p owner %d hwnd_owner %p window %p)\n", debugstr_format(format_id), data, owner, hwnd_owner, window); - /* Find the "natural" format for this format_id (the one which isn't - synthesized from another type). */ - LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) - if (format->format_id == format_id && !format->synthesized) break; - - if (&format->entry == &format_list && !(format = insert_clipboard_format(format_id, NULL))) + format = natural_format_for_format(format_id); + if (!format && !(format = insert_clipboard_format(format_id, NULL))) { WARN("Failed to register clipboard format %s\n", debugstr_format(format_id)); return FALSE; @@ -2165,16 +2182,13 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) pasteboard would also have data for "public.utf8-plain-text" and we wouldn't be here.) If "org.winehq.builtin.text" is not on the pasteboard, then one of the other text formats is presumably responsible for the promise that we're trying to satisfy, so we keep looking. */ - LIST_FOR_EACH_ENTRY(base_format, &format_list, WINE_CLIPFORMAT, entry) + if ((base_format = natural_format_for_format(format->format_id)) && + CFArrayContainsValue(types, range, base_format->type)) { - if (base_format->format_id == format->format_id && !base_format->synthesized && - CFArrayContainsValue(types, range, base_format->type)) - { - TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(base_format->format_id), hwnd); - SendMessageW(hwnd, WM_RENDERFORMAT, base_format->format_id, 0); - ret = TRUE; - goto done; - } + TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(format->format_id), hwnd); + SendMessageW(hwnd, WM_RENDERFORMAT, format->format_id, 0); + ret = TRUE; + goto done; } }

1 0

Ken Thomases : winemac: Synthesize text clipboard formats in CF_TEXT, CF_OEMTEXT, CF_UNICODETEXT order.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: a0061e0a30f0d9cbd339432e81f0cf4a4f0751af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0061e0a30f0d9cbd339432e8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:39 2013 -0600 winemac: Synthesize text clipboard formats in CF_TEXT, CF_OEMTEXT, CF_UNICODETEXT order. --- dlls/winemac.drv/clipboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f9891e6..f428ab6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -177,20 +177,20 @@ static const struct { CF_OEMTEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_oemtext, NULL, TRUE }, { CF_TEXT, CFSTR("org.winehq.builtin.text"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_UNICODETEXT, CFSTR("org.winehq.builtin.text"), import_text_to_unicodetext, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.text"), import_text_to_oemtext, NULL, TRUE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.text"), import_text_to_unicodetext, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.oemtext"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_UNICODETEXT, CFSTR("org.winehq.builtin.oemtext"), import_oemtext_to_unicodetext, NULL, TRUE }, { CF_TEXT, CFSTR("org.winehq.builtin.oemtext"), import_oemtext_to_text, NULL, TRUE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.oemtext"), import_oemtext_to_unicodetext, NULL, TRUE }, - { CF_UNICODETEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_unicodetext, export_unicodetext_to_utf8, TRUE }, { CF_TEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_text, export_text_to_utf8, TRUE }, { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, + { CF_UNICODETEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_unicodetext, export_unicodetext_to_utf8, TRUE }, - { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, { CF_TEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_text, export_text_to_utf16, TRUE }, { CF_OEMTEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_oemtext, export_oemtext_to_utf16, TRUE }, + { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, { CF_DIB, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE },

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013