November 2008 - Wine-Commits

Ricardo Filipe : comctl32: Remove dead stores (llvm/clang).
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 66019452f4ef0bdca5c1c8c333b396d8116ad517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66019452f4ef0bdca5c1c8c33… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 23:46:36 2008 +0000 comctl32: Remove dead stores (llvm/clang). --- dlls/comctl32/toolbar.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8e30df0..7972605 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -542,7 +542,7 @@ TOOLBAR_DrawArrow (HDC hdc, INT left, INT top, COLORREF clr) MoveToEx (hdc, x, y, NULL); LineTo (hdc, x+3, y++); x++; MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+1, y++); + LineTo (hdc, x+1, y); SelectObject( hdc, hOldPen ); DeleteObject( hPen ); } @@ -1151,7 +1151,7 @@ TOOLBAR_Refresh (HWND hwnd, HDC hdc, const PAINTSTRUCT *ps) tbcd.nmcd.dwDrawStage = CDDS_POSTPAINT; tbcd.nmcd.hdc = hdc; tbcd.nmcd.rc = ps->rcPaint; - ntfret = TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW); + TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW); } } @@ -1426,7 +1426,6 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) TRACE("wrap point 5 btn %d style %02x, x=%d, cx=%d\n", i, btnPtr[i].fsStyle, x, cx); btnPtr[i].fsState |= TBSTATE_WRAP; - bFound = TRUE; x = infoPtr->nIndent; if (btnPtr[i].fsStyle & BTNS_SEP ) bButtonWrap = FALSE;

1 0

Ricardo Filipe : comctl32: Removed dead increment (llvm/clang).
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 6c24fb1ca8704d2fde3e65d80c820fdeaae231e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c24fb1ca8704d2fde3e65d80… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 23:37:30 2008 +0000 comctl32: Removed dead increment (llvm/clang). --- dlls/comctl32/syslink.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7f74b36..64cea11 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -286,8 +286,6 @@ CheckParameter: ValidLink = TRUE; taglen++; } - else - tmp++; } }

1 0

Ricardo Filipe : comctl32: Removed dead increment (llvm/clang).
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 422cd0bc3ad5616049367ea0a9235068b9213dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422cd0bc3ad5616049367ea0a… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 23:33:55 2008 +0000 comctl32: Removed dead increment (llvm/clang). --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index c8c200f..89ac420 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -484,7 +484,7 @@ REBAR_DrawChevron (HDC hdc, INT left, INT top, INT colorRef) MoveToEx (hdc, x, y, NULL); LineTo (hdc, x+3, y++); x++; MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+1, y++); + LineTo (hdc, x+1, y); SelectObject( hdc, hOldPen ); DeleteObject( hPen ); }

1 0

Ricardo Filipe : comctl32: Removed dead store (llvm/clang).
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 56301248968059e4d32bd38f017986b033b7f99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56301248968059e4d32bd38f0… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 23:27:51 2008 +0000 comctl32: Removed dead store (llvm/clang). --- dlls/comctl32/monthcal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8cae0db..15acf1f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1172,7 +1172,6 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, LPARAM lParam) x = lpht->pt.x; y = lpht->pt.y; - retval = MCHT_NOWHERE; ZeroMemory(&lpht->st, sizeof(lpht->st)); @@ -1887,7 +1886,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); - theme = OpenThemeData (infoPtr->hwndSelf, themeClass); + OpenThemeData (infoPtr->hwndSelf, themeClass); return 0; }

1 0

