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

Gerald Pfeifer : gdi32/tests: Remove two variables which are not really used from test_clipping.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: fcf831aceffed81c983b14b7552f9db4f39e070a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf831aceffed81c983b14b75… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 22:50:45 2010 +0200 gdi32/tests: Remove two variables which are not really used from test_clipping. --- dlls/gdi32/tests/bitmap.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 882d548..d94239f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2810,9 +2810,7 @@ static void test_GdiAlphaBlend(void) static void test_clipping(void) { HBITMAP bmpDst; - HBITMAP oldDst; HBITMAP bmpSrc; - HBITMAP oldSrc; HRGN hRgn; LPVOID bits; BOOL result; @@ -2830,11 +2828,11 @@ static void test_clipping(void) bmpDst = CreateDIBSection( hdcDst, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(bmpDst != NULL, "Couldn't create destination bitmap\n"); - oldDst = SelectObject( hdcDst, bmpDst ); + SelectObject( hdcDst, bmpDst ); bmpSrc = CreateDIBSection( hdcSrc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldSrc = SelectObject( hdcSrc, bmpSrc ); + SelectObject( hdcSrc, bmpSrc ); result = BitBlt( hdcDst, 0, 0, 100, 100, hdcSrc, 100, 100, SRCCOPY ); ok(result, "BitBlt failed\n");

1 0

Gerald Pfeifer : cmd: Remove variable copyFromDir which is not really used from WCMD_copy.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 0d527532face4cd5a1922b222555dcef53cb7ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d527532face4cd5a1922b222… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:59:08 2010 +0200 cmd: Remove variable copyFromDir which is not really used from WCMD_copy. --- programs/cmd/builtins.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0573114..7a4f9a1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -175,7 +175,6 @@ void WCMD_copy (void) { DWORD len; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; BOOL copyToDir = FALSE; - BOOL copyFromDir = FALSE; WCHAR srcspec[MAX_PATH]; DWORD attribs; WCHAR drive[10]; @@ -204,7 +203,6 @@ void WCMD_copy (void) { /* If a directory, then add \* on the end when searching */ if (attribs & FILE_ATTRIBUTE_DIRECTORY) { strcatW(srcpath, slashW); - copyFromDir = TRUE; strcatW(srcspec, slashW); strcatW(srcspec, starW); } else {

1 0

Gerald Pfeifer : comctl32/tests: Add tests for the return values of TreeView_SelectItem in test_select.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 3ff0890c117599d660c0608db5df1ede8ce5aa96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff0890c117599d660c0608db… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:57:20 2010 +0200 comctl32/tests: Add tests for the return values of TreeView_SelectItem in test_select. --- dlls/comctl32/tests/treeview.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 953b54a..848d4ca 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -388,17 +388,23 @@ static void test_select(void) /* root-none select tests */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); r = TreeView_SelectItem(hTree, NULL); + expect(TRUE, r); Clear(); AddItem('1'); r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); AddItem('2'); r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); AddItem('3'); r = TreeView_SelectItem(hTree, NULL); + expect(TRUE, r); AddItem('4'); r = TreeView_SelectItem(hTree, NULL); + expect(TRUE, r); AddItem('5'); r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n"); ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, rootnone_select_seq, @@ -407,17 +413,24 @@ static void test_select(void) /* root-child select tests */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); r = TreeView_SelectItem(hTree, NULL); + expect(TRUE, r); + Clear(); AddItem('1'); r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); AddItem('2'); r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); AddItem('3'); r = TreeView_SelectItem(hTree, hChild); + expect(TRUE, r); AddItem('4'); r = TreeView_SelectItem(hTree, hChild); + expect(TRUE, r); AddItem('5'); r = TreeView_SelectItem(hTree, hRoot); + expect(TRUE, r); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, rootchild_select_seq,

1 0

Gerald Pfeifer : msi: Fix the return value of msi_copy_outval in the error case.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: acd9732ffe49b6b846dbefb7a514a0638ae7f00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd9732ffe49b6b846dbefb7a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:22:34 2010 +0200 msi: Fix the return value of msi_copy_outval in the error case. --- dlls/msi/msi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 646963d..3170e6d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1216,7 +1216,7 @@ done: static UINT msi_copy_outval(LPWSTR val, LPWSTR out, LPDWORD size) { - UINT r; + UINT r = ERROR_SUCCESS; if (!val) return ERROR_UNKNOWN_PROPERTY; @@ -1236,7 +1236,7 @@ static UINT msi_copy_outval(LPWSTR val, LPWSTR out, LPDWORD size) if (size) *size = lstrlenW(val); - return ERROR_SUCCESS; + return r; } UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,

1 0

Piotr Caban : msvcrt: Fix synonym handling in setlocale/create_locale.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 130686cbfca578baa233669559c42e8f0ce0ee8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=130686cbfca578baa23366955… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 9 23:39:17 2010 +0200 msvcrt: Fix synonym handling in setlocale/create_locale. --- dlls/msvcrt/locale.c | 101 ++++++++++++++++++++++++------------------- dlls/msvcrt/tests/locale.c | 84 ++++++++++++++++-------------------- 2 files changed, 93 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=130686cbfca578baa2336…

1 0

Gerald Pfeifer : riched20: Remove variable pCell which is not really used from ME_StreamIn.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 6dd4b071ccfbe41fc883bce5f3d49b466ea53ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd4b071ccfbe41fc883bce5f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:42:04 2010 +0200 riched20: Remove variable pCell which is not really used from ME_StreamIn. --- dlls/riched20/editor.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7a11647..531fae1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1495,7 +1495,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre { /* Delete any incomplete table row at the end of the rich text. */ int nOfs, nChars; - ME_DisplayItem *pCell; ME_DisplayItem *para; parser.rtfMinor = rtfRow; @@ -1515,7 +1514,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre assert(para->member.para.nFlags & MEPF_ROWEND); para = para->member.para.next_para; } - pCell = para->member.para.pCell; editor->pCursors[1].pPara = para; editor->pCursors[1].pRun = ME_FindItemFwd(para, diRun);

1 0

Gerald Pfeifer : riched20: Remove variable ys which is not really used from ME_ArrowPageDown.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 2d462ad0881800ddb50f82a2cacb839ad956239b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d462ad0881800ddb50f82a2c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:32:26 2010 +0200 riched20: Remove variable ys which is not really used from ME_ArrowPageDown. --- dlls/riched20/caret.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 29ff5a6..930fb14 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1415,7 +1415,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) } else { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *p; - int ys, yd, yp; + int yd, yp; int yOldScrollPos = editor->vert_si.nPos; if (!pCursor->nOffset && editor->bCaretAtEnd) @@ -1424,7 +1424,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) p = ME_FindItemBack(pRun, diStartRowOrParagraph); assert(p->type == diStartRow); yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - ys = y = yp + p->member.row.pt.y; + y = yp + p->member.row.pt.y; /* For native richedit controls: * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us

1 0

Gerald Pfeifer : gdi32/tests: Remove variable oldPen which is not really used from test_widenpath.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 4339944fae9608f585d03a388332bbe9a94a7fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4339944fae9608f585d03a388… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:06:58 2010 +0200 gdi32/tests: Remove variable oldPen which is not really used from test_widenpath. --- dlls/gdi32/tests/path.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 43f3d62..9fe6f43 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -37,13 +37,12 @@ static void test_widenpath(void) { HDC hdc = GetDC(0); HPEN greenPen, narrowPen; - HPEN oldPen; POINT pnt[6]; INT nSize, ret; /* Create a pen to be used in WidenPath */ greenPen = CreatePen(PS_SOLID, 10, RGB(0,0,0)); - oldPen = SelectObject(hdc, greenPen); + SelectObject(hdc, greenPen); /* Prepare a path */ pnt[0].x = 100; @@ -85,7 +84,7 @@ static void test_widenpath(void) /* Test when the pen width is equal to 1. The path should change too */ narrowPen = CreatePen(PS_SOLID, 1, RGB(0,0,0)); - oldPen = SelectObject(hdc, narrowPen); + SelectObject(hdc, narrowPen); BeginPath(hdc); Polyline(hdc, pnt, 6); EndPath(hdc);

1 0

Gerald Pfeifer : user.exe16: Remove variable width which is not really used from listbox_proc16.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: cbbfbca9e46f3ee958b6004db13bedb9d1b13fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbbfbca9e46f3ee958b6004db… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:44:33 2010 +0200 user.exe16: Remove variable width which is not really used from listbox_proc16. --- dlls/user.exe16/message.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 547933c..c642e85 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2403,7 +2403,7 @@ static LRESULT listbox_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if (is_old_app( hwnd )) { DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - int width, height, remaining, item_height; + int height, remaining, item_height; RECT rect; /* give a margin for error to old 16 bits programs - if we need @@ -2413,7 +2413,6 @@ static LRESULT listbox_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if (!(style & LBS_NOINTEGRALHEIGHT) && !(style & LBS_OWNERDRAWVARIABLE)) { GetClientRect( hwnd, &rect ); - width = rect.right - rect.left; height = rect.bottom - rect.top; item_height = wow_handlers32.listbox_proc( hwnd, LB_GETITEMHEIGHT, 0, 0, FALSE ); remaining = item_height ? (height % item_height) : 0;

1 0

Piotr Caban : msvcrt: Partial fix for setlocale/create_locale.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 0697c5dc0eb7d88df4d941f920a901d3570dfaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0697c5dc0eb7d88df4d941f92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 9 23:38:11 2010 +0200 msvcrt: Partial fix for setlocale/create_locale. --- dlls/msvcrt/locale.c | 68 +++++++++++++++++++++++++++++--------------- dlls/msvcrt/tests/locale.c | 56 ++++++++++++++++++------------------ 2 files changed, 73 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0697c5dc0eb7d88df4d94…

1 0