March 2009 - Wine-Commits - list.winehq.org

Francois Gouget : port: Remove spaces before '\n's.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: c0a672b19d6a6ce5ca0a2bdd9c2ccaccee57d4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a672b19d6a6ce5ca0a2bdd9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 8 23:51:38 2009 +0100 port: Remove spaces before '\n's. --- libs/port/interlocked.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 12b326f..fc40fe5 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -242,7 +242,7 @@ void* interlocked_xchg_ptr( void** dest, void* val ) __asm__ __volatile__( "0: lwarx %0,0,%1\n" " stwcx. %2,0,%1\n" - " bne- 0b \n" + " bne- 0b\n" " isync\n" : "=&r"(ret) : "r"(dest), "r"(val)

1 0

Francois Gouget : winedbg: Remove spaces before '\n's.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: d1110dd2e9e4fd834568d5c2ed3621d1712bcf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1110dd2e9e4fd834568d5c2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 8 23:49:42 2009 +0100 winedbg: Remove spaces before '\n's. --- programs/winedbg/be_i386.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 0d6d058..3638463 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -173,10 +173,11 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) dbg_printf(")\n"); /* Here are the rest of the registers */ - dbg_printf(" FLES:%08x ", (unsigned int) ctx->FloatSave.ErrorSelector); - dbg_printf(" FLDO:%08x ", (unsigned int) ctx->FloatSave.DataOffset); - dbg_printf(" FLDS:%08x ", (unsigned int) ctx->FloatSave.DataSelector); - dbg_printf(" FLCNS:%08x \n", (unsigned int) ctx->FloatSave.Cr0NpxState); + dbg_printf(" FLES:%08x FLDO:%08x FLDS:%08x FLCNS:%08x\n", + ctx->FloatSave.ErrorSelector, + ctx->FloatSave.DataOffset, + ctx->FloatSave.DataSelector, + ctx->FloatSave.Cr0NpxState); /* Now for the floating point registers */ dbg_printf("Floating Point Registers:\n");

1 0

