wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Michael Stefaniuc : dmband: Move struct definitions to the .c files that uses them.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: c3e753c20be1b6e5d2cddb6333fc8959d5b699ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e753c20be1b6e5d2cddb633… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:28:01 2014 +0200 dmband: Move struct definitions to the .c files that uses them. --- dlls/dmband/band.c | 9 +++++++++ dlls/dmband/bandtrack.c | 11 ++++++++++- dlls/dmband/dmband_private.h | 40 ---------------------------------------- 3 files changed, 19 insertions(+), 41 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 97e7c30..0ab7df7 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandImpl implementation */ +typedef struct IDirectMusicBandImpl { + IDirectMusicBand IDirectMusicBand_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Instruments; +} IDirectMusicBandImpl; + static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface) { return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 459c158..14e368d 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -25,7 +25,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandTrack implementation */ -/* IDirectMusicBandTrack IUnknown part: */ +typedef struct IDirectMusicBandTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_BAND_TRACK_HEADER header; + struct list Bands; +} IDirectMusicBandTrack; + static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 6be6ae8..4c8fa0b 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -43,13 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicBandImpl IDirectMusicBandImpl; - -typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; @@ -82,39 +75,6 @@ typedef struct _DMUS_PRIVATE_BAND { } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND; -/***************************************************************************** - * IDirectMusicBandImpl implementation structure - */ -struct IDirectMusicBandImpl { - IDirectMusicBand IDirectMusicBand_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicBandImpl fields */ - LPDMUS_OBJECTDESC pDesc; - /* data */ - struct list Instruments; -}; - -/***************************************************************************** - * IDirectMusicBandTrack implementation structure - */ -struct IDirectMusicBandTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicBandTrack fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_BAND_TRACK_HEADER header; - - /* data */ - struct list Bands; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmband.dll */

1 0

Michael Stefaniuc : dmime: Move a struct definition to the .c file that uses it.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 8b9fd8939bfc86d8046a2c69859d8ce3b69cab8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9fd8939bfc86d8046a2c698… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:27:04 2014 +0200 dmime: Move a struct definition to the .c file that uses it. --- dlls/dmime/dmime_private.h | 17 ----------------- dlls/dmime/segment.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 01cd528..35b51a2 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -46,7 +46,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl; typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; @@ -122,22 +121,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; /***************************************************************************** - * IDirectMusicSegment8Impl implementation structure - */ -struct IDirectMusicSegment8Impl { - IDirectMusicSegment8 IDirectMusicSegment8_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSegment8Impl fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_SEGMENT_HEADER header; - IDirectMusicGraph* pGraph; - struct list Tracks; -}; - -/***************************************************************************** * IDirectMusicAudioPathImpl implementation structure */ struct IDirectMusicAudioPathImpl { diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 1bdf163..d17b341 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -26,6 +26,17 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegmentImpl implementation */ +typedef struct IDirectMusicSegment8Impl { + IDirectMusicSegment8 IDirectMusicSegment8_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_SEGMENT_HEADER header; + IDirectMusicGraph *pGraph; + struct list Tracks; +} IDirectMusicSegment8Impl; + static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMusicSegment8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);

1 0

Michael Stefaniuc : dmime/tests: Rather test for IDirectMusicObject as invalid iface.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 232aeb6b20ac7612824e6c5ad03a046b9a8a05e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232aeb6b20ac7612824e6c5ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:23:07 2014 +0200 dmime/tests: Rather test for IDirectMusicObject as invalid iface. --- dlls/dmime/tests/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 143eeed..de8b76e 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -216,7 +216,7 @@ static void test_COM(void) /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectSound, (void**)&dmp); + &IID_IDirectMusicObject, (void**)&dmp); ok(hr == E_NOINTERFACE, "DirectMusicPerformance create failed: %08x, expected E_NOINTERFACE\n", hr);

1 0

