October 2008 - Wine-commits

Dylan Smith : richedit: ES_AUTOHSCROLL window style disables word wrapping.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 4785c2fa2d8c62c77a9f5a4d2dd6547ce871278a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4785c2fa2d8c62c77a9f5a4d2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 3 18:28:34 2008 -0400 richedit: ES_AUTOHSCROLL window style disables word wrapping. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f3046c9..608be01 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2210,7 +2210,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->bRedraw = TRUE; - ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) ? FALSE : TRUE; + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & (WS_HSCROLL|ES_AUTOHSCROLL)) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL;

1 0

Marcus Meissner : gdiplus: Also handle 32bpp bitmaps.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: e4198d473c95de1a50a70e8a628541b0494aa1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4198d473c95de1a50a70e8a6… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Oct 4 11:30:09 2008 +0200 gdiplus: Also handle 32bpp bitmaps. --- dlls/gdiplus/image.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9e3fd62..4d6a54f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1389,6 +1389,9 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi case 24: format = PixelFormat24bppRGB; break; + case 32: + format = PixelFormat32bppRGB; + break; case 48: format = PixelFormat48bppRGB; break;

1 0

Paul Vriens : gdi32/tests: Fix a few failures on win9x.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 4bf5c5f8a23cdfe6af012403a875a0a95bf07a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf5c5f8a23cdfe6af012403a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 6 11:47:56 2008 +0200 gdi32/tests: Fix a few failures on win9x. --- dlls/gdi32/tests/bitmap.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 12224c9..25f1fe7 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -308,8 +308,11 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER buf = HeapAlloc(GetProcessHeap(), 0, bm.bmWidthBytes * bm.bmHeight + 4096); /* GetBitmapBits returns not 32-bit aligned data */ + SetLastError(0xdeadbeef); ret = GetBitmapBits(hbm, 0, NULL); - ok(ret == bm_width_bytes * bm.bmHeight, "%d != %d\n", ret, bm_width_bytes * bm.bmHeight); + ok(ret == bm_width_bytes * bm.bmHeight || + broken(ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + "%d != %d\n", ret, bm_width_bytes * bm.bmHeight); memset(buf, 0xAA, bm.bmWidthBytes * bm.bmHeight + 4096); ret = GetBitmapBits(hbm, bm.bmWidthBytes * bm.bmHeight + 4096, buf);

1 0

Dmitry Timoshkov : user32: Print the expected and received rectangles.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 53160b600fe3274274cbc37f39c1defe09d5f283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53160b600fe3274274cbc37f3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Oct 3 04:52:17 2008 +0900 user32: Print the expected and received rectangles. --- dlls/user32/tests/win.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fac40fe..db1de11 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4365,7 +4365,9 @@ static void test_ShowWindow(void) ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rcMain, &rc), "rects should match\n"); + ok(EqualRect(&rcMain, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rcMain.left, rcMain.top, rcMain.right, rcMain.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = ShowWindow(hwnd, SW_SHOW); ok(!ret, "not expected ret: %lu\n", ret); @@ -4375,7 +4377,9 @@ static void test_ShowWindow(void) ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rcMain, &rc), "rects should match\n"); + ok(EqualRect(&rcMain, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rcMain.left, rcMain.top, rcMain.right, rcMain.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = ShowWindow(hwnd, SW_MINIMIZE); ok(ret, "not expected ret: %lu\n", ret); @@ -4395,7 +4399,9 @@ static void test_ShowWindow(void) ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rcMain, &rc), "rects should match\n"); + ok(EqualRect(&rcMain, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rcMain.left, rcMain.top, rcMain.right, rcMain.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = EnableWindow(hwnd, FALSE); ok(!ret, "not expected ret: %lu\n", ret); @@ -4410,7 +4416,9 @@ static void test_ShowWindow(void) ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rcMain, &rc), "rects should match\n"); + ok(EqualRect(&rcMain, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rcMain.left, rcMain.top, rcMain.right, rcMain.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -4420,7 +4428,9 @@ static void test_ShowWindow(void) ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rcMain, &rc), "rects should match\n"); + ok(EqualRect(&rcMain, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rcMain.left, rcMain.top, rcMain.right, rcMain.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = ShowWindow(hwnd, SW_MINIMIZE); ok(ret, "not expected ret: %lu\n", ret); @@ -4450,7 +4460,9 @@ static void test_ShowWindow(void) ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rcMain, &rc), "rects should match\n"); + ok(EqualRect(&rcMain, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rcMain.left, rcMain.top, rcMain.right, rcMain.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = DefWindowProc(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); ok(!ret, "not expected ret: %lu\n", ret);

1 0

Andrew Talbot : gdi32: Sign-compare warnings fix.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 44be6c7cbfbb3729e374bc343e5224d2c498ec0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44be6c7cbfbb3729e374bc343… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 2 22:18:38 2008 +0100 gdi32: Sign-compare warnings fix. --- dlls/gdi32/bitmap.c | 4 ++-- dlls/gdi32/dib.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 94061f8..a38fdd9 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -335,7 +335,7 @@ LONG WINAPI GetBitmapBits( DIBSECTION *dib = bmp->dib; const char *src = dib->dsBm.bmBits; INT width_bytes = BITMAP_GetWidthBytes(dib->dsBm.bmWidth, dib->dsBm.bmBitsPixel); - DWORD max = width_bytes * bmp->bitmap.bmHeight; + LONG max = width_bytes * bmp->bitmap.bmHeight; if (!bits) { @@ -451,7 +451,7 @@ LONG WINAPI SetBitmapBits( { DIBSECTION *dib = bmp->dib; char *dest = dib->dsBm.bmBits; - DWORD max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + LONG max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; if (count > max) count = max; ret = count; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 440857d..299e27a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1193,8 +1193,7 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, const BITMAPINFO *bmi, UINT16 us static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) { RGBQUAD *colorTable; - unsigned int colors; - int i; + unsigned int colors, i; BOOL core_info = info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER); if (core_info)

1 0

Dylan Smith : richedit: Use RTF reader for text starting with {\urtf.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: bdf181b4d3621e4a392304bcd6b505bd15bcc0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf181b4d3621e4a392304bcd… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 3 04:08:34 2008 -0400 richedit: Use RTF reader for text starting with {\urtf. --- dlls/riched20/editor.c | 10 ++++++---- dlls/riched20/tests/editor.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 253c7b8..f3046c9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2741,8 +2741,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_GetSelection(editor, &from, &to); style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to - from, FALSE); - if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 1, (char *)lParam); + if (pStruct->codepage != 1200 && lParam && + (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) + ME_StreamInRTFString(editor, 1, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_ReleaseStyle(style); @@ -2750,8 +2751,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } else { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor), FALSE); - if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 0, (char *)lParam); + if (pStruct->codepage != 1200 && lParam && + (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) + ME_StreamInRTFString(editor, 0, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); len = 1; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 87e67da..54b100c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3522,6 +3522,28 @@ static void test_EM_SETTEXTEX(void) "EM_GETTEXTEX results not what was set by EM_SETTEXTEX when" " using ST_SELECTION and non-Unicode\n"); + /* Test setting text using rich text format */ + setText.flags = 0; + setText.codepage = CP_ACP; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"{\\rtf richtext}"); + getText.codepage = CP_ACP; + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); + ok(!strcmp(bufACP, "richtext"), "expected 'richtext' but got '%s'\n", bufACP); + + setText.flags = 0; + setText.codepage = CP_ACP; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"{\\urtf morerichtext}"); + getText.codepage = CP_ACP; + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); + ok(!strcmp(bufACP, "morerichtext"), "expected 'morerichtext' but got '%s'\n", bufACP); DestroyWindow(hwndRichEdit); }

1 0

Rob Shearman : wininet: Fix behaviour of InternetTimeFromSystemTimeA/ W when dealing with invalid parameters.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 7ffaafb2652e59c3f3966c2a533562932e0a07a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffaafb2652e59c3f3966c2a5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 3 12:58:32 2008 +0100 wininet: Fix behaviour of InternetTimeFromSystemTimeA/W when dealing with invalid parameters. --- dlls/wininet/internet.c | 9 +++++++++ dlls/wininet/tests/internet.c | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ea1d294..4b33ca6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2478,6 +2478,12 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); + if (!time || !string || format != INTERNET_RFC1123_FORMAT) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (size < INTERNET_RFC1123_BUFSIZE * sizeof(*string)) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2502,7 +2508,10 @@ BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, L TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); if (!time || !string || format != INTERNET_RFC1123_FORMAT) + { + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + } if (size < INTERNET_RFC1123_BUFSIZE * sizeof(*string)) { diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 91d72cc..5fbfd76 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -386,7 +386,6 @@ static void InternetTimeFromSystemTimeA_test(void) ret = pInternetTimeFromSystemTimeA( NULL, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "InternetTimeFromSystemTimeA failed with ERROR_INVALID_PARAMETER instead of %u\n", error ); @@ -395,7 +394,6 @@ static void InternetTimeFromSystemTimeA_test(void) SetLastError(0xdeadbeef); ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, NULL, sizeof(string) ); error = GetLastError(); - todo_wine ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); ok( error == ERROR_INVALID_PARAMETER, "InternetTimeFromSystemTimeA failed with ERROR_INVALID_PARAMETER instead of %u\n", @@ -406,7 +404,6 @@ static void InternetTimeFromSystemTimeA_test(void) ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT + 1, string, sizeof(string) ); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "InternetTimeFromSystemTimeA failed with ERROR_INVALID_PARAMETER instead of %u\n", error ); @@ -441,7 +438,6 @@ static void InternetTimeFromSystemTimeW_test(void) ret = pInternetTimeFromSystemTimeW( NULL, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "InternetTimeFromSystemTimeW failed with ERROR_INVALID_PARAMETER instead of %u\n", error ); @@ -451,7 +447,6 @@ static void InternetTimeFromSystemTimeW_test(void) ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, NULL, sizeof(string) ); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "InternetTimeFromSystemTimeW failed with ERROR_INVALID_PARAMETER instead of %u\n", error ); @@ -461,7 +456,6 @@ static void InternetTimeFromSystemTimeW_test(void) ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT + 1, string, sizeof(string) ); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "InternetTimeFromSystemTimeW failed with ERROR_INVALID_PARAMETER instead of %u\n", error );

1 0

Lei Zhang : regedit: Make branch export behavior work more like native regedit.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: d3908e699b109c397ca347eb28d125b381496144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3908e699b109c397ca347eb2… Author: Lei Zhang <thestig(a)google.com> Date: Fri Oct 3 14:21:15 2008 -0700 regedit: Make branch export behavior work more like native regedit. --- programs/regedit/framewnd.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 4d8056e..ca836e2 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -278,10 +278,13 @@ static UINT CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARA { case CDN_INITDONE: { + BOOL export_branch = FALSE; WCHAR* path = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); + if (path && strlenW(path) > 0) + export_branch = TRUE; HeapFree(GetProcessHeap(), 0, path); - CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, pOpenFileName->lCustData ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL); + CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, export_branch ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL); break; } case CDN_FILEOK: @@ -356,7 +359,7 @@ static BOOL ImportRegistryFile(HWND hWnd) } -static BOOL ExportRegistryFile(HWND hWnd, BOOL export_branch) +static BOOL ExportRegistryFile(HWND hWnd) { OPENFILENAMEW ofn; WCHAR ExportKeyPath[_MAX_PATH]; @@ -366,7 +369,6 @@ static BOOL ExportRegistryFile(HWND hWnd, BOOL export_branch) InitOpenFileName(hWnd, &ofn); LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; - ofn.lCustData = export_branch; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCEW(IDD_EXPORT_TEMPLATE); @@ -665,10 +667,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ImportRegistryFile(hWnd); break; case ID_EDIT_EXPORT: - ExportRegistryFile(hWnd, TRUE); - break; case ID_REGISTRY_EXPORTREGISTRYFILE: - ExportRegistryFile(hWnd, FALSE); + ExportRegistryFile(hWnd); break; case ID_REGISTRY_CONNECTNETWORKREGISTRY: break;

1 0

Maarten Lankhorst : dsound: Fix volume and panning for primary buffer.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: a4a9d50dd9651a8026044613ee537f020bd1aee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a9d50dd9651a8026044613e… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Sun Sep 28 20:47:28 2008 +0200 dsound: Fix volume and panning for primary buffer. Fixes failing dsound tests in wine. --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 2 + dlls/dsound/primary.c | 72 +++++++++++++++++++++++------------------ 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 87e9bba..7032774 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1471,7 +1471,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->drvcaps.dwFlags |= DSCAPS_EMULDRIVER; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - device->drvcaps.dwPrimaryBuffers = 1; + ZeroMemory(&device->volpan, sizeof(device->volpan)); } hr = DSOUND_PrimaryCreate(device); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 262e9ec..2d87263 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -108,6 +108,8 @@ struct DirectSoundDevice LPBYTE tmp_buffer, mix_buffer; DWORD tmp_buffer_len, mix_buffer_len; + DSVOLUMEPAN volpan; + mixfunc mixfunction; normfunc normfunction; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 4e80778..661cd8c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -169,7 +169,10 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) return err; } } - DSOUND_RecalcPrimary(device); + if (device->hwbuf) + IDsDriverBuffer_SetVolumePan(device->hwbuf, &device->volpan); + + DSOUND_RecalcPrimary(device); device->prebuf = ds_snd_queue_max; if (device->helfrags < ds_snd_queue_min) { @@ -582,7 +585,6 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume( ) { DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device; DWORD ampfactors; - DSVOLUMEPAN volpan; HRESULT hres = DS_OK; TRACE("(%p,%d)\n", iface, vol); @@ -600,18 +602,18 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume( EnterCriticalSection(&(device->mixlock)); waveOutGetVolume(device->hwo, &ampfactors); - volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; - volpan.dwTotalRightAmpFactor=ampfactors >> 16; - DSOUND_AmpFactorToVolPan(&volpan); - if (vol != volpan.lVolume) { - volpan.lVolume=vol; - DSOUND_RecalcVolPan(&volpan); + device->volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; + device->volpan.dwTotalRightAmpFactor=ampfactors >> 16; + DSOUND_AmpFactorToVolPan(&device->volpan); + if (vol != device->volpan.lVolume) { + device->volpan.lVolume=vol; + DSOUND_RecalcVolPan(&device->volpan); if (device->hwbuf) { - hres = IDsDriverBuffer_SetVolumePan(device->hwbuf, &volpan); + hres = IDsDriverBuffer_SetVolumePan(device->hwbuf, &device->volpan); if (hres != DS_OK) WARN("IDsDriverBuffer_SetVolumePan failed\n"); } else { - ampfactors = (volpan.dwTotalLeftAmpFactor & 0xffff) | (volpan.dwTotalRightAmpFactor << 16); + ampfactors = (device->volpan.dwTotalLeftAmpFactor & 0xffff) | (device->volpan.dwTotalRightAmpFactor << 16); waveOutSetVolume(device->hwo, ampfactors); } } @@ -627,7 +629,6 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume( ) { DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device; DWORD ampfactors; - DSVOLUMEPAN volpan; TRACE("(%p,%p)\n", iface, vol); if (!(device->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { @@ -640,11 +641,14 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume( return DSERR_INVALIDPARAM; } - waveOutGetVolume(device->hwo, &ampfactors); - volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; - volpan.dwTotalRightAmpFactor=ampfactors >> 16; - DSOUND_AmpFactorToVolPan(&volpan); - *vol = volpan.lVolume; + if (!device->hwbuf) + { + waveOutGetVolume(device->hwo, &ampfactors); + device->volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; + device->volpan.dwTotalRightAmpFactor=ampfactors >> 16; + DSOUND_AmpFactorToVolPan(&device->volpan); + } + *vol = device->volpan.lVolume; return DS_OK; } @@ -907,7 +911,6 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan( ) { DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device; DWORD ampfactors; - DSVOLUMEPAN volpan; HRESULT hres = DS_OK; TRACE("(%p,%d)\n", iface, pan); @@ -924,19 +927,22 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan( /* **** */ EnterCriticalSection(&(device->mixlock)); - waveOutGetVolume(device->hwo, &ampfactors); - volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; - volpan.dwTotalRightAmpFactor=ampfactors >> 16; - DSOUND_AmpFactorToVolPan(&volpan); - if (pan != volpan.lPan) { - volpan.lPan=pan; - DSOUND_RecalcVolPan(&volpan); + if (!device->hwbuf) + { + waveOutGetVolume(device->hwo, &ampfactors); + device->volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; + device->volpan.dwTotalRightAmpFactor=ampfactors >> 16; + DSOUND_AmpFactorToVolPan(&device->volpan); + } + if (pan != device->volpan.lPan) { + device->volpan.lPan=pan; + DSOUND_RecalcVolPan(&device->volpan); if (device->hwbuf) { - hres = IDsDriverBuffer_SetVolumePan(device->hwbuf, &volpan); + hres = IDsDriverBuffer_SetVolumePan(device->hwbuf, &device->volpan); if (hres != DS_OK) WARN("IDsDriverBuffer_SetVolumePan failed\n"); } else { - ampfactors = (volpan.dwTotalLeftAmpFactor & 0xffff) | (volpan.dwTotalRightAmpFactor << 16); + ampfactors = (device->volpan.dwTotalLeftAmpFactor & 0xffff) | (device->volpan.dwTotalRightAmpFactor << 16); waveOutSetVolume(device->hwo, ampfactors); } } @@ -952,7 +958,6 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan( ) { DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device; DWORD ampfactors; - DSVOLUMEPAN volpan; TRACE("(%p,%p)\n", iface, pan); if (!(device->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { @@ -965,11 +970,14 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan( return DSERR_INVALIDPARAM; } - waveOutGetVolume(device->hwo, &ampfactors); - volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; - volpan.dwTotalRightAmpFactor=ampfactors >> 16; - DSOUND_AmpFactorToVolPan(&volpan); - *pan = volpan.lPan; + if (!device->hwbuf) + { + waveOutGetVolume(device->hwo, &ampfactors); + device->volpan.dwTotalLeftAmpFactor=ampfactors & 0xffff; + device->volpan.dwTotalRightAmpFactor=ampfactors >> 16; + DSOUND_AmpFactorToVolPan(&device->volpan); + } + *pan = device->volpan.lPan; return DS_OK; }

1 0

Maarten Lankhorst : winealsa.drv: Don't hang on last few bytes not played.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: 717df5b2972b3cb998ca5a43279ae2283b117eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=717df5b2972b3cb998ca5a432… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Sat Oct 4 12:04:12 2008 +0200 winealsa.drv: Don't hang on last few bytes not played. Fixes winmm:wave test hanging. --- dlls/winealsa.drv/waveout.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 8149a4a..6cb2da8 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -104,11 +104,13 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) snd_pcm_delay(wwo->pcm, &delay); /* A delay < 0 indicates an underrun; for our purposes that's 0. */ - if ( (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) || (delay < 0)) + if (delay < 0) { WARN("Unexpected state (%d) or delay (%ld) while updating Total Played, resetting\n", state, delay); delay=0; } + if (state == SND_PCM_STATE_XRUN) + snd_pcm_start(wwo->pcm); InterlockedExchange((LONG*)&wwo->dwPlayedTotal, wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->pcm, delay)); return TRUE; } @@ -281,10 +283,14 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) if (!lpWaveHdr) {TRACE("Empty queue\n"); break;} if (!force) { + snd_pcm_uframes_t frames; + snd_pcm_hw_params_get_period_size(wwo->hw_params, &frames, NULL); + if (lpWaveHdr == wwo->lpPlayPtr) {TRACE("play %p\n", lpWaveHdr); break;} if (lpWaveHdr == wwo->lpLoopPtr) {TRACE("loop %p\n", lpWaveHdr); break;} - if (lpWaveHdr->reserved > wwo->dwPlayedTotal) {TRACE("still playing %p (%u/%u)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;} + if (lpWaveHdr->reserved > wwo->dwPlayedTotal + frames) {TRACE("still playing %p (%u/%u)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;} } + wwo->dwPlayedTotal += lpWaveHdr->reserved - wwo->dwPlayedTotal; wwo->lpQueuePtr = lpWaveHdr->lpNext; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;

1 0