February 2010 - Wine-commits

Paul Vriens : user32/tests: Don't try to detect Win9x/WinMe several times.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: c0acfe1eadea7d6f0f9a12349dc340ab02baafac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0acfe1eadea7d6f0f9a12349… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Feb 7 13:20:53 2010 +0100 user32/tests: Don't try to detect Win9x/WinMe several times. --- dlls/user32/tests/win.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d524bcc..86e955c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -63,6 +63,8 @@ static const char* szAWRClass = "Winsize"; static HMENU hmenu; static DWORD our_pid; +static BOOL is_win9x = FALSE; + #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) static void dump_minmax_info( const MINMAXINFO *minmax ) @@ -646,7 +648,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR } case WM_WINDOWPOSCHANGING: { - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; WINDOWPOS *winpos = (WINDOWPOS *)lparam; trace("main: WM_WINDOWPOSCHANGING %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", winpos->hwnd, winpos->hwndInsertAfter, @@ -855,7 +856,6 @@ static void test_nonclient_area(HWND hwnd) DWORD style, exstyle; RECT rc_window, rc_client, rc; BOOL menu; - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; LRESULT ret; style = GetWindowLongA(hwnd, GWL_STYLE); @@ -1039,9 +1039,9 @@ static void test_shell_window(void) HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; - if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) + if (is_win9x) { - trace("Skipping shell window test on Win9x\n"); + win_skip("Skipping shell window test on Win9x\n"); return; } @@ -1906,7 +1906,6 @@ static void test_SetWindowPos(HWND hwnd) { RECT orig_win_rc, rect; LONG_PTR old_proc; - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; SetRect(&rect, 111, 222, 333, 444); ok(!GetWindowRect(0, &rect), "GetWindowRect succeeded\n"); @@ -1969,7 +1968,6 @@ static void test_SetMenu(HWND parent) { HWND child; HMENU hMenu, ret; - BOOL is_win9x = GetWindowLongPtrW(parent, GWLP_WNDPROC) == 0; BOOL retok; DWORD style; @@ -2272,7 +2270,7 @@ static void test_vis_rgn( HWND hwnd ) ok( GetRandomRgn( hdc, hrgn, SYSRGN ) != 0, "GetRandomRgn failed\n" ); GetWindowRect( hwnd, &win_rect ); GetRgnBox( hrgn, &rgn_rect ); - if (GetVersion() & 0x80000000) + if (is_win9x) { trace("win9x, mapping to screen coords\n"); MapWindowPoints( hwnd, 0, (POINT *)&rgn_rect, 2 ); @@ -2804,7 +2802,7 @@ static void test_capture_4(void) /* set main window to have initial capture */ SetCapture(hwnd); - if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) + if (is_win9x) { win_skip("TrackPopupMenu test crashes on Win9x/WinMe\n"); } @@ -3220,6 +3218,7 @@ static void test_SetParent(void) BOOL ret; HWND desktop = GetDesktopWindow(); HMENU hMenu; + /* FIXME: This detection is not correct as it also covers (all?) XP+ */ BOOL is_win9x = GetWindowLongPtrW(desktop, GWLP_WNDPROC) == 0; HWND parent, child1, child2, child3, child4, sibling; @@ -3280,6 +3279,8 @@ static void test_SetParent(void) check_parents(child3, child2, child2, child2, 0, child2, parent); check_parents(child4, desktop, child2, child2, child2, child4, parent); } + else + skip("Win9x/WinMe crash\n"); hMenu = CreateMenu(); sibling = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, @@ -5918,6 +5919,10 @@ START_TEST(win) if (!RegisterWindowClasses()) assert(0); + SetLastError(0xdeafbeef); + GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC); + is_win9x = (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hhook) win_skip( "Cannot set CBT hook, skipping some tests\n" );

1 0

Paul Vriens : user32/tests: Fix crash on Win9x/WinMe.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 1cbedfb2047d1d3d9728e35ea6616bf674eb739d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbedfb2047d1d3d9728e35ea… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Feb 7 13:33:51 2010 +0100 user32/tests: Fix crash on Win9x/WinMe. --- dlls/user32/tests/win.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 86e955c..2799ec8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -448,11 +448,16 @@ static void test_parent_owner(void) ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); check_parents( test, child, child, 0, 0, hwndMain, test ); - ShowWindow( test, SW_SHOW ); - ret = SetParent( test, test ); - ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); - ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); - check_parents( test, child, child, 0, 0, hwndMain, test ); + if (!is_win9x) + { + ShowWindow( test, SW_SHOW ); + ret = SetParent( test, test ); + ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); + ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); + check_parents( test, child, child, 0, 0, hwndMain, test ); + } + else + win_skip( "Test crashes on Win9x/WinMe\n" ); DestroyWindow( test ); /* owned popup */

1 0

Vincent Povirk : gdiplus: Don't use gdi32 to do pixel format conversion.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 318ba28630588a0dc160097f382defa6c0507b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318ba28630588a0dc160097f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 4 19:05:54 2010 -0600 gdiplus: Don't use gdi32 to do pixel format conversion. --- dlls/gdiplus/gdiplus_private.h | 4 + dlls/gdiplus/image.c | 521 ++++++++++++++++++++++++++++++++++------ 2 files changed, 455 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=318ba28630588a0dc1600…

1 0

Vincent Povirk : gdiplus: Use linear gradient brush angles.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 71e4af507fc51c18066273b6c91c843a85c7cdfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e4af507fc51c18066273b6c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 6 15:43:16 2010 -0600 gdiplus: Use linear gradient brush angles. --- dlls/gdiplus/brush.c | 66 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0f6d707..2eca755 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -468,20 +468,74 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, /****************************************************************************** * GdipCreateLineBrushFromRectWithAngle [GDIPLUS.@] - * - * FIXME: angle value completely ignored. Don't know how to use it since native - * always set Brush rectangle to rect (independetly of this angle). - * Maybe it's used only on drawing. */ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect, ARGB startcolor, ARGB endcolor, REAL angle, BOOL isAngleScalable, GpWrapMode wrap, GpLineGradient **line) { + GpStatus stat; + LinearGradientMode mode; + REAL width, height, exofs, eyofs; + REAL sin_angle, cos_angle, sin_cos_angle; + TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - return GdipCreateLineBrushFromRect(rect, startcolor, endcolor, LinearGradientModeForwardDiagonal, - wrap, line); + sin_angle = sinf(deg2rad(angle)); + cos_angle = cosf(deg2rad(angle)); + sin_cos_angle = sin_angle * cos_angle; + + if (isAngleScalable) + { + width = height = 1.0; + } + else + { + width = rect->Width; + height = rect->Height; + } + + if (sin_cos_angle >= 0) + mode = LinearGradientModeForwardDiagonal; + else + mode = LinearGradientModeBackwardDiagonal; + + stat = GdipCreateLineBrushFromRect(rect, startcolor, endcolor, mode, wrap, line); + + if (stat == Ok) + { + if (sin_cos_angle >= 0) + { + exofs = width * sin_cos_angle + height * cos_angle * cos_angle; + eyofs = width * sin_angle * sin_angle + height * sin_cos_angle; + } + else + { + exofs = width * sin_angle * sin_angle + height * sin_cos_angle; + eyofs = -width * sin_cos_angle + height * sin_angle * sin_angle; + } + + if (isAngleScalable) + { + exofs = exofs * rect->Width; + eyofs = eyofs * rect->Height; + } + + if (sin_angle >= 0) + { + (*line)->endpoint.X = rect->X + exofs; + (*line)->endpoint.Y = rect->Y + eyofs; + } + else + { + (*line)->endpoint.X = (*line)->startpoint.X; + (*line)->endpoint.Y = (*line)->startpoint.Y; + (*line)->startpoint.X = rect->X + exofs; + (*line)->startpoint.Y = rect->Y + eyofs; + } + } + + return stat; } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect,

1 0

Vincent Povirk : shell32: Use the current directory when copying to an empty destination.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: b609e25204f6fdb74b6ee67ce6f348e2dda7afee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b609e25204f6fdb74b6ee67ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 1 17:42:31 2010 -0600 shell32: Use the current directory when copying to an empty destination. --- dlls/shell32/shlfileop.c | 14 ++++++++++++++ dlls/shell32/tests/shlfileop.c | 12 ++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index a768c15..0b08f52 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1182,6 +1182,20 @@ static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST if (flFrom->bAnyDontExist) return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + if (flTo->dwNumFiles == 0) + { + /* If the destination is empty, SHFileOperation should use the current directory */ + WCHAR curdir[MAX_PATH+1]; + + GetCurrentDirectoryW(MAX_PATH, curdir); + curdir[lstrlenW(curdir)+1] = 0; + + destroy_file_list(flTo); + ZeroMemory(flTo, sizeof(FILE_LIST)); + parse_file_list(flTo, curdir); + fileDest = &flTo->feFiles[0]; + } + if (op->req->fFlags & FOF_MULTIDESTFILES) { if (flFrom->bAnyFromWildcard) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3e9f9c7..49ef8cb 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1720,6 +1720,18 @@ static void test_copy(void) ok(DeleteFileA("ab.txt"), "Expected file to exist\n"); ok(RemoveDirectoryA("one"), "Expected dir to exist\n"); ok(RemoveDirectoryA("two"), "Expected dir to exist\n"); + + /* pTo is an empty string */ + CreateDirectoryA("dir", NULL); + createTestFile("dir\\abcdefgh.abc"); + shfo.pFrom = "dir\\abcdefgh.abc\0"; + shfo.pTo = "\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); + ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); + ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } /* tests the FO_MOVE action */

1 0

André Hentschel : oleaut32: Fix formula.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 1dc896eb52e17130673262524f00ef8e79b2fee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc896eb52e17130673262524… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 7 18:59:15 2010 +0100 oleaut32: Fix formula. --- dlls/oleaut32/variant.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 55d0935..450856f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1148,13 +1148,13 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iYear > 0 && iYear < 100) iYear += 1900; - iMinute += (iSecond - (iSecond % 60)) / 60; - iSecond = iSecond % 60; - iHour += (iMinute - (iMinute % 60)) / 60; - iMinute = iMinute % 60; - iDay += (iHour - (iHour % 24)) / 24; - iHour = iHour % 24; - iYear += (iMonth - (iMonth % 12)) / 12; + iMinute += iSecond / 60; + iSecond = iSecond % 60; + iHour += iMinute / 60; + iMinute = iMinute % 60; + iDay += iHour / 24; + iHour = iHour % 24; + iYear += iMonth / 12; iMonth = iMonth % 12; if (iMonth<=0) {iMonth+=12; iYear--;} while (iDay > days[iMonth]) @@ -1164,7 +1164,7 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) else iDay -= days[iMonth]; iMonth++; - iYear += (iMonth - (iMonth % 12)) / 12; + iYear += iMonth / 12; iMonth = iMonth % 12; } while (iDay <= 0)

1 0

Christian Costa : d3dxof: Fix typo in comment.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: ff6eccdabfbd752bbb065402fefffcff43ae869a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6eccdabfbd752bbb065402f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:15:43 2010 +0100 d3dxof: Fix typo in comment. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b1df558..aac10c4 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -722,7 +722,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (This->from_ref && (This->level >= 1)) { - /* Only 2 levels can enumerated if the object is obtained from a reference */ + /* Only 2 levels can be enumerated if the object is obtained from a reference */ return DXFILEERR_NOMOREOBJECTS; }

1 0

Alexandre Julliard : winetest: Require an email address to submit a report.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 6fae8e1df1bc604b491c75c4d227b66fc33b5f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fae8e1df1bc604b491c75c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 6 10:21:22 2010 +0100 winetest: Require an email address to submit a report. --- programs/winetest/gui.c | 33 +++++++++++++++++++++++++++++++++ programs/winetest/main.c | 17 +++++++++++++++++ programs/winetest/resource.h | 2 ++ programs/winetest/winetest.h | 2 ++ programs/winetest/winetest.rc | 11 +++++++++++ 5 files changed, 65 insertions(+), 0 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index cb59ac2..7a7b1e0 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -361,6 +361,39 @@ guiAskTag (void) dialog, AskTagProc); } +static INT_PTR CALLBACK +AskEmailProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + int len; + + switch (msg) + { + case WM_COMMAND: + switch (LOWORD (wParam)) { + case IDOK: + len = GetWindowTextLengthA (GetDlgItem (hwnd, IDC_EMAIL)); + if(!len) { + report (R_WARNING, "You must enter an email address to continue"); + return FALSE; + } + email = heap_alloc (len+1); + GetDlgItemTextA (hwnd, IDC_EMAIL, email, len+1); + EndDialog (hwnd, IDOK); + return TRUE; + case IDABORT: + EndDialog (hwnd, IDABORT); + return TRUE; + } + } + return FALSE; +} + +int +guiAskEmail (void) +{ + return DialogBox (GetModuleHandle (NULL), MAKEINTRESOURCE (IDD_EMAIL), dialog, AskEmailProc); +} + /* Quiet functions */ static int qNoOp (va_list ap) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 69b7da6..a20fa06 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -48,6 +48,7 @@ struct wine_test }; char *tag = NULL; +char *email = NULL; static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; static int nr_native_dlls; @@ -221,6 +222,7 @@ static void print_version (void) xprintf (" Platform=%s%s\n", platform, wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); + xprintf (" Submitter=%s\n", email ); xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" " dwBuildNumber=%u\n PlatformId=%u\n szCSDVersion=%s\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, @@ -921,6 +923,7 @@ usage (void) " -d DIR Use DIR as temp directory (default: %%TEMP%%\\wct)\n" " -e preserve the environment\n" " -h print this message and exit\n" +" -m MAIL an email address to enable developers to contact you\n" " -p shutdown when the tests are done\n" " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" @@ -971,6 +974,13 @@ int main( int argc, char *argv[] ) case '?': usage (); exit (0); + case 'm': + if (!(email = argv[++i])) + { + usage(); + exit( 2 ); + } + break; case 'p': poweroff = 1; break; @@ -1056,6 +1066,13 @@ int main( int argc, char *argv[] ) } report (R_TAG); + while (!email) { + if (!interactive) + report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" + " to contact you about your report if necessary."); + if (guiAskEmail () == IDABORT) exit (1); + } + if (!build_id[0]) report( R_WARNING, "You won't be able to submit results without a valid build id.\n" "To submit results, winetest needs to be built from a git checkout." ); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index b0f1646..be71274 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -23,6 +23,7 @@ #define IDD_STATUS 100 #define IDD_ABOUT 101 #define IDD_TAG 102 +#define IDD_EMAIL 103 #define IDC_STATIC -1 @@ -36,6 +37,7 @@ #define IDC_DIR 2000 #define IDC_OUT 2001 #define IDC_TAG 2002 +#define IDC_EMAIL 2002 #define IDC_SB 3000 diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 945586c..a0d2fbd 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -68,7 +68,9 @@ enum report_type { #define MAXTAGLEN 20 extern char *tag; +extern char *email; int guiAskTag (void); +int guiAskEmail (void); int report (enum report_type t, ...); #endif /* __WINETESTS_H */ diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 52c3430..5b5d6e0 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -35,6 +35,17 @@ BEGIN PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 END +IDD_EMAIL DIALOG 0, 0, 150, 65 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "No email supplied" +BEGIN + CTEXT "Please supply an email address to enable developers to contact you about your report." + IDC_STATIC, 10, 5, 130, 30 + EDITTEXT IDC_EMAIL, 10, 30, 130, 10, ES_AUTOHSCROLL + DEFPUSHBUTTON "Start", IDOK, 25, 45, 40, 14 + PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 +END + IDD_STATUS DIALOG 0, 0, 160, 150 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX CAPTION "Wine Test Shell"

1 0

Alexandre Julliard : winetest: Report the correct source directory for program tests.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: ecb2d7bd935665b51025e1a643efc9e3b4d37d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb2d7bd935665b51025e1a64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 6 20:36:12 2010 +0100 winetest: Report the correct source directory for program tests. --- programs/winetest/main.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a20fa06..e0b9ced 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -300,16 +300,24 @@ static const char* get_test_source_file(const char* test, const char* subtest) { 0, 0 } }; static char buffer[MAX_PATH]; - int i; + int i, len = strlen(test); + + if (len > 4 && !strcmp( test + len - 4, ".exe" )) + { + len = sprintf(buffer, "programs/%s", test) - 4; + buffer[len] = 0; + } + else len = sprintf(buffer, "dlls/%s", test); for (i = 0; special_dirs[i][0]; i++) { if (strcmp(test, special_dirs[i][0]) == 0) { - test = special_dirs[i][1]; + strcpy( buffer, special_dirs[i][1] ); + len = strlen(buffer); break; } } - snprintf(buffer, sizeof(buffer), "dlls/%s/tests/%s.c", test, subtest); + sprintf(buffer + len, "/tests/%s.c", subtest); return buffer; }

1 0

Nikolay Sivov : msxml3: Use libxml2 functionality to skip top XML declaration node while writing to file .
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: afad45fffea6be29e7a989d610f3753247f01a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afad45fffea6be29e7a989d61… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 5 16:25:02 2010 +0300 msxml3: Use libxml2 functionality to skip top XML declaration node while writing to file. --- dlls/msxml3/domdoc.c | 56 +++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4914a7c..a7c1680 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -47,6 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +#include <libxml/xmlsave.h> + static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; @@ -1651,6 +1653,24 @@ static HRESULT WINAPI domdoc_loadXML( return hr; } +static int XMLCALL domdoc_save_writecallback(void *ctx, const char *buffer, + int len) +{ + DWORD written = -1; + + if(!WriteFile(ctx, buffer, len, &written, NULL)) + { + WARN("write error\n"); + return -1; + } + else + return written; +} + +static int XMLCALL domdoc_save_closecallback(void *ctx) +{ + return CloseHandle(ctx) ? 0 : -1; +} static HRESULT WINAPI domdoc_save( IXMLDOMDocument2 *iface, @@ -1658,10 +1678,8 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); HANDLE handle; - xmlChar *mem, *p; - int size; + xmlSaveCtxtPtr ctx; HRESULT ret = S_OK; - DWORD written; TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination), V_VT(&destination) == VT_BSTR ? debugstr_w(V_BSTR(&destination)) : NULL); @@ -1707,31 +1725,19 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } - xmlDocDumpMemory(get_doc(This), &mem, &size); - - /* - * libxml2 always adds XML declaration on top of the file and one for each processing instruction node in DOM tree. - * MSXML adds XML declaration only for processing instruction nodes. - * We skip the first XML declaration generated by libxml2 to get exactly what we need. - */ - p = mem; - if(size > 2 && p[0] == '<' && p[1] == '?') { - while(p < mem+size && (p[0] != '?' || p[1] != '>')) - p++; - p += 2; - while(p < mem+size && isspace(*p)) - p++; - size -= p-mem; - } - - if(!WriteFile(handle, p, (DWORD)size, &written, NULL) || written != (DWORD)size) + /* disable top XML declaration */ + ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, + handle, NULL, XML_SAVE_NO_DECL); + if (!ctx) { - WARN("write error\n"); - ret = S_FALSE; + CloseHandle(handle); + return S_FALSE; } - xmlFree(mem); - CloseHandle(handle); + if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; + /* will close file through close callback */ + xmlSaveClose(ctx); + return ret; }

1 0