December 2019 - Wine-Devel - list.winehq.org

[PATCH] msvcrt: Improve strtod precision.
by Piotr Caban Dec. 30, 2019

Dec. 30, 2019

This patch fixes strtod precision regression. It also removes floating points operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 ++++++++++++++++++++++++----------- dlls/ucrtbase/tests/string.c | 20 +++-- 3 files changed, 123 insertions(+), 55 deletions(-)

1 0

[PATCH] testbot/LobUtils: Update the ParseTaskLog() Perl documentation.
by Francois Gouget Dec. 30, 2019

Dec. 30, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ac0eae63e..9de11d1a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -78,6 +78,10 @@ Returns a hashtable containing a summary of the task log: =item Task Either 'ok' if the task was successful or a code indicating why it failed. +=item TestLauncher.exe... +Entries named after the binaries and files of interest to the TestBot that +have been updated. + =item NoLog Contains an error message if the task log could not be read. -- 2.20.1

1 0

[PATCH] testbot/LogUtils: Ignore the pid when comparing exception messages.
by Francois Gouget Dec. 30, 2019

Dec. 30, 2019

When the test framework detects and exception it includes the process id in the failure message to help diagnose if the failure happened in the main test process or one of its subprocesses. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c57742691..a3fa12b58 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -868,6 +868,8 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + # and the process id + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; -- 2.20.1

1 0

[PATCH 1/2] testbot/LogUtils: Ignore the variable parts of failure messages.
by Francois Gouget Dec. 29, 2019

Dec. 29, 2019

Some failure messages have to include elements that change with every run in order to allow diagnosing. But this makes the failure message look different with every run, thus breaking the detection of new failures. So such 'variable' parts can now be enclosed in double parentheses, for instance "((0x2d))", to let the TestBot know it should ignore this part when comparing failure messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48209 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I'm open to other ways to identify the variable parts. testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c57742691..0489f3e5b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -863,6 +863,10 @@ sub _GetLineKey($) my ($Line) = @_; return undef if (!defined $Line); + # Remove variable parts. + # Use a non-greedy match to ensure the ignored part does not contain '))'. + $Line =~ s/$\(.+?$\)/(())/g; + # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; -- 2.20.1

1 1

[PATCH] testbot/WineRun*: Trace the disconnection in all WineRun* scripts.
by Francois Gouget Dec. 29, 2019

Dec. 29, 2019

It was already present in WineRunWineTest. There is no reason for it to be the exception. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 ++ testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 2 ++ 3 files changed, 5 insertions(+) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ccbba3bbf..f33b7bde6 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -491,6 +491,8 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) } } } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 985d9312e..9b0b479ee 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -507,6 +507,7 @@ if ($NewStatus eq "completed") } } +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index a324265eb..6a30de3d3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -582,6 +582,8 @@ elsif (!defined $TAError) { $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); -- 2.20.1

1 0

[PATCH] testbot/Janitor: Document where filenames are untainted.
by Francois Gouget Dec. 29, 2019

Dec. 29, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 139faea94..35500e1f0 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -261,7 +261,7 @@ if (opendir(my $dh, "$DataDir/staging")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); - $Entry =~ m%^([^/]+)$%; + $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); -- 2.20.1

1 0

[PATCH] testbot/Janitor: Update the list of files to keep in latest/.
by Francois Gouget Dec. 29, 2019

Dec. 29, 2019

TestAgentd.exe and wine-parentsrc.txt were missing from the list, resulting in error messages in the log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c51637a19..139faea94 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -307,6 +307,13 @@ if (opendir(my $dh, "$DataDir/latest")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); + # Needed to analyze Wine patches + next if ($Entry eq "winefiles.txt" or $Entry eq "wine-parentsrc.txt"); + # Needed to update Windows VMs + next if ($Entry eq "TestAgentd.exe"); + # Needed to run the tests + next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); + next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { @@ -315,10 +322,6 @@ if (opendir(my $dh, "$DataDir/latest")) my $VMName = $1; next if ($AllVMs->GetItem($VMName)); } - elsif ($Entry =~ /^(?:TestLauncher[0-9]*\.exe|winefiles.txt|winetest[0-9]*-latest\.exe)$/) - { - next; - } Trace "Found a suspicious latest file: $Entry\n"; if ($JobPurgeDays != 0) -- 2.20.1

1 0

[PATCH] tests: Trace elapsed time when $WINETEST_TIME is set.
by Francois Gouget Dec. 29, 2019

Dec. 29, 2019

This simplifies narrowing down where a test gets stuck or is slow if it times out but prints few messages. Note that the elapsed time is relative to the current process start time. So subprocesses will have a different elapsed time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48094 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't see a good alternative to passing the main start time to subprocesses without using an environment variable. Using a temporary file or shared memory would be too much trouble for too little gain. So in this version each process uses its own start time as a reference for the elapsed time. Subprocesses will use a different elapsed time but that's just something to keep in mind when analysing the traces. Reference: https://www.winehq.org/pipermail/wine-devel/2019-December/156960.html include/wine/test.h | 55 +++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index a919ce81d68..ae0a130fa62 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -56,6 +56,9 @@ /* debug level */ extern int winetest_debug; +/* trace timing information */ +extern int winetest_time; + /* running in interactive mode? */ extern int winetest_interactive; @@ -202,6 +205,10 @@ extern const struct test winetest_testlist[]; /* debug level */ int winetest_debug = 1; +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + /* interactive mode? */ int winetest_interactive = 0; @@ -272,11 +279,20 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +const char *winetest_elapsed(void) +{ + DWORD now; + + if (!winetest_time) return ""; + winetest_last_time = now = GetTickCount(); + return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); +} + void winetest_subtest( const char* name ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Subtest %s\n", - data->current_file, data->current_line, name); + printf( "%s:%d:%s Subtest %s\n", + data->current_file, data->current_line, name, winetest_elapsed()); } int broken( int condition ) @@ -302,8 +318,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test succeeded inside todo block: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -312,8 +328,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test marked todo: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -324,17 +340,20 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d: Test failed: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test failed: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success) - printf( "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + if (winetest_report_success || + (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + { + printf( "%s:%d:%s Test succeeded\n", + data->current_file, data->current_line, winetest_elapsed() ); + } InterlockedIncrement(&successes); return 1; } @@ -357,7 +376,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_debug > 0) { - printf( "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -368,7 +387,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); skipped++; } @@ -505,8 +524,8 @@ static int run_test( const char *name ) if (winetest_debug) { - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", @@ -531,8 +550,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) struct tls_data *data = get_tls_data(); if (data->current_file) - printf( "%s:%d: this is the last test seen before the exception\n", - data->current_file, data->current_line ); + printf( "%s:%d:%s this is the last test seen before the exception\n", + data->current_file, data->current_line, winetest_elapsed() ); printf( "%04x:%s: unhandled exception %08x at %p\n", GetCurrentProcessId(), current_test->name, ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); @@ -570,6 +589,8 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); + winetest_last_time = winetest_start_time = GetTickCount(); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); -- 2.20.1

