wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Huw Davies : wineps: Fix top-down dib pattern brushes.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: c5697ff4b106cb08ea74ce6f7f94651fdf6ddc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5697ff4b106cb08ea74ce6f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 17 14:42:12 2012 +0100 wineps: Fix top-down dib pattern brushes. --- dlls/wineps.drv/ps.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 4a391cc..2e7597a 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -20,6 +20,7 @@ #include <ctype.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <stdarg.h> #include <locale.h> @@ -889,7 +890,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U " %d %d scale\n mypat image\n end\n }\n>>\n matrix makepattern setpattern\n"; PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *ptr; - INT w, h, x, y, w_mult, h_mult; + INT w, h, x, y, w_mult, h_mult, abs_height = abs( bmi->bmiHeader.biHeight ); COLORREF map[2]; TRACE( "size %dx%dx%d\n", @@ -901,7 +902,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U } w = bmi->bmiHeader.biWidth & ~0x7; - h = bmi->bmiHeader.biHeight & ~0x7; + h = abs_height & ~0x7; buf = HeapAlloc( GetProcessHeap(), 0, sizeof(do_pattern) + 100 ); ptr = buf; @@ -913,7 +914,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U } } PSDRV_WriteSpool(dev, mypat, sizeof(mypat) - 1); - PSDRV_WriteImageDict(dev, 1, 8, 8, buf, FALSE); + PSDRV_WriteImageDict(dev, 1, 8, 8, buf, bmi->bmiHeader.biHeight < 0); PSDRV_WriteSpool(dev, "def\n", 4); PSDRV_WriteIndexColorSpaceBegin(dev, 1);

1 0