Nikolay Sivov : comctl32/treeview: Send TVN_KEYDOWN in response of WM_KEYDOWN.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: a7fb6c89b3535368faaad06b1bd49253ed3c1430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fb6c89b3535368faaad06b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 00:46:31 2014 +0400 comctl32/treeview: Send TVN_KEYDOWN in response of WM_KEYDOWN. --- dlls/comctl32/tests/treeview.c | 4 ++-- dlls/comctl32/treeview.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3b70e6c..24a63d8 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -206,7 +206,7 @@ static const struct message parent_expand_seq[] = { }; static const struct message parent_expand_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { WM_CHANGEUISTATE, sent|optional }, @@ -221,7 +221,7 @@ static const struct message parent_collapse_2nd_kb_seq[] = { }; static const struct message parent_expand_empty_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c26513f..4067323 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5201,11 +5201,15 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) { /* If it is non-NULL and different, it will be selected and visible. */ TREEVIEW_ITEM *newSelection = NULL; - TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; + NMTVKEYDOWN nmkeydown; TRACE("%lx\n", wParam); + nmkeydown.wVKey = wParam; + nmkeydown.flags = 0; + TREEVIEW_SendRealNotify(infoPtr, TVN_KEYDOWN, &nmkeydown.hdr); + if (prevItem == NULL) return FALSE;

1 0

Nikolay Sivov : comctl32/treeview: Simplify sending parent WM_NOTIFY notifications.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 3f8bda94fc264188133d25f7a5c9b4d544414cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f8bda94fc264188133d25f7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 00:13:38 2014 +0400 comctl32/treeview: Simplify sending parent WM_NOTIFY notifications. --- dlls/comctl32/treeview.c | 80 ++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 59 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6dd7e93..c26513f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -499,24 +499,22 @@ static INT get_notifycode(const TREEVIEW_INFO *infoPtr, INT code) } static inline BOOL -TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPNMHDR pnmh) +TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, UINT code, NMHDR *hdr) { - TRACE("wParam=%ld, lParam=%p\n", wParam, pnmh); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, (LPARAM)pnmh); + TRACE("code=%d, hdr=%p\n", code, hdr); + + hdr->hwndFrom = infoPtr->hwnd; + hdr->idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + hdr->code = get_notifycode(infoPtr, code); + + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); } static BOOL TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code) { - NMHDR nmhdr; - HWND hwnd = infoPtr->hwnd; - - TRACE("%d\n", code); - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.code = get_notifycode(infoPtr, code); - - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, &nmhdr); + NMHDR hdr; + return TREEVIEW_SendRealNotify(infoPtr, code, &hdr); } static VOID @@ -556,18 +554,13 @@ static BOOL TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action, UINT mask, HTREEITEM oldItem, HTREEITEM newItem) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; BOOL ret; TRACE("code:%d action:%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); - ZeroMemory(&nmhdr, sizeof(NMTREEVIEWW)); - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); + memset(&nmhdr, 0, sizeof(NMTREEVIEWW)); nmhdr.action = action; if (oldItem) @@ -579,7 +572,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -592,14 +585,10 @@ static BOOL TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, HTREEITEM dragItem, POINT pt) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; TRACE("code:%d dragitem:%p\n", code, dragItem); - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); nmhdr.action = 0; nmhdr.itemNew.mask = TVIF_STATE | TVIF_PARAM | TVIF_HANDLE; nmhdr.itemNew.hItem = dragItem; @@ -609,7 +598,7 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + return TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); } @@ -617,16 +606,12 @@ static BOOL TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, RECT rc) { - HWND hwnd = infoPtr->hwnd; NMTVCUSTOMDRAW nmcdhdr; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = rc; @@ -637,11 +622,9 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr.nmcd.hdr); + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr.nmcd.hdr); } - - /* FIXME: need to find out when the flags in uItemState need to be set */ static BOOL @@ -649,8 +632,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item, UINT uItemDrawState, NMTVCUSTOMDRAW *nmcdhdr) { - HWND hwnd = infoPtr->hwnd; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; DWORD dwDrawStage; DWORD_PTR dwItemSpec; UINT uItemState; @@ -666,9 +648,6 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, uItemState |= CDIS_HOT; nmcd = &nmcdhdr->nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = item->rect; @@ -681,24 +660,19 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr->nmcd.hdr); + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr->nmcd.hdr); } static BOOL TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editItem) { - HWND hwnd = infoPtr->hwnd; NMTVDISPINFOW tvdi; BOOL ret; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_BEGINLABELEDITW); - TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, &tvdi.item, editItem); - ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) Free(tvdi.item.pszText); @@ -711,17 +685,12 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, UINT mask) { NMTVDISPINFOEXW callback; - HWND hwnd = infoPtr->hwnd; TRACE("mask=0x%x, callbackmask=0x%x\n", mask, item->callbackMask); mask &= item->callbackMask; if (mask == 0) return; - callback.hdr.hwndFrom = hwnd; - callback.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - callback.hdr.code = get_notifycode(infoPtr, TVN_GETDISPINFOW); - /* 'state' always contains valid value, as well as 'lParam'. * All other parameters are uninitialized. */ @@ -736,7 +705,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, if (mask & TVIF_TEXT) item->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, &callback.hdr); + TREEVIEW_SendRealNotify(infoPtr, TVN_GETDISPINFOW, &callback.hdr); TRACE("resulting code 0x%08x\n", callback.hdr.code); /* It may have changed due to a call to SetItem. */ @@ -3990,7 +3959,6 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { - HWND hwnd = infoPtr->hwnd; TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; @@ -4000,9 +3968,6 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!IsWindow(infoPtr->hwndEdit)) return FALSE; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_ENDLABELEDITW); tvdi.item.mask = 0; tvdi.item.hItem = editedItem; tvdi.item.state = editedItem->state; @@ -4030,7 +3995,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) tvdi.item.cchTextMax = 0; } - bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + bCommit = TREEVIEW_SendRealNotify(infoPtr, TVN_ENDLABELEDITW, &tvdi.hdr); if (!bCancel && bCommit) /* Apply the changes */ { @@ -5543,9 +5508,6 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) item = TREEVIEW_HitTestPoint(infoPtr, pt); memset(&nmmouse, 0, sizeof(nmmouse)); - nmmouse.hdr.hwndFrom = infoPtr->hwnd; - nmmouse.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); - nmmouse.hdr.code = NM_SETCURSOR; if (item) { nmmouse.dwItemSpec = (DWORD_PTR)item; @@ -5554,7 +5516,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nmmouse.pt.x = 0; nmmouse.pt.y = 0; nmmouse.dwHitInfo = lParam; - if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, &nmmouse.hdr)) + if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT))

1 0

Nikolay Sivov : comctl32/progress: Update position by one step on PBM_SETPOS in PBS_MARQUEE style.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 2a348791ee56c6556887a64d98eea68aaa01cc01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a348791ee56c6556887a64d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 8 00:04:28 2014 +0400 comctl32/progress: Update position by one step on PBM_SETPOS in PBS_MARQUEE style. --- dlls/comctl32/progress.c | 85 +++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 7c996cb..44fdd3f 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -448,38 +448,32 @@ static LRESULT PROGRESS_Paint (PROGRESS_INFO *infoPtr, HDC hdc) /*********************************************************************** - * PROGRESS_Timer - * Handle the marquee timer messages + * Advance marquee progress by one step. */ -static LRESULT PROGRESS_Timer (PROGRESS_INFO *infoPtr, INT idTimer) +static void PROGRESS_UpdateMarquee (PROGRESS_INFO *infoPtr) { - if(idTimer == ID_MARQUEE_TIMER) - { - LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); - RECT rect; - int ledWidth, leds; - HTHEME theme = GetWindowTheme (infoPtr->Self); - BOOL barSmooth = (style & PBS_SMOOTH) && !theme; + LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); + RECT rect; + int ledWidth, leds; + HTHEME theme = GetWindowTheme (infoPtr->Self); + BOOL smooth = (style & PBS_SMOOTH) && !theme; - get_client_rect (infoPtr->Self, &rect); + get_client_rect (infoPtr->Self, &rect); - if(!barSmooth) - ledWidth = get_led_size( infoPtr, style, &rect ) + - get_led_gap( infoPtr ); - else - ledWidth = 1; + if (smooth) + ledWidth = 1; + else + ledWidth = get_led_size( infoPtr, style, &rect ) + get_led_gap( infoPtr ); - leds = (get_bar_size( style, &rect ) + ledWidth - 1) / - ledWidth; + leds = (get_bar_size( style, &rect ) + ledWidth - 1) / + ledWidth; - /* increment the marquee progress */ - if(++infoPtr->MarqueePos >= leds) - infoPtr->MarqueePos = 0; + /* increment the marquee progress */ + if (++infoPtr->MarqueePos >= leds) + infoPtr->MarqueePos = 0; - InvalidateRect(infoPtr->Self, &rect, TRUE); - UpdateWindow(infoPtr->Self); - } - return 0; + InvalidateRect(infoPtr->Self, &rect, TRUE); + UpdateWindow(infoPtr->Self); } @@ -522,6 +516,30 @@ static DWORD PROGRESS_SetRange (PROGRESS_INFO *infoPtr, int low, int high) return res; } +static UINT PROGRESS_SetPos (PROGRESS_INFO *infoPtr, INT pos) +{ + DWORD style = GetWindowLongW(infoPtr->Self, GWL_STYLE); + + if (style & PBS_MARQUEE) + { + PROGRESS_UpdateMarquee(infoPtr); + return 1; + } + else + { + UINT oldVal; + oldVal = infoPtr->CurVal; + if (oldVal != pos) { + infoPtr->CurVal = pos; + PROGRESS_CoercePos(infoPtr); + TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); + PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow( infoPtr->Self ); + } + return oldVal; + } +} + /*********************************************************************** * ProgressWindowProc */ @@ -596,7 +614,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, return PROGRESS_Paint (infoPtr, (HDC)wParam); case WM_TIMER: - return PROGRESS_Timer (infoPtr, (INT)wParam); + if (wParam == ID_MARQUEE_TIMER) + PROGRESS_UpdateMarquee (infoPtr); + return 0; case WM_THEMECHANGED: { @@ -632,18 +652,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, } case PBM_SETPOS: - { - UINT oldVal; - oldVal = infoPtr->CurVal; - if(oldVal != wParam) { - infoPtr->CurVal = (INT)wParam; - PROGRESS_CoercePos(infoPtr); - TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); - PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); - UpdateWindow( infoPtr->Self ); - } - return oldVal; - } + return PROGRESS_SetPos(infoPtr, wParam); case PBM_SETRANGE: return PROGRESS_SetRange (infoPtr, (int)LOWORD(lParam), (int)HIWORD(lParam));