1 0

Wine staging 5.0 rc3 release
by Alistair Leslie-Hughes Dec. 28, 2019

Dec. 28, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc3 (865 patches are applied to wine vanilla) This release has a completely new set of rawinput patch, so enjoy. Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Fix free area search outside of reserved area in map_view() for non-zero bitmask. Added: * [48338] gdiplus: Improve GdipCreateBitmapFromHBITMAP support for GIF images. * [40649] activeds: Implement ADsOpenObject. Updated: * directmanipulation-new-dll * user32-rawinput Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

Bugs To Fix?
by Thales Dec. 28, 2019

Dec. 28, 2019

Hello, What are some of the most important bugs that need fixing? I would like to take a crack at one or more. I've been looking at Bugzilla and there's quite a bit there to sift through. Thanks for any feedback! ...John Alway

4 6

msvcrt:scanf float conversion behavior
by Erich E. Hoover Dec. 27, 2019

Dec. 27, 2019

I am trying to resolve places where "long double" is being used to compute the value of a floating point number and I am currently looking at resolving this issue in the scanf family of functions. I'm not the hugest fan of having duplicated code running around, so I'm wondering if anyone knows why scanf float behavior isn't implemented using [str|wcs]tod (or possibly the other way around). So, does anyone know why this is the case? Would a patch be accepted that consolidates these instances? Best, Erich

4 7

[PATCH] quartz/tests: Skip the IVideoWindow tests if connecting returns E_FAIL.
by Zebediah Figura Dec. 27, 2019

Dec. 27, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3024fa84ef..d3d8893cb5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2267,7 +2267,13 @@ static void test_video_window(void) testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_GetAllocator(input, &allocator); @@ -2302,8 +2308,6 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -2324,6 +2328,7 @@ static void test_video_window(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); +out: IMediaControl_Release(control); IFilterGraph2_Release(graph); IVideoWindow_Release(window); -- 2.24.1

1 0

[PATCH 1/3] user32/tests: Remove unnecessary uses of CREATE_SUSPENDED.
by Zebediah Figura Dec. 27, 2019

Dec. 27, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dde.c | 102 ++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 56 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index d370df181a..786d4eca07 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -43,6 +43,22 @@ static WNDPROC old_dde_client_wndproc; static const DWORD default_timeout = 200; +static HANDLE create_process(const char *arg) +{ + STARTUPINFOA si = {.cb = sizeof(si)}; + PROCESS_INFORMATION pi; + char cmdline[200]; + char **argv; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], arg); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(pi.hThread); + return pi.hProcess; +} + static BOOL is_cjk(void) { int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); @@ -253,23 +269,25 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_msg_server(HANDLE hproc, HANDLE hthread) +static void test_msg_server(void) { + HANDLE client; MSG msg; HWND hwnd; DWORD res; create_dde_window(&hwnd, "dde_server", dde_server_wndproc); - ResumeThread( hthread ); + client = create_process("ddeml"); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } destroy_dde_window(&hwnd, "dde_server"); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } static HDDEDATA CALLBACK client_ddeml_callback(UINT uType, UINT uFmt, HCONV hconv, @@ -823,14 +841,17 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon return 0; } -static void test_ddeml_server(HANDLE hproc) +static void test_ddeml_server(void) { + HANDLE client; MSG msg; UINT res; BOOL ret; HSZ server; HDDEDATA hdata; + client = create_process("msg"); + /* set up DDE server */ server_pid = 0; res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); @@ -842,14 +863,15 @@ static void test_ddeml_server(HANDLE hproc) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } static HWND client_hwnd, server_hwnd; @@ -2683,8 +2705,9 @@ static void test_end_to_end_client(BOOL type_a) } -static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) +static void test_end_to_end_server(BOOL client_unicode, BOOL server_unicode) { + HANDLE client; MSG msg; HSZ server; BOOL ret; @@ -2692,13 +2715,14 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("start end to end server %s\n", type_a ? "ASCII" : "UNICODE"); + trace("client %s, server %s\n", client_unicode ? "unicode" : "ascii", + server_unicode ? "unicode" : "ascii"); server_pid = 0; - if (type_a) - res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); - else + if (server_unicode) res = DdeInitializeW(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); + else + res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); server = DdeCreateStringHandleA(server_pid, test_service, CP_WINANSI); @@ -2706,27 +2730,25 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - ResumeThread( hthread ); + client = create_process(client_unicode ? "endw" : "enda"); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } START_TEST(dde) { int argc; char **argv; - char buffer[MAX_PATH]; - STARTUPINFOA startup; - PROCESS_INFORMATION proc; DWORD dde_inst = 0xdeadbeef; argc = winetest_get_mainargs(&argv); @@ -2754,30 +2776,12 @@ START_TEST(dde) return; } - ZeroMemory(&startup, sizeof(STARTUPINFOA)); - sprintf(buffer, "%s dde ddeml", argv[0]); - startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW; - startup.wShowWindow = SW_SHOWNORMAL; - - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_msg_server(proc.hProcess, proc.hThread); - - sprintf(buffer, "%s dde msg", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - 0, NULL, NULL, &startup, &proc); - - test_ddeml_server(proc.hProcess); + test_msg_server(); + test_ddeml_server(); /* Test the combinations of A and W interfaces with A and W data end to end to ensure that data conversions are accurate */ - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(FALSE, FALSE); /* Don't bother testing W interfaces on Win9x/WinMe */ SetLastError(0xdeadbeef); @@ -2788,23 +2792,9 @@ START_TEST(dde) } else { - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(TRUE, TRUE); + test_end_to_end_server(FALSE, TRUE); + test_end_to_end_server(TRUE, FALSE); test_dde_aw_transaction( FALSE, TRUE ); test_dde_aw_transaction( TRUE, FALSE ); -- 2.24.1

2 6

[PATCH] ntdll/tests: Fix some test failures with Windows 10.
by Zebediah Figura Dec. 27, 2019

Dec. 27, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/reg.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9bb8d25020..51562786e9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -387,7 +387,9 @@ todo_wine /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtOpenKey Failed: 0x%08x\n", status); + if (!status) pNtClose( key ); attr.Attributes = OBJ_CASE_INSENSITIVE; status = pNtOpenKey(&key, KEY_READ, &attr); @@ -615,8 +617,9 @@ static void test_NtCreateKey(void) attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); @@ -926,14 +929,14 @@ static void test_NtQueryLicenseKey(void) len = 0xbeef; status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); type = 0xdead; len = 0xbeef; status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n"); ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); pRtlFreeUnicodeString(&name); @@ -1291,7 +1294,7 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); attr.ObjectName = &link_str; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID /* Win10 1607+ */, "NtOpenKey wrong status 0x%08x\n", status ); key = (HKEY)0xdeadbeef; @@ -1320,8 +1323,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_NAME_TOO_LONG, - "NtOpenKey failed: 0x%08x\n", status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND /* XP */ + || status == STATUS_NAME_TOO_LONG + || status == STATUS_INVALID_PARAMETER /* Win10 1607+ */, + "NtOpenKey failed: 0x%08x\n", status ); attr.Attributes = OBJ_OPENLINK; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); -- 2.24.1

