wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Riccardo Bortolato : wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 9621737c8e7ce3c67f998ef096ea321f9ea2f04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9621737c8e7ce3c67f998ef09… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:49 2015 +0200 wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback. Store wined3d_texture and sub_resource in d3d8_volume. Updated the d3d8_volume_LockBox to make use of wined3d_texture_map. Also updated d3d9, d3d11, ddraw callbacks accordingly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/d3d8_private.h | 6 ++++-- dlls/d3d8/device.c | 10 +++++----- dlls/d3d8/volume.c | 11 +++++++---- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 8 ++++---- dlls/d3d9/volume.c | 6 +++--- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 3 ++- 10 files changed, 34 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9621737c8e7ce3c67f998…

1 0

Riccardo Bortolato : wined3d: Introduce new wined3d_texture_(un) map functions.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: eac95d30b66609c5c924ec36b6049e680c63015f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac95d30b66609c5c924ec36b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:48 2015 +0200 wined3d: Introduce new wined3d_texture_(un)map functions. Initial usage in d3d11. Also removed wined3d_volume_from_resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/texture.c | 28 ++++--------------------- dlls/wined3d/texture.c | 47 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 3 ++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 +++- 6 files changed, 59 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eac95d30b66609c5c924e…

1 0

Riccardo Bortolato : wined3d: Pass a wined3d_box to wined3d_surface_map..
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 1d1487105d4d3a9133f0846d32363a0432812d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1487105d4d3a9133f0846d3… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:47 2015 +0200 wined3d: Pass a wined3d_box to wined3d_surface_map.. Introduced a new surface_check_block_align function that accepts a wined3d_box, eventually the old _rect version will be completely replaced. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/surface.c | 9 +++++++- dlls/d3d9/surface.c | 13 ++++++++++- dlls/ddraw/surface.c | 9 +++++++- dlls/wined3d/surface.c | 62 ++++++++++++++++++++++++++++---------------------- include/wine/wined3d.h | 2 +- 5 files changed, 64 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d1487105d4d3a9133f08…

1 0

Dmitry Timoshkov : oleview: Always check return value of SendMessage( TVM_GETITEM).
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 26db80b685e9be1191a892e149ec35bc71404072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26db80b685e9be1191a892e14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:49 2015 +0800 oleview: Always check return value of SendMessage(TVM_GETITEM). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/tree.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 4a16081..decedc4 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -82,7 +82,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) tvis.hParent = item; tvis.hInsertAfter = TVI_LAST; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if (!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) return; if(!tvi.lParam || ((ITEM_INFO *)tvi.lParam)->loaded || !(((ITEM_INFO *)tvi.lParam)->cFlag&SHOWALL)) return; @@ -154,9 +154,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) while(hCur) { tvi.hItem = hCur; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(!tvi.lParam) + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) || !tvi.lParam) { hCur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hCur); @@ -192,9 +190,7 @@ void ReleaseInst(HTREEITEM item) memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(!tvi.lParam) return; + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) || !tvi.lParam) return; pU = ((ITEM_INFO *)tvi.lParam)->pU; @@ -223,18 +219,18 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize) { TVITEMW tvi; int bufLen; - BOOL ret; + BOOL ret = FALSE; memset(buffer, 0, bufSize * sizeof(WCHAR)); memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - ret = (tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGPATH); + if (SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) + ret = (tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGPATH); while(TRUE) { - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) break; if(tvi.lParam && (((ITEM_INFO *)tvi.lParam)->cFlag & (REGPATH|REGTOP))) { @@ -318,7 +314,7 @@ static void AddCOMandAll(void) while(curSearch) { tvi.hItem = curSearch; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) break; if(tvi.lParam && !lstrcmpW(((ITEM_INFO *)tvi.lParam)->info, wszComp)) { @@ -631,15 +627,13 @@ void EmptyTree(void) TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)del); tvi.hItem = del; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(tvi.lParam) + if(SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) && tvi.lParam) { if(((ITEM_INFO *)tvi.lParam)->loaded) ReleaseInst(del); HeapFree(GetProcessHeap(), 0, (ITEM_INFO *)tvi.lParam); - } - SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + } if(!cur) break; }

1 0

Dmitry Timoshkov : oleview: Remove useless check for hPrevInst.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 65187a0b9997a8251b5853e1df9dff418282a42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65187a0b9997a8251b5853e1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:37 2015 +0800 oleview: Remove useless check for hPrevInst. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/oleview.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 5a11888..350f6ad 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -558,12 +558,9 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int { MSG msg; HANDLE hAccelTable; - - if(!hPrevInst) - { - if(!InitApplication(hInst)) - return FALSE; - } + + if(!InitApplication(hInst)) + return FALSE; if(!InitInstance(hInst, nCmdShow)) return FALSE;

1 0

Dmitry Timoshkov : oleview: Correctly set window' s class background and cursor.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: e10db2f22e50b6f575b921f6d3e2d363c2af46b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10db2f22e50b6f575b921f6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:30 2015 +0800 oleview: Correctly set window's class background and cursor. Otherwise background of some windows doesn't match current theme, and mouse cursor sometimes gets stuck after moving over vertical splitter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/details.c | 3 ++- programs/oleview/oleview.c | 1 + programs/oleview/pane.c | 3 ++- programs/oleview/tree.c | 2 ++ programs/oleview/typelib.c | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 9fdd9f3..49d3dc4 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -397,7 +397,8 @@ HWND CreateDetailsWindow(HINSTANCE hInst) memset(&wcd, 0, sizeof(WNDCLASSW)); wcd.lpfnWndProc = DetailsProc; wcd.lpszClassName = wszDetailsClass; - wcd.hbrBackground = (HBRUSH)COLOR_WINDOW; + wcd.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcd.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); if(!RegisterClassW(&wcd)) return NULL; diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 69f4f9e..5a11888 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -499,6 +499,7 @@ static BOOL InitApplication(HINSTANCE hInst) memset(&wc, 0, sizeof(WNDCLASSW)); wc.lpfnWndProc = WndProc; wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MENU); wc.lpszClassName = wszAppName; diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index a96da4d..9e4cd28 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -135,7 +135,8 @@ BOOL PaneRegisterClassW(void) memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = PaneProc; - wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW); + wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcc.lpszClassName = wszPaneClass; if(!RegisterClassW(&wcc)) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 17844bf..4a16081 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -703,6 +703,8 @@ HWND CreateTreeWindow(HINSTANCE hInst) memset(&wct, 0, sizeof(WNDCLASSW)); wct.lpfnWndProc = TreeProc; wct.lpszClassName = wszTreeClass; + wct.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wct.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); if(!RegisterClassW(&wct)) return NULL; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index d07dd3c..3a60348 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1628,6 +1628,7 @@ BOOL TypeLibRegisterClassW(void) memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = TypeLibProc; wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcc.lpszMenuName = MAKEINTRESOURCEW(IDM_TYPELIB); wcc.lpszClassName = wszTypeLib;

1 0

Dmitry Timoshkov : oleview: Fix compilation with PSDK.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: edb35ff096db2b5c4a2c5c5188963a0947f01028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb35ff096db2b5c4a2c5c518… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:23 2015 +0800 oleview: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/oleview.c | 2 +- programs/oleview/typelib.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 3a379b4..69f4f9e 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -422,7 +422,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, sizeof(filter_typelib)/sizeof(WCHAR)); LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); - snprintfW( filter, MAX_PATH, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); + wsprintfW( filter, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); InitOpenFileName(hWnd, &ofn, filter, wszTitle, wszName); if(GetOpenFileNameW(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); break; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 21e9d96..d07dd3c 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "main.h" #include "wine/debug.h"

1 0

Piotr Caban : comctl32: Don' t use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 9c87c7e76dbb860884308c7f609fb3588d3e686d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c87c7e76dbb860884308c7f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 7 10:17:14 2015 +0200 comctl32: Don't use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listview.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c0956ad..a76935a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7851,10 +7851,18 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, item.iItem = nItem; if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) { - item.mask |= LVIF_STATE; - item.stateMask |= LVIS_STATEIMAGEMASK; - item.state &= ~LVIS_STATEIMAGEMASK; - item.state |= INDEXTOSTATEIMAGEMASK(1); + if (item.mask & LVIF_STATE) + { + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } + else + { + item.mask |= LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + } } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo;

1 0

Alex Henrie : comctl32: Remove redundant if (button) statements.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: c565145b0e6b04af591662719c09c2574607df02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c565145b0e6b04af591662719… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:16:24 2015 -0600 comctl32: Remove redundant if (button) statements. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/toolbar.c | 151 ++++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 77 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c777f5b..558bfa1 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5536,95 +5536,92 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); if (button) + { btnPtr = &infoPtr->buttons[nHit]; - if (button && bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) - { - infoPtr->nButtonDrag = nHit; - SetCapture (infoPtr->hwndSelf); - - /* If drag cursor has not been loaded, load it. - * Note: it doesn't need to be freed */ - if (!hCursorDrag) - hCursorDrag = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_MOVEBUTTON); - SetCursor(hCursorDrag); - } - else if (button) - { - RECT arrowRect; - infoPtr->nOldHit = nHit; - - CopyRect(&arrowRect, &btnPtr->rect); - arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); - - /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */ - if ((btnPtr->fsState & TBSTATE_ENABLED) && - ((btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) || - ((btnPtr->fsStyle & BTNS_DROPDOWN) && - ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) || - (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle)))))) - { - LRESULT res; + if (bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) + { + infoPtr->nButtonDrag = nHit; + SetCapture (infoPtr->hwndSelf); + + /* If drag cursor has not been loaded, load it. + * Note: it doesn't need to be freed */ + if (!hCursorDrag) + hCursorDrag = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_MOVEBUTTON); + SetCursor(hCursorDrag); + } + else + { + RECT arrowRect; + infoPtr->nOldHit = nHit; - /* draw in pressed state */ - if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) - btnPtr->fsState |= TBSTATE_PRESSED; - else - btnPtr->bDropDownPressed = TRUE; - RedrawWindow(infoPtr->hwndSelf,&btnPtr->rect,0, - RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW); - - memset(&nmtb, 0, sizeof(nmtb)); - nmtb.iItem = btnPtr->idCommand; - nmtb.rcButton = btnPtr->rect; - res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, - TBN_DROPDOWN); - TRACE("TBN_DROPDOWN responded with %ld\n", res); - - if (res != TBDDRET_TREATPRESSED) + CopyRect(&arrowRect, &btnPtr->rect); + arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); + + /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */ + if ((btnPtr->fsState & TBSTATE_ENABLED) && + ((btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) || + ((btnPtr->fsStyle & BTNS_DROPDOWN) && + ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) || + (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle)))))) { - MSG msg; + LRESULT res; - /* redraw button in unpressed state */ - if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) - btnPtr->fsState &= ~TBSTATE_PRESSED; - else - btnPtr->bDropDownPressed = FALSE; - InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + /* draw in pressed state */ + if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) + btnPtr->fsState |= TBSTATE_PRESSED; + else + btnPtr->bDropDownPressed = TRUE; + RedrawWindow(infoPtr->hwndSelf, &btnPtr->rect, 0, RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW); - /* find and set hot item */ - GetCursorPos(&pt); - ScreenToClient(infoPtr->hwndSelf, &pt); - nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); - if (!infoPtr->bAnchor || button) - TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); - - /* remove any left mouse button down or double-click messages - * so that we can get a toggle effect on the button */ - while (PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDOWN, WM_LBUTTONDOWN, PM_REMOVE) || - PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDBLCLK, WM_LBUTTONDBLCLK, PM_REMOVE)) - ; + memset(&nmtb, 0, sizeof(nmtb)); + nmtb.iItem = btnPtr->idCommand; + nmtb.rcButton = btnPtr->rect; + res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_DROPDOWN); + TRACE("TBN_DROPDOWN responded with %ld\n", res); - return 0; + if (res != TBDDRET_TREATPRESSED) + { + MSG msg; + + /* redraw button in unpressed state */ + if (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) + btnPtr->fsState &= ~TBSTATE_PRESSED; + else + btnPtr->bDropDownPressed = FALSE; + InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + + /* find and set hot item */ + GetCursorPos(&pt); + ScreenToClient(infoPtr->hwndSelf, &pt); + nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); + if (!infoPtr->bAnchor || button) + TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + + /* remove any left mouse button down or double-click messages + * so that we can get a toggle effect on the button */ + while (PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDOWN, WM_LBUTTONDOWN, PM_REMOVE) || + PeekMessageW(&msg, infoPtr->hwndSelf, WM_LBUTTONDBLCLK, WM_LBUTTONDBLCLK, PM_REMOVE)) + ; + + return 0; + } + /* otherwise drop through and process as pushed */ } - /* otherwise drop through and process as pushed */ - } - infoPtr->bCaptured = TRUE; - infoPtr->nButtonDown = nHit; - infoPtr->bDragOutSent = FALSE; + infoPtr->bCaptured = TRUE; + infoPtr->nButtonDown = nHit; + infoPtr->bDragOutSent = FALSE; - btnPtr->fsState |= TBSTATE_PRESSED; + btnPtr->fsState |= TBSTATE_PRESSED; - TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); - if (btnPtr->fsState & TBSTATE_ENABLED) - InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); - UpdateWindow(infoPtr->hwndSelf); - SetCapture (infoPtr->hwndSelf); - } + if (btnPtr->fsState & TBSTATE_ENABLED) + InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + UpdateWindow(infoPtr->hwndSelf); + SetCapture (infoPtr->hwndSelf); + } - if (button) - { memset(&nmtb, 0, sizeof(nmtb)); nmtb.iItem = btnPtr->idCommand; TOOLBAR_SendNotify((NMHDR *)&nmtb, infoPtr, TBN_BEGINDRAG);

1 0

Alex Henrie : advapi32: Remove always-true if statements from RegEnumValue [AW].
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 18b7ec94796ed09bef5337e0b02ea374d86de262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b7ec94796ed09bef5337e0b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:06:23 2015 -0600 advapi32: Remove always-true if statements from RegEnumValue[AW]. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/registry.c | 164 ++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 88 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f988c0e..4820b33 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1940,53 +1940,45 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - if (value || data) + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); + } - if (status) goto done; + if (status) goto done; - if (value) + if (info->NameLength/sizeof(WCHAR) >= *val_count) + { + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( value, info->Name, info->NameLength ); + *val_count = info->NameLength / sizeof(WCHAR); + value[*val_count] = 0; + + if (data) + { + if (total_size - info->DataOffset > *count) { - if (info->NameLength/sizeof(WCHAR) >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( value, info->Name, info->NameLength ); - *val_count = info->NameLength / sizeof(WCHAR); - value[*val_count] = 0; + status = STATUS_BUFFER_OVERFLOW; + goto overflow; } - - if (data) + memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) { - if (total_size - info->DataOffset > *count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) - { - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); - if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; - } + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; } } - else status = STATUS_SUCCESS; overflow: if (type) *type = info->Type; @@ -2025,74 +2017,70 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; /* we need to fetch the contents for a string type even if not requested, * because we need to compute the length of the ASCII string. */ - if (value || data || is_string(info->Type)) + + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); + } - if (status) goto done; + if (status) goto done; - if (is_string(info->Type)) + if (is_string(info->Type)) + { + DWORD len; + RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), + total_size - info->DataOffset ); + if (data && len) { - DWORD len; - RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); - if (data && len) + if (len > *count) status = STATUS_BUFFER_OVERFLOW; + else { - if (len > *count) status = STATUS_BUFFER_OVERFLOW; - else - { - RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - if (len < *count && data[len-1]) data[len] = 0; - } + RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), + total_size - info->DataOffset ); + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (len < *count && data[len-1]) data[len] = 0; } - info->DataLength = len; - } - else if (data) - { - if (total_size - info->DataOffset > *count) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); } + info->DataLength = len; + } + else if (data) + { + if (total_size - info->DataOffset > *count) status = STATUS_BUFFER_OVERFLOW; + else memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + } - if (value && !status) - { - DWORD len; + if (!status) + { + DWORD len; - RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); - if (len >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - if (*val_count) - { - len = *val_count - 1; - RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); - value[len] = 0; - } - } - else + RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); + if (len >= *val_count) + { + status = STATUS_BUFFER_OVERFLOW; + if (*val_count) { + len = *val_count - 1; RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); value[len] = 0; - *val_count = len; } } + else + { + RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); + value[len] = 0; + *val_count = len; + } } - else status = STATUS_SUCCESS; if (type) *type = info->Type; if (count) *count = info->DataLength;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015