1 0

Nikolay Sivov : comctl32/progress: Erase background too on WM_TIMER for marquee animation.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: c69a7ecfb6c2ca6e9844a567c4dfe58f6f7070d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69a7ecfb6c2ca6e9844a567c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 7 23:46:25 2014 +0400 comctl32/progress: Erase background too on WM_TIMER for marquee animation. --- dlls/comctl32/progress.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 69e9cf8..7c996cb 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -474,11 +474,9 @@ static LRESULT PROGRESS_Timer (PROGRESS_INFO *infoPtr, INT idTimer) /* increment the marquee progress */ if(++infoPtr->MarqueePos >= leds) - { infoPtr->MarqueePos = 0; - } - InvalidateRect(infoPtr->Self, &rect, FALSE); + InvalidateRect(infoPtr->Self, &rect, TRUE); UpdateWindow(infoPtr->Self); } return 0;

1 0

Nikolay Sivov : comctl32/progress: Set default marquee animation timer to 30 msec.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 25279d310e90a90c7584111932b014f035c3f203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25279d310e90a90c758411193… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 7 23:29:38 2014 +0400 comctl32/progress: Set default marquee animation timer to 30 msec. --- dlls/comctl32/progress.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 989c61e..69e9cf8 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -68,6 +68,7 @@ typedef struct #define LED_GAP 2 #define MARQUEE_LEDS 5 #define ID_MARQUEE_TIMER 1 +#define DEFAULT_MARQUEE_PERIOD 30 /* Helper to obtain size of a progress bar chunk ("led"). */ static inline int get_led_size ( const PROGRESS_INFO *infoPtr, LONG style, @@ -724,8 +725,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_SETMARQUEE: if(wParam != 0) { + UINT period = lParam ? (UINT)lParam : DEFAULT_MARQUEE_PERIOD; infoPtr->Marquee = TRUE; - SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, (UINT)lParam, NULL); + SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, period, NULL); } else {