Francois Gouget : fnt2bdf: Remove spaces before '\n's.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 6724655a57e7e9dd962f7524e945852074b4e8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6724655a57e7e9dd962f7524e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 8 23:51:25 2009 +0100 fnt2bdf: Remove spaces before '\n's. --- tools/fnt2bdf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index e6a53fa..277764b 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -226,13 +226,13 @@ static int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer) l_span = (int) (cpe_font_struct->dfCharTable[ic].charWidth-1)/8; - fprintf(fp, "STARTCHAR %d \n", ic); + fprintf(fp, "STARTCHAR %d\n", ic); fprintf(fp, "ENCODING %d\n", l_fchar); - fprintf(fp, "SWIDTH %d %d \n", + fprintf(fp, "SWIDTH %d %d\n", cpe_font_struct->dfCharTable[ic].charWidth*1000, 0); - fprintf(fp, "DWIDTH %d %d \n", + fprintf(fp, "DWIDTH %d %d\n", cpe_font_struct->dfCharTable[ic].charWidth, 0); fprintf(fp, "BBX %d %d %d %d\n",

1 0

Francois Gouget : libwine: Reenable the memory reservation code on FreeBSD.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: ae28fdb560439a1760f644f9fa7b5d5601e398d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae28fdb560439a1760f644f9f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 8 23:42:43 2009 +0100 libwine: Reenable the memory reservation code on FreeBSD. --- libs/wine/mmap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index ff117cc..d107fc7 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -243,7 +243,7 @@ static inline int mmap_reserve( void *addr, size_t size ) * * Reserve as much memory as possible in the given area. */ -#if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ +#ifdef __i386__ static void reserve_area( void *addr, void *end ) { size_t size = (char *)end - (char *)addr; @@ -343,7 +343,7 @@ void mmap_init(void) { struct reserved_area *area; struct list *ptr; -#if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ +#ifdef __i386__ char stack; char * const stack_ptr = &stack; char *user_space_limit = (char *)0x7ffe0000; @@ -369,8 +369,8 @@ void mmap_init(void) char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); if (base > user_space_limit) reserve_area( user_space_limit, base ); base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1); -#ifdef linux - /* Linux heuristic: assume the stack is near the end of the address */ +#if defined(linux) || defined(__FreeBSD__) + /* Heuristic: assume the stack is near the end of the address */ /* space, this avoids a lot of futile allocation attempts */ end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000); #endif

1 0

Andrew Talbot : msacm32: Fix a typo.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: b0cd0d1ea80cfebf975583c9c58186a4b8a2784c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cd0d1ea80cfebf975583c9c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Mar 8 21:05:17 2009 +0000 msacm32: Fix a typo. --- dlls/msacm32/internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 4100aae..feb6e9c 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -72,7 +72,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) /* The requested registry entry must have the format msacm.XXXXX in order to be recognized in any future sessions of msacm */ - if (0 == strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { + if (0 == strncmpiW(pszRegEntry, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { WARN("unable to open registry key - 0x%08x\n", lRet);

1 0

Paul Vriens : shlwapi/tests: Don't crash on IE5.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 630c43ab284a46dea31a217747fc271120af8b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630c43ab284a46dea31a21774… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Mar 8 18:07:30 2009 +0100 shlwapi/tests: Don't crash on IE5. --- dlls/shlwapi/tests/ordinal.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index d0e8dd8..3e37121 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -380,7 +380,9 @@ static void test_GetShellSecurityDescriptor(void) } psd = pGetShellSecurityDescriptor(NULL, 2); - ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); + ok(psd==NULL || + broken(psd==INVALID_HANDLE_VALUE), /* IE5 */ + "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0); ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); @@ -392,6 +394,11 @@ static void test_GetShellSecurityDescriptor(void) win_skip("GetShellSecurityDescriptor is not implemented\n"); return; } + if (psd==INVALID_HANDLE_VALUE) + { + win_skip("GetShellSecurityDescriptor is broken on IE5\n"); + return; + } ok(psd!=NULL, "GetShellSecurityDescriptor failed\n"); if (psd!=NULL) {

1 0

Paul Vriens : wininet/tests: Don't crash on systems with IE5.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 2266219ca691a9d96e21f06f780ec3f9fc4ee09f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2266219ca691a9d96e21f06f7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Mar 8 14:06:48 2009 +0100 wininet/tests: Don't crash on systems with IE5. --- dlls/wininet/tests/url.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index a3c2d91..39c0286 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -305,13 +305,19 @@ static void InternetCrackUrlW_test(void) return; } ok( !r, "InternetCrackUrlW succeeded unexpectedly\n"); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + ok( error == ERROR_INVALID_PARAMETER || + broken(error == ERROR_INTERNET_UNRECOGNIZED_SCHEME), /* IE5 */ + "expected ERROR_INVALID_PARAMETER got %u\n", error); - SetLastError(0xdeadbeef); - r = InternetCrackUrlW(url, 0, 0, NULL ); - error = GetLastError(); - ok( !r, "InternetCrackUrlW succeeded unexpectedly\n"); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + if (error == ERROR_INVALID_PARAMETER) + { + /* Crashes on IE5 */ + SetLastError(0xdeadbeef); + r = InternetCrackUrlW(url, 0, 0, NULL ); + error = GetLastError(); + ok( !r, "InternetCrackUrlW succeeded unexpectedly\n"); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + } r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n");

1 0

Paul Vriens : wininet/tests: Skip tests for not implemented functions.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: c01d0ade5074957c0503d422d8183e46aa9c3414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01d0ade5074957c0503d422d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Mar 8 13:59:51 2009 +0100 wininet/tests: Skip tests for not implemented functions. --- dlls/wininet/tests/url.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index c848f6b..a3c2d91 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -299,6 +299,11 @@ static void InternetCrackUrlW_test(void) SetLastError(0xdeadbeef); r = InternetCrackUrlW(NULL, 0, 0, &comp ); error = GetLastError(); + if (!r && error == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("InternetCrackUrlW is not implemented\n"); + return; + } ok( !r, "InternetCrackUrlW succeeded unexpectedly\n"); ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error);

1 0

Paul Vriens : wininet/tests: Skip some tests on IE5.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: ac07d2eb289dbe1a1aaf4f56904bab047d798dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac07d2eb289dbe1a1aaf4f569… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Mar 8 13:38:25 2009 +0100 wininet/tests: Skip some tests on IE5. --- dlls/wininet/tests/internet.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 80841a1..56a604b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -27,6 +27,8 @@ #include "wine/test.h" +static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD, + DWORD, DWORD, DWORD, DWORD); static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); @@ -770,6 +772,7 @@ START_TEST(internet) { HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); + pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA"); pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA"); pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW"); pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA"); @@ -784,7 +787,7 @@ START_TEST(internet) test_null(); if (!pInternetTimeFromSystemTimeA) - skip("skipping the InternetTime tests\n"); + win_skip("skipping the InternetTime tests\n"); else { InternetTimeFromSystemTimeA_test(); @@ -792,8 +795,10 @@ START_TEST(internet) InternetTimeToSystemTimeA_test(); InternetTimeToSystemTimeW_test(); } - if (!pIsDomainLegalCookieDomainW) - skip("skipping IsDomainLegalCookieDomainW tests\n"); + if (pIsDomainLegalCookieDomainW && (void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA) + win_skip("IsDomainLegalCookieDomainW is not available on systems with IE5\n"); + else if (!pIsDomainLegalCookieDomainW) + win_skip("IsDomainLegalCookieDomainW (or ordinal 117) is not available\n"); else test_IsDomainLegalCookieDomainW(); }

1 0

Paul Vriens : wininet/tests: Test result differences are related to IE6 version, not to platform.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 1db4ecf8e9fda654d29c897d3744b958e24b9d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db4ecf8e9fda654d29c897d3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Mar 8 13:19:04 2009 +0100 wininet/tests: Test result differences are related to IE6 version, not to platform. --- dlls/wininet/tests/internet.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fe3f477..80841a1 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -643,7 +643,7 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(NULL, NULL); error = GetLastError(); ok(!ret || - broken(ret), /* Win98, NT4, W2K, XP (some) */ + broken(ret), /* IE6 */ "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); @@ -664,7 +664,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* Win98, NT4, W2K, XP (some) */ + broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); @@ -672,7 +672,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* Win98, NT4, W2K, XP (some) */ + broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); @@ -680,7 +680,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + broken(error == 0xdeadbeef), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); @@ -688,7 +688,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + broken(error == 0xdeadbeef), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); @@ -702,7 +702,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + broken(error == 0xdeadbeef), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); @@ -710,7 +710,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + broken(error == 0xdeadbeef), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); @@ -745,7 +745,7 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + broken(error == 0xdeadbeef), /* IE6 */ "got %u expected ERROR_INVALID_NAME\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com);

1 0