December 2006 - Wine-Commits

Tag wine-0.9.28 : Alexandre Julliard : Release 0.9.28
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: refs/tags/wine-0.9.28 Tag: 26e45ca3866c5eb78b48f7dcc00a98376ce28ef0 URL: http://source.winehq.org/git/wine.git/?a=tag;h=26e45ca3866c5eb78b48f7dcc00a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 17:17:48 2006 +0100 Release 0.9.28

1 0

Alexandre Julliard : Release 0.9.28.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 0ee7db45fd95cbcbd4c60ac68d118f77b76e4d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee7db45fd95cbcbd4c60ac68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 17:17:47 2006 +0100 Release 0.9.28. --- ANNOUNCE | 848 +++++++++++++++++--------------------- ChangeLog | 1372 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1765 insertions(+), 475 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ee7db45fd95cbcbd4c60…

1 0

tools/winetest winetest.cgi
by Jeremy Newman Dec. 22, 2006

Dec. 22, 2006

ChangeSet ID: 30760 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2006/12/22 09:34:48 Modified files: winetest : winetest.cgi Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Make sure we can receive larger files Patch: http://cvs.winehq.org/patch.py?id=30760 Old revision New revision Changes Path 1.7 1.8 +2 -1 tools/winetest/winetest.cgi Index: tools/winetest/winetest.cgi diff -u -p tools/winetest/winetest.cgi:1.7 tools/winetest/winetest.cgi:1.8 --- tools/winetest/winetest.cgi:1.7 22 Dec 2006 15:34:48 -0000 +++ tools/winetest/winetest.cgi 22 Dec 2006 15:34:48 -0000 @@ -26,7 +26,8 @@ BEGIN { use File::Temp qw(tempdir); use CGI qw(:standard); -$CGI::POST_MAX = 1024 * 1025; +# This should be in line with programs\winetest\send.c +$CGI::POST_MAX = 1.5 * 1024 * 1025; my $name = param ("reportfile"); my $error = cgi_error ();

1 0

Dmitry Timoshkov : user32: Add a message test for various ShowWindow() calls, fix some failures.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 910660253b28c4ecc9f6fdd2f633ad8304bb38bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=910660253b28c4ecc9f6fdd2f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 22 18:32:04 2006 +0800 user32: Add a message test for various ShowWindow() calls, fix some failures. --- dlls/user32/tests/msg.c | 424 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/winpos.c | 6 +- 2 files changed, 425 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=910660253b28c4ecc9f6f…

1 0

James Hawkins : mscoree: Add a stub for GetCORSystemDirectory.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 077b4024be6f908bc949566222713246fbd2bb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077b4024be6f908bc94956622… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 18 03:40:13 2006 -0600 mscoree: Add a stub for GetCORSystemDirectory. --- dlls/mscoree/mscoree.spec | 4 ++-- dlls/mscoree/mscoree_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 80dac08..0d3106d 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -39,8 +39,8 @@ @ stdcall GetAssemblyMDImport(ptr ptr ptr) @ stub GetCORRequiredVersion @ stub GetCORRootDirectory -@ stub GetCORSystemDirectory -@ stdcall GetCORVersion(wstr long ptr) +@ stdcall GetCORSystemDirectory(ptr long ptr) +@ stdcall GetCORVersion(ptr long ptr) @ stub GetCompileInfo @ stub GetFileVersion @ stub GetHashFromAssemblyFile diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 414e725..90057bc 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -192,6 +192,18 @@ DWORD _CorValidateImage(LPCVOID* imageBa return E_FAIL; } +HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) +{ + FIXME("(%p, %d, %p): stub!\n", pbuffer, cchBuffer, dwLength); + + if (!dwLength) + return E_POINTER; + + *dwLength = 0; + + return S_OK; +} + HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { static const WCHAR version[] = {'v','1','.','1','.','4','3','2','2',0};

1 0

Dmitry Timoshkov : kernel32: Fix a typo.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: efb1e8eb750ba2284e5717dda74639de8f2cc26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb1e8eb750ba2284e5717dda… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 22 17:05:45 2006 +0800 kernel32: Fix a typo. --- dlls/kernel32/tests/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4f00e4d..ea5bb21 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -416,7 +416,7 @@ START_TEST(loader) start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; - ok(memcmp(start, filler, size), "%d: alignment should not be not cleared\n", i); + ok(memcmp(start, filler, size), "%d: alignment should not be cleared\n", i); } }

