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

James Hawkins : advpack: Run the install test in a temporary directory.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 8cfb50e57e312106bafcb68c50c3bb896e4ff9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfb50e57e312106bafcb68c5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:17:44 2008 -0500 advpack: Run the install test in a temporary directory. --- dlls/advpack/tests/install.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 564ecda..9423dd0 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -266,14 +266,26 @@ static void test_LaunchINFSectionEx(void) START_TEST(install) { + DWORD len; + char temp_path[MAX_PATH], prev_path[MAX_PATH]; + if (!init_function_pointers()) return; - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPath(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + lstrcpyA(CURR_DIR, temp_path); + len = lstrlenA(CURR_DIR); + + if(len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; test_RunSetupCommand(); test_LaunchINFSection(); test_LaunchINFSectionEx(); FreeLibrary(hAdvPack); + SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : advpack: Run the files test in a temporary directory.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 315e8ce312eacccd0f7498ae954d456cdddca29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=315e8ce312eacccd0f7498ae9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:17:10 2008 -0500 advpack: Run the files test in a temporary directory. --- dlls/advpack/tests/files.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 530c3b2..d018975 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -63,14 +63,6 @@ static void createTestFile(const CHAR *name) static void create_test_files(void) { - int len; - - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - len = lstrlenA(CURR_DIR); - - if(len && (CURR_DIR[len-1] == '\\')) - CURR_DIR[len-1] = 0; - createTestFile("a.txt"); createTestFile("b.txt"); CreateDirectoryA("testdir", NULL); @@ -528,7 +520,21 @@ static void test_AdvInstallFile(void) START_TEST(files) { + DWORD len; + char temp_path[MAX_PATH], prev_path[MAX_PATH]; + init_function_pointers(); + + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPath(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + lstrcpyA(CURR_DIR, temp_path); + len = lstrlenA(CURR_DIR); + + if(len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; + create_test_files(); create_cab_file(); @@ -539,4 +545,5 @@ START_TEST(files) delete_test_files(); FreeLibrary(hAdvPack); + SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : kernel32: Don't test for HARDDISK and RAMDISK on win9x.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 63ac79f4d594c392d27fb6688b35de43e9de5ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ac79f4d594c392d27fb6688… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:15:21 2008 -0500 kernel32: Don't test for HARDDISK and RAMDISK on win9x. --- dlls/kernel32/tests/volume.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9a21db1..727f326 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -37,6 +37,11 @@ static void test_query_dos_deviceA(void) DWORD ret; BOOL found = FALSE; + if (!pFindFirstVolumeA) { + skip("On win9x, HARDDISK and RAMDISK not present\n"); + return; + } + for (;drivestr[0] <= 'z'; drivestr[0]++) { ret = QueryDosDeviceA( drivestr, buffer, sizeof(buffer)); if(ret) {

1 0

James Hawkins : kernel32: Fix a few test failures in win9x.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 03d23bd43d7edf18537ac4c206e9d7d6379e7b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d23bd43d7edf18537ac4c20… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:14:18 2008 -0500 kernel32: Fix a few test failures in win9x. --- dlls/kernel32/tests/heap.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2939862..e35d8bf 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -186,23 +186,29 @@ START_TEST(heap) SetLastError(MAGIC_DEAD); mem = GlobalFree(gbl); ok(mem == gbl, "Expected gbl, got %p\n", mem); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); gbl = GlobalAlloc(GMEM_DDESHARE, 100); res = GlobalUnlock(gbl); - ok(res == 1, "Expected 1, got %d\n", res); + ok(res == 1 || + res == 0, /* win9x */ + "Expected 1 or 0, got %d\n", res); res = GlobalUnlock(gbl); - ok(res == 1, "Expected 1, got %d\n", res); + ok(res == 1 || + res == 0, /* win9x */ + "Expected 1 or 0, got %d\n", res); /* GlobalSize on an invalid handle */ SetLastError(MAGIC_DEAD); size = GlobalSize((HGLOBAL)0xc042); ok(size == 0, "Expected 0, got %ld\n", size); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* ####################################### */ /* Local*() functions */

1 0

James Hawkins : kernel32: Fix a few test failures in win9x.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: ac5885ef4183db83aa560a8eabf4671092190f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5885ef4183db83aa560a8ea… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:14:50 2008 -0500 kernel32: Fix a few test failures in win9x. --- dlls/kernel32/tests/sync.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8d7191f..842a6e9 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -156,12 +156,16 @@ static void test_mutex(void) SetLastError(0xdeadbeef); hOpened = OpenMutex(READ_CONTROL, FALSE, "WINETESTMUTEX"); ok(!hOpened, "OpenMutex succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_INVALID_NAME, /* win9x */ + "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); hOpened = OpenMutex(READ_CONTROL, FALSE, "winetestmutex"); ok(!hOpened, "OpenMutex succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_INVALID_NAME, /* win9x */ + "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); hOpened = CreateMutex(NULL, FALSE, "WineTestMutex"); @@ -334,7 +338,9 @@ static void test_event(void) SetLastError(0xdeadbeef); handle2 = OpenEventA( EVENT_ALL_ACCESS, FALSE, __FILE__ ": TEST EVENT"); ok( !handle2, "OpenEvent succeeded\n"); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_INVALID_NAME, /* win9x */ + "wrong error %u\n", GetLastError()); CloseHandle( handle ); } @@ -370,7 +376,9 @@ static void test_semaphore(void) SetLastError(0xdeadbeef); handle2 = OpenSemaphoreA( SEMAPHORE_ALL_ACCESS, FALSE, __FILE__ ": TEST SEMAPHORE"); ok( !handle2, "OpenSemaphore succeeded\n"); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_INVALID_NAME, /* win9x */ + "wrong error %u\n", GetLastError()); CloseHandle( handle ); }

1 0

Detlef Riekenberg : spoolss: Add a stub for IsLocalCall.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 5cdde8d796dad84cdd407a7b55ebf18a005a020f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdde8d796dad84cdd407a7b5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 27 22:17:51 2008 +0200 spoolss: Add a stub for IsLocalCall. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index e430e32..5645b2e 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -74,7 +74,7 @@ @ stub GetPrinterW @ stdcall ImpersonatePrinterClient(long) @ stub InitializeRouter -@ stub IsLocalCall +@ stdcall IsLocalCall() @ stub IsNamedPipeRpcCall @ stub LoadDriver @ stub LoadDriverFiletoConvertDevmode diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 2e35062..c701c0d 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -170,6 +170,15 @@ BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) } /****************************************************************** + * IsLocalCall [SPOOLSS.@] + */ +BOOL WINAPI IsLocalCall(void) +{ + FIXME("() stub\n"); + return TRUE; +} + +/****************************************************************** * RevertToPrinterSelf [SPOOLSS.@] */ HANDLE WINAPI RevertToPrinterSelf(void)

1 0

James Hawkins : kernel32: Fix a test failure in win9x.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 3361f0c4fd899db00669a3664dd0caa2769f0402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3361f0c4fd899db00669a3664… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:13:47 2008 -0500 kernel32: Fix a test failure in win9x. --- dlls/kernel32/tests/format_msg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1f52da9..74d5109 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -228,7 +228,9 @@ static void test_message_null_buffer(void) ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); error = GetLastError(); ok(!ret, "FormatMessageA returned %u\n", ret); - ok(error == ERROR_NOT_ENOUGH_MEMORY, "last error %u\n", error); + ok(error == ERROR_NOT_ENOUGH_MEMORY || + error == ERROR_INVALID_PARAMETER, /* win9x */ + "last error %u\n", error); SetLastError(0xdeadbeef); ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL);

1 0

Detlef Riekenberg : spoolss: Add a stub for WaitForSpoolerInitialization.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 70415dc8a927ea2b899d931dde292368c3958289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70415dc8a927ea2b899d931dd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 27 21:17:57 2008 +0200 spoolss: Add a stub for WaitForSpoolerInitialization. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 240f155..e430e32 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -142,7 +142,7 @@ @ stub UpdatePrinterRegAll @ stub UpdatePrinterRegUser @ stub WaitForPrinterChange -@ stub WaitForSpoolerInitialization +@ stdcall WaitForSpoolerInitialization() @ stub WritePrinter @ stub XcvDataW @ stub bGetDevModePerUser diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 4a4e3bc..2e35062 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -248,3 +248,12 @@ BOOL WINAPI SpoolerInit(void) FIXME("() stub\n"); return TRUE; } + +/****************************************************************** + * WaitForSpoolerInitialization [SPOOLSS.@] + */ +BOOL WINAPI WaitForSpoolerInitialization(void) +{ + FIXME("() stub\n"); + return TRUE; +}

1 0

Nikolay Sivov : gdiplus: Fix uninitialized value jump and a leak in GdipAddPathPolygon test.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: db9172471b6eda3ee91bbe0bf49bccfa5478f892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9172471b6eda3ee91bbe0bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 28 11:08:39 2008 +0400 gdiplus: Fix uninitialized value jump and a leak in GdipAddPathPolygon test. --- dlls/gdiplus/tests/graphicspath.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 9f65898..286cba6 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -602,6 +602,8 @@ static void test_polygon(void) points[4].X = 20.0; points[4].Y = 0.0; + GdipCreatePath(FillModeAlternate, &path); + /* NULL args */ status = GdipAddPathPolygon(NULL, points, 5); expect(InvalidParameter, status); @@ -611,7 +613,6 @@ static void test_polygon(void) status = GdipAddPathPolygon(path, points, 2); expect(InvalidParameter, status); - GdipCreatePath(FillModeAlternate, &path); /* to test how it prolongs not empty path */ status = GdipAddPathLine(path, 5.0, 5.0, 6.0, 8.0); expect(Ok, status); @@ -619,6 +620,8 @@ static void test_polygon(void) expect(Ok, status); /* check resulting path */ ok_path(path, poly_path, sizeof(poly_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); } static path_test_t rect_path[] = {

1 0

Adam Petaccia : gdiplus: Improve accuracy in calculating point sizes.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: e663816d45db36d8060cb0d83058e66551995ac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e663816d45db36d8060cb0d83… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Fri Jun 27 20:06:24 2008 -0400 gdiplus: Improve accuracy in calculating point sizes. --- dlls/gdiplus/font.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 2455c1f..98a4c43 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -33,7 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); #include "gdiplus.h" #include "gdiplus_private.h" -static const REAL mm_per_pixel = 25.4; +static const REAL mm_per_inch = 25.4; +static const REAL inch_per_point = 1.0/72.0; static inline REAL get_dpi (void) { @@ -50,7 +51,7 @@ static inline REAL get_dpi (void) static inline REAL point_to_pixel (REAL point) { - return point * 1.5; + return point * get_dpi() * inch_per_point; } static inline REAL inch_to_pixel (REAL inch) @@ -65,7 +66,7 @@ static inline REAL document_to_pixel (REAL doc) static inline REAL mm_to_pixel (REAL mm) { - return mm * (get_dpi() / mm_per_pixel); + return mm * (get_dpi() / mm_per_inch); } /*******************************************************************************

1 0