Huw Davies : localspl: Calling AddPrinterDriver on an existing driver should succeed.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 25bb808cf104ee853173aefa6e1e685f62d28e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bb808cf104ee853173aefa6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 17 13:12:03 2012 +0100 localspl: Calling AddPrinterDriver on an existing driver should succeed. --- dlls/localspl/provider.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 392b8ed..a599113 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1361,13 +1361,6 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo } RegCloseKey(hroot); - if (disposition == REG_OPENED_EXISTING_KEY) { - TRACE("driver %s already installed\n", debugstr_w(di.pName)); - RegCloseKey(hdrv); - SetLastError(ERROR_PRINTER_DRIVER_ALREADY_INSTALLED); - return FALSE; - } - /* Verified with the Adobe PS Driver, that w2k does not use di.Version */ RegSetValueExW(hdrv, versionW, 0, REG_DWORD, (const BYTE*) &env->driverversion, sizeof(DWORD));

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICStream methods.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 73a4309234f4b2beedf866fb0dc12d66fa1fbabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a4309234f4b2beedf866fb0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:50:58 2012 -0500 windowscodecs: Add wrapper functions for IWICStream methods. --- dlls/windowscodecs/proxy.c | 12 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 1b298db..216bf19 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -608,6 +608,18 @@ HRESULT WINAPI IWICPalette_HasAlpha_Proxy_W(IWICPalette *iface, return IWICPalette_HasAlpha(iface, pfHasAlpha); } +HRESULT WINAPI IWICStream_InitializeFromIStream_Proxy_W(IWICStream *iface, + IStream *pIStream) +{ + return IWICStream_InitializeFromIStream(iface, pIStream); +} + +HRESULT WINAPI IWICStream_InitializeFromMemory_Proxy_W(IWICStream *iface, + BYTE *pbBuffer, DWORD cbBufferSize) +{ + return IWICStream_InitializeFromMemory(iface, pbBuffer, cbBufferSize); +} + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) { TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index bd5b94c..453a84e 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -102,8 +102,8 @@ @ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy @ stub IWICPixelFormatInfo_GetChannelCount_Proxy @ stub IWICPixelFormatInfo_GetChannelMask_Proxy -@ stub IWICStream_InitializeFromIStream_Proxy -@ stub IWICStream_InitializeFromMemory_Proxy +@ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W +@ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) @ stub WICCreateBitmapFromSection @ stub WICCreateColorContext_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICComponentFactory methods.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 6e2da125fdadfabcf37da86c0a6af57eea2ae5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2da125fdadfabcf37da86c0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 13:10:38 2012 -0500 windowscodecs: Add wrapper functions for IWICComponentFactory methods. --- dlls/windowscodecs/proxy.c | 12 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 8e6ff4a..1b298db 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -305,6 +305,18 @@ HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *i return IWICColorContext_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI IWICComponentFactory_CreateMetadataWriterFromReader_Proxy_W(IWICComponentFactory *iface, + IWICMetadataReader *pIReader, const GUID *pguidVendor, IWICMetadataWriter **ppIWriter) +{ + return IWICComponentFactory_CreateMetadataWriterFromReader(iface, pIReader, pguidVendor, ppIWriter); +} + +HRESULT WINAPI IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy_W(IWICComponentFactory *iface, + IWICMetadataBlockWriter *pIBlockWriter, IWICMetadataQueryWriter **ppIQueryWriter) +{ + return IWICComponentFactory_CreateQueryWriterFromBlockWriter(iface, pIBlockWriter, ppIQueryWriter); +} + HRESULT WINAPI IWICComponentInfo_GetCLSID_Proxy_W(IWICComponentInfo *iface, CLSID *pclsid) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 80782f1..bd5b94c 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -53,8 +53,8 @@ @ stdcall IWICBitmap_SetPalette_Proxy(ptr ptr) IWICBitmap_SetPalette_Proxy_W @ stdcall IWICBitmap_SetResolution_Proxy(ptr double double) IWICBitmap_SetResolution_Proxy_W @ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W -@ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy -@ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy +@ stdcall IWICComponentFactory_CreateMetadataWriterFromReader_Proxy(ptr ptr ptr ptr) IWICComponentFactory_CreateMetadataWriterFromReader_Proxy_W +@ stdcall IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy(ptr ptr ptr) IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy_W @ stdcall IWICComponentInfo_GetAuthor_Proxy(ptr long ptr ptr) IWICComponentInfo_GetAuthor_Proxy_W @ stdcall IWICComponentInfo_GetCLSID_Proxy(ptr ptr) IWICComponentInfo_GetCLSID_Proxy_W @ stdcall IWICComponentInfo_GetFriendlyName_Proxy(ptr long ptr ptr) IWICComponentInfo_GetFriendlyName_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICMetadataBlockReader methods.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 157c92de227440cd86581b49c723dedd01027173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157c92de227440cd86581b49c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 13:06:59 2012 -0500 windowscodecs: Add wrapper functions for IWICMetadataBlockReader methods. --- dlls/windowscodecs/proxy.c | 13 +++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 6115198..8e6ff4a 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wincodecs_private.h" @@ -499,6 +500,18 @@ HRESULT WINAPI IWICImagingFactory_CreateStream_Proxy_W(IWICImagingFactory *pFact return IWICImagingFactory_CreateStream(pFactory, ppIWICStream); } +HRESULT WINAPI IWICMetadataBlockReader_GetCount_Proxy_W(IWICMetadataBlockReader *iface, + UINT *pcCount) +{ + return IWICMetadataBlockReader_GetCount(iface, pcCount); +} + +HRESULT WINAPI IWICMetadataBlockReader_GetReaderByIndex_Proxy_W(IWICMetadataBlockReader *iface, + UINT nIndex, IWICMetadataReader **ppIMetadataReader) +{ + return IWICMetadataBlockReader_GetReaderByIndex(iface, nIndex, ppIMetadataReader); +} + HRESULT WINAPI IWICMetadataQueryReader_GetContainerFormat_Proxy_W(IWICMetadataQueryReader *iface, GUID *pguidContainerFormat) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 259ff06..80782f1 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -83,8 +83,8 @@ @ stdcall IWICImagingFactory_CreateQueryWriterFromReader_Proxy(ptr ptr ptr ptr) IWICImagingFactory_CreateQueryWriterFromReader_Proxy_W @ stdcall IWICImagingFactory_CreateQueryWriter_Proxy(ptr ptr ptr ptr) IWICImagingFactory_CreateQueryWriter_Proxy_W @ stdcall IWICImagingFactory_CreateStream_Proxy(ptr ptr) IWICImagingFactory_CreateStream_Proxy_W -@ stub IWICMetadataBlockReader_GetCount_Proxy -@ stub IWICMetadataBlockReader_GetReaderByIndex_Proxy +@ stdcall IWICMetadataBlockReader_GetCount_Proxy(ptr ptr) IWICMetadataBlockReader_GetCount_Proxy_W +@ stdcall IWICMetadataBlockReader_GetReaderByIndex_Proxy(ptr long ptr) IWICMetadataBlockReader_GetReaderByIndex_Proxy_W @ stdcall IWICMetadataQueryReader_GetContainerFormat_Proxy(ptr ptr) IWICMetadataQueryReader_GetContainerFormat_Proxy_W @ stdcall IWICMetadataQueryReader_GetEnumerator_Proxy(ptr ptr) IWICMetadataQueryReader_GetEnumerator_Proxy_W @ stdcall IWICMetadataQueryReader_GetLocation_Proxy(ptr long ptr ptr) IWICMetadataQueryReader_GetLocation_Proxy_W

1 0

Piotr Caban : comctl32: Don't make separator on first position hot.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 99ff5683f3333f390417ed4c28dcf65b0a56ad6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ff5683f3333f390417ed4c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 17 12:22:55 2012 +0200 comctl32: Don't make separator on first position hot. --- dlls/comctl32/toolbar.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9807745..da13aa2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5485,7 +5485,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ScreenToClient(infoPtr->hwndSelf, &pt); nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); if (!infoPtr->bAnchor || button) - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + 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 */ @@ -5503,7 +5503,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) btnPtr->fsState |= TBSTATE_PRESSED; - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); if (btnPtr->fsState & TBSTATE_ENABLED) InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); @@ -5559,7 +5559,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); if (!infoPtr->bAnchor || button) - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); if (infoPtr->nButtonDrag >= 0) { RECT rcClient; @@ -5619,7 +5619,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } /* button under cursor changed so need to re-set hot item */ - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); infoPtr->nButtonDrag = -1; TOOLBAR_SendNotify(&hdr, infoPtr, TBN_TOOLBARCHANGE); @@ -5849,7 +5849,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) && (!infoPtr->bAnchor || button)) - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE); if (infoPtr->nOldHit != nHit) {

1 0

Piotr Caban : comctl32: Return if point is over a button in TOOLBAR_InternalHitTest.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 2d75a2425e401e5b7781f3484298ae8ebca01bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d75a2425e401e5b7781f3484… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 17 12:22:32 2012 +0200 comctl32: Return if point is over a button in TOOLBAR_InternalHitTest. --- dlls/comctl32/toolbar.c | 50 ++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fbabc1d..9807745 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1775,11 +1775,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) static INT -TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt) +TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt, BOOL *button) { TBUTTON_INFO *btnPtr; INT i; + if (button) + *button = FALSE; + btnPtr = infoPtr->buttons; for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { if (btnPtr->fsState & TBSTATE_HIDDEN) @@ -1794,6 +1797,8 @@ TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt) else { if (PtInRect (&btnPtr->rect, *lpPt)) { TRACE(" ON BUTTON %d!\n", i); + if (button) + *button = TRUE; return i; } } @@ -3664,7 +3669,7 @@ TOOLBAR_HideButton (TOOLBAR_INFO *infoPtr, INT Id, BOOL fHide) static inline LRESULT TOOLBAR_HitTest (const TOOLBAR_INFO *infoPtr, const POINT* lpPt) { - return TOOLBAR_InternalHitTest (infoPtr, lpPt); + return TOOLBAR_InternalHitTest (infoPtr, lpPt, NULL); } @@ -5376,13 +5381,13 @@ static LRESULT TOOLBAR_LButtonDblClk (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { POINT pt; - INT nHit; + BOOL button; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - if (nHit >= 0) + if (button) TOOLBAR_LButtonDown (infoPtr, wParam, lParam); else if (infoPtr->dwStyle & CCS_ADJUSTABLE) TOOLBAR_Customize (infoPtr); @@ -5400,6 +5405,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) NMTOOLBARA nmtb; NMMOUSE nmmouse; BOOL bDragKeyPressed; + BOOL button; TRACE("\n"); @@ -5414,11 +5420,12 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - btnPtr = &infoPtr->buttons[nHit]; + if (button) + btnPtr = &infoPtr->buttons[nHit]; - if ((nHit >= 0) && bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) + if (button && bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) { infoPtr->nButtonDrag = nHit; SetCapture (infoPtr->hwndSelf); @@ -5429,7 +5436,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) hCursorDrag = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_MOVEBUTTON); SetCursor(hCursorDrag); } - else if (nHit >= 0) + else if (button) { RECT arrowRect; infoPtr->nOldHit = nHit; @@ -5476,8 +5483,8 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * NOTE: native doesn't do this, but that is a bug */ GetCursorPos(&pt); ScreenToClient(infoPtr->hwndSelf, &pt); - nHit = TOOLBAR_InternalHitTest(infoPtr, &pt); - if (!infoPtr->bAnchor || (nHit >= 0)) + 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 @@ -5504,7 +5511,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) SetCapture (infoPtr->hwndSelf); } - if (nHit >=0) + if (button) { memset(&nmtb, 0, sizeof(nmtb)); nmtb.iItem = btnPtr->idCommand; @@ -5514,7 +5521,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nmmouse.dwHitInfo = nHit; /* !!! Undocumented - sends NM_LDOWN with the NMMOUSE structure. */ - if (nHit < 0) + if (!button) nmmouse.dwItemSpec = -1; else { @@ -5541,6 +5548,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) NMHDR hdr; NMMOUSE nmmouse; NMTOOLBARA nmtb; + BOOL button; if (infoPtr->hwndToolTip) TOOLBAR_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwndSelf, @@ -5548,9 +5556,9 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - if (!infoPtr->bAnchor || (nHit >= 0)) + if (!infoPtr->bAnchor || button) TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); if (infoPtr->nButtonDrag >= 0) { @@ -5676,7 +5684,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * NM_CLICK with the NMMOUSE structure. */ nmmouse.dwHitInfo = nHit; - if (nHit < 0) + if (!button) nmmouse.dwItemSpec = -1; else { @@ -5699,14 +5707,15 @@ TOOLBAR_RButtonUp(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) INT nHit; NMMOUSE nmmouse; POINT pt; + BOOL button; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest(infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); nmmouse.dwHitInfo = nHit; - if (nHit < 0) { + if (!button) { nmmouse.dwItemSpec = -1; } else { nmmouse.dwItemSpec = infoPtr->buttons[nmmouse.dwHitInfo].idCommand; @@ -5805,6 +5814,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACKMOUSEEVENT trackinfo; INT nHit; TBUTTON_INFO *btnPtr; + BOOL button; if ((infoPtr->dwStyle & TBSTYLE_TOOLTIPS) && (infoPtr->hwndToolTip == NULL)) TOOLBAR_TooltipCreateControl(infoPtr); @@ -5835,10 +5845,10 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && (!infoPtr->bAnchor || (nHit >= 0))) + && (!infoPtr->bAnchor || button)) TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE); if (infoPtr->nOldHit != nHit)

1 0

Hans Leidekker : msi: Add support for version 4.0 of the .NET runtime.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 35b95942449394f6a69b9f39b5f1fc7de16ddba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b95942449394f6a69b9f39b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 17 10:17:50 2012 +0200 msi: Add support for version 4.0 of the .NET runtime. --- dlls/msi/assembly.c | 33 +++++++++++++++++++++++++++------ dlls/msi/msipriv.h | 1 + 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index b8fabb7..d384003 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -34,11 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); +static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); -static HMODULE hfusion10, hfusion11, hfusion20, hmscoree, hsxs; +static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; static BOOL init_function_pointers( void ) { @@ -46,8 +47,10 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; - if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20) return TRUE; + if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20 || + pCreateAssemblyCacheNet40 ) return TRUE; if (!(hmscoree = LoadLibraryA( "mscoree.dll" ))) return FALSE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ @@ -62,7 +65,11 @@ static BOOL init_function_pointers( void ) if (!pLoadLibraryShim( szFusion, szVersion20, NULL, &hfusion20 )) pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); - if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20) goto error; + if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) + pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); + + if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20 + && !pCreateAssemblyCacheNet40) goto error; if (!(hsxs = LoadLibraryA( "sxs.dll" ))) goto error; if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) goto error; @@ -72,9 +79,11 @@ error: pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + pCreateAssemblyCacheNet40 = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); + FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); return FALSE; } @@ -84,16 +93,19 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) if (!init_function_pointers()) return FALSE; if (package->cache_net[CLR_VERSION_V10] || package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20]) return TRUE; + package->cache_net[CLR_VERSION_V20] || + package->cache_net[CLR_VERSION_V40]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); + if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); if (package->cache_net[CLR_VERSION_V10] || package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20]) + package->cache_net[CLR_VERSION_V20] || + package->cache_net[CLR_VERSION_V40]) { return TRUE; } @@ -112,6 +124,11 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) IAssemblyCache_Release( package->cache_net[CLR_VERSION_V20] ); package->cache_net[CLR_VERSION_V20] = NULL; } + if (package->cache_net[CLR_VERSION_V40]) + { + IAssemblyCache_Release( package->cache_net[CLR_VERSION_V40] ); + package->cache_net[CLR_VERSION_V40] = NULL; + } IAssemblyCache_Release( package->cache_sxs ); package->cache_sxs = NULL; return FALSE; @@ -137,9 +154,11 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + pCreateAssemblyCacheNet40 = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); + FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); FreeLibrary( hsxs ); } @@ -274,13 +293,15 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR clr_version_v11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR clr_version_v20[] = {'v','2','.','0','.','5','0','7','2','7',0}; +static const WCHAR clr_version_v40[] = {'v','4','.','0','.','3','0','3','1','9',0}; static const WCHAR clr_version_unknown[] = {'u','n','k','n','o','w','n',0}; static const WCHAR *clr_version[] = { clr_version_v10, clr_version_v11, - clr_version_v20 + clr_version_v20, + clr_version_v40 }; static const WCHAR *get_clr_version_str( enum clr_version version ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bc9e596..605ee8d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -347,6 +347,7 @@ enum clr_version CLR_VERSION_V10, CLR_VERSION_V11, CLR_VERSION_V20, + CLR_VERSION_V40, CLR_VERSION_MAX };

1 0

Hans Leidekker : msi: Use the correct function pointer in msi_init_assembly_caches.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: d6105eaa1f9ffeca229e6bcb584636692ce097e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6105eaa1f9ffeca229e6bcb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 17 10:17:29 2012 +0200 msi: Use the correct function pointer in msi_init_assembly_caches. --- dlls/msi/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index c188d55..b8fabb7 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -87,7 +87,7 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) package->cache_net[CLR_VERSION_V20]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V10], 0 ); + if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 );

1 0

Hans Leidekker : msi: Break out of the loop as soon as the assembly is detected in msi_load_assembly .
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 11daa6aad516e044e96e426c5b89ef26445ffd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11daa6aad516e044e96e426c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 17 10:17:16 2012 +0200 msi: Break out of the loop as soon as the assembly is detected in msi_load_assembly. --- dlls/msi/assembly.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 712bb23..c188d55 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -347,6 +347,7 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { TRACE("runtime version %s\n", debugstr_w(get_clr_version_str( i ))); a->installed = TRUE; + break; } } }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
74
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 May 2012