May 2010 - Wine-Commits - list.winehq.org

Nikolay Sivov : user32: Fix selected brush color for caret bitmap creation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: dcddea361f3cd2717c92757adddb87badc55d3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcddea361f3cd2717c92757ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 8 22:10:29 2010 +0400 user32: Fix selected brush color for caret bitmap creation. --- dlls/user32/caret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 953a081..308336d 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -154,7 +154,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) { HBITMAP hPrevBmp = SelectObject(hMemDC, hBmp); SetRect( &r, 0, 0, width, height ); - FillRect(hMemDC, &r, ULongToHandle((bitmap ? COLOR_GRAYTEXT : COLOR_WINDOW) + 1)); + FillRect(hMemDC, &r, bitmap ? GetStockObject(GRAY_BRUSH) : GetStockObject(WHITE_BRUSH)); SelectObject(hMemDC, hPrevBmp); } DeleteDC(hMemDC);

1 0

Alexandre Julliard : winex11: The startscan line is relative to the destination in SetDIBits.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 27c85646057fd4b1011f4e3c7101930a892accaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c85646057fd4b1011f4e3c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:35:47 2010 +0200 winex11: The startscan line is relative to the destination in SetDIBits. --- dlls/winex11.drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index d72ae00..95e3511 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4043,8 +4043,8 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start { unsigned int srcwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); int dstwidthb = ds.dsBm.bmWidthBytes; - LPBYTE dbits = physBitmap->base; - const BYTE *sbits = (const BYTE*)bits + (startscan * srcwidthb); + LPBYTE dbits = physBitmap->base + startscan * dstwidthb; + const BYTE *sbits = bits; int widthb; UINT y;

1 0

Gerald Pfeifer : winecfg: Remove variable drive which is not really used from DriveDlgProc.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: cd958391e6894942419638804adbc5e6d30c0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd958391e6894942419638804… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 12:57:01 2010 +0200 winecfg: Remove variable drive which is not really used from DriveDlgProc. --- programs/winecfg/driveui.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 87af06c..dced874 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -736,7 +736,6 @@ INT_PTR CALLBACK DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) { int item; - struct drive *drive; switch (msg) { @@ -813,7 +812,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) case IDC_BUTTON_EDIT: if (HIWORD(wParam) != BN_CLICKED) break; item = SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETCURSEL, 0, 0); - drive = (struct drive *) SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); + SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); break; case IDC_BUTTON_AUTODETECT:

1 0

Gerald Pfeifer : user32/tests: Remove SetShellWindowEx from test_shell_window.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 612df7ee228c9f2312f2b82ce23818d7fa047779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612df7ee228c9f2312f2b82ce… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 20:14:52 2010 +0200 user32/tests: Remove SetShellWindowEx from test_shell_window. --- dlls/user32/tests/win.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a295850..eab16e7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1040,7 +1040,6 @@ static void test_shell_window(void) DWORD error; HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); - BOOL (WINAPI*SetShellWindowEx)(HWND, HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; @@ -1055,7 +1054,6 @@ static void test_shell_window(void) hUser32 = GetModuleHandleA("user32"); SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); - SetShellWindowEx = (void *)GetProcAddress(hUser32, "SetShellWindowEx"); trace("previous shell window: %p\n", shellWindow);

1 0

