November 2013 - Wine-commits

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

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

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

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

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

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

Henri Verbeet : wined3d: Swap the container's texture name in flip_surface( ).
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: caf9ad6c2ca60c50492ab1218428e08702899819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf9ad6c2ca60c50492ab1218… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 16:22:16 2013 +0100 wined3d: Swap the container's texture name in flip_surface(). --- dlls/wined3d/surface.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6f6b5de..f456bb9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3997,6 +3997,10 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) { + if (front->container->level_count != 1 || front->container->layer_count != 1 + || back->container->level_count != 1 || back->container->layer_count != 1) + ERR("Flip between surfaces %p and %p not supported.\n", front, back); + /* Flip the surface contents */ /* Flip the DC */ { @@ -4041,6 +4045,14 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) { GLuint tmp; + tmp = back->container->texture_rgb.name; + back->container->texture_rgb.name = front->container->texture_rgb.name; + front->container->texture_rgb.name = tmp; + + tmp = back->container->texture_srgb.name; + back->container->texture_srgb.name = front->container->texture_srgb.name; + front->container->texture_srgb.name = tmp; + tmp = back->rb_multisample; back->rb_multisample = front->rb_multisample; front->rb_multisample = tmp;

1 0

Andrew Eikum : winecoreaudio.drv: Don' t return 0 absolute position if AudioQueue call fails.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: f53dd40ad881cc7f887c0587d42f70bb07ddd2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53dd40ad881cc7f887c0587d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:35 2013 -0600 winecoreaudio.drv: Don't return 0 absolute position if AudioQueue call fails. Some failures are temporary, for example if the user reconfigures their audio setup while playing audio. Returning 0 could have bad "going backward in time" effects which can break audio even after the call starts to succeed again. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 914baa9..5e32229 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -688,6 +688,8 @@ static UINT64 get_current_aqbuffer_position(ACImpl *This, int mode) if(sc != noErr){ if(sc != kAudioQueueErr_InvalidRunState) WARN("Unable to get current time: %lx\n", sc); + if(mode == BUFPOS_ABSOLUTE) + return This->highest_sampletime; return 0; }

1 0

Andrew Eikum : dsound: Don' t change play position if IAudioClient methods fail.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: ace3c315b891fbfc801ab20303dce08ad1c76e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace3c315b891fbfc801ab2030… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:41 2013 -0600 dsound: Don't change play position if IAudioClient methods fail. --- dlls/dsound/mixer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 282808e..43b7dca 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -605,8 +605,6 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) if(!prebuf_bytes) return; - device->in_mmdev_bytes += prebuf_bytes; - if(prebuf_bytes + read_offs_bytes > device->buflen){ DWORD chunk_bytes = device->buflen - read_offs_bytes; prebuf_frames = chunk_bytes / device->pwfx->nBlockAlign; @@ -631,6 +629,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; + /* check if anything wrapped */ if(prebuf_bytes > 0){ prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; @@ -648,6 +648,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) WARN("ReleaseBuffer failed: %08x\n", hr); return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; } TRACE("in_mmdev_bytes now = %i\n", device->in_mmdev_bytes);

1 0

Alistair Leslie-Hughes : mscoree: Implement IMetahostPolicy GetRequestedRuntime.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: d8f54b4d4922de8a73527368ec1d741db543b621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f54b4d4922de8a73527368e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 5 15:13:34 2013 +1100 mscoree: Implement IMetahostPolicy GetRequestedRuntime. --- dlls/mscoree/metahost.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6d87b25..3a7e109 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1190,11 +1190,52 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa LPWSTR pwzImageVersion, DWORD *pcchImageVersion, DWORD *pdwConfigFlags, REFIID riid, LPVOID *ppRuntime) { - FIXME("%d %p %p %p %p %p %p %p %s %p\n", dwPolicyFlags, pwzBinary, pCfgStream, + ICLRRuntimeInfo *result; + HRESULT hr; + WCHAR filename[MAX_PATH]; + const WCHAR *path = NULL; + int flags = 0; + + TRACE("%d %p %p %p %p %p %p %p %s %p\n", dwPolicyFlags, pwzBinary, pCfgStream, pwzVersion, pcchVersion, pwzImageVersion, pcchImageVersion, pdwConfigFlags, debugstr_guid(riid), ppRuntime); - return E_NOTIMPL; + if (pCfgStream) + FIXME("ignoring config file stream\n"); + + if (pdwConfigFlags) + FIXME("ignoring config flags\n"); + + if(dwPolicyFlags & METAHOST_POLICY_USE_PROCESS_IMAGE_PATH) + { + GetModuleFileNameW(0, filename, MAX_PATH); + path = filename; + } + else if(pwzBinary) + { + path = pwzBinary; + } + + if(dwPolicyFlags & METAHOST_POLICY_APPLY_UPGRADE_POLICY) + flags |= RUNTIME_INFO_UPGRADE_VERSION; + + hr = get_runtime_info(path, pwzImageVersion, NULL, 0, flags, FALSE, &result); + if (SUCCEEDED(hr)) + { + if (pwzImageVersion) + { + /* Ignoring errors on purpose */ + ICLRRuntimeInfo_GetVersionString(result, pwzImageVersion, pcchImageVersion); + } + + hr = ICLRRuntimeInfo_QueryInterface(result, riid, ppRuntime); + + ICLRRuntimeInfo_Release(result); + } + + TRACE("<- 0x%08x\n", hr); + + return hr; } static const struct ICLRMetaHostPolicyVtbl CLRMetaHostPolicy_vtbl = @@ -1327,6 +1368,9 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (runtimeinfo_flags & ~supported_runtime_flags) FIXME("unsupported runtimeinfo flags %x\n", runtimeinfo_flags & ~supported_runtime_flags); + if (exefile && !exefile[0]) + exefile = NULL; + if (exefile && !config_file) { strcpyW(local_config_file, exefile);

1 0