1 0

Detlef Riekenberg : winspoool/tests: Build the name of the local print server in a separate function.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 496fd1dc56dd3816b7b6f0529eb5ee4d3802db9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=496fd1dc56dd3816b7b6f0529… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 22 00:48:16 2006 +0100 winspoool/tests: Build the name of the local print server in a separate function. --- dlls/winspool.drv/tests/info.c | 44 +++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 94cf3d2..f1dba3f 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -56,6 +56,7 @@ struct monitor_entry { }; static LPSTR default_printer = NULL; +static LPSTR local_server = NULL; /* report common behavior only once */ static DWORD report_deactivated_spooler = 1; @@ -179,6 +180,30 @@ static struct monitor_entry * find_insta return entry; } + +/* ########################### */ + +static void find_local_server(VOID) +{ + static char buffer[MAX_PATH]; + DWORD res; + DWORD size; + + size = sizeof(buffer) - 3 ; + buffer[0] = '\\'; + buffer[1] = '\\'; + buffer[2] = '\0'; + + SetLastError(0xdeadbeef); + res = GetComputerNameA(&buffer[2], &size); + trace("returned %d with %d and %d: '%s'\n", res, GetLastError(), size, buffer); + + ok( res != 0, "returned %d with %d and %d: '%s' (expected '!= 0')\n", + res, GetLastError(), size, buffer); + + if (res) local_server = buffer; +} + /* ########################### */ @@ -1219,10 +1244,6 @@ static void test_OpenPrinter(void) PRINTER_DEFAULTSA defaults; HANDLE hprinter; DWORD res; - DWORD size; - CHAR buffer[DEFAULT_PRINTER_SIZE]; - LPSTR ptr; - SetLastError(MAGIC_DEAD); res = OpenPrinter(NULL, NULL, NULL); @@ -1268,17 +1289,11 @@ static void test_OpenPrinter(void) } - size = sizeof(buffer) - 3 ; - ptr = buffer; - ptr[0] = '\\'; - ptr++; - ptr[0] = '\\'; - ptr++; - if (GetComputerNameA(ptr, &size)) { - hprinter = (HANDLE) MAGIC_DEAD; - SetLastError(MAGIC_DEAD); - res = OpenPrinter(buffer, &hprinter, NULL); + if (local_server != NULL) { + hprinter = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = OpenPrinter(local_server, &hprinter, NULL); todo_wine { ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", @@ -1681,6 +1696,7 @@ START_TEST(info) pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); find_default_printer(); + find_local_server(); test_AddMonitor(); test_AddPort();

1 0

Detlef Riekenberg : winspoool/tests: Rename unclear string.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 0bb3e4f74d45ecd54f8df2243b45af8a4566bba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb3e4f74d45ecd54f8df2243… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 22 00:48:08 2006 +0100 winspoool/tests: Rename unclear string. --- dlls/winspool.drv/tests/info.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 433314b..94cf3d2 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -32,17 +32,17 @@ #define MAGIC_DEAD 0xdeadbeef #define DEFAULT_PRINTER_SIZE 1000 -static CHAR does_not_exist_dll[]= "does_not_exists.dll"; -static CHAR does_not_exist[] = "does_not_exists"; +static CHAR does_not_exist_dll[]= "does_not_exist.dll"; +static CHAR does_not_exist[] = "does_not_exist"; static CHAR empty[] = ""; static CHAR env_x86[] = "Windows NT x86"; static CHAR env_win9x_case[] = "windowS 4.0"; static CHAR illegal_name[] = "illegal,name"; static CHAR invalid_env[] = "invalid_env"; -static CHAR invalid_server[] = "\\invalid_server"; static CHAR portname_com1[] = "COM1:"; static CHAR portname_file[] = "FILE:"; static CHAR portname_lpt1[] = "LPT1:"; +static CHAR server_does_not_exist[] = "\\does_not_exist"; static CHAR version_dll[] = "version.dll"; static CHAR winetest_monitor[] = "winetest"; @@ -1204,7 +1204,7 @@ static void test_GetPrintProcessorDirect /* invalid on all Systems */ buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetPrintProcessorDirectoryA(invalid_server, NULL, 1, buffer, cbBuf*2, &pcbNeeded); + res = GetPrintProcessorDirectoryA(server_does_not_exist, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %d (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError());

1 0

Detlef Riekenberg : localspl/tests: Rename unclear string.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 9721edf5c1ddee445ed153dcdb7faba747a85389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9721edf5c1ddee445ed153dcd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 22 00:47:57 2006 +0100 localspl/tests: Rename unclear string. --- dlls/localspl/tests/localmon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 4ca6644..5aecda6 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -62,7 +62,6 @@ static WCHAR cmd_MonitorUIW[] = {'M','o' static WCHAR cmd_MonitorUI_lcaseW[] = {'m','o','n','i','t','o','r','u','i',0}; static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; static WCHAR emptyW[] = {0}; -static WCHAR invalid_serverW[] = {'\\','\\','i','n','v','a','l','i','d','_','s','e','r','v','e','r',0}; static WCHAR Monitors_LocalPortW[] = { \ 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -75,6 +74,8 @@ static WCHAR portname_com1W[] = {'C','O' static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; +static WCHAR server_does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + /* ########################### */ static void test_AddPort(void) @@ -261,7 +262,7 @@ static void test_EnumPorts(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(invalid_serverW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = pEnumPorts(server_does_not_existW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned);

1 0

Detlef Riekenberg : localspl/tests: Fix copy+paste typo.
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

Module: wine Branch: master Commit: 99c716fee456d1fe95c6f9f809793355787726cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c716fee456d1fe95c6f9f80… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 22 00:47:54 2006 +0100 localspl/tests: Fix copy+paste typo. --- dlls/localspl/tests/localmon.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 93b595c..4ca6644 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -223,7 +223,7 @@ static void test_EnumPorts(void) SetLastError(0xdeadbeef); res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", - level, res, GetLastError(), cbBuf, pcReturned); + level, res, GetLastError(), pcbNeeded, pcReturned); /* We can compare the returned Data with the Registry / "win.ini",[Ports] here */ pcbNeeded = 0xdeadbeef; @@ -231,7 +231,7 @@ static void test_EnumPorts(void) SetLastError(0xdeadbeef); res = pEnumPorts(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", - level, res, GetLastError(), cbBuf, pcReturned); + level, res, GetLastError(), pcbNeeded, pcReturned); pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; @@ -240,7 +240,7 @@ static void test_EnumPorts(void) ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "(%d) returned %d with %d and %d, %d (expected '0' with " \ "ERROR_INSUFFICIENT_BUFFER)\n", - level, res, GetLastError(), cbBuf, pcReturned); + level, res, GetLastError(), pcbNeeded, pcReturned); if (0) { @@ -256,14 +256,14 @@ static void test_EnumPorts(void) SetLastError(0xdeadbeef); res = pEnumPorts(emptyW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", - level, res, GetLastError(), cbBuf, pcReturned); + level, res, GetLastError(), pcbNeeded, pcReturned); pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); res = pEnumPorts(invalid_serverW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", - level, res, GetLastError(), cbBuf, pcReturned); + level, res, GetLastError(), pcbNeeded, pcReturned); HeapFree(GetProcessHeap(), 0, buffer); }

1 0