1 0

Akihiro Sagawa : oleaut32: Delete opposite side keys on UnRegisterTypeLib.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 86b7fc3829b3891c359090f0d12b447f9cd0a4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b7fc3829b3891c359090f0d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 1 20:30:05 2014 +0900 oleaut32: Delete opposite side keys on UnRegisterTypeLib. --- dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 39 ++++++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index dcf56d1..312195b 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4347,10 +4347,7 @@ static void test_register_typelib(BOOL system_registration) if (is_win64 || is_wow64) { ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); - todo_wine { ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); - } } } ITypeInfo_ReleaseTypeAttr(typeinfo, attr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d4fd22e..48b171b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -838,6 +838,24 @@ HRESULT WINAPI RegisterTypeLib( return res; } +static void TLB_unregister_interface(GUID *guid, REGSAM flag) +{ + WCHAR subKeyName[50]; + HKEY subKey; + + /* the path to the type */ + get_interface_key( guid, subKeyName ); + + /* Delete its bits */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE | flag, &subKey) != ERROR_SUCCESS) + return; + + RegDeleteKeyW(subKey, ProxyStubClsidW); + RegDeleteKeyW(subKey, ProxyStubClsid32W); + RegDeleteKeyW(subKey, TypeLibW); + RegCloseKey(subKey); + RegDeleteKeyExW(HKEY_CLASSES_ROOT, subKeyName, flag, 0); +} /****************************************************************************** * UnRegisterTypeLib [OLEAUT32.186] @@ -863,7 +881,6 @@ HRESULT WINAPI UnRegisterTypeLib( DWORD i = 0; BOOL deleteOtherStuff; HKEY key = NULL; - HKEY subKey = NULL; TYPEATTR* typeAttr = NULL; TYPEKIND kind; ITypeInfo* typeInfo = NULL; @@ -922,19 +939,16 @@ HRESULT WINAPI UnRegisterTypeLib( if ((kind == TKIND_INTERFACE && (typeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || kind == TKIND_DISPATCH) { - /* the path to the type */ - get_interface_key( &typeAttr->guid, subKeyName ); + BOOL is_wow64; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); - /* Delete its bits */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) - goto enddeleteloop; + TLB_unregister_interface(&typeAttr->guid, 0); - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); - RegCloseKey(subKey); - subKey = NULL; - RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); + /* unregister TLBs into the opposite registry view, too */ + if(opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)) { + TLB_unregister_interface(&typeAttr->guid, opposite); + } } enddeleteloop: @@ -980,7 +994,6 @@ enddeleteloop: end: SysFreeString(tlibPath); if (typeLib) ITypeLib_Release(typeLib); - if (subKey) RegCloseKey(subKey); if (key) RegCloseKey(key); return result; }

1 0

Akihiro Sagawa : oleaut32/tests: Test UnRegisterTypeLib surely deletes registry keys.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 3f65a86959c1471fe52da2b659474ad848c59cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f65a86959c1471fe52da2b65… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 1 20:30:03 2014 +0900 oleaut32/tests: Test UnRegisterTypeLib surely deletes registry keys. --- dlls/oleaut32/tests/typelib.c | 50 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7abd606..dcf56d1 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -74,6 +74,7 @@ static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); +static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static WCHAR wszGUID[] = {'G','U','I','D',0}; @@ -172,6 +173,7 @@ static void init_function_pointers(void) pCreateActCtxW = (void *)GetProcAddress(hk32, "CreateActCtxW"); pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); + pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); } static void ref_count_test(LPCWSTR type_lib) @@ -4195,6 +4197,8 @@ static void test_register_typelib(BOOL system_registration) LONG ret, expect_ret; UINT count, i; HKEY hkey; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + BOOL is_wow64 = FALSE; struct { TYPEKIND kind; @@ -4224,6 +4228,9 @@ static void test_register_typelib(BOOL system_registration) return; } + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + filenameA = create_test_typelib(3); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); @@ -4250,7 +4257,6 @@ static void test_register_typelib(BOOL system_registration) { ITypeInfo *typeinfo; TYPEATTR *attr; - REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); ok(hr == S_OK, "got %08x\n", hr); @@ -4301,9 +4307,12 @@ static void test_register_typelib(BOOL system_registration) if(ret == ERROR_SUCCESS) RegCloseKey(hkey); /* 32-bit typelibs should be registered into both registry bit modes */ - ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); - ok(ret == expect_ret, "%d: got %d\n", i, ret); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + if (is_win64 || is_wow64) + { + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + ok(ret == expect_ret, "%d: got %d\n", i, ret); + if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + } ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -4315,6 +4324,39 @@ static void test_register_typelib(BOOL system_registration) hr = pUnRegisterTypeLibForUser(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, is_win64 ? SYS_WIN64 : SYS_WIN32); ok(hr == S_OK, "got %08x\n", hr); + for(i = 0; i < count; i++) + { + ITypeInfo *typeinfo; + TYPEATTR *attr; + + hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); + ok(hr == S_OK, "got %08x\n", hr); + + if((attr->typekind == TKIND_INTERFACE && (attr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || + attr->typekind == TKIND_DISPATCH) + { + StringFromGUID2(&attr->guid, uuidW, sizeof(uuidW) / sizeof(uuidW[0])); + WideCharToMultiByte(CP_ACP, 0, uuidW, -1, uuid, sizeof(uuid), NULL, NULL); + sprintf(key_name, "Interface\\%s", uuid); + + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); + ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); + if (is_win64 || is_wow64) + { + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + todo_wine { + ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); + if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + } + } + } + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + } + ITypeLib_Release(typelib); DeleteFileA( filenameA ); }

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
38
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 June 2014