1 0

[PATCH] msscript.ocx/tests: Fix a typo.
by Andrey Gusev Dec. 27, 2019

Dec. 27, 2019

And the same for mshtml/tests and scrobj/tests

1 0

[PATCH] msscript.ocx/tests: Fix a typo.
by Dmitry Timoshkov Dec. 27, 2019

Dec. 27, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msscript.ocx/tests/msscript.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7693f0b51b..d95c43d9b4 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -448,7 +448,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; - ICanHandleException *canexpection; + ICanHandleException *canexception; LCID lcid; HRESULT hres; @@ -468,7 +468,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); - hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); -- 2.20.1

1 0

[PATCH] po: Update Catalan translation
by Alex Henrie Dec. 27, 2019

Dec. 27, 2019

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 508 ++++++++++++++++--------------------------------------- 1 file changed, 146 insertions(+), 362 deletions(-) diff --git a/po/ca.po b/po/ca.po index 4b7466522b..7255f30d38 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-17 21:33-0700\n" +"PO-Revision-Date: 2019-12-26 18:54-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.2.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -629,7 +629,7 @@ msgstr "Colors personalit&zats:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|Sò&lid" #: comdlg32.rc:290 msgid "&Red:" @@ -666,11 +666,9 @@ msgid "&Define Custom Colors >>" msgstr "D&efinició de colors personalitzats >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&No" +msgstr "&l" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -1723,7 +1721,7 @@ msgstr "Correu electrònic segur" #: crypt32.rc:142 msgid "Time Stamping" -msgstr "Segellament de temps" +msgstr "Marcació horària" #: crypt32.rc:143 msgid "Microsoft Trust List Signing" @@ -1731,7 +1729,7 @@ msgstr "Segellament de llista de confiança del Microsoft" #: crypt32.rc:144 msgid "Microsoft Time Stamping" -msgstr "Segellament de temps del Microsoft" +msgstr "Marcació horària del Microsoft" #: crypt32.rc:145 msgid "IP security end system" @@ -3924,7 +3922,7 @@ msgstr "La longitud és dolenta.\n" #: winerror.mc:153 winerror.mc:528 msgid "Seek error.\n" -msgstr "Hi ha hagut un error en cercar.\n" +msgstr "Hi ha hagut un error en saltar.\n" #: winerror.mc:158 msgid "Not DOS disk.\n" @@ -4216,7 +4214,7 @@ msgstr "L'ús d'identificador d'accés directe no és vàlid.\n" #: winerror.mc:523 msgid "Negative seek.\n" -msgstr "La cerca és negativa.\n" +msgstr "El salt és negatiu.\n" #: winerror.mc:533 msgid "Drive is a JOIN target.\n" @@ -4372,7 +4370,7 @@ msgstr "El fitxer ja existeix.\n" #: winerror.mc:723 msgid "Invalid flag number.\n" -msgstr "El número de bandera no és vàlid.\n" +msgstr "El número d'opció no és vàlid.\n" #: winerror.mc:728 msgid "Semaphore name not found.\n" @@ -4624,7 +4622,7 @@ msgstr "No es pot acabar.\n" #: winerror.mc:1038 msgid "Invalid flags.\n" -msgstr "Les banderes no són vàlides.\n" +msgstr "Les opcions no són vàlides.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" @@ -5700,7 +5698,7 @@ msgstr "L'autenticació mútua ha fallat.\n" #: winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "Hi ha una asimetria de temps entre el client i el servidor.\n" +msgstr "Hi ha una asimetria horària entre el client i el servidor.\n" #: winerror.mc:2398 msgid "Invalid window handle.\n" @@ -6840,541 +6838,387 @@ msgstr "Envia correu" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "Ja s'ha fet la sol·licitud per començar.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "No s'ha trobat l'UUID de l'objecte.\n" +msgstr "No s'ha finalitzat el receptor.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "La plataforma d'instal·lació no és compatible.\n" +msgstr "No s'ha inicialitzat la plataforma de Fundació de Mitjans.\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "El nombre de bytes és massa petit.\n" +msgstr "La memòria intermèdia és massa petita.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "La sintaxi de consulta no és vàlida.\n" +msgstr "La sol·licitud no és vàlida.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "El número de segment no és vàlid.\n" +msgstr "El número de flux no és vàlid.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "El tipus de dades no és vàlid.\n" +msgstr "El tipus de mitjans no és vàlid.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "No hi ha més entrades.\n" +msgstr "No s'accepten més entrades.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "No s'ha trobat l'UUID de l'objecte.\n" +msgstr "No s'ha inicialitzat l'objecte.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "No s'admet l'operació.\n" +msgstr "No s'admet la representació.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "No hi ha més tipus en la llista de tipus de mitjans suggerits.\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El servei és incompatible.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Hi ha hagut un error de xarxa inesperat.\n" +msgstr "Hi ha hagut un error inesperat.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "L'hora no és vàlida.\n" +msgstr "El tipus no és vàlid.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "El format de píxels no és vàlid.\n" +msgstr "El format de fitxer no és vàlid.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "L'hora no és vàlida.\n" +msgstr "La marca horària no és vàlida.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "El tipus és incompatible.\n" +msgstr "L'esquema és incompatible.\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El flux de bytes és incompatible.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El format horari és incompatible.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "La marca horària de la mostra no està establerta.\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "La mostra no té cap duració establerta.\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Les dades no són vàlides.\n" +msgstr "Les dades de flux no són vàlides.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "No hi ha cap ajuda disponible." +msgstr "Suport per a temps real no està disponible.\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "El tipus és incompatible.\n" +msgstr "La velocitat és incompatible.\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "El tipus és incompatible.\n" +msgstr "L'aprimament és incompatible.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "No s'admet la sol·licitud.\n" +msgstr "No s'admet marxa enrere.\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "No s'admet el nivell d'autorització.\n" +msgstr "La transició de velocitat no és compatible.\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "El canvi de velocitat ha estat cancel·lat per un altre.\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "No s'ha trobat l'UUID de l'objecte.\n" +msgstr "No s'ha trobat l'objecte o el valor.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "No hi ha cap ajuda disponible." +msgstr "El valor no està disponible.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "No hi ha cap ajuda disponible." +msgstr "El rellotge no està disponible.\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "No s'accepten atributs extensos.\n" +msgstr "No s'accepten múltiples subscriptors.\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "El controlador no estava habilitat." +msgstr "El temporitzador s'ha fet orfe.\n" #: mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "Ha fallat l'obertura de la taula de traducció de caràcters.\n" +msgstr "Una transició d'estat està penjada.\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "No s'admet el nivell d'autorització.\n" +msgstr "La transició de velocitat no és compatible.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "Ha ocorregut un error intern.\n" +msgstr "Ha ocorregut un error no recuperable.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "La mostra té massa memòria intermèdia.\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "No es pot escriure al directori temporal.\n" +msgstr "No es pot escriure a la mostra.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "El camí no és vàlid.\n" +msgstr "La clau no és vàlida.\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "La versió d'esbós (stub) és incorrecta.\n" +msgstr "La versió d'inici és dolenta.\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El subtítol és incompatible.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "L'estació de treball no és vàlida.\n" +msgstr "La posició no és vàlida.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "No s'ha trobat el fitxer.\n" +msgstr "No s'ha trobat l'atribut.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "El tipus de ganxo no es permet.\n" +msgstr "El tipus de propietat no es permet.\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "No s'admet l'operació.\n" +msgstr "El tipus de propietat no s'admet.\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "El directori no està buit.\n" +msgstr "La propietat està buida.\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "El directori no està buit.\n" +msgstr "La propietat no està buida.\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "El tipus de ganxo no es permet.\n" +msgstr "No es permet una propietat vectora.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "Cal una propietat vectora.\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "L'usuari ha cancel·lat l'operació.\n" +msgstr "S'ha cancel·lat l'operació.\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "El servidor no està inhabilitat.\n" +msgstr "No es pot saltar en el flux de bytes.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "La plataforma està inhabilitat en el mode segur.\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "No es pot crear el fil de servei.\n" +msgstr "No es pot analitzar el flux de bytes.\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "S'han passat opcions mutualment exclusives al resolutor de fons.\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "La interfície és desconeguda.\n" +msgstr "La llargada del flux de dades és desconeguda.\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "L'índex no és vàlid.\n" +msgstr "L'índex de cua de treball no és vàlida.\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "Cap servidor d'autenticació està disponible.\n" +msgstr "Cap esdeveniment està disponible.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "No s'admet el nivell d'autorització.\n" +msgstr "La transició d'estat de fons de mitjans no és vàlida.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "S'ha recuperat el registre.\n" +msgstr "S'ha arribat al final del flux de mitjans.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "S'ha invocat Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "S'ha recuperat el registre.\n" +msgstr "El flux de mitjans no té cap duració establerta.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "El format de mitjans s'ha reconegut però no és vàlid.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "No s'ha trobat el conjunt de propietats.\n" +msgstr "No s'ha trobat la propietat.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "El directori no està buit.\n" +msgstr "Només es pot llegir la propietat.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "El tipus de ganxo no es permet.\n" +msgstr "No es permet la propietat.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "El recurs està en ús.\n" +msgstr "No s'ha començat la font de mitjans.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El format de mitjans és incompatible.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "El recurs està en ús.\n" +msgstr "La font de mitjans està en un estat incorrecte.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "No s'ha detectat dades.\n" +msgstr "No s'ha seleccionat cap flux de mitjans.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "El tipus és incompatible.\n" +msgstr "Les característiques de font de mitjans són incompatibles.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "S'ha eliminat el receptor de flux.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Els receptors de flux no estan sincronitzats.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "S'ha recuperat el registre.\n" +msgstr "El conjunt de receptors del flux de mitjans és fix.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "El domini ja existeix.\n" +msgstr "El receptor de flux ja existeix.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "L'usuari ha cancel·lat l'operació.\n" +msgstr "S'ha cancel·lat l'assignació de mostra.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "El directori no està buit.\n" +msgstr "L'assignador de mostra està buit.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "La classe ja existeix.\n" +msgstr "El receptor ja s'ha aturat.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "No s'ha reconegut la velocitat de bits del receptor ASF.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "No s'ha detectat dades.\n" +msgstr "No s'ha seleccionat cap flux per al receptor.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "El nom de fitxer és massa llarg.\n" +msgstr "Les metadades han estat massa llargues.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "El receptor no ha processat cap mostra.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "No s'han proporcionat les capçaleres requerides al receptor.\n" #: mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "La connexió no és vàlida.\n" +msgstr "El node opcional no és vàlid.\n" #: mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "No es pot trobar la impressora." +msgstr "No es pot trobar el desxifrador.\n" #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "No s'ha trobat el mòdul.\n" +msgstr "No s'ha trobat el còdec.\n" #: mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "No es pot obtenir l'identificador de trucada.\n" +msgstr "No es poden connectar els nodes de la topologia.\n" #: mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "No s'admet la sol·licitud.\n" +msgstr "No s'admet la sol·licitud de topologia.\n" #: mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "Els atributs de grup no són vàlids.\n" +msgstr "Els atributs de topologia horària no són vàlids.\n" #: mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "S'han trobat bucles en la topologia.\n" #: mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "Manca la font d'instal·lació.\n" +msgstr "Manca el descriptor de presentació.\n" #: mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "Manca l'índex.\n" +msgstr "Manca el descriptor de flux.\n" #: mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "El dispositiu no està connectat.\n" +msgstr "El descriptor de flux no està seleccionat.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Manca l'índex.\n" +msgstr "Manca la font.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "El carregador de topologia no admet activacions de receptor.\n" #: mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "El rellotge no té cap font d'hora establerta.\n" #: mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "La classe ja existeix.\n" +msgstr "Ja s'ha establert l'estat de rellotge.\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8471,26 +8315,20 @@ msgid "Off" msgstr "Inactiu" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "vídeo" +msgstr "Proveïdor" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Seleccioneu el format que voleu utilitzar:" +msgstr "Seleccioneu les dades a les qualles voleu connectar:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Propietats" +msgstr "Propietats d'enllaç de dades" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "Proveïdors de base de dades OLE" #: oledlg.rc:55 msgid "Insert Object" @@ -9884,11 +9722,11 @@ msgstr "Hora d'estiu central" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "Hora estàndard dels Açores" +msgstr "Hora estàndard de les Açores" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "Hora d'estiu dels Açores" +msgstr "Hora d'estiu de les Açores" #: tzres.rc:158 msgid "North Asia East Standard Time" @@ -10048,11 +9886,11 @@ msgstr "Hora d'estiu de les muntanyes" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "Hora estàndard oriental EEUU" +msgstr "Hora estàndard oriental EUA" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "Hora d'estiu oriental EEUU" +msgstr "Hora d'estiu oriental EUA" #: tzres.rc:196 msgid "Tasmania Standard Time" @@ -10072,11 +9910,11 @@ msgstr "Hora d'estiu de l'Àmerica Central" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "Hora estàndard de les muntanyes EEUU" +msgstr "Hora estàndard de les muntanyes EUA" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "Hora d'estiu de les muntanyes EEUU" +msgstr "Hora d'estiu de les muntanyes EUA" #: tzres.rc:188 msgid "South Africa Standard Time" @@ -10120,11 +9958,11 @@ msgstr "Hora d'estiu de Iakutsk" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-Est" +msgstr "Hora estàndard de l'Àmerica del Sud-est" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-Est" +msgstr "Hora d'estiu de l'Àmerica del Sud-est" #: tzres.rc:34 msgid "Arab Standard Time" @@ -10160,11 +9998,11 @@ msgstr "Hora d'estiu romànic" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "Hora estàndard d'Iekaterinburg" +msgstr "Hora estàndard de Iekaterinburg" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "Hora d'estiu d'Iekaterinburg" +msgstr "Hora d'estiu de Iekaterinburg" #: tzres.rc:192 msgid "Syria Standard Time" @@ -10288,11 +10126,11 @@ msgstr "Hora d'estiu de Hawaii" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "Hora estàndard de l'Àsia del Sud-Est" +msgstr "Hora estàndard de l'Àsia del Sud-est" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Sud-Est" +msgstr "Hora d'estiu de l'Àsia del Sud-est" #: tzres.rc:154 msgid "New Zealand Standard Time" @@ -10320,11 +10158,11 @@ msgstr "Hora d'estiu de Bielorússia" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-Oest" +msgstr "Hora estàndard de l'Àmerica del Sud-oest" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-Oest" +msgstr "Hora d'estiu de l'Àmerica del Sud-oest" #: tzres.rc:108 msgid "Greenland Standard Time" @@ -10747,7 +10585,7 @@ msgstr "Un número d'error s'ha especificat que no està definit en el sistema." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "S'ha passat una bandera no vàlida a una funció de sistema." +msgstr "S'ha passat una opció no vàlida a una funció de sistema." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." @@ -10783,7 +10621,7 @@ msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"No es pot obrir el dispositiu sense utilitzar la bandera WAVE_ALLOWSYNC. " +"No es pot obrir el dispositiu sense utilitzar l'opció WAVE_ALLOWSYNC. " "Utilitzeu la bandera i després torneu a intentar." #: winmm.rc:52 @@ -11026,7 +10864,7 @@ msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"El valor especificat per al format d'hora no és vàlid. Consulteu la " +"El valor especificat per al format horari no és vàlid. Consulteu la " "documentació MCI pels formats vàlids." #: winmm.rc:93 @@ -11066,7 +10904,7 @@ msgstr "Heu d'especificar un àlies quan s'utilitza el paràmetre 'new'." #: winmm.rc:99 msgid "Cannot use the 'notify' flag with auto-opened devices." msgstr "" -"No es pot utilitzar la bandera 'notify' amb els dispositius oberts " +"No es pot utilitzar l'opció 'notify' amb els dispositius oberts " "automàticament." #: winmm.rc:100 @@ -11242,19 +11080,15 @@ msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"Els formats d'hora de la \"punter de cançó\" i SMPTE són mútuament " +"Els formats horaris de la \"punter de cançó\" i SMPTE són mútuament " "excloents. No es poden utilitzar junts." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." msgstr "" -"El port MIDI especificat ja està en ús. Espereu fins que estigui lliure; " +"El port MIDI especificat ja està en ús. Espereu fins que estigui lliure i " "llavors torneu a intentar." #: winmm.rc:131 @@ -11271,16 +11105,12 @@ msgid "An error occurred with the specified port." msgstr "Ha ocorregut un error amb el port especificat." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." msgstr "" -"Les altres aplicacions estan utilitzant tots els temporitzadors de " -"multimèdia. Tanqueu una d'aquestes aplicacions, llavors torneu a intentar." +"Tots els temporitzadors de multimèdia estan en ús per altres aplicacions. " +"Tanqueu una d'aquestes aplicacions i llavors torneu a intentar." #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -11692,7 +11522,7 @@ msgid "" msgstr "" "CALL <nom de fitxer BAT> s'utilitza dins un fitxer BAT per a executar\n" "ordres d'un altre fitxer BAT. Quan se surt del fitxer BAT, el control\n" -"retorna al fitxer que l'ha trucat. L'ordre CALL pot proveir paràmetres al\n" +"retorna al fitxer que l'ha invocat. L'ordre CALL pot proveir paràmetres al\n" "procediment trucat.\n" "\n" "El procediment trucant hereta els canvis al directori per defecte,\n" @@ -11792,7 +11622,7 @@ msgstr "" "\n" "L'etiqueta que és la destinació d'un GOTO pot ser de fins a 255 caràcters\n" "de longitud però no pot incloure espais (això és diferent d'altres sistemes\n" -"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer BAT,\n" +"operatius). Si dues o més etiquetes idèntiques existeixen en un fitxer BAT,\n" "el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no existent\n" "termina l'execució del fitxer BAT.\n" "\n" @@ -12104,14 +11934,14 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"S'utilitza VERIFY per a definir, esborrar o provar la bandera de\n" +"S'utilitza VERIFY per a establir, esborrar o provar l'opció de\n" "verificació. Les formes vàlides són:\n" "\n" -"VERIFY ON\tEstableix la bandera.\n" -"VERIFY OFF\tEsborra la bandera.\n" +"VERIFY ON\tEstableix l'opció.\n" +"VERIFY OFF\tEsborra l'opció.\n" "VERIFY\t\tMostra ON o OFF segons correspongui.\n" "\n" -"La bandera de verificació no té cap funció en el Wine.\n" +"L'opció de verificació no té cap funció en el Wine.\n" #: cmd.rc:256 msgid "VER displays the version of cmd you are running.\n" @@ -13132,7 +12962,7 @@ msgstr "&Executa l'Editor de Registre" #: oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "Bandera &CoCreateInstance" +msgstr "Opció &CoCreateInstance" #: oleview.rc:44 msgid "&In-process server" @@ -14699,7 +14529,7 @@ msgstr "De&finició de la prioritat" #: taskmgr.rc:156 msgid "&Realtime" -msgstr "&Temps real" +msgstr "Temps &real" #: taskmgr.rc:160 msgid "&Above Normal" @@ -15470,7 +15300,7 @@ msgstr "Visualitzador de Metafitxers Regular" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafitxers (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15643,10 +15473,6 @@ msgid "Drive configuration" msgstr "Configuració d'unitats" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15938,12 +15764,6 @@ msgid "System drive" msgstr "Unitat de sistema" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16375,7 +16195,7 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" -"Un program en el vostre sistema ha tingut una pana, però el WineDbg no ha " +"Un programa en el vostre sistema ha tingut una pana, però el WineDbg no ha " "pogut enganxar-se al procès per a obtenir una traça inversa." #: winedbg.rc:41 @@ -17027,10 +16847,8 @@ msgid "Text documents (*.txt)" msgstr "Documents de text (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Documents de text d'Unicode (*.txt)" +msgstr "Document de text d'Unicode (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17234,42 +17052,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17333,6 +17115,8 @@ msgstr "" "[/A] Només copiar els fitxers amb l'atribut d'arxiu establert.\n" "[/M] Només copiar els fitxers amb l'atribut d'arxiu establert, elimina\n" "\tl'atribut d'arxiu.\n" +"[/K] Copiar els atributs de fitxer; sense això, no se preserven els\n" +" atributs.\n" "[/D | /D:m-d-y] Copiar els fitxers nous o els modificats després de la data\n" "\t\tproveïda.\n" "\t\tSi no es proveeix cap data, només es copia si la destinació és més\n" -- 2.24.1