Ricardo Filipe : sane.ds: Check dead stored status (llvm/clang).
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 66b732e4f8e16421eaea4c995b53dd5f1f0c2bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b732e4f8e16421eaea4c995… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 20:29:53 2008 +0000 sane.ds: Check dead stored status (llvm/clang). --- dlls/sane.ds/ds_image.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index c3e7082..9a88bb5 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -100,8 +100,15 @@ TW_UINT16 SANE_ImageInfoGet (pTW_IDENTITY pOrigin, { /* return general image description information about the image about to be transferred */ status = psane_get_parameters (activeDS.deviceHandle, &activeDS.sane_param); - activeDS.sane_param_valid = TRUE; TRACE("Getting parameters\n"); + if (status != SANE_STATUS_GOOD) + { + WARN("psane_get_parameters: %s\n", psane_strstatus (status)); + psane_cancel (activeDS.deviceHandle); + activeDS.twCC = TWCC_OPERATIONERROR; + return TWRC_FAILURE; + } + activeDS.sane_param_valid = TRUE; } pImageInfo->XResolution.Whole = -1;

1 0

Alexandre Julliard : configure: Add a --disable-tests option to avoid building regression tests.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 35078f4b57523d4afe00d01da9afb9cbe2c37dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=35078f4b57523d4afe00d01da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 21 10:16:12 2008 +0100 configure: Add a --disable-tests option to avoid building regression tests. --- configure | 191 ++++++++++++++++++++++++++------------------------ configure.ac | 185 ++++++++++++++++++++++++------------------------ tools/make_makefiles | 2 +- 3 files changed, 193 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35078f4b57523d4afe00d…

1 0

Austin English : msvcrt: Fix a compiler warning.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 8efc3fec1d9804a0416e71bb6641017a07003ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8efc3fec1d9804a0416e71bb6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 20 18:07:07 2008 -0600 msvcrt: Fix a compiler warning. --- dlls/msvcrt/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 25ac69f..30d7956 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -420,8 +420,8 @@ int CDECL _fpclass(double num) #ifdef FP_PNORM case FP_PNORM: return MSVCRT__FPCLASS_PN; #endif + default: return MSVCRT__FPCLASS_PN; } - return MSVCRT__FPCLASS_PN; #elif defined (fpclassify) switch (fpclassify( num )) {

1 0

Paul Vriens : user32/tests: Fix a few test failures on Win9x.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: a413c38a7c78e460bd2f753ca315ee95fb88fa27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a413c38a7c78e460bd2f753ca… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 21 08:59:09 2008 +0100 user32/tests: Fix a few test failures on Win9x. --- dlls/user32/tests/win.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9a15236..8540827 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4011,6 +4011,11 @@ static void test_CreateWindow(void) #define expect_ex_style(window, ex_style)\ ok(GetWindowLong(window, GWL_EXSTYLE) == (ex_style), "expected ex_style %x != %x\n", (LONG)(ex_style), GetWindowLong(window, GWL_EXSTYLE)) +#define expect_gle_broken_9x(gle)\ + ok(GetLastError() == gle ||\ + broken(GetLastError() == 0xdeadbeef),\ + "IsMenu set error %d\n", GetLastError()) + hmenu = CreateMenu(); assert(hmenu != 0); parent = GetDesktopWindow(); @@ -4067,7 +4072,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4081,7 +4086,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4095,7 +4100,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4109,14 +4114,16 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); /* WS_CHILD | WS_POPUP */ SetLastError(0xdeadbeef); hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP, 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); - ok(!hwnd, "CreateWindowEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + ok(!hwnd || broken(hwnd != 0 /* Win9x */), "CreateWindowEx should fail\n"); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); + if (hwnd) + DestroyWindow(hwnd); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4130,13 +4137,15 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); SetLastError(0xdeadbeef); hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION, 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); - ok(!hwnd, "CreateWindowEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + ok(!hwnd || broken(hwnd != 0 /* Win9x */), "CreateWindowEx should fail\n"); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); + if (hwnd) + DestroyWindow(hwnd); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4150,13 +4159,15 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); SetLastError(0xdeadbeef); hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_POPUP, 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); - ok(!hwnd, "CreateWindowEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + ok(!hwnd || broken(hwnd != 0 /* Win9x */), "CreateWindowEx should fail\n"); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); + if (hwnd) + DestroyWindow(hwnd); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4170,13 +4181,15 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); SetLastError(0xdeadbeef); hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION, 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); - ok(!hwnd, "CreateWindowEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + ok(!hwnd || broken(hwnd != 0 /* Win9x */), "CreateWindowEx should fail\n"); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); + if (hwnd) + DestroyWindow(hwnd); hmenu = CreateMenu(); assert(hmenu != 0); @@ -4190,7 +4203,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + expect_gle_broken_9x(ERROR_INVALID_MENU_HANDLE); /* test child window sizing */ cls.style = 0; @@ -4324,6 +4337,7 @@ static void test_CreateWindow(void) UnregisterClass("MinMax_WndClass", GetModuleHandle(0)); UnregisterClass("Sizes_WndClass", GetModuleHandle(0)); +#undef expect_gle_broken_9x #undef expect_menu #undef expect_style #undef expect_ex_style

1 0

Paul Vriens : comdlg32/tests 2/2: Fix a test failure on Win9x.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: cac3cb90368c84041ebed6a5fdd73de03a15186d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac3cb90368c84041ebed6a5f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 20 20:52:35 2008 +0100 comdlg32/tests 2/2: Fix a test failure on Win9x. --- dlls/comdlg32/tests/filedlg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index ad2cb45..c3d56ea 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -199,7 +199,9 @@ static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); - ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_DETAILS); + ok(folder_settings.ViewMode == FVM_DETAILS || + broken(folder_settings.ViewMode == FVM_LIST), /* Win9x */ + "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_DETAILS); cleanup: if (shell_view2) IShellView2_Release(shell_view2);

1 0

Paul Vriens : comdlg32/tests 1/2: Fix a test failure on XP and W2K3.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: c9b82600563c3bafaca91e0a0f0f59882734de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b82600563c3bafaca91e0a0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 20 20:48:12 2008 +0100 comdlg32/tests 1/2: Fix a test failure on XP and W2K3. --- dlls/comdlg32/tests/filedlg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index e05f5a9..ad2cb45 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -187,6 +187,11 @@ static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, hr = IShellView2_DestroyViewWindow(shell_view2); ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); + /* XP and W2K3 need this. On Win9x and W2K the call to DestroyWindow() fails and has + * no side effects. NT4 doesn't get here. (FIXME: Vista doesn't get here yet). + */ + DestroyWindow(view_params.hwndView); + view_params.pvid = &VID_Details; hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr);

1 0