Alexandre Julliard : user32: Fix checking of show count in ShowCursor.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: eeda373f6ff1989b61a256dfb66d6381930b2cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeda373f6ff1989b61a256dfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 11:53:37 2010 +0200 user32: Fix checking of show count in ShowCursor. --- dlls/user32/cursoricon.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 856d900..9d7788d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1701,7 +1701,7 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { HCURSOR cursor; int increment = bShow ? 1 : -1; - int prev_count; + int count; SERVER_START_REQ( set_cursor ) { @@ -1709,15 +1709,16 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) req->show_count = increment; wine_server_call( req ); cursor = wine_server_ptr_handle( reply->prev_handle ); - prev_count = reply->prev_count; + count = reply->prev_count + increment; } SERVER_END_REQ; - TRACE("%d, count=%d\n", bShow, prev_count + increment ); + TRACE("%d, count=%d\n", bShow, count ); - if (!prev_count) USER_Driver->pSetCursor( bShow ? cursor : 0 ); + if (bShow && !count) USER_Driver->pSetCursor( cursor ); + else if (!bShow && count == -1) USER_Driver->pSetCursor( 0 ); - return prev_count + increment; + return count; } /***********************************************************************

1 0

Gerald Pfeifer : d3dx9_36/tests: Remove variable scaling which is not really used from D3DXMatrixTest.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: c45c226de4559687f993187fb44b4ef79bf19681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45c226de4559687f993187fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 01:06:30 2010 +0200 d3dx9_36/tests: Remove variable scaling which is not really used from D3DXMatrixTest. --- dlls/d3dx9_36/tests/math.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 832798f..6d192f9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -236,7 +236,7 @@ static void D3DXMatrixTest(void) LPD3DXMATRIX funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; - D3DXVECTOR3 at, axis, eye, last, scaling; + D3DXVECTOR3 at, axis, eye, last; D3DXVECTOR4 light; BOOL expected, got; FLOAT angle, determinant, expectedfloat, gotfloat; @@ -264,7 +264,6 @@ static void D3DXMatrixTest(void) axis.x = 1.0f; axis.y = -3.0f; axis.z = 7.0f; eye.x = 8.0f; eye.y = -5.0f; eye.z = 5.75f; last.x = 9.7f; last.y = -8.6; last.z = 1.3f; - scaling.x = 0.03f; scaling.y =0.05f; scaling.z = 0.06f; light.x = 9.6f; light.y = 8.5f; light.z = 7.4; light.w = 6.3;

1 0

Gerald Pfeifer : winefile: Remove variable hChildClass which is not really used from InitInstance.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 7b252d6edb7db11f745b307daa5f44ea1725492d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b252d6edb7db11f745b307da… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 22:30:39 2010 +0200 winefile: Remove variable hChildClass which is not really used from InitInstance. --- programs/winefile/winefile.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index b63144c..c150c9a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4505,7 +4505,6 @@ static void InitInstance(HINSTANCE hinstance) WNDCLASSEXW wcFrame; WNDCLASSW wcChild; - ATOM hChildClass; int col; INITCOMMONCONTROLSEX icc = { @@ -4551,7 +4550,7 @@ static void InitInstance(HINSTANCE hinstance) wcChild.lpszMenuName = 0; wcChild.lpszClassName = sWINEFILETREE; - hChildClass = RegisterClassW(&wcChild); + RegisterClassW(&wcChild); Globals.haccel = LoadAcceleratorsW(hinstance, MAKEINTRESOURCEW(IDA_WINEFILE));

1 0

Gerald Pfeifer : shell32/tests: Remove variable res which is not really used from init_strings.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 3a8862355389e6bf1226e134d4fcf2d0b8e28d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8862355389e6bf1226e134d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 23:38:35 2010 +0200 shell32/tests: Remove variable res which is not really used from init_strings. --- dlls/shell32/tests/progman_dde.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 333e1f1..d7bf432 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -149,7 +149,6 @@ static void init_strings(void) { HKEY key; DWORD size; - LONG res; /* Older Win9x and NT4 */ @@ -162,7 +161,7 @@ static void init_strings(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); size = sizeof(commonprograms); - res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); + RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); RegCloseKey(key); }

1 0

Gerald Pfeifer : taskmgr: Remove variable idctrl which is not really used from TaskManagerWndProc.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 11bbb0f0100976bba287b14d72ae0c74e6dcf342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bbb0f0100976bba287b14d7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 22:00:24 2010 +0200 taskmgr: Remove variable idctrl which is not really used from TaskManagerWndProc. --- programs/taskmgr/taskmgr.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 5958d5c..a9c6278 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -777,7 +777,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) PAINTSTRUCT ps; LPRECT pRC; RECT rc; - int idctrl; LPNMHDR pnmh; WINDOWPLACEMENT wp; @@ -960,7 +959,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_NOTIFY: - idctrl = (int)wParam; pnmh = (LPNMHDR)lParam; if ((pnmh->hwndFrom == hTabWnd) && (pnmh->idFrom == IDC_TAB) &&

1 0

Gerald Pfeifer : quartz: Remove variable keyframe which is not really used from AVISplitter_next_request .
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: af72df259ef32f84746b48cdb1b5c2b63b98a21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af72df259ef32f84746b48cdb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 01:00:51 2010 +0200 quartz: Remove variable keyframe which is not really used from AVISplitter_next_request. --- dlls/quartz/avisplit.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d1d3426..3d567d2 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -206,7 +206,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe { DWORD flags = This->oldindex->aIndex[stream->pos].dwFlags; DWORD size = This->oldindex->aIndex[stream->pos].dwSize; - BOOL keyframe; /* End of file */ if (stream->index) @@ -216,8 +215,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe return S_FALSE; } - keyframe = !!(flags & AVIIF_KEYFRAME); - rtSampleStart = MEDIATIME_FROM_BYTES(This->offset); rtSampleStart += MEDIATIME_FROM_BYTES(This->oldindex->aIndex[stream->pos].dwOffset); rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(size);

1 0