May 2008 - Wine-commits - list.winehq.org

Frans Kool : winhelp: Added missing Dutch translations.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 33d586d4243c64488a6f23db4889b1a96b5deb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d586d4243c64488a6f23db4… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed May 7 22:44:56 2008 +0200 winhelp: Added missing Dutch translations. --- programs/winhelp/Nl.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/Nl.rc b/programs/winhelp/Nl.rc index 8890a8e..ead97e7 100644 --- a/programs/winhelp/Nl.rc +++ b/programs/winhelp/Nl.rc @@ -79,3 +79,26 @@ STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" } + +CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotering...", MNID_CTXT_ANNOTATE + MENUITEM "Kopi�ren", MNID_CTXT_COPY + MENUITEM "Print...", MNID_CTXT_PRINT + POPUP "Lettertypes" + BEGIN + MENUITEM "Klein", MNID_CTXT_FONTS_SMALL + MENUITEM "Normaal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Groot", MNID_CTXT_FONTS_LARGE + END + POPUP "Help altijd zichtbaar" + BEGIN + MENUITEM "Standaard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Zichtbaar", MNID_CTXT_HELP_VISIBLE + MENUITEM "Onzichtbaar", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Maarten Lankhorst : kernel32: Fix process tests to pass in Windows.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: db8e63af27b75d098db6f9a61a6fb0ab7d70d83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8e63af27b75d098db6f9a61… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 7 15:44:48 2008 -0700 kernel32: Fix process tests to pass in Windows. --- dlls/kernel32/tests/process.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fbf13b0..3a3743a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -470,7 +470,8 @@ static void test_Startup(void) GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); - okChildString("StartupInfoA", "lpTitle", si.lpTitle); + ok (si.lpTitle == NULL || !strncmp(si.lpTitle, selfname, strlen(selfname)), + "StartupInfoA:lpTitle expected something starting with '%s' or null, got '%s'\n", selfname, si.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -622,7 +623,8 @@ static void test_Startup(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); - okChildString("StartupInfoA", "lpTitle", si.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1041,7 +1043,8 @@ static void test_SuspendFlag(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1091,7 +1094,8 @@ static void test_DebuggingFlag(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1195,7 +1199,8 @@ static void test_Console(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1230,7 +1235,7 @@ static void test_Console(void) ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); ok(modeInC == (modeIn ^ 1), "Wrong console mode\n"); ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n"); - ok(sbiC.dwCursorPosition.X == (sbi.dwCursorPosition.X ^ 1), "Wrong cursor position\n"); + trace("cursor position(X): %d/%d\n",sbi.dwCursorPosition.X, sbiC.dwCursorPosition.X); ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n"); release_memory();

1 0

Alexandre Julliard : ntdll: Ignore failures to retrieve serial status for events we are not interested in .
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 03fbe0163294d1af2418ade46210f6ed6dc37e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fbe0163294d1af2418ade46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 21:10:39 2008 +0200 ntdll: Ignore failures to retrieve serial status for events we are not interested in. Based on a patch by Valentine Sinitsyn. --- dlls/ntdll/serial.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 3e1c071..bdb47e4 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -287,18 +287,13 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) { - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status = STATUS_NOT_SUPPORTED; int mstat; + *lpModemStat = 0; #ifdef TIOCMGET - if (ioctl(fd, TIOCMGET, &mstat) == -1) - { - WARN("ioctl failed\n"); - status = FILE_GetNtStatus(); - } - else + if (!ioctl(fd, TIOCMGET, &mstat)) { - *lpModemStat = 0; #ifdef TIOCM_CTS if (mstat & TIOCM_CTS) *lpModemStat |= MS_CTS_ON; #endif @@ -317,9 +312,10 @@ static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) (*lpModemStat & MS_RING_ON) ? "MS_RING_ON " : "", (*lpModemStat & MS_DSR_ON) ? "MS_DSR_ON " : "", (*lpModemStat & MS_CTS_ON) ? "MS_CTS_ON " : ""); + return STATUS_SUCCESS; } -#else - status = STATUS_NOT_SUPPORTED; + WARN("ioctl failed\n"); + status = FILE_GetNtStatus(); #endif return status; } @@ -873,6 +869,7 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { + NTSTATUS status = STATUS_NOT_IMPLEMENTED; #ifdef TIOCGICOUNT struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) @@ -887,11 +884,10 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) return STATUS_SUCCESS; } TRACE("TIOCGICOUNT err %s\n", strerror(errno)); - return FILE_GetNtStatus(); -#else - memset(irq_info,0, sizeof(serial_irq_info)); - return STATUS_NOT_IMPLEMENTED; + status = FILE_GetNtStatus(); #endif + memset(irq_info,0, sizeof(serial_irq_info)); + return status; } @@ -1050,15 +1046,24 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, DWORD* events) #endif if (commio->evtmask & EV_RXFLAG) FIXME("EV_RXFLAG not handled\n"); - if ((status = get_irq_info(fd, &commio->irq_info)) || - (status = get_modem_status(fd, &commio->mstat))) - goto out_now; + + if ((status = get_irq_info(fd, &commio->irq_info)) && + (commio->evtmask & (EV_BREAK | EV_ERR))) + goto out_now; + + if ((status = get_modem_status(fd, &commio->mstat)) && + (commio->evtmask & (EV_CTS | EV_DSR| EV_RING| EV_RLSD))) + goto out_now; /* We might have received something or the TX buffer is delivered */ *events = check_events(fd, commio->evtmask, &commio->irq_info, &commio->irq_info, commio->mstat, commio->mstat); - if (*events) goto out_now; + if (*events) + { + status = STATUS_SUCCESS; + goto out_now; + } /* create the worker for the task */ status = RtlQueueWorkItem(wait_for_event, commio, 0 /* FIXME */);

1 0

Maarten Lankhorst : ntdll: Fix some exception tests to pass on Windows.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 9c509234bc7d3d615da60b80e5c7c528d5858c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c509234bc7d3d615da60b80e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 7 10:41:52 2008 -0700 ntdll: Fix some exception tests to pass on Windows. --- dlls/ntdll/tests/exception.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d6168ee..80a8fbd 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -105,7 +105,7 @@ static const struct exception /* test loading an invalid selector */ { { 0xb8, 0xef, 0xbe, 0x00, 0x00, 0x8e, 0xe8, 0xc3 }, /* mov $beef,%ax; mov %ax,%gs; ret */ - 5, 2, STATUS_ACCESS_VIOLATION, 2, { 0, 0xbee8 } }, + 5, 2, STATUS_ACCESS_VIOLATION, 2, { 0, 0xbee8 } }, /* 0xbee8 or 0xffffffff */ /* test accessing a zero selector */ { { 0x06, 0x31, 0xc0, 0x8e, 0xc0, 0x26, 0xa1, 0, 0, 0, 0, 0x07, 0xc3 }, @@ -358,6 +358,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram goto skip_params; } + /* Seems that both 0xbee8 and 0xfffffffff can be returned in windows */ + if (except->nb_params == 2 && rec->NumberParameters == 2 + && except->params[1] == 0xbee8 && rec->ExceptionInformation[1] == 0xffffffff + && except->params[0] == rec->ExceptionInformation[0]) + { + goto skip_params; + } + for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->params[i], "%u: Wrong parameter %d: %lx/%x\n", @@ -485,7 +493,8 @@ static DWORD direction_flag_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATI #ifdef __GNUC__ unsigned int flags; __asm__("pushfl; popl %0" : "=r" (flags) ); - ok( !(flags & 0x400), "eflags has DF bit set\n" ); + /* older windows versions don't clear DF properly so don't test */ + if (flags & 0x400) trace( "eflags has DF bit set\n" ); #endif ok( context->EFlags & 0x400, "context eflags has DF bit cleared\n" ); got_exception++;

1 0

Maarten Lankhorst : ntdll: Fix file test to not free memory allocated on the stack.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: b574c11582eac45499e7a78fcbe654ad897dd94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b574c11582eac45499e7a78fc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 7 11:05:13 2008 -0700 ntdll: Fix file test to not free memory allocated on the stack. --- dlls/ntdll/tests/file.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8d2ffc3..7b88b01 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -39,7 +39,6 @@ #endif static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); -static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, PLARGE_INTEGER ); static NTSTATUS (WINAPI *pNtReadFile)(HANDLE hFile, HANDLE hEvent, @@ -467,8 +466,6 @@ static void nt_mailslot_test(void) rc = pNtClose(hslot); ok( rc == STATUS_SUCCESS, "NtClose failed\n"); - - pRtlFreeUnicodeString(&str); } static void test_iocp_setcompletion(HANDLE h) @@ -611,7 +608,6 @@ START_TEST(file) return; } - pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile");

1 0

Maarten Lankhorst : rpcrt4: Fix ndr_marshall test failures.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: fd7b277d8ac23706b1c819d2ed1fd0ee9833fd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7b277d8ac23706b1c819d2e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 6 15:06:17 2008 -0700 rpcrt4: Fix ndr_marshall test failures. Created with help from Robert Shearman. --- dlls/rpcrt4/tests/ndr_marshall.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 72fd1be..1ff5e3b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -514,7 +514,9 @@ static void test_nontrivial_pointer_types(void) NdrPointerBufferSize( &StubMsg, (unsigned char *)p1, &fmtstr_ref_unique_out[4] ); - ok(StubMsg.BufferLength == 5, "length %d\n", StubMsg.BufferLength); + + /* Windows overestimates the buffer size */ + ok(StubMsg.BufferLength >= 5, "length %d\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); @@ -1706,7 +1708,7 @@ static void test_nonconformant_string(void) static void test_ndr_buffer(void) { static unsigned char ncalrpc[] = "ncalrpc"; - static unsigned char endpoint[] = "winetest:" __FILE__; + static unsigned char endpoint[] = "winetest:test_ndr_buffer"; RPC_MESSAGE RpcMessage; MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc = Object_StubDesc; @@ -1717,9 +1719,17 @@ static void test_ndr_buffer(void) StubDesc.RpcInterfaceInformation = (void *)&IFoo___RpcServerInterface; - ok(RPC_S_OK == RpcServerUseProtseqEp(ncalrpc, 20, endpoint, NULL), "RpcServerUseProtseqEp\n"); - ok(RPC_S_OK == RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL), "RpcServerRegisterIf\n"); - ok(RPC_S_OK == RpcServerListen(1, 20, TRUE), "RpcServerListen\n"); + status = RpcServerUseProtseqEp(ncalrpc, 20, endpoint, NULL); + ok(RPC_S_OK == status, "RpcServerUseProtseqEp failed with status %lu\n", status); + status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); + ok(RPC_S_OK == status, "RpcServerRegisterIf failed with status %lu\n", status); + status = RpcServerListen(1, 20, TRUE); + ok(RPC_S_OK == status, "RpcServerListen failed with status %lu\n", status); + if (status != RPC_S_OK) + { + /* Failed to create a server, running client tests is useless */ + return; + } status = RpcStringBindingCompose(NULL, ncalrpc, NULL, endpoint, NULL, &binding); ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status);

1 0

Alexandre Julliard : ntdll: Don' t consider a 0-byte read from a serial port as a broken pipe.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 152d65c6f34c9973e6d6acece883443746e9b78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=152d65c6f34c9973e6d6acece… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 20:18:09 2008 +0200 ntdll: Don't consider a 0-byte read from a serial port as a broken pipe. --- dlls/ntdll/file.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index fd72a61..972d600 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -599,10 +599,22 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (!result || total == length) { if (total) + { status = STATUS_SUCCESS; - else - status = (type == FD_TYPE_FILE || type == FD_TYPE_CHAR) ? STATUS_END_OF_FILE : STATUS_PIPE_BROKEN; - goto done; + goto done; + } + switch (type) + { + case FD_TYPE_FILE: + case FD_TYPE_CHAR: + status = STATUS_END_OF_FILE; + goto done; + case FD_TYPE_SERIAL: + break; + default: + status = STATUS_PIPE_BROKEN; + goto done; + } } } else

1 0

Rob Shearman : crypt32: Add stub for CertVerifyCTLUsage.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 9e717aa2e8b03fd1b4a389022571251c99c10933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e717aa2e8b03fd1b4a389022… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 7 17:03:25 2008 +0100 crypt32: Add stub for CertVerifyCTLUsage. --- dlls/crypt32/cert.c | 12 ++++++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 84780cb..41d3998 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2574,3 +2574,15 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN CryptReleaseContext(hProv, 0); return context; } + +BOOL WINAPI CertVerifyCTLUsage(DWORD dwEncodingType, DWORD dwSubjectType, + void *pvSubject, PCTL_USAGE pSubjectUsage, DWORD dwFlags, + PCTL_VERIFY_USAGE_PARA pVerifyUsagePara, + PCTL_VERIFY_USAGE_STATUS pVerifyUsageStatus) +{ + FIXME("(0x%x, %d, %p, %p, 0x%x, %p, %p): stub\n", dwEncodingType, + dwSubjectType, pvSubject, pSubjectUsage, dwFlags, pVerifyUsagePara, + pVerifyUsageStatus); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 870ee48..b7f45d0 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -89,7 +89,7 @@ @ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) -@ stub CertVerifyCTLUsage +@ stdcall CertVerifyCTLUsage(long long ptr ptr long ptr ptr) @ stdcall CertVerifyRevocation(long long long ptr long ptr ptr) @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr)

1 0

Dmitry Timoshkov : gdi32: More carefully compare EMF records in tests.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 51c28a1493c844eff4f4625d3398da5ee5d707fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c28a1493c844eff4f4625d3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 7 20:34:36 2008 +0900 gdi32: More carefully compare EMF records in tests. --- dlls/gdi32/tests/metafile.c | 128 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 109 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 7c14428..78bbd8b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -953,6 +953,81 @@ static void dump_emf_records(const HENHMETAFILE mf, const char *desc) } } +static void dump_emf_record(const ENHMETARECORD *emr, const char *desc) +{ + const BYTE *buf; + DWORD i; + + if (!winetest_debug) return; + + printf ("%s: EMF record %u has bits:\n{\n", desc, emr->iType); + buf = (const BYTE *)emr; + for (i = 0; i < emr->nSize; i++) + { + printf ("0x%02x", buf[i]); + if (i == emr->nSize - 1) + printf ("\n"); + else if (i % 8 == 7) + printf (",\n"); + else + printf (", "); + } + printf ("};\n"); +} + +static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr2, + const char *desc, BOOL todo) +{ + int diff; + + if (emr1->iType != emr2->iType && todo) + { + todo_wine + { + ok(emr1->iType == emr2->iType, "%s: emr->iType %u != %u\n", + desc, emr1->iType, emr2->iType); + } + } + else + ok(emr1->iType == emr2->iType, "%s: emr->iType %u != %u\n", + desc, emr1->iType, emr2->iType); + + if (emr1->nSize != emr2->nSize && todo) + { + todo_wine + { + ok(emr1->nSize == emr2->nSize, "%s: emr->nSize %u != %u\n", + desc, emr1->nSize, emr2->nSize); + } + } + else + ok(emr1->nSize == emr2->nSize, "%s: emr->nSize %u != %u\n", + desc, emr1->nSize, emr2->nSize); + + /* iType and nSize mismatches are fatal */ + if (emr1->iType != emr2->iType || emr1->nSize != emr2->nSize) return FALSE; + + /* contents of EMR_GDICOMMENT are not interesting */ + if (emr1->iType == EMR_GDICOMMENT) return TRUE; + + diff = memcmp(emr1->dParm, emr2->dParm, emr1->nSize - sizeof(EMR)); + if (diff && todo) + { + todo_wine + ok(diff == 0, "%s: contents of record %u don't match\n", desc, emr1->iType); + } + else + ok(diff == 0, "%s: contents of record %u don't match\n", desc, emr1->iType); + + if (diff) + { + dump_emf_record(emr1, "expected bits"); + dump_emf_record(emr2, "actual bits"); + } + + return diff == 0 || todo; /* report all non-fatal record mismatches */ +} + /* Compare the EMF produced by a test function with the * expected raw EMF data in "bits". * Return value is 0 for a perfect match, @@ -963,8 +1038,8 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, UINT bsize, const char *desc, BOOL todo) { unsigned char buf[MF_BUFSIZE]; - UINT mfsize, i; - int diff; + UINT mfsize, offset; + const ENHMETAHEADER *emh1, *emh2; mfsize = GetEnhMetaFileBits(mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetEnhMetaFileBits error %d\n", desc, GetLastError()); @@ -983,31 +1058,46 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, ok(bsize >= MF_BUFSIZE, "%s: mfsize > bufsize (%d bytes), bsize=%d\n", desc, mfsize, bsize); - if (mfsize != bsize) - return -1; - - diff = 0; - for (i = 0; i < bsize; i++) + /* basic things must match */ + emh1 = (const ENHMETAHEADER *)bits; + emh2 = (const ENHMETAHEADER *)buf; + ok(emh1->iType == EMR_HEADER, "expected EMR_HEADER, got %u\n", emh1->iType); + ok(emh1->nSize == sizeof(ENHMETAHEADER), "expected sizeof(ENHMETAHEADER), got %u\n", emh1->nSize); + ok(emh2->nBytes == mfsize, "expected emh->nBytes %u, got %u\n", mfsize, emh2->nBytes); + ok(emh1->dSignature == ENHMETA_SIGNATURE, "expected ENHMETA_SIGNATURE, got %u\n", emh1->dSignature); + + ok(emh1->iType == emh2->iType, "expected EMR_HEADER, got %u\n", emh2->iType); + ok(emh1->nSize == emh2->nSize, "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); + ok(emh1->dSignature == emh2->dSignature, "expected dSignature %u, got %u\n", emh1->dSignature, emh2->dSignature); + if (todo && emh1->nBytes != emh2->nBytes) { - if (buf[i] != bits[i]) - diff++; + todo_wine + ok(emh1->nBytes == emh2->nBytes, "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); } - if (diff != 0 && todo) + else + ok(emh1->nBytes == emh2->nBytes, "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); + if (todo && emh1->nRecords != emh2->nRecords) { todo_wine - { - ok(diff == 0, "%s: mfsize=%d, bsize=%d, diff=%d\n", - desc, mfsize, bsize, diff); - } - return diff; + ok(emh1->nRecords == emh2->nRecords, "expected nBytes %u, got %u\n", emh1->nRecords, emh2->nRecords); } else + ok(emh1->nRecords == emh2->nRecords, "expected nBytes %u, got %u\n", emh1->nRecords, emh2->nRecords); + + offset = emh1->nSize; + while (offset < emh1->nBytes) { - ok(diff == 0, "%s: mfsize=%d, bsize=%d, diff=%d\n", - desc, mfsize, bsize, diff); + const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset); + const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset); + + trace("EMF record %u, size %u/record %u, size %u\n", + emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); + + if (!match_emf_record(emr1, emr2, desc, todo)) return -1; - return diff; + offset += emr1->nSize; } + return 0; } /* Test a blank metafile. May be used as a template for new tests. */ @@ -1561,7 +1651,7 @@ static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETAREC * until a record is played which actually outputs something */ PlayEnhMetaFileRecord(hdc, lpHTable, lpEMFR, nObj); LPtoDP(hdc, mapping, 2); - trace("Meta record: iType %d, nSize %d, (%d,%d)-(%d,%d)\n", + trace("EMF record: iType %d, nSize %d, (%d,%d)-(%d,%d)\n", lpEMFR->iType, lpEMFR->nSize, mapping[0].x, mapping[0].y, mapping[1].x, mapping[1].y);

1 0

Dmitry Timoshkov : gdi32: Implement EMFDRV_SelectPalette.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 2820682202886cb1fc438ab55b3c39f13baef9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2820682202886cb1fc438ab55… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 7 20:35:04 2008 +0900 gdi32: Implement EMFDRV_SelectPalette. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 55 ++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index f1c81a2..c00c653 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -122,6 +122,7 @@ extern HBRUSH EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN extern BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; extern HPEN EMFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; +extern HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; extern COLORREF EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index dafac60..de135d2 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,7 +114,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ + EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ EMFDRV_SetArcDirection, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index c7ecd54..54c34bf 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -465,6 +465,61 @@ HPEN EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen ) /****************************************************************** + * EMFDRV_CreatePalette + */ +static DWORD EMFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPal) +{ + WORD i; + struct { + EMRCREATEPALETTE hdr; + PALETTEENTRY entry[255]; + } pal; + + memset( &pal, 0, sizeof(pal) ); + + if (!GetObjectW( hPal, sizeof(pal.hdr.lgpl) + sizeof(pal.entry), &pal.hdr.lgpl )) + return 0; + + for (i = 0; i < pal.hdr.lgpl.palNumEntries; i++) + pal.hdr.lgpl.palPalEntry[i].peFlags = 0; + + pal.hdr.emr.iType = EMR_CREATEPALETTE; + pal.hdr.emr.nSize = sizeof(pal.hdr) + pal.hdr.lgpl.palNumEntries * sizeof(PALETTEENTRY); + pal.hdr.ihPal = EMFDRV_AddHandle( dev, hPal ); + + if (!EMFDRV_WriteRecord( dev, &pal.hdr.emr )) + pal.hdr.ihPal = 0; + return pal.hdr.ihPal; +} + +/****************************************************************** + * EMFDRV_SelectPalette + */ +HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) +{ + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; + EMRSELECTPALETTE emr; + DWORD index; + + if (hPal == GetStockObject( DEFAULT_PALETTE )) + index = DEFAULT_PALETTE | 0x80000000; + goto found; + + if ((index = EMFDRV_FindObject( dev, hPal )) != 0) + goto found; + + if (!(index = EMFDRV_CreatePalette( dev, hPal ))) return 0; + GDI_hdc_using_object( hPal, physDev->hdc ); + +found: + emr.emr.iType = EMR_SELECTPALETTE; + emr.emr.nSize = sizeof(emr); + emr.ihPal = index; + return EMFDRV_WriteRecord( dev, &emr.emr ) ? hPal : 0; +} + + +/****************************************************************** * EMFDRV_GdiComment */ BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer)

1 0