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

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

10 May '10

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 : quartz: Remove variable keyframe which is not really used from AVISplitter_next_request .
by Alexandre Julliard 10 May '10

10 May '10

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

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

10 May '10

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 : gdi32/tests: Remove variable oldPen which is not really used from test_widenpath.
by Alexandre Julliard 10 May '10

10 May '10

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 : msi: Fix the return value of msi_copy_outval in the error case.
by Alexandre Julliard 10 May '10

10 May '10

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

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

10 May '10

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 : riched20: Remove variable pCell which is not really used from ME_StreamIn.
by Alexandre Julliard 10 May '10

10 May '10

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 : user.exe16: Remove variable width which is not really used from listbox_proc16.
by Alexandre Julliard 10 May '10

10 May '10

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

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

10 May '10

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

Sven Baars : wineconsole: Fix Dutch translation.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 194f7318ce4ee7c688fc0b7674c5002222fd78e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194f7318ce4ee7c688fc0b767… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 9 00:38:03 2010 +0200 wineconsole: Fix Dutch translation. --- programs/wineconsole/wineconsole_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/wineconsole_Nl.rc b/programs/wineconsole/wineconsole_Nl.rc index df3556e..c42e80f 100644 --- a/programs/wineconsole/wineconsole_Nl.rc +++ b/programs/wineconsole/wineconsole_Nl.rc @@ -78,7 +78,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Aantal te bewaren opdrachten :", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Verwijderen dubbelen", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Verwijder dubbelen", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -102,7 +102,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Configuratie " FONT 8, "MS Shell Dlg" { - GROUPBOX "Buffer zone", -1, 10, 11, 100, 42, BS_GROUPBOX + GROUPBOX "Bufferzone", -1, 10, 11, 100, 42, BS_GROUPBOX LTEXT "&Breedte :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -118,7 +118,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Programma is ge�indigd", -1, 115, 11, 80, 42, BS_GROUPBOX + GROUPBOX "Programma is be�indigd", -1, 115, 11, 80, 42, BS_GROUPBOX AUTOCHECKBOX "&Console afsluiten", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP GROUPBOX "Versie", -1, 115, 55, 80, 42

1 0