1 0

[PATCH v2 1/5] msvcrt: Introduce IMPORT_SYMBOL helper macro.
by Jacek Caban Dec. 26, 2019

Dec. 26, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/iob.c | 8 ++------ dlls/msvcrt/msvcrt.h | 8 ++++++++ 2 files changed, 10 insertions(+), 6 deletions(-)

2 1

[PATCH v4 1/4] ntdll: Rename find_free_area to find_reserved_free_area.
by Rémi Bernon Dec. 26, 2019

Dec. 26, 2019

We used this function to find free areas outside of the reserved range, and it's obviously incorrect as there can be some system or external memory mapping we don't know about. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/virtual.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cb869feff02..ded00e3eb7d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,14 +496,14 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } - /*********************************************************************** - * find_free_area + * find_reserved_free_area * * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. + * The range must be inside the preloader reserved range. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_reserved_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; void *start; @@ -1053,14 +1053,14 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) else { /* range is split in two by the preloader reservation, try first part */ - if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + if ((alloc->result = find_reserved_free_area( start, preload_reserve_start, alloc->size, + alloc->mask, alloc->top_down ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_reserved_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) return 1; return 0; @@ -1167,7 +1167,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (!zero_bits_64) ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + else if (!(ptr = find_reserved_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) return STATUS_NO_MEMORY; if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) -- 2.24.1

1 3

[PATCH] ntdll/tests: Remove a no longer reliable test.
by Zebediah Figura Dec. 26, 2019

Dec. 26, 2019

On Windows 10 version 1607, a process called "Memory Compression" violates this invariant. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index caa123e982..76de56810c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -363,8 +363,6 @@ static void test_query_process(void) last_pid = (DWORD_PTR)spi->UniqueProcessId; - ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\n"); - /* Loop through the threads, skip NT4 for now */ if (!is_nt) -- 2.24.1

1 0

[PATCH v4] user32/tests: Move TEST_MOUSEACTIVATE to test_defwinproc.
by Rémi Bernon Dec. 26, 2019

Dec. 26, 2019

This test is actually testing the reply from DefWindowProcA, as the window it was sent to is not handling this particular message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending just this one with the missing "LRESULT res;" removal. The other two (176134 and 176136) should still apply. dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 33 --------------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0ba5834cf9..b1095037066 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15623,6 +15623,38 @@ static void test_defwinproc(void) ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + /* Test WM_MOUSEACTIVATE */ +#define TEST_MOUSEACTIVATE(A,B,C) \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9309a8cba6..926234fa5d4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3782,7 +3782,6 @@ static void test_mouse_input(HWND hwnd) HWND popup, child = NULL; MSG msg; BOOL ret; - LRESULT res; ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd); @@ -3935,38 +3934,6 @@ static void test_mouse_input(HWND hwnd) msg.hwnd, popup, msg.message); ok(peek_message(&msg), "no message available\n"); - /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B,C) \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ - ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - - TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); - ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after -- 2.24.1

2 1

[PATCH 2/2] msvcr90: Improve floats comparison in _atoflt tests.
by Piotr Caban Dec. 26, 2019

Dec. 26, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)

1 0

[PATCH 1/2] msvcrt: Improve doubles comparison in strtod and atodbl tests.
by Piotr Caban Dec. 26, 2019

Dec. 26, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 38 deletions(-)

1 0

[PATCH] oleaut32/tests: Avoid testing that GDI objects are invalid.
by Zebediah Figura Dec. 26, 2019

Dec. 26, 2019

This is not consistent across Windows versions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/olefont.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 10e2a4cf2f..9c8d255af1 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1033,9 +1033,6 @@ static void test_hfont_lifetime(void) hr = IFont_get_hFont(font, &hfont); EXPECT_HR(hr, S_OK); - - obj_type = GetObjectType(last_hfont); - ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); } /* now show that if we take a reference on the hfont, it persists @@ -1063,9 +1060,6 @@ static void test_hfont_lifetime(void) IFont_Release(font); - obj_type = GetObjectType(first_hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); - /* An AddRefHfont followed by a ReleaseHfont means the font doesn't not persist through re-realization */ @@ -1099,9 +1093,6 @@ static void test_hfont_lifetime(void) hr = IFont_ReleaseHfont(font, hfont); EXPECT_HR(hr, S_OK); - - obj_type = GetObjectType(last_hfont); - ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); } /* Interestingly if we release a nonexistent reference on the hfont, @@ -1130,9 +1121,6 @@ static void test_hfont_lifetime(void) IFont_Release(font); - obj_type = GetObjectType(first_hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); - /* If we take two internal references on a hfont then we can release it twice. So it looks like there's a total reference count that includes internal and external references */ @@ -1165,9 +1153,6 @@ todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); IFont_Release(font2); - - obj_type = GetObjectType(hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); } static void test_realization(void) -- 2.24.1

