August 2009 - Wine-Commits - list.winehq.org

Nicolas Le Cam : kernel32/tests: Skip GetVolumeInformation test on current directory when running on a root directory .
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 5e58b29cfec3a9a34ecdae90defc088953edad26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e58b29cfec3a9a34ecdae90d… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Jul 13 20:13:54 2009 +0200 kernel32/tests: Skip GetVolumeInformation test on current directory when running on a root directory. --- dlls/kernel32/tests/volume.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 09aa4b3..f569247 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -322,16 +322,21 @@ static void test_GetVolumeInformationA(void) ret = pGetVolumeNameForVolumeMountPointA(Root_Dir1, volume, MAX_PATH); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); - /* **** now start the tests **** */ - /* check for error on no trailing \ */ - ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, - NULL, NULL, fs_name_buf, fs_name_len); - ok(!ret && GetLastError() == ERROR_INVALID_NAME, - "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError()); - result = GetCurrentDirectory(MAX_PATH, currentdir); ok(result, "GetCurrentDirectory: error %d\n", GetLastError()); + /* **** now start the tests **** */ + /* check for error on no trailing \ */ + if (result > 3) + { + ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, + NULL, NULL, fs_name_buf, fs_name_len); + ok(!ret && GetLastError() == ERROR_INVALID_NAME, + "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError()); + } + else + skip("Running on a root directory\n"); + /* check for error on no trailing \ when current dir is root dir */ ret = SetCurrentDirectory(Root_Dir1); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError());

1 0

Nicolas Le Cam : kernel32/tests: Test GetVolumeInformation when current directory is a root directory.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 1975ba276f094b789c6e0bc4c8ab5568e4fec397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1975ba276f094b789c6e0bc4c… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Jul 13 20:09:37 2009 +0200 kernel32/tests: Test GetVolumeInformation when current directory is a root directory. --- dlls/kernel32/tests/volume.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 4f8c1c0..09aa4b3 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -299,6 +299,7 @@ static void test_GetVolumeInformationA(void) DWORD vol_name_size=MAX_PATH+1, vol_serial_num=-1, max_comp_len=0, fs_flags=0, fs_name_len=MAX_PATH+1; char vol_name_buf[MAX_PATH+1], fs_name_buf[MAX_PATH+1]; char windowsdir[MAX_PATH+10]; + char currentdir[MAX_PATH+1]; if (!pGetVolumeInformationA) { win_skip("GetVolumeInformationA not found\n"); @@ -328,6 +329,29 @@ static void test_GetVolumeInformationA(void) ok(!ret && GetLastError() == ERROR_INVALID_NAME, "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError()); + result = GetCurrentDirectory(MAX_PATH, currentdir); + ok(result, "GetCurrentDirectory: error %d\n", GetLastError()); + + /* check for error on no trailing \ when current dir is root dir */ + ret = SetCurrentDirectory(Root_Dir1); + ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); + ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, + NULL, NULL, fs_name_buf, fs_name_len); + todo_wine + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + + /* check for error on no trailing \ when current dir is windows dir */ + ret = SetCurrentDirectory(windowsdir); + ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); + ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, + NULL, NULL, fs_name_buf, fs_name_len); + ok(!ret && GetLastError() == ERROR_INVALID_NAME, + "GetVolumeInformationA did not fail, last error %u\n", GetLastError()); + + /* reset current directory */ + ret = SetCurrentDirectory(currentdir); + ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); + /* try null root directory to return "root of the current directory" */ ret = pGetVolumeInformationA(NULL, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len);

1 0

Nikolay Sivov : gdiplus: Correctly forward to GdipAddPathPie.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: c562d444f5c33fac6060ddf0a481fa51701ea22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c562d444f5c33fac6060ddf0a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 3 12:24:31 2009 +0400 gdiplus: Correctly forward to GdipAddPathPie. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 1375cc3..94e17dd 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -775,7 +775,7 @@ GpStatus WINGDIPAPI GdipAddPathPieI(GpPath *path, INT x, INT y, INT width, INT h TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", path, x, y, width, height, startAngle, sweepAngle); - return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); + return GdipAddPathPie(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); } GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count)

1 0

Nikolay Sivov : comctl32/listview: Offset every but LVIR_BOUNDS rectangles to column bound in details view.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: ebdf2fd254b877b05b1d3b1a607c1ba5684a03be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebdf2fd254b877b05b1d3b1a6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 3 02:32:37 2009 +0400 comctl32/listview: Offset every but LVIR_BOUNDS rectangles to column bound in details view. --- dlls/comctl32/listview.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 59f70a2..ea96b8a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6258,6 +6258,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT BOOL doLabel = TRUE, oversizedBox = FALSE; POINT Position, Origin; LVITEMW lvItem; + LONG mode; TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc); @@ -6294,6 +6295,8 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && lprc->left == LVIR_SELECTBOUNDS) lprc->left = LVIR_BOUNDS; + + mode = lprc->left; switch(lprc->left) { case LVIR_ICON: @@ -6318,7 +6321,13 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT } if (infoPtr->uView == LV_VIEW_DETAILS) - OffsetRect(lprc, Origin.x, Position.y + Origin.y); + { + if (mode != LVIR_BOUNDS) + OffsetRect(lprc, Origin.x + LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, + Position.y + Origin.y); + else + OffsetRect(lprc, Origin.x, Position.y + Origin.y); + } else OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y);

1 0

Nikolay Sivov : comctl32/listview: Don' t offset to column bound calculating LVIR_LABEL for items.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 021410cf0e07b64f9347d3100f589b71d5e75ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=021410cf0e07b64f9347d3100… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 3 02:15:10 2009 +0400 comctl32/listview: Don't offset to column bound calculating LVIR_LABEL for items. --- dlls/comctl32/listview.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0713308..59f70a2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -319,7 +319,7 @@ typedef struct tagLISTVIEW_INFO */ /* How many we debug buffer to allocate */ #define DEBUG_BUFFERS 20 -/* The size of a single debug bbuffer */ +/* The size of a single debug buffer */ #define DEBUG_BUFFER_SIZE 256 /* Internal interface to LISTVIEW_HScroll and LISTVIEW_VScroll */ @@ -2202,7 +2202,12 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW Label.right = Box.right; if (infoPtr->uView == LV_VIEW_DETAILS) { - if (lpLVItem->iSubItem == 0) Label = lpColumnInfo->rcHeader; + if (lpLVItem->iSubItem == 0) + { + /* we need a zero based rect here */ + Label = lpColumnInfo->rcHeader; + OffsetRect(&Label, -Label.left, 0); + } } if (lpLVItem->iSubItem || ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && infoPtr->uView == LV_VIEW_DETAILS)) @@ -2267,7 +2272,8 @@ calc_label: { Label.left = Icon.right; Label.top = Box.top; - Label.right = lpColumnInfo->rcHeader.right; + Label.right = lpLVItem->iSubItem ? lpColumnInfo->rcHeader.right : + lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left; Label.bottom = Label.top + infoPtr->nItemHeight; } else /* LV_VIEW_SMALLICON or LV_VIEW_LIST */

1 0

Nikolay Sivov : comctl32/treeview: Correct define name.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: ba65d634e69ba89599b43943677f144a908672f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba65d634e69ba89599b439436… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 3 01:56:35 2009 +0400 comctl32/treeview: Correct define name. --- dlls/comctl32/tests/treeview.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 73b34e4..d0767f3 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -35,7 +35,7 @@ const char *TEST_CALLBACK_TEXT = "callback_text"; #define NUM_MSG_SEQUENCES 1 -#define LISTVIEW_SEQ_INDEX 0 +#define TREEVIEW_SEQ_INDEX 0 static struct msg_sequence *MsgSequences[NUM_MSG_SEQUENCES]; @@ -608,61 +608,61 @@ static void TestGetSet(void) /* TVM_GETBKCOLOR and TVM_SETBKCOLOR */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetBkColor(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetBkColorSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetBkColorSeq, "TestGetSetBkColor", FALSE); /* TVM_GETIMAGELIST and TVM_SETIMAGELIST */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetImageList(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetImageListSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetImageListSeq, "TestGetImageList", FALSE); /* TVM_SETINDENT and TVM_GETINDENT */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetIndent(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetIndentSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetIndentSeq, "TestGetSetIndent", FALSE); /* TVM_GETINSERTMARKCOLOR and TVM_GETINSERTMARKCOLOR */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetInsertMarkColor(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetInsertMarkColorSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetInsertMarkColorSeq, "TestGetSetInsertMarkColor", FALSE); /* TVM_GETITEM and TVM_SETITEM */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetItem(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetItemSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetItemSeq, "TestGetSetItem", FALSE); /* TVM_GETITEMHEIGHT and TVM_SETITEMHEIGHT */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetItemHeight(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetItemHeightSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetItemHeightSeq, "TestGetSetItemHeight", FALSE); /* TVM_GETSCROLLTIME and TVM_SETSCROLLTIME */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetScrollTime(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetScrollTimeSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetScrollTimeSeq, "TestGetSetScrollTime", FALSE); /* TVM_GETTEXTCOLOR and TVM_SETTEXTCOLOR */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetTextColor(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetTextColorSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetTextColorSeq, "TestGetSetTextColor", FALSE); /* TVM_GETTOOLTIPS and TVM_SETTOOLTIPS */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetToolTips(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetToolTipsSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetToolTipsSeq, "TestGetSetToolTips", TRUE); /* TVM_GETUNICODEFORMAT and TVM_SETUNICODEFORMAT */ flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); TestGetSetUnicodeFormat(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, TestGetSetUnicodeFormatSeq, + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, TestGetSetUnicodeFormatSeq, "TestGetSetUnicodeFormat", FALSE); } @@ -679,7 +679,7 @@ static LRESULT WINAPI TreeviewWndProc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - add_message(MsgSequences, LISTVIEW_SEQ_INDEX, &msg); + add_message(MsgSequences, TREEVIEW_SEQ_INDEX, &msg); defwndproc_counter++; ret = CallWindowProcA(lpOldProc, hwnd, message, wParam, lParam); @@ -865,23 +865,23 @@ START_TEST(treeview) flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); FillRoot(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, FillRootSeq, "FillRoot", FALSE); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, FillRootSeq, "FillRoot", FALSE); flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoTest1(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, DoTest1Seq, "DoTest1", FALSE); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest1Seq, "DoTest1", FALSE); flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoTest2(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, DoTest2Seq, "DoTest2", FALSE); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest2Seq, "DoTest2", FALSE); flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoTest3(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, DoTest3Seq, "DoTest3", FALSE); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest3Seq, "DoTest3", FALSE); flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoFocusTest(); - ok_sequence(MsgSequences, LISTVIEW_SEQ_INDEX, DoFocusTestSeq, "DoFocusTest", TRUE); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoFocusTestSeq, "DoFocusTest", TRUE); /* Sequences tested inside due to number */ TestGetSet();

1 0

Nikolay Sivov : comctl32/comboex: Use const pointer when possible.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: cbb8d4567e20b38b38bc98cda7b9cf37556fbc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb8d4567e20b38b38bc98cda… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 3 01:54:37 2009 +0400 comctl32/comboex: Use const pointer when possible. --- dlls/comctl32/comboex.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 2156896..1484ba8 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -174,7 +174,7 @@ static void COMBOEX_DumpInput (COMBOBOXEXITEMW const *input) } -static inline CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index) +static inline CBE_ITEMDATA *get_item_data(const COMBOEX_INFO *infoPtr, INT index) { return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA, (WPARAM)index, 0); @@ -185,7 +185,7 @@ static inline cmp_func_t get_cmp_func(COMBOEX_INFO const *infoPtr) return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW; } -static INT COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr) +static INT COMBOEX_Notify (const COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr) { hdr->idFrom = GetDlgCtrlID (infoPtr->hwndSelf); hdr->hwndFrom = infoPtr->hwndSelf; @@ -198,7 +198,7 @@ static INT COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr) static INT -COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, UINT code, NMCOMBOBOXEXW *hdr) +COMBOEX_NotifyItem (const COMBOEX_INFO *infoPtr, UINT code, NMCOMBOBOXEXW *hdr) { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) @@ -234,7 +234,7 @@ COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, UINT code, NMCOMBOBOXEXW *hdr) } -static INT COMBOEX_NotifyEndEdit (COMBOEX_INFO *infoPtr, NMCBEENDEDITW *neew, LPCWSTR wstr) +static INT COMBOEX_NotifyEndEdit (const COMBOEX_INFO *infoPtr, NMCBEENDEDITW *neew, LPCWSTR wstr) { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) { @@ -254,7 +254,7 @@ static INT COMBOEX_NotifyEndEdit (COMBOEX_INFO *infoPtr, NMCBEENDEDITW *neew, LP } -static void COMBOEX_NotifyDragBegin(COMBOEX_INFO *infoPtr, LPCWSTR wstr) +static void COMBOEX_NotifyDragBegin(const COMBOEX_INFO *infoPtr, LPCWSTR wstr) { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) { @@ -303,7 +303,7 @@ static INT COMBOEX_GetIndex(COMBOEX_INFO const *infoPtr, CBE_ITEMDATA const *ite } -static LPCWSTR COMBOEX_GetText(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) +static LPCWSTR COMBOEX_GetText(const COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) { NMCOMBOBOXEXW nmce; LPWSTR text, buf; @@ -340,7 +340,7 @@ static LPCWSTR COMBOEX_GetText(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) } -static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size) +static void COMBOEX_GetComboFontSize (const COMBOEX_INFO *infoPtr, SIZE *size) { static const WCHAR strA[] = { 'A', 0 }; HFONT nfont, ofont; @@ -385,7 +385,7 @@ static void COMBOEX_CopyItem (const CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit) } -static void COMBOEX_AdjustEditPos (COMBOEX_INFO *infoPtr) +static void COMBOEX_AdjustEditPos (const COMBOEX_INFO *infoPtr) { SIZE mysize; INT x, y, w, h, xioff; @@ -419,7 +419,7 @@ static void COMBOEX_AdjustEditPos (COMBOEX_INFO *infoPtr) } -static void COMBOEX_ReSize (COMBOEX_INFO *infoPtr) +static void COMBOEX_ReSize (const COMBOEX_INFO *infoPtr) { SIZE mysize; LONG cy; @@ -452,7 +452,7 @@ static void COMBOEX_ReSize (COMBOEX_INFO *infoPtr) } -static void COMBOEX_SetEditText (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) +static void COMBOEX_SetEditText (const COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) { if (!infoPtr->hwndEdit) return; /* native issues the following messages to the {Edit} control */ @@ -500,7 +500,7 @@ static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO const *infoPtr) /* *** CBEM_xxx message support *** */ -static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) +static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) { CBE_ITEMDATA *item; LPCWSTR str; @@ -527,7 +527,7 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) } -static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) +static INT COMBOEX_DeleteItem (const COMBOEX_INFO *infoPtr, INT_PTR index) { TRACE("(index=%ld)\n", index); @@ -763,7 +763,7 @@ static HIMAGELIST COMBOEX_SetImageList (COMBOEX_INFO *infoPtr, HIMAGELIST himl) return himlTemp; } -static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -814,7 +814,7 @@ static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) return TRUE; } -static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) +static BOOL COMBOEX_SetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -851,7 +851,7 @@ static BOOL COMBOEX_SetUnicodeFormat (COMBOEX_INFO *infoPtr, BOOL value) /* *** CB_xxx message support *** */ static INT -COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) +COMBOEX_FindStringExact (const COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) { INT i; cmp_func_t cmptext = get_cmp_func(infoPtr); @@ -872,7 +872,7 @@ COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) } -static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT_PTR index) +static DWORD_PTR COMBOEX_GetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA const *item1; CBE_ITEMDATA const *item2; @@ -912,7 +912,7 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT_PTR index) } -static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) +static DWORD_PTR COMBOEX_SetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) { CBE_ITEMDATA *item1; CBE_ITEMDATA const *item2; @@ -1334,7 +1334,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const } -static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) +static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) { static const WCHAR nil[] = { 0 }; CBE_ITEMDATA *item = 0; @@ -1671,7 +1671,7 @@ static LRESULT COMBOEX_Size (COMBOEX_INFO *infoPtr, INT width, INT height) } -static LRESULT COMBOEX_SetRedraw(COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +static LRESULT COMBOEX_SetRedraw(const COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { LRESULT ret = DefWindowProcW( infoPtr->hwndSelf, WM_SETREDRAW, wParam, lParam ); if (wParam) RedrawWindow( infoPtr->hwndSelf, NULL, 0, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN ); @@ -1679,7 +1679,7 @@ static LRESULT COMBOEX_SetRedraw(COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lP } -static LRESULT COMBOEX_WindowPosChanging (COMBOEX_INFO *infoPtr, WINDOWPOS *wp) +static LRESULT COMBOEX_WindowPosChanging (const COMBOEX_INFO *infoPtr, WINDOWPOS *wp) { RECT cbx_wrect, cbx_crect, cb_wrect; INT width, height;

1 0

Aled Hughes : comctl32/toolbar: Avoid unnecessary invalidation on TB_HIDEBUTTON.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 85abd4c3cfdc21dd614b00bc02697610c13d9651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85abd4c3cfdc21dd614b00bc0… Author: Aled Hughes <winehq(a)aledhughes.co.uk> Date: Mon Aug 3 01:52:51 2009 +0400 comctl32/toolbar: Avoid unnecessary invalidation on TB_HIDEBUTTON. --- dlls/comctl32/toolbar.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0d11b2b..d95dc7d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3633,6 +3633,7 @@ static LRESULT TOOLBAR_HideButton (TOOLBAR_INFO *infoPtr, INT Id, BOOL fHide) { TBUTTON_INFO *btnPtr; + BYTE oldState; INT nIndex; TRACE("\n"); @@ -3642,15 +3643,17 @@ TOOLBAR_HideButton (TOOLBAR_INFO *infoPtr, INT Id, BOOL fHide) return FALSE; btnPtr = &infoPtr->buttons[nIndex]; + oldState = btnPtr->fsState; if (fHide) btnPtr->fsState |= TBSTATE_HIDDEN; else btnPtr->fsState &= ~TBSTATE_HIDDEN; - TOOLBAR_LayoutToolbar (infoPtr); - - InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); + if (oldState != btnPtr->fsState) { + TOOLBAR_LayoutToolbar (infoPtr); + InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); + } return TRUE; }

1 0

Nikolay Sivov : comctl32/listview: Fix some test failures on comctl32 4.7x.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 86b480b8285113a4cf54a40a8a3cfcd227cc92f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b480b8285113a4cf54a40a8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 3 01:44:31 2009 +0400 comctl32/listview: Fix some test failures on comctl32 4.7x. --- dlls/comctl32/tests/listview.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 888b323..4ac14d5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -267,14 +267,18 @@ static const struct message getitemposition_seq2[] = { static const struct message editbox_create_pos[] = { /* sequence sent after LVN_BEGINLABELEDIT */ + /* next two are 4.7x specific */ { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGED, sent|optional }, + + { WM_WINDOWPOSCHANGING, sent|optional }, { WM_NCCALCSIZE, sent }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, - /* the rest is todo */ - { WM_WINDOWPOSCHANGING, sent }, - { WM_WINDOWPOSCHANGED, sent }, + /* the rest is todo, skipped in 4.7x */ + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|optional }, { 0 } }; @@ -3440,7 +3444,7 @@ static void test_editbox(void) ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); /* testing only sizing messages */ ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos, - "edit box create - sizing", TRUE); + "edit box create - sizing", FALSE); DestroyWindow(hwnd); }

1 0

Henri Verbeet : user32: Send 0 as LPARAM for SIZE_MINIMIZED WM_SIZE messages.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: b31f0f24ffd62062608ac0fa5bd7896fa8c36b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31f0f24ffd62062608ac0fa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:53 2009 +0200 user32: Send 0 as LPARAM for SIZE_MINIMIZED WM_SIZE messages. --- dlls/user32/defwnd.c | 13 +++++++++---- dlls/user32/tests/msg.c | 22 +++++++++++----------- dlls/user32/winpos.c | 10 +++++++--- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 19d6ab2..39e27b3 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -66,11 +66,16 @@ static void DEFWND_HandleWindowPosChanged( HWND hwnd, const WINDOWPOS *winpos ) if (!(winpos->flags & SWP_NOCLIENTSIZE) || (winpos->flags & SWP_STATECHANGED)) { - WPARAM wp = SIZE_RESTORED; - if (IsZoomed(hwnd)) wp = SIZE_MAXIMIZED; - else if (IsIconic(hwnd)) wp = SIZE_MINIMIZED; + if (IsIconic( hwnd )) + { + SendMessageW( hwnd, WM_SIZE, SIZE_MINIMIZED, 0 ); + } + else + { + WPARAM wp = IsZoomed( hwnd ) ? SIZE_MAXIMIZED : SIZE_RESTORED; - SendMessageW( hwnd, WM_SIZE, wp, MAKELONG(rect.right-rect.left, rect.bottom-rect.top) ); + SendMessageW( hwnd, WM_SIZE, wp, MAKELONG(rect.right-rect.left, rect.bottom-rect.top) ); + } } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e2789ce..30acaa2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -581,7 +581,7 @@ static const struct message WmShowMinOverlappedSeq[] = { { WM_GETTEXT, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { WM_NCCALCSIZE, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, @@ -1004,7 +1004,7 @@ static const struct message WmShowChildInvisibleParentSeq_1[] = { { WM_CHILDACTIVATE, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ @@ -1044,7 +1044,7 @@ static const struct message WmShowChildInvisibleParentSeq_3[] = { { WM_CHILDACTIVATE, sent }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ @@ -1065,7 +1065,7 @@ static const struct message WmShowChildInvisibleParentSeq_4[] = { { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ @@ -3186,7 +3186,7 @@ static const struct message WmMinimizeMDIchildVisibleSeq[] = { { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOCLIENTSIZE|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { WM_CHILDACTIVATE, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ @@ -10254,7 +10254,7 @@ static const struct message WmShowMinimized_1[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinimize_1[] = { @@ -10264,7 +10264,7 @@ static const struct message WmMinimize_1[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinimize_2[] = { @@ -10273,7 +10273,7 @@ static const struct message WmMinimize_2[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinimize_3[] = { @@ -10281,7 +10281,7 @@ static const struct message WmMinimize_3[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmShowMinNoActivate[] = { @@ -10289,7 +10289,7 @@ static const struct message WmShowMinNoActivate[] = { { WM_WINDOWPOSCHANGING, sent }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc|optional, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinMax_1[] = { @@ -10315,7 +10315,7 @@ static const struct message WmMinMax_3[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MINIMIZED }, + { WM_SIZE, sent|wparam|lparam|defwinproc|optional, SIZE_MINIMIZED, 0 }, { 0 } }; static const struct message WmMinMax_4[] = { diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 7f18da5..8aeecc2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1077,14 +1077,18 @@ static BOOL show_window( HWND hwnd, INT cmd ) /* should happen only in CreateWindowEx() */ int wParam = SIZE_RESTORED; RECT client = wndPtr->rectClient; + LPARAM lparam = MAKELONG( client.right - client.left, client.bottom - client.top ); wndPtr->flags &= ~WIN_NEED_SIZE; if (wndPtr->dwStyle & WS_MAXIMIZE) wParam = SIZE_MAXIMIZED; - else if (wndPtr->dwStyle & WS_MINIMIZE) wParam = SIZE_MINIMIZED; + else if (wndPtr->dwStyle & WS_MINIMIZE) + { + wParam = SIZE_MINIMIZED; + lparam = 0; + } WIN_ReleasePtr( wndPtr ); - SendMessageW( hwnd, WM_SIZE, wParam, - MAKELONG( client.right - client.left, client.bottom - client.top )); + SendMessageW( hwnd, WM_SIZE, wParam, lparam ); SendMessageW( hwnd, WM_MOVE, 0, MAKELONG( client.left, client.top )); } else WIN_ReleasePtr( wndPtr );

1 0