February 2010 - Wine-commits

Alexandre Julliard : server: Fix tracing of invalid ACLs.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 9c87c88837bb708e83792a38fe819585f4592b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c87c88837bb708e83792a38f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 12:57:03 2010 +0100 server: Fix tracing of invalid ACLs. --- server/trace.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/trace.c b/server/trace.c index 03e4c04..529316d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -822,7 +822,7 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz { if (size < sizeof(ACL)) { - fprintf( stderr, "<invalid acl>}\n" ); + fprintf( stderr, "<invalid acl>}" ); return; } size -= sizeof(ACL); @@ -832,10 +832,7 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz const SID *sid = NULL; data_size_t sid_size = 0; - if (size < sizeof(ACE_HEADER)) - return; - if (size < ace->AceSize) - return; + if (size < sizeof(ACE_HEADER) || size < ace->AceSize) break; size -= ace->AceSize; if (i != 0) fputc( ',', stderr ); fprintf( stderr, "{AceType=" );

1 0

Alexandre Julliard : user.exe: The default dialog button id is 0 on Win16.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: a9a5dae06459ac512b61c989e945012af8615bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a5dae06459ac512b61c989e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:12:11 2010 +0100 user.exe: The default dialog button id is 0 on Win16. --- dlls/user.exe16/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index ab6cb38..a194a58 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -446,6 +446,7 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; + dlgInfo->idResult = 0; dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc );

1 0

Dylan Smith : richedit: Prevent crash on word selection at end of paragraph .
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 9106860c853511b8d5c739b69a6292eb395b5473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9106860c853511b8d5c739b69… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 17 14:15:50 2010 -0500 richedit: Prevent crash on word selection at end of paragraph. --- dlls/riched20/caret.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 500b6c7..abcc73e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -723,6 +723,7 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) return FALSE; pRun = ME_FindItemBack(pPara, diRun); + pPara = pPara->member.para.prev_para; } break; }

1 0

Dylan Smith : wordpad: Avoid making monochrome bitmaps for print preview.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 003e7e967545711f5a750b05686856d7630d7ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003e7e967545711f5a750b056… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 17 14:16:01 2010 -0500 wordpad: Avoid making monochrome bitmaps for print preview. Previewly monochrome bitmaps were being created by CreateCompatibleBitmap because the hdc passed into that call came from CreateCompatibleDC which is initialized with a single pixel monochrome bitmap. --- programs/wordpad/print.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index e43b4b9..e8d14e8 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -874,13 +874,11 @@ static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float r } -static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, int bmWidth, int bmHeight, RECT* paper, int page) +static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int page) { - HBITMAP hBitmapCapture = CreateCompatibleBitmap(lpFr->hdc, bmWidth, bmHeight); int bottom; char_from_pagenum(hEditorWnd, lpFr, page); - SelectObject(lpFr->hdc, hBitmapCapture); FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); bottom = lpFr->rc.bottom; SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); @@ -926,6 +924,7 @@ LRESULT print_preview(HWND hwndPreview) GETTEXTLENGTHEX gt; RECT paper; HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); + HBITMAP hBitmapCapture; preview.hdc = CreateCompatibleDC(hdc); @@ -947,12 +946,16 @@ LRESULT print_preview(HWND hwndPreview) paper.bottom = preview.bmSize.cy; fr.hdc = preview.hdc; - draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &paper, preview.page); + hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); + SelectObject(fr.hdc, hBitmapCapture); + draw_preview(hEditorWnd, &fr, &paper, preview.page); if(preview.hdc2) { fr.hdc = preview.hdc2; - draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &fr.rcPage, preview.page + 1); + hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); + SelectObject(fr.hdc, hBitmapCapture); + draw_preview(hEditorWnd, &fr, &fr.rcPage, preview.page + 1); } update_preview_buttons(hMainWnd);

1 0

Dylan Smith : wordpad: Added text colour toolbar button.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 2397171cf3f2455ecddd1c32c3251c10fc3be337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2397171cf3f2455ecddd1c32c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 17 14:19:36 2010 -0500 wordpad: Added text colour toolbar button. --- programs/wordpad/Da.rc | 24 +++++++++++++++ programs/wordpad/De.rc | 24 +++++++++++++++ programs/wordpad/En.rc | 24 +++++++++++++++ programs/wordpad/Fr.rc | 24 +++++++++++++++ programs/wordpad/Hu.rc | 24 +++++++++++++++ programs/wordpad/It.rc | 24 +++++++++++++++ programs/wordpad/Ja.rc | 24 +++++++++++++++ programs/wordpad/Ko.rc | 24 +++++++++++++++ programs/wordpad/Lt.rc | 24 +++++++++++++++ programs/wordpad/Nl.rc | 24 +++++++++++++++ programs/wordpad/No.rc | 24 +++++++++++++++ programs/wordpad/Pl.rc | 24 +++++++++++++++ programs/wordpad/Pt.rc | 24 +++++++++++++++ programs/wordpad/Ru.rc | 24 +++++++++++++++ programs/wordpad/Si.rc | 24 +++++++++++++++ programs/wordpad/Sv.rc | 24 +++++++++++++++ programs/wordpad/Tr.rc | 24 +++++++++++++++ programs/wordpad/Uk.rc | 24 +++++++++++++++ programs/wordpad/Zh.rc | 24 +++++++++++++++ programs/wordpad/formatbar.bmp | Bin 1014 -> 1142 bytes programs/wordpad/wordpad.c | 62 ++++++++++++++++++++++++++++++++++++--- programs/wordpad/wordpad.h | 21 +++++++++++++ 22 files changed, 534 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2397171cf3f2455ecddd1…

1 0

Alexandre Julliard : user32: Don' t overwrite the default button id when creating the dialog structure.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: a64765f673b01944ebf5da44dbcae7b8f4b68ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64765f673b01944ebf5da44d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 11:43:34 2010 +0100 user32: Don't overwrite the default button id when creating the dialog structure. --- dlls/user.exe16/dialog.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 04f2435..ab6cb38 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -446,7 +446,6 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 373260a..fecd417 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -339,7 +339,7 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->hMenu = 0; dlgInfo->xBaseUnit = 0; dlgInfo->yBaseUnit = 0; - dlgInfo->idResult = 0; + dlgInfo->idResult = IDOK; dlgInfo->flags = 0; wndPtr->dlgInfo = dlgInfo; } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index d95746b..c7c9409 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -672,7 +672,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId );

1 0

Paul Vriens : winspool.drv/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: f5d40cb8c5d6f33b7b34c5b0c1943b9dd50e8bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d40cb8c5d6f33b7b34c5b0c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:38:31 2010 +0100 winspool.drv/tests: Fix some test failures on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 712b00b..2ea5f54 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2277,7 +2277,12 @@ static void test_GetPrinter(void) ret = GetPrinter(hprn, level, NULL, 0, &needed); ok(!ret, "level %d: GetPrinter should fail\n", level); /* Not all levels are supported on all Windows-Versions */ - if(GetLastError() == ERROR_INVALID_LEVEL) continue; + if (GetLastError() == ERROR_INVALID_LEVEL || + GetLastError() == ERROR_NOT_SUPPORTED /* Win9x/WinMe */) + { + skip("Level %d not supported\n", level); + continue; + } ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); ok(needed > 0,"not expected needed buffer size %d\n", needed);

1 0

Paul Vriens : winspool.drv/tests: Skip non supported levels on Win9x/WinMe.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 5e3e9e03f2c6c4b71e17fd51309e741f4d37f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3e9e03f2c6c4b71e17fd513… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:50:09 2010 +0100 winspool.drv/tests: Skip non supported levels on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 2ea5f54..7739a2b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2275,6 +2275,13 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); needed = (DWORD)-1; ret = GetPrinter(hprn, level, NULL, 0, &needed); + if (ret) + { + win_skip("Level %d is not supported on Win9x/WinMe\n", level); + ok(GetLastError() == ERROR_SUCCESS, "wrong error %d\n", GetLastError()); + ok(needed == 0,"Expected 0, got %d\n", needed); + continue; + } ok(!ret, "level %d: GetPrinter should fail\n", level); /* Not all levels are supported on all Windows-Versions */ if (GetLastError() == ERROR_INVALID_LEVEL ||

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 387f050f681f2a9397d599fb68940a77f609b3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=387f050f681f2a9397d599fb6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:59:18 2010 +0100 winspool.drv/tests: Fix a test failure on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 7739a2b..1b552fe 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2448,7 +2448,9 @@ static void test_GetPrinterDriver(void) { ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); - ok(di_2->pDataFile == NULL, "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); + ok(di_2->pDataFile == NULL || + broken(di_2->pDataFile != NULL), /* Win9x/WinMe */ + "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); } }

1 0

Alexandre Julliard : kernel32/tests: Fix a test failure on xp64.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: fb950a6da5f2c1be38c185c19b198e94e734e5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb950a6da5f2c1be38c185c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 12:04:42 2010 +0100 kernel32/tests: Fix a test failure on xp64. --- dlls/kernel32/tests/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index edc0a64..43db787 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -554,7 +554,8 @@ static void test_heap_checks( DWORD flags ) ok( p2 == NULL, "HeapReAlloc succeeded\n" ); ret = HeapFree( GetProcessHeap(), 0, p ); - ok( !ret, "HeapFree succeeded\n" ); + ok( !ret || broken(sizeof(void*) == 8), /* not caught on xp64 */ + "HeapFree succeeded\n" ); } p[17] = old;

1 0