June 2010 - Wine-commits - list.winehq.org

Francois Gouget : ntdll: Fix a typo in a parameter name.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 4c8b3b0f3db867957df46371796c58752297778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3b0f3db867957df463717… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:51:43 2010 +0200 ntdll: Fix a typo in a parameter name. --- dlls/ntdll/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 5537c87..80bf787 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -132,7 +132,7 @@ DWORD WINAPI RtlGetLastWin32Error(void) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters, - PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters, + PUNICODE_STRING UnicodeStringParameterMask, PVOID *Parameters, HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response ) { FIXME(": stub. Errorstatus was %08x\n", ErrorStatus);

1 0

Francois Gouget : ws2_32/tests: Fix a typo in a variable name.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 1a1f1aa58865c19882b308083292f93c7c907523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1f1aa58865c19882b308083… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:52:12 2010 +0200 ws2_32/tests: Fix a typo in a variable name. --- dlls/ws2_32/tests/sock.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c405053..9217913 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2564,7 +2564,7 @@ typedef struct async_message struct async_message *next; } async_message; -static struct async_message *messages_recieved; +static struct async_message *messages_received; #define WM_SOCKET (WM_USER+100) static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2579,14 +2579,14 @@ static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPA message->lparam = lparam; message->next = NULL; - if (messages_recieved) + if (messages_received) { - struct async_message *last = messages_recieved; + struct async_message *last = messages_received; while (last->next) last = last->next; last->next = message; } else - messages_recieved = message; + messages_received = message; return 0; } @@ -2650,7 +2650,7 @@ static char *dbgstr_event_seq(const LPARAM *seq) static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) { static char message[1024]; - struct async_message *curr = messages_recieved; + struct async_message *curr = messages_received; int index, error, bit = 0; char name[10]; @@ -2693,7 +2693,7 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) static void flush_events(SOCKET s, HANDLE hEvent) { WSANETWORKEVENTS netEvents; - struct async_message *prev = NULL, *curr = messages_recieved; + struct async_message *prev = NULL, *curr = messages_received; int ret; DWORD dwRet; @@ -2714,12 +2714,12 @@ static void flush_events(SOCKET s, HANDLE hEvent) if (curr->socket == s) { if (prev) prev->next = curr->next; - else messages_recieved = curr->next; + else messages_received = curr->next; HeapFree(GetProcessHeap(), 0, curr); if (prev) curr = prev->next; - else curr = messages_recieved; + else curr = messages_received; } else { @@ -2759,7 +2759,7 @@ static int match_event_sequence(SOCKET s, WSANETWORKEVENTS *netEvents, const LPA } else { - curr = messages_recieved; + curr = messages_received; while (curr) { if (curr->socket == s)

1 0

Francois Gouget : msvcr90/tests: Make test_invalid_parameter_handler() static.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 31f7eb790fc2f10888bbffa482051367d2ab3d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f7eb790fc2f10888bbffa48… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:52:23 2010 +0200 msvcr90/tests: Make test_invalid_parameter_handler() static. --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2b4fae4..9f6e47b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -44,7 +44,7 @@ int cb_called[4]; /* ########## */ -void __cdecl test_invalid_parameter_handler(const wchar_t *expression, +static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) {

1 0

Francois Gouget : winemenubuilder: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 4a9b52549e3d7dcb1de8ea7b97a30cf8b04d979f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9b52549e3d7dcb1de8ea7b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:54:28 2010 +0200 winemenubuilder: Add a trailing '\n' to a FIXME() call. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3abfc39..c027dad 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -514,7 +514,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, case 32: return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); default: - WINE_FIXME("unsupported bpp %d, please report", pIcon->bmiHeader.biBitCount); + WINE_FIXME("unsupported bpp %d, please report\n", pIcon->bmiHeader.biBitCount); return FALSE; } }

1 0

Francois Gouget : msvcr100: The msvcr100 debug channel is unused so remove it.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 7735f024eabd6fa0f32df8fce2a0efdc4451cdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7735f024eabd6fa0f32df8fce… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:54:19 2010 +0200 msvcr100: The msvcr100 debug channel is unused so remove it. --- dlls/msvcr100/msvcr100.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 735092e..274d4c7 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -23,9 +23,7 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcr100); /********************************************************************* * DllMain (MSVCR100.@)

1 0

André Hentschel : winemaker: Ignore the Global section .
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 61622fe8d1804e2fba8a7a57fda1650195411bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61622fe8d1804e2fba8a7a57f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:03 2010 +0200 winemaker: Ignore the Global section. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 23f800f..bed499d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1163,6 +1163,8 @@ sub source_scan_workspace_file($) next; } elsif (/^#/) { # ignore Comments + } elsif (/^Global:/) { + # ignore the Global section } elsif (/\w:/) { print STDERR "unknown section $_\n"; } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) {

1 0

Francois Gouget : crypt32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: fea384cea4be337d9c86a3f5f57114d28c583c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea384cea4be337d9c86a3f5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:48:34 2010 +0200 crypt32/tests: Add a trailing '\n' to ok() calls. --- dlls/crypt32/tests/encode.c | 4 ++-- dlls/crypt32/tests/store.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d60843a..cc59a59 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7962,7 +7962,7 @@ static void testPortPublicKeyInfo(void) CRYPT_DELETEKEYSET); ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(ret,"CryptAcquireContextA failed"); + ok(ret,"CryptAcquireContextA failed\n"); testExportPublicKey(csp, &info); testImportPublicKey(csp, info); @@ -7971,7 +7971,7 @@ static void testPortPublicKeyInfo(void) CryptReleaseContext(csp, 0); ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ok(ret,"CryptAcquireContextA failed"); + ok(ret,"CryptAcquireContextA failed\n"); } START_TEST(encode) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 3d55935..10a85a3 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2228,7 +2228,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store1, "unexpected store"); + ok(linked->hCertStore == store1, "unexpected store\n"); ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size); ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); @@ -2300,7 +2300,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size); ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); @@ -2360,7 +2360,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size); ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); @@ -2429,7 +2429,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); compareStore(store2, "file store -> system store", @@ -2452,7 +2452,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); CertDeleteCertificateFromStore(linked); } CertCloseStore(store2, 0);

1 0

André Hentschel : winedev: Update installing sources of mingw32 for deb and rpm systems.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: docs Branch: master Commit: 85929c15831cfa63989e397295da69bb991aac8a URL: http://source.winehq.org/git/docs.git/?a=commit;h=85929c15831cfa63989e39729… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 21:54:04 2010 +0200 winedev: Update installing sources of mingw32 for deb and rpm systems. --- en/winedev-testing.sgml | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 31f15f4..ccd1020 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -188,32 +188,24 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures. distributions and *BSD. </para> <sect3> - <title>Debian GNU/Linux</title> + <title>Debian GNU/Linux like deb systems</title> <para> - On Debian do <command>apt-get install mingw32</>. + This includes Debian GNU/Linux, Ubuntu, etc. + The following step should probably work on any deb based system. </para> <para> - The standard MinGW libraries will probably be incomplete, causing - 'undefined symbol' errors. So get the latest - <ulink url="http://mirzam.it.vu.nl/mingw/">mingw-w32api RPM</> - and use <command>alien</> to either convert it to a .tar.gz file - from which to extract just the relevant files, or to convert it - to a Debian package that you will install. + Run <command>apt-get install mingw32</>. </para> </sect3> <sect3> <title>Red Hat Linux like rpm systems</title> <para> - This includes Fedora Core, Red Hat Enterprise Linux, Mandrake, + This includes Fedora, Red Hat Enterprise Linux, Mandrake, most probably SuSE Linux too, etc. But this list isn't exhaustive; - the following steps should probably work on any rpm based system. + The following step should probably work on any rpm based system. </para> <para> - Download and install the latest rpm's from - <ulink url="http://mirzam.it.vu.nl/mingw/">MinGW RPM packages</>. - Alternatively you can follow the instructions on that page and - build your own packages from the source rpm's listed there as well. - </para> + Run <command>yum install mingw32-gcc</>. </sect3> <sect3> <title>*BSD</title>

1 0

Alexandre Julliard : jscript/tests: Fix a test that fails because of the reduced FPU precision.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: b4d21efd127aa6164e25613118117be72f5d7592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d21efd127aa6164e2561311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 12:52:03 2010 +0200 jscript/tests: Fix a test that fails because of the reduced FPU precision. --- dlls/jscript/tests/lang.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 495762e..36a75f5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -263,7 +263,9 @@ ok(tmp === 7, "2*3.5 !== 7"); ok(getVT(tmp) === "VT_I4", "getVT(2*3.5) !== VT_I4"); tmp = 2.5*3.5; -ok(tmp === 8.75, "2.5*3.5 !== 8.75"); +/* FIXME: the parser loses precision */ +/* ok(tmp === 8.75, "2.5*3.5 !== 8.75"); */ +ok(tmp > 8.749999 && tmp < 8.750001, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); tmp = 4/2;

1 0

Alexandre Julliard : psapi/tests: Fix the working set tests for Wow64.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 6cf16d723af29e37819e1f6c4b4a646ff404447b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf16d723af29e37819e1f6c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 12:55:23 2010 +0200 psapi/tests: Fix the working set tests for Wow64. --- dlls/psapi/tests/psapi_main.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 21a3d1a..55eb937 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -275,23 +275,36 @@ static void test_ws_functions(void) ULONG_PTR pages[4096]; char *addr; unsigned int i; - + BOOL ret; + todo_wine w32_err(pEmptyWorkingSet(NULL), ERROR_INVALID_HANDLE); todo_wine w32_err(pEmptyWorkingSet(hpSR), ERROR_ACCESS_DENIED); w32_suc(pEmptyWorkingSet(hpAA)); - - todo_wine w32_err(pInitializeProcessForWsWatch(NULL), ERROR_INVALID_HANDLE); + + SetLastError( 0xdeadbeef ); + ret = pInitializeProcessForWsWatch( NULL ); + todo_wine ok( !ret, "InitializeProcessForWsWatch succeeded\n" ); + if (!ret) + { + if (GetLastError() == ERROR_INVALID_FUNCTION) /* not supported on xp in wow64 mode */ + { + trace( "InitializeProcessForWsWatch not supported\n" ); + return; + } + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + } w32_suc(pInitializeProcessForWsWatch(hpAA)); if(!w32_suc(addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE))) return; + *addr = 0; /* make sure it's paged in (needed on wow64) */ if(!VirtualLock(addr, 1)) { trace("locking failed (error=%d) - skipping test\n", GetLastError()); goto free_page; } - + todo_wine if(w32_suc(pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)))) { for(i = 0; i < pages[0]; i++)

1 0