February 2014 - Wine-Commits

André Hentschel : gdiplus/tests: Remove assertions in graphics tests.
by Alexandre Julliard Feb. 12, 2014

Feb. 12, 2014

Module: wine Branch: master Commit: 374b449fdd02f4d0963460cc14698a7fa7cc63a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=374b449fdd02f4d0963460cc1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 11 20:27:45 2014 +0100 gdiplus/tests: Remove assertions in graphics tests. --- dlls/gdiplus/tests/graphics.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 2de456c..4d74081 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -20,7 +20,6 @@ */ #include <math.h> -#include <assert.h> #include "objbase.h" #include "gdiplus.h" @@ -60,7 +59,7 @@ static REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) case UnitMillimeter: return units * dpi / mm_per_inch; default: - assert(0); + ok(0, "Unsupported unit: %d\n", unit); return 0; } } @@ -82,7 +81,7 @@ static REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) case UnitMillimeter: return pixels * mm_per_inch / dpi; default: - assert(0); + ok(0, "Unsupported unit: %d\n", unit); return 0; } }

1 0

Alexandre Julliard : winebuild: Generate position-independent code for ARM.
by Alexandre Julliard Feb. 12, 2014

Feb. 12, 2014

Module: wine Branch: master Commit: 4e4acd5f705c770b7c361605e11d9d7c044ca0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4acd5f705c770b7c361605e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 11 20:46:25 2014 +0100 winebuild: Generate position-independent code for ARM. --- tools/winebuild/import.c | 59 ++++++++++++++++++++++------------------------ tools/winebuild/spec32.c | 42 +++++++++++++++++---------------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f8de47e..6bafd86 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -650,9 +650,9 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; case CPU_ARM: - output( "\tldr IP,[PC,#0]\n"); - output( "\tldr PC,[IP,#%d]\n", pos); - output( "\t.long %s\n", table ); + output( "\tldr IP,1f\n"); + output( "\tldr PC,[PC,IP]\n" ); + output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: output( "\tadr x9, 1f\n" ); @@ -967,15 +967,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%rax\n" ); break; case CPU_ARM: - output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); - output( "\tmov LR,PC\n"); - output( "\tadd LR,LR,#8\n"); - output( "\tldr PC,[PC,#-4]\n"); - output( "\t.long %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov IP,r0\n"); - output( "\tldmfd SP!, {r4-r10,FP,LR}\n" ); - output( "\tldmfd SP!, {r0-r3}\n" ); - output( "\tmov PC,IP\n"); + output( "\tpush {r0-r3,FP,LR}\n" ); + output( "\tmov r0,IP\n" ); + output( "\tldr IP,2f\n"); + output( "\tadd IP,PC\n"); + output( "\tblx IP\n"); + output( "1:\tmov IP,r0\n"); + output( "\tpop {r0-r3,FP,LR}\n" ); + output( "\tbx IP\n"); + output( "2:\t.long %s-1b\n", asm_name("__wine_spec_delay_load") ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); @@ -1067,18 +1067,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_ARM: - output( "\tstmfd SP!, {r0-r3}\n" ); - output( "\tmov r0, #%d\n", idx ); - output( "\tmov r1, #16384\n" ); - output( "\tmul r1, r0, r1\n" ); - output( "\tmov r0, r1\n" ); - output( "\tmov r1, #4\n" ); - output( "\tmul r1, r0, r1\n" ); - output( "\tmov r0, r1\n" ); - output( "\tadd r0, #%d\n", j ); - output( "\tldr PC,[PC,#-4]\n"); - output( "\t.long %s\n", asm_name("__wine_delay_load_asm") ); + { + unsigned int mask, count = 0, val = (idx << 16) | j; + + for (mask = 0xff; mask; mask <<= 8) + if (val & mask) output( "\t%s IP,#%u\n", count++ ? "add" : "mov", val & mask ); + if (!count) output( "\tmov IP,#0\n" ); + output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); break; + } case CPU_ARM64: output( "\tstp x6, x7, [sp,#-80]!\n" ); output( "\tstp x4, x5, [sp,#48]\n" ); @@ -1268,19 +1265,19 @@ void output_stubs( DLLSPEC *spec ) output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_ARM: - output( "\tldr r0,[PC,#0]\n"); - output( "\tmov PC,PC\n"); - output( "\t.long .L__wine_spec_file_name\n" ); - output( "\tldr r1,[PC,#0]\n"); - output( "\tmov PC,PC\n"); + output( "\tldr r0,2f\n"); + output( "\tadd r0,PC\n"); + output( "\tldr r1,2f+4\n"); + output( "1:" ); if (exp_name) { - output( "\t.long .L%s_string\n", name ); + output( "\tadd r1,PC\n"); count++; } - else - output( "\t.long %d\n", odp->ordinal ); output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "2:\t.long .L__wine_spec_file_name-1b\n" ); + if (exp_name) output( "\t.long .L%s_string-2b\n", name ); + else output( "\t.long %u\n", odp->ordinal ); break; default: assert(0); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 0ed38ed..35fe144 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -210,32 +210,34 @@ static void output_relay_debug( DLLSPEC *spec ) break; case CPU_ARM: - switch (args) + { + unsigned int mask, val, count = 0; + unsigned int stack_size = min( 16, (args * 4 + 7) & ~7 ); + + if (odp->flags & FLAG_RET64) flags |= 1; + val = (flags << 24) | (args << 16) | (i - spec->base); + switch (stack_size) { - default: output( "\tpush {r0-r3}\n" ); break; - case 3: output( "\tpush {r0-r2}\n" ); break; - case 2: output( "\tpush {r0-r1}\n" ); break; - case 1: output( "\tpush {r0}\n" ); break; + case 16: output( "\tpush {r0-r3}\n" ); break; + case 8: output( "\tpush {r0-r1}\n" ); break; case 0: break; } output( "\tpush {LR}\n" ); output( "\tmov r2, SP\n"); - if (odp->flags & FLAG_RET64) flags |= 1; - output( "\tmov r1, #%u\n", (flags << 24) ); - if (args) output( "\tadd r1, #%u\n", (args << 16) ); - if ((i - spec->base) & 0xf000) output( "\tadd r1, #%u\n", (i - spec->base) & 0xf000 ); - if ((i - spec->base) & 0x0f00) output( "\tadd r1, #%u\n", (i - spec->base) & 0x0f00 ); - if ((i - spec->base) & 0x00f0) output( "\tadd r1, #%u\n", (i - spec->base) & 0x00f0 ); - if ((i - spec->base) & 0x000f) output( "\tadd r1, #%u\n", (i - spec->base) & 0x000f ); - output( "\tldr r0, [PC, #0]\n"); - output( "\tmov PC, PC\n"); - output( "\t.long .L__wine_spec_relay_descr\n" ); - output( "\tldr r3, [r0, #4]\n"); - output( "\tblx r3\n"); - output( "\tpop {r3}\n" ); - if (args) output( "\tadd SP, SP, #%u\n", min(args*4, 16) ); - output( "\tbx r3\n"); + output( "\tsub SP, #4\n"); + for (mask = 0xff; mask; mask <<= 8) + if (val & mask) output( "\t%s r1,#%u\n", count++ ? "add" : "mov", val & mask ); + if (!count) output( "\tmov r1,#0\n" ); + output( "\tldr r0, 2f\n"); + output( "\tadd r0, PC\n"); + output( "\tldr IP, [r0, #4]\n"); + output( "1:\tblx IP\n"); + output( "\tldr IP, [SP, #4]\n" ); + output( "\tadd SP, #%u\n", stack_size + 8 ); + output( "\tbx IP\n"); + output( "2:\t.long .L__wine_spec_relay_descr-1b\n" ); break; + } case CPU_x86_64: output( "\tsubq $40,%%rsp\n" );

1 0

Frédéric Delanoy : crypt32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Feb. 12, 2014

Feb. 12, 2014

Module: wine Branch: master Commit: d3b0543c05965ad29c4ed6d95e70d0e1e5538906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b0543c05965ad29c4ed6d95… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 11 22:37:45 2014 +0100 crypt32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/crypt32/tests/sip.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index f63afc7..212c24b 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -36,17 +36,6 @@ static BOOL (WINAPI * funcCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *, static BOOL (WINAPI * funcCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); static BOOL (WINAPI * funcCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD); -static char *show_guid(const GUID *guid, char *buf) -{ - sprintf(buf, - "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - - return buf; -} - static void test_AddRemoveProvider(void) { BOOL ret; @@ -165,7 +154,6 @@ static void test_SIPRetrieveSubjectGUID(void) static CHAR path[MAX_PATH]; static CHAR tempfile[MAX_PATH]; static WCHAR tempfileW[MAX_PATH]; - static char guid1[39], guid2[39]; DWORD written; /* NULL check */ @@ -186,7 +174,7 @@ static void test_SIPRetrieveSubjectGUID(void) "Expected ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND, got %d.\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", show_guid(&subject, guid1)); + "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", wine_dbgstr_guid(&subject)); /* Now with an executable that should exist * @@ -205,7 +193,7 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(regeditPathW, NULL, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", show_guid(&unknownGUID, guid1), show_guid(&subject, guid2)); + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); /* The same thing but now with a handle instead of a filename */ file = CreateFileA(regeditPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -214,7 +202,7 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(NULL, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", show_guid(&unknownGUID, guid1), show_guid(&subject, guid2)); + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); CloseHandle(file); /* And both */ @@ -224,7 +212,7 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(regeditPathW, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", show_guid(&unknownGUID, guid1), show_guid(&subject, guid2)); + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); CloseHandle(file); /* Now with an empty file */ @@ -244,7 +232,7 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* Use a file with a size of 3 (at least < 4) */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -260,7 +248,7 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, "Expected ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* And now >= 4 */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -275,7 +263,7 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* Win98 */, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile); @@ -293,7 +281,7 @@ static void test_SIPRetrieveSubjectGUID(void) ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), - "Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2)); + "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile); @@ -311,7 +299,7 @@ static void test_SIPRetrieveSubjectGUID(void) ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), - "Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2)); + "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile);

1 0

Alexandre Julliard : ntdll: Fix printing formats for ARM registers.
by Alexandre Julliard Feb. 12, 2014

Feb. 12, 2014

Module: wine Branch: master Commit: 241dd9ff237dd58ddab6e7b9c0a7467e8e8d3d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241dd9ff237dd58ddab6e7b9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 11 23:04:37 2014 +0100 ntdll: Fix printing formats for ARM registers. --- dlls/ntdll/signal_arm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6dbc7c8..a681986 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -536,12 +536,12 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f } else { - TRACE(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x r0:%04x r1:%04x r2:%04x r3:%04x\n", - context->Pc, context->Sp, context->Lr, context->Cpsr, - context->R0, context->R1, context->R2, context->R3); - TRACE(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x r9:%04x r10:%04x Fp:%04x Ip:%04x\n", - context->R4, context->R5, context->R6, context->R7, context->R8, - context->R9, context->R10, context->Fp, context->Ip ); + TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", + context->R0, context->R1, context->R2, context->R3, context->R4, context->R5 ); + TRACE( " r6=%08x r7=%08x r8=%08x r9=%08x r10=%08x fp=%08x\n", + context->R6, context->R7, context->R8, context->R9, context->R10, context->Fp ); + TRACE( " ip=%08x sp=%08x lr=%08x pc=%08x cpsr=%08x\n", + context->Ip, context->Sp, context->Lr, context->Pc, context->Cpsr ); } status = send_debug_event( rec, TRUE, context );

1 0

Frédéric Delanoy : propsys/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Feb. 12, 2014

Feb. 12, 2014

Module: wine Branch: master Commit: 538059637901034dbac4dfc71dd33f35fff83148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538059637901034dbac4dfc71… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 11 22:37:46 2014 +0100 propsys/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/propsys/tests/propsys.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 0a81779..fc595f9 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -38,22 +38,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe); DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12); -static char *show_guid(const GUID *guid, char *buf) -{ - static char static_buf[40]; - - if(!buf) - buf = static_buf; - - sprintf(buf, - "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - - return buf; -} - static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -347,7 +331,6 @@ static void test_PSPropertyKeyFromString(void) PROPERTYKEY out_init = {dummy_guid, 0xdeadbeef}; PROPERTYKEY out; HRESULT ret; - char guid_buf[40], guid_buf2[40]; const struct { @@ -439,7 +422,7 @@ static void test_PSPropertyKeyFromString(void) { ok(IsEqualGUID(&testcases[i].pkey->fmtid, &testcases[i].pkey_expect.fmtid), "[%d] Expected GUID %s, got %s\n", - i, show_guid(&testcases[i].pkey_expect.fmtid, guid_buf), show_guid(&testcases[i].pkey->fmtid, guid_buf2)); + i, wine_dbgstr_guid(&testcases[i].pkey_expect.fmtid), wine_dbgstr_guid(&testcases[i].pkey->fmtid)); ok(testcases[i].pkey->pid == testcases[i].pkey_expect.pid, "[%d] Expected property ID %u, got %u\n", i, testcases[i].pkey_expect.pid, testcases[i].pkey->pid); @@ -579,7 +562,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar); @@ -587,7 +570,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt); propvar.u.pwszVal[1] = 'd'; @@ -595,7 +578,7 @@ static void test_PropVariantToGUID(void) propvar.u.pwszVal[3] = 'a'; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); propvar.u.pwszVal[1] = 'z'; hres = PropVariantToGUID(&propvar, &guid); @@ -608,7 +591,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); VariantClear(&var); hres = InitVariantFromGUIDAsString(&dummy_guid, &var); @@ -616,7 +599,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var)); V_BSTR(&var)[1] = 'z'; @@ -629,7 +612,7 @@ static void test_PropVariantToGUID(void) V_VT(&var) = VT_EMPTY; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.12
by Jeremy Newman Feb. 12, 2014

Feb. 12, 2014

Module: website Branch: master Commit: 17807d65518570caa018dc37dde1224d0c4a8c73 URL: http://source.winehq.org/git/website.git/?a=commit;h=17807d65518570caa018dc… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Feb 11 20:16:36 2014 +0100 Polish translation for release 1.7.12 --- news/pl/2014020701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014020701.xml b/news/pl/2014020701.xml new file mode 100644 index 0000000..51ff6bf --- /dev/null +++ b/news/pl/2014020701.xml @@ -0,0 +1,16 @@ +<news> +<date>Luty 7, 2014</date> +<title>Wydano Wine 1.7.12</title> +<body> + Wydanie rozwojowe Wine 1.7.12 jest już dostępne. + <a href="{$root}/announce/1.7.12">Co nowego</a> w tym wydaniu: +<ul> + <li>Wstępne wsparcie dla interfejsów Window Media Player.</li> + <li>Trochę lepsze wsparcie dla Harmonogramu Zadań.</li> + <li>Rozmaite poprawki w bibliotece uruchomieniowej C++.</li> + <li>Więcej bibliotek dll z dziwnymi nazwami dla wsparcia zestawu API dla Windows 8.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.12.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Martin Storsjo : wined3d: Fix clamping in reading rectangular YV12 textures.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 963c26b36fd0192053dd245fadc4814af79e718d URL: http://source.winehq.org/git/wine.git/?a=commit;h=963c26b36fd0192053dd245fa… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 11 12:14:55 2014 +0100 wined3d: Fix clamping in reading rectangular YV12 textures. The lower bound for chroma components is size.y + 1/2, not size.y - 1/2. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 56ab15f..aa0f609 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7003,7 +7003,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, shader_addline(buffer, "MAD temp.y, size.y, coef.w, size.y;\n"); shader_addline(buffer, "ADD temp.y, temp.y, -coef.y;\n"); shader_addline(buffer, "MIN texcrd.y, temp.y, texcrd.y;\n"); - shader_addline(buffer, "ADD temp.y, size.y, -coef.y;\n"); + shader_addline(buffer, "ADD temp.y, size.y, coef.y;\n"); shader_addline(buffer, "MAX texcrd.y, temp.y, texcrd.y;\n"); } /* Read the texture, put the result into the output register */

1 0

Erich E. Hoover : ddraw: Return a DLL in szDriver for GetDeviceIdentifier.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 2cb3aeb7b9f7eedacf77c562f93c9c7fac1c4eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb3aeb7b9f7eedacf77c562f… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Feb 10 21:27:33 2014 -0700 ddraw: Return a DLL in szDriver for GetDeviceIdentifier. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddrawmodes.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7aea03e..c4c0b33 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -35,7 +35,7 @@ static BOOL restore_mode; /* Device identifier. Don't relay it to WineD3D */ static const DDDEVICEIDENTIFIER2 deviceidentifier = { - "display", + "vga.dll", /* default 2D driver */ "DirectDraw HAL", { { 0x00010001, 0x00010001 } }, 0, 0, 0, 0, diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 643fe9b..2d7123b 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -988,6 +988,8 @@ static void testddraw7(void) if (hr==DD_OK) { + /* szDriver contains the name of the driver DLL */ + ok(strstr(pdddi2->szDriver, ".dll")!=NULL, "szDriver does not contain DLL name\n"); /* check how strings are copied into the structure */ ok(pdddi2->szDriver[MAX_DDDEVICEID_STRING - 1]==0, "szDriver not cleared\n"); ok(pdddi2->szDescription[MAX_DDDEVICEID_STRING - 1]==0, "szDescription not cleared\n");

1 0

Erich E. Hoover : ddraw: Return the D3D identifier when GetDeviceIdentifier is called with no flags.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 68e3b18533e3c71515a7294c0312c1b3c2201ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e3b18533e3c71515a7294c0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Feb 11 09:21:53 2014 -0700 ddraw: Return the D3D identifier when GetDeviceIdentifier is called with no flags. --- dlls/ddraw/ddraw.c | 43 +++++++++++++++++++++++++++++++++-------- dlls/ddraw/tests/ddrawmodes.c | 18 +++++++++++++++++ dlls/wined3d/directx.c | 4 ++-- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c4c0b33..ed0606f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2561,19 +2561,46 @@ static HRESULT WINAPI ddraw7_EvaluateMode(IDirectDraw7 *iface, DWORD Flags, DWOR static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, DDDEVICEIDENTIFIER2 *DDDI, DWORD Flags) { + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr = S_OK; + TRACE("iface %p, device_identifier %p, flags %#x.\n", iface, DDDI, Flags); - if(!DDDI) + if (!DDDI) return DDERR_INVALIDPARAMS; - /* The DDGDI_GETHOSTIDENTIFIER returns the information about the 2D - * host adapter, if there's a secondary 3D adapter. This doesn't apply - * to any modern hardware, nor is it interesting for Wine, so ignore it. - * Size of DDDEVICEIDENTIFIER2 may be aligned to 8 bytes and thus 4 - * bytes too long. So only copy the relevant part of the structure - */ + if (Flags & DDGDI_GETHOSTIDENTIFIER) + { + /* The DDGDI_GETHOSTIDENTIFIER returns the information about the 2D + * host adapter, if there's a secondary 3D adapter. This doesn't apply + * to any modern hardware, nor is it interesting for Wine, so ignore it. + * Size of DDDEVICEIDENTIFIER2 may be aligned to 8 bytes and thus 4 + * bytes too long. So only copy the relevant part of the structure + */ - memcpy(DDDI, &deviceidentifier, FIELD_OFFSET(DDDEVICEIDENTIFIER2, dwWHQLLevel) + sizeof(DWORD)); + memcpy(DDDI, &deviceidentifier, FIELD_OFFSET(DDDEVICEIDENTIFIER2, dwWHQLLevel) + sizeof(DWORD)); + return DD_OK; + } + + /* Drakan: Order of the Flame expects accurate D3D device information from ddraw */ + adapter_id.driver = DDDI->szDriver; + adapter_id.driver_size = sizeof(DDDI->szDriver); + adapter_id.description = DDDI->szDescription; + adapter_id.description_size = sizeof(DDDI->szDescription); + adapter_id.device_name_size = 0; + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (FAILED(hr)) return hr; + + DDDI->liDriverVersion = adapter_id.driver_version; + DDDI->dwVendorId = adapter_id.vendor_id; + DDDI->dwDeviceId = adapter_id.device_id; + DDDI->dwSubSysId = adapter_id.subsystem_id; + DDDI->dwRevision = adapter_id.revision; + DDDI->guidDeviceIdentifier = adapter_id.device_identifier; + DDDI->dwWHQLLevel = adapter_id.whql_level; return DD_OK; } diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 2d7123b..39b3555 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -999,6 +999,24 @@ static void testddraw7(void) ok(pend[1]==0xdeadbeef, "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); } + /* recheck with the DDGDI_GETHOSTIDENTIFIER flag */ + pend[0] = 0xdeadbeef; + pend[1] = 0xdeadbeef; + hr = IDirectDraw7_GetDeviceIdentifier(dd7, pdddi2, DDGDI_GETHOSTIDENTIFIER); + ok(hr==DD_OK, "get device identifier failed with %08x\n", hr); + if (hr==DD_OK) + { + /* szDriver contains the name of the driver DLL */ + ok(strstr(pdddi2->szDriver, ".dll")!=NULL, "szDriver does not contain DLL name\n"); + /* check how strings are copied into the structure */ + ok(pdddi2->szDriver[MAX_DDDEVICEID_STRING - 1]==0, "szDriver not cleared\n"); + ok(pdddi2->szDescription[MAX_DDDEVICEID_STRING - 1]==0, "szDescription not cleared\n"); + /* verify that 8 byte structure size alignment will not overwrite memory */ + ok(pend[0]==0xdeadbeef || broken(pend[0] != 0xdeadbeef), /* win2k */ + "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); + ok(pend[1]==0xdeadbeef, "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); + } + IDirectDraw_Release(dd7); HeapFree( GetProcessHeap(), 0, pdddi2 ); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 16b9948..a779af7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3413,7 +3413,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, const char *name = adapter->driver_info.name; len = min(strlen(name), identifier->driver_size - 1); memcpy(identifier->driver, name, len); - identifier->driver[len] = '\0'; + memset(&identifier->driver[len], 0, identifier->driver_size - len); } if (identifier->description_size) @@ -3421,7 +3421,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, const char *description = adapter->driver_info.description; len = min(strlen(description), identifier->description_size - 1); memcpy(identifier->description, description, len); - identifier->description[len] = '\0'; + memset(&identifier->description[len], 0, identifier->description_size - len); } /* Note that d3d8 doesn't supply a device name. */

1 0

Piotr Caban : msvcrt/tests: Don't pass path containing spaces to _spawnvp.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: f4985e42b7198b14ce4201a189c1faa5416e728e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4985e42b7198b14ce4201a18… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 11 15:20:08 2014 +0100 msvcrt/tests: Don't pass path containing spaces to _spawnvp. --- dlls/msvcrt/tests/file.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fd1d06c..470ef60 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -40,6 +40,18 @@ static HANDLE proc_handles[2]; static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); +static const char* get_base_name(const char *path) +{ + const char *ret = path+strlen(path)-1; + + while(ret >= path) { + if(*ret=='\\' || *ret=='/') + break; + ret--; + } + return ret+1; +} + static void init(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); @@ -1408,7 +1420,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[0] = selfname; + arg_v[0] = get_base_name(selfname); arg_v[1] = "tests/file.c"; arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); @@ -1422,7 +1434,6 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[0] = selfname; arg_v[1] = "tests/file.c"; arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); @@ -1972,7 +1983,7 @@ static void test_pipes(const char* selfname) return; } - arg_v[0] = selfname; + arg_v[0] = get_base_name(selfname); arg_v[1] = "tests/file.c"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); @@ -2002,7 +2013,6 @@ static void test_pipes(const char* selfname) return; } - arg_v[0] = selfname; arg_v[1] = "tests/file.c"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]);

1 0