1 0

[PATCH 1/2] ole32/tests: Rewrite and expand test_data_cache_updatecache().
by Zebediah Figura Dec. 26, 2019

Dec. 26, 2019

Instead of testing calls to IDataObject::GetData() and IDataObject::QueryGetData(), actually test whether the cache contains the updated data that we expose after calling IOleCache2::UpdateCache(). Fixes test failures with Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/ole2.c | 511 +++++++++++++++++++--------------------- 1 file changed, 242 insertions(+), 269 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6be187497d..4103a75abc 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -118,7 +118,8 @@ static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; -static FORMATETC *g_dataobject_fmts; +static FORMATETC *data_object_format; +static const BYTE *data_object_dib; /**************************************************************************** * PresentationDataHeader @@ -182,8 +183,7 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM ok(!expected_method_list->method, "Method sequence starting from %s not called\n", expected_method_list->method); \ } while (0) -/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ -static const BYTE dib[] = +static const BYTE dib_white[] = { 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, @@ -193,14 +193,24 @@ static const BYTE dib[] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +static const BYTE dib_black[] = +{ + 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc8, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + static void create_dib( STGMEDIUM *med ) { void *ptr; med->tymed = TYMED_HGLOBAL; - U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) ); + U(med)->hGlobal = GlobalAlloc(GMEM_MOVEABLE, sizeof(dib_white)); ptr = GlobalLock( U(med)->hGlobal ); - memcpy( ptr, dib, sizeof(dib) ); + memcpy(ptr, dib_white, sizeof(dib_white)); GlobalUnlock( U(med)->hGlobal ); med->pUnkForRelease = NULL; } @@ -1361,34 +1371,33 @@ static inline BOOL fmtetc_equal( const FORMATETC *a, const FORMATETC *b ) } -static HRESULT WINAPI DataObject_GetData( IDataObject *iface, FORMATETC *fmt_in, - STGMEDIUM *med ) +static HRESULT WINAPI DataObject_GetData(IDataObject *iface, FORMATETC *format, STGMEDIUM *medium) { - FORMATETC *fmt; - - CHECK_EXPECTED_METHOD_FMT("DataObject_GetData", fmt_in); + if (winetest_debug > 1) trace("IDataObject::GetData(cf %u)\n", format->cfFormat); - for (fmt = g_dataobject_fmts; fmt && fmt->cfFormat != 0; fmt++) + if (data_object_format && fmtetc_equal(format, data_object_format)) { - if (fmtetc_equal( fmt_in, fmt )) + switch (format->cfFormat) { - switch (fmt->cfFormat) - { - case CF_DIB: - create_dib( med ); - return S_OK; - case CF_BITMAP: - create_bitmap( med ); - return S_OK; - case CF_ENHMETAFILE: - create_emf( med ); - return S_OK; - case CF_TEXT: - create_text( med ); - return S_OK; - default: - trace( "unhandled fmt %d\n", fmt->cfFormat ); - } + case CF_DIB: + medium->tymed = TYMED_HGLOBAL; + medium->pUnkForRelease = NULL; + U(*medium).hGlobal = GlobalAlloc(GMEM_MOVEABLE, sizeof(dib_white)); + memcpy(GlobalLock(U(*medium).hGlobal), data_object_dib, sizeof(dib_white)); + GlobalUnlock(U(*medium).hGlobal); + return S_OK; + case CF_BITMAP: + create_bitmap(medium); + return S_OK; + case CF_ENHMETAFILE: + create_emf(medium); + return S_OK; + case CF_METAFILEPICT: + create_mfpict(medium); + return S_OK; + case CF_TEXT: + create_text(medium); + return S_OK; } } @@ -1404,16 +1413,11 @@ static HRESULT WINAPI DataObject_GetDataHere( return E_NOTIMPL; } -static HRESULT WINAPI DataObject_QueryGetData( IDataObject *iface, FORMATETC *fmt_in ) +static HRESULT WINAPI DataObject_QueryGetData(IDataObject *iface, FORMATETC *format) { - FORMATETC *fmt; - - CHECK_EXPECTED_METHOD_FMT("DataObject_QueryGetData", fmt_in); + if (winetest_debug > 1) trace("IDataObject::QueryGetData(cf %u)\n", format->cfFormat); - for (fmt = g_dataobject_fmts; fmt && fmt->cfFormat != 0; fmt++) - if (fmtetc_equal( fmt_in, fmt )) return S_OK; - - return S_FALSE; + return (data_object_format && fmtetc_equal(format, data_object_format)) ? S_OK : S_FALSE; } static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( @@ -1606,9 +1610,6 @@ static void test_data_cache(void) { "draw_continue", 1 }, { "draw_continue", 1 }, { "draw_continue", 1 }, - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_THUMBNAIL, -1, TYMED_HGLOBAL} }, - { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_THUMBNAIL, -1, TYMED_GDI} }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_ICON, -1, TYMED_MFPICT} }, { NULL, 0 } }; static const struct expected_method methods_cachethenrun[] = @@ -2042,7 +2043,7 @@ static void test_data_cache_dib_contents_stream(int num) hr = IDataObject_GetData( data, &fmt, &med ); ok( SUCCEEDED(hr), "got %08x\n", hr ); ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); - ok( GlobalSize( U(med).hGlobal ) >= sizeof(dib) - sizeof(BITMAPFILEHEADER), + ok( GlobalSize( U(med).hGlobal ) >= sizeof(dib_white) - sizeof(BITMAPFILEHEADER), "got %lu\n", GlobalSize( U(med).hGlobal ) ); ptr = GlobalLock( U(med).hGlobal ); @@ -2518,84 +2519,26 @@ static void test_data_cache_initnew(void) IOleCache2_Release( cache ); } +static BOOL compare_global(HGLOBAL handle, const void *data, SIZE_T size) +{ + const void *mem = GlobalLock(handle); + BOOL ret = GlobalSize(handle) == size && !memcmp(data, mem, size); + GlobalUnlock(handle); + return ret; +} + static void test_data_cache_updatecache( void ) { + FORMATETC dib_fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; + FORMATETC emf_fmt = {CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF}; + FORMATETC wmf_fmt = {CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT}; + FORMATETC view_fmt = {0, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; + IDataObject *data; HRESULT hr; IOleCache2 *cache; - FORMATETC fmt; + STGMEDIUM medium; DWORD conn[4]; - static const struct expected_method methods_dib[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, - { NULL } - }; - - static const struct expected_method methods_dib_emf[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_dib_wmf[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_viewcache[] = - { - { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { "DataObject_QueryGetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_QueryGetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_QueryGetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, - { NULL } - }; - static const struct expected_method methods_viewcache_with_dib[] = - { - { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { "DataObject_QueryGetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_QueryGetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { NULL } - }; - static const struct expected_method methods_flags_all[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_flags_ifblank_1[] = - { - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_flags_ifblank_2[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_flags_normal[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { NULL } - }; - static const struct expected_method methods_initcache[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_empty[] = - { - { NULL } - }; - static STATDATA view_cache[] = { {{ 0, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 0 } @@ -2606,216 +2549,276 @@ static void test_data_cache_updatecache( void ) {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 0 } }; - static FORMATETC dib_fmt[] = - { - { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, - { 0 } - }; - hr = CreateDataCache( NULL, &CLSID_WineTestOld, &IID_IOleCache2, (void **)&cache ); ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_QueryInterface(cache, &IID_IDataObject, (void **)&data); - /* No cache slots */ - g_dataobject_fmts = NULL; - expected_method_list = NULL; - + data_object_format = NULL; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - /* A dib cache slot */ - fmt.cfFormat = CF_DIB; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_HGLOBAL; - - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[0] ); + hr = IOleCache2_Cache( cache, &dib_fmt, 0, &conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_dib; - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - /* Now with a dib available */ - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_dib; + data_object_format = &dib_fmt; + data_object_dib = dib_white; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + + hr = IOleCache2_Cache(cache, &emf_fmt, 0, &conn[1]); + ok( hr == S_OK, "got %08x\n", hr ); + + data_object_dib = dib_black; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - /* Add an EMF cache slot */ - fmt.cfFormat = CF_ENHMETAFILE; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_ENHMF; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_black, sizeof(dib_black)), "Media didn't match.\n"); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[1] ); + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_dib_emf; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_ENHMF, "Got unexpected tymed %u.\n", medium.tymed); - /* Two slots to fill, only the dib will succeed */ + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + + data_object_format = &wmf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_ENHMF, "Got unexpected tymed %u.\n", medium.tymed); + + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - /* Replace the emf slot with a wmf */ hr = IOleCache2_Uncache( cache, conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); - fmt.cfFormat = CF_METAFILEPICT; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_MFPICT; + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[1] ); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IOleCache2_Cache( cache, &wmf_fmt, 0, &conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_dib_wmf; + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &wmf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IOleCache2_Uncache( cache, conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); hr = IOleCache2_Uncache( cache, conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - /* View caching */ - fmt.cfFormat = 0; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_HGLOBAL; + /* Test view caching. */ - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[0] ); + hr = IOleCache2_Cache( cache, &view_fmt, 0, &conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); view_cache[0].dwConnection = conn[0]; - g_dataobject_fmts = NULL; - expected_method_list = methods_viewcache; - + data_object_format = NULL; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); check_enum_cache( cache, view_cache, 1 ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_viewcache_with_dib; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &view_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &dib_fmt; + data_object_dib = dib_white; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); view_cache_after_dib[0].dwConnection = view_cache_after_dib[1].dwConnection = view_cache[0].dwConnection; check_enum_cache( cache, view_cache_after_dib, 2 ); - hr = IOleCache2_Uncache( cache, conn[0] ); - ok( hr == S_OK, "got %08x\n", hr ); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &view_fmt, &medium); + todo_wine ok(hr == DV_E_CLIPFORMAT, "Got hr %#x.\n", hr); - /* Try some different flags */ + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); - fmt.cfFormat = CF_DIB; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_HGLOBAL; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[0] ); + hr = IOleCache2_Uncache( cache, conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - fmt.cfFormat = CF_ENHMETAFILE; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_ENHMF; + /* Try some different flags */ - hr = IOleCache2_Cache( cache, &fmt, ADVF_NODATA, &conn[1] ); + hr = IOleCache2_Cache( cache, &dib_fmt, 0, &conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - fmt.cfFormat = CF_METAFILEPICT; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_MFPICT; - - hr = IOleCache2_Cache( cache, &fmt, ADVFCACHE_ONSAVE, &conn[2] ); + hr = IOleCache2_Cache( cache, &emf_fmt, ADVF_NODATA, &conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_flags_all; - - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); - - CHECK_NO_EXTRA_METHODS(); + data_object_format = &dib_fmt; + data_object_dib = dib_white; + hr = IOleCache2_UpdateCache(cache, &DataObject, UPDFCACHE_IFBLANK, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); - expected_method_list = methods_flags_all; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + data_object_dib = dib_black; + hr = IOleCache2_UpdateCache(cache, &DataObject, UPDFCACHE_IFBLANK, NULL); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); - - expected_method_list = methods_flags_ifblank_1; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &emf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK , NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_flags_ifblank_2; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK , NULL ); + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK | UPDFCACHE_NODATACACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_flags_all; - - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK | UPDFCACHE_NODATACACHE, NULL ); + data_object_format = &dib_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); - - expected_method_list = methods_empty; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &emf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_flags_normal; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); + hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + data_object_format = &dib_fmt; + hr = IOleCache2_InitCache( cache, &DataObject ); + ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_initcache; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_InitCache( cache, &DataObject ); + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + IDataObject_Release(data); IOleCache2_Release( cache ); } @@ -4130,18 +4133,18 @@ static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *st switch (cf) { case CF_DIB: - data_size = sizeof(dib); + data_size = sizeof(dib_white); if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) { data_size += sizeof(dib_inf); data = HeapAlloc(GetProcessHeap(), 0, data_size); memcpy(data, dib_inf, sizeof(dib_inf)); - memcpy(data + sizeof(dib_inf), dib, sizeof(dib)); + memcpy(data + sizeof(dib_inf), dib_white, sizeof(dib_white)); } else { data = HeapAlloc(GetProcessHeap(), 0, data_size); - memcpy(data, dib, sizeof(dib)); + memcpy(data, dib_white, sizeof(dib_white)); } stg_def->stream[stm_idx].data = data; stg_def->stream[stm_idx].data_size = data_size; @@ -4484,6 +4487,9 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || static void test_OleCreateStaticFromData(void) { + FORMATETC dib_fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; + FORMATETC emf_fmt = {CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF}; + FORMATETC text_fmt = {CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; HRESULT hr; IOleObject *ole_obj = NULL; IStorage *storage; @@ -4493,41 +4499,10 @@ static void test_OleCreateStaticFromData(void) STATSTG statstg; int enumerated_streams, matched_streams; STGMEDIUM stgmed; - static FORMATETC dib_fmt[] = - { - { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, - { 0 } - }; - static FORMATETC emf_fmt[] = - { - { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, - { 0 } - }; - static FORMATETC text_fmt[] = - { - { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, - { 0 } - }; static const struct expected_method methods_create_from_dib[] = { { "DataObject_EnumFormatEtc", TEST_TODO }, { "DataObject_GetDataHere", 0 }, - { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, - { NULL } - }; - static const struct expected_method methods_createstatic_from_dib[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { NULL } - }; - static const struct expected_method methods_createstatic_from_emf[] = - { - { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { NULL } - }; - static const struct expected_method methods_createstatic_from_text[] = - { - { "DataObject_GetData", 0, { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, { NULL } }; static struct storage_def stg_def_dib = @@ -4554,18 +4529,18 @@ static void test_OleCreateStaticFromData(void) ILockBytes_Release(ilb); hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - dib_fmt, NULL, NULL, (void **)&ole_obj); + &dib_fmt, NULL, NULL, (void **)&ole_obj); ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - dib_fmt, NULL, storage, NULL); + &dib_fmt, NULL, storage, NULL); ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); /* CF_DIB */ - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_createstatic_from_dib; + data_object_format = &dib_fmt; + data_object_dib = dib_white; hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - dib_fmt, NULL, storage, (void **)&ole_obj); + &dib_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); @@ -4596,10 +4571,9 @@ static void test_OleCreateStaticFromData(void) 0, &storage); ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); ILockBytes_Release(ilb); - g_dataobject_fmts = emf_fmt; - expected_method_list = methods_createstatic_from_emf; + data_object_format = &emf_fmt; hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - emf_fmt, NULL, storage, (void **)&ole_obj); + &emf_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); @@ -4630,10 +4604,9 @@ static void test_OleCreateStaticFromData(void) 0, &storage); ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); ILockBytes_Release(ilb); - g_dataobject_fmts = text_fmt; - expected_method_list = methods_createstatic_from_text; + data_object_format = &text_fmt; hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - text_fmt, NULL, storage, (void **)&ole_obj); + &text_fmt, NULL, storage, (void **)&ole_obj); ok(hr == DV_E_CLIPFORMAT, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); IStorage_Release(storage); @@ -4643,9 +4616,9 @@ static void test_OleCreateStaticFromData(void) 0, &storage); ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); ILockBytes_Release(ilb); - g_dataobject_fmts = dib_fmt; + data_object_format = &dib_fmt; expected_method_list = methods_create_from_dib; - hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, &dib_fmt, NULL, storage, (void **)&ole_obj); todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); IStorage_Release(storage); -- 2.24.1

1 1