- wine-devel - winehq.org

[PATCH 4/4] mshtml: Set SCRIPTPROP_INVOKEVERSIONING based on document mode value.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 5 ++--- dlls/mshtml/htmlwindow.c | 4 +--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 19 +++++++++++++++---- dlls/mshtml/script.c | 22 +--------------------- 5 files changed, 21 insertions(+), 31 deletions(-)

1 0

[PATCH 3/4] mshtml: Properly handle conditional comments in IE9+ modes.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mutation.c | 22 ++++++++-------------- dlls/mshtml/tests/documentmode.js | 8 ++------ 2 files changed, 10 insertions(+), 20 deletions(-)

1 0

[PATCH 2/4] mshtml: Properly support custom event listeners in XMLHttpRequest object.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.js | 12 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] mshtml: Register load, error and abort events directly in event target.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 11 +--------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++++++++++++++++---------------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/tests/events.js | 40 ++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 32 deletions(-)

1 0

[PATCH v2 1/5] winegstreamer: Stop creating the filter if gstreamer fails to render.
by Zebediah Figura 22 Feb '18

22 Feb '18

Otherwise the push_data() thread will run and try to use resources we never allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64f..b48648c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,7 +1103,6 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; - HRESULT hr; int ret, i; LONGLONG avail, duration; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1163,19 +1162,20 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (!This->cStreams) { + if (!This->cStreams) + { FIXME("GStreamer could not find any streams\n"); - hr = E_FAIL; - } else { - gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < This->cStreams; ++i) { - This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; - This->ppPins[i]->seek.llCurrent = 0; - if (!This->ppPins[i]->seek.llDuration) - This->ppPins[i]->seek.dwCapabilities = 0; - WaitForSingleObject(This->ppPins[i]->caps_event, -1); - } - hr = S_OK; + return E_FAIL; + } + + gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + for (i = 0; i < This->cStreams; ++i) + { + This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; + This->ppPins[i]->seek.llCurrent = 0; + if (!This->ppPins[i]->seek.llDuration) + This->ppPins[i]->seek.dwCapabilities = 0; + WaitForSingleObject(This->ppPins[i]->caps_event, INFINITE); } *props = This->props; @@ -1191,7 +1191,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_active(This->my_src, 1); This->nextofs = This->nextpullofs = 0; - return hr; + return S_OK; } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) -- 2.7.4

2 9

[Patch website v2] Add Korean translations of News resend
by 김건우 22 Feb '18

22 Feb '18

2 1

[PATCH 1/5] winegstreamer: Stop creating the filter if gstreamer fails to render.
by Zebediah Figura 22 Feb '18

22 Feb '18

Otherwise the push_data() thread will run and try to use resources we never allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64f..ea61ed5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,7 +1103,6 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; - HRESULT hr; int ret, i; LONGLONG avail, duration; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1165,7 +1164,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI if (!This->cStreams) { FIXME("GStreamer could not find any streams\n"); - hr = E_FAIL; + return E_FAIL; } else { gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < This->cStreams; ++i) { @@ -1175,7 +1174,6 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI This->ppPins[i]->seek.dwCapabilities = 0; WaitForSingleObject(This->ppPins[i]->caps_event, -1); } - hr = S_OK; } *props = This->props; @@ -1191,7 +1189,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_active(This->my_src, 1); This->nextofs = This->nextpullofs = 0; - return hr; + return S_OK; } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) -- 2.7.4

2 6

[PATCH] comctl32: Make COMBO_WindowProc() static.
by Francois Gouget 22 Feb '18

22 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 7401a7eaec5..712e27276a5 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1714,7 +1714,7 @@ static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi) return TRUE; } -LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 ); HTHEME theme; -- 2.16.1

1 0

[PATCH] wmp: Make the WMPControls_*() functions static.
by Francois Gouget 22 Feb '18

22 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wmp/player.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index e40422d95ae..d15538a7211 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -940,7 +940,7 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; -HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = iface; @@ -1008,105 +1008,105 @@ static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstr return E_NOTIMPL; } -HRESULT WINAPI WMPControls_play(IWMPControls *iface) +static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +static HRESULT WINAPI WMPControls_pause(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +static HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pdCurrentPosition); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%f)\n", This, dCurrentPosition); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_next(IWMPControls *iface) +static HRESULT WINAPI WMPControls_next(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +static HRESULT WINAPI WMPControls_previous(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +static HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, ppIWMPMedia); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +static HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pIWMPMedia); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +static HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, plMarker); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +static HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%d)\n", This, lMarker); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +static HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pIWMPMedia); -- 2.16.1

1 0

[PATCH] secur32: Make the SecurityFunctionTable[AW] functions static.
by Francois Gouget 22 Feb '18

22 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/secur32/ntlm.c | 22 +++++++++++----------- dlls/secur32/secur32_priv.h | 15 --------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 49845c33f9b..3280fa1d25e 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -122,7 +122,7 @@ static char *ntlm_GetDomainArg(LPCWSTR domainW, INT domainW_length) /*********************************************************************** * AcquireCredentialsHandleW */ -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( +static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) @@ -414,7 +414,7 @@ static BOOL ntlm_GetCachedCredential(const SEC_WCHAR *pszTargetName, PCREDENTIAL /*********************************************************************** * InitializeSecurityContextW */ -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( +static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( PCredHandle phCredential, PCtxtHandle phContext, SEC_WCHAR *pszTargetName, ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, @@ -951,7 +951,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextA( /*********************************************************************** * AcceptSecurityContext */ -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( +static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) @@ -1317,7 +1317,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_CompleteAuthToken(PCtxtHandle phContext, /*********************************************************************** * DeleteSecurityContext */ -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) +static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) { PNegoHelper helper; @@ -1427,7 +1427,7 @@ static SecPkgInfoA *build_package_infoA( const SecPkgInfoA *info ) /*********************************************************************** * QueryContextAttributesW */ -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); @@ -1488,7 +1488,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, /*********************************************************************** * QueryContextAttributesA */ -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { switch(ulAttribute) @@ -1679,7 +1679,7 @@ static SECURITY_STATUS ntlm_CreateSignature(PNegoHelper helper, PSecBufferDesc p /*********************************************************************** * MakeSignature */ -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { PNegoHelper helper; @@ -1714,7 +1714,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, /*********************************************************************** * VerifySignature */ -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { PNegoHelper helper; @@ -1783,7 +1783,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, /*********************************************************************** * FreeCredentialsHandle */ -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle phCredential) +static SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle phCredential) { if (phCredential) { @@ -1803,7 +1803,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle phCredential) /*********************************************************************** * EncryptMessage */ -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { PNegoHelper helper; @@ -1874,7 +1874,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, /*********************************************************************** * DecryptMessage */ -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { SECURITY_STATUS ret; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 268e77ee2e1..4566fe2446f 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -190,21 +190,6 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(SEC_WCHAR *, SEC_WCHAR *, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(PCredHandle, PCtxtHandle, - SEC_WCHAR *, ULONG fContextReq, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, - PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(PCredHandle, PCtxtHandle, PSecBufferDesc, - ULONG, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; -- 2.16.1

1 0

[PATCH 2/2] krnl386.exe16: Make a couple of functions static.
by Francois Gouget 22 Feb '18

22 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/interrupts.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 4a59cdf6c05..dfeae8a78ec 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -272,7 +272,6 @@ extern void EMS_Ioctl_Handler(CONTEXT*) DECLSPEC_HIDDEN; /* interrupts.c */ extern void __wine_call_int_handler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; -extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index 70690f600e6..e1b01b7b3d2 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -185,7 +185,7 @@ static void DOSVM_PushFlags( CONTEXT *context, BOOL islong, BOOL isstub ) * Pushes interrupt frame to stack and changes instruction * pointer to interrupt handler. */ -void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) +static void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) { FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); @@ -386,7 +386,7 @@ void DOSVM_SetPMHandler16( BYTE intnum, FARPROC16 handler ) * * Execute Wine interrupt handler procedure. */ -void DOSVM_CallBuiltinHandler( CONTEXT *context, BYTE intnum ) +static void DOSVM_CallBuiltinHandler( CONTEXT *context, BYTE intnum ) { /* * FIXME: Make all builtin interrupt calls go via this routine. -- 2.16.1

1 0

[PATCH 1/2] krnl386.exe16: Avoid the DOSVM_HardwareInterruptPM() forward declaration.
by Francois Gouget 22 Feb '18

22 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/interrupts.c | 86 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 8f9dc3458e6..4a59cdf6c05 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -275,7 +275,6 @@ extern void __wine_call_int_handler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; -extern void DOSVM_HardwareInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; /* ioports.c */ diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index 298f7e467a6..70690f600e6 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -177,6 +177,49 @@ static void DOSVM_PushFlags( CONTEXT *context, BOOL islong, BOOL isstub ) } +/********************************************************************** + * DOSVM_HardwareInterruptPM + * + * Emulate call to interrupt handler in 16-bit or 32-bit protected mode. + * + * Pushes interrupt frame to stack and changes instruction + * pointer to interrupt handler. + */ +void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) +{ + FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); + + if (SELECTOROF(addr) == DOSVM_dpmi_segments->int16_sel) + { + TRACE( "builtin interrupt %02x has been invoked " + "(through vector %02x)\n", + OFFSETOF(addr)/DOSVM_STUB_PM16, intnum ); + + if (intnum == 0x25 || intnum == 0x26) + DOSVM_PushFlags( context, FALSE, FALSE ); + + DOSVM_BuildCallFrame( context, + DOSVM_IntProcRelay, + DOSVM_GetBuiltinHandler( + OFFSETOF(addr)/DOSVM_STUB_PM16 ) ); + } + else + { + TRACE( "invoking hooked interrupt %02x at %04x:%04x\n", + intnum, SELECTOROF(addr), OFFSETOF(addr) ); + + /* Push the flags and return address on the stack */ + PUSH_WORD16( context, LOWORD(context->EFlags) ); + PUSH_WORD16( context, context->SegCs ); + PUSH_WORD16( context, LOWORD(context->Eip) ); + + /* Jump to the interrupt handler */ + context->SegCs = HIWORD(addr); + context->Eip = LOWORD(addr); + } +} + + /********************************************************************** * DOSVM_EmulateInterruptPM * @@ -243,49 +286,6 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) } -/********************************************************************** - * DOSVM_HardwareInterruptPM - * - * Emulate call to interrupt handler in 16-bit or 32-bit protected mode. - * - * Pushes interrupt frame to stack and changes instruction - * pointer to interrupt handler. - */ -void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) -{ - FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); - - if (SELECTOROF(addr) == DOSVM_dpmi_segments->int16_sel) - { - TRACE( "builtin interrupt %02x has been invoked " - "(through vector %02x)\n", - OFFSETOF(addr)/DOSVM_STUB_PM16, intnum ); - - if (intnum == 0x25 || intnum == 0x26) - DOSVM_PushFlags( context, FALSE, FALSE ); - - DOSVM_BuildCallFrame( context, - DOSVM_IntProcRelay, - DOSVM_GetBuiltinHandler( - OFFSETOF(addr)/DOSVM_STUB_PM16 ) ); - } - else - { - TRACE( "invoking hooked interrupt %02x at %04x:%04x\n", - intnum, SELECTOROF(addr), OFFSETOF(addr) ); - - /* Push the flags and return address on the stack */ - PUSH_WORD16( context, LOWORD(context->EFlags) ); - PUSH_WORD16( context, context->SegCs ); - PUSH_WORD16( context, LOWORD(context->Eip) ); - - /* Jump to the interrupt handler */ - context->SegCs = HIWORD(addr); - context->Eip = LOWORD(addr); - } -} - - /********************************************************************** * DOSVM_GetPMHandler16 * -- 2.16.1

1 0

[PATCH resend2] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml
by Alex Henrie 22 Feb '18

22 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42468 dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7aeafa5e75..23c17ea978 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12143,34 +12143,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12754,6 +12868,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4bf62..abd89dbd6b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length( -- 2.16.2

2 1

[PATCH 5/5] usp10/tests: Cleanup test_ScriptTextOut2().
by Henri Verbeet 22 Feb '18

22 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 96 ++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 57 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0cfe0a9..450c8ad 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2717,23 +2717,19 @@ static void test_ScriptTextOut(HDC hdc) ok(!psc, "Got unexpected psc %p.\n", psc); } +/* The intent is to validate that the DC passed into ScriptTextOut() is used + * instead of the (possibly) invalid cached one. */ static void test_ScriptTextOut2(HDC hdc) { -/* Intent is to validate that the HDC passed into ScriptTextOut is - * used instead of the (possibly) invalid cached one - */ HRESULT hr; HDC hdc1, hdc2; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; WORD pwLogClust[256]; SCRIPT_VISATTR psva[256]; @@ -2741,67 +2737,53 @@ static void test_ScriptTextOut2(HDC hdc) int piAdvance[256]; GOFFSET pGoffset[256]; ABC pABC[256]; + BOOL ret; - /* Create an extra DC that will be used until the ScriptTextOut */ + /* Create an extra DC that will be used until the ScriptTextOut() call. */ hdc1 = CreateCompatibleDC(hdc); - ok (hdc1 != 0, "CreateCompatibleDC failed to create a DC\n"); + ok(!!hdc1, "Failed to create a DC.\n"); hdc2 = CreateCompatibleDC(hdc); - ok (hdc2 != 0, "CreateCompatibleDC failed to create a DC\n"); + ok(!!hdc2, "Failed to create a DC.\n"); - /* This is a valid test that will cause parsing to take place */ - cInChars = 5; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + /* This is a valid test that will cause parsing to take place. */ + cInChars = lstrlenW(TestItem1); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 1, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[1].iCharPos, cInChars); - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ - cInChars = 5; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = 256; - hr = ScriptShape(hdc2, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr == S_OK) { - BOOL ret; + psc = NULL; + hr = ScriptShape(hdc2, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); - /* Note hdc is needed as glyph info is not yet in psc */ - hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); + /* Note hdc is needed as glyph info is not yet in psc. */ + hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* key part!!! cached dc is being deleted */ - ret = DeleteDC(hdc2); - ok(ret, "DeleteDC should return 1 not %d\n", ret); + /* Key part! Cached DC is being deleted. */ + ret = DeleteDC(hdc2); + ok(ret, "Got unexpected ret %#x.\n", ret); - /* At this point the cached hdc (hdc2) has been destroyed, - * however, we are passing in a *real* hdc (the original hdc). - * The text should be written to that DC - */ - hr = ScriptTextOut(hdc1, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + /* At this point the cached DC (hdc2) has been destroyed. However, we are + * passing in a *real* DC (the original DC). The text should be written to + * that DC. */ + hr = ScriptTextOut(hdc1, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); - DeleteDC(hdc1); + DeleteDC(hdc1); - /* Clean up and go */ - ScriptFreeCache(&psc); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - } - } + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); } static void test_ScriptTextOut3(HDC hdc) -- 2.1.4

2 1

[PATCH 1/3] oleaut32: Don't reset property page site to NULL
by Nikolay Sivov 22 Feb '18

22 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixes the crash reported as https://bugs.winehq.org/show_bug.cgi?id=44265. There is another patch attached to this bug that allows to manually test creation/destruction sequence. dlls/oleaut32/olepropframe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 73af7451f1..1a89024885 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -308,10 +308,8 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) PropertySheetW(&property_sheet); for(i=0; i<lpParams->cPages; i++) { - if(property_page[i]) { - IPropertyPage_SetPageSite(property_page[i], NULL); + if(property_page[i]) IPropertyPage_Release(property_page[i]); - } } HeapFree(GetProcessHeap(), 0, dialogs); -- 2.16.1

1 2

[PATCH] shell32: Use global memory allocation helpers
by Nikolay Sivov 22 Feb '18

22 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/assoc.c | 36 +++++----- dlls/shell32/autocomplete.c | 33 +++++---- dlls/shell32/brsfolder.c | 12 ++-- dlls/shell32/control.c | 24 +++---- dlls/shell32/dataobject.c | 9 ++- dlls/shell32/dde.c | 58 +++++++-------- dlls/shell32/dialogs.c | 32 ++++----- dlls/shell32/ebrowser.c | 15 ++-- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/folders.c | 13 ++-- dlls/shell32/iconcache.c | 26 +++---- dlls/shell32/pidl.c | 4 +- dlls/shell32/shell32_main.c | 24 +++---- dlls/shell32/shell32_main.h | 7 +- dlls/shell32/shelldispatch.c | 40 +++++------ dlls/shell32/shellitem.c | 38 +++++----- dlls/shell32/shelllink.c | 151 +++++++++++++++++++--------------------- dlls/shell32/shellole.c | 16 ++--- dlls/shell32/shellord.c | 16 ++--- dlls/shell32/shellpath.c | 64 ++++++++--------- dlls/shell32/shfldr_fs.c | 7 +- dlls/shell32/shfldr_netplaces.c | 4 +- dlls/shell32/shfldr_unixfs.c | 34 ++++----- dlls/shell32/shlexec.c | 90 ++++++++++++------------ dlls/shell32/shlfileop.c | 50 ++++++------- dlls/shell32/shlfsbind.c | 6 +- dlls/shell32/shlmenu.c | 31 +++++---- dlls/shell32/shlview.c | 8 +-- dlls/shell32/shlview_cmenu.c | 6 +- dlls/shell32/systray.c | 5 +- dlls/shell32/trash.c | 33 +++++---- dlls/shell32/xdg.c | 19 ++--- 32 files changed, 451 insertions(+), 464 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 1ccf0e2d54..a9eb70e933 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -253,7 +253,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( 0, KEY_READ, &This->hkeyProgID); - HeapFree(GetProcessHeap(), 0, progId); + heap_free(progId); return S_OK; } @@ -278,13 +278,13 @@ static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD * return HRESULT_FROM_WIN32(ret); if (!size) return E_FAIL; - *data = HeapAlloc(GetProcessHeap(), 0, size); + *data = heap_alloc(size); if (!*data) return E_OUTOFMEMORY; ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); if (ret != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, *data); + heap_free(*data); return HRESULT_FROM_WIN32(ret); } if(data_size) @@ -312,7 +312,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra HKEY hkeyFile; ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, KEY_READ, &hkeyFile); - HeapFree(GetProcessHeap(), 0, filetype); + heap_free(filetype); if (ret == ERROR_SUCCESS) { @@ -344,7 +344,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra } max_subkey_len++; - extra_from_reg = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + extra_from_reg = heap_alloc(max_subkey_len * sizeof(WCHAR)); if (!extra_from_reg) { RegCloseKey(hkeyShell); @@ -354,7 +354,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra ret = RegEnumKeyExW(hkeyShell, 0, extra_from_reg, &max_subkey_len, NULL, NULL, NULL, NULL); if (ret) { - HeapFree(GetProcessHeap(), 0, extra_from_reg); + heap_free(extra_from_reg); RegCloseKey(hkeyShell); return HRESULT_FROM_WIN32(ret); } @@ -364,7 +364,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra /* open verb subkey */ ret = RegOpenKeyExW(hkeyShell, extra, 0, KEY_READ, &hkeyVerb); - HeapFree(GetProcessHeap(), 0, extra_from_reg); + heap_free(extra_from_reg); RegCloseKey(hkeyShell); if (ret) return HRESULT_FROM_WIN32(ret); @@ -415,7 +415,7 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); } - HeapFree(GetProcessHeap(), 0, pszCommand); + heap_free(pszCommand); if (!*len) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); return S_OK; @@ -530,7 +530,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (SUCCEEDED(hr)) { hr = ASSOC_ReturnString(flags, pszOut, pcchOut, command, strlenW(command) + 1); - HeapFree(GetProcessHeap(), 0, command); + heap_free(command); } return hr; } @@ -554,7 +554,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); } hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); - HeapFree(GetProcessHeap(), 0, docName); + heap_free(docName); return hr; } @@ -582,7 +582,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( retval = GetFileVersionInfoSizeW(path, &size); if (!retval) goto get_friendly_name_fail; - verinfoW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); + verinfoW = heap_alloc_zero(retval); if (!verinfoW) return E_OUTOFMEMORY; if (!GetFileVersionInfoW(path, 0, retval, verinfoW)) @@ -601,7 +601,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); hr = ASSOC_ReturnString(flags, pszOut, pcchOut, bufW, len); - HeapFree(GetProcessHeap(), 0, verinfoW); + heap_free(verinfoW); return hr; } } @@ -611,7 +611,7 @@ get_friendly_name_fail: PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); hr = ASSOC_ReturnString(flags, pszOut, pcchOut, path, strlenW(path) + 1); - HeapFree(GetProcessHeap(), 0, verinfoW); + heap_free(verinfoW); return hr; } @@ -626,7 +626,7 @@ get_friendly_name_fail: ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, NULL, &size); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); - contentType = HeapAlloc(GetProcessHeap(), 0, size); + contentType = heap_alloc(size); if (contentType != NULL) { ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); @@ -634,7 +634,7 @@ get_friendly_name_fail: hr = ASSOC_ReturnString(flags, pszOut, pcchOut, contentType, strlenW(contentType) + 1); else hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, contentType); + heap_free(contentType); } else hr = E_OUTOFMEMORY; @@ -652,7 +652,7 @@ get_friendly_name_fail: ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); if (ret == ERROR_SUCCESS) { - WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); + WCHAR *icon = heap_alloc(size); if (icon) { ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); @@ -660,7 +660,7 @@ get_friendly_name_fail: hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); else hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, icon); + heap_free(icon); } else hr = E_OUTOFMEMORY; @@ -776,7 +776,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, hres = ASSOC_GetValue(This->hkeyProgID, edit_flags, &data, &size); if(SUCCEEDED(hres) && pcbOut) hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hres; default: FIXME("Unsupported ASSOCDATA value: %d\n", assocdata); diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 1a02c8301e..b411c1b675 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -130,12 +130,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; if (control && This->quickComplete) { - hwndQCText = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); + hwndQCText = heap_alloc((lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); sel = sprintfW(hwndQCText, This->quickComplete, hwndText); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); SendMessageW(hwnd, EM_SETSEL, 0, sel); - HeapFree(GetProcessHeap(), 0, hwndQCText); + heap_free(hwndQCText); } ShowWindow(This->hwndListBox, SW_HIDE); @@ -173,11 +172,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, int len; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + msg = heap_alloc((len + 1)*sizeof(WCHAR)); SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg)); - HeapFree(GetProcessHeap(), 0, msg); + heap_free(msg); } else { SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)This->txtbackup); SendMessageW(hwnd, EM_SETSEL, lstrlenW(This->txtbackup), lstrlenW(This->txtbackup)); @@ -209,9 +208,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); - HeapFree(GetProcessHeap(), 0, This->txtbackup); + heap_free(This->txtbackup); len = strlenW(hwndText); - This->txtbackup = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + This->txtbackup = heap_alloc((len + 1)*sizeof(WCHAR)); lstrcpyW(This->txtbackup, hwndText); /* Returns if there is no text to search and we doesn't want to display all the entries */ @@ -307,12 +306,12 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (sel < 0) break; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + msg = heap_alloc((len + 1)*sizeof(WCHAR)); SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg)); ShowWindow(hwnd, SW_HIDE); - HeapFree(GetProcessHeap(), 0, msg); + heap_free(msg); break; default: return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); @@ -399,11 +398,11 @@ static ULONG WINAPI IAutoComplete2_fnRelease( if (!refCount) { TRACE("destroying IAutoComplete(%p)\n", This); - HeapFree(GetProcessHeap(), 0, This->quickComplete); - HeapFree(GetProcessHeap(), 0, This->txtbackup); + heap_free(This->quickComplete); + heap_free(This->txtbackup); if (This->enumstr) IEnumString_Release(This->enumstr); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return refCount; } @@ -479,7 +478,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LONG len; /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); + key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); strcpyW(key, pwzsRegKeyPath); value = strrchrW(key, '\\'); *value = 0; @@ -493,16 +492,16 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (res == ERROR_SUCCESS) { res = RegQueryValueW(hKey, value, result, &len); if (res == ERROR_SUCCESS) { - This->quickComplete = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + This->quickComplete = heap_alloc(len*sizeof(WCHAR)); strcpyW(This->quickComplete, result); } RegCloseKey(hKey); } - HeapFree(GetProcessHeap(), 0, key); + heap_free(key); } if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); + This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); lstrcpyW(This->quickComplete, pwszQuickComplete); } @@ -658,7 +657,7 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) return CLASS_E_NOAGGREGATION; - lpac = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAutoCompleteImpl)); + lpac = heap_alloc_zero(sizeof(*lpac)); if (!lpac) return E_OUTOFMEMORY; diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index a473874a6b..fc7b5b6b74 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -951,13 +951,13 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL return BrsFolder_OnSetSelectionW(info, selection, is_str); if ((length = MultiByteToWideChar(CP_ACP, 0, selection, -1, NULL, 0)) && - (selectionW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR))) && + (selectionW = heap_alloc(length * sizeof(WCHAR))) && MultiByteToWideChar(CP_ACP, 0, selection, -1, selectionW, length)) { result = BrsFolder_OnSetSelectionW(info, selectionW, is_str); } - HeapFree(GetProcessHeap(), 0, selectionW); + heap_free(selectionW); return result; } @@ -1071,14 +1071,14 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi) bi.hwndOwner = lpbi->hwndOwner; bi.pidlRoot = lpbi->pidlRoot; if (lpbi->pszDisplayName) - bi.pszDisplayName = HeapAlloc( GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) ); + bi.pszDisplayName = heap_alloc( MAX_PATH * sizeof(WCHAR) ); else bi.pszDisplayName = NULL; if (lpbi->lpszTitle) { len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 ); - title = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + title = heap_alloc( len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, title, len ); } else @@ -1094,9 +1094,9 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi) { WideCharToMultiByte( CP_ACP, 0, bi.pszDisplayName, -1, lpbi->pszDisplayName, MAX_PATH, 0, NULL); - HeapFree( GetProcessHeap(), 0, bi.pszDisplayName ); + heap_free( bi.pszDisplayName ); } - HeapFree(GetProcessHeap(), 0, title); + heap_free(title); lpbi->iImage = bi.iImage; return lpid; } diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 88d0ae81c9..66fbf17954 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -55,8 +55,8 @@ void Control_UnloadApplet(CPlApplet* applet) if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); list_remove( &applet->entry ); - HeapFree(GetProcessHeap(), 0, applet->cmd); - HeapFree(GetProcessHeap(), 0, applet); + heap_free(applet->cmd); + heap_free(applet); } CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) @@ -67,13 +67,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) CPLINFO info; NEWCPLINFOW newinfo; - if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) + if (!(applet = heap_alloc_zero(sizeof(*applet)))) return applet; len = ExpandEnvironmentStringsW(cmd, NULL, 0); if (len > 0) { - if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)))) + if (!(applet->cmd = heap_alloc((len+1) * sizeof(WCHAR)))) { WARN("Cannot allocate memory for applet path\n"); goto theError; @@ -180,8 +180,8 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) theError: FreeLibrary(applet->hModule); - HeapFree(GetProcessHeap(), 0, applet->cmd); - HeapFree(GetProcessHeap(), 0, applet); + heap_free(applet->cmd); + heap_free(applet); return NULL; } @@ -289,7 +289,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) { for (i = 0; i < applet->count; i++) { /* set up a CPlItem for this particular subprogram */ - item = HeapAlloc(GetProcessHeap(), 0, sizeof(CPlItem)); + item = heap_alloc(sizeof(CPlItem)); if (!item) continue; @@ -366,7 +366,7 @@ static void Control_FreeCPlItems(HWND hWnd, CPanel *panel) if (!GetMenuItemInfoW(hSubMenu, i, FALSE, &mii)) continue; - HeapFree(GetProcessHeap(), 0, (LPVOID) mii.dwItemData); + heap_free((void *)mii.dwItemData); } } @@ -724,7 +724,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) BOOL quoted = FALSE; CPlApplet *applet; - buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); + buffer = heap_alloc((lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; end = lstrcpyW(buffer, wszCmd); @@ -813,7 +813,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) Control_UnloadApplet(applet); } - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } /************************************************************************* @@ -844,12 +844,12 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) { DWORD len = MultiByteToWideChar(CP_ACP, 0, cmd, -1, NULL, 0 ); - LPWSTR wszCmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + LPWSTR wszCmd = heap_alloc(len * sizeof(WCHAR)); if (wszCmd && MultiByteToWideChar(CP_ACP, 0, cmd, -1, wszCmd, len )) { Control_RunDLLW(hWnd, hInst, wszCmd, nCmdShow); } - HeapFree(GetProcessHeap(), 0, wszCmd); + heap_free(wszCmd); } /************************************************************************* diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index cc7b63e5d0..ab720559f6 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -99,8 +99,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) { TRACE(" destroying IEnumFORMATETC(%p)\n",This); SHFree (This->pFmt); - HeapFree(GetProcessHeap(),0,This); - return 0; + heap_free(This); } return refCount; } @@ -173,7 +172,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) IEnumFORMATETCImpl* ef; DWORD size=cfmt * sizeof(FORMATETC); - ef = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumFORMATETCImpl)); + ef = heap_alloc_zero(sizeof(*ef)); if(ef) { @@ -276,7 +275,7 @@ static ULONG WINAPI IDataObject_fnRelease(IDataObject *iface) TRACE(" destroying IDataObject(%p)\n",This); _ILFreeaPidl(This->apidl, This->cidl); ILFree(This->pidl), - HeapFree(GetProcessHeap(),0,This); + heap_free(This); } return refCount; } @@ -432,7 +431,7 @@ IDataObject* IDataObject_Constructor(HWND hwndOwner, { IDataObjectImpl* dto; - dto = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDataObjectImpl)); + dto = heap_alloc_zero(sizeof(*dto)); if (dto) { diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 365ce1cce3..0283a45760 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -89,7 +89,7 @@ static WCHAR *get_programs_path(const WCHAR *name) SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); len = lstrlenW(programs) + 1 + lstrlenW(name); - path = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*path)); + path = heap_alloc((len + 1) * sizeof(*path)); lstrcpyW(path, programs); lstrcatW(path, slashW); lstrcatW(path, name); @@ -112,7 +112,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, WIN32_FIND_DATAW finddata; HANDLE hfind; int len = 1; - WCHAR *groups_data = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + WCHAR *groups_data = heap_alloc(sizeof(WCHAR)); char *groups_dataA; HDDEDATA ret; @@ -127,7 +127,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, lstrcmpW(finddata.cFileName, dotW) && lstrcmpW(finddata.cFileName, dotdotW)) { len += lstrlenW(finddata.cFileName) + 2; - groups_data = HeapReAlloc(GetProcessHeap(), 0, groups_data, len * sizeof(WCHAR)); + groups_data = heap_realloc(groups_data, len * sizeof(WCHAR)); lstrcatW(groups_data, finddata.cFileName); lstrcatW(groups_data, newlineW); } @@ -136,13 +136,13 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, } len = WideCharToMultiByte(CP_ACP, 0, groups_data, -1, NULL, 0, NULL, NULL); - groups_dataA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + groups_dataA = heap_alloc(len * sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, groups_data, -1, groups_dataA, len, NULL, NULL); ret = DdeCreateDataHandle(dwDDEInst, (BYTE *)groups_dataA, len, 0, hszGroups, uFmt, 0); - HeapFree(GetProcessHeap(), 0, groups_dataA); - HeapFree(GetProcessHeap(), 0, groups_data); - HeapFree(GetProcessHeap(), 0, programs); + heap_free(groups_dataA); + heap_free(groups_data); + heap_free(programs); return ret; } else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) @@ -184,7 +184,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) HeapFree(GetProcessHeap(), 0, last_group); + if (last_group) heap_free(last_group); last_group = path; } else if (!strcmpiW(command, delete_groupW)) @@ -197,7 +197,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) path = get_programs_path(argv[0]); - path2 = HeapAlloc(GetProcessHeap(), 0, (strlenW(path) + 2) * sizeof(*path)); + path2 = heap_alloc((strlenW(path) + 2) * sizeof(*path)); strcpyW(path2, path); path2[strlenW(path) + 1] = 0; @@ -207,8 +207,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ret = SHFileOperationW(&shfos); - HeapFree(GetProcessHeap(), 0, path2); - HeapFree(GetProcessHeap(), 0, path); + heap_free(path2); + heap_free(path); if (ret || shfos.fAnyOperationsAborted) return DDE_FNOTPROCESSED; } @@ -224,7 +224,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) HeapFree(GetProcessHeap(), 0, last_group); + if (last_group) heap_free(last_group); last_group = path; } else if (!strcmpiW(command, add_itemW)) @@ -247,10 +247,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) IShellLinkW_Release(link); return DDE_FNOTPROCESSED; } - path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + path = heap_alloc(len * sizeof(WCHAR)); SearchPathW(NULL, argv[0], dotexeW, len, path, NULL); IShellLinkW_SetPath(link, path); - HeapFree(GetProcessHeap(), 0, path); + heap_free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); if (argc >= 4) IShellLinkW_SetIconLocation(link, argv[2], atoiW(argv[3])); @@ -270,7 +270,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + strlenW(argv[1]) + 5) * sizeof(*name)); + name = heap_alloc((strlenW(last_group) + 1 + strlenW(argv[1]) + 5) * sizeof(*name)); lstrcpyW(name, last_group); lstrcatW(name, slashW); lstrcatW(name, argv[1]); @@ -280,7 +280,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) { const WCHAR *filename = PathFindFileNameW(argv[0]); int len = PathFindExtensionW(filename) - filename; - name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + len + 5) * sizeof(*name)); + name = heap_alloc((strlenW(last_group) + 1 + len + 5) * sizeof(*name)); lstrcpyW(name, last_group); lstrcatW(name, slashW); lstrcpynW(name+strlenW(name), filename, len + 1); @@ -288,7 +288,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } hres = IPersistFile_Save(file, name, TRUE); - HeapFree(GetProcessHeap(), 0, name); + heap_free(name); IPersistFile_Release(file); IShellLinkW_Release(link); @@ -301,7 +301,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + strlenW(argv[0]) + 5) * sizeof(*name)); + name = heap_alloc((strlenW(last_group) + 1 + strlenW(argv[0]) + 5) * sizeof(*name)); lstrcpyW(name, last_group); lstrcatW(name, slashW); lstrcatW(name, argv[0]); @@ -309,7 +309,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ret = DeleteFileW(name); - HeapFree(GetProcessHeap(), 0, name); + heap_free(name); if (!ret) return DDE_FNOTPROCESSED; } @@ -341,7 +341,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) while (*command == '[') { argc = 0; - argv = HeapAlloc(GetProcessHeap(), 0, sizeof(*argv)); + argv = heap_alloc(sizeof(*argv)); command++; while (*command == ' ') command++; @@ -370,7 +370,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) } argc++; - argv = HeapReAlloc(GetProcessHeap(), 0, argv, argc * sizeof(*argv)); + argv = heap_realloc(argv, argc * sizeof(*argv)); argv[argc-1] = strndupW(command, p - command); command = p; @@ -396,9 +396,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) ret = DDE_FNOTPROCESSED; } - HeapFree(GetProcessHeap(), 0, opcode); - for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]); - HeapFree(GetProcessHeap(), 0, argv); + heap_free(opcode); + for (i = 0; i < argc; i++) heap_free(argv[i]); + heap_free(argv); if (ret == DDE_FNOTPROCESSED) break; } @@ -407,9 +407,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) error: ERR("failed to parse command %s\n", debugstr_w(original)); - HeapFree(GetProcessHeap(), 0, opcode); - for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]); - HeapFree(GetProcessHeap(), 0, argv); + heap_free(opcode); + for (i = 0; i < argc; i++) heap_free(argv[i]); + heap_free(argv); return DDE_FNOTPROCESSED; } @@ -421,14 +421,14 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) len = DdeGetData(hdata, NULL, 0, 0); if (!len) return DDE_FNOTPROCESSED; - command = HeapAlloc(GetProcessHeap(), 0, len); + command = heap_alloc(len); DdeGetData(hdata, (BYTE *)command, len, 0); TRACE("conv=%p topic=%s data=%s\n", hconv, debugstr_hsz(hszTopic), debugstr_w(command)); ret = parse_dde_command(hszTopic, command); - HeapFree(GetProcessHeap(), 0, command); + heap_free(command); return ret; } diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 1a583f2858..48321364d0 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -121,7 +121,7 @@ static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) WCHAR *dest, *result, *result_end=NULL; static const WCHAR dotexeW[] = {'.','e','x','e',0}; - result = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(strlenW(cmdline)+5)); + result = heap_alloc(sizeof(WCHAR)*(strlenW(cmdline)+5)); src = cmdline; dest = result; @@ -161,7 +161,7 @@ static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) } else { - HeapFree(GetProcessHeap(), 0, result); + heap_free(result); return NULL; } } @@ -216,7 +216,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR ZeroMemory (&sei, sizeof(sei)) ; sei.cbSize = sizeof(sei) ; - psz = HeapAlloc( GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR) ); + psz = heap_alloc( (ic + 1)*sizeof(WCHAR) ); GetWindowTextW (htxt, psz, ic + 1) ; /* according to http://www.codeproject.com/KB/shell/runfiledlg.aspx we should send a @@ -233,8 +233,8 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR if (!ShellExecuteExW( &sei )) { - HeapFree(GetProcessHeap(), 0, psz); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(psz); + heap_free(parent); SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; return TRUE ; } @@ -243,8 +243,8 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR GetWindowTextA (htxt, (LPSTR)psz, ic + 1) ; FillList (htxt, (LPSTR)psz, FALSE) ; - HeapFree(GetProcessHeap(), 0, psz); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(psz); + heap_free(parent); EndDialog (hwnd, 0); } } @@ -326,14 +326,14 @@ static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault) if (icList > 0) { - pszList = HeapAlloc( GetProcessHeap(), 0, icList) ; + pszList = heap_alloc(icList) ; if (ERROR_SUCCESS != RegQueryValueExA (hkey, "MRUList", NULL, NULL, (LPBYTE)pszList, &icList)) MessageBoxA (hCb, "Unable to grab MRUList !", "Nix", MB_OK) ; } else { icList = 1 ; - pszList = HeapAlloc( GetProcessHeap(), 0, icList) ; + pszList = heap_alloc(icList) ; pszList[0] = 0 ; } @@ -347,9 +347,9 @@ static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault) if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, NULL, &icCmd)) MessageBoxA (hCb, "Unable to grab size of index", "Nix", MB_OK) ; if( pszCmd ) - pszCmd = HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd) ; + pszCmd = heap_realloc(pszCmd, icCmd) ; else - pszCmd = HeapAlloc(GetProcessHeap(), 0, icCmd) ; + pszCmd = heap_alloc(icCmd) ; if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, (LPBYTE)pszCmd, &icCmd)) MessageBoxA (hCb, "Unable to grab index", "Nix", MB_OK) ; @@ -416,9 +416,9 @@ static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault) cMatch = ++cMax ; if( pszList ) - pszList = HeapReAlloc(GetProcessHeap(), 0, pszList, ++icList) ; + pszList = heap_realloc(pszList, ++icList) ; else - pszList = HeapAlloc(GetProcessHeap(), 0, ++icList) ; + pszList = heap_alloc(++icList) ; memmove (&pszList[1], pszList, icList - 1) ; pszList[0] = cMatch ; szIndex[0] = cMatch ; @@ -427,9 +427,9 @@ static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault) RegSetValueExA (hkey, "MRUList", 0, REG_SZ, (LPBYTE)pszList, strlen (pszList) + 1) ; - HeapFree( GetProcessHeap(), 0, pszCmd) ; - HeapFree( GetProcessHeap(), 0, pszList) ; - } + heap_free(pszCmd) ; + heap_free(pszList) ; +} /************************************************************************* * RunFileDlgA [internal] diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 0a6010d378..2d5a30aabb 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -112,7 +112,7 @@ static void events_unadvise_all(ExplorerBrowserImpl *This) TRACE("Removing %p\n", client); list_remove(&client->entry); IExplorerBrowserEvents_Release(client->pebe); - HeapFree(GetProcessHeap(), 0, client); + heap_free(client); } } @@ -184,7 +184,7 @@ static void travellog_remove_entry(ExplorerBrowserImpl *This, travellog_entry *e list_remove(&entry->entry); ILFree(entry->pidl); - HeapFree(GetProcessHeap(), 0, entry); + heap_free(entry); This->travellog_count--; } @@ -216,7 +216,7 @@ static void travellog_add_entry(ExplorerBrowserImpl *This, LPITEMIDLIST pidl) } /* Create and add the new entry */ - new = HeapAlloc(GetProcessHeap(), 0, sizeof(travellog_entry)); + new = heap_alloc(sizeof(*new)); new->pidl = ILClone(pidl); list_add_tail(&This->travellog, &new->entry); This->travellog_cursor = new; @@ -851,8 +851,7 @@ static ULONG WINAPI IExplorerBrowser_fnRelease(IExplorerBrowser *iface) IObjectWithSite_SetSite(&This->IObjectWithSite_iface, NULL); - HeapFree(GetProcessHeap(), 0, This); - return 0; + heap_free(This); } return ref; @@ -1017,7 +1016,7 @@ static HRESULT WINAPI IExplorerBrowser_fnAdvise(IExplorerBrowser *iface, event_client *client; TRACE("%p (%p, %p)\n", This, psbe, pdwCookie); - client = HeapAlloc(GetProcessHeap(), 0, sizeof(event_client)); + client = heap_alloc(sizeof(*client)); client->pebe = psbe; client->cookie = ++This->events_next_cookie; @@ -1042,7 +1041,7 @@ static HRESULT WINAPI IExplorerBrowser_fnUnadvise(IExplorerBrowser *iface, { list_remove(&client->entry); IExplorerBrowserEvents_Release(client->pebe); - HeapFree(GetProcessHeap(), 0, client); + heap_free(client); return S_OK; } } @@ -2079,7 +2078,7 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi if(pUnkOuter) return CLASS_E_NOAGGREGATION; - eb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ExplorerBrowserImpl)); + eb = heap_alloc_zero(sizeof(*eb)); eb->ref = 1; eb->IExplorerBrowser_iface.lpVtbl = &vt_IExplorerBrowser; eb->IShellBrowser_iface.lpVtbl = &vt_IShellBrowser; diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index e555d6efe0..3c28426ce4 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -186,7 +186,7 @@ static ULONG WINAPI IEnumIDList_fnRelease(IEnumIDList *iface) SHFree(cur->pidl); SHFree(cur); } - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return refCount; @@ -295,7 +295,7 @@ static const IEnumIDListVtbl eidlvt = IEnumIDListImpl *IEnumIDList_Constructor(void) { - IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), 0, sizeof(*lpeidl)); + IEnumIDListImpl *lpeidl = heap_alloc(sizeof(*lpeidl)); if (lpeidl) { diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 9307b08858..c18369f080 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -125,8 +125,7 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) { TRACE(" destroying IExtractIcon(%p)\n",This); SHFree(This->pidl); - HeapFree(GetProcessHeap(),0,This); - return 0; + heap_free(This); } return refCount; } @@ -419,14 +418,14 @@ static HRESULT WINAPI IExtractIconA_fnGetIconLocation(IExtractIconA * iface, UIN { IExtractIconWImpl *This = impl_from_IExtractIconA(iface); HRESULT ret; - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); + LPWSTR lpwstrFile = heap_alloc(cchMax * sizeof(WCHAR)); TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); ret = IExtractIconW_GetIconLocation(&This->IExtractIconW_iface, uFlags, lpwstrFile, cchMax, piIndex, pwFlags); WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + heap_free(lpwstrFile); TRACE("-- %s %x\n", szIconFile, *piIndex); return ret; @@ -440,14 +439,14 @@ static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszF IExtractIconWImpl *This = impl_from_IExtractIconA(iface); HRESULT ret; INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + LPWSTR lpwstrFile = heap_alloc(len * sizeof(WCHAR)); TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len); ret = IExtractIconW_Extract(&This->IExtractIconW_iface, lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + heap_free(lpwstrFile); return ret; } @@ -537,7 +536,7 @@ static IExtractIconWImpl *extracticon_create(LPCITEMIDLIST pidl) TRACE("%p\n", pidl); - ei = HeapAlloc(GetProcessHeap(), 0, sizeof(*ei)); + ei = heap_alloc(sizeof(*ei)); ei->ref=1; ei->IExtractIconW_iface.lpVtbl = &eivt; ei->IExtractIconA_iface.lpVtbl = &eiavt; diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index fc4e703799..8b864df5e8 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -316,7 +316,7 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI lpsice = SHAlloc(sizeof(SIC_ENTRY)); GetFullPathNameW(sSourceFile, MAX_PATH, path, NULL); - lpsice->sSourceFile = HeapAlloc( GetProcessHeap(), 0, (strlenW(path)+1)*sizeof(WCHAR) ); + lpsice->sSourceFile = heap_alloc( (strlenW(path)+1)*sizeof(WCHAR) ); strcpyW( lpsice->sSourceFile, path ); lpsice->dwSourceIndex = dwSourceIndex; @@ -327,7 +327,7 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI index = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); if ( INVALID_INDEX == index ) { - HeapFree(GetProcessHeap(), 0, lpsice->sSourceFile); + heap_free(lpsice->sSourceFile); SHFree(lpsice); ret = INVALID_INDEX; } @@ -492,7 +492,7 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context */ static INT CALLBACK sic_free( LPVOID ptr, LPVOID lparam ) { - HeapFree(GetProcessHeap(), 0, ((LPSIC_ENTRY)ptr)->sSourceFile); + heap_free(((LPSIC_ENTRY)ptr)->sSourceFile); SHFree(ptr); return TRUE; } @@ -746,12 +746,12 @@ static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateD WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_a(szPath), nIndex, bSimulateDoc); len = MultiByteToWideChar( CP_ACP, 0, szPath, -1, NULL, 0 ); - szTemp = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + szTemp = heap_alloc( len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, szPath, -1, szTemp, len ); ret = SIC_GetIconIndex( szTemp, nIndex, 0 ); - HeapFree( GetProcessHeap(), 0, szTemp ); + heap_free( szTemp ); return ret; } @@ -790,7 +790,7 @@ UINT WINAPI ExtractIconExA(LPCSTR lpszFile, INT nIconIndex, HICON * phiconLarge, { UINT ret = 0; INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + LPWSTR lpwstrFile = heap_alloc( len * sizeof(WCHAR)); TRACE("%s %i %p %p %i\n", lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); @@ -798,7 +798,7 @@ UINT WINAPI ExtractIconExA(LPCSTR lpszFile, INT nIconIndex, HICON * phiconLarge, { MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); ret = ExtractIconExW(lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + heap_free(lpwstrFile); } return ret; } @@ -818,7 +818,7 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp * lpIconPath itself is supposed to be large enough, so make sure lpIconPathW * is large enough too. Yes, I am puking too. */ - LPWSTR lpIconPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + LPWSTR lpIconPathW = heap_alloc(MAX_PATH * sizeof(WCHAR)); TRACE("%p %s %p\n", hInst, debugstr_a(lpIconPath), lpiIcon); @@ -827,7 +827,7 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, lpIconPathW, len); hIcon = ExtractAssociatedIconW(hInst, lpIconPathW, lpiIcon); WideCharToMultiByte(CP_ACP, 0, lpIconPathW, -1, lpIconPath, MAX_PATH , NULL, NULL); - HeapFree(GetProcessHeap(), 0, lpIconPathW); + heap_free(lpIconPathW); } return hIcon; } @@ -896,13 +896,13 @@ HICON WINAPI ExtractAssociatedIconExA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD { HICON ret; INT len = MultiByteToWideChar( CP_ACP, 0, lpIconPath, -1, NULL, 0 ); - LPWSTR lpwstrFile = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + LPWSTR lpwstrFile = heap_alloc( len * sizeof(WCHAR) ); TRACE("%p %s %p %p)\n", hInst, lpIconPath, lpiIconIdx, lpiIconId); MultiByteToWideChar( CP_ACP, 0, lpIconPath, -1, lpwstrFile, len ); ret = ExtractAssociatedIconExW(hInst, lpwstrFile, lpiIconIdx, lpiIconId); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + heap_free(lpwstrFile); return ret; } @@ -943,13 +943,13 @@ HRESULT WINAPI SHDefExtractIconA(LPCSTR pszIconFile, int iIndex, UINT uFlags, { HRESULT ret; INT len = MultiByteToWideChar(CP_ACP, 0, pszIconFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + LPWSTR lpwstrFile = heap_alloc(len * sizeof(WCHAR)); TRACE("%s %d 0x%08x %p %p %d\n", pszIconFile, iIndex, uFlags, phiconLarge, phiconSmall, nIconSize); MultiByteToWideChar(CP_ACP, 0, pszIconFile, -1, lpwstrFile, len); ret = SHDefExtractIconW(lpwstrFile, iIndex, uFlags, phiconLarge, phiconSmall, nIconSize); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + heap_free(lpwstrFile); return ret; } diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 72169d592d..e11a918c32 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1063,13 +1063,13 @@ LPITEMIDLIST SHSimpleIDListFromPathA(LPCSTR lpszPath) if (lpszPath) { len = MultiByteToWideChar(CP_ACP, 0, lpszPath, -1, NULL, 0); - wPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + wPath = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpszPath, -1, wPath, len); } _ILParsePathW(wPath, NULL, TRUE, &pidl, NULL); - HeapFree(GetProcessHeap(), 0, wPath); + heap_free(wPath); TRACE("%s %p\n", debugstr_a(lpszPath), pidl); return pidl; } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 445cd59db9..dd0f6e71de 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -723,8 +723,8 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, while ((hr = SIC_get_location( psfi->iIcon, file, &size, &icon_idx )) == E_NOT_SUFFICIENT_BUFFER) { - if (file == buf) file = HeapAlloc( GetProcessHeap(), 0, size ); - else file = HeapReAlloc( GetProcessHeap(), 0, file, size ); + if (file == buf) file = heap_alloc( size ); + else file = heap_realloc( file, size ); if (!file) break; } if (SUCCEEDED(hr)) @@ -732,7 +732,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, ret = PrivateExtractIconsW( file, icon_idx, width, height, &psfi->hIcon, 0, 1, 0); if (ret == 0 || ret == (UINT)-1) hr = E_FAIL; } - if (file != buf) HeapFree( GetProcessHeap(), 0, file ); + if (file != buf) heap_free( file ); } } } @@ -783,7 +783,7 @@ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, else { len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); - temppath = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + temppath = heap_alloc(len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, temppath, len); pathW = temppath; } @@ -816,7 +816,7 @@ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, } } - HeapFree(GetProcessHeap(), 0, temppath); + heap_free(temppath); return ret; } @@ -855,7 +855,7 @@ HICON WINAPI ExtractIconA(HINSTANCE hInstance, const char *file, UINT nIconIndex fileW = strdupAtoW(file); ret = ExtractIconW(hInstance, fileW, nIconIndex); - HeapFree(GetProcessHeap(), 0, fileW); + heap_free(fileW); return ret; } @@ -1037,7 +1037,7 @@ static void add_authors( HWND list ) if (!strA) return; sizeW = MultiByteToWideChar( CP_UTF8, 0, strA, sizeA, NULL, 0 ) + 1; - if (!(strW = HeapAlloc( GetProcessHeap(), 0, sizeW * sizeof(WCHAR) ))) return; + if (!(strW = heap_alloc( sizeW * sizeof(WCHAR) ))) return; MultiByteToWideChar( CP_UTF8, 0, strA, sizeA, strW, sizeW ); strW[sizeW - 1] = 0; @@ -1051,7 +1051,7 @@ static void add_authors( HWND list ) SendMessageW( list, LB_ADDSTRING, -1, (LPARAM)start ); start = end; } - HeapFree( GetProcessHeap(), 0, strW ); + heap_free( strW ); } /************************************************************************* @@ -1148,20 +1148,20 @@ BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIc if (szApp) { len = MultiByteToWideChar(CP_ACP, 0, szApp, -1, NULL, 0); - appW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + appW = heap_alloc( len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szApp, -1, appW, len); } if (szOtherStuff) { len = MultiByteToWideChar(CP_ACP, 0, szOtherStuff, -1, NULL, 0); - otherW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + otherW = heap_alloc( len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szOtherStuff, -1, otherW, len); } ret = ShellAboutW(hWnd, appW, otherW, hIcon); - HeapFree(GetProcessHeap(), 0, otherW); - HeapFree(GetProcessHeap(), 0, appW); + heap_free(otherW); + heap_free(appW); return ret; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index b65141f489..11a96309e8 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -35,6 +35,7 @@ #include "undocshell.h" #include "shlobj.h" #include "shellapi.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/list.h" @@ -232,7 +233,7 @@ static inline WCHAR *strdupW(const WCHAR *src) { WCHAR *dest; if (!src) return NULL; - dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(*dest)); + dest = heap_alloc((lstrlenW(src) + 1) * sizeof(*dest)); if (dest) lstrcpyW(dest, src); return dest; @@ -242,7 +243,7 @@ static inline WCHAR *strndupW(const WCHAR *src, DWORD len) { WCHAR *dest; if (!src) return NULL; - dest = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*dest)); + dest = heap_alloc((len + 1) * sizeof(*dest)); if (dest) { memcpy(dest, src, len * sizeof(WCHAR)); @@ -259,7 +260,7 @@ static inline WCHAR *strdupAtoW(const char *str) if (!str) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ret = heap_alloc(len * sizeof(WCHAR)); if (ret) MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 11890f1da3..2dd52a61c1 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -234,7 +234,7 @@ static ULONG WINAPI FolderItemVerbImpl_Release(FolderItemVerb *iface) { IContextMenu_Release(This->contextmenu); SysFreeString(This->name); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -346,7 +346,7 @@ static HRESULT FolderItemVerb_Constructor(IContextMenu *contextmenu, BSTR name, TRACE("%p, %s\n", contextmenu, debugstr_w(name)); - This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbImpl)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -404,7 +404,7 @@ static ULONG WINAPI FolderItemVerbsImpl_Release(FolderItemVerbs *iface) { IContextMenu_Release(This->contextmenu); DestroyMenu(This->hMenu); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -578,7 +578,7 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) *verbs = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbsImpl)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -613,7 +613,7 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) return S_OK; failed: - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return hr; } @@ -661,8 +661,8 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) if (!ref) { Folder3_Release(&This->folder->Folder3_iface); - HeapFree(GetProcessHeap(), 0, This->path); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->path); + heap_free(This); } return ref; } @@ -964,7 +964,7 @@ static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, Fol *item = NULL; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + This = heap_alloc_zero(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1031,8 +1031,8 @@ static ULONG WINAPI FolderItemsImpl_Release(FolderItems3 *iface) Folder3_Release(&This->folder->Folder3_iface); for (i = 0; i < This->item_count; i++) SysFreeString(This->item_names[i]); - HeapFree(GetProcessHeap(), 0, This->item_names); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->item_names); + heap_free(This); } return ref; } @@ -1285,7 +1285,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) *ret = NULL; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + This = heap_alloc_zero(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1312,13 +1312,13 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) LPITEMIDLIST *pidls; ULONG fetched; - pidls = HeapAlloc(GetProcessHeap(), 0, This->item_count * sizeof(*pidls)); - This->item_names = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->item_count * sizeof(*This->item_names)); + pidls = heap_alloc(This->item_count * sizeof(*pidls)); + This->item_names = heap_alloc_zero(This->item_count * sizeof(*This->item_names)); if (!pidls || !This->item_names) { - HeapFree(GetProcessHeap(), 0, pidls); - HeapFree(GetProcessHeap(), 0, This->item_names); + heap_free(pidls); + heap_free(This->item_names); hr = E_OUTOFMEMORY; goto failed; } @@ -1336,7 +1336,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) ILFree(pidls[i]); } - HeapFree(GetProcessHeap(), 0, pidls); + heap_free(pidls); } IEnumIDList_Release(enumidlist); @@ -1397,7 +1397,7 @@ static ULONG WINAPI FolderImpl_Release(Folder3 *iface) SysFreeString(This->path); IShellFolder2_Release(This->folder); IDispatch_Release(This->application); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; } @@ -1667,7 +1667,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold *ret = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1734,7 +1734,7 @@ static ULONG WINAPI ShellDispatch_Release(IShellDispatch6 *iface) TRACE("(%p), new refcount=%i\n", iface, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -2244,7 +2244,7 @@ HRESULT WINAPI IShellDispatch_Constructor(IUnknown *outer, REFIID riid, void **p if (outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(ShellDispatch)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IShellDispatch6_iface.lpVtbl = &ShellDispatchVtbl; This->ref = 1; diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 8fc767eae1..fc95e7c227 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -112,7 +112,7 @@ static ULONG WINAPI ShellItem_Release(IShellItem2 *iface) if (ref == 0) { ILFree(This->pidl); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -551,7 +551,7 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(ShellItem)); + This = heap_alloc(sizeof(*This)); This->IShellItem2_iface.lpVtbl = &ShellItem2_Vtbl; This->ref = 1; This->pidl = NULL; @@ -918,7 +918,7 @@ static ULONG WINAPI IEnumShellItems_fnRelease(IEnumShellItems *iface) { TRACE("Freeing.\n"); IShellItemArray_Release(This->array); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return 0; } @@ -1007,7 +1007,7 @@ static HRESULT IEnumShellItems_Constructor(IShellItemArray *array, IEnumShellIte IEnumShellItemsImpl *This; HRESULT ret; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumShellItemsImpl)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; @@ -1088,8 +1088,8 @@ static ULONG WINAPI IShellItemArray_fnRelease(IShellItemArray *iface) for(i = 0; i < This->item_count; i++) IShellItem_Release(This->array[i]); - HeapFree(GetProcessHeap(), 0, This->array); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->array); + heap_free(This); return 0; } @@ -1236,17 +1236,17 @@ static HRESULT create_shellitemarray(IShellItem **items, DWORD count, IShellItem TRACE("(%p, %d, %p)\n", items, count, ret); - This = HeapAlloc(GetProcessHeap(), 0, sizeof(IShellItemArrayImpl)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IShellItemArray_iface.lpVtbl = &vt_IShellItemArray; This->ref = 1; - This->array = HeapAlloc(GetProcessHeap(), 0, count*sizeof(IShellItem*)); + This->array = heap_alloc(count*sizeof(IShellItem*)); if (!This->array) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return E_OUTOFMEMORY; } memcpy(This->array, items, count*sizeof(IShellItem*)); @@ -1276,7 +1276,7 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(!ppidl) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cidl*sizeof(IShellItem*)); + array = heap_alloc_zero(cidl*sizeof(IShellItem*)); if(!array) return E_OUTOFMEMORY; @@ -1289,7 +1289,7 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, ppsiItemArray); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); if(SUCCEEDED(ret)) return ret; } @@ -1297,7 +1297,7 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, /* Something failed, clean up. */ for(i = 0; i < cidl; i++) if(array[i]) IShellItem_Release(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return ret; } @@ -1354,13 +1354,13 @@ HRESULT WINAPI SHCreateShellItemArrayFromDataObject(IDataObject *pdo, REFIID rii parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[0]); - children = HeapAlloc(GetProcessHeap(), 0, sizeof(LPCITEMIDLIST)*pida->cidl); + children = heap_alloc(sizeof(LPCITEMIDLIST)*pida->cidl); for(i = 0; i < pida->cidl; i++) children[i] = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[i+1]); ret = SHCreateShellItemArray(parent_pidl, NULL, pida->cidl, children, &psia); - HeapFree(GetProcessHeap(), 0, children); + heap_free(children); GlobalUnlock(medium.u.hGlobal); GlobalFree(medium.u.hGlobal); @@ -1389,7 +1389,7 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(cidl == 0) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cidl*sizeof(IShellItem*)); + array = heap_alloc_zero(cidl*sizeof(IShellItem*)); if(!array) return E_OUTOFMEMORY; @@ -1403,14 +1403,14 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, psia); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); if(SUCCEEDED(ret)) return ret; } for(i = 0; i < cidl; i++) if(array[i]) IShellItem_Release(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); *psia = NULL; return ret; } @@ -1471,7 +1471,7 @@ static ULONG WINAPI CustomDestinationList_Release(ICustomDestinationList *iface) TRACE("(%p), new refcount=%i\n", This, ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -1583,7 +1583,7 @@ HRESULT WINAPI CustomDestinationList_Constructor(IUnknown *outer, REFIID riid, v if (outer) return CLASS_E_NOAGGREGATION; - if(!(list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)))) + if(!(list = heap_alloc(sizeof(*list)))) return E_OUTOFMEMORY; list->ICustomDestinationList_iface.lpVtbl = &CustomDestinationListVtbl; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 40fab4d0c3..ba04c8e288 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -208,7 +208,7 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor static inline LPWSTR heap_strdupAtoW( LPCSTR str) { INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR) ); + LPWSTR p = heap_alloc( len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); @@ -287,7 +287,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile IStream_Release( stm ); /* update file path */ - HeapFree(GetProcessHeap(), 0, This->filepath); + heap_free(This->filepath); This->filepath = strdupW(pszFileName); This->bDirty = FALSE; @@ -311,7 +311,7 @@ BOOL run_winemenubuilder( const WCHAR *args ) strcatW( app, menubuilder ); len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); + buffer = heap_alloc( len ); if( !buffer ) return FALSE; @@ -327,7 +327,7 @@ BOOL run_winemenubuilder( const WCHAR *args ) ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); - HeapFree( GetProcessHeap(), 0, buffer ); + heap_free( buffer ); if (ret) { @@ -346,13 +346,13 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) BOOL ret; len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); + buffer = heap_alloc( len ); if( !buffer ) return FALSE; wsprintfW( buffer, szFormat, szLink ); ret = run_winemenubuilder( buffer ); - HeapFree( GetProcessHeap(), 0, buffer ); + heap_free( buffer ); return ret; } @@ -379,7 +379,7 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile StartLinkProcessor( pszFileName ); /* update file path */ - HeapFree(GetProcessHeap(), 0, This->filepath); + heap_free(This->filepath); This->filepath = strdupW(pszFileName); This->bDirty = FALSE; @@ -513,14 +513,14 @@ static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr ) len *= sizeof (WCHAR); TRACE("reading %d\n", len); - temp = HeapAlloc(GetProcessHeap(), 0, len+sizeof(WCHAR)); + temp = heap_alloc(len + sizeof(WCHAR)); if( !temp ) return E_OUTOFMEMORY; count = 0; r = IStream_Read(stm, temp, len, &count); if( FAILED (r) || ( count != len ) ) { - HeapFree( GetProcessHeap(), 0, temp ); + heap_free( temp ); return E_FAIL; } @@ -530,14 +530,14 @@ static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr ) if( !unicode ) { count = MultiByteToWideChar( CP_ACP, 0, temp, len, NULL, 0 ); - str = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) ); + str = heap_alloc( (count+1)*sizeof (WCHAR) ); if( !str ) { - HeapFree( GetProcessHeap(), 0, temp ); + heap_free( temp ); return E_OUTOFMEMORY; } MultiByteToWideChar( CP_ACP, 0, temp, len, str, count ); - HeapFree( GetProcessHeap(), 0, temp ); + heap_free( temp ); } else { @@ -567,7 +567,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) if( FAILED( r ) || count != sizeof(size) ) return E_FAIL; - chunk = HeapAlloc( GetProcessHeap(), 0, size ); + chunk = heap_alloc( size ); if( !chunk ) return E_OUTOFMEMORY; @@ -575,7 +575,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) r = IStream_Read( stm, chunk->data, size - sizeof(size), &count ); if( FAILED( r ) || count != (size - sizeof(size)) ) { - HeapFree( GetProcessHeap(), 0, chunk ); + heap_free( chunk ); return E_FAIL; } @@ -617,7 +617,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen ) len++; wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); - path = HeapAlloc(GetProcessHeap(), 0, (wlen+1)*sizeof(WCHAR)); + path = heap_alloc((wlen + 1) * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, p, len, path, wlen); path[wlen] = 0; @@ -639,7 +639,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, loc = (LOCATION_INFO*) p; if (loc->dwTotalSize < sizeof(LOCATION_INFO)) { - HeapFree( GetProcessHeap(), 0, p ); + heap_free( p ); return E_FAIL; } @@ -661,7 +661,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, TRACE("type %d serial %08x name %s path %s\n", volume->type, volume->serial, debugstr_w(volume->label), debugstr_w(*path)); - HeapFree( GetProcessHeap(), 0, p ); + heap_free( p ); return S_OK; } @@ -715,8 +715,7 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str ) return E_FAIL; } - *str = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW(buffer.szwDarwinID)+1) * sizeof(WCHAR) ); + *str = heap_alloc((lstrlenW(buffer.szwDarwinID) + 1) * sizeof(WCHAR) ); lstrcpyW( *str, buffer.szwDarwinID ); return S_OK; @@ -758,21 +757,21 @@ static HRESULT WINAPI IPersistStream_fnLoad( ILFree(This->pPidl); This->pPidl = NULL; memset( &This->volume, 0, sizeof This->volume ); - HeapFree(GetProcessHeap(), 0, This->sPath); + heap_free(This->sPath); This->sPath = NULL; - HeapFree(GetProcessHeap(), 0, This->sDescription); + heap_free(This->sDescription); This->sDescription = NULL; - HeapFree(GetProcessHeap(), 0, This->sPathRel); + heap_free(This->sPathRel); This->sPathRel = NULL; - HeapFree(GetProcessHeap(), 0, This->sWorkDir); + heap_free(This->sWorkDir); This->sWorkDir = NULL; - HeapFree(GetProcessHeap(), 0, This->sArgs); + heap_free(This->sArgs); This->sArgs = NULL; - HeapFree(GetProcessHeap(), 0, This->sIcoPath); + heap_free(This->sIcoPath); This->sIcoPath = NULL; - HeapFree(GetProcessHeap(), 0, This->sProduct); + heap_free(This->sProduct); This->sProduct = NULL; - HeapFree(GetProcessHeap(), 0, This->sComponent); + heap_free(This->sComponent); This->sComponent = NULL; This->wHotKey = (WORD)hdr.wHotKey; @@ -942,7 +941,7 @@ static HRESULT Stream_WriteLocationInfo( IStream* stm, LPCWSTR path, total_size = sizeof *loc + volume_info_size + path_size + final_path_size; /* create pointers to everything */ - loc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, total_size); + loc = heap_alloc_zero(total_size); vol = (LOCAL_VOLUME_INFO*) &loc[1]; szLabel = (LPSTR) &vol[1]; szPath = &szLabel[label_size]; @@ -971,7 +970,7 @@ static HRESULT Stream_WriteLocationInfo( IStream* stm, LPCWSTR path, szFinalPath[0] = 0; hr = IStream_Write( stm, loc, total_size, &count ); - HeapFree(GetProcessHeap(), 0, loc); + heap_free(loc); return hr; } @@ -1175,7 +1174,7 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor if (!*abs_path) lstrcpyW(abs_path, sPathRel); - *psPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(abs_path)+1)*sizeof(WCHAR)); + *psPath = heap_alloc((lstrlenW(abs_path) + 1) * sizeof(WCHAR)); if (!*psPath) return E_OUTOFMEMORY; @@ -1352,7 +1351,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA *iface, LPCSTR ps descrW = NULL; hr = IShellLinkW_SetDescription(&This->IShellLinkW_iface, descrW); - HeapFree(GetProcessHeap(), 0, descrW); + heap_free(descrW); return hr; } @@ -1385,7 +1384,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA *iface, LPCS if (!dirW) return E_OUTOFMEMORY; hr = IShellLinkW_SetWorkingDirectory(&This->IShellLinkW_iface, dirW); - HeapFree(GetProcessHeap(), 0, dirW); + heap_free(dirW); return hr; } @@ -1422,7 +1421,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA *iface, LPCSTR pszA argsW = NULL; hr = IShellLinkW_SetArguments(&This->IShellLinkW_iface, argsW); - HeapFree(GetProcessHeap(), 0, argsW); + heap_free(argsW); return hr; } @@ -1481,7 +1480,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR p if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetIconLocation(&This->IShellLinkW_iface, pathW, iIcon); - HeapFree(GetProcessHeap(), 0, pathW); + heap_free(pathW); return hr; } @@ -1499,7 +1498,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA *iface, LPCSTR p if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetRelativePath(&This->IShellLinkW_iface, pathW, dwReserved); - HeapFree(GetProcessHeap(), 0, pathW); + heap_free(pathW); return hr; } @@ -1528,7 +1527,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) return E_OUTOFMEMORY; r = IShellLinkW_SetPath(&This->IShellLinkW_iface, str); - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); return r; } @@ -1650,15 +1649,15 @@ static ULONG WINAPI IShellLinkW_fnRelease(IShellLinkW * iface) TRACE("-- destroying IShellLink(%p)\n",This); - HeapFree(GetProcessHeap(), 0, This->sIcoPath); - HeapFree(GetProcessHeap(), 0, This->sArgs); - HeapFree(GetProcessHeap(), 0, This->sWorkDir); - HeapFree(GetProcessHeap(), 0, This->sDescription); - HeapFree(GetProcessHeap(), 0, This->sPath); - HeapFree(GetProcessHeap(), 0, This->sPathRel); - HeapFree(GetProcessHeap(), 0, This->sProduct); - HeapFree(GetProcessHeap(), 0, This->sComponent); - HeapFree(GetProcessHeap(), 0, This->filepath); + heap_free(This->sIcoPath); + heap_free(This->sArgs); + heap_free(This->sWorkDir); + heap_free(This->sDescription); + heap_free(This->sPath); + heap_free(This->sPathRel); + heap_free(This->sProduct); + heap_free(This->sComponent); + heap_free(This->filepath); if (This->site) IUnknown_Release( This->site ); @@ -1752,12 +1751,12 @@ static HRESULT WINAPI IShellLinkW_fnSetIDList(IShellLinkW * iface, LPCITEMIDLIST if( !This->pPidl ) return E_FAIL; - HeapFree( GetProcessHeap(), 0, This->sPath ); + heap_free( This->sPath ); This->sPath = NULL; if ( SHGetPathFromIDListW( pidl, path ) ) { - This->sPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path)+1)*sizeof(WCHAR)); + This->sPath = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)); if (!This->sPath) return E_OUTOFMEMORY; @@ -1788,11 +1787,10 @@ static HRESULT WINAPI IShellLinkW_fnSetDescription(IShellLinkW * iface, LPCWSTR TRACE("(%p)->(desc=%s)\n",This, debugstr_w(pszName)); - HeapFree(GetProcessHeap(), 0, This->sDescription); + heap_free(This->sDescription); if (pszName) { - This->sDescription = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszName )+1)*sizeof(WCHAR) ); + This->sDescription = heap_alloc((lstrlenW( pszName )+1)*sizeof(WCHAR) ); if ( !This->sDescription ) return E_OUTOFMEMORY; @@ -1825,9 +1823,8 @@ static HRESULT WINAPI IShellLinkW_fnSetWorkingDirectory(IShellLinkW * iface, LPC TRACE("(%p)->(dir=%s)\n",This, debugstr_w(pszDir)); - HeapFree(GetProcessHeap(), 0, This->sWorkDir); - This->sWorkDir = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszDir )+1)*sizeof (WCHAR) ); + heap_free(This->sWorkDir); + This->sWorkDir = heap_alloc((lstrlenW( pszDir ) + 1) * sizeof (WCHAR) ); if ( !This->sWorkDir ) return E_OUTOFMEMORY; lstrcpyW( This->sWorkDir, pszDir ); @@ -1856,11 +1853,10 @@ static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR ps TRACE("(%p)->(args=%s)\n",This, debugstr_w(pszArgs)); - HeapFree(GetProcessHeap(), 0, This->sArgs); + heap_free(This->sArgs); if (pszArgs) { - This->sArgs = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszArgs )+1)*sizeof (WCHAR) ); + This->sArgs = heap_alloc((lstrlenW( pszArgs )+1)*sizeof (WCHAR) ); if ( !This->sArgs ) return E_OUTOFMEMORY; lstrcpyW( This->sArgs, pszArgs ); @@ -1940,9 +1936,8 @@ static HRESULT WINAPI IShellLinkW_fnSetIconLocation(IShellLinkW * iface, LPCWSTR TRACE("(%p)->(path=%s iicon=%u)\n",This, debugstr_w(pszIconPath), iIcon); - HeapFree(GetProcessHeap(), 0, This->sIcoPath); - This->sIcoPath = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszIconPath )+1)*sizeof (WCHAR) ); + heap_free(This->sIcoPath); + This->sIcoPath = heap_alloc((lstrlenW( pszIconPath )+1)*sizeof (WCHAR) ); if ( !This->sIcoPath ) return E_OUTOFMEMORY; lstrcpyW( This->sIcoPath, pszIconPath ); @@ -1959,9 +1954,8 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR TRACE("(%p)->(path=%s %x)\n",This, debugstr_w(pszPathRel), dwReserved); - HeapFree(GetProcessHeap(), 0, This->sPathRel); - This->sPathRel = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszPathRel )+1) * sizeof (WCHAR) ); + heap_free(This->sPathRel); + This->sPathRel = heap_alloc((lstrlenW( pszPathRel )+1) * sizeof (WCHAR) ); if ( !This->sPathRel ) return E_OUTOFMEMORY; lstrcpyW( This->sPathRel, pszPathRel ); @@ -1987,7 +1981,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR bSuccess = SHGetPathFromIDListW(This->pPidl, buffer); if (bSuccess && *buffer) { - This->sPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(buffer)+1)*sizeof(WCHAR)); + This->sPath = heap_alloc((lstrlenW(buffer)+1)*sizeof(WCHAR)); if (!This->sPath) return E_OUTOFMEMORY; @@ -1999,7 +1993,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR } if (!This->sIcoPath && This->sPath) { - This->sIcoPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(This->sPath)+1)*sizeof(WCHAR)); + This->sIcoPath = heap_alloc((lstrlenW(This->sPath)+1)*sizeof(WCHAR)); if (!This->sIcoPath) return E_OUTOFMEMORY; @@ -2025,7 +2019,7 @@ static LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str) if( !p ) return NULL; len = p - str; - ret = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); + ret = heap_alloc(sizeof(WCHAR)*(len+1)); if( !ret ) return ret; memcpy( ret, str, sizeof(WCHAR)*len ); @@ -2133,14 +2127,14 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile /* any other quote marks are invalid */ if (strchrW(pszFile, '"')) { - HeapFree(GetProcessHeap(), 0, unquoted); + heap_free(unquoted); return S_FALSE; } - HeapFree(GetProcessHeap(), 0, This->sPath); + heap_free(This->sPath); This->sPath = NULL; - HeapFree(GetProcessHeap(), 0, This->sComponent); + heap_free(This->sComponent); This->sComponent = NULL; if (This->pPidl) @@ -2160,18 +2154,17 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile This->pPidl = SHSimpleIDListFromPathW(pszFile); ShellLink_GetVolumeInfo(buffer, &This->volume); - This->sPath = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( buffer )+1) * sizeof (WCHAR) ); + This->sPath = heap_alloc( (lstrlenW( buffer )+1) * sizeof (WCHAR) ); if (!This->sPath) { - HeapFree(GetProcessHeap(), 0, unquoted); + heap_free(unquoted); return E_OUTOFMEMORY; } lstrcpyW(This->sPath, buffer); } This->bDirty = TRUE; - HeapFree(GetProcessHeap(), 0, unquoted); + heap_free(unquoted); return hr; } @@ -2372,14 +2365,14 @@ ShellLink_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder, count = DragQueryFileW( stgm.u.hGlobal, 0, NULL, 0 ); count++; - path = HeapAlloc( GetProcessHeap(), 0, count*sizeof(WCHAR) ); + path = heap_alloc(count*sizeof(WCHAR) ); if( path ) { IPersistFile *pf = &This->IPersistFile_iface; count = DragQueryFileW( stgm.u.hGlobal, 0, path, count ); r = IPersistFile_Load( pf, path, 0 ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path ); } } ReleaseStgMedium( &stgm ); @@ -2457,11 +2450,11 @@ shelllink_get_msi_component_path( LPWSTR component ) return NULL; sz++; - path = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + path = heap_alloc( sz*sizeof(WCHAR) ); r = CommandLineFromMsiDescriptor( component, path, &sz ); if (r != ERROR_SUCCESS) { - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path ); path = NULL; } @@ -2516,7 +2509,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) if ( iciex->lpParametersW ) len += lstrlenW( iciex->lpParametersW ); - args = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + args = heap_alloc( len*sizeof(WCHAR) ); args[0] = 0; if ( This->sArgs ) lstrcatW( args, This->sArgs ); @@ -2543,8 +2536,8 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) else r = E_FAIL; - HeapFree( GetProcessHeap(), 0, args ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( args ); + heap_free( path ); return r; } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 7b6ee924ea..c79242199b 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -391,7 +391,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc { IDefClFImpl* lpclf; - lpclf = HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl)); + lpclf = heap_alloc(sizeof(*lpclf)); lpclf->ref = 1; lpclf->IClassFactory_iface.lpVtbl = &dclfvt; lpclf->lpfnCI = lpfnCI; @@ -451,9 +451,9 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) if (This->pcRefDll) InterlockedDecrement(This->pcRefDll); TRACE("-- destroying IClassFactory(%p)\n",This); - HeapFree(GetProcessHeap(),0,This); - return 0; + heap_free(This); } + return refCount; } /****************************************************************************** @@ -586,7 +586,7 @@ UINT WINAPI DragQueryFileA( LPWSTR lpszFileW = NULL; if(lpszFile && lFile != 0xFFFFFFFF) { - lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); + lpszFileW = heap_alloc(lLength*sizeof(WCHAR)); if(lpszFileW == NULL) { goto end; } @@ -595,7 +595,7 @@ UINT WINAPI DragQueryFileA( if(lpszFileW) { WideCharToMultiByte(CP_ACP, 0, lpszFileW, -1, lpszFile, lLength, 0, NULL); - HeapFree(GetProcessHeap(), 0, lpszFileW); + heap_free(lpszFileW); } goto end; } @@ -641,7 +641,7 @@ UINT WINAPI DragQueryFileW( LPSTR lpszFileA = NULL; if(lpszwFile && lFile != 0xFFFFFFFF) { - lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength); + lpszFileA = heap_alloc(lLength); if(lpszFileA == NULL) { goto end; } @@ -650,7 +650,7 @@ UINT WINAPI DragQueryFileW( if(lpszFileA) { MultiByteToWideChar(CP_ACP, 0, lpszFileA, -1, lpszwFile, lLength); - HeapFree(GetProcessHeap(), 0, lpszFileA); + heap_free(lpszFileA); } goto end; } @@ -882,7 +882,7 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) if (!ref) { GdipDisposeImage(This->image); - HeapFree(GetProcessHeap(), 0, This->path); + heap_free(This->path); SHFree(This); } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index f9814997da..6bf29a1fbd 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1350,7 +1350,7 @@ BOOL WINAPI IsUserAnAdmin(VOID) } } - lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + lpGroups = heap_alloc(dwSize); if (lpGroups == NULL) { CloseHandle(hToken); @@ -1359,7 +1359,7 @@ BOOL WINAPI IsUserAnAdmin(VOID) if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) { - HeapFree(GetProcessHeap(), 0, lpGroups); + heap_free(lpGroups); CloseHandle(hToken); return FALSE; } @@ -1369,7 +1369,7 @@ BOOL WINAPI IsUserAnAdmin(VOID) DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &lpSid)) { - HeapFree(GetProcessHeap(), 0, lpGroups); + heap_free(lpGroups); return FALSE; } @@ -1383,7 +1383,7 @@ BOOL WINAPI IsUserAnAdmin(VOID) } FreeSid(lpSid); - HeapFree(GetProcessHeap(), 0, lpGroups); + heap_free(lpGroups); return bResult; } @@ -1553,7 +1553,7 @@ DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) TRACE("(%s, %d)\n", debugstr_a(pszString), cchString); - if ((dst = HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(CHAR)))) + if ((dst = heap_alloc(cchString * sizeof(CHAR)))) { len = ExpandEnvironmentStringsA(pszString, dst, cchString); /* len includes the terminating 0 */ @@ -1565,7 +1565,7 @@ DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) else len = cchString; - HeapFree(GetProcessHeap(), 0, dst); + heap_free(dst); } return MAKELONG(len, res); } @@ -1597,7 +1597,7 @@ DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString) TRACE("(%s, %d)\n", debugstr_w(pszString), cchString); - if ((cchString < MAXLONG) && (dst = HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(WCHAR)))) + if ((cchString < MAXLONG) && (dst = heap_alloc(cchString * sizeof(WCHAR)))) { len = ExpandEnvironmentStringsW(pszString, dst, cchString); /* len includes the terminating 0 */ @@ -1609,7 +1609,7 @@ DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString) else len = cchString; - HeapFree(GetProcessHeap(), 0, dst); + heap_free(dst); } return MAKELONG(len, res); } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 3b9c53b41c..fdd9c4087a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1079,7 +1079,7 @@ static ULONG WINAPI ApplicationDestinations_Release(IApplicationDestinations *if TRACE("(%p), new refcount=%i\n", This, ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -3575,13 +3575,13 @@ static LPWSTR _GetUserSidStringFromToken(HANDLE Token) { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; - UserInfo = HeapAlloc(GetProcessHeap(), 0, InfoSize); + UserInfo = heap_alloc(InfoSize); if (UserInfo == NULL) return NULL; if (! GetTokenInformation(Token, TokenUser, UserInfo, InfoSize, &InfoSize)) { - HeapFree(GetProcessHeap(), 0, UserInfo); + heap_free(UserInfo); return NULL; } } @@ -3590,7 +3590,7 @@ static LPWSTR _GetUserSidStringFromToken(HANDLE Token) SidStr = NULL; if (UserInfo != (PTOKEN_USER) InfoBuffer) - HeapFree(GetProcessHeap(), 0, UserInfo); + heap_free(UserInfo); return SidStr; } @@ -3939,7 +3939,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); if(pszPath) { - pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + pszPathW = heap_alloc(MAX_PATH * sizeof(WCHAR)); if(!pszPathW) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; @@ -3953,7 +3953,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( */ if (pszSubPath && pszSubPath[0]) { length = MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, NULL, 0); - pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + pszSubPathW = heap_alloc(length * sizeof(WCHAR)); if(!pszSubPathW) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; @@ -3967,8 +3967,8 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( WideCharToMultiByte(CP_ACP, 0, pszPathW, -1, pszPath, MAX_PATH, NULL, NULL); cleanup: - HeapFree(GetProcessHeap(), 0, pszPathW); - HeapFree(GetProcessHeap(), 0, pszSubPathW); + heap_free(pszPathW); + heap_free(pszSubPathW); return hr; } @@ -4535,7 +4535,7 @@ static void _SHCreateSymbolicLinks(void) } remove(pszMyStuff); symlink(szMyStuffTarget, pszMyStuff); - HeapFree(GetProcessHeap(), 0, pszMyStuff); + heap_free(pszMyStuff); } /* Last but not least, the Desktop folder */ @@ -4543,7 +4543,7 @@ static void _SHCreateSymbolicLinks(void) strcpy(szDesktopTarget, pszHome); else strcpy(szDesktopTarget, pszPersonal); - HeapFree(GetProcessHeap(), 0, pszPersonal); + heap_free(pszPersonal); xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; if (xdg_desktop_dir || @@ -4559,7 +4559,7 @@ static void _SHCreateSymbolicLinks(void) symlink(xdg_desktop_dir, pszDesktop); else symlink(szDesktopTarget, pszDesktop); - HeapFree(GetProcessHeap(), 0, pszDesktop); + heap_free(pszDesktop); } } @@ -4567,8 +4567,8 @@ static void _SHCreateSymbolicLinks(void) if (xdg_results) { for (i = 0; i < num; i++) - HeapFree(GetProcessHeap(), 0, xdg_results[i]); - HeapFree(GetProcessHeap(), 0, xdg_results); + heap_free(xdg_results[i]); + heap_free(xdg_results); } } @@ -5054,7 +5054,7 @@ static HRESULT get_known_folder_registry_path( lstrcpyW(sGuid, lpStringGuid); length = lstrlenW(szKnownFolderDescriptions)+51; - *lpPath = HeapAlloc(GetProcessHeap(), 0, length*sizeof(WCHAR)); + *lpPath = heap_alloc(length*sizeof(WCHAR)); if(!(*lpPath)) hr = E_OUTOFMEMORY; @@ -5138,7 +5138,7 @@ static HRESULT get_known_folder_redirection_place( hr = E_FAIL; } - HeapFree(GetProcessHeap(), 0, lpRegistryPath); + heap_free(lpRegistryPath); return hr; } @@ -5166,7 +5166,7 @@ static HRESULT redirect_known_folder( if(SUCCEEDED(hr)) hr = get_known_folder_path_by_id(rfid, lpRegistryPath, 0, &lpSrcPath); - HeapFree(GetProcessHeap(), 0, lpRegistryPath); + heap_free(lpRegistryPath); /* get path to redirection storage */ if(SUCCEEDED(hr)) @@ -5263,8 +5263,8 @@ static ULONG WINAPI knownfolder_Release( if (!refs) { TRACE("destroying %p\n", knownfolder); - HeapFree( GetProcessHeap(), 0, knownfolder->registryPath); - HeapFree( GetProcessHeap(), 0, knownfolder ); + heap_free( knownfolder->registryPath ); + heap_free( knownfolder ); } return refs; } @@ -5322,7 +5322,7 @@ static HRESULT knownfolder_set_id( else { /* This known folder is not registered. To mark it, we set registryPath to NULL */ - HeapFree(GetProcessHeap(), 0, knownfolder->registryPath); + heap_free(knownfolder->registryPath); knownfolder->registryPath = NULL; hr = S_OK; } @@ -5402,15 +5402,15 @@ static HRESULT get_known_folder_path( hr = get_known_folder_path(parentGuid, parentRegistryPath, &parentPath); if(FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, parentRegistryPath); + heap_free(parentRegistryPath); return hr; } lstrcatW(path, parentPath); lstrcatW(path, sBackslash); - HeapFree(GetProcessHeap(), 0, parentRegistryPath); - HeapFree(GetProcessHeap(), 0, parentPath); + heap_free(parentRegistryPath); + heap_free(parentPath); } /* check, if folder was redirected */ @@ -5625,7 +5625,7 @@ static HRESULT knownfolder_create( struct knownfolder **knownfolder ) { struct knownfolder *kf; - kf = HeapAlloc( GetProcessHeap(), 0, sizeof(*kf) ); + kf = heap_alloc( sizeof(*kf) ); if (!kf) return E_OUTOFMEMORY; kf->IKnownFolder_iface.lpVtbl = &knownfolder_vtbl; @@ -5667,8 +5667,8 @@ static ULONG WINAPI foldermanager_Release( if (!refs) { TRACE("destroying %p\n", foldermanager); - HeapFree( GetProcessHeap(), 0, foldermanager->ids ); - HeapFree( GetProcessHeap(), 0, foldermanager ); + heap_free( foldermanager->ids ); + heap_free( foldermanager ); } return refs; } @@ -5760,7 +5760,7 @@ static BOOL is_knownfolder( struct foldermanager *fm, const KNOWNFOLDERID *id ) if(SUCCEEDED(hr)) { hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, 0, &hKey)); - HeapFree(GetProcessHeap(), 0, registryPath); + heap_free(registryPath); } if(SUCCEEDED(hr)) @@ -5820,7 +5820,7 @@ static HRESULT WINAPI foldermanager_GetFolderByName( if (FAILED( hr )) return hr; hr = get_known_folder_wstr( path, szName, &name ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path ); if (FAILED( hr )) return hr; found = !strcmpiW( pszCanonicalName, name ); @@ -5894,7 +5894,7 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI SHDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath); } - HeapFree(GetProcessHeap(), 0, registryPath); + heap_free(registryPath); return hr; } @@ -5920,7 +5920,7 @@ static HRESULT WINAPI foldermanager_UnregisterFolder( if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(SHDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath)); - HeapFree(GetProcessHeap(), 0, registryPath); + heap_free(registryPath); return hr; } @@ -5978,7 +5978,7 @@ static HRESULT foldermanager_create( void **ppv ) UINT i, j; struct foldermanager *fm; - fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); + fm = heap_alloc( sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; fm->IKnownFolderManager_iface.lpVtbl = &foldermanager_vtbl; @@ -5989,10 +5989,10 @@ static HRESULT foldermanager_create( void **ppv ) { if (!IsEqualGUID( CSIDL_Data[i].id, &GUID_NULL )) fm->num_ids++; } - fm->ids = HeapAlloc( GetProcessHeap(), 0, fm->num_ids * sizeof(KNOWNFOLDERID) ); + fm->ids = heap_alloc( fm->num_ids * sizeof(KNOWNFOLDERID) ); if (!fm->ids) { - HeapFree( GetProcessHeap(), 0, fm ); + heap_free( fm ); return E_OUTOFMEMORY; } for (i = j = 0; i < sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]); i++) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0e52fc1c40..1e7d1f2629 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1205,7 +1205,7 @@ static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, const LPCITEMIDLIS int i; iPathLen = lstrlenW(wszBasePath); - wszPathsList = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)*cidl+1); + wszPathsList = heap_alloc(MAX_PATH*sizeof(WCHAR)*cidl+1); wszListPos = wszPathsList; for (i = 0; i < cidl; i++) { @@ -1283,7 +1283,7 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) wszCurrentPath += lstrlenW(wszCurrentPath)+1; } - HeapFree(GetProcessHeap(), 0, wszPathsList); + heap_free(wszPathsList); return ret; } @@ -1333,8 +1333,7 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, WARN("Copy failed\n"); ret = E_FAIL; } - HeapFree(GetProcessHeap(), 0, wszSrcPathsList); - + heap_free(wszSrcPathsList); } SHFree(pidl); IPersistFolder2_Release(ppf2); diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index d973e409fd..471abd879e 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -95,7 +95,7 @@ HRESULT WINAPI ISF_NetworkPlaces_Constructor (IUnknown * pUnkOuter, REFIID riid, if (pUnkOuter) return CLASS_E_NOAGGREGATION; - sf = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); + sf = heap_alloc_zero (sizeof (*sf)); if (!sf) return E_OUTOFMEMORY; @@ -171,7 +171,7 @@ static ULONG WINAPI ISF_NetworkPlaces_fnRelease (IShellFolder2 * iface) if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); SHFree (This->pidlRoot); - HeapFree (GetProcessHeap(), 0, This); + heap_free (This); } return refCount; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 345e965feb..cde815a99d 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -405,7 +405,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) if (!pszUnixPath) return FALSE; cDriveSymlinkLen = strlen(pszUnixPath); pElement = realpath(pszUnixPath, szPath); - HeapFree(GetProcessHeap(), 0, pszUnixPath); + heap_free(pszUnixPath); if (!pElement) return FALSE; if (szPath[strlen(szPath)-1] != '/') strcat(szPath, "/"); @@ -432,7 +432,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) if(dospath_end < dospath) return FALSE; strcat(szPath, pszUnixPath + cDriveSymlinkLen); - HeapFree(GetProcessHeap(), 0, pszUnixPath); + heap_free(pszUnixPath); if(has_failed && WideCharToMultiByte(CP_UNIXCP, 0, dospath_end + 1, -1, mb_path, FILENAME_MAX, NULL, NULL) > 0){ @@ -800,7 +800,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB ((dos_name = wine_get_dos_file_name(This->m_pszPath)))) { This->m_dwAttributes |= SFGAO_FILESYSTEM; - HeapFree( GetProcessHeap(), 0, dos_name ); + heap_free( dos_name ); } return S_OK; @@ -831,8 +831,8 @@ static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst) iSrcLen = lstrlenW(pwszDosSrc); iDstLen = lstrlenW(pwszDosDst); - pwszSrc = HeapAlloc(GetProcessHeap(), 0, (iSrcLen + 2) * sizeof(WCHAR)); - pwszDst = HeapAlloc(GetProcessHeap(), 0, (iDstLen + 2) * sizeof(WCHAR)); + pwszSrc = heap_alloc((iSrcLen + 2) * sizeof(WCHAR)); + pwszDst = heap_alloc((iDstLen + 2) * sizeof(WCHAR)); if (pwszSrc && pwszDst) { lstrcpyW(pwszSrc, pwszDosSrc); @@ -856,8 +856,8 @@ static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst) res = S_OK; } - HeapFree(GetProcessHeap(), 0, pwszSrc); - HeapFree(GetProcessHeap(), 0, pwszDst); + heap_free(pwszSrc); + heap_free(pwszDst); return res; } @@ -1151,7 +1151,7 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci if (!(dos_name = wine_get_dos_file_name( szAbsolutePath ))) *attrs &= ~SFGAO_FILESYSTEM; else - HeapFree( GetProcessHeap(), 0, dos_name ); + heap_free( dos_name ); } if (_ILIsFolder(apidl[i])) *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | @@ -1254,7 +1254,7 @@ static HRESULT WINAPI ShellFolder2_GetDisplayNameOf(IShellFolder2* iface, if (!lpName->u.pOleStr) return HRESULT_FROM_WIN32(GetLastError()); lstrcpyW(lpName->u.pOleStr, pwszDosFileName); PathRemoveBackslashW(lpName->u.pOleStr); - HeapFree(GetProcessHeap(), 0, pwszDosFileName); + heap_free(pwszDosFileName); } } else if (_ILIsValue(pidl)) { STRRET str; @@ -1953,7 +1953,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP lstrcpyA(szAbsolute, This->m_pszPath); pszRelative = szAbsolute + lstrlenA(szAbsolute); - wszListPos = wszPathsList = HeapAlloc(GetProcessHeap(), 0, cidl*MAX_PATH*sizeof(WCHAR)+1); + wszListPos = wszPathsList = heap_alloc(cidl*MAX_PATH*sizeof(WCHAR)+1); if (wszPathsList == NULL) return E_OUTOFMEMORY; for (i=0; i<cidl; i++) { @@ -1963,19 +1963,19 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP continue; if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelative)) { - HeapFree(GetProcessHeap(), 0, wszPathsList); + heap_free(wszPathsList); return E_INVALIDARG; } wszDosPath = wine_get_dos_file_name(szAbsolute); if (wszDosPath == NULL || lstrlenW(wszDosPath) >= MAX_PATH) { - HeapFree(GetProcessHeap(), 0, wszPathsList); - HeapFree(GetProcessHeap(), 0, wszDosPath); + heap_free(wszPathsList); + heap_free(wszDosPath); return S_FALSE; } lstrcpyW(wszListPos, wszDosPath); wszListPos += lstrlenW(wszListPos)+1; - HeapFree(GetProcessHeap(), 0, wszDosPath); + heap_free(wszDosPath); } *wszListPos = 0; @@ -1992,7 +1992,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP else ret = S_OK; - HeapFree(GetProcessHeap(), 0, wszPathsList); + heap_free(wszPathsList); return ret; } @@ -2108,8 +2108,8 @@ static HRESULT WINAPI SFHelper_CopyItems(ISFHelper* iface, IShellFolder *psfFrom else res = E_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, pwszDosSrc); - HeapFree(GetProcessHeap(), 0, pwszDosDst); + heap_free(pwszDosSrc); + heap_free(pwszDosDst); if (res != S_OK) return res; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 7a432c6eb0..2055d21d30 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -402,7 +402,7 @@ static void *SHELL_BuildEnvW( const WCHAR *path ) if (!got_path) total += 5; /* we need to create PATH */ total++; /* terminating null */ - if (!(new_env = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ))) + if (!(new_env = heap_alloc( total * sizeof(WCHAR) ))) { FreeEnvironmentStringsW( strings ); return NULL; @@ -943,7 +943,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); if (resultLen > sizeof(static_res)/sizeof(WCHAR)) { - res = dynamic_res = HeapAlloc(GetProcessHeap(), 0, resultLen * sizeof(WCHAR)); + res = dynamic_res = heap_alloc(resultLen * sizeof(WCHAR)); SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL); } else @@ -959,11 +959,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec else { DWORD lenA = WideCharToMultiByte(CP_ACP, 0, res, -1, NULL, 0, NULL, NULL); - char *resA = HeapAlloc(GetProcessHeap(), 0, lenA); + char *resA = heap_alloc(lenA); WideCharToMultiByte(CP_ACP, 0, res, -1, resA, lenA, NULL, NULL); hDdeData = DdeClientTransaction( (LPBYTE)resA, lenA, hConv, 0L, 0, XTYP_EXECUTE, 10000, &tid ); - HeapFree(GetProcessHeap(), 0, resA); + heap_free(resA); } if (hDdeData) DdeFreeDataHandle(hDdeData); @@ -971,7 +971,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec WARN("DdeClientTransaction failed with error %04x\n", DdeGetLastError(ddeInst)); ret = 33; - HeapFree(GetProcessHeap(), 0, dynamic_res); + heap_free(dynamic_res); DdeDisconnect(hConv); @@ -1145,7 +1145,7 @@ static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) if ( r == ERROR_SUCCESS && type == REG_SZ ) { sz += sizeof (WCHAR); - cls = HeapAlloc( GetProcessHeap(), 0, sz ); + cls = heap_alloc( sz ); cls[0] = 0; RegQueryValueExW( hkey, NULL, 0, &type, (LPBYTE) cls, &sz ); } @@ -1160,7 +1160,7 @@ static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) if ( lpClass ) RegOpenKeyW( HKEY_CLASSES_ROOT, lpClass, &hkey ); - HeapFree( GetProcessHeap(), 0, cls ); + heap_free( cls ); return hkey; } @@ -1488,7 +1488,7 @@ static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LP /* Length of space plus length of parameters */ len += 1 + lstrlenW(wszParameters); } - wszQuotedCmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + wszQuotedCmd = heap_alloc(len * sizeof(WCHAR)); /* Must quote to handle case where cmd contains spaces, * else security hole if malicious user creates executable file "C:\\Program" */ @@ -1504,7 +1504,7 @@ static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LP retval = execute_from_key(wszKeyname, wszApplicationName, env, psei->lpParameters, wcmd, execfunc, psei, psei_out); else retval = execfunc(wszQuotedCmd, env, FALSE, psei, psei_out); - HeapFree(GetProcessHeap(), 0, wszQuotedCmd); + heap_free(wszQuotedCmd); return retval; } @@ -1531,7 +1531,7 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wcmd, LPSHELLEXECUTEI len += lstrlenW(psei->lpVerb); else len += lstrlenW(wszOpen); - lpstrProtocol = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + lpstrProtocol = heap_alloc(len * sizeof(WCHAR)); memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); lpstrProtocol[iSize] = '\0'; strcatW(lpstrProtocol, wShell); @@ -1540,7 +1540,7 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wcmd, LPSHELLEXECUTEI retval = execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, wcmd, execfunc, psei, psei_out); - HeapFree(GetProcessHeap(), 0, lpstrProtocol); + heap_free(lpstrProtocol); return retval; } @@ -1596,13 +1596,13 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* make copies of all path/command strings */ if (!sei_tmp.lpFile) { - wszApplicationName = HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); + wszApplicationName = heap_alloc(dwApplicationNameLen*sizeof(WCHAR)); *wszApplicationName = '\0'; } else if (*sei_tmp.lpFile == '\"' && sei_tmp.lpFile[(len = strlenW(sei_tmp.lpFile))-1] == '\"') { if(len-1 >= dwApplicationNameLen) dwApplicationNameLen = len; - wszApplicationName = HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); + wszApplicationName = heap_alloc(dwApplicationNameLen*sizeof(WCHAR)); memcpy(wszApplicationName, sei_tmp.lpFile+1, len*sizeof(WCHAR)); if(len > 2) wszApplicationName[len-2] = '\0'; @@ -1610,7 +1610,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } else { DWORD l = strlenW(sei_tmp.lpFile)+1; if(l > dwApplicationNameLen) dwApplicationNameLen = l+1; - wszApplicationName = HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); + wszApplicationName = heap_alloc(dwApplicationNameLen*sizeof(WCHAR)); memcpy(wszApplicationName, sei_tmp.lpFile, l*sizeof(WCHAR)); } @@ -1620,7 +1620,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) len = lstrlenW(sei_tmp.lpParameters) + 1; if (len > parametersLen) { - wszParameters = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + wszParameters = heap_alloc(len * sizeof(WCHAR)); parametersLen = len; } strcpyW(wszParameters, sei_tmp.lpParameters); @@ -1633,7 +1633,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { len = lstrlenW(sei_tmp.lpDirectory) + 1; if (len > sizeof(dirBuffer) / sizeof(WCHAR)) - wszDir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + wszDir = heap_alloc(len * sizeof(WCHAR)); strcpyW(wszDir, sei_tmp.lpDirectory); } else @@ -1663,11 +1663,11 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) IShellExecuteHookW_Release(pSEH); if (hr == S_OK) { - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); if (wszParameters != parametersBuffer) - HeapFree(GetProcessHeap(), 0, wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) - HeapFree(GetProcessHeap(), 0, wszDir); + heap_free(wszDir); return TRUE; } } @@ -1679,11 +1679,11 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) ) { sei->hInstApp = (HINSTANCE) 33; - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); if (wszParameters != parametersBuffer) - HeapFree(GetProcessHeap(), 0, wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) - HeapFree(GetProcessHeap(), 0, wszDir); + heap_free(wszDir); return TRUE; } @@ -1693,11 +1693,11 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) execfunc ); if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) do_error_dialog(retval, sei_tmp.hwnd); - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); if (wszParameters != parametersBuffer) - HeapFree(GetProcessHeap(), 0, wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) - HeapFree(GetProcessHeap(), 0, wszDir); + heap_free(wszDir); return retval > 32; } @@ -1717,13 +1717,13 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) DWORD size; size = MAX_PATH; - buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + buf = heap_alloc(size * sizeof(WCHAR)); if (!buf || FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) { - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); return SE_ERR_OOM; } - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName; } @@ -1733,10 +1733,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (len>0) { LPWSTR buf; - buf = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + buf = heap_alloc((len + 1) * sizeof(WCHAR)); ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName; @@ -1750,10 +1750,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { LPWSTR buf; len++; - buf = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + buf = heap_alloc(len * sizeof(WCHAR)); ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buf, len); if (wszDir != dirBuffer) - HeapFree(GetProcessHeap(), 0, wszDir); + heap_free(wszDir); wszDir = buf; sei_tmp.lpDirectory = wszDir; } @@ -1768,7 +1768,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) len += 1 + lstrlenW(wszParameters); if (len > wcmdLen) { - wcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + wcmd = heap_alloc(len * sizeof(WCHAR)); wcmdLen = len; } wcmd[0] = '\"'; @@ -1784,13 +1784,13 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); if (retval > 32) { - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); if (wszParameters != parametersBuffer) - HeapFree(GetProcessHeap(), 0, wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) - HeapFree(GetProcessHeap(), 0, wszDir); + heap_free(wszDir); if (wcmd != wcmdBuffer) - HeapFree(GetProcessHeap(), 0, wcmd); + heap_free(wcmd); return TRUE; } @@ -1802,14 +1802,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) retval = SHELL_quote_and_execute( wcmd, wszParameters, wszKeyname, wszApplicationName, env, &sei_tmp, sei, execfunc ); - HeapFree( GetProcessHeap(), 0, env ); + heap_free( env ); } else if (PathIsDirectoryW(lpFile)) { static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r',0}; static const WCHAR wQuote[] = {'"',0}; WCHAR wExec[MAX_PATH]; - WCHAR * lpQuotedFile = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (strlenW(lpFile) + 3) ); + WCHAR * lpQuotedFile = heap_alloc( sizeof(WCHAR) * (strlenW(lpFile) + 3) ); if (lpQuotedFile) { @@ -1825,9 +1825,9 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) wszKeyname, wszApplicationName, env, &sei_tmp, sei, execfunc ); - HeapFree( GetProcessHeap(), 0, env ); + heap_free( env ); } - HeapFree( GetProcessHeap(), 0, lpQuotedFile ); + heap_free( lpQuotedFile ); } else retval = 0; /* Out of memory */ @@ -1848,13 +1848,13 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("retval %lu\n", retval); - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); if (wszParameters != parametersBuffer) - HeapFree(GetProcessHeap(), 0, wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) - HeapFree(GetProcessHeap(), 0, wszDir); + heap_free(wszDir); if (wcmd != wcmdBuffer) - HeapFree(GetProcessHeap(), 0, wcmd); + heap_free(wcmd); sei->hInstApp = (HINSTANCE)(retval > 32 ? 33 : retval); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 24f5e05dbc..315f5a7453 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -322,7 +322,7 @@ static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChar if (len < minChars) len = minChars; - *wPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + *wPath = heap_alloc(len * sizeof(WCHAR)); if (*wPath) { MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); @@ -331,11 +331,6 @@ static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChar return E_OUTOFMEMORY; } -static void SHELL32_FreeUnicodeBuf(LPWSTR wPath) -{ - HeapFree(GetProcessHeap(), 0, wPath); -} - HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) { FIXME("(%s, %p) stub\n", debugstr_w(path), status); @@ -406,7 +401,7 @@ static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec) if (!retCode) { retCode = SHNotifyCreateDirectoryW(wPath, sec); - SHELL32_FreeUnicodeBuf(wPath); + heap_free(wPath); } return retCode; } @@ -460,7 +455,7 @@ static DWORD SHNotifyRemoveDirectoryA(LPCSTR path) if (!retCode) { retCode = SHNotifyRemoveDirectoryW(wPath); - SHELL32_FreeUnicodeBuf(wPath); + heap_free(wPath); } return retCode; } @@ -524,7 +519,7 @@ static DWORD SHNotifyDeleteFileA(LPCSTR path) if (!retCode) { retCode = SHNotifyDeleteFileW(wPath); - SHELL32_FreeUnicodeBuf(wPath); + heap_free(wPath); } return retCode; } @@ -720,7 +715,7 @@ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES se if (!retCode) { retCode = SHCreateDirectoryExW(hWnd, wPath, sec); - SHELL32_FreeUnicodeBuf(wPath); + heap_free(wPath); } return retCode; } @@ -886,12 +881,12 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); - HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ + heap_free(ForFree); /* we cannot use wString, it was changed */ break; } else { - wString = ForFree = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + wString = ForFree = heap_alloc(size * sizeof(WCHAR)); if (ForFree) continue; retCode = ERROR_OUTOFMEMORY; nFileOp.fAnyOperationsAborted = TRUE; @@ -943,18 +938,18 @@ static void add_file_to_entry(FILE_ENTRY *feFile, LPCWSTR szFile) DWORD dwLen = lstrlenW(szFile) + 1; LPCWSTR ptr; - feFile->szFullPath = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + feFile->szFullPath = heap_alloc(dwLen * sizeof(WCHAR)); lstrcpyW(feFile->szFullPath, szFile); ptr = StrRChrW(szFile, NULL, '\\'); if (ptr) { dwLen = ptr - szFile + 1; - feFile->szDirectory = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + feFile->szDirectory = heap_alloc(dwLen * sizeof(WCHAR)); lstrcpynW(feFile->szDirectory, szFile, dwLen); dwLen = lstrlenW(feFile->szFullPath) - dwLen + 1; - feFile->szFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + feFile->szFilename = heap_alloc(dwLen * sizeof(WCHAR)); lstrcpyW(feFile->szFilename, ptr + 1); /* skip over backslash */ } feFile->bFromWildcard = FALSE; @@ -970,7 +965,7 @@ static LPWSTR wildcard_to_file(LPCWSTR szWildCard, LPCWSTR szFileName) dwDirLen = ptr - szWildCard + 1; dwFullLen = dwDirLen + lstrlenW(szFileName) + 1; - szFullPath = HeapAlloc(GetProcessHeap(), 0, dwFullLen * sizeof(WCHAR)); + szFullPath = heap_alloc(dwFullLen * sizeof(WCHAR)); lstrcpynW(szFullPath, szWildCard, dwDirLen + 1); lstrcatW(szFullPath, szFileName); @@ -998,7 +993,7 @@ static void parse_wildcard_files(FILE_LIST *flList, LPCWSTR szFile, LPDWORD pdwL file->bFromWildcard = TRUE; file->attributes = wfd.dwFileAttributes; if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; - HeapFree(GetProcessHeap(), 0, szFullPath); + heap_free(szFullPath); } FindClose(hFile); @@ -1024,8 +1019,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) if (!szFiles[0]) return ERROR_ACCESS_DENIED; - flList->feFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - flList->num_alloc * sizeof(FILE_ENTRY)); + flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); while (*ptr) { @@ -1080,12 +1074,12 @@ static void destroy_file_list(FILE_LIST *flList) for (i = 0; i < flList->dwNumFiles; i++) { - HeapFree(GetProcessHeap(), 0, flList->feFiles[i].szDirectory); - HeapFree(GetProcessHeap(), 0, flList->feFiles[i].szFilename); - HeapFree(GetProcessHeap(), 0, flList->feFiles[i].szFullPath); + heap_free(flList->feFiles[i].szDirectory); + heap_free(flList->feFiles[i].szFilename); + heap_free(flList->feFiles[i].szFullPath); } - HeapFree(GetProcessHeap(), 0, flList->feFiles); + heap_free(flList->feFiles); } static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) @@ -1216,9 +1210,9 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl /* Free all but the first entry. */ for (i = 1; i < flTo->dwNumFiles; i++) { - HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szDirectory); - HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szFilename); - HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szFullPath); + heap_free(flTo->feFiles[i].szDirectory); + heap_free(flTo->feFiles[i].szFilename); + heap_free(flTo->feFiles[i].szFullPath); } flTo->dwNumFiles = 1; @@ -1758,7 +1752,7 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path len = 1; else len = last_slash - path + 1; - temppath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + temppath = heap_alloc(len * sizeof(WCHAR)); if (!temppath) return E_OUTOFMEMORY; StrCpyNW(temppath, path, len); @@ -1781,7 +1775,7 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path /* check if we can access the directory */ res = GetFileAttributesW(realpath); - HeapFree(GetProcessHeap(), 0, temppath); + heap_free(temppath); if (res == INVALID_FILE_ATTRIBUTES) { diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 53a1d3b0aa..14d3a8629c 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -92,7 +92,7 @@ static ULONG WINAPI FileSystemBindData_Release(IFileSystemBindData *iface) TRACE("(%p)->(%u)\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -143,7 +143,7 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *find_data *ppV = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IFileSystemBindData_iface.lpVtbl = &FileSystemBindDataVtbl; @@ -167,6 +167,6 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *find_data IFileSystemBindData_Release(&This->IFileSystemBindData_iface); } else - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ret; } diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 39ab4c618c..1c262e74b0 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -197,7 +197,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) MENUINFO MenuInfo; HMENU hMenuPopup = CreatePopupMenu(); - lpFmMi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); + lpFmMi = heap_alloc_zero(sizeof(*lpFmMi)); lpFmMi->pidl = ILCombine(pidl, pidlTemp); lpFmMi->uEnumFlags = SHCONTF_FOLDERS | SHCONTF_NONFOLDERS; @@ -268,7 +268,7 @@ HMENU WINAPI FileMenu_Create ( TRACE("0x%08x 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu); - menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); + menudata = heap_alloc_zero(sizeof(*menudata)); menudata->crBorderColor = crBorderColor; menudata->nBorderWidth = nBorderWidth; menudata->hBorderBmp = hBorderBmp; @@ -298,7 +298,7 @@ void WINAPI FileMenu_Destroy (HMENU hmenu) menudata = FM_GetMenuInfo(hmenu); SHFree( menudata->pidl); - HeapFree(GetProcessHeap(), 0, menudata); + heap_free(menudata); DestroyMenu (hmenu); } @@ -401,11 +401,11 @@ BOOL WINAPI FileMenu_AppendItemAW( else { DWORD len = MultiByteToWideChar( CP_ACP, 0, lpText, -1, NULL, 0 ); - LPWSTR lpszText = HeapAlloc ( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + LPWSTR lpszText = heap_alloc( len*sizeof(WCHAR) ); if (!lpszText) return FALSE; MultiByteToWideChar( CP_ACP, 0, lpText, -1, lpszText, len ); ret = FileMenu_AppendItemW(hMenu, lpszText, uID, icon, hMenuPopup, nItemHeight); - HeapFree( GetProcessHeap(), 0, lpszText ); + heap_free( lpszText ); } return ret; @@ -1020,24 +1020,27 @@ static CompositeCMenu* impl_from_IContextMenu3(IContextMenu3* iface) static HRESULT CompositeCMenu_Constructor(IContextMenu **menus,UINT menu_count, REFIID riid, void **ppv) { - CompositeCMenu *ret = HeapAlloc(GetProcessHeap(),0,sizeof(CompositeCMenu)); + CompositeCMenu *ret; UINT i; + TRACE("(%p,%u,%s,%p)\n",menus,menu_count,shdebugstr_guid(riid),ppv); + + ret = heap_alloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; ret->IContextMenu3_iface.lpVtbl = &CompositeCMenuVtbl; ret->menu_count = menu_count; - ret->menus = HeapAlloc(GetProcessHeap(),0,menu_count*sizeof(IContextMenu*)); + ret->menus = heap_alloc(menu_count*sizeof(IContextMenu*)); if(!ret->menus) { - HeapFree(GetProcessHeap(),0,ret); + heap_free(ret); return E_OUTOFMEMORY; } - ret->offsets = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,menu_count*sizeof(UINT)); + ret->offsets = heap_alloc_zero(menu_count*sizeof(UINT)); if(!ret->offsets) { - HeapFree(GetProcessHeap(),0,ret->menus); - HeapFree(GetProcessHeap(),0,ret); + heap_free(ret->menus); + heap_free(ret); return E_OUTOFMEMORY; } ret->refCount=0; @@ -1052,9 +1055,9 @@ static void CompositeCMenu_Destroy(CompositeCMenu *This) UINT i; for(i=0;i<This->menu_count;i++) IContextMenu_Release(This->menus[i]); - HeapFree(GetProcessHeap(),0,This->menus); - HeapFree(GetProcessHeap(),0,This->offsets); - HeapFree(GetProcessHeap(),0,This); + heap_free(This->menus); + heap_free(This->offsets); + heap_free(This); } static HRESULT WINAPI CompositeCMenu_QueryInterface(IContextMenu3 *iface, REFIID riid, void **ppv) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1628ea3367..ecc23cb727 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1555,7 +1555,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } /* allocate memory for the pidl array */ - pItems = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST) * count); + pItems = heap_alloc(sizeof(LPITEMIDLIST) * count); /* retrieve all selected items */ i = 0; @@ -1581,7 +1581,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn ISFHelper_Release(psfhlp); /* free pidl array memory */ - HeapFree(GetProcessHeap(), 0, pItems); + heap_free(pItems); } break; @@ -1803,7 +1803,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView3 *iface) if(This->pAdvSink) IAdviseSink_Release(This->pAdvSink); - HeapFree(GetProcessHeap(),0,This); + heap_free(This); } return refCount; } @@ -3728,7 +3728,7 @@ IShellView *IShellView_Constructor(IShellFolder *folder) { IShellViewImpl *sv; - sv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellViewImpl)); + sv = heap_alloc_zero(sizeof(*sv)); if (!sv) return NULL; diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 4a7263e4db..9baaa27eaa 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -133,7 +133,7 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) SHFree(This->pidl); _ILFreeaPidl(This->apidl, This->cidl); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -684,7 +684,7 @@ HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPC HRESULT hr; UINT i; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; @@ -994,7 +994,7 @@ HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID ri ContextMenu *This; HRESULT hr; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 0fcf73e3e6..7c5704505a 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -32,6 +32,7 @@ #include "shellapi.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(systray); @@ -180,7 +181,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) if (iconinfo.hbmColor) cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; cds.cbData = sizeof(*data) + cbMaskBits + cbColourBits; - buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); + buffer = heap_alloc(cds.cbData); if (!buffer) { DeleteObject(iconinfo.hbmMask); @@ -240,7 +241,7 @@ noicon: cds.lpData = data; ret = SendMessageW(tray, WM_COPYDATA, (WPARAM)nid->hWnd, (LPARAM)&cds); - if (data != &data_buffer) HeapFree( GetProcessHeap(), 0, data ); + if (data != &data_buffer) heap_free( data ); return ret; } diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 6b3d1ca156..7bc035fd53 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -123,7 +123,7 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) return FALSE; status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); - HeapFree(GetProcessHeap(), 0, unix_path); + heap_free(unix_path); if (status == noErr) status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, NULL, NULL, NULL); @@ -145,7 +145,7 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) status = FSPathMoveObjectToTrashSync(unix_path, NULL, kFSFileOperationSkipPreflight); - HeapFree(GetProcessHeap(), 0, unix_path); + heap_free(unix_path); return (status == noErr); } @@ -171,7 +171,7 @@ HRESULT TRASH_GetDetails(const char *trash_path, const char *name, WIN32_FIND_DA memcpy(path+trash_path_length+1, name, name_length+1); ret = lstat(path, &stats); - HeapFree(GetProcessHeap(), 0, path); + heap_free(path); if(ret == -1) return S_FALSE; memset(data, 0, sizeof(*data)); data->nFileSizeHigh = stats.st_size>>32; @@ -212,7 +212,7 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) return E_OUTOFMEMORY; status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); - HeapFree(GetProcessHeap(), 0, unix_path); + heap_free(unix_path); if(status != noErr) return E_FAIL; status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalog_info, NULL, NULL, NULL); if(status != noErr) return E_FAIL; @@ -222,7 +222,7 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) if(status != noErr) return E_FAIL; if(!(dir = opendir(trash_path))) return E_FAIL; - ret = HeapAlloc(GetProcessHeap(), 0, ret_size * sizeof(*ret)); + ret = heap_alloc(ret_size * sizeof(*ret)); if(!ret) { closedir(dir); return E_OUTOFMEMORY; @@ -237,7 +237,7 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) if(i == ret_size) { LPITEMIDLIST *resized; ret_size *= 2; - resized = HeapReAlloc(GetProcessHeap(), 0, ret, ret_size * sizeof(*ret)); + resized = heap_realloc(ret, ret_size * sizeof(*ret)); if(!resized) hr = E_OUTOFMEMORY; else ret = resized; } @@ -250,7 +250,7 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) hr = TRASH_CreateSimplePIDL(entry->d_name, &data, ret+i); if(FAILED(hr)) { while(i>0) SHFree(ret+(--i)); - HeapFree(GetProcessHeap(), 0, ret); + heap_free(ret); closedir(dir); return hr; } @@ -261,12 +261,12 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) *pidls = SHAlloc(sizeof(**pidls) * i); if(!*pidls) { while(i>0) SHFree(ret+(--i)); - HeapFree(GetProcessHeap(), 0, ret); + heap_free(ret); return E_OUTOFMEMORY; } *count = i; for(i--; i>=0; i--) (*pidls)[i] = ret[i]; - HeapFree(GetProcessHeap(), 0, ret); + heap_free(ret); return S_OK; } @@ -384,17 +384,16 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { struct stat file_stat; char *unix_path; - + int ret; + TRACE("(%s)\n", debugstr_w(wszPath)); if (!TRASH_EnsureInitialized()) return FALSE; if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; - if (lstat(unix_path, &file_stat)==-1) - { - HeapFree(GetProcessHeap(), 0, unix_path); + ret = lstat(unix_path, &file_stat); + heap_free(unix_path); + if (ret == -1) return FALSE; - } - HeapFree(GetProcessHeap(), 0, unix_path); return file_good_for_bucket(home_trash, &file_stat); } @@ -542,7 +541,7 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; result = TRASH_MoveFileToBucket(home_trash, unix_path); - HeapFree(GetProcessHeap(), 0, unix_path); + heap_free(unix_path); return result; } @@ -760,7 +759,7 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){ else WARN("could not erase %s from the trash (errno=%i)\n",filename,errno); SHFree(file_path); - HeapFree(GetProcessHeap(), 0, restore_path); + heap_free(restore_path); return S_OK; } diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 1504f1f951..3f1d317b72 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -756,7 +756,7 @@ static HRESULT get_xdg_config_file(char * home_dir, char ** config_file) config_home = getenv("XDG_CONFIG_HOME"); if (!config_home || !config_home[0]) { - *config_file = HeapAlloc(GetProcessHeap(), 0, strlen(home_dir) + strlen("/.config/user-dirs.dirs") + 1); + *config_file = heap_alloc(strlen(home_dir) + strlen("/.config/user-dirs.dirs") + 1); if (!*config_file) return E_OUTOFMEMORY; @@ -765,7 +765,7 @@ static HRESULT get_xdg_config_file(char * home_dir, char ** config_file) } else { - *config_file = HeapAlloc(GetProcessHeap(), 0, strlen(config_home) + strlen("/user-dirs.dirs") + 1); + *config_file = heap_alloc(strlen(config_home) + strlen("/user-dirs.dirs") + 1); if (!*config_file) return E_OUTOFMEMORY; @@ -849,7 +849,7 @@ static HRESULT parse_config2(char * p, const char * home_dir, char ** out_ptr) if (relative) { - out = HeapAlloc(GetProcessHeap(), 0, strlen(home_dir) + strlen(p) + 2); + out = heap_alloc(strlen(home_dir) + strlen(p) + 2); if (!out) return E_OUTOFMEMORY; @@ -858,7 +858,7 @@ static HRESULT parse_config2(char * p, const char * home_dir, char ** out_ptr) } else { - out = HeapAlloc(GetProcessHeap(), 0, strlen(p) + 1); + out = heap_alloc(strlen(p) + 1); if (!out) return E_OUTOFMEMORY; *out = 0; @@ -897,7 +897,7 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d unsigned int i; HRESULT hr; - *out_ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num_dirs * sizeof(char *)); + *out_ptr = heap_alloc_zero(num_dirs * sizeof(char *)); out = *out_ptr; if (!out) return E_OUTOFMEMORY; @@ -914,7 +914,7 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d goto xdg_user_dir_lookup_error; file = fopen(config_file, "r"); - HeapFree(GetProcessHeap(), 0, config_file); + heap_free(config_file); if (!file) { hr = E_HANDLE; @@ -963,15 +963,16 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d continue; if (!stat(out[i], &statFolder) && S_ISDIR(statFolder.st_mode)) continue; - HeapFree(GetProcessHeap(), 0, out[i]); + heap_free(out[i]); out[i] = NULL; } xdg_user_dir_lookup_error: if (FAILED(hr)) { - for (i = 0; i < num_dirs; i++) HeapFree(GetProcessHeap(), 0, out[i]); - HeapFree(GetProcessHeap(), 0, *out_ptr); + for (i = 0; i < num_dirs; i++) + heap_free(out[i]); + heap_free(*out_ptr); } return hr; } -- 2.16.1

1 0

[PATCH 4/5] wined3d: Use wined3d_texture_get_sub_resource_target() in surface_load_fb_texture().
by Henri Verbeet 22 Feb '18

22 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 7 +++++-- dlls/wined3d/texture.c | 11 ----------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 699e8b3..d4da824 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1529,15 +1529,17 @@ error: * switch to a different context and restore the original one before return. */ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *old_ctx) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; + GLenum target; restore_rt = context_get_rt_surface(old_ctx); if (restore_rt != surface) - context = context_acquire(device, texture, surface_get_sub_resource_idx(surface)); + context = context_acquire(device, texture, sub_resource_idx); else restore_rt = NULL; @@ -1555,7 +1557,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); checkGLcall("glReadBuffer"); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(surface->texture_target, surface->texture_level, + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, surface->texture_level, 0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), wined3d_texture_get_level_height(texture, surface->texture_level)); checkGLcall("glCopyTexSubImage2D"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e34299..ebaa3b9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1394,7 +1394,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->target = GL_TEXTURE_2D_MULTISAMPLE; else texture->target = GL_TEXTURE_2D; - texture->sub_resources[0].u.surface->texture_target = texture->target; if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) @@ -2213,22 +2212,12 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { for (j = 0; j < texture->layer_count; ++j) { - static const GLenum cube_targets[6] = - { - GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB, - }; struct wined3d_texture_sub_resource *sub_resource; unsigned int idx = j * texture->level_count + i; struct wined3d_surface *surface; surface = &surfaces[idx]; surface->container = texture; - surface->texture_target = desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP ? cube_targets[j] : texture->target; surface->texture_level = i; surface->texture_layer = j; list_init(&surface->renderbuffers); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b9647d2..b4d15c5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3310,7 +3310,6 @@ struct wined3d_surface { struct wined3d_texture *container; - GLenum texture_target; unsigned int texture_level; unsigned int texture_layer; -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_hwstretch().
by Henri Verbeet 22 Feb '18

22 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dfdcd9c..699e8b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1692,19 +1692,23 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; + GLenum src_target, dst_target, texture_target; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ const struct wined3d_gl_info *gl_info; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; - GLenum texture_target; BOOL noBackBufferBackup; BOOL src_offscreen; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; TRACE("Using hwstretch blit\n"); + + src_target = wined3d_texture_get_sub_resource_target(src_texture, src_sub_resource_idx); + dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); + /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(device, src_texture, src_sub_resource_idx); gl_info = context->gl_info; @@ -1751,7 +1755,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st /* Backup the back buffer and copy the source buffer into a texture to draw an upside down stretched quad. If * we are reading from the back buffer, the backup can be used as source texture */ - texture_target = src_surface->texture_target; + texture_target = src_target; context_bind_texture(context, texture_target, src_texture->texture_rgb.name); gl_info->gl_ops.gl.p_glEnable(texture_target); checkGLcall("glEnable(texture_target)"); @@ -1879,11 +1883,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glEnd(); checkGLcall("glEnd and previous"); - if (texture_target != dst_surface->texture_target) + if (texture_target != dst_target) { gl_info->gl_ops.gl.p_glDisable(texture_target); - gl_info->gl_ops.gl.p_glEnable(dst_surface->texture_target); - texture_target = dst_surface->texture_target; + gl_info->gl_ops.gl.p_glEnable(dst_target); + texture_target = dst_target; } /* Now read the stretched and upside down image into the destination texture */ @@ -1910,13 +1914,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } else { - if (texture_target != src_surface->texture_target) + if (texture_target != src_target) { gl_info->gl_ops.gl.p_glDisable(texture_target); - gl_info->gl_ops.gl.p_glEnable(src_surface->texture_target); - texture_target = src_surface->texture_target; + gl_info->gl_ops.gl.p_glEnable(src_target); + texture_target = src_target; } - context_bind_texture(context, src_surface->texture_target, src_texture->texture_rgb.name); + context_bind_texture(context, src_target, src_texture->texture_rgb.name); } gl_info->gl_ops.gl.p_glBegin(GL_QUADS); -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_direct().
by Henri Verbeet 22 Feb '18

22 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eafe47f..dfdcd9c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1580,6 +1580,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; unsigned int src_height; + GLenum dst_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -1627,12 +1628,13 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc } src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) { /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do. */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, src_rect->left, src_height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); @@ -1657,14 +1659,14 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc for (col = dst_rect.left; col < dst_rect.right; ++col) { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, dst_rect.left + col /* x offset */, row /* y offset */, src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } } else { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, dst_rect.left /* x offset */, row /* y offset */, src_rect->left, yoffset - (int) (row * yrel), dst_rect.right - dst_rect.left, 1); } -- 2.1.4

1 0

[PATCH 1/5] wined3d: Use wined3d_texture_get_sub_resource_target() in draw_textured_quad().
by Henri Verbeet 22 Feb '18

22 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/surface.c | 19 ++++++++++++------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d21f24..36e69a9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7797,6 +7797,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; @@ -7877,7 +7878,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blit_set(arbfp_blitter, context, src_surface, color_key); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); + draw_textured_quad(src_texture, src_sub_resource_idx, context, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6e80f85..eafe47f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -176,16 +176,20 @@ static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLs } /* Context activation is done by the caller. */ -void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, - const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) +void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = src_surface->container; struct blt_info info; + unsigned int level; + GLenum target; - surface_get_blt_info(src_surface->texture_target, src_rect, - wined3d_texture_get_level_pow2_width(texture, src_surface->texture_level), - wined3d_texture_get_level_pow2_height(texture, src_surface->texture_level), &info); + level = sub_resource_idx % texture->level_count; + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + surface_get_blt_info(target, src_rect, + wined3d_texture_get_level_pow2_width(texture, level), + wined3d_texture_get_level_pow2_height(texture, level), &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); @@ -2819,6 +2823,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2903,7 +2908,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glAlphaFunc"); } - draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); + draw_textured_quad(src_texture, src_sub_resource_idx, context, src_rect, dst_rect, filter); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 021c274..b9647d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3346,8 +3346,9 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; -void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, - const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; struct wined3d_sampler { -- 2.1.4

1 0

[PATCH 1/2] xmllite: Use ARRAY_SIZE macro for reader too
by Nikolay Sivov 22 Feb '18

22 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 8 ++++---- dlls/xmllite/writer.c | 2 -- dlls/xmllite/xmllite_private.h | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 495d4e3cb4..9cb7f3bd77 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -168,7 +168,7 @@ const WCHAR *get_encoding_name(xml_encoding encoding) xml_encoding get_encoding_from_codepage(UINT codepage) { int i; - for (i = 0; i < sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(xml_encoding_map); i++) { if (xml_encoding_map[i].cp == codepage) return xml_encoding_map[i].enc; } @@ -749,7 +749,7 @@ xml_encoding parse_encoding_name(const WCHAR *name, int len) if (!name) return XmlEncoding_Unknown; min = 0; - max = sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]) - 1; + max = ARRAY_SIZE(xml_encoding_map) - 1; while (min <= max) { @@ -3013,12 +3013,12 @@ static void reader_get_attribute_ns_uri(xmlreader *reader, struct attribute *att strval_eq(reader, &attr->prefix, &strval_xmlns)) { *uri = xmlns_uriW; - *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + *len = ARRAY_SIZE(xmlns_uriW) - 1; } else if (strval_eq(reader, &attr->prefix, &strval_xml)) { *uri = xml_uriW; - *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + *len = ARRAY_SIZE(xml_uriW) - 1; } else { diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 9bf7e63211..88f75b6e20 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 7884e27453..381dec496c 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -23,6 +23,8 @@ #include "wine/heap.h" +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) + static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc) -- 2.16.1

1 1

[PATCH] testbot: Ensure we prepare the right future VM on startup.
by Francois Gouget 22 Feb '18

22 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 56c903d09..ae1e4ecde 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -471,6 +471,7 @@ sub _GetSchedHost($$) sleeping => 0, running => 0, dirty => 0, + dirtychild => 0, MaxRevertingVMs => $MaxRevertingVMs, MaxRevertsWhileRunningVMs => $MaxRevertsWhileRunningVMs, MaxActiveVMs => $MaxActiveVMs, @@ -604,6 +605,7 @@ sub _CheckAndClassifyVMs() $Sched->{busyvms}->{$VMKey} = 1; $Host->{$VM->Status}++; $Host->{active}++; + $Host->{dirtychild}++ if ($VM->Status eq "dirty"); } elsif ($VM->Status eq "sleeping") { @@ -1103,13 +1105,16 @@ sub _RevertVMs($$) { # Only start preparing VMs for future jobs on a host which is idle, i.e. # which no longer has queued tasks (ignoring blocked ones). - # Note that we could also check that the host only has idle VMs. This - # would help ensure that we are not prevented from preparing the best VM - # (e.g. build) on startup just because it is still being checked (i.e. - # marked dirty). But during regular operation this would force the host - # to go through an extra poweroff during which we lose track of which - # VM is 'hot' - if ($Host->{queued} != 0 or $Host->{MaxVMsWhenIdle} == 0) + # Note that during regular operation we get dirty VMs before they are + # assigned a process to shut them down. This makes it possible to pick + # the best future VM while we still know which VM is hot. + # In constrast on startup the dirty VMs all have processes checking their + # status, hence the dirtychild check to ensure we are not prevented from + # preparing the best VM (e.g. build): it delays preparing the future VMs + # until either there are no dirty VM or a VM got prepared for a task + # which means the host is not idle. + if ($Host->{queued} != 0 or $Host->{MaxVMsWhenIdle} == 0 or + ($Host->{active} and $Host->{active} == $Host->{dirtychild})) { # The TestBot is busy or does not prepare VMs when idle next; -- 2.16.1

1 0

Testing Visual Styles - Is there an app that displays a good selection windows widgets ?
by Stuart Axon 22 Feb '18

22 Feb '18

I'm interested in testing the visual styles support in Wine with various visual styles. Is there an app that displays a selection of windows widgets, so I can try styles and grab screenshots of anything that looks weird ? I'm was thinking an equivalent to the Gtk app that exercises all the widgets. S++

3 2

[PATCH 00/10] winevulkan
by Roderick Colenbrander 21 Feb '18

21 Feb '18

Hi all, This is the first wave of patches for my Vulkan ICD for Wine. There have been many changes and improvements since I first posted my work. In particular there is a winevulkan library now, which implements common code between ICDs instead of winex11 and other drivers being the ICD. In Vulkan there is no clear OpenGL / WGL separation, but I managed to separate things into Window System Integration (WSI) and a few core Vulkan functions. Feature wise the ICD will be at Vulkan 1.0.51 and core functionality and various extension will work. Two features not there yet are child window rendering and application provided memory allocators. Memory allocation will come later and for child window rendering I haven't found any application using it yet. The code has been tested with many Vulkan applications and major games e.g. Doom and Wolfenstein II thanks to my testers. All seem to work quite well. The full 40+ patches can be found here: https://github.com/roderickc/wine-vulkan See my github page as well for instructions how to use the ICD (registry keys, json file). I intend to add this into Wine later. Not sure yet how. Registry keys can automate using DllRegisterServer. Not sure yet how we want to deal with the json file. We can either bundle it as a file somehow or I could generate it from DllRegisterServer. Not sure what is preferred. See khronos documentation for details on the ICD interface: https://github.com/LunarG/VulkanSamples/blob/master/loader/LoaderAndLayerIn… Thanks, Roderick Roderick Colenbrander (10): vulkan: Add initial Wine vulkan header. winevulkan: Add stub ICD. winevulkan: Implement vk_icdNegotiateICDInterfaceVersion. winevulkan: Implement global Vulkan function stubs and loading. winevulkan: Define vulkan driver interface. winex11: Add Vulkan stubs. winex11: Implement vkEnumerateInstanceExtensionProperties. winevulkan/winex11: Implement vkCreateInstance. winevulkan: Add instance funcs stubs. winevulkan: Implement vkDestroyInstance. configure.ac | 10 + dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/dibdrv/dc.c | 2 + dlls/gdi32/driver.c | 6 + dlls/gdi32/enhmfdrv/dc.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/gdi32.spec | 3 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/gdi32/vulkan.c | 41 + dlls/wineandroid.drv/init.c | 1 + dlls/winemac.drv/gdi.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winevulkan/Makefile.in | 8 + dlls/winevulkan/version.rc | 27 + dlls/winevulkan/vulkan.c | 235 ++++ dlls/winevulkan/vulkan_private.h | 51 + dlls/winevulkan/vulkan_thunks.c | 104 ++ dlls/winevulkan/vulkan_thunks.h | 12 + dlls/winevulkan/winevulkan.spec | 2 + dlls/winex11.drv/Makefile.in | 3 +- dlls/winex11.drv/init.c | 16 + dlls/winex11.drv/vulkan.c | 151 +++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 1 + include/config.h.in | 3 + include/wine/gdi_driver.h | 5 +- include/wine/vulkan.h | 2678 ++++++++++++++++++++++++++++++++++++++ include/wine/vulkan_driver.h | 23 + 30 files changed, 3390 insertions(+), 3 deletions(-) create mode 100644 dlls/gdi32/vulkan.c create mode 100644 dlls/winevulkan/Makefile.in create mode 100644 dlls/winevulkan/version.rc create mode 100644 dlls/winevulkan/vulkan.c create mode 100644 dlls/winevulkan/vulkan_private.h create mode 100644 dlls/winevulkan/vulkan_thunks.c create mode 100644 dlls/winevulkan/vulkan_thunks.h create mode 100644 dlls/winevulkan/winevulkan.spec create mode 100644 dlls/winex11.drv/vulkan.c create mode 100644 include/wine/vulkan.h create mode 100644 include/wine/vulkan_driver.h -- 2.14.3

3 24

[PATCH] mshtml/tests: Fixed copy&paste typo in createDocumentFragment call.
by Jacek Caban 21 Feb '18

21 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/elements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/3] kerberos: Add support for caller supplied credentials.
by Hans Leidekker 21 Feb '18

21 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 198 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 154 insertions(+), 44 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 42474eaaea..e51f7ea4f8 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -91,21 +91,30 @@ static LSA_DISPATCH_TABLE lsa_dispatch; static void *libkrb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p_##f -MAKE_FUNCPTR(krb5_init_context); -MAKE_FUNCPTR(krb5_free_context); -MAKE_FUNCPTR(krb5_free_ticket); -MAKE_FUNCPTR(krb5_cccol_cursor_new); -MAKE_FUNCPTR(krb5_cccol_cursor_next); -MAKE_FUNCPTR(krb5_cccol_cursor_free); MAKE_FUNCPTR(krb5_cc_close); -MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_default); MAKE_FUNCPTR(krb5_cc_end_seq_get); +MAKE_FUNCPTR(krb5_cc_initialize); MAKE_FUNCPTR(krb5_cc_next_cred); -MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_store_cred); +MAKE_FUNCPTR(krb5_cccol_cursor_free); +MAKE_FUNCPTR(krb5_cccol_cursor_new); +MAKE_FUNCPTR(krb5_cccol_cursor_next); MAKE_FUNCPTR(krb5_decode_ticket); -MAKE_FUNCPTR(krb5_unparse_name_flags); -MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_free_context); MAKE_FUNCPTR(krb5_free_cred_contents); +MAKE_FUNCPTR(krb5_free_principal); +MAKE_FUNCPTR(krb5_free_ticket); +MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_get_init_creds_opt_alloc); +MAKE_FUNCPTR(krb5_get_init_creds_opt_free); +MAKE_FUNCPTR(krb5_get_init_creds_opt_set_out_ccache); +MAKE_FUNCPTR(krb5_get_init_creds_password); +MAKE_FUNCPTR(krb5_init_context); +MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_parse_name_flags); +MAKE_FUNCPTR(krb5_unparse_name_flags); #undef MAKE_FUNCPTR static void load_krb5(void) @@ -123,21 +132,30 @@ static void load_krb5(void) goto fail; \ } - LOAD_FUNCPTR(krb5_init_context) - LOAD_FUNCPTR(krb5_free_context) - LOAD_FUNCPTR(krb5_free_ticket) - LOAD_FUNCPTR(krb5_cccol_cursor_new) - LOAD_FUNCPTR(krb5_cccol_cursor_next) - LOAD_FUNCPTR(krb5_cccol_cursor_free) LOAD_FUNCPTR(krb5_cc_close) - LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_default) LOAD_FUNCPTR(krb5_cc_end_seq_get) + LOAD_FUNCPTR(krb5_cc_initialize) LOAD_FUNCPTR(krb5_cc_next_cred) - LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_store_cred) + LOAD_FUNCPTR(krb5_cccol_cursor_free) + LOAD_FUNCPTR(krb5_cccol_cursor_new) + LOAD_FUNCPTR(krb5_cccol_cursor_next) LOAD_FUNCPTR(krb5_decode_ticket) - LOAD_FUNCPTR(krb5_unparse_name_flags) - LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_free_context) LOAD_FUNCPTR(krb5_free_cred_contents) + LOAD_FUNCPTR(krb5_free_principal) + LOAD_FUNCPTR(krb5_free_ticket) + LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_get_init_creds_opt_alloc) + LOAD_FUNCPTR(krb5_get_init_creds_opt_free) + LOAD_FUNCPTR(krb5_get_init_creds_opt_set_out_ccache) + LOAD_FUNCPTR(krb5_get_init_creds_password) + LOAD_FUNCPTR(krb5_init_context) + LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_parse_name_flags) + LOAD_FUNCPTR(krb5_unparse_name_flags) #undef LOAD_FUNCPTR return; @@ -818,38 +836,96 @@ static int get_buffer_index( SecBufferDesc *desc, DWORD type ) } return -1; } -#endif /* SONAME_LIBGSSAPI_KRB5 */ -static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( - UNICODE_STRING *principal_us, ULONG credential_use, LUID *logon_id, void *auth_data, - void *get_key_fn, void *get_key_arg, LSA_SEC_HANDLE *credential, TimeStamp *ts_expiry ) +static char *get_user_at_domain( const WCHAR *user, ULONG user_len, const WCHAR *domain, ULONG domain_len ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - OM_uint32 ret, minor_status, expiry_time; - gss_name_t principal = GSS_C_NO_NAME; - gss_cred_usage_t cred_usage; - gss_cred_id_t cred_handle; + int len_user, len_domain; + char *ret; - TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, - logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); + len_user = WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, NULL, 0, NULL, NULL ); + len_domain = WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, NULL, 0, NULL, NULL ); + if (!(ret = heap_alloc( len_user + len_domain + 2 ))) return NULL; + + WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, ret, len_user, NULL, NULL ); + ret[len_user] = '@'; + WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, ret + len_user + 1, len_domain, NULL, NULL ); + ret[len_user + len_domain + 1] = 0; + return ret; +} - if (auth_data) FIXME( "specific credentials not supported\n" ); +static char *get_password( const WCHAR *passwd, ULONG passwd_len ) +{ + int len; + char *ret; - switch (credential_use) + len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, passwd, passwd_len, NULL, 0, NULL, NULL ); + if (!(ret = heap_alloc( len + 1 ))) return NULL; + WideCharToMultiByte( CP_UNIXCP, 0, passwd, passwd_len, ret, len, NULL, NULL ); + ret[len] = 0; + return ret; +} + +static NTSTATUS init_creds( const SEC_WINNT_AUTH_IDENTITY_W *id ) +{ + char *user_at_domain, *password; + krb5_context ctx; + krb5_principal principal = NULL; + krb5_get_init_creds_opt *options = NULL; + krb5_ccache cache = NULL; + krb5_creds creds; + krb5_error_code err; + + if (!id) return STATUS_SUCCESS; + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) { - case SECPKG_CRED_INBOUND: - cred_usage = GSS_C_ACCEPT; - break; - case SECPKG_CRED_OUTBOUND: - cred_usage = GSS_C_INITIATE; - break; - case SECPKG_CRED_BOTH: - cred_usage = GSS_C_BOTH; - break; - default: - return SEC_E_UNKNOWN_CREDENTIALS; + FIXME( "ANSI identity not supported\n" ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + if (!(user_at_domain = get_user_at_domain( id->User, id->UserLength, id->Domain, id->DomainLength ))) + { + return SEC_E_INSUFFICIENT_MEMORY; + } + if (!(password = get_password( id->Password, id->PasswordLength ))) + { + heap_free( user_at_domain ); + return SEC_E_INSUFFICIENT_MEMORY; } + if ((err = p_krb5_init_context( &ctx ))) + { + heap_free( password ); + heap_free( user_at_domain ); + return krb5_error_to_status( err ); + } + if ((err = p_krb5_parse_name_flags( ctx, user_at_domain, 0, &principal ))) goto done; + if ((err = p_krb5_cc_default( ctx, &cache ))) goto done; + if ((err = p_krb5_get_init_creds_opt_alloc( ctx, &options ))) goto done; + if ((err = p_krb5_get_init_creds_opt_set_out_ccache( ctx, options, cache ))) goto done; + if ((err = p_krb5_get_init_creds_password( ctx, &creds, principal, password, 0, NULL, 0, NULL, 0 ))) goto done; + if ((err = p_krb5_cc_initialize( ctx, cache, principal ))) goto done; + if ((err = p_krb5_cc_store_cred( ctx, cache, &creds ))) goto done; + + TRACE( "success\n" ); + p_krb5_free_cred_contents( ctx, &creds ); + +done: + if (cache) p_krb5_cc_close( ctx, cache ); + if (principal) p_krb5_free_principal( ctx, principal ); + if (options) p_krb5_get_init_creds_opt_free( ctx, options ); + p_krb5_free_context( ctx ); + heap_free( user_at_domain ); + heap_free( password ); + + return krb5_error_to_status( err ); +} + +static NTSTATUS acquire_credentials_handle( UNICODE_STRING *principal_us, gss_cred_usage_t cred_usage, + LSA_SEC_HANDLE *credential, TimeStamp *ts_expiry ) +{ + OM_uint32 ret, minor_status, expiry_time; + gss_name_t principal = GSS_C_NO_NAME; + gss_cred_id_t cred_handle; + if (principal_us && ((ret = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return ret; ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, @@ -865,6 +941,40 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( if (principal != GSS_C_NO_NAME) pgss_release_name( &minor_status, &principal ); return status_gss_to_sspi( ret ); +} +#endif /* SONAME_LIBGSSAPI_KRB5 */ + +static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( + UNICODE_STRING *principal_us, ULONG credential_use, LUID *logon_id, void *auth_data, + void *get_key_fn, void *get_key_arg, LSA_SEC_HANDLE *credential, TimeStamp *ts_expiry ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_cred_usage_t cred_usage; + NTSTATUS status; + + TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, + logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); + + switch (credential_use) + { + case SECPKG_CRED_INBOUND: + cred_usage = GSS_C_ACCEPT; + break; + + case SECPKG_CRED_OUTBOUND: + if ((status = init_creds( auth_data )) != STATUS_SUCCESS) return status; + cred_usage = GSS_C_INITIATE; + break; + + case SECPKG_CRED_BOTH: + cred_usage = GSS_C_BOTH; + break; + + default: + return SEC_E_UNKNOWN_CREDENTIALS; + } + + return acquire_credentials_handle( principal_us, cred_usage, credential, ts_expiry ); #else FIXME( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); -- 2.11.0

1 0

[PATCH 2/3] kerberos: Get rid of a redundant parameter check in kerberos_SpInitLsaModeContext.
by Hans Leidekker 21 Feb '18

21 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 52cbe05da4..42474eaaea 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -920,7 +920,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, cred_handle = credhandle_sspi_to_gss( credential ); ctxt_handle = ctxthandle_sspi_to_gss( context ); - if (!input || (idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; else { input_token.length = input->pBuffers[idx].cbBuffer; -- 2.11.0

1 0

[PATCH 1/3] include: Fix the definition of CREDUI_MAX_DOMAIN_TARGET_LENGTH.
by Hans Leidekker 21 Feb '18

21 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/wincred.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincred.h b/include/wincred.h index 74fc16f91f..86934b892e 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -189,7 +189,7 @@ typedef struct _BINARY_BLOB_CREDENTIAL_INFO #define CREDUI_MAX_MESSAGE_LENGTH 32767 #define CREDUI_MAX_CAPTION_LENGTH 128 #define CREDUI_MAX_GENERIC_TARGET_LENGTH CRED_MAX_GENERIC_TARGET_NAME_LENGTH -#define CREDUI_MAX_DOMAIN_TARGET_LENGTH CRED_MAX_DOMAIN_TARGET_LENGTH +#define CREDUI_MAX_DOMAIN_TARGET_LENGTH CRED_MAX_DOMAIN_TARGET_NAME_LENGTH #define CREDUI_MAX_USERNAME_LENGTH CRED_MAX_USERNAME_LENGTH #define CREDUI_MAX_PASSWORD_LENGTH (CRED_MAX_CREDENTIAL_BLOB_SIZE / 2) -- 2.11.0

1 0

[PATCH 4/4] mshtml: Forward IHTMLEventObj::toElement and fromElement implementation to IDOMMouseEvent.
by Jacek Caban 21 Feb '18

21 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] mshtml: Added IDOMMouseEvent::fromElement property implementation.
by Jacek Caban 21 Feb '18

21 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/events.js | 1 + 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] mshtml: Added IDOMMouseEvent::toElement property implementation.
by Jacek Caban 21 Feb '18

21 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++----- dlls/mshtml/tests/events.js | 1 + 2 files changed, 29 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] mshtml: Improved IDOMMouseEvent::offset[XY] stubs.
by Jacek Caban 21 Feb '18

21 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 24 ++++++++++++++++++------ dlls/mshtml/tests/events.js | 2 ++ 2 files changed, 20 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2] comctl32/tests: Run some tooltips tests on version 6 too
by Nikolay Sivov 21 Feb '18

21 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/tooltips.c | 48 ++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 7e82604376..207536cadf 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -24,9 +24,11 @@ #include "wine/test.h" +#include "v6util.h" + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -static void test_create_tooltip(void) +static void test_create_tooltip(BOOL is_v6) { HWND parent, hwnd; DWORD style, exp_style; @@ -56,9 +58,12 @@ static void test_create_tooltip(void) ok(hwnd != NULL, "failed to create tooltip wnd\n"); style = GetWindowLongA(hwnd, GWL_STYLE); - trace("style = %08x\n", style); - ok(style == (WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER), - "wrong style %08x\n", style); + exp_style = WS_POPUP | WS_CLIPSIBLINGS; + if (!is_v6) + exp_style |= WS_BORDER; +todo_wine_if(is_v6) + ok(style == exp_style || broken(style == (exp_style | WS_BORDER)) /* XP */, + "Unexpected window style %#x.\n", style); DestroyWindow(hwnd); @@ -273,9 +278,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP return DefWindowProcA(hwnd, message, wParam, lParam); } -static BOOL register_parent_wnd_class(void) +static void register_parent_wnd_class(void) { WNDCLASSA cls; + BOOL ret; cls.style = 0; cls.lpfnWndProc = parent_wnd_proc; @@ -287,14 +293,12 @@ static BOOL register_parent_wnd_class(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Tooltips test parent class"; - return RegisterClassA(&cls); + ret = RegisterClassA(&cls); + ok(ret, "Failed to register test parent class.\n"); } static HWND create_parent_window(void) { - if (!register_parent_wnd_class()) - return NULL; - return CreateWindowExA(0, "Tooltips test parent class", "Tooltips test parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -884,7 +888,7 @@ static LRESULT CALLBACK info_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM return 0; } -static void test_setinfo(void) +static void test_setinfo(BOOL is_v6) { WNDCLASSA wc; LRESULT lResult; @@ -976,7 +980,8 @@ static void test_setinfo(void) toolInfo2.uId = 0x1234ABCD; lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); ok(lResult, "GetToolInfo failed\n"); - ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS || broken(is_v6 && !(toolInfo2.uFlags & TTF_SUBCLASS)) /* XP */, + "uFlags does not have subclass\n"); wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); @@ -1057,15 +1062,32 @@ static void test_margin(void) START_TEST(tooltips) { + ULONG_PTR ctx_cookie; + HANDLE hCtx; + LoadLibraryA("comctl32.dll"); - test_create_tooltip(); + register_parent_wnd_class(); + + test_create_tooltip(FALSE); test_customdraw(); test_gettext(); test_ttm_gettoolinfo(); test_longtextA(); test_longtextW(); test_track(); - test_setinfo(); + test_setinfo(FALSE); test_margin(); + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_create_tooltip(TRUE); + test_customdraw(); + test_longtextW(); + test_track(); + test_setinfo(TRUE); + test_margin(); + + unload_v6_module(ctx_cookie, hCtx); } -- 2.16.1

1 1

[PATCH 1/8] wined3d: Fix stack buffer overrun in wined3d_debug_resource_access().
by Józef Kucia 21 Feb '18

21 Feb '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 10cfa25a4cdc..e6a6244ff5e8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4150,7 +4150,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) const char *wined3d_debug_resource_access(DWORD access) { - char buf[91]; + char buf[124]; buf[0] = '\0'; #define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } -- 2.13.6

5 19

[PATCH v4 7/7] winebus.sys: Add SDL to CriticalDeviceDatabase
by Aric Stewart 21 Feb '18

21 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH v4 6/7] winebus.sys: Implement SDL Haptic for controller vibration
by Aric Stewart 21 Feb '18

21 Feb '18

v3: Dynamicl load of SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 134 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 3 deletions(-)

1 0

[PATCH v4 5/7] winebus.sys: map SDL GameControllers if requested
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 267 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 251 insertions(+), 16 deletions(-)

1 0

[PATCH v4 4/7] winebus.sys: Process SDL device reports
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 120 ++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/bus_udev.c | 19 +------ dlls/winebus.sys/controller.c | 17 ++++++ dlls/winebus.sys/controller.h | 1 + 4 files changed, 139 insertions(+), 18 deletions(-)

1 0

[PATCH v4 3/7] winebus.sys: Build SDL device report
by Aric Stewart 21 Feb '18

21 Feb '18

v2: Correct ifdef value v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 1 + dlls/winebus.sys/bus_sdl.c | 197 +++++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/bus_udev.c | 95 +------------------- dlls/winebus.sys/controller.c | 48 ++++++++++ dlls/winebus.sys/controller.h | 96 ++++++++++++++++++++ 5 files changed, 342 insertions(+), 95 deletions(-) create mode 100644 dlls/winebus.sys/controller.c create mode 100644 dlls/winebus.sys/controller.h

1 0

[PATCH v4 2/7] winebus.sys: Support adding and removing SDL devices
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic loading of the SDL library v4: Dynamically use Joystick Vendor and Product ID if available Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 292 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 291 insertions(+), 1 deletion(-)

1 0

[PATCH v4 1/7] winebus.sys: Add SDL gamepad and joystick driver
by Aric Stewart 21 Feb '18

21 Feb '18

v3: dynamic SDL library loading v4: Dynamically use Joystick Vendor and Product ID if avaliable Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- configure | 160 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 15 ++++ dlls/winebus.sys/Makefile.in | 3 +- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_sdl.c | 58 ++++++++++++++++ dlls/winebus.sys/main.c | 15 +++- include/config.h.in | 9 +++ 7 files changed, 259 insertions(+), 2 deletions(-) create mode 100644 dlls/winebus.sys/bus_sdl.c

1 0

[PATCH] wined3d: Increase string buffer size in wined3d_debug_resource_access().
by Paul Gofman 21 Feb '18

21 Feb '18

Otherwise it was crashing on long resource access debug string. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 10cfa25a4c..e2c02f0785 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4150,7 +4150,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) const char *wined3d_debug_resource_access(DWORD access) { - char buf[91]; + char buf[126]; buf[0] = '\0'; #define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } -- 2.14.3

3 3

[PATCH] d3dx9: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/surface.c | 10 +++++----- dlls/d3dx9_36/texture.c | 4 ++-- dlls/d3dx9_36/util.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294ce624f..fc23745b0b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2340,7 +2340,7 @@ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_id if (element->Stream != stream_idx) continue; - if (element->Type >= sizeof(d3dx_decltype_size) / sizeof(*d3dx_decltype_size)) + if (element->Type >= ARRAY_SIZE(d3dx_decltype_size)) { FIXME("Unhandled element type %#x, size will be incorrect.\n", element->Type); continue; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fc747799d6..0a6e20e8f1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -53,7 +53,7 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) { unsigned int i; - for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(wic_pixel_formats); i++) { if (IsEqualGUID(wic_pixel_formats[i].wic_guid, guid)) return wic_pixel_formats[i].d3dformat; @@ -66,7 +66,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) { unsigned int i; - for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(wic_pixel_formats); i++) { if (wic_pixel_formats[i].d3dformat == format) return wic_pixel_formats[i].wic_guid; @@ -164,7 +164,7 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) D3DFMT_A32B32G32R32F, }; - for (i = 0; i < sizeof(known_fourcc) / sizeof(known_fourcc[0]); i++) + for (i = 0; i < ARRAY_SIZE(known_fourcc); i++) { if (known_fourcc[i] == fourcc) return fourcc; @@ -203,7 +203,7 @@ static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_forma { unsigned int i; - for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(rgb_pixel_formats); i++) { if (rgb_pixel_formats[i].bpp == pixel_format->bpp && rgb_pixel_formats[i].rmask == pixel_format->rmask @@ -297,7 +297,7 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form pixel_format->size = sizeof(*pixel_format); - for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(rgb_pixel_formats); i++) { if (rgb_pixel_formats[i].format == d3dformat) { diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index b326bc1362..b81f3a1e9e 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -200,7 +200,7 @@ static D3DFORMAT get_luminance_replacement_format(D3DFORMAT format) }; unsigned int i; - for (i = 0; i < sizeof(luminance_replacements) / sizeof(luminance_replacements[0]); ++i) + for (i = 0; i < ARRAY_SIZE(luminance_replacements); ++i) if (format == luminance_replacements[i].luminance_format) return luminance_replacements[i].replacement_format; return format; @@ -557,7 +557,7 @@ static D3DFORMAT get_alpha_replacement_format(D3DFORMAT format) }; unsigned int i; - for (i = 0; i < sizeof(replacement_formats) / sizeof(replacement_formats[0]); ++i) + for (i = 0; i < ARRAY_SIZE(replacement_formats); ++i) if (replacement_formats[i].orig_format == format) return replacement_formats[i].replacement_format; return format; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 9e4bbbf0bc..af71250b78 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -220,7 +220,7 @@ const struct pixel_format_desc *get_format_info(D3DFORMAT format) const struct pixel_format_desc *get_format_info_idx(int idx) { - if(idx >= sizeof(formats) / sizeof(formats[0])) + if(idx >= ARRAY_SIZE(formats)) return NULL; if(formats[idx].format == D3DFMT_UNKNOWN) return NULL; -- 2.14.3

2 1

wineserver sometimes crashes in fd.c:1548: set_fd_events: Assertion `poll_users[user] == fd' failed
by Mihai Todor 21 Feb '18

21 Feb '18

Hello Everyone, I am using Wine 3.0 stable and, as part of my setup, I am running wineserver in persistent mode forever (wineserver -p) for performance reasons and, sometimes, it dies with this error: "wineserver: fd.c:1548: set_fd_events: Assertion `poll_users[user] == fd' failed." For the time being, this is a sufficiently rare occurrence to not concern me (it happens once / day or so), but I am curious to learn what might cause it, since it looks like a bug. For a bit more detail about my setup, while wineserver is running, I am starting a single instance of an x86 application with an embedded gRPC TCP server, I am instructing this application to process some local files and, after it finishes, I am stopping it. This cycle repeats once every 10 - 20 seconds on average and there is just one instance of this application running at the same time. Sometimes, this application hangs and I terminate it forcefully by killing the process (bad input file / bad code / etc), which is what I am thinking might be the cause of the wineserver crash. However, so far, I was unable to reproduce this issue consistently. I am considering to spend some time adding more logging in the wineserver code to narrow it down, but I'd be grateful if anyone has any insight into what might be the cause and how to diagnose it. Thanks, Mihai

1 1

[PATCH] ddraw: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 10 +++++----- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/utils.c | 25 ++++++++++++------------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56a02bc676..97a11ef1ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1738,7 +1738,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes outsize = NumCodes && Codes ? *NumCodes : 0; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) @@ -2395,7 +2395,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, wined3d_mutex_lock(); pixelformat.dwSize = sizeof(pixelformat); - for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) + for(fmt = 0; fmt < ARRAY_SIZE(checkFormatList); fmt++) { modenum = 0; while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], @@ -3111,7 +3111,7 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU if ((requested->dwFlags & provided->dwFlags) != requested->dwFlags) return FALSE; - for (i=0; i < sizeof(compare)/sizeof(compare[0]); i++) + for (i=0; i < ARRAY_SIZE(compare); i++) { if (requested->dwFlags & compare[i].flag && memcmp((const char *)provided + compare[i].offset, @@ -3643,7 +3643,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA return hr; } - for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) + for (i = 0; i < ARRAY_SIZE(device_list7); i++) { HRESULT ret; @@ -4357,7 +4357,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device return hr; } - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c2d87ddfe6..75e000aa09 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1086,7 +1086,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) @@ -1108,7 +1108,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, } } - for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i) + for (i = 0; i < ARRAY_SIZE(BumpFormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_LEGACYBUMPMAP, @@ -1214,7 +1214,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b6e5b11879..0faa98234d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -740,13 +740,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) && !IsEqualGUID(&IID_IUnknown, riid)) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i=0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 0170fcd7fb..65f24dc13f 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -768,8 +768,8 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) FE(DDSCAPS2_STEREOSURFACELEFT) }; - DDRAW_dump_flags_nolf(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0])); - DDRAW_dump_flags(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); + DDRAW_dump_flags_nolf(in->dwCaps, flags, ARRAY_SIZE(flags)); + DDRAW_dump_flags(in->dwCaps2, flags2, ARRAY_SIZE(flags2)); } static void @@ -806,7 +806,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) FE(DDPF_ZPIXELS) }; - DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags_nolf(flagmask, flags, ARRAY_SIZE(flags)); } static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems) @@ -906,8 +906,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) { DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members_caps, 1); } - DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, - sizeof(members)/sizeof(members[0])); + DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, ARRAY_SIZE(members)); } } @@ -984,7 +983,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) if (TRACE_ON(ddraw)) { TRACE(" - "); - DDRAW_dump_flags(cooplevel, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags(cooplevel, flags, ARRAY_SIZE(flags)); } } @@ -1143,13 +1142,13 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) }; TRACE(" - dwSize : %d\n", lpcaps->dwSize); - TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0])); - TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); - TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0])); - TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, sizeof(flags4)/sizeof(flags4[0])); - TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, sizeof(flags5)/sizeof(flags5[0])); - TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0])); - TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0])); + TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, ARRAY_SIZE(flags1)); + TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, ARRAY_SIZE(flags2)); + TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, ARRAY_SIZE(flags3)); + TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, ARRAY_SIZE(flags4)); + TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, ARRAY_SIZE(flags5)); + TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, ARRAY_SIZE(flags6)); + TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, ARRAY_SIZE(flags7)); TRACE("...\n"); TRACE(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes); TRACE(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays); -- 2.14.3

2 1

[PATCH] ddraw/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 02b10b5ccb..550d73a1bd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14265,7 +14265,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0, NULL); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 43c52aa8b9..3f433a6765 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13640,7 +13640,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); -- 2.14.3

2 1

[PATCH] d3d9: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 21 Feb '18

21 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/vertexdeclaration.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5f8827852a..5e0f55838f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2401,7 +2401,7 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (state >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; @@ -2421,7 +2421,7 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); - if (state >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index f7e0eb9e53..5075309638 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -344,7 +344,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem for (i = 0; i < count; ++i) { - if (d3d9_elements[i].Type >= (sizeof(d3d_dtype_lookup) / sizeof(*d3d_dtype_lookup))) + if (d3d9_elements[i].Type >= ARRAY_SIZE(d3d_dtype_lookup)) { WARN("Invalid element type %#x.\n", d3d9_elements[i].Type); heap_free(*wined3d_elements); -- 2.14.3

2 1

[PATCH 1/2] msi/tests: Use the custom DLL for testing deferred actions.
by Zebediah Figura 21 Feb '18

21 Feb '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/custom.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ dlls/msi/tests/install.c | 44 +++++++++++++++++++++++++++++++++----------- 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0eedb8e..f504464 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -83,3 +83,38 @@ UINT WINAPI test_retval(MSIHANDLE hinst) sscanf(prop, "%u", &retval); return retval; } + +static void append_file(MSIHANDLE hinst, const char *filename, const char *text) +{ + DWORD size; + HANDLE file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(hinst, file != INVALID_HANDLE_VALUE, "CreateFile failed, error %u\n", GetLastError()); + + SetFilePointer(file, 0, NULL, FILE_END); + WriteFile(file, text, strlen(text), &size, NULL); + CloseHandle(file); +} + +UINT WINAPI da_immediate(MSIHANDLE hinst) +{ + char prop[300]; + DWORD len = sizeof(prop); + + MsiGetPropertyA(hinst, "TESTPATH", prop, &len); + + append_file(hinst, prop, "one"); + + return ERROR_SUCCESS; +} + +UINT WINAPI da_deferred(MSIHANDLE hinst) +{ + char prop[300]; + DWORD len = sizeof(prop); + + MsiGetPropertyA(hinst, "CustomActionData", prop, &len); + + append_file(hinst, prop, "two"); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 9d1e821..bb400ff 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -1,2 +1,4 @@ @ stdcall main_test(long) @ stdcall test_retval(long) +@ stdcall da_immediate(long) +@ stdcall da_deferred(long) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 55d83d4..69095cd 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1300,12 +1300,12 @@ static const char ft_install_exec_seq_dat[] = "InstallFinalize\t\t1500\n"; static const char da_custom_action_dat[] = - "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" - "deferred\t1074\tCMDEXE\t/c if exist msitest (exit 0) else (exit 1)\t\n" - "immediate\t50\tCMDEXE\t/c mkdir msitest\t\n" - "cleanup\t50\tCMDEXE\t/c rmdir msitest\t\n"; + "setprop\t51\tdeferred\t[TESTPATH]\n" + "immediate\t1\tcustom.dll\tda_immediate\n" + "deferred\t1025\tcustom.dll\tda_deferred\n"; static const char da_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -1315,10 +1315,10 @@ static const char da_install_exec_seq_dat[] = "FileCost\t\t300\n" "CostFinalize\t\t400\n" "InstallInitialize\t\t500\n" - "deferred\t\t600\n" - "immediate\t\t700\n" - "InstallFinalize\t\t1100\n" - "cleanup\t\t1200\n"; + "setprop\t\t600\n" + "deferred\t\t700\n" + "immediate\t\t800\n" + "InstallFinalize\t\t1100\n"; typedef struct _msi_table { @@ -6042,23 +6042,45 @@ static void test_feature_tree(void) DeleteFileA( msifile ); } +static void check_file_matches(const char *filename, const char *text) +{ + char buffer[200]; + HANDLE file; + DWORD size; + + file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ReadFile(file, buffer, sizeof(buffer), &size, NULL); + ok(size == strlen(text) && !memcmp(buffer, text, size), "got %.*s\n", size, buffer); + CloseHandle(file); +} + static void test_deferred_action(void) { + char path[200], file[200], buffer[200]; UINT r; + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "da", 0, file); + sprintf(buffer, "TESTPATH=\"%s\"", file); + create_database(msifile, da_tables, sizeof(da_tables) / sizeof(da_tables[0])); + add_custom_dll(); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - r = MsiInstallProductA(msifile, "CMDEXE=\"cmd.exe\""); + r = MsiInstallProductA(msifile, buffer); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); goto error; } -todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); +todo_wine + check_file_matches(file, "onetwo"); + + ok(DeleteFileA(file), "Directory not created\n"); + error: DeleteFileA(msifile); } -- 2.7.4

3 4

[PATCH] user32/tests: Drop broadcast test workarounds for Windows <= 2000
by Alex Henrie 21 Feb '18

21 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- These tests fail consistently on Windows 10. Removing the cruft will make them a bit easier to debug. dlls/user32/tests/broadcast.c | 73 +++++++++++-------------------------------- 1 file changed, 19 insertions(+), 54 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 322fbd0414..5869119a69 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -33,10 +33,6 @@ typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); -static PBROADCAST pBroadcastA; -static PBROADCAST pBroadcastW; -static PBROADCASTEX pBroadcastExA; -static PBROADCASTEX pBroadcastExW; static HANDLE hevent; static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -59,20 +55,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR static BOOL init_procs(void) { WNDCLASSA cls; - HANDLE user32 = GetModuleHandleA("user32.dll"); - pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageA"); - if (!pBroadcastA) - pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessage"); - ok(pBroadcastA != NULL, "No BroadcastSystemMessage found\n"); - if (!pBroadcastA) - { - win_skip("BroadcastA is not available\n"); - return FALSE; - } - - pBroadcastW = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageW"); - pBroadcastExA = (PBROADCASTEX)GetProcAddress(user32, "BroadcastSystemMessageExA"); - pBroadcastExW = (PBROADCASTEX)GetProcAddress(user32, "BroadcastSystemMessageExW"); hevent = CreateEventA(NULL, TRUE, FALSE, "Asynchronous checking event"); @@ -264,12 +246,8 @@ if (0) /* TODO: Check the hang flags */ PulseEvent(hevent); } -static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, HANDLE*); -static BOOL (WINAPI *pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); - static void test_noprivileges(void) { - HANDLE advapi32 = GetModuleHandleA("advapi32"); HANDLE token; DWORD recips; BOOL ret; @@ -277,14 +255,12 @@ static void test_noprivileges(void) static const DWORD BSM_ALL_RECIPS = BSM_VXDS | BSM_NETDRIVER | BSM_INSTALLABLEDRIVERS | BSM_APPLICATIONS; - pOpenProcessToken = (void *)GetProcAddress(advapi32, "OpenProcessToken"); - pAdjustTokenPrivileges = (void *)GetProcAddress(advapi32, "AdjustTokenPrivileges"); - if (!pOpenProcessToken || !pAdjustTokenPrivileges || !pOpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) { skip("Can't open security token for process\n"); return; } - if (!pAdjustTokenPrivileges(token, TRUE, NULL, 0, NULL, NULL)) + if (!AdjustTokenPrivileges(token, TRUE, NULL, 0, NULL, NULL)) { skip("Can't adjust security token for process\n"); return; @@ -294,7 +270,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLDESKTOPS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == BSM_ALLDESKTOPS || @@ -305,7 +281,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLCOMPONENTS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == BSM_ALLCOMPONENTS || @@ -316,7 +292,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || @@ -327,7 +303,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); ok(!ret, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || @@ -342,28 +318,17 @@ START_TEST(broadcast) return; trace("Running BroadcastSystemMessageA tests\n"); - test_parameters(pBroadcastA, "BroadcastSystemMessageA"); - if (pBroadcastW) - { - trace("Running BroadcastSystemMessageW tests\n"); - test_parameters(pBroadcastW, "BroadcastSystemMessageW"); - } - else - win_skip("No BroadcastSystemMessageW, skipping\n"); - if (pBroadcastExA) - { - trace("Running BroadcastSystemMessageExA tests\n"); - test_parametersEx(pBroadcastExA); - } - else - win_skip("No BroadcastSystemMessageExA, skipping\n"); - if (pBroadcastExW) - { - trace("Running BroadcastSystemMessageExW tests\n"); - test_parametersEx(pBroadcastExW); - trace("Attempting privileges checking tests\n"); - test_noprivileges(); - } - else - win_skip("No BroadcastSystemMessageExW, skipping\n"); + test_parameters(BroadcastSystemMessageA, "BroadcastSystemMessageA"); + + trace("Running BroadcastSystemMessageW tests\n"); + test_parameters(BroadcastSystemMessageW, "BroadcastSystemMessageW"); + + trace("Running BroadcastSystemMessageExA tests\n"); + test_parametersEx(BroadcastSystemMessageExA); + + trace("Running BroadcastSystemMessageExW tests\n"); + test_parametersEx(BroadcastSystemMessageExW); + + trace("Attempting privileges checking tests\n"); + test_noprivileges(); } -- 2.16.1

1 0

[PATCH 5/5] wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_surface_upload_data().
by Henri Verbeet 21 Feb '18

21 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91979ee..6e80f85 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -775,6 +775,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; + GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, @@ -798,6 +799,8 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w checkGLcall("glBindBuffer"); } + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; @@ -819,22 +822,20 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - surface->texture_target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); + target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, + update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) { - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + surface->texture_layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, - internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + update_w, update_h, internal, dst_slice_pitch, addr)); } } else @@ -846,16 +847,15 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w * can't use the unpack row length like for glTexSubImage2D. */ for (row = 0, y = dst_point->y; row < row_count; ++row) { - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, y, surface->texture_layer, update_w, format->block_height, 1, - internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, + surface->texture_layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); } y += format->block_height; @@ -873,20 +873,19 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - surface->texture_target, surface->texture_level, surface->texture_layer, + target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - format->glFormat, format->glType, addr)); + GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + surface->texture_layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { - gl_info->gl_ops.gl.p_glTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + gl_info->gl_ops.gl.p_glTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + update_w, update_h, format->glFormat, format->glType, addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("Upload surface data"); -- 2.1.4

1 0

[PATCH 4/5] wined3d: Use wined3d_texture_get_sub_resource_target() in surface_download_data().
by Henri Verbeet 21 Feb '18

21 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3fabef..91979ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -555,6 +555,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct unsigned int src_row_pitch, src_slice_pitch; struct wined3d_bo_address data; BYTE *temporary_mem = NULL; + GLenum target; void *mem; /* Only support read back of converted P8 surfaces. */ @@ -565,8 +566,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } sub_resource = &texture->sub_resources[sub_resource_idx]; + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { if (format->download) { @@ -658,7 +660,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, mem); - GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, mem)); + GL_EXTCALL(glGetCompressedTexImage(target, surface->texture_level, mem)); checkGLcall("glGetCompressedTexImage"); } else @@ -666,8 +668,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, mem); - gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level, - format->glFormat, format->glType, mem); + gl_info->gl_ops.gl.p_glGetTexImage(target, surface->texture_level, format->glFormat, format->glType, mem); checkGLcall("glGetTexImage"); } -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_texture_allocate_gl_mutable_storage().
by Henri Verbeet 21 Feb '18

21 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 94d6a98..1e34299 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -492,7 +492,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum gl_internal_format, const struct wined3d_format *format, const struct wined3d_gl_info *gl_info) { - unsigned int i, sub_call_count; + unsigned int i, level, sub_call_count; sub_call_count = texture->level_count; if (texture->target != GL_TEXTURE_2D_ARRAY) @@ -502,29 +502,31 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * { struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei width, height; + GLenum target; - width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); - height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + level = surface->texture_level; + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator; height /= format->height_scale.denominator; } + target = wined3d_texture_get_sub_resource_target(texture, i); TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, surface->texture_target, surface->texture_level, width, height); + surface, target, level, width, height); if (texture->target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexImage3D(surface->texture_target, surface->texture_level, - gl_internal_format, width, height, texture->layer_count, 0, - format->glFormat, format->glType, NULL)); + GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, + texture->layer_count, 0, format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else { - gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, - gl_internal_format, width, height, 0, format->glFormat, format->glType, NULL); + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, + width, height, 0, format->glFormat, format->glType, NULL); checkGLcall("glTexImage2D"); } } -- 2.1.4

1 0

[PATCH 2/5] wined3d: Introduce a helper to retrieve the texture target in context_set_fbo_key_for_render_target().
by Henri Verbeet 21 Feb '18

21 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 14 ++++---------- dlls/wined3d/wined3d_private.h | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9b6c19e..fc97205 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -454,17 +454,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co key->rb_namespace |= 1 << idx; return; } - - key->objects[idx].target = surface->texture_target; - key->objects[idx].level = surface->texture_level; - key->objects[idx].layer = surface->texture_layer; - } - else - { - key->objects[idx].target = texture->target; - key->objects[idx].level = sub_resource_idx % texture->level_count; - key->objects[idx].layer = sub_resource_idx / texture->level_count; } + key->objects[idx].target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + key->objects[idx].level = sub_resource_idx % texture->level_count; + key->objects[idx].layer = sub_resource_idx / texture->level_count; + if (render_target->layer_count != 1) key->objects[idx].layer = WINED3D_ALL_LAYERS; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b12aa21..021c274 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,6 +3179,23 @@ static inline struct wined3d_texture *texture_from_resource(struct wined3d_resou return CONTAINING_RECORD(resource, struct wined3d_texture, resource); } +static inline GLenum wined3d_texture_get_sub_resource_target(const struct wined3d_texture *texture, + unsigned int sub_resource_idx) +{ + static const GLenum cube_targets[] = + { + GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB, + }; + + return texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP + ? cube_targets[sub_resource_idx / texture->level_count] : texture->target; +} + static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_texture *texture, BOOL srgb) { -- 2.1.4

1 0

[PATCH 1/5] wined3d: Store overlay info in textures instead of in surfaces.
by Henri Verbeet 21 Feb '18

21 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 105 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 16 ++++--- 2 files changed, 73 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 58d4116..94d6a98 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -654,6 +654,21 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) context_release(context); texture->texture_ops->texture_cleanup_sub_resources(texture); + if (texture->overlay_info) + { + for (i = 0; i < sub_count; ++i) + { + struct wined3d_overlay_info *info = &texture->overlay_info[i]; + struct wined3d_overlay_info *overlay, *cur; + + list_remove(&info->entry); + LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) + { + list_remove(&overlay->entry); + } + } + heap_free(texture->overlay_info); + } wined3d_texture_unload_gl_texture(texture); } @@ -1700,7 +1715,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; - struct wined3d_surface *overlay, *cur; struct wined3d_surface *surface; unsigned int i; @@ -1728,15 +1742,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) if (surface->dc) texture2d_destroy_dc(surface); - - if (surface->overlay_dest) - list_remove(&surface->overlay_entry); - - LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry) - { - list_remove(&overlay->overlay_entry); - overlay->overlay_dest = NULL; - } } if (context) context_release(context); @@ -2031,7 +2036,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_surface *surfaces; UINT pow2_width, pow2_height; - unsigned int i, j; + unsigned int i, j, sub_count; HRESULT hr; if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 @@ -2177,13 +2182,30 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if (wined3d_texture_use_pbo(texture, gl_info)) texture->resource.map_binding = WINED3D_LOCATION_BUFFER; - if (level_count > ~(SIZE_T)0 / layer_count - || !(surfaces = heap_calloc(level_count * layer_count, sizeof(*surfaces)))) + sub_count = level_count * layer_count; + if (sub_count / layer_count != level_count + || !(surfaces = heap_calloc(sub_count, sizeof(*surfaces)))) { wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } + if (desc->usage & WINED3DUSAGE_OVERLAY) + { + if (!(texture->overlay_info = heap_calloc(sub_count, sizeof(*texture->overlay_info)))) + { + heap_free(surfaces); + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + + for (i = 0; i < sub_count; ++i) + { + list_init(&texture->overlay_info[i].entry); + list_init(&texture->overlay_info[i].overlays); + } + } + /* Generate all the surfaces. */ for (i = 0; i < texture->level_count; ++i) { @@ -2208,7 +2230,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 surface->texture_level = i; surface->texture_layer = j; list_init(&surface->renderbuffers); - list_init(&surface->overlays); sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; @@ -2696,19 +2717,19 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG *x, LONG *y) { - struct wined3d_surface *surface; + struct wined3d_overlay_info *overlay; TRACE("texture %p, sub_resource_idx %u, x %p, y %p.\n", texture, sub_resource_idx, x, y); - if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D + if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || sub_resource_idx >= texture->level_count * texture->layer_count) { WARN("Invalid sub-resource specified.\n"); return WINEDDERR_NOTAOVERLAYSURFACE; } - surface = texture->sub_resources[sub_resource_idx].u.surface; - if (!surface->overlay_dest) + overlay = &texture->overlay_info[sub_resource_idx]; + if (!overlay->dst) { TRACE("Overlay not visible.\n"); *x = 0; @@ -2716,8 +2737,8 @@ HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture return WINEDDERR_OVERLAYNOTVISIBLE; } - *x = surface->overlay_destrect.left; - *y = surface->overlay_destrect.top; + *x = overlay->dst_rect.left; + *y = overlay->dst_rect.top; TRACE("Returning position %d, %d.\n", *x, *y); @@ -2727,23 +2748,22 @@ HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y) { - struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_surface *surface; + struct wined3d_overlay_info *overlay; LONG w, h; TRACE("texture %p, sub_resource_idx %u, x %d, y %d.\n", texture, sub_resource_idx, x, y); - if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) + || sub_resource_idx >= texture->level_count * texture->layer_count) { WARN("Invalid sub-resource specified.\n"); return WINEDDERR_NOTAOVERLAYSURFACE; } - surface = sub_resource->u.surface; - w = surface->overlay_destrect.right - surface->overlay_destrect.left; - h = surface->overlay_destrect.bottom - surface->overlay_destrect.top; - SetRect(&surface->overlay_destrect, x, y, x + w, y + h); + overlay = &texture->overlay_info[sub_resource_idx]; + w = overlay->dst_rect.right - overlay->dst_rect.left; + h = overlay->dst_rect.bottom - overlay->dst_rect.top; + SetRect(&overlay->dst_rect, x, y, x + w, y + h); return WINED3D_OK; } @@ -2754,6 +2774,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un { struct wined3d_texture_sub_resource *sub_resource, *dst_sub_resource; struct wined3d_surface *surface, *dst_surface; + struct wined3d_overlay_info *overlay; TRACE("texture %p, sub_resource_idx %u, src_rect %s, dst_texture %p, " "dst_sub_resource_idx %u, dst_rect %s, flags %#x.\n", @@ -2774,42 +2795,44 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un return WINED3DERR_INVALIDCALL; } + overlay = &texture->overlay_info[sub_resource_idx]; + surface = sub_resource->u.surface; if (src_rect) - surface->overlay_srcrect = *src_rect; + overlay->src_rect = *src_rect; else - SetRect(&surface->overlay_srcrect, 0, 0, + SetRect(&overlay->src_rect, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), wined3d_texture_get_level_height(texture, surface->texture_level)); dst_surface = dst_sub_resource->u.surface; if (dst_rect) - surface->overlay_destrect = *dst_rect; + overlay->dst_rect = *dst_rect; else - SetRect(&surface->overlay_destrect, 0, 0, + SetRect(&overlay->dst_rect, 0, 0, wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level), wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)); - if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE)) + if (overlay->dst && (overlay->dst != dst_surface || flags & WINEDDOVER_HIDE)) { - surface->overlay_dest = NULL; - list_remove(&surface->overlay_entry); + overlay->dst = NULL; + list_remove(&overlay->entry); } if (flags & WINEDDOVER_SHOW) { - if (surface->overlay_dest != dst_surface) + if (overlay->dst != dst_surface) { - surface->overlay_dest = dst_surface; - list_add_tail(&dst_surface->overlays, &surface->overlay_entry); + overlay->dst = dst_surface; + list_add_tail(&texture->overlay_info[dst_sub_resource_idx].overlays, &overlay->entry); } } else if (flags & WINEDDOVER_HIDE) { /* Tests show that the rectangles are erased on hide. */ - SetRectEmpty(&surface->overlay_srcrect); - SetRectEmpty(&surface->overlay_destrect); - surface->overlay_dest = NULL; + SetRectEmpty(&overlay->src_rect); + SetRectEmpty(&overlay->dst_rect); + overlay->dst = NULL; } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a606a7..b12aa21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3147,6 +3147,15 @@ struct wined3d_texture DWORD color_key_flags; } async; + struct wined3d_overlay_info + { + struct list entry; + struct list overlays; + struct wined3d_surface *dst; + RECT src_rect; + RECT dst_rect; + } *overlay_info; + struct wined3d_texture_sub_resource { void *parent; @@ -3294,13 +3303,6 @@ struct wined3d_surface struct list renderbuffers; const struct wined3d_renderbuffer_entry *current_renderbuffer; - - /* DirectDraw Overlay handling */ - RECT overlay_srcrect; - RECT overlay_destrect; - struct wined3d_surface *overlay_dest; - struct list overlays; - struct list overlay_entry; }; static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *surface) -- 2.1.4

1 0

[PATCH] dwrite: Use ARRAY_SIZE() macro
by Nikolay Sivov 21 Feb '18

21 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 10 +++++----- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/font.c | 26 +++++++++++++------------- dlls/dwrite/opentype.c | 6 +++--- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index bb08017611..b20bafa72a 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -217,8 +217,8 @@ struct fallback_mapping { static const struct fallback_mapping fontfallback_neutral_data[] = { #define MAPPING_RANGE(ranges, families) \ - { (DWRITE_UNICODE_RANGE *)ranges, sizeof(ranges)/sizeof(ranges[0]), \ - (WCHAR **)families, sizeof(families)/sizeof(families[0]) } + { (DWRITE_UNICODE_RANGE *)ranges, ARRAY_SIZE(ranges), \ + (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), @@ -1056,7 +1056,7 @@ static UINT32 get_opentype_language(const WCHAR *locale) if (locale) { WCHAR tag[5]; - if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) + if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, ARRAY_SIZE(tag))) language = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); } @@ -1108,7 +1108,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub break; case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: - if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, sizeof(isolang)/sizeof(isolang[0]))) { + if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) { static const WCHAR arW[] = {'a','r',0}; static const WCHAR arabicW[] = {0x640,0x641,0x642,0x643,0x644,0x645,0x646,0x647,0x648,0x649,0}; @@ -2199,7 +2199,7 @@ HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback fallback->IDWriteFontFallback_iface.lpVtbl = &fontfallbackvtbl; fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; - fallback->mappings_count = sizeof(fontfallback_neutral_data) / sizeof(*fontfallback_neutral_data); + fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); IDWriteFactory5_GetSystemFontCollection(fallback->factory, FALSE, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback_iface; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 31b977a159..c16c401ad1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -24,6 +24,8 @@ #include "wine/list.h" #include "wine/unicode.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + static const DWRITE_MATRIX identity = { 1.0f, 0.0f, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c545f09c0a..c7824b6d07 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -419,7 +419,7 @@ static void release_font_data(struct dwrite_font_data *data) if (InterlockedDecrement(&data->ref) > 0) return; - for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < sizeof(data->info_strings)/sizeof(data->info_strings[0]); i++) { + for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < ARRAY_SIZE(data->info_strings); i++) { if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } @@ -522,7 +522,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace4 *iface) IDWriteFontFileStream_Release(This->stream); heap_free(This->files); - for (i = 0; i < sizeof(This->glyphs)/sizeof(This->glyphs[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->glyphs); i++) heap_free(This->glyphs[i]); freetype_notify_cacheremove(iface); @@ -3060,7 +3060,7 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { extrablackW, DWRITE_FONT_WEIGHT_EXTRA_BLACK } }; - ptr = bsearch(&weight, knownweights, sizeof(knownweights)/sizeof(knownweights[0]), sizeof(knownweights[0]), + ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(knownweights[0]), compare_knownweights); if (!ptr) { nameW[0] = 0; @@ -3373,8 +3373,8 @@ static HRESULT init_font_data(const struct fontface_desc *desc, IDWriteLocalized data->fontsig = props.fontsig; data->lf = props.lf; - fontstrings_get_en_string(*family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); - fontstrings_get_en_string(data->names, faceW, sizeof(faceW)/sizeof(WCHAR)); + fontstrings_get_en_string(*family_name, familyW, ARRAY_SIZE(familyW)); + fontstrings_get_en_string(data->names, faceW, ARRAY_SIZE(faceW)); if (font_apply_differentiation_rules(data, familyW, faceW)) { set_en_localizedstring(*family_name, familyW); set_en_localizedstring(data->names, faceW); @@ -3495,7 +3495,7 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa /* Simulated face name should only contain Bold as weight term, so remove existing regular and weight terms. */ - fontstrings_get_en_string(family->fonts[heaviest]->names, initialW, sizeof(initialW)/sizeof(WCHAR)); + fontstrings_get_en_string(family->fonts[heaviest]->names, initialW, ARRAY_SIZE(initialW)); facename_remove_regular_term(initialW, -1); /* remove current weight pattern */ @@ -3566,7 +3566,7 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data /* add oblique simulation based on this regular face */ /* remove regular term if any, append 'Oblique' */ - fontstrings_get_en_string(family->fonts[regular]->names, facenameW, sizeof(facenameW)/sizeof(WCHAR)); + fontstrings_get_en_string(family->fonts[regular]->names, facenameW, ARRAY_SIZE(facenameW)); facename_remove_regular_term(facenameW, -1); if (*facenameW) @@ -3610,7 +3610,7 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect } fontcollection_add_family(collection, target); - fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR)); + fontstrings_get_en_string(replacement->familyname, nameW, ARRAY_SIZE(nameW)); TRACE("replacement %s -> %s\n", debugstr_w(target_name), debugstr_w(nameW)); } IDWriteLocalizedStrings_Release(strings); @@ -3767,7 +3767,7 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat continue; } - fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); + fontstrings_get_en_string(family_name, familyW, ARRAY_SIZE(familyW)); /* ignore dot named faces */ if (familyW[0] == '.') { @@ -3886,7 +3886,7 @@ static HRESULT create_local_file_reference(IDWriteFactory5 *factory, const WCHAR static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR fullpathW[MAX_PATH]; - GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + GetWindowsDirectoryW(fullpathW, ARRAY_SIZE(fullpathW)); strcatW(fullpathW, fontsW); strcatW(fullpathW, filename); @@ -3914,7 +3914,7 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); WCHAR name_buf[256], *name = name_buf; - DWORD name_count, max_name_count = sizeof(name_buf) / sizeof(*name_buf), type, data_size; + DWORD name_count, max_name_count = ARRAY_SIZE(name_buf), type, data_size; HRESULT hr = S_OK; LONG r; @@ -4162,8 +4162,8 @@ HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection1 WCHAR keynameW[64], pathW[MAX_PATH]; DWORD type, path_len, name_len; - path_len = sizeof(pathW)/sizeof(*pathW); - name_len = sizeof(keynameW)/sizeof(*keynameW); + path_len = ARRAY_SIZE(pathW); + name_len = ARRAY_SIZE(keynameW); retval = RegEnumValueW(eudckey, index++, keynameW, &name_len, NULL, &type, (BYTE*)pathW, &path_len); if (retval || type != REG_SZ) continue; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 18fb00be09..b95083e33a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1553,7 +1553,7 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a UINT codepage; codepage = get_name_record_codepage(platform, encoding); - get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); + get_name_record_locale(platform, lang_id, locale, ARRAY_SIZE(locale)); if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); @@ -1730,7 +1730,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, ARRAY_SIZE(localeW))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) @@ -1801,7 +1801,7 @@ HRESULT opentype_get_typographic_features(IDWriteFontFace *fontface, UINT32 scri UINT8 i; *count = 0; - for (i = 0; i < sizeof(tables)/sizeof(tables[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tables); i++) { const OT_ScriptList *scriptlist; const GPOS_GSUB_Header *header; const OT_Script *script; -- 2.16.1

1 0

[PATCH 3/3] testbot: Track the per-host queued tasks and use it for future VMs.
by Francois Gouget 21 Feb '18

21 Feb '18

It is a better sign that the host is idle than checking it only has idle VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 7c9da685a..56c903d09 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -464,7 +464,8 @@ sub _GetSchedHost($$) if (!$Sched->{hosts}->{$HostKey}) { $Sched->{hosts}->{$HostKey} = { - active => 0, + queued => 0, # Tasks + active => 0, # VMs... idle => 0, reverting => 0, sleeping => 0, @@ -865,6 +866,8 @@ sub _ScheduleTasks($) $Sched->{blocked}++; next; } + my $Host = _GetSchedHost($Sched, $VM); + $Host->{queued}++; $Sched->{queued}++; if ($StepRank >= 2 or !$PreviousVMs) @@ -906,7 +909,6 @@ sub _ScheduleTasks($) # candidate for shutdown since it will be needed next. delete $Sched->{lambvms}->{$VMKey}; - my $Host = _GetSchedHost($Sched, $VM); # Dirty VMs are VMs that were running and have still not been # powered off. Sleeping VMs may be VMs that are booting. # So in both cases they may still be using CPU and I/O resources so @@ -1099,24 +1101,15 @@ sub _RevertVMs($$) my $NeedsSacrifice; if (_GetNiceness($NeededVMs, $VMKey) >= $FUTURE_BASE) { - if (!exists $Host->{isidle}) - { - # Only start preparing VMs for future jobs on a host which is idle. - # FIXME As a proxy we currently check that the host only has idle VMs. - # This is a bad proxy because: - # - The host could still have pending tasks for a 'next step'. Once - # those get closer to running, preparing those would be better than - # preparing future VMs. - # - Checking there are no queued tasks on that host would be better - # but this information is not available on a per-host basis. - # - It forces the host to go through an extra poweroff during which we - # lose track of which VM is 'hot'. - # - However on startup this helps ensure that we are not prevented - # from preparing the best VM (e.g. build) just because it is still - # being checked (i.e. marked dirty). - $Host->{isidle} = ($Host->{active} == $Host->{idle}); - } - if (!$Host->{isidle} or $Host->{MaxVMsWhenIdle} == 0) + # Only start preparing VMs for future jobs on a host which is idle, i.e. + # which no longer has queued tasks (ignoring blocked ones). + # Note that we could also check that the host only has idle VMs. This + # would help ensure that we are not prevented from preparing the best VM + # (e.g. build) on startup just because it is still being checked (i.e. + # marked dirty). But during regular operation this would force the host + # to go through an extra poweroff during which we lose track of which + # VM is 'hot' + if ($Host->{queued} != 0 or $Host->{MaxVMsWhenIdle} == 0) { # The TestBot is busy or does not prepare VMs when idle next; -- 2.16.1

1 0

[PATCH 2/3] testbot/web: Show the number of blocked tasks on the activity page.
by Francois Gouget 21 Feb '18

21 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 5 +++-- testbot/web/Activity.pl | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 3016b14d6..acec6064c 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -68,6 +68,7 @@ for the specified timestamp. Entries have the following structure: end => <EndTimestamp>, runnable => <RunnableTasksCount>, queued => <QueuedTasksCount>, + blocked => <TasksOnMaintenanceOrDisabledVMsCount>, engine => <StartOrStop>, statusvms => { <VMName1> => { @@ -145,7 +146,7 @@ sub GetActivity($;$) my $Group = $ActivityHash->{$Record->RecordGroupId}; if ($Record->Type eq "tasks" and $Record->Name eq "counters") { - ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; + ($Group->{runnable}, $Group->{queued}, $Group->{blocked}) = split / /, $Record->Value; } elsif ($Record->Type eq "engine" and $Record->Name =~ /^(?:start|stop)$/) { @@ -237,7 +238,7 @@ sub GetActivity($;$) if ($LastGroup) { $LastGroup->{end} = $Group->{start}; - foreach my $Counter ('runnable', 'queued') + foreach my $Counter ('runnable', 'queued', 'blocked') { if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 13c77c68e..91153b3a3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -161,9 +161,11 @@ EOF print "<td colspan='", scalar(@SortedVMs), "'><hr></td>\n"; next; } - if ($Group->{runnable} or $Group->{queued}) + if ($Group->{runnable} or $Group->{queued} or $Group->{blocked}) { - print "<td class='Record'>", ($Group->{runnable} || 0), " / ", ($Group->{queued} || 0), "</td>"; + print "<td class='Record'>", ($Group->{runnable} || 0), " / ", + ($Group->{queued} || 0), + ($Group->{blocked} ? "+$Group->{blocked}" : ""), "</td>"; } else { @@ -282,7 +284,7 @@ sub GenerateFooter($) print "running a task (in which case it links to it), \n"; print "dirty while the server is powering off the VM after a task or while it assesses its state on startup.\n"; - print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted. \n"; + print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. If any task needs to run on a maintenance, retired or deleted VM is is shown as +N. A long horizontal bar indicates the TestBot server was restarted. \n"; print "This border indicates that the task timed out, \n"; print "this border denotes a transient (network?) error so the task will be re-run, \n"; print "and this border indicates a TestBot error. \n"; -- 2.16.1

1 0

[PATCH 1/3] testbot: Also record the number of blocked tasks.
by Francois Gouget 21 Feb '18

21 Feb '18

A task is blocked if it should run on a retired or deleted VM, or one which is undergoing maintenance. Previously the runnable and queued task counters would include blocked tasks which was wrong since, although they are queued, blocked tasks cannot be run until some external actor makes the VM usable again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b71073adb..7c9da685a 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -572,6 +572,7 @@ sub _CheckAndClassifyVMs() nicefuture => {}, runnable => 0, queued => 0, + blocked => 0, recordgroups => CreateRecordGroups(), }; $Sched->{recordgroup} = $Sched->{recordgroups}->Add(); @@ -848,30 +849,29 @@ sub _ScheduleTasks($) $Steps->AddFilter("Status", ["queued", "running"]); foreach my $Step (sort { $a->No <=> $b->No } @{$Steps->GetItems()}) { - my $Tasks = $Step->Tasks; - $Tasks->AddFilter("Status", ["queued"]); - $Sched->{queued} += $Tasks->GetItemsCount(); - # StepRank 0 contains the runnable tasks, 1 the 'may soon be runnable' # ones, and 2 and greater tasks we don't care about yet - next if ($StepRank >= 2); - if ($StepRank == 0) - { - $Step->HandleStaging() if ($Step->Status eq "queued"); - $Sched->{runnable} += $Tasks->GetItemsCount(); - } - elsif (!$PreviousVMs) - { - # The previous step is nowhere near done so skip this one for now - next; - } + $Step->HandleStaging() if ($StepRank == 0 and $Step->Status eq "queued"); my $StepVMs = []; + + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["queued"]); foreach my $Task (@{$Tasks->GetItems()}) { my $VM = $Task->VM; - next if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()); + if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()) + { + $Sched->{blocked}++; + next; + } + $Sched->{queued}++; + if ($StepRank >= 2 or !$PreviousVMs) + { + # The previous step is nowhere near done so skip this one for now + next; + } if ($StepRank == 1) { # Passing $PreviousVMs ensures this VM will be reverted if and only @@ -880,6 +880,7 @@ sub _ScheduleTasks($) _AddNeededVM($NeededVMs, $VM, $NEXT_BASE + $JobRank, $PreviousVMs); next; } + $Sched->{runnable}++; # $StepRank == 0 if (!_AddNeededVM($NeededVMs, $VM, $JobRank)) { @@ -1108,9 +1109,6 @@ sub _RevertVMs($$) # preparing future VMs. # - Checking there are no queued tasks on that host would be better # but this information is not available on a per-host basis. - # - Also the number of queued tasks includes tasks scheduled to run - # on maintenance and retired/deleted VMs. Any such task would prevent - # preparing future VMs for no good reason. # - It forces the host to go through an extra poweroff during which we # lose track of which VM is 'hot'. # - However on startup this helps ensure that we are not prevented @@ -1253,9 +1251,7 @@ sub ScheduleJobs() if (@{$Sched->{records}->GetItems()}) { - # FIXME Add the number of tasks scheduled to run on a maintenance, retired - # or deleted VM... - my $TaskCounts = "$Sched->{runnable} $Sched->{queued} 0"; + my $TaskCounts = "$Sched->{runnable} $Sched->{queued} $Sched->{blocked}"; if ($TaskCounts ne $_LastTaskCounts) { $Sched->{records}->AddRecord('tasks', 'counters', $TaskCounts); -- 2.16.1

1 0

wine-2.0.5-rc1 Available
by Michael Stefaniuc 20 Feb '18

20 Feb '18

Hello guys, I have pushed wine-2.0.4-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ This should be the last release for 2.0.x. Thus nothing fancy in it even though I could have cherry picked more stuff. Please let me know if I missed anything obvious. The interesting parts from the ANNOUNCE file are: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 2.0.5 (total 0): ---------------------------------------------------------------- Changes since 2.0.4: Akihiro Sagawa (3): imm32/tests: Add a skip message when composition string isn't available. imm32/tests: Add more composition string tests. winex11: Keep the result string in the IME UI window procedure. Alex Henrie (4): ucrtbase: Add __stdio_common_vsprintf_p. advapi32: Add stub for LsaLookupPrivilegeName. libport: Move rint fallback implementations from msvcrt to libport. mmsystem.dll16: Pass through MCI_LIST, MCI_SETAUDIO, and MCI_SETVIDEO. Alexandre Julliard (9): kernel32: Also set the preloader range for 64-bit binaries. setupapi: Use correct architecture for fake dlls on ARM and ARM64. comctl32/imagelist: Use the correct allocation size for the image mask. explorer: Fix parsing command line that contains spaces. libport: Add a replacement implementation for strnlen. kernel32: Properly detect ELF binaries that are position independent executables. ntdll: Fix source/destination confusion in vsscanf. ddraw: Validate the surface descriptor size in GetDisplayMode. configure: Check the positive form of the warning options. Alistair Leslie-Hughes (4): oleaut32: Remove dead code. oleaut32: Use VariantChangeTypeEx to convert to VT_BOOL. oleaut32/tests: Add more VarCat tests. oleaut32: Improve support for IDispatch in VarCat. Andrew Eikum (2): xaudio2: Ignore buffers returned from OpenAL after Stop. xaudio2: Account for abandoned buffer bytes. Andrey Gusev (1): d3dx10: Add D3DX10PreprocessShaderFromMemory stub. Bob Ziuchkovski (1): dinput: Ignore vendor-specific usage pages for joystick elements on Mac. Daniel Lehman (1): wininet: Use case-insensitive comparison for server name. Fabian Maurer (2): gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names. msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test. Gerald Pfeifer (1): configure: Use the -Wno-packed-not-aligned compiler option if available. Henri Verbeet (3): wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM. wined3d: Try to avoid stalling on dynamic buffer maps. wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE. Hugh McMaster (1): setupapi: Recursively remove any subkeys before calling NtDeleteKey(). Huw D. M. Davies (2): comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists. comctl32: Don't create a masked imagelist if CLR_NONE is specified. Joel Holdsworth (1): urlmon: Support [Add.Code] sections in ActiveX INF files. Józef Kucia (3): wined3d: Use correct data type for immediate constants. wined3d: Allow copies between compatible formats in wined3d_device_copy_sub_resource_region(). d3d11: Implement depth bias. Kimmo Myllyvirta (1): xaudio2: Add support for float formats with more than 2 channels. Lucian Poston (1): shell32: Stub GetRedirectionCapabilities with S_OK. Martin Payne (3): kernel32: Don't report valid non-Win16 NE executables (e.g. OS/2) as broken. krnl386.exe16: Shared libraries have a ".exe" rather than ".dll" extension on Windows < 3.0. user.exe16: Implemented OldExitWindows() user.exe16 function. Martin Storsjo (1): configure: Check for -Wno-pragma-pack. Matteo Bruni (1): d3dx9: Implement D3DXGetShader{Input|Output}Semantics(). Michael Stefaniuc (1): comctl32/tests: Add an ImageList_Copy() test. Nikolay Sivov (9): advapi32: Partially implement LsaLookupPrivilegeName(). d3dx9: Implement D3DXFrameFind(). msvcrt: Implement _memicmp_l(). msvcrt: Added _get_purecall_handler(). user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used. user32/edit: Allow buffer access after EM_GETHANDLE. comctl32/tooltips: Remove window subclass right before window is destroyed. comctl32/updown: Reset control width conditionally on UDM_SETBUDDY with NULL buddy handle. mshtml: Avoid potential moniker instance leak. Piotr Caban (4): msvcrt: Fix buffer size checks in swscanf_s. msvcrt: Call cdecl functions with empty FPU stack in _CI* functions. msvcrt: Correctly set rounding mode in _ftol implementation. msvcp90: Use correct locale in basic_ios::narrow and basic_ios::widen. Sebastian Lackner (1): user32: Globally invalidate key state on changes in other threads. Thomas Faber (1): ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity). Vincent Povirk (1): windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion. Zebediah Figura (5): dinput/tests: Don't pump messages in test_acquire(). winegstreamer: Hold a reference to the filter in push_data(). compobj.dll16: Implement CoGetClassObject16(). imaadp32.acm: Fix nibble ordering. winedbg/gdbproxy: Replace memory read over a breakpoint with the real value. Zhiyi Zhang (1): winecfg: Fix a crash when inputting non-ASCII dll override name. -- Michael Stefaniuc mstefani(a)winehq.org

2 2

[PATCH v3 2/7] winebus.sys: Support adding and removing SDL devices
by Aric Stewart 20 Feb '18

20 Feb '18

v3: dynamic loading of the SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 300 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 299 insertions(+), 1 deletion(-)

2 3

[PATCH] winebus.sys: Do not depend on USB devices
by Aric Stewart 20 Feb '18

20 Feb '18

Allows for bluetooth devices to work as well Based on work and testing by Michael Menegakis <arxeio(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 93 +++++++++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 24 deletions(-)

1 0

[PATCH 5/5] usp10/tests: Cleanup test_ScriptTextOut().
by Henri Verbeet 20 Feb '18

20 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 129 +++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 78 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d9feb7f..0cfe0a9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2638,14 +2638,11 @@ static void test_ScriptTextOut(HDC hdc) HRESULT hr; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; WORD pwLogClust[256]; SCRIPT_VISATTR psva[256]; @@ -2655,93 +2652,69 @@ static void test_ScriptTextOut(HDC hdc) ABC pABC[256]; RECT rect; int piX; - int iCP = 1; - BOOL fTrailing = FALSE; - SCRIPT_LOGATTR *psla; SCRIPT_LOGATTR sla[256]; - /* This is a valid test that will cause parsing to take place */ - cInChars = 5; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + /* This is a valid test that will cause parsing to take place. */ + cInChars = lstrlenW(TestItem1); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 1, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[1].iCharPos, cInChars); - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ + psc = NULL; cInChars = 5; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = 256; - hr = ScriptShape(hdc, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr == S_OK) { - /* Note hdc is needed as glyph info is not yet in psc */ - hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); - ScriptFreeCache(&psc); /* Get rid of psc for next test set */ - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + hr = ScriptShape(hdc, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); - hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); - ok (hr == E_INVALIDARG, "Should return 0 not (%08x)\n", hr); + /* Note hdc is needed as glyph info is not yet in psc. */ + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Get rid of psc for next test set. */ + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); - hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok( hr == E_INVALIDARG, "(NULL,NULL,TestItem1, cInChars, dwFlags, pwOutGlyphs3), " - "expected E_INVALIDARG, got %08x\n", hr); - - /* Set psc to NULL, to be able to check if a pointer is returned in psc */ - psc = NULL; - hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, - NULL, NULL, NULL); - ok( hr == E_INVALIDARG, "(NULL,&psc,NULL,0,0,0,NULL,), expected E_INVALIDARG, " - "got %08x\n", hr); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* hdc is required for this one rather than the usual optional */ - psc = NULL; - hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok( hr == E_INVALIDARG, "(NULL,&psc,), expected E_INVALIDARG, got %08x\n", hr); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* Set that it returns 0 status */ - hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); + hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!psc, "Got unexpected psc %p.\n", psc); - /* Test Rect Rgn is acceptable */ - SetRect(&rect, 10, 10, 40, 20); - hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); + /* hdc is required. */ + hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!psc, "Got unexpected psc %p.\n", psc); + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - iCP = 1; - hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, - (const SCRIPT_VISATTR *) &psva, (const int *)&piAdvance, &pItem[0].a, &piX); - ok(hr == S_OK, "ScriptCPtoX Stub should return S_OK not %08x\n", hr); + /* Test Rect Rgn is acceptable. */ + SetRect(&rect, 10, 10, 40, 20); + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - psla = (SCRIPT_LOGATTR *)&sla; - hr = ScriptBreak(TestItem1, cChars, &pItem[0].a, psla); - ok(hr == S_OK, "ScriptBreak Stub should return S_OK not %08x\n", hr); + hr = ScriptCPtoX(1, FALSE, cInChars, pcGlyphs, pwLogClust, psva, piAdvance, &pItem[0].a, &piX); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Clean up and go */ - ScriptFreeCache(&psc); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - } - } + hr = ScriptBreak(TestItem1, cInChars, &pItem[0].a, sla); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); } static void test_ScriptTextOut2(HDC hdc) -- 2.1.4

2 1

[PATCH 4/5] usp10/tests: Cleanup test_ScriptItemIzeShapePlace().
by Henri Verbeet 20 Feb '18

20 Feb '18

This mostly just removes redundant branches and variables. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 256 +++++++++++++++++++---------------------------- 1 file changed, 103 insertions(+), 153 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5d1b144..d9feb7f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2177,185 +2177,135 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 WCHAR TestItem6[] = {'T', 'e', 's', 't', 'f',' ',' ',' ','\r','\n','e','n','d',0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; - unsigned short pwOutGlyphs2[256]; unsigned short pwLogClust[256]; SCRIPT_VISATTR psva[256]; int pcGlyphs; int piAdvance[256]; GOFFSET pGoffset[256]; ABC pABC[256]; - int cnt; + unsigned int i; - /* Start testing usp10 functions */ - /* This test determines that the pointer returned by ScriptGetProperties is valid - * by checking a known value in the table */ + /* Verify we get a valid pointer from ScriptGetProperties(). */ hr = ScriptGetProperties(&ppSp, &iMaxProps); ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); trace("number of script properties %d\n", iMaxProps); - ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); - if (iMaxProps > 0) - ok( ppSp[0]->langid == 0, "Langid[0] not = to 0\n"); /* Check a known value to ensure */ - /* ptrs work */ + ok(iMaxProps > 0, "Got unexpected script count %d.\n", iMaxProps); + ok(ppSp[0]->langid == 0, "Got unexpected langid %#x.\n", ppSp[0]->langid); /* This is a valid test that will cause parsing to take place. */ - cInChars = 5; + cInChars = lstrlenW(TestItem1); hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 1, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[1].iCharPos, cInChars); - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ - cInChars = 5; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = cInChars; - hr = ScriptShape(NULL, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == E_PENDING, "If psc is NULL (%08x) the E_PENDING should be returned\n", hr); - cMaxGlyphs = 4; - hr = ScriptShape(hdc, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == E_OUTOFMEMORY, "If not enough output area cChars (%d) is > than CMaxGlyphs " - "(%d) but not E_OUTOFMEMORY\n", - cChars, cMaxGlyphs); - cMaxGlyphs = 256; - hr = ScriptShape(hdc, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr ==0) { - hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "ScriptPlace should return S_OK not (%08x)\n", hr); - hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "ScriptPlace should return S_OK not (%08x)\n", hr); - for (cnt=0; cnt < pcGlyphs; cnt++) - pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */ - } - - /* This test verifies that SCRIPT_CACHE is reused and that no - * translation takes place if fNoGlyphIndex is set. */ - cInChars = 5; - hr = ScriptItemize(TestItem2, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[1].iCharPos); - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue */ - if (hr == S_OK) { - cChars = cInChars; - cMaxGlyphs = 256; - pItem[0].a.fNoGlyphIndex = 1; /* say no translate */ - hr = ScriptShape(NULL, &psc, TestItem2, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs2, pwLogClust, psva, &pcGlyphs); - ok (hr != E_PENDING, "If psc should not be NULL (%08x) and the E_PENDING should be returned\n", hr); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - for (cnt=0; cnt < cChars && TestItem2[cnt] == pwOutGlyphs2[cnt]; cnt++) {} - ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", - cnt, TestItem2[cnt], pwOutGlyphs2[cnt]); - if (hr == S_OK) { - hr = ScriptPlace(hdc, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "ScriptPlace should return S_OK not (%08x)\n", hr); - } - } - ScriptFreeCache( &psc); - ok (!psc, "psc is not null after ScriptFreeCache\n"); - - } - - /* This is a valid test that will cause parsing to take place and create - * 3 script_items. */ - cInChars = ARRAY_SIZE(TestItem3) - 1; - hr = ScriptItemize(TestItem3, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - if (hr == S_OK) + psc = NULL; + hr = ScriptShape(NULL, &psc, TestItem1, cInChars, cInChars, + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); + + hr = ScriptShape(hdc, &psc, TestItem1, cInChars, cInChars - 1, + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); + + hr = ScriptShape(hdc, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); + + /* Send to next test. */ + memcpy(pwOutGlyphs, pwOutGlyphs1, pcGlyphs * sizeof(*pwOutGlyphs)); + + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* This test verifies that SCRIPT_CACHE is reused and that no translation + * takes place if fNoGlyphIndex is set. */ + cInChars = lstrlenW(TestItem2); + hr = ScriptItemize(TestItem2, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 1, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[1].iCharPos, cInChars); + + pItem[0].a.fNoGlyphIndex = 1; /* No translation. */ + hr = ScriptShape(NULL, &psc, TestItem2, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); + + for (i = 0; i < cInChars; ++i) { - ok (pcItems == 3, "The number of SCRIPT_ITEMS should be 3 not %d\n", pcItems); - if (pcItems > 2) - { - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, - "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", - pItem[0].iCharPos, pItem[1].iCharPos); - ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, - "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", - pItem[1].iCharPos, pItem[2].iCharPos); - ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == cInChars, - "Start pos [2] not = 11 (%d) or end [3] pos not = 14 (%d), cInChars = %d\n", - pItem[2].iCharPos, pItem[3].iCharPos, cInChars); - } + ok(pwOutGlyphs1[i] == TestItem2[i], + "Got unexpected pwOutGlyphs1[%u] %#x, expected %#x.\n", + i, pwOutGlyphs1[i], TestItem2[i]); } - /* This is a valid test that will cause parsing to take place and create - * 5 script_items. */ - cInChars = ARRAY_SIZE(TestItem4) - 1; + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); + + /* This is a valid test that will cause parsing to take place and create 3 + * script_items. */ + cInChars = lstrlenW(TestItem3); + hr = ScriptItemize(TestItem3, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(pcItems == 3, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == 6, "Got unexpected character position %d.\n", pItem[1].iCharPos); + ok(pItem[2].iCharPos == 11, "Got unexpected character position %d.\n", pItem[2].iCharPos); + ok(pItem[3].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[3].iCharPos, cInChars); + + /* This is a valid test that will cause parsing to take place and create 5 + * script_items. */ + cInChars = lstrlenW(TestItem4); hr = ScriptItemize(TestItem4, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - if (hr == S_OK) - { - ok (pcItems == 5, "The number of SCRIPT_ITEMS should be 5 not %d\n", pcItems); - if (pcItems > 4) - { - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, - "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", - pItem[0].iCharPos, pItem[1].iCharPos); - ok (pItem[0].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", - pItem[0].a.s.uBidiLevel); - ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, - "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", - pItem[1].iCharPos, pItem[2].iCharPos); - ok (pItem[1].a.s.uBidiLevel == 1, "Should have been bidi=1 not %d\n", - pItem[1].a.s.uBidiLevel); - ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == 12, - "Start pos [2] not = 11 (%d) or end [3] pos not = 12 (%d)\n", - pItem[2].iCharPos, pItem[3].iCharPos); - ok (pItem[2].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", - pItem[2].a.s.uBidiLevel); - ok (pItem[3].iCharPos == 12 && pItem[4].iCharPos == 13, - "Start pos [3] not = 12 (%d) or end [4] pos not = 13 (%d)\n", - pItem[3].iCharPos, pItem[4].iCharPos); - ok (pItem[3].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", - pItem[3].a.s.uBidiLevel); - ok (pItem[4].iCharPos == 13 && pItem[5].iCharPos == cInChars, - "Start pos [4] not = 13 (%d) or end [5] pos not = 16 (%d), cInChars = %d\n", - pItem[4].iCharPos, pItem[5].iCharPos, cInChars); - } - } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(pcItems == 5, "Got unexpected item count %d.\n", pcItems); + + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == 6, "Got unexpected character position %d.\n", pItem[1].iCharPos); + ok(pItem[2].iCharPos == 11, "Got unexpected character position %d.\n", pItem[2].iCharPos); + ok(pItem[3].iCharPos == 12, "Got unexpected character position %d.\n", pItem[3].iCharPos); + ok(pItem[4].iCharPos == 13, "Got unexpected character position %d.\n", pItem[4].iCharPos); + ok(pItem[5].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[5].iCharPos, cInChars); + + ok(pItem[0].a.s.uBidiLevel == 0, "Got unexpected bidi level %u.\n", pItem[0].a.s.uBidiLevel); + ok(pItem[1].a.s.uBidiLevel == 1, "Got unexpected bidi level %u.\n", pItem[1].a.s.uBidiLevel); + ok(pItem[2].a.s.uBidiLevel == 0, "Got unexpected bidi level %u.\n", pItem[2].a.s.uBidiLevel); + ok(pItem[3].a.s.uBidiLevel == 0, "Got unexpected bidi level %u.\n", pItem[3].a.s.uBidiLevel); + ok(pItem[4].a.s.uBidiLevel == 0, "Got unexpected bidi level %u.\n", pItem[3].a.s.uBidiLevel); /* This test is for when the first Unicode character requires BiDi support. */ - hr = ScriptItemize(TestItem5, ARRAY_SIZE(TestItem5) - 1, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); - ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", - pItem[0].a.s.uBidiLevel); + hr = ScriptItemize(TestItem5, lstrlenW(TestItem5), ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(pcItems == 4, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].a.s.uBidiLevel == 1, "Got unexpected bidi level %u.\n", pItem[0].a.s.uBidiLevel); /* This test verifies that the test to see if there are sufficient buffers * to store the pointer to the last character works. Note that Windows * often needs a greater number of SCRIPT_ITEMS to process a string than * is returned in pcItems. */ - hr = ScriptItemize(TestItem6, ARRAY_SIZE(TestItem6) - 1, 4, NULL, NULL, pItem, &pcItems); - ok (hr == E_OUTOFMEMORY, "ScriptItemize should return E_OUTOFMEMORY, returned %08x\n", hr); - + hr = ScriptItemize(TestItem6, lstrlenW(TestItem6), 4, NULL, NULL, pItem, &pcItems); + ok(hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); } static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) -- 2.1.4

2 1

[PATCH 3/5] usp10/tests: Introduce an ARRAY_SIZE macro.
by Henri Verbeet 20 Feb '18

20 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 112 +++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 62 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index de91cb8..5d1b144 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -31,6 +31,10 @@ #include <windows.h> #include <usp10.h> +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + typedef struct _itemTest { char todo_flag[6]; int iCharPos; @@ -2019,7 +2023,7 @@ static void test_ScriptShape(HDC hdc) chars[0] = 'A'; chars[2] = 'A'; - for (j = 0; j < sizeof(test_data) / sizeof(*test_data); ++j) + for (j = 0; j < ARRAY_SIZE(test_data); ++j) { WCHAR c = test_data[j].c; SCRIPT_ITEM *item; @@ -2073,15 +2077,15 @@ static void test_ScriptShape(HDC hdc) /* Text does not support this range. */ memset(items, 0, sizeof(items)); nb = 0; - hr = ScriptItemize(test3, sizeof(test3)/sizeof(test3[0]), sizeof(items)/sizeof(items[0]), NULL, NULL, items, &nb); + hr = ScriptItemize(test3, ARRAY_SIZE(test3), ARRAY_SIZE(items), NULL, NULL, items, &nb); ok(hr == S_OK, "ScriptItemize failed, hr %#x.\n", hr); ok(items[0].a.eScript > 0, "Expected script id.\n"); ok(nb == 1, "Unexpected number of items.\n"); memset(glyphs, 0xff, sizeof(glyphs)); nb = 0; - hr = ScriptShape(hdc, &sc, test3, sizeof(test3)/sizeof(test3[0]), sizeof(glyphs)/sizeof(glyphs[0]), &items[0].a, - glyphs, logclust, attrs, &nb); + hr = ScriptShape(hdc, &sc, test3, ARRAY_SIZE(test3), ARRAY_SIZE(glyphs), + &items[0].a, glyphs, logclust, attrs, &nb); ok(hr == S_OK, "ScriptShape failed, hr %#x.\n", hr); ok(nb == 1, "Unexpected glyph count %u\n", nb); ok(glyphs[0] == 0, "Unexpected glyph id\n"); @@ -2163,7 +2167,6 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 const SCRIPT_PROPERTIES **ppSp; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; @@ -2197,10 +2200,9 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok( ppSp[0]->langid == 0, "Langid[0] not = to 0\n"); /* Check a known value to ensure */ /* ptrs work */ - /* This is a valid test that will cause parsing to take place */ + /* This is a valid test that will cause parsing to take place. */ cInChars = 5; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ @@ -2246,12 +2248,10 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */ } - /* This test will check to make sure that SCRIPT_CACHE is reused and that not translation * - * takes place if fNoGlyphIndex is set. */ - + /* This test verifies that SCRIPT_CACHE is reused and that no + * translation takes place if fNoGlyphIndex is set. */ cInChars = 5; - cMaxItems = 255; - hr = ScriptItemize(TestItem2, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + hr = ScriptItemize(TestItem2, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ @@ -2284,13 +2284,13 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 } - /* This is a valid test that will cause parsing to take place and create 3 script_items */ - cInChars = (sizeof(TestItem3)/2)-1; - cMaxItems = 255; - hr = ScriptItemize(TestItem3, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + /* This is a valid test that will cause parsing to take place and create + * 3 script_items. */ + cInChars = ARRAY_SIZE(TestItem3) - 1; + hr = ScriptItemize(TestItem3, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); if (hr == S_OK) - { + { ok (pcItems == 3, "The number of SCRIPT_ITEMS should be 3 not %d\n", pcItems); if (pcItems > 2) { @@ -2306,13 +2306,13 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 } } - /* This is a valid test that will cause parsing to take place and create 5 script_items */ - cInChars = (sizeof(TestItem4)/2)-1; - cMaxItems = 255; - hr = ScriptItemize(TestItem4, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + /* This is a valid test that will cause parsing to take place and create + * 5 script_items. */ + cInChars = ARRAY_SIZE(TestItem4) - 1; + hr = ScriptItemize(TestItem4, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); if (hr == S_OK) - { + { ok (pcItems == 5, "The number of SCRIPT_ITEMS should be 5 not %d\n", pcItems); if (pcItems > 4) { @@ -2342,22 +2342,18 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 } } - /* - * This test is for when the first unicode character requires bidi support - */ - cInChars = (sizeof(TestItem5)-1)/sizeof(WCHAR); - hr = ScriptItemize(TestItem5, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + /* This test is for when the first Unicode character requires BiDi support. */ + hr = ScriptItemize(TestItem5, ARRAY_SIZE(TestItem5) - 1, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", pItem[0].a.s.uBidiLevel); - /* This test checks to make sure that the test to see if there are sufficient buffers to store * - * the pointer to the last char works. Note that windows often needs a greater number of * - * SCRIPT_ITEMS to process a string than is returned in pcItems. */ - cInChars = (sizeof(TestItem6)/2)-1; - cMaxItems = 4; - hr = ScriptItemize(TestItem6, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + /* This test verifies that the test to see if there are sufficient buffers + * to store the pointer to the last character works. Note that Windows + * often needs a greater number of SCRIPT_ITEMS to process a string than + * is returned in pcItems. */ + hr = ScriptItemize(TestItem6, ARRAY_SIZE(TestItem6) - 1, 4, NULL, NULL, pItem, &pcItems); ok (hr == E_OUTOFMEMORY, "ScriptItemize should return E_OUTOFMEMORY, returned %08x\n", hr); } @@ -3223,13 +3219,13 @@ static void test_ScriptString(HDC hdc) HRESULT hr; WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; - int len = (sizeof(teststr) / sizeof(WCHAR)) - 1; + int len = ARRAY_SIZE(teststr) - 1; int Glyphs = len * 2 + 16; int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - static const int Dx[(sizeof(teststr) / sizeof(WCHAR)) - 1]; - static const BYTE InClass[(sizeof(teststr) / sizeof(WCHAR)) - 1]; + static const int Dx[ARRAY_SIZE(teststr) - 1]; + static const BYTE InClass[ARRAY_SIZE(teststr) - 1]; SCRIPT_STRING_ANALYSIS ssa = NULL; int X = 10; @@ -3305,13 +3301,12 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) HRESULT hr; static const WCHAR teststr1[] = {0x05e9, 'i', 0x05dc, 'n', 0x05d5, 'e', 0x05dd, '.',0}; static const BOOL rtl[] = {1, 0, 1, 0, 1, 0, 1, 0}; - void *String = (WCHAR *) &teststr1; /* ScriptStringAnalysis needs void */ - int String_len = (sizeof(teststr1)/sizeof(WCHAR))-1; + unsigned int String_len = ARRAY_SIZE(teststr1) - 1; int Glyphs = String_len * 2 + 16; /* size of buffer as recommended */ int Charset = -1; /* unicode */ DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - static const BYTE InClass[(sizeof(teststr1)/sizeof(WCHAR))-1]; + static const BYTE InClass[ARRAY_SIZE(teststr1) - 1]; SCRIPT_STRING_ANALYSIS ssa = NULL; int Ch; /* Character position in string */ @@ -3321,17 +3316,13 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) int trail,lead; BOOL fTrailing; - /* Test with hdc, this should be a valid test - * Here we generate an SCRIPT_STRING_ANALYSIS that will be used as input to the - * following character positions to X and X to character position functions. - */ - - hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, NULL, NULL, - InClass, &ssa); - ok(hr == S_OK || - hr == E_INVALIDARG, /* NT */ - "ScriptStringAnalyse should return S_OK or E_INVALIDARG not %08x\n", hr); + /* Test with hdc, this should be a valid test. Here we generate a + * SCRIPT_STRING_ANALYSIS that will be used as input to the following + * character-positions-to-X and X-to-character-position functions. */ + hr = ScriptStringAnalyse(hdc, &teststr1, String_len, Glyphs, Charset, + Flags, ReqWidth, NULL, NULL, NULL, NULL, InClass, &ssa); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* NT */, + "Got unexpected hr %08x.\n", hr); if (hr == S_OK) { @@ -3462,13 +3453,10 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) hr = ScriptStringFree(&ssa); ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); - /* - * Test to see that exceeding the number of chars returns E_INVALIDARG. First - * generate an SSA for the subsequent tests. - */ - hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, NULL, NULL, - InClass, &ssa); + /* Test to see that exceeding the number of characters returns + * E_INVALIDARG. First generate an SSA for the subsequent tests. */ + hr = ScriptStringAnalyse(hdc, &teststr1, String_len, Glyphs, Charset, + Flags, ReqWidth, NULL, NULL, NULL, NULL, InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); /* @@ -3671,7 +3659,7 @@ static void test_ScriptLayout(void) hr = ScriptLayout(sizeof(levels[0]), levels[0], NULL, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); - for (i = 0; i < sizeof(levels)/sizeof(levels[0]); i++) + for (i = 0; i < ARRAY_SIZE(levels); ++i) { hr = ScriptLayout(sizeof(levels[0]), levels[i], vistolog, logtovis); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); @@ -3744,7 +3732,7 @@ static void test_digit_substitution(void) LGRPID_ARMENIAN }; - for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++) + for (i = 0; i < ARRAY_SIZE(groups); ++i) { ret = EnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: %u\n", GetLastError()); @@ -4007,7 +3995,7 @@ static void test_ScriptGetLogicalWidths(void) SCRIPT_ANALYSIS sa = { 0 }; unsigned int i, j; - for (i = 0; i < sizeof(logical_width_tests)/sizeof(logical_width_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(logical_width_tests); ++i) { const struct logical_width_test *ptr = logical_width_tests + i; SCRIPT_VISATTR attrs[3]; @@ -4068,7 +4056,7 @@ static void test_ScriptIsComplex(void) hr = ScriptIsComplex(test2W, 0, SIC_ASCIIDIGIT); ok(hr == S_FALSE, "got 0x%08x\n", hr); - for (i = 0; i < sizeof(complex_tests)/sizeof(complex_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(complex_tests); ++i) { hr = ScriptIsComplex(complex_tests[i].text, lstrlenW(complex_tests[i].text), complex_tests[i].flags); todo_wine_if(complex_tests[i].todo) -- 2.1.4

2 1

[PATCH 2/5] usp10: Use usp10_array_reserve() in computeBracketPairs().
by Henri Verbeet 20 Feb '18

20 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/bidi.c | 71 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2277190..b0df781 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -694,6 +694,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) int stack_top = iso_run->length; unsigned int pair_count = 0; BracketPair *out = NULL; + SIZE_T out_size = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -702,42 +703,43 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry(bidi_bracket_table, iso_run->item[i].ch); - if (ubv) + + if (!ubv) + continue; + + if ((ubv >> 8) == 0) { - if (!out) - { - out = heap_alloc(sizeof(*out)); - out[0].start = -1; - } + --stack_top; + open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); + /* Deal with canonical equivalent U+2329/232A and U+3008/3009. */ + if (open_stack[stack_top] == 0x232a) + open_stack[stack_top] = 0x3009; + stack_index[stack_top] = i; + } + else if ((ubv >> 8) == 1) + { + unsigned int j; - if ((ubv >> 8) == 0) - { - stack_top --; - open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); - /* deal with canonical equivalent U+2329/232A and U+3008/3009 */ - if (open_stack[stack_top] == 0x232A) - open_stack[stack_top] = 0x3009; - stack_index[stack_top] = i; - } - else if ((ubv >> 8) == 1) + for (j = stack_top; j < iso_run->length; ++j) { - int j; - if (stack_top == iso_run->length) continue; - for (j = stack_top; j < iso_run->length; j++) - { - WCHAR c = iso_run->item[i].ch; - if (c == 0x232A) c = 0x3009; - if (c == open_stack[j]) - { - out[pair_count].start = stack_index[j]; - out[pair_count].end = i; - pair_count++; - out = HeapReAlloc(GetProcessHeap(), 0, out, sizeof(BracketPair) * (pair_count+1)); - out[pair_count].start = -1; - stack_top = j+1; - break; - } - } + WCHAR c = iso_run->item[i].ch; + + if (c == 0x232a) + c = 0x3009; + + if (c != open_stack[j]) + continue; + + if (!(usp10_array_reserve((void **)&out, &out_size, pair_count + 2, sizeof(*out)))) + ERR("Failed to grow output array.\n"); + + out[pair_count].start = stack_index[j]; + out[pair_count].end = i; + ++pair_count; + + out[pair_count].start = -1; + stack_top = j + 1; + break; } } } @@ -746,10 +748,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(stack_index); if (!pair_count) - { - heap_free(out); return NULL; - } qsort(out, pair_count, sizeof(*out), compr); -- 2.1.4

2 1

[PATCH 1/5] usp10: Make "pair_count" unsigned in computeBracketPairs().
by Henri Verbeet 20 Feb '18

20 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/bidi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 8f94ede..2277190 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -692,8 +692,8 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; + unsigned int pair_count = 0; BracketPair *out = NULL; - int pair_count = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -745,13 +745,13 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(open_stack); heap_free(stack_index); - if (pair_count == 0) + if (!pair_count) { heap_free(out); - out = NULL; + return NULL; } - else if (pair_count > 1) - qsort(out, pair_count, sizeof(BracketPair), compr); + + qsort(out, pair_count, sizeof(*out), compr); return out; } -- 2.1.4

2 1

[PATCH v3 7/7] winebus.sys: Add SDL to CriticalDeviceDatabase
by Aric Stewart 20 Feb '18

20 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH v3 6/7] winebus.sys: Implement SDL Haptic for controller vibration
by Aric Stewart 20 Feb '18

20 Feb '18

v3: dynamic loading of the SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 134 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 3 deletions(-)

1 0

[PATCH v3 5/7] winebus.sys: map SDL GameControllers if requested
by Aric Stewart 20 Feb '18

20 Feb '18

v3: dynamic loading of the SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 271 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 253 insertions(+), 18 deletions(-)

1 0

[PATCH v3 4/7] winebus.sys: Process SDL device reports
by Aric Stewart 20 Feb '18

20 Feb '18

v3: dynamic loading of the SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 120 ++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/bus_udev.c | 19 +------ dlls/winebus.sys/controller.c | 17 ++++++ dlls/winebus.sys/controller.h | 1 + 4 files changed, 139 insertions(+), 18 deletions(-)

1 0

[PATCH v3 3/7] winebus.sys: Build SDL device report
by Aric Stewart 20 Feb '18

20 Feb '18

v2: Correct ifdef value v3: dynamic loading of the SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 1 + dlls/winebus.sys/bus_sdl.c | 197 +++++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/bus_udev.c | 95 +------------------- dlls/winebus.sys/controller.c | 48 ++++++++++ dlls/winebus.sys/controller.h | 96 ++++++++++++++++++++ 5 files changed, 342 insertions(+), 95 deletions(-) create mode 100644 dlls/winebus.sys/controller.c create mode 100644 dlls/winebus.sys/controller.h

1 0

[PATCH v3 1/7] winebus.sys: Add SDL gamepad and joystick driver
by Aric Stewart 20 Feb '18

20 Feb '18

v3: dynamic loading of the SDL library Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- configure | 202 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 17 ++++ dlls/winebus.sys/Makefile.in | 3 +- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_sdl.c | 58 +++++++++++++ dlls/winebus.sys/main.c | 15 +++- include/config.h.in | 12 +++ 7 files changed, 306 insertions(+), 2 deletions(-) create mode 100644 dlls/winebus.sys/bus_sdl.c

1 0

[PATCH] testbot: Add the $MaxRunningVMs limit.
by Francois Gouget 20 Feb '18

20 Feb '18

This allows preparing up to $MaxActiveVMs idle VMs while putting a lower limit on the number of simultaneously running tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch is just to introduce the parameter and associated code. So $MaxRunningVMs is set to 1 by default and thus there should be no change in the TestBot behavior. Later on we can play with this parameter to see if another value would be better. testbot/bin/Engine.pl | 6 ++++++ testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7e278ba97..2e62c660c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -736,6 +736,12 @@ sub main() # Validate and adjust the configuration options $MaxActiveVMs ||= 1; + $MaxRunningVMs ||= $MaxActiveVMs; + if ($MaxRunningVMs > $MaxActiveVMs) + { + $MaxRunningVMs = $MaxActiveVMs; + LogMsg "Capping MaxRunningVMs to MaxActiveVMs ($MaxRunningVMs)\n"; + } $MaxRevertingVMs ||= $MaxActiveVMs; if ($MaxRevertingVMs > $MaxActiveVMs) { diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 2c615fadb..a425e4909 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -27,7 +27,8 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs - $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxVMsWhenIdle + $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs + $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout @@ -42,7 +43,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs - $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM + $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout @@ -69,6 +70,7 @@ $BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; +$MaxRunningVMs = 1; $MaxVMsWhenIdle = undef; # How long to wait for each of the 3 connection attempts to the VM's TestAgent diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 9a0f8bc39..b71073adb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -473,6 +473,7 @@ sub _GetSchedHost($$) MaxRevertingVMs => $MaxRevertingVMs, MaxRevertsWhileRunningVMs => $MaxRevertsWhileRunningVMs, MaxActiveVMs => $MaxActiveVMs, + MaxRunningVMs => $MaxRunningVMs, MaxVMsWhenIdle => $MaxVMsWhenIdle, }; } @@ -905,7 +906,11 @@ sub _ScheduleTasks($) delete $Sched->{lambvms}->{$VMKey}; my $Host = _GetSchedHost($Sched, $VM); - if ($Host->{active} - $Host->{idle} < $Host->{MaxActiveVMs} and + # Dirty VMs are VMs that were running and have still not been + # powered off. Sleeping VMs may be VMs that are booting. + # So in both cases they may still be using CPU and I/O resources so + # count them against the running VM limit. + if ($Host->{sleeping} + $Host->{running} + $Host->{dirty} < $Host->{MaxRunningVMs} and ($Host->{reverting} == 0 or $Host->{reverting} <= $Host->{MaxRevertsWhileRunningVMs})) { -- 2.16.1

1 0

[PATCH] msi/tests: Skip the deferred action test if the process is limited.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/install.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index acbf1629a5..7612a00785 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5924,6 +5924,12 @@ static void test_deferred_action(void) { UINT r; + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + create_database(msifile, da_tables, sizeof(da_tables) / sizeof(da_tables[0])); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); -- 2.11.0

2 2

[PATCH 5/5] mshtml: Added IDOMMouseEvent::relatedTarget implementation.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 7 ++++ dlls/mshtml/htmlelem.c | 7 ++++ dlls/mshtml/htmlevent.c | 90 +++++++++++++++++++++++++++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 7 ++++ dlls/mshtml/tests/events.js | 5 ++- dlls/mshtml/xmlhttprequest.c | 7 ++++ 7 files changed, 109 insertions(+), 15 deletions(-)

2 1

[PATCH] ntdll: Allow closing tags for 'supportedOS' elements
by Nikolay Sivov 20 Feb '18

20 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Reported as https://bugs.winehq.org/show_bug.cgi?id=44563 dlls/kernel32/tests/actctx.c | 4 +-- dlls/ntdll/actctx.c | 70 ++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index cef11a5e63..263fe3997c 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -426,9 +426,9 @@ static const char compat_manifest_vista_7_8_10_81[] = " <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" " <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" " <application>" -" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" />" /* Windows Vista */ +" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" ></supportedOS>" /* Windows Vista */ " <supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" />" /* Windows 7 */ -" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" />" /* Windows 8 */ +" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" ></supportedOS>" /* Windows 8 */ " <supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" />" /* Windows 10 */ " <supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" />" /* Windows 8.1 */ " </application>" diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4a3370048f..27d6ad864c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2245,11 +2245,50 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct return ret; } +static BOOL parse_supportedos_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IdW)) + { + COMPATIBILITY_CONTEXT_ELEMENT *compat; + UNICODE_STRING str; + GUID compat_id; + + str.Buffer = (PWSTR)attr_value.ptr; + str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) + { + if (!(compat = add_compat_context(assembly))) return FALSE; + compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Id = compat_id; + } + else + { + WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); + } + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + } + } + + if (error) return FALSE; + if (end) return TRUE; + + return parse_expect_end_elem(xmlbuf, supportedOSW, asmv1W); +} + static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader* acl) { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, ret = TRUE, error; + BOOL ret = TRUE; + xmlstr_t elem; while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -2260,32 +2299,7 @@ static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assemb } else if (xmlstr_cmp(&elem, supportedOSW)) { - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) - { - if (xmlstr_cmp(&attr_name, IdW)) - { - UNICODE_STRING str; - COMPATIBILITY_CONTEXT_ELEMENT* compat; - GUID compat_id; - str.Buffer = (PWSTR)attr_value.ptr; - str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); - if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) - { - if (!(compat = add_compat_context(assembly))) return FALSE; - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; - compat->Id = compat_id; - } - else - { - WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); - } - } - else - { - WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), - debugstr_xmlstr(&attr_value)); - } - } + ret = parse_supportedos_elem(xmlbuf, assembly, acl); } else { -- 2.16.1

1 0

[PATCH 5/5 v2] mshtml: Added IDOMMouseEvent::relatedTarget implementation.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo. dlls/mshtml/htmldoc.c | 7 ++++ dlls/mshtml/htmlelem.c | 7 ++++ dlls/mshtml/htmlevent.c | 90 +++++++++++++++++++++++++++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 7 ++++ dlls/mshtml/tests/events.js | 5 ++- dlls/mshtml/xmlhttprequest.c | 7 ++++ 7 files changed, 109 insertions(+), 15 deletions(-)

1 0

[PATCH 4/5] mshtml: Share more code between get_form implementations.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlform.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/htmlinput.c | 40 ++-------------------------------------- dlls/mshtml/htmloption.c | 28 +--------------------------- dlls/mshtml/htmlselect.c | 28 +--------------------------- dlls/mshtml/htmltextarea.c | 23 +---------------------- dlls/mshtml/mshtml_private.h | 1 + 6 files changed, 38 insertions(+), 114 deletions(-)

1 0

[PATCH 3/5] mshtml: Use get_element helper in IHTMLDocument3::get_documentElement implementation.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)

1 0

[PATCH 2/5] mshtml: Get rid of no longer needed document argument from create_collection_from_nodelist and create_collection_from_htmlcol.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 18 +++++++++--------- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 8 ++++---- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmltable.c | 4 ++-- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-)

1 0

[PATCH 1/5] mshtml: Use get_element helper in IHTMLDocument2::elementFromPoint implementation.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH] wldap32: Use the global memory allocation helpers.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wldap32/control.c | 3 +- dlls/wldap32/init.c | 19 +++--- dlls/wldap32/page.c | 8 +-- dlls/wldap32/value.c | 10 ++- dlls/wldap32/wldap32.h | 175 ++++++++++++++++++------------------------------- 5 files changed, 81 insertions(+), 134 deletions(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index b9d7b3b8f5..1ec8641847 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -276,8 +276,7 @@ INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, static inline void bv_val_dup( const struct WLDAP32_berval *src, struct WLDAP32_berval *dst ) { - dst->bv_val = HeapAlloc( GetProcessHeap(), 0, src->bv_len ); - if (dst->bv_val) + if ((dst->bv_val = heap_alloc( src->bv_len ))) { memcpy( dst->bv_val, src->bv_val, src->bv_len ); dst->bv_len = src->bv_len; diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 6b413f8437..fdb79084b5 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -62,10 +62,9 @@ static char **split_hostnames( const char *hostnames ) p++; } - res = HeapAlloc( GetProcessHeap(), 0, (i + 1) * sizeof(char *) ); - if (!res) + if (!(res = heap_alloc( (i + 1) * sizeof(char *) ))) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); return NULL; } @@ -74,7 +73,7 @@ static char **split_hostnames( const char *hostnames ) q = p; i = 0; - + while (*p) { if (p[1] != '\0') @@ -85,7 +84,7 @@ static char **split_hostnames( const char *hostnames ) res[i] = strdupU( q ); if (!res[i]) goto oom; i++; - + while (isspace( *p )) p++; q = p; } @@ -100,14 +99,14 @@ static char **split_hostnames( const char *hostnames ) } res[i] = NULL; - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); return res; oom: while (i > 0) strfreeU( res[--i] ); - HeapFree( GetProcessHeap(), 0, res ); - HeapFree( GetProcessHeap(), 0, str ); + heap_free( res ); + heap_free( str ); return NULL; } @@ -154,9 +153,7 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum } size += (i - 1) * strlen( sep ); - - res = HeapAlloc( GetProcessHeap(), 0, size + 1 ); - if (!res) return NULL; + if (!(res = heap_alloc( size + 1 ))) return NULL; p = res; for (v = hostnames; *v; v++) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 15d5119902..7cf7d93245 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -99,17 +99,15 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, return WLDAP32_LDAP_NO_MEMORY; /* copy the berval so it can be properly freed by the caller */ - val = HeapAlloc( GetProcessHeap(), 0, berval->bv_len ); - if (!val) return WLDAP32_LDAP_NO_MEMORY; + if (!(val = heap_alloc( berval->bv_len ))) return WLDAP32_LDAP_NO_MEMORY; len = berval->bv_len; memcpy( val, berval->bv_val, len ); ber_bvfree( berval ); - ctrl = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (!ctrl) + if (!(ctrl = heap_alloc( sizeof(LDAPControlW) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return WLDAP32_LDAP_NO_MEMORY; } diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index 69ab040072..bcfa9a2f6b 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -156,8 +156,7 @@ static char *bv2str( struct berval *bv ) char *str = NULL; unsigned int len = bv->bv_len; - str = HeapAlloc( GetProcessHeap(), 0, len + 1 ); - if (str) + if ((str = heap_alloc( len + 1 ))) { memcpy( str, bv->bv_val, len ); str[len] = '\0'; @@ -176,8 +175,7 @@ static char **bv2str_array( struct berval **bv ) len++; p++; } - str = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(char *) ); - if (!str) return NULL; + if (!(str = heap_alloc( (len + 1) * sizeof(char *) ))) return NULL; p = bv; while (*p) @@ -185,8 +183,8 @@ static char **bv2str_array( struct berval **bv ) str[i] = bv2str( *p ); if (!str[i]) { - while (i > 0) HeapFree( GetProcessHeap(), 0, str[--i] ); - HeapFree( GetProcessHeap(), 0, str ); + while (i > 0) heap_free( str[--i] ); + heap_free( str ); return NULL; } i++; diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 55852a6617..1d4052002a 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; @@ -31,22 +32,16 @@ ULONG map_error( int ) DECLSPEC_HIDDEN; static inline char *strdupU( const char *src ) { char *dst; - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (strlen( src ) + 1) * sizeof(char) ); - if (dst) - strcpy( dst, src ); + if ((dst = heap_alloc( (strlen( src ) + 1) * sizeof(char) ))) strcpy( dst, src ); return dst; } static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) - strcpyW( dst, src ); + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); return dst; } @@ -56,7 +51,7 @@ static inline LPWSTR strAtoW( LPCSTR str ) if (str) { DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); } return ret; @@ -68,7 +63,7 @@ static inline LPSTR strWtoA( LPCWSTR str ) if (str) { DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + if ((ret = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); } return ret; @@ -80,7 +75,7 @@ static inline char *strWtoU( LPCWSTR str ) if (str) { DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + if ((ret = heap_alloc( len ))) WideCharToMultiByte( CP_UTF8, 0, str, -1, ret, len, NULL, NULL ); } return ret; @@ -92,7 +87,7 @@ static inline LPWSTR strUtoW( char *str ) if (str) { DWORD len = MultiByteToWideChar( CP_UTF8, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_UTF8, 0, str, -1, ret, len ); } return ret; @@ -100,17 +95,17 @@ static inline LPWSTR strUtoW( char *str ) static inline void strfreeA( LPSTR str ) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); } static inline void strfreeW( LPWSTR str ) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); } static inline void strfreeU( char *str ) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); } static inline DWORD strarraylenA( LPSTR *strarray ) @@ -142,9 +137,7 @@ static inline LPWSTR *strarrayAtoW( LPSTR *strarray ) if (strarray) { size = sizeof(WCHAR*) * (strarraylenA( strarray ) + 1); - strarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayW) + if ((strarrayW = heap_alloc( size ))) { LPSTR *p = strarray; LPWSTR *q = strarrayW; @@ -164,9 +157,7 @@ static inline LPSTR *strarrayWtoA( LPWSTR *strarray ) if (strarray) { size = sizeof(LPSTR) * (strarraylenW( strarray ) + 1); - strarrayA = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayA) + if ((strarrayA = heap_alloc( size ))) { LPWSTR *p = strarray; LPSTR *q = strarrayA; @@ -186,9 +177,7 @@ static inline char **strarrayWtoU( LPWSTR *strarray ) if (strarray) { size = sizeof(char*) * (strarraylenW( strarray ) + 1); - strarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayU) + if ((strarrayU = heap_alloc( size ))) { LPWSTR *p = strarray; char **q = strarrayU; @@ -208,9 +197,7 @@ static inline LPWSTR *strarrayUtoW( char **strarray ) if (strarray) { size = sizeof(WCHAR*) * (strarraylenU( strarray ) + 1); - strarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayW) + if ((strarrayW = heap_alloc( size ))) { char **p = strarray; LPWSTR *q = strarrayW; @@ -228,7 +215,7 @@ static inline void strarrayfreeA( LPSTR *strarray ) { LPSTR *p = strarray; while (*p) strfreeA( *p++ ); - HeapFree( GetProcessHeap(), 0, strarray ); + heap_free( strarray ); } } @@ -238,7 +225,7 @@ static inline void strarrayfreeW( LPWSTR *strarray ) { LPWSTR *p = strarray; while (*p) strfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, strarray ); + heap_free( strarray ); } } @@ -248,7 +235,7 @@ static inline void strarrayfreeU( char **strarray ) { char **p = strarray; while (*p) strfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, strarray ); + heap_free( strarray ); } } @@ -259,8 +246,7 @@ static inline struct berval *bvdup( struct berval *bv ) struct berval *berval; DWORD size = sizeof(struct berval) + bv->bv_len; - berval = HeapAlloc( GetProcessHeap(), 0, size ); - if (berval) + if ((berval = heap_alloc( size ))) { char *val = (char *)berval + sizeof(struct berval); @@ -286,9 +272,7 @@ static inline struct berval **bvarraydup( struct berval **bv ) if (bv) { size = sizeof(struct berval *) * (bvarraylen( bv ) + 1); - berval = HeapAlloc( GetProcessHeap(), 0, size ); - - if (berval) + if ((berval = heap_alloc( size ))) { struct berval **p = bv; struct berval **q = berval; @@ -303,16 +287,15 @@ static inline struct berval **bvarraydup( struct berval **bv ) static inline void bvarrayfree( struct berval **bv ) { struct berval **p = bv; - while (*p) HeapFree( GetProcessHeap(), 0, *p++ ); - HeapFree( GetProcessHeap(), 0, bv ); + while (*p) heap_free( *p++ ); + heap_free( bv ); } static inline LDAPModW *modAtoW( LDAPModA *mod ) { LDAPModW *modW; - modW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPModW) ); - if (modW) + if ((modW = heap_alloc( sizeof(LDAPModW) ))) { modW->mod_op = mod->mod_op; modW->mod_type = strAtoW( mod->mod_type ); @@ -329,8 +312,7 @@ static inline LDAPMod *modWtoU( LDAPModW *mod ) { LDAPMod *modU; - modU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPMod) ); - if (modU) + if ((modU = heap_alloc( sizeof(LDAPMod) ))) { modU->mod_op = mod->mod_op; modU->mod_type = strWtoU( mod->mod_type ); @@ -349,7 +331,7 @@ static inline void modfreeW( LDAPModW *mod ) bvarrayfree( mod->mod_vals.modv_bvals ); else strarrayfreeW( mod->mod_vals.modv_strvals ); - HeapFree( GetProcessHeap(), 0, mod ); + heap_free( mod ); } static inline void modfreeU( LDAPMod *mod ) @@ -358,7 +340,7 @@ static inline void modfreeU( LDAPMod *mod ) bvarrayfree( mod->mod_vals.modv_bvals ); else strarrayfreeU( mod->mod_vals.modv_strvals ); - HeapFree( GetProcessHeap(), 0, mod ); + heap_free( mod ); } static inline DWORD modarraylenA( LDAPModA **modarray ) @@ -383,9 +365,7 @@ static inline LDAPModW **modarrayAtoW( LDAPModA **modarray ) if (modarray) { size = sizeof(LDAPModW*) * (modarraylenA( modarray ) + 1); - modarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (modarrayW) + if ((modarrayW = heap_alloc( size ))) { LDAPModA **p = modarray; LDAPModW **q = modarrayW; @@ -405,9 +385,7 @@ static inline LDAPMod **modarrayWtoU( LDAPModW **modarray ) if (modarray) { size = sizeof(LDAPMod*) * (modarraylenW( modarray ) + 1); - modarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (modarrayU) + if ((modarrayU = heap_alloc( size ))) { LDAPModW **p = modarray; LDAPMod **q = modarrayU; @@ -425,7 +403,7 @@ static inline void modarrayfreeW( LDAPModW **modarray ) { LDAPModW **p = modarray; while (*p) modfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, modarray ); + heap_free( modarray ); } } @@ -435,7 +413,7 @@ static inline void modarrayfreeU( LDAPMod **modarray ) { LDAPMod **p = modarray; while (*p) modfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, modarray ); + heap_free( modarray ); } } @@ -447,15 +425,13 @@ static inline LDAPControlW *controlAtoW( LDAPControlA *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (!controlW) + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -475,15 +451,13 @@ static inline LDAPControlA *controlWtoA( LDAPControlW *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlA = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlA) ); - if (!controlA) + if (!(controlA = heap_alloc( sizeof(LDAPControlA) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -503,15 +477,13 @@ static inline LDAPControl *controlWtoU( LDAPControlW *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControl) ); - if (!controlU) + if (!(controlU = heap_alloc( sizeof(LDAPControl) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -531,15 +503,13 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (!controlW) + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -547,7 +517,7 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) controlW->ldctl_value.bv_len = len; controlW->ldctl_value.bv_val = val; controlW->ldctl_iscritical = control->ldctl_iscritical; - + return controlW; } @@ -556,8 +526,8 @@ static inline void controlfreeA( LDAPControlA *control ) if (control) { strfreeA( control->ldctl_oid ); - HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); - HeapFree( GetProcessHeap(), 0, control ); + heap_free( control->ldctl_value.bv_val ); + heap_free( control ); } } @@ -566,8 +536,8 @@ static inline void controlfreeW( LDAPControlW *control ) if (control) { strfreeW( control->ldctl_oid ); - HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); - HeapFree( GetProcessHeap(), 0, control ); + heap_free( control->ldctl_value.bv_val ); + heap_free( control ); } } @@ -576,8 +546,8 @@ static inline void controlfreeU( LDAPControl *control ) if (control) { strfreeU( control->ldctl_oid ); - HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); - HeapFree( GetProcessHeap(), 0, control ); + heap_free( control->ldctl_value.bv_val ); + heap_free( control ); } } @@ -610,9 +580,7 @@ static inline LDAPControlW **controlarrayAtoW( LDAPControlA **controlarray ) if (controlarray) { size = sizeof(LDAPControlW*) * (controlarraylenA( controlarray ) + 1); - controlarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayW) + if ((controlarrayW = heap_alloc( size ))) { LDAPControlA **p = controlarray; LDAPControlW **q = controlarrayW; @@ -632,9 +600,7 @@ static inline LDAPControlA **controlarrayWtoA( LDAPControlW **controlarray ) if (controlarray) { size = sizeof(LDAPControl*) * (controlarraylenW( controlarray ) + 1); - controlarrayA = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayA) + if ((controlarrayA = heap_alloc( size ))) { LDAPControlW **p = controlarray; LDAPControlA **q = controlarrayA; @@ -654,9 +620,7 @@ static inline LDAPControl **controlarrayWtoU( LDAPControlW **controlarray ) if (controlarray) { size = sizeof(LDAPControl*) * (controlarraylenW( controlarray ) + 1); - controlarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayU) + if ((controlarrayU = heap_alloc( size ))) { LDAPControlW **p = controlarray; LDAPControl **q = controlarrayU; @@ -676,9 +640,7 @@ static inline LDAPControlW **controlarrayUtoW( LDAPControl **controlarray ) if (controlarray) { size = sizeof(LDAPControlW*) * (controlarraylenU( controlarray ) + 1); - controlarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayW) + if ((controlarrayW = heap_alloc( size ))) { LDAPControl **p = controlarray; LDAPControlW **q = controlarrayW; @@ -696,7 +658,7 @@ static inline void controlarrayfreeA( LDAPControlA **controlarray ) { LDAPControlA **p = controlarray; while (*p) controlfreeA( *p++ ); - HeapFree( GetProcessHeap(), 0, controlarray ); + heap_free( controlarray ); } } @@ -706,7 +668,7 @@ static inline void controlarrayfreeW( LDAPControlW **controlarray ) { LDAPControlW **p = controlarray; while (*p) controlfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, controlarray ); + heap_free( controlarray ); } } @@ -716,7 +678,7 @@ static inline void controlarrayfreeU( LDAPControl **controlarray ) { LDAPControl **p = controlarray; while (*p) controlfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, controlarray ); + heap_free( controlarray ); } } @@ -724,8 +686,7 @@ static inline LDAPSortKeyW *sortkeyAtoW( LDAPSortKeyA *sortkey ) { LDAPSortKeyW *sortkeyW; - sortkeyW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPSortKeyW) ); - if (sortkeyW) + if ((sortkeyW = heap_alloc( sizeof(LDAPSortKeyW) ))) { sortkeyW->sk_attrtype = strAtoW( sortkey->sk_attrtype ); sortkeyW->sk_matchruleoid = strAtoW( sortkey->sk_matchruleoid ); @@ -738,8 +699,7 @@ static inline LDAPSortKeyA *sortkeyWtoA( LDAPSortKeyW *sortkey ) { LDAPSortKeyA *sortkeyA; - sortkeyA = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPSortKeyA) ); - if (sortkeyA) + if ((sortkeyA = heap_alloc( sizeof(LDAPSortKeyA) ))) { sortkeyA->sk_attrtype = strWtoA( sortkey->sk_attrtype ); sortkeyA->sk_matchruleoid = strWtoA( sortkey->sk_matchruleoid ); @@ -752,8 +712,7 @@ static inline LDAPSortKey *sortkeyWtoU( LDAPSortKeyW *sortkey ) { LDAPSortKey *sortkeyU; - sortkeyU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPSortKey) ); - if (sortkeyU) + if ((sortkeyU = heap_alloc( sizeof(LDAPSortKey) ))) { sortkeyU->attributeType = strWtoU( sortkey->sk_attrtype ); sortkeyU->orderingRule = strWtoU( sortkey->sk_matchruleoid ); @@ -768,7 +727,7 @@ static inline void sortkeyfreeA( LDAPSortKeyA *sortkey ) { strfreeA( sortkey->sk_attrtype ); strfreeA( sortkey->sk_matchruleoid ); - HeapFree( GetProcessHeap(), 0, sortkey ); + heap_free( sortkey ); } } @@ -778,7 +737,7 @@ static inline void sortkeyfreeW( LDAPSortKeyW *sortkey ) { strfreeW( sortkey->sk_attrtype ); strfreeW( sortkey->sk_matchruleoid ); - HeapFree( GetProcessHeap(), 0, sortkey ); + heap_free( sortkey ); } } @@ -788,7 +747,7 @@ static inline void sortkeyfreeU( LDAPSortKey *sortkey ) { strfreeU( sortkey->attributeType ); strfreeU( sortkey->orderingRule ); - HeapFree( GetProcessHeap(), 0, sortkey ); + heap_free( sortkey ); } } @@ -814,9 +773,7 @@ static inline LDAPSortKeyW **sortkeyarrayAtoW( LDAPSortKeyA **sortkeyarray ) if (sortkeyarray) { size = sizeof(LDAPSortKeyW*) * (sortkeyarraylenA( sortkeyarray ) + 1); - sortkeyarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (sortkeyarrayW) + if ((sortkeyarrayW = heap_alloc( size ))) { LDAPSortKeyA **p = sortkeyarray; LDAPSortKeyW **q = sortkeyarrayW; @@ -836,9 +793,7 @@ static inline LDAPSortKey **sortkeyarrayWtoU( LDAPSortKeyW **sortkeyarray ) if (sortkeyarray) { size = sizeof(LDAPSortKey*) * (sortkeyarraylenW( sortkeyarray ) + 1); - sortkeyarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (sortkeyarrayU) + if ((sortkeyarrayU = heap_alloc( size ))) { LDAPSortKeyW **p = sortkeyarray; LDAPSortKey **q = sortkeyarrayU; @@ -856,7 +811,7 @@ static inline void sortkeyarrayfreeW( LDAPSortKeyW **sortkeyarray ) { LDAPSortKeyW **p = sortkeyarray; while (*p) sortkeyfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, sortkeyarray ); + heap_free( sortkeyarray ); } } @@ -866,7 +821,7 @@ static inline void sortkeyarrayfreeU( LDAPSortKey **sortkeyarray ) { LDAPSortKey **p = sortkeyarray; while (*p) sortkeyfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, sortkeyarray ); + heap_free( sortkeyarray ); } } #endif /* HAVE_LDAP */ -- 2.11.0

1 0

[PATCH] fusion: Use the global memory allocation helpers.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/fusion/asmcache.c | 50 +++++++++++++++++++++--------------------------- dlls/fusion/asmenum.c | 17 +++++++--------- dlls/fusion/asmname.c | 34 ++++++++++++++++---------------- dlls/fusion/assembly.c | 39 +++++++++++++++---------------------- dlls/fusion/fusionpriv.h | 4 ++-- 5 files changed, 62 insertions(+), 82 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 6cc6602dcc..668aa8777e 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -63,9 +63,7 @@ static BOOL create_full_path(LPCWSTR path) BOOL ret = TRUE; int len; - new_path = HeapAlloc(GetProcessHeap(), 0, (strlenW(path) + 1) * sizeof(WCHAR)); - if (!new_path) - return FALSE; + if (!(new_path = heap_alloc((strlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; strcpyW(new_path, path); @@ -103,7 +101,7 @@ static BOOL create_full_path(LPCWSTR path) new_path[len] = '\\'; } - HeapFree(GetProcessHeap(), 0, new_path); + heap_free(new_path); return ret; } @@ -200,7 +198,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) if (!refCount) { CloseHandle( cache->lock ); - HeapFree( GetProcessHeap(), 0, cache ); + heap_free( cache ); } return refCount; } @@ -258,7 +256,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) goto done; - if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; @@ -293,7 +291,7 @@ done: IAssemblyName_Release( asmname ); if (next) IAssemblyName_Release( next ); if (asmenum) IAssemblyEnum_Release( asmenum ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path ); cache_unlock( cache ); return hr; } @@ -375,9 +373,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *ppAsmItem = NULL; - item = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheItemImpl)); - if (!item) - return E_OUTOFMEMORY; + if (!(item = heap_alloc(sizeof(*item)))) return E_OUTOFMEMORY; item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; item->ref = 1; @@ -400,22 +396,22 @@ static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_ DWORD len = strlenW( filename ); HRESULT hr = S_OK; - if (!(src_file = HeapAlloc( GetProcessHeap(), 0, (src_len + len + 1) * sizeof(WCHAR) ))) + if (!(src_file = heap_alloc( (src_len + len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); strcpyW( src_file + src_len, filename ); - if (!(dst_file = HeapAlloc( GetProcessHeap(), 0, (dst_len + len + 1) * sizeof(WCHAR) ))) + if (!(dst_file = heap_alloc( (dst_len + len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, src_file ); + heap_free( src_file ); return E_OUTOFMEMORY; } memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); strcpyW( dst_file + dst_len, filename ); if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); - HeapFree( GetProcessHeap(), 0, src_file ); - HeapFree( GetProcessHeap(), 0, dst_file ); + heap_free( src_file ); + heap_free( dst_file ); return hr; } @@ -488,7 +484,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); dst_len += strlenW(asmdir) + strlenW(name) + strlenW(version) + strlenW(token); - if (!(dst_dir = HeapAlloc(GetProcessHeap(), 0, dst_len * sizeof(WCHAR)))) + if (!(dst_dir = heap_alloc(dst_len * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -528,13 +524,13 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, } done: - HeapFree(GetProcessHeap(), 0, name); - HeapFree(GetProcessHeap(), 0, token); - HeapFree(GetProcessHeap(), 0, version); - HeapFree(GetProcessHeap(), 0, asmpath); - HeapFree(GetProcessHeap(), 0, dst_dir); - for (i = 0; i < count; i++) HeapFree(GetProcessHeap(), 0, external_files[i]); - HeapFree(GetProcessHeap(), 0, external_files); + heap_free(name); + heap_free(token); + heap_free(version); + heap_free(asmpath); + heap_free(dst_dir); + for (i = 0; i < count; i++) heap_free(external_files[i]); + heap_free(external_files); assembly_release(assembly); cache_unlock( cache ); return hr; @@ -565,16 +561,14 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved *ppAsmCache = NULL; - cache = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheImpl)); - if (!cache) - return E_OUTOFMEMORY; + if (!(cache = heap_alloc(sizeof(*cache)))) return E_OUTOFMEMORY; cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - HeapFree( GetProcessHeap(), 0, cache ); + heap_free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *ppAsmCache = &cache->IAssemblyCache_iface; @@ -627,7 +621,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); if (!refCount) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return refCount; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 4a5dadd994..ba86818a2c 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -106,10 +106,10 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) list_remove(&asmname->entry); IAssemblyName_Release(asmname->name); - HeapFree(GetProcessHeap(), 0, asmname); + heap_free(asmname); } - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return refCount; @@ -355,8 +355,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } sprintfW(disp, name_fmt, parent, version, token); - asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); - if (!asmname) + if (!(asmname = heap_alloc(sizeof(*asmname)))) { hr = E_OUTOFMEMORY; break; @@ -366,7 +365,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, CANOF_PARSE_DISPLAY_NAME, NULL); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, asmname); + heap_free(asmname); break; } @@ -374,7 +373,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, if (FAILED(hr)) { IAssemblyName_Release(asmname->name); - HeapFree(GetProcessHeap(), 0, asmname); + heap_free(asmname); break; } @@ -477,9 +476,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (dwFlags == 0 || dwFlags == ASM_CACHE_ROOT) return E_INVALIDARG; - asmenum = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyEnumImpl)); - if (!asmenum) - return E_OUTOFMEMORY; + if (!(asmenum = heap_alloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; @@ -490,7 +487,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, hr = enumerate_gac(asmenum, pName); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, asmenum); + heap_free(asmenum); return hr; } } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index ea104349b3..c5d07009a3 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -115,12 +115,12 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) if (!refCount) { - HeapFree(GetProcessHeap(), 0, This->path); - HeapFree(GetProcessHeap(), 0, This->displayname); - HeapFree(GetProcessHeap(), 0, This->name); - HeapFree(GetProcessHeap(), 0, This->culture); - HeapFree(GetProcessHeap(), 0, This->procarch); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->path); + heap_free(This->displayname); + heap_free(This->name); + heap_free(This->culture); + heap_free(This->procarch); + heap_free(This); } return refCount; @@ -663,7 +663,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) BOOL quoted = FALSE; unsigned int i = 0; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; if (*p == '\"') { quoted = TRUE; @@ -672,7 +672,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) while (*p && *p != '\"') ret[i++] = *p++; if ((quoted && *p != '\"') || (!quoted && *p == '\"')) { - HeapFree( GetProcessHeap(), 0, ret ); + heap_free( ret ); return NULL; } ret[i] = 0; @@ -769,7 +769,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam hr = parse_procarch( name, name->procarch ); } - HeapFree( GetProcessHeap(), 0, value ); + heap_free( value ); if (FAILED(hr)) goto done; @@ -778,13 +778,13 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam } done: - HeapFree(GetProcessHeap(), 0, save); + heap_free(save); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, name->displayname); - HeapFree(GetProcessHeap(), 0, name->name); - HeapFree(GetProcessHeap(), 0, name->culture); - HeapFree(GetProcessHeap(), 0, name->procarch); + heap_free(name->displayname); + heap_free(name->name); + heap_free(name->culture); + heap_free(name->procarch); } return hr; } @@ -809,9 +809,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, (!szAssemblyName || !*szAssemblyName)) return E_INVALIDARG; - name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAssemblyNameImpl)); - if (!name) - return E_OUTOFMEMORY; + if (!(name = heap_alloc_zero(sizeof(*name)))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; @@ -819,7 +817,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, hr = parse_display_name(name, szAssemblyName); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, name); + heap_free(name); return hr; } diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index c2f98ecf72..ec380ef442 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -539,9 +539,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); - if (!assembly->metadatahdr) - return E_OUTOFMEMORY; + if (!(assembly->metadatahdr = heap_alloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); @@ -646,9 +644,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); - if (!assembly) - return E_OUTOFMEMORY; + if (!(assembly = heap_alloc_zero(sizeof(*assembly)))) return E_OUTOFMEMORY; assembly->path = strdupW(file); if (!assembly->path) @@ -699,12 +695,12 @@ HRESULT assembly_release(ASSEMBLY *assembly) if (!assembly) return S_OK; - HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); - HeapFree(GetProcessHeap(), 0, assembly->path); + heap_free(assembly->metadatahdr); + heap_free(assembly->path); UnmapViewOfFile(assembly->data); CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); - HeapFree(GetProcessHeap(), 0, assembly); + heap_free(assembly); return S_OK; } @@ -717,8 +713,8 @@ static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if ((cpy = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); + if ((cpy = heap_alloc(len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); return cpy; } @@ -752,7 +748,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { - LPWSTR cpy = HeapAlloc(GetProcessHeap(), 0, (strlenW(assembly->path) + 1) * sizeof(WCHAR)); + WCHAR *cpy = heap_alloc((strlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; if (cpy) strcpyW(cpy, assembly->path); @@ -779,8 +775,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) if (!asmtbl) return E_FAIL; - *version = HeapAlloc(GetProcessHeap(), 0, sizeof(format) + 4 * strlen("65535") * sizeof(WCHAR)); - if (!*version) + if (!(*version = heap_alloc(sizeof(format) + 4 * strlen("65535") * sizeof(WCHAR)))) return E_OUTOFMEMORY; sprintfW(*version, format, asmtbl->MajorVersion, asmtbl->MinorVersion, @@ -852,8 +847,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) if (!CryptGetHashParam(hash, HP_HASHVAL, NULL, &size, 0)) return E_FAIL; - hashdata = HeapAlloc(GetProcessHeap(), 0, size); - if (!hashdata) + if (!(hashdata = heap_alloc(size))) { hr = E_OUTOFMEMORY; goto done; @@ -865,8 +859,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; - tok = HeapAlloc(GetProcessHeap(), 0, (TOKEN_LENGTH + 1) * sizeof(WCHAR)); - if (!tok) + if (!(tok = heap_alloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -878,7 +871,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) hr = S_OK; done: - HeapFree(GetProcessHeap(), 0, hashdata); + heap_free(hashdata); CryptDestroyHash(hash); CryptReleaseContext(crypt, 0); @@ -913,9 +906,7 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c if (num_rows <= 0) return S_OK; - ret = HeapAlloc(GetProcessHeap(), 0, num_rows * sizeof(WCHAR *)); - if (!ret) - return E_OUTOFMEMORY; + if (!(ret = heap_alloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; for (i = 0; i < num_rows; i++) { @@ -928,8 +919,8 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c ret[i] = assembly_dup_str(assembly, idx); if (!ret[i]) { - for (; i >= 0; i--) HeapFree(GetProcessHeap(), 0, ret[i]); - HeapFree(GetProcessHeap(), 0, ret); + for (; i >= 0; i--) heap_free(ret[i]); + heap_free(ret); return E_OUTOFMEMORY; } ptr += assembly->stringsz; /* skip Name field */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 95b1282050..22de4ca784 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "winver.h" +#include "wine/heap.h" #include <pshpack1.h> @@ -448,8 +449,7 @@ static inline LPWSTR strdupW(LPCWSTR src) if (!src) return NULL; - dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dest) + if ((dest = heap_alloc((lstrlenW(src) + 1) * sizeof(WCHAR)))) lstrcpyW(dest, src); return dest; -- 2.11.0

1 0

[PATCH] bcrypt: Use the global memory allocation helpers.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c064b63752..72b5df225a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -39,6 +39,7 @@ #include "bcrypt_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/library.h" #include "wine/unicode.h" @@ -294,7 +295,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR return STATUS_NOT_IMPLEMENTED; } - if (!(alg = HeapAlloc( GetProcessHeap(), 0, sizeof(*alg) ))) return STATUS_NO_MEMORY; + if (!(alg = heap_alloc( sizeof(*alg) ))) return STATUS_NO_MEMORY; alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; @@ -310,7 +311,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD fl TRACE( "%p, %08x\n", handle, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - HeapFree( GetProcessHeap(), 0, alg ); + heap_free( alg ); return STATUS_SUCCESS; } @@ -630,7 +631,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash) ))) return STATUS_NO_MEMORY; + if (!(hash = heap_alloc( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; hash->hmac = alg->hmac; @@ -662,7 +663,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL end: if (status != STATUS_SUCCESS) { - HeapFree( GetProcessHeap(), 0, hash ); + heap_free( hash ); return status; } @@ -682,7 +683,7 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND if (!handle_copy) return STATUS_INVALID_PARAMETER; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) ))) + if (!(hash_copy = heap_alloc( sizeof(*hash_copy) ))) return STATUS_NO_MEMORY; memcpy( hash_copy, hash_orig, sizeof(*hash_orig) ); @@ -698,7 +699,7 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) TRACE( "%p\n", handle ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; - HeapFree( GetProcessHeap(), 0, hash ); + heap_free( hash ); return STATUS_SUCCESS; } @@ -804,7 +805,7 @@ static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, } if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); key->alg_id = id; @@ -892,8 +893,8 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); - HeapFree( GetProcessHeap(), 0, key->secret ); - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key->secret ); + heap_free( key ); return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 @@ -923,7 +924,7 @@ static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, } if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); key->alg_id = id; @@ -1000,8 +1001,8 @@ static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); - HeapFree( GetProcessHeap(), 0, key->secret ); - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key->secret ); + heap_free( key ); return STATUS_SUCCESS; } #else @@ -1057,12 +1058,12 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) return STATUS_NO_MEMORY; + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; if ((status = key_init( key, alg->id, secret, secret_len ))) { - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key ); return status; } @@ -1128,11 +1129,11 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; memcpy( buf, src, bytes_left ); memset( buf + bytes_left, key->block_size - bytes_left, key->block_size - bytes_left ); status = key_encrypt( key, buf, key->block_size, dst, key->block_size ); - HeapFree( GetProcessHeap(), 0, buf ); + heap_free( buf ); } return status; @@ -1189,7 +1190,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; status = key_decrypt( key, src, key->block_size, buf, key->block_size ); if (!status && buf[ key->block_size - 1 ] <= key->block_size) { @@ -1199,7 +1200,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp } else status = STATUS_UNSUCCESSFUL; /* FIXME: invalid padding */ - HeapFree( GetProcessHeap(), 0, buf ); + heap_free( buf ); } return status; -- 2.11.0

1 0

[website] German translation for release 3.2
by Julian Rüger 20 Feb '18

20 Feb '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.1
by Julian Rüger 20 Feb '18

20 Feb '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] shell32/tests: Increase 6 buffers to avoid potential overflows via sprintf (GCC).
by Gerald Pfeifer 20 Feb '18

20 Feb '18

This sheds off 10 warnings from builds with current versions of GCC. The pattern is printing a pathname plus some additional text into a buffer the size of a pathname. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/shell32/tests/shlexec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9db12ce42a..4f00db44e6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1654,7 +1654,7 @@ static void test_argify(void) static void test_filename(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH+16]; const filename_tests_t* test; char* c; INT_PTR rc; @@ -1920,7 +1920,7 @@ static void test_fileurls(void) static void test_urls(void) { - char url[MAX_PATH]; + char url[MAX_PATH+15]; INT_PTR rc; if (!create_test_class("fakeproto", FALSE)) @@ -2015,7 +2015,7 @@ static void test_urls(void) static void test_find_executable(void) { char notepad_path[MAX_PATH]; - char filename[MAX_PATH]; + char filename[MAX_PATH+17]; char command[MAX_PATH]; const filename_tests_t* test; INT_PTR rc; @@ -2433,7 +2433,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) static void test_dde(void) { - char filename[MAX_PATH], defApplication[MAX_PATH]; + char filename[MAX_PATH+14], defApplication[MAX_PATH]; const dde_tests_t* test; char params[1024]; INT_PTR rc; @@ -2600,7 +2600,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) static void test_dde_default_app(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH+15]; HSZ hszApplication; dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_default_app_tests_t* test; @@ -2702,7 +2702,7 @@ static void init_test(void) { HMODULE hdll; HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*); - char filename[MAX_PATH]; + char filename[MAX_PATH+26]; WCHAR lnkfile[MAX_PATH]; char params[1024]; const char* const * testfile; -- 2.15.1

2 1

[PATCH] comctl32/tests: Replace some asserts with regular test calls
by Nikolay Sivov 20 Feb '18

20 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 67592423af..23c2e2b2ec 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -292,10 +291,10 @@ static void test_ownerdraw(void) RECT rc; parent = create_parent(); - assert(parent); + ok(parent != NULL, "Failed to create parent window.\n"); hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - assert(hLB); + ok(hLB != NULL, "Failed to create listbox window.\n"); SetForegroundWindow(hLB); UpdateWindow(hLB); @@ -334,7 +333,7 @@ static void test_LB_SELITEMRANGE(void) INT ret; hLB = create_listbox(LBS_EXTENDEDSEL, 0); - assert(hLB); + ok(hLB != NULL, "Failed to create listbox window.\n"); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); @@ -594,7 +593,7 @@ static void test_listbox_LB_DIR(void) */ hList = CreateWindowA( WC_LISTBOXA, "list test", WS_VISIBLE|WS_POPUP, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); - assert(hList); + ok(hList != NULL, "Failed to create listbox window.\n"); /* Test for standard usage */ @@ -1076,6 +1075,7 @@ static void test_listbox_dlgdir(void) char * p; char driveletter; HANDLE file; + BOOL ret; file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); @@ -1088,7 +1088,8 @@ static void test_listbox_dlgdir(void) */ hInst = GetModuleHandleA(0); - if (!RegisterListboxWindowClass(hInst)) assert(0); + ret = RegisterListboxWindowClass(hInst); + ok(ret, "Failed to register test class.\n"); hWnd = CreateWindowA("ListboxContainerClass", "ListboxContainerClass", WS_OVERLAPPEDWINDOW | WS_VISIBLE, -- 2.16.1

2 1

[PATCH] shell32/tests: Use the global memory allocation helpers
by Nikolay Sivov 20 Feb '18

20 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/assoc.c | 5 +++-- dlls/shell32/tests/autocomplete.c | 8 +++++--- dlls/shell32/tests/ebrowser.c | 13 +++++++------ dlls/shell32/tests/msg.h | 13 ++++++------- dlls/shell32/tests/shelldispatch.c | 6 ++++-- dlls/shell32/tests/shelllink.c | 6 ++++-- dlls/shell32/tests/shlexec.c | 10 ++++++---- dlls/shell32/tests/shlfolder.c | 19 ++++++++++--------- dlls/shell32/tests/shlview.c | 21 +++++++++------------ 9 files changed, 54 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 2cd06d2c08..5e93750229 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -25,6 +25,7 @@ #include "shlguid.h" #include "shobjidl.h" +#include "wine/heap.h" #include "wine/test.h" @@ -121,7 +122,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW return; } - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + buffer = heap_alloc(len * sizeof(WCHAR)); ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); ok_(__FILE__, line)(hr == S_OK, "GetString returned 0x%x, expected S_OK\n", hr); @@ -133,7 +134,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW } IQueryAssociations_Release(assoc); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static void test_IQueryAssociations_GetString(void) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 99b394b281..859734ce59 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include <wine/test.h> #include <stdarg.h> #include "windows.h" @@ -29,6 +28,9 @@ #include "initguid.h" #include "shldisp.h" +#include "wine/heap.h" +#include "wine/test.h" + static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; @@ -268,7 +270,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface) ULONG ref = InterlockedDecrement(&this->ref); if (!ref) - HeapFree(GetProcessHeap(), 0, this); + heap_free(this); return ref; } @@ -335,7 +337,7 @@ static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int cou { struct string_enumerator *object; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; object->ref = 1; object->data = suggestions; diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 7db584225e..3e89b90439 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -26,6 +26,7 @@ #include "shlobj.h" #include "shlwapi.h" +#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -239,7 +240,7 @@ static ULONG WINAPI IExplorerPaneVisibility_fnRelease(IExplorerPaneVisibility *i ULONG ref = InterlockedDecrement(&This->ref); if(!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -285,7 +286,7 @@ static IExplorerPaneVisibilityImpl *create_explorerpanevisibility(void) { IExplorerPaneVisibilityImpl *epv; - epv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IExplorerPaneVisibilityImpl)); + epv = heap_alloc_zero(sizeof(*epv)); epv->IExplorerPaneVisibility_iface.lpVtbl = &epvvt; epv->ref = 1; @@ -328,7 +329,7 @@ static ULONG WINAPI ICommDlgBrowser3_fnRelease(ICommDlgBrowser3 *iface) ULONG ref = InterlockedDecrement(&This->ref); if(!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -439,7 +440,7 @@ static ICommDlgBrowser3Impl *create_commdlgbrowser3(void) { ICommDlgBrowser3Impl *cdb; - cdb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ICommDlgBrowser3Impl)); + cdb = heap_alloc_zero(sizeof(*cdb)); cdb->ICommDlgBrowser3_iface.lpVtbl = &cdbvtbl; cdb->ref = 1; @@ -497,7 +498,7 @@ static ULONG WINAPI IServiceProvider_fnRelease(IServiceProvider *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -548,7 +549,7 @@ static const IServiceProviderVtbl spvtbl = static IServiceProviderImpl *create_serviceprovider(void) { - IServiceProviderImpl *sp = HeapAlloc(GetProcessHeap(), 0, sizeof(IServiceProviderImpl)); + IServiceProviderImpl *sp = heap_alloc(sizeof(*sp)); sp->IServiceProvider_iface.lpVtbl = &spvtbl; sp->ref = 1; return sp; diff --git a/dlls/shell32/tests/msg.h b/dlls/shell32/tests/msg.h index a457fd4fce..74354d1740 100644 --- a/dlls/shell32/tests/msg.h +++ b/dlls/shell32/tests/msg.h @@ -20,6 +20,8 @@ #include <assert.h> #include <windows.h> + +#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -66,16 +68,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - msg_seq->size * sizeof (struct message)); + msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - msg_seq->sequence, - msg_seq->size * sizeof (struct message)); + msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -92,7 +91,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, msg_seq->sequence); + heap_free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -290,5 +289,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct msg_sequence)); + seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 64a695dc0d..cc00757840 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -26,6 +26,8 @@ #include "shlobj.h" #include "shlwapi.h" #include "winsvc.h" + +#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -276,7 +278,7 @@ static void test_namespace(void) GetFullPathNameW(winetestW, MAX_PATH, tempW, NULL); len = GetLongPathNameW(tempW, NULL, 0); - long_pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + long_pathW = heap_alloc(len * sizeof(WCHAR)); GetLongPathNameW(tempW, long_pathW, len); V_VT(&var) = VT_BSTR; @@ -348,7 +350,7 @@ static void test_namespace(void) SysFreeString(V_BSTR(&var)); } - HeapFree(GetProcessHeap(), 0, long_pathW); + heap_free(long_pathW); RemoveDirectoryW(winetestW); SetCurrentDirectoryW(curW); IShellDispatch_Release(sd); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 4f1629090f..a9288cc798 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -28,6 +28,8 @@ #include "shlobj.h" #include "shellapi.h" #include "commoncontrols.h" + +#include "wine/heap.h" #include "wine/test.h" #include "shell32_test.h" @@ -83,12 +85,12 @@ static LPITEMIDLIST path_to_pidl(const char* path) int len; len=MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); - pathW=HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + pathW = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); r=pSHILCreateFromPath(pathW, &pidl, NULL); ok(r == S_OK, "SHILCreateFromPath failed (0x%08x)\n", r); - HeapFree(GetProcessHeap(), 0, pathW); + heap_free(pathW); } return pidl; } diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9db12ce42a..7cdae878db 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -44,6 +44,8 @@ #include "shellapi.h" #include "shlwapi.h" #include "ddeml.h" + +#include "wine/heap.h" #include "wine/test.h" #include "shell32_test.h" @@ -759,7 +761,7 @@ static LSTATUS myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) if (dwMaxLen > sizeof(szNameBuf)/sizeof(CHAR)) { /* Name too big: alloc a buffer for it */ - if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(CHAR)))) + if (!(lpszName = heap_alloc(dwMaxLen*sizeof(CHAR)))) { ret = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; @@ -794,7 +796,7 @@ static LSTATUS myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) cleanup: /* Free buffer if allocated */ if (lpszName != szNameBuf) - HeapFree( GetProcessHeap(), 0, lpszName); + heap_free(lpszName); if(lpszSubKey) RegCloseKey(hSubKey); return ret; @@ -854,11 +856,11 @@ static void create_test_verb_dde(const char* classname, const char* verb, } else { - cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1); + cmd = heap_alloc(strlen(argv0) + 10 + strlen(child_file) + 2 + strlen(cmdtail) + 1); sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail); rc=RegSetValueExA(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmd, strlen(cmd)+1); ok(rc == ERROR_SUCCESS, "setting command failed with %d\n", rc); - HeapFree(GetProcessHeap(), 0, cmd); + heap_free(cmd); } if (ddeexec) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 716a486515..bd4bba2236 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -37,6 +37,7 @@ #include "ocidl.h" #include "oleauto.h" +#include "wine/heap.h" #include "wine/test.h" #include <initguid.h> @@ -75,7 +76,7 @@ static WCHAR *make_wstr(const char *str) if(!len || len < 0) return NULL; - ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ret = heap_alloc(len * sizeof(WCHAR)); if(!ret) return NULL; @@ -3049,7 +3050,7 @@ static void test_SHGetIDListFromObject(void) hres = pSHGetIDListFromObject(NULL, &pidl); ok(hres == E_NOINTERFACE, "Got %x\n", hres); - punkimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(IUnknownImpl)); + punkimpl = heap_alloc(sizeof(*punkimpl)); punkimpl->IUnknown_iface.lpVtbl = &vt_IUnknown; punkimpl->ifaces = ifaces; punkimpl->unknown = 0; @@ -3066,7 +3067,7 @@ static void test_SHGetIDListFromObject(void) "interface not requested.\n"); ok(!punkimpl->unknown, "Got %d unknown.\n", punkimpl->unknown); - HeapFree(GetProcessHeap(), 0, punkimpl); + heap_free(punkimpl); pidl_desktop = NULL; SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); @@ -3220,7 +3221,7 @@ static void test_SHGetItemFromObject(void) hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)&punk); ok(hres == E_NOINTERFACE, "Got 0x%08x\n", hres); - punkimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(IUnknownImpl)); + punkimpl = heap_alloc(sizeof(*punkimpl)); punkimpl->IUnknown_iface.lpVtbl = &vt_IUnknown; punkimpl->ifaces = ifaces; punkimpl->unknown = 0; @@ -3238,7 +3239,7 @@ static void test_SHGetItemFromObject(void) "interface not requested.\n"); ok(!punkimpl->unknown, "Got %d unknown.\n", punkimpl->unknown); - HeapFree(GetProcessHeap(), 0, punkimpl); + heap_free(punkimpl); /* Test IShellItem */ hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IShellItem, (void**)&psi); @@ -4858,8 +4859,8 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L path2 = make_wstr(exp_data->path_2); verify_pidl(pidls[0], path1); verify_pidl(pidls[1], path2); - HeapFree(GetProcessHeap(), 0, path1); - HeapFree(GetProcessHeap(), 0, path2); + heap_free(path1); + heap_free(path2); exp_data->missing_events--; @@ -4966,8 +4967,8 @@ static void test_SHChangeNotify(BOOL test_new_delivery) do_events(); ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); - HeapFree(GetProcessHeap(), 0, path1); - HeapFree(GetProcessHeap(), 0, path2); + heap_free(path1); + heap_free(path2); } } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f31d16e5e2..f5d96c8d44 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -38,6 +38,7 @@ #include "initguid.h" +#include "wine/heap.h" #include "wine/test.h" #include "msg.h" @@ -149,7 +150,7 @@ static IDataObject* IDataObjectImpl_Construct(void) { IDataObjectImpl *obj; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + obj = heap_alloc(sizeof(*obj)); obj->IDataObject_iface.lpVtbl = &IDataObjectImpl_Vtbl; obj->ref = 1; @@ -163,7 +164,7 @@ static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDataObject)) { - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; } if(*ppvObj) @@ -187,10 +188,8 @@ static ULONG WINAPI IDataObjectImpl_Release(IDataObject * iface) ULONG ref = InterlockedDecrement(&This->ref); if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - return 0; - } + heap_free(This); + return ref; } @@ -276,7 +275,7 @@ static IShellBrowser* IShellBrowserImpl_Construct(void) { IShellBrowserImpl *browser; - browser = HeapAlloc(GetProcessHeap(), 0, sizeof(*browser)); + browser = heap_alloc(sizeof(*browser)); browser->IShellBrowser_iface.lpVtbl = &IShellBrowserImpl_Vtbl; browser->ref = 1; @@ -295,7 +294,7 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, IsEqualIID(riid, &IID_IOleWindow) || IsEqualIID(riid, &IID_IShellBrowser)) { - *ppvObj = This; + *ppvObj = &This->IShellBrowser_iface; } if(*ppvObj) @@ -319,10 +318,8 @@ static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) ULONG ref = InterlockedDecrement(&This->ref); if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - return 0; - } + heap_free(This); + return ref; } -- 2.16.1

2 1

[PATCH] ddraw/tests: Recognize mipmap brokenness on Windows 8 and 10
by Alex Henrie 20 Feb '18

20 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- There appear to be off-by-one errors too in certain code paths. dlls/ddraw/tests/d3d.c | 75 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 77836fd627..a010362867 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include <limits.h> +#include <math.h> #include "initguid.h" #include "ddraw.h" #include "d3d.h" @@ -1418,7 +1419,7 @@ static void DeviceLoadTest(void) RECT loadrect; POINT loadpoint; int i, i1, i2; - unsigned diff_count = 0, diff_count2 = 0; + unsigned diff_count = 0, diff_count2 = 0, diff_count3 = 0; unsigned x, y; BOOL load_mip_subset_broken = FALSE; IDirectDrawPalette *palettes[5]; @@ -1939,6 +1940,7 @@ static void DeviceLoadTest(void) { diff_count = 0; diff_count2 = 0; + diff_count3 = 0; memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); ddsd.dwSize = sizeof(ddsd); @@ -1953,6 +1955,9 @@ static void DeviceLoadTest(void) for (x = 0; x < ddsd.dwWidth; x++) { DWORD color = *textureRow++; + DWORD r = (color & 0xff0000) >> 16; + DWORD g = (color & 0xff00) >> 8; + DWORD b = (color & 0xff); if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) @@ -1961,10 +1966,6 @@ static void DeviceLoadTest(void) } else { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - if (r != (0xf0 | i1) || g != x + loadrect.left - loadpoint.x || b != y + loadrect.top - loadpoint.y) diff_count++; } @@ -1978,21 +1979,29 @@ static void DeviceLoadTest(void) } else { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - if (r != (0xf0 | i1) || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; } + + /* some windows 8 and 10 machines copy the wrong mip */ + if (x < loadpoint.x / 16 || x >= ceil((loadpoint.x + loadrect.right - loadrect.left) / 16.0) || + y < loadpoint.y / 16 || y >= ceil((loadpoint.y + loadrect.bottom - loadrect.top) / 16.0)) + { + if (color & 0xffffff) diff_count3++; + } + else + { + if (r != (0xf0 | (i1 + 4)) || g != x || b != y) diff_count3++; + } } } hr = IDirectDrawSurface7_Unlock(texture_levels[1][i1], NULL); ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - ok(diff_count == 0 || diff_count2 == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", - MIN(diff_count, diff_count2), i1); + ok(diff_count == 0 || diff_count2 == 0 || broken(diff_count3 == 0), + "Unexpected destination texture level pixels; %u differences, %d level\n", + MIN(MIN(diff_count, diff_count2), diff_count3), i1); loadpoint.x /= 2; loadpoint.y /= 2; @@ -2153,6 +2162,9 @@ static void DeviceLoadTest(void) for (x = 0; x < ddsd.dwWidth; x++) { DWORD color = *textureRow++; + DWORD r = (color & 0xff0000) >> 16; + DWORD g = (color & 0xff00) >> 8; + DWORD b = (color & 0xff); if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) @@ -2161,13 +2173,20 @@ static void DeviceLoadTest(void) } else { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - if (r != (0xf0 | 2) || g != x + loadrect.left - loadpoint.x || b != y + loadrect.top - loadpoint.y) diff_count++; } + + /* some windows 8 and 10 machines copy the wrong mip */ + if (x < loadpoint.x / 16 || x >= (loadpoint.x + loadrect.right - loadrect.left) / 16 || + y < loadpoint.y / 16 || y >= (loadpoint.y + loadrect.bottom - loadrect.top) / 16) + { + if (color & 0xffffff) diff_count3++; + } + else + { + if (r != 0xf7 || g != x || b != y) diff_count3++; + } } } } @@ -2175,7 +2194,9 @@ static void DeviceLoadTest(void) hr = IDirectDrawSurface7_Unlock(texture_levels[1][0], NULL); ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - ok(diff_count == 0, "Unexpected destination texture level pixels; %u differences\n", diff_count); + ok(diff_count == 0 || broken(diff_count3 == 0), + "Unexpected destination texture level pixels; %u differences\n", + MIN(diff_count, diff_count3)); for (i = 0; i < 2; i++) { @@ -2301,6 +2322,9 @@ static void DeviceLoadTest(void) for (x = 0; x < ddsd.dwWidth; x++) { DWORD color = *textureRow++; + DWORD r = (color & 0xff0000) >> 16; + DWORD g = (color & 0xff00) >> 8; + DWORD b = (color & 0xff); if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) @@ -2309,20 +2333,29 @@ static void DeviceLoadTest(void) } else { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - if (r != (0xf0 | i1) || g != x + loadrect.left - loadpoint.x || b != y + loadrect.top - loadpoint.y) diff_count++; } + + /* some windows 8 and 10 machines copy the wrong mip */ + if (x < loadpoint.x / 16 || x >= ceil((loadpoint.x + loadrect.right - loadrect.left) / 16.0) || + y < loadpoint.y / 16 || y >= ceil((loadpoint.y + loadrect.bottom - loadrect.top) / 16.0)) + { + if (color & 0xffffff) diff_count3++; + } + else + { + if (r != (0xf0 | (i + 4)) || g != x || b != y) diff_count3++; + } } } hr = IDirectDrawSurface7_Unlock(texture_levels[1][i], NULL); ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - ok(diff_count == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", diff_count, i1); + ok(diff_count == 0 || broken(diff_count3 == 0), + "Unexpected destination texture level pixels; %u differences at %d level\n", + MIN(diff_count, diff_count3), i1); i++; } -- 2.16.2

1 0

[PATCH] iphlpapi: Also check the IP address family before treating it as an IPv6 one.
by Dmitry Timoshkov 20 Feb '18

20 Feb '18

On my local network there is no IPv6 DNS servers, and sin6_family == AF_INET. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 48a83870a5..97284edbe6 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1300,7 +1300,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) for (i = 0, addr = servers; addr < (servers + num) && i < _res.nscount; i++) { #ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 - if (_res._u._ext.nsaddrs[i]) + if (_res._u._ext.nsaddrs[i] && _res._u._ext.nsaddrs[i]->sin6_family == AF_INET6) { if (ip4_only) continue; sockaddr_in6_to_WS_storage( addr, _res._u._ext.nsaddrs[i] ); -- 2.16.1

1 0

Re: [PATCH] ping: Implemented -n functionality.
by Isira Seneviratne 20 Feb '18

20 Feb '18

How do I link the ws2_32 dll? On Feb 20, 2018 1:47 AM, "Marvin" <testbot(a)winehq.org> wrote: Thank you for your contribution to Wine! This is an automated notification to let you know that your patch has been reviewed and its status set to "Rejected". This means that the patch has been rejected by a reviewer. You should have received a mail explaining why it was rejected. You need to fix the issue and resend the patch, or if you are convinced that your patch is good as is, you should reply to the rejection message with your counterarguments. If you do not understand the reason for this status, disagree with our assessment, or are simply not sure how to proceed next, please ask for clarification by replying to this email.

2 2

[PATCH 1/9] [v2] include: Define ipv6_mreq structure.
by Owen Rudge 19 Feb '18

19 Feb '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- include/ws2ipdef.h | 6 ++++++ 1 file changed, 6 insertions(+)

2 1

[PATCH 2/9] [v2] wsdapi/tests: Add test for Publish
by Owen Rudge 19 Feb '18

19 Feb '18

Initial test for the IWSDiscoveryPublisher::Publish function. Further tests will follow when this is committed. Due to the nature of the test, this patch includes a fair bit of code that will also be used by the Wine implementation of this function (mainly the functions join_multicast_group, set_send_interface, resolve_address, and with some minor modifications start_listening and start_listening_on_all_addresses). Would it be acceptable to store this common code in a header (or .c) file in the top-level wsdapi directory and #include "../network_common.h" from the tests to avoid duplication, or is the approach I've taken in this patch of duplicating the code best? Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 359 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 357 insertions(+), 4 deletions(-)

1 0

[PATCH 2/2] wsdapi/tests: Add test for Publish
by Owen Rudge 19 Feb '18

19 Feb '18

Initial test for the IWSDiscoveryPublisher::Publish function. Further tests will follow when this is committed. Due to the nature of the test, this patch includes a fair bit of code that will also be used by the Wine implementation of this function (mainly the functions join_multicast_group, set_send_interface, resolve_address, and with some minor modifications start_listening and start_listening_on_all_addresses). Would it be acceptable to store this common code in a header (or .c) file in the top-level wsdapi directory and #include "../network_common.h" from the tests to avoid duplication, or is the approach I've taken in this patch of duplicating the code best? Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 358 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 357 insertions(+), 3 deletions(-)

2 1

[PATCH 1/2] include: Define ipv6_mreq structure.
by Owen Rudge 19 Feb '18

19 Feb '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- include/ws2ipdef.h | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH] ws2_32: Only set error codes for triggered events in WSAEnumNetworkEvents().
by Zebediah Figura 19 Feb '18

19 Feb '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 5 ++++- dlls/ws2_32/tests/sock.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb0dbd2..2d755cc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7220,7 +7220,10 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp if (!ret) { for (i = 0; i < FD_MAX_EVENTS; i++) - lpEvent->iErrorCode[i] = NtStatusToWSAError(errors[i]); + { + if (lpEvent->lNetworkEvents & (1 << i)) + lpEvent->iErrorCode[i] = NtStatusToWSAError(errors[i]); + } return 0; } SetLastError(WSAEINVAL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2b209d4..1ad6dba 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2996,7 +2996,7 @@ static void test_WSAEnumNetworkEvents(void) } for (k = 0; k < FD_MAX_EVENTS; k++) { - if (i >= 1 && j == 0 && k == 1) /* first UDP and connected TCP test, FD_WRITE bit no error*/ + if (net_events.lNetworkEvents & (1 << k)) { ok (net_events.iErrorCode[k] == 0x0, "Test[%d][%d]: expected 0x0, got 0x%x\n", i, k, net_events.iErrorCode[k]); @@ -3004,7 +3004,6 @@ static void test_WSAEnumNetworkEvents(void) else { /* Bits that are not set in lNetworkEvents MUST not be changed */ - todo_wine ok (net_events.iErrorCode[k] == 0xABABABAB, "Test[%d][%d]: expected 0xABABABAB, got 0x%x\n", i, k, net_events.iErrorCode[k]); } -- 2.7.4

1 0

[PATCH] shlwapi/tests: Fix link order.
by Zebediah Figura 19 Feb '18

19 Feb '18

Some functions are declared both in shell32 and in shlwapi; we want to link to the latter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shlwapi/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 2ec694c..450a395 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shlwapi.dll -IMPORTS = shell32 shlwapi mlang oleaut32 ole32 user32 advapi32 +IMPORTS = shlwapi shell32 mlang oleaut32 ole32 user32 advapi32 C_SRCS = \ assoc.c \ -- 2.7.4

1 0

[PATCH] kernel32/tests: Handle notifications on the parent dir more gracefully.
by Zebediah Figura 19 Feb '18

19 Feb '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes an intermittent test failure. The recursive watch might give us a notification on the parent dir. The test already handles this, but expects only one notification to occur and that it will precede the creation notification. However, sometimes the server will return before we receive the creation notification; additionally, sometimes inotify will give us multiple modifications on the parent dir. The point of the test is that recursive watch *works*, i.e. that we receive a notification on the subdirectory at all. So keep calling ReadDirectoryChanges() until we get it (or time out). dlls/kernel32/tests/change.c | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 4accad0..f4abad4 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -383,6 +383,7 @@ static void test_readdirectorychanges(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; static const WCHAR szGa[] = { '\\','h','o','o','\\','g','a',0 }; PFILE_NOTIFY_INFORMATION pfni; + BOOL got_subdir_change = FALSE; if (!pReadDirectoryChangesW) { @@ -550,26 +551,40 @@ static void test_readdirectorychanges(void) r = CreateDirectoryW( subsubdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( ov.hEvent, 1000 ); - ok( r == WAIT_OBJECT_0, "should be ready\n" ); + while (1) + { + r = WaitForSingleObject( ov.hEvent, 1000 ); + ok(r == WAIT_OBJECT_0, "should be ready\n" ); + if (r == WAIT_TIMEOUT) break; - ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18, - "ov.InternalHigh wrong %lx\n", ov.InternalHigh); + ok((NTSTATUS) ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - pfni = (PFILE_NOTIFY_INFORMATION) buffer; - if (pfni->NextEntryOffset) /* we may get a modified event on the parent dir */ - { - ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset ); - ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action ); - ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n"); - pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + while (1) + { + /* We might get one or more modified events on the parent dir */ + if (pfni->Action == FILE_ACTION_MODIFIED) + { + ok(pfni->FileNameLength == 3 * sizeof(WCHAR), "len wrong\n" ); + ok(!memcmp(pfni->FileName, &szGa[1], 3 * sizeof(WCHAR)), "name wrong\n"); + } + else + { + ok(pfni->Action == FILE_ACTION_ADDED, "action wrong\n"); + ok(pfni->FileNameLength == 6 * sizeof(WCHAR), "len wrong\n" ); + ok(!memcmp(pfni->FileName, &szGa[1], 6 * sizeof(WCHAR)), "name wrong\n"); + got_subdir_change = TRUE; + } + if (!pfni->NextEntryOffset) break; + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } + + if (got_subdir_change) break; + + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); } - ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); - ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); - ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); + ok(got_subdir_change, "didn't get subdir change\n"); r = RemoveDirectoryW( subsubdir ); ok( r == TRUE, "failed to remove directory\n"); -- 2.7.4

1 0

[PATCH] ntdll/tests: Added pipe security descriptor tests.
by Jacek Caban 19 Feb '18

19 Feb '18

Based on patch by Jonathan Doron. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/Makefile.in | 2 +- dlls/ntdll/tests/pipe.c | 213 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 1 deletion(-)

1 0

[PATCH] user.exe16: Don't open code CONTAINING_RECORD.
by Nikolay Sivov 19 Feb '18

19 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user.exe16/user.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f7d41093f5..27b9279383 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -87,10 +87,7 @@ static BOOL CALLBACK gray_string_callback( HDC hdc, LPARAM param, INT len ) /* callback for 16-bit gray string proc with string pointer */ static BOOL CALLBACK gray_string_callback_ptr( HDC hdc, LPARAM param, INT len ) { - const struct gray_string_info *info; - char *str = (char *)param; - - info = (struct gray_string_info *)(str - offsetof( struct gray_string_info, str )); + const struct gray_string_info *info = CONTAINING_RECORD( (void *)param, struct gray_string_info, str ); return gray_string_callback( hdc, (LPARAM)info, len ); } -- 2.16.1

1 0

[PATCH appdb] Disable staging checkbox for new test reports
by Rosanne DiMesio 19 Feb '18

19 Feb '18

Prevents users from submitting new test reports for nonexistant staging versions. Current data is retained and the checkbox is still active for existing reports in case they need to be edited by an admin or maintainer. This change can be easily reverted if the branch is officially revived by WineHQ. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1083cfb..cec7fec 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,11 +921,14 @@ class testData{ echo "Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a> "; // Checkbox for Wine-staging echo '<label class="btn btn-secondary">'; - if($this->iStaging != 0) - echo '<input type="checkbox" name="iStaging" value="1" checked>'; + if($this->sState != 'accepted') + echo '<input type="checkbox" name="iStaging" value="1" disabled>'; else - echo '<input type="checkbox" name="iStaging" value="1">'; - echo ' Wine-staging'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging (discontinued; last official release was 2.21)'; echo '</label>'; echo '</td></tr>',"\n"; -- 2.12.3

1 0

Incorrect tooltip size
by Roman Pišl 19 Feb '18

19 Feb '18

Hi, our appliction is affected by this bug https://bugs.winehq.org/show_bug.cgi?id=14336. Would you please give me a hint and point me to the right direction? I am ready to fix this, if it doesn't require to rewrite the component completely ;) Roman

2 1

[PATCH 4/5] usp10: Avoid leaking "open_stack" and "stack_index" in case of 0 "pair_count" in computeBracketPairs().
by Henri Verbeet 19 Feb '18

19 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/bidi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index d94dc7b..8f94ede 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -741,6 +741,10 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) } } } + + heap_free(open_stack); + heap_free(stack_index); + if (pair_count == 0) { heap_free(out); @@ -749,8 +753,6 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) else if (pair_count > 1) qsort(out, pair_count, sizeof(BracketPair), compr); - heap_free(open_stack); - heap_free(stack_index); return out; } -- 2.1.4

2 1

[PATCH 3/5] usp10/tests: Also restore the previous font when the finger print matches in _find_font_for_range().
by Henri Verbeet 19 Feb '18

19 Feb '18

Otherwise the subsequent SelectObject() call will set *origFont to *hfont. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5c04441..de91cb8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1289,11 +1289,12 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co if (*hfont) { winetest_trace("using font %s\n",lParam.lf.lfFaceName); - *origFont = SelectObject(hdc,*hfont); if (fingerprint) { WORD output[10]; int i; + + *origFont = SelectObject(hdc,*hfont); if (GetGlyphIndicesW(hdc, fingerprint->check, 10, output, 0) != GDI_ERROR) { for (i=0; i < 10; i++) @@ -1307,6 +1308,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co } if (i == 10) rc = 1; } + SelectObject(hdc, *origFont); } else rc = 1; } -- 2.1.4

2 1

[PATCH 1/2] mmdevapi/tests: Fix capture test that consistently fails on Windows 10
by Alex Henrie 19 Feb '18

19 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mmdevapi/tests/capture.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 3cdfda1a37..27a5cdc33f 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -308,20 +308,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ - /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { - /* FIXME: Some drivers fail */ - ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY){ /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); + sum = pos; + }else{ /* win10 */ + ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - - if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) - sum = pos; } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); -- 2.16.1

3 6

[PATCH 2/2 v2] msvcrt/tests: Add tests for _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s
by Piotr Caban 19 Feb '18

19 Feb '18

From: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - added test with not found file - moved test files to temp directory dlls/msvcrt/tests/dir.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+)

1 0

[PATCH 1/2 v2] msvcrt: Fix _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s
by Piotr Caban 19 Feb '18

19 Feb '18

From: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - simplified the code a little - fix off by one error in buffer size check - added FIXME in _s variants when count > MAX_PATH dlls/msvcrt/dir.c | 210 ++++++++++++++++++++++++++---------------------------- 1 file changed, 102 insertions(+), 108 deletions(-)

1 0

[PATCH resend 1/7] winebus.sys: Add SDL gamepad and joystick driver
by Aric Stewart 19 Feb '18

19 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- configure | 149 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 16 +++++ dlls/winebus.sys/Makefile.in | 5 +- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_sdl.c | 58 +++++++++++++++++ dlls/winebus.sys/main.c | 15 ++++- include/config.h.in | 9 +++ 7 files changed, 249 insertions(+), 4 deletions(-) create mode 100644 dlls/winebus.sys/bus_sdl.c

2 1

The future of Wine-staging
by Alexandre Julliard 19 Feb '18

19 Feb '18

If you haven't seen the sad news yet: https://wine-staging.com/news/2018-02-17-future-wine-staging.html We'll need to discuss how to move forward, but first I want to take the opportunity to thank Sebastian and Michael for their amazing work and dedication over the years. It was indeed a major effort, and they've done an incredible job of it. Wine-staging has done a lot to move Wine forward and make things exciting again, and I hope we can keep that momentum going (we may have to cut down on the number of patches though, so that the workload remains manageable for mere mortals...) Thank you guys! -- Alexandre Julliard julliard(a)winehq.org

6 6

[PATCH v3] wmp: add IWMPControls stub implementation
by Anton Romanov 19 Feb '18

19 Feb '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 13 +++ dlls/wmp/wmp_private.h | 1 + 3 files changed, 225 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index accf5401ed..e40422d95a 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -32,6 +32,11 @@ static inline WindowsMediaPlayer *impl_from_IWMPPlayer(IWMPPlayer *iface) return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer_iface); } +static inline WindowsMediaPlayer *impl_from_IWMPControls(IWMPControls *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPControls_iface); +} + static HRESULT WINAPI WMPPlayer4_QueryInterface(IWMPPlayer4 *iface, REFIID riid, void **ppv) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); @@ -121,8 +126,12 @@ static HRESULT WINAPI WMPPlayer4_get_playState(IWMPPlayer4 *iface, WMPPlayState static HRESULT WINAPI WMPPlayer4_get_controls(IWMPPlayer4 *iface, IWMPControls **ppControl) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppControl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppControl); + + IWMPControls_AddRef(&This->IWMPControls_iface); + *ppControl = &This->IWMPControls_iface; + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings **ppSettings) @@ -931,9 +940,209 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; +HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWMPControls)) { + *ppv = iface; + }else { + WARN("Unsupported interface (%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPControls_AddRef(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI WMPControls_Release(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI WMPControls_GetTypeInfoCount(IWMPControls *iface, UINT *pctinfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_play(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pdCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%f)\n", This, dCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_next(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, ppIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, plMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d)\n", This, lMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +static const IWMPControlsVtbl WMPControlsVtbl = { + WMPControls_QueryInterface, + WMPControls_AddRef, + WMPControls_Release, + WMPControls_GetTypeInfoCount, + WMPControls_GetTypeInfo, + WMPControls_GetIDsOfNames, + WMPControls_Invoke, + WMPControls_get_isAvailable, + WMPControls_play, + WMPControls_stop, + WMPControls_pause, + WMPControls_fastForward, + WMPControls_fastReverse, + WMPControls_get_currentPosition, + WMPControls_put_currentPosition, + WMPControls_get_currentPositionString, + WMPControls_next, + WMPControls_previous, + WMPControls_get_currentItem, + WMPControls_put_currentItem, + WMPControls_get_currentMarker, + WMPControls_put_currentMarker, + WMPControls_playItem, +}; + void init_player_ifaces(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; + wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 46b0b72cd3..a004337749 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -859,11 +859,24 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPControls *controls; HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + player = NULL; + hres = IWMPControls_QueryInterface(controls, &IID_IWMPPlayer, (void**)&player); + ok(hres != S_OK, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); + ok(player == NULL, "player != NULL\n"); + + IWMPControls_Release(controls); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 710793c513..65de6bbd09 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,6 +44,7 @@ struct WindowsMediaPlayer { IWMPPlayer4 IWMPPlayer4_iface; IWMPPlayer IWMPPlayer_iface; IWMPSettings IWMPSettings_iface; + IWMPControls IWMPControls_iface; LONG ref; -- 2.16.2

2 1

[PATCH 8/8] mshtml: Use get_element helper in IHTMLElement::get_offsetParent implementation.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)

1 0

[PATCH 7/8] mshtml: Get rid of no longer needed document argument from get_element.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 18 ++++++++++-------- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-)

1 0

[PATCH 6/8] mshtml: Get rid of no longer needed document argument from create_all_list.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelemcol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 5/8] mshtml: Get rid of no longer needed document argument from script_elem_from_nsscript.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlscript.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/script.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 4/8] mshtml: Get rid of no loner needed document node reference in HTMLDOMChildrenCollection.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlnode.c | 11 ++--------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-)

1 0

[PATCH 3/8] mshtml: Get rid of no longer needed document argument in get_node.
by Jacek Caban 19 Feb '18

19 Feb '18

1 0

[PATCH 2/8] mshtml/tests: Added more ownerDocument property tests.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/elements.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] mshtml: Get owner document from Gecko node in get_node.
by Jacek Caban 19 Feb '18

19 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 19 +++++++++++++++++++ dlls/mshtml/htmlnode.c | 18 +++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-)

1 0

[PATCH 2/2] winedbg: Add cvtdq2ps and cvtps2pd opcodes.
by Huw Davies 19 Feb '18

19 Feb '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winedbg/db_disasm.c | 4 ++-- programs/winedbg/db_disasm64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index b8a21522c4..fc25e1cc4a 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -312,8 +312,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index b1556ad8f1..4d9aca9d43 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -362,8 +362,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, -- 2.12.0

1 0

[PATCH 1/2] winedbg: Fix the operand order of some XMM instructions.
by Huw Davies 19 Feb '18

19 Feb '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winedbg/db_disasm.c | 30 +++++++++++++++--------------- programs/winedbg/db_disasm64.c | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index c745617e69..b8a21522c4 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -301,23 +301,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = { diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 3db0b5e31e..b1556ad8f1 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -351,23 +351,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = { -- 2.12.0

1 0

[PATCH] adsldp: Add initial tests for ADSystemInfo.
by Dmitry Timoshkov 19 Feb '18

19 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/adsldp/tests/Makefile.in | 5 + dlls/adsldp/tests/sysinfo.c | 228 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 234 insertions(+) create mode 100644 dlls/adsldp/tests/Makefile.in create mode 100644 dlls/adsldp/tests/sysinfo.c diff --git a/configure.ac b/configure.ac index d06476e6c9..18918b7924 100644 --- a/configure.ac +++ b/configure.ac @@ -2794,6 +2794,7 @@ WINE_CONFIG_DLL(activeds,,[implib]) WINE_CONFIG_DLL(actxprxy,,[clean]) WINE_CONFIG_LIB(adsiid) WINE_CONFIG_DLL(adsldp,,[clean]) +WINE_CONFIG_TEST(dlls/adsldp/tests) WINE_CONFIG_DLL(adsldpc) WINE_CONFIG_DLL(advapi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/advapi32/tests) diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in new file mode 100644 index 0000000000..777d2aa9de --- /dev/null +++ b/dlls/adsldp/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = adsldp.dll +IMPORTS = ole32 oleaut32 secur32 advapi32 uuid + +C_SRCS = \ + sysinfo.c diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c new file mode 100644 index 0000000000..649fb7fa3b --- /dev/null +++ b/dlls/adsldp/tests/sysinfo.c @@ -0,0 +1,228 @@ +/* + * ADSystemInfo Tests + * + * Copyright 2018 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "initguid.h" +#include "iads.h" +#define SECURITY_WIN32 +#include "security.h" + +#include "wine/test.h" + +static WCHAR *strchrW(const WCHAR *str, WCHAR ch) +{ + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; +} + +static void test_ComputerName(void) +{ + static const WCHAR cnW[] = { 'C','N','=' }; + static const WCHAR ComputersW[] = { 'C','N','=','C','o','m','p','u','t','e','r','s' }; + BOOL ret; + ULONG size, name_size; + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR buf[1024]; + IADsADSystemInfo *sysinfo; + BSTR bstr; + HRESULT hr; + + name_size = MAX_COMPUTERNAME_LENGTH + 1; + SetLastError(0xdeadbeef); + ret = GetComputerNameW(name, &name_size); + ok(ret, "GetComputerName error %u\n", GetLastError()); + + /* Distinguished name (rfc1779) is supposed to look like this: + * "CN=COMPNAME,CN=Computers,DC=domain,DC=com" + */ + + size = 1024; + SetLastError(0xdeadbeef); + ret = GetComputerObjectNameW(NameFullyQualifiedDN, buf, &size); + ok(ret || GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO, "GetComputerObjectName error %u\n", GetLastError()); + if (ret) + { + const WCHAR *p; + ok(size == lstrlenW(buf) + 1, "got %u, expected %u\n", size, lstrlenW(buf) + 1); + ok(!memcmp(buf, cnW, sizeof(cnW)), "got %s\n", wine_dbgstr_w(buf)); + ok(!memcmp(buf + 3, name, name_size), "got %s (name_size = %u)\n", wine_dbgstr_w(buf), name_size); + p = strchrW(buf, ','); + ok(p != NULL, "delimiter was not found\n"); + ok(p && !memcmp(p + 1, ComputersW, sizeof(ComputersW)), "got %s\n", p ? wine_dbgstr_w(p + 1) : wine_dbgstr_w(buf)); + } + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IADsADSystemInfo, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); + if (hr == S_OK) + { + ok(!lstrcmpW(bstr, buf), "got %s, expected %s\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); + SysFreeString(bstr); + } + + IADsADSystemInfo_Release(sysinfo); +} + +static void test_UserName(void) +{ + static const WCHAR cnW[] = { 'C','N','=' }; + static const WCHAR UsersW[] = { 'C','N','=','U','s','e','r','s' }; + BOOL ret; + ULONG size, name_size; + WCHAR name[256]; + WCHAR buf[1024]; + IADsADSystemInfo *sysinfo; + BSTR bstr; + HRESULT hr; + + name_size = 256; + SetLastError(0xdeadbeef); + ret = GetUserNameW(name, &name_size); + ok(ret, "GetUserName error %u\n", GetLastError()); + + /* Distinguished name (rfc1779) is supposed to look like this: + * "CN=username,CN=Users,DC=domain,DC=com" + */ + + size = 1024; + SetLastError(0xdeadbeef); + ret = GetUserNameExW(NameFullyQualifiedDN, buf, &size); + ok(ret || GetLastError() == ERROR_NONE_MAPPED, "GetUserNameEx error %u\n", GetLastError()); + if (ret) + { + const WCHAR *p; + ok(size == lstrlenW(buf), "got %u, expected %u\n", size, lstrlenW(buf)); + ok(!memcmp(buf, cnW, sizeof(cnW)), "got %s\n", wine_dbgstr_w(buf)); + ok(!memcmp(buf + 3, name, name_size), "got %s (name_size = %u)\n", wine_dbgstr_w(buf), name_size); + p = strchrW(buf, ','); + ok(p != NULL, "delimiter was not found\n"); + ok(p && !memcmp(p + 1, UsersW, sizeof(UsersW)), "got %s\n", p ? wine_dbgstr_w(p + 1) : wine_dbgstr_w(buf)); + } + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IADsADSystemInfo, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr == S_OK) + { + ok(!lstrcmpW(bstr, buf), "got %s, expected %s\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); + SysFreeString(bstr); + } + + IADsADSystemInfo_Release(sysinfo); +} + +static void test_sysinfo(void) +{ + + IADsADSystemInfo *sysinfo; + IDispatch *dispatch; + BSTR bstr; + VARIANT_BOOL value; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IUnknown, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + IADsADSystemInfo_Release(sysinfo); + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IADsADSystemInfo, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IADsADSystemInfo_QueryInterface(sysinfo, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(dispatch); + + hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr != S_OK) + { + skip("Computer is not part of a domain, skipping the tests\n"); + IADsADSystemInfo_Release(sysinfo); + return; + } + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_SiteName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_DomainShortName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_DomainDNSName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_ForestDNSName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_PDCRoleOwner(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_IsNativeMode(sysinfo, &value); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + ok(value == VARIANT_TRUE, "IsNativeMode: %s\n", value == VARIANT_TRUE ? "yes" : "no"); + + hr = IADsADSystemInfo_GetAnyDCName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + SysFreeString(bstr); + + IADsADSystemInfo_Release(sysinfo); +} + +START_TEST(sysinfo) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_ComputerName(); + test_UserName(); + test_sysinfo(); +} -- 2.16.1

2 1

[PATCH 3/3] riched20: Underline links.
by Huw Davies 19 Feb '18

19 Feb '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3b908a7f3..fcc4e105a3 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -218,6 +218,9 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { + if (style->fmt.dwEffects & CFE_LINK) + return CreatePen( PS_SOLID, 1, color ); + /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) { -- 2.12.0

1 0

[PATCH 2/3] riched20: Return the underline pen as the return value.
by Huw Davies 19 Feb '18

19 Feb '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b4b6697165..d3b908a7f3 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } -static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) +static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { - *pen = NULL; /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) { @@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ - *pen = CreatePen( PS_SOLID, 1, color ); - break; + return CreatePen( PS_SOLID, 1, color ); case CFU_UNDERLINEDOTTED: - *pen = CreatePen( PS_DOT, 1, color ); - break; + return CreatePen( PS_DOT, 1, color ); default: FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); /* fall through */ @@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) break; } } - return; + return NULL; } static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) { HPEN pen; - get_underline_pen( run->style, color, &pen ); + pen = get_underline_pen( run->style, color ); if (pen) { HPEN old_pen = SelectObject( c->hDC, pen ); -- 2.12.0

1 0

[PATCH 1/3] riched20: Don't use logfont-style underlining for links.
by Huw Davies 19 Feb '18

19 Feb '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/style.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 48d57e8b43..0b85d69f6f 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -306,7 +306,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1; - if ((s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) && + if ((s->fmt.dwEffects & s->fmt.dwMask & CFM_UNDERLINE) && + !(s->fmt.dwEffects & CFE_LINK) && s->fmt.bUnderlineType == CFU_CF1UNDERLINE) lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT) -- 2.12.0

1 0

[PATCH 3/3] [v2] gdi32: Fix text metrics in synthetic bold bitmap fonts.
by Akihiro Sagawa 19 Feb '18

19 Feb '18

In v2, fix tmOverhang calculation (just increments it). font_desc.matrix.eM11 is always 1.0 for bitmap fonts (freetype.c:5701). Therefore, the previous code doesn't make sense. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 9 +++++++-- dlls/gdi32/tests/font.c | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-)

2 1

[PATCH 2/3] [v4] gdi32/tests: Add more text metrics tests in synthetic bold bitmap fonts.
by Akihiro Sagawa 19 Feb '18

19 Feb '18

In v4, - Revert v3 changes. - For scaling, use exisiting variable instead of adding another variable. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-)

2 1

[PATCH 1/3] gdi32: Fix synthetic bold outline text metrics. (resend)
by Akihiro Sagawa 19 Feb '18

19 Feb '18

Without this fix, synthetic tmAveCharWidth value unintentionally affects SCALE_X calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

2 1

[PATCH] schannel/tests: Relax GetInfo return value test
by Alex Henrie 19 Feb '18

19 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This test has failed on the Windows 8 and Windows 10 testbot VMs since January 19, most likely because of some Windows update. I wasn't able to figure out what the seemingly random return codes mean, but they're not errors. dlls/schannel/tests/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index fb350d5e62..fc913c14a9 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -219,11 +219,11 @@ static void testGetInfo(void) return; } status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS || + ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ "status: 0x%x\n", status); - if (status == STATUS_SUCCESS) + if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), -- 2.16.1

2 1

[PATCH] shlwapi/tests: Drop ordinal test workarounds for Windows <= 2000
by Alex Henrie 19 Feb '18

19 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This resolves a Coverity warning. dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 205 +++-------------------------------------- 2 files changed, 16 insertions(+), 191 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 7155f38c4a..6a5e71b0f3 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shlwapi.dll -IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 +IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 shell32 mlang C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 004c75da3f..f192849cd4 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -36,8 +36,6 @@ /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; -static BOOL is_win2k_and_lower; -static BOOL is_win9x; static int (WINAPI *pSHSearchMapInt)(const int*,const int*,int,int); static HRESULT (WINAPI *pGetAcceptLanguagesA)(LPSTR,LPDWORD); @@ -89,12 +87,6 @@ typedef struct SHELL_USER_PERMISSION { static SECURITY_DESCRIPTOR* (WINAPI *pGetShellSecurityDescriptor)(const SHELL_USER_PERMISSION**,int); -static HMODULE hmlang; -static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); - -static HMODULE hshell32; -static HRESULT (WINAPI *pSHGetDesktopFolder)(IShellFolder**); - static const CHAR ie_international[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -207,11 +199,6 @@ static void test_GetAcceptLanguagesA(void) LPCSTR entry; INT i = 0; - if (!pGetAcceptLanguagesA) { - win_skip("GetAcceptLanguagesA is not available\n"); - return; - } - lcid = GetUserDefaultLCID(); /* Get the original Value */ @@ -257,10 +244,8 @@ static void test_GetAcceptLanguagesA(void) if (lstrcmpA(buffer, language)) { /* some windows versions use "lang" or "lang-country" as default */ language[0] = 0; - if (pLcidToRfc1766A) { - hr = pLcidToRfc1766A(lcid, language, sizeof(language)); - ok(hr == S_OK, "LcidToRfc1766A returned 0x%x and %s\n", hr, language); - } + hr = LcidToRfc1766A(lcid, language, sizeof(language)); + ok(hr == S_OK, "LcidToRfc1766A returned 0x%x and %s\n", hr, language); } ok(!lstrcmpA(buffer, language), @@ -714,40 +699,20 @@ static void test_GetShellSecurityDescriptor(void) &supCurrentUserFull, &supEveryoneDenied, }; SECURITY_DESCRIPTOR* psd; - void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW"); - if(!pGetShellSecurityDescriptor) + if(!pGetShellSecurityDescriptor) /* vista and later */ { win_skip("GetShellSecurityDescriptor not available\n"); return; } - if(pChrCmpIW && pChrCmpIW == pGetShellSecurityDescriptor) /* win2k */ - { - win_skip("Skipping for GetShellSecurityDescriptor, same ordinal used for ChrCmpIW\n"); - return; - } - psd = pGetShellSecurityDescriptor(NULL, 2); - ok(psd==NULL || - broken(psd==INVALID_HANDLE_VALUE), /* IE5 */ - "GetShellSecurityDescriptor should fail\n"); + ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0); ok(psd==NULL, "GetShellSecurityDescriptor should fail, got %p\n", psd); SetLastError(0xdeadbeef); psd = pGetShellSecurityDescriptor(rgsup, 2); - if (psd == NULL && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - /* The previous calls to GetShellSecurityDescriptor don't set the last error */ - win_skip("GetShellSecurityDescriptor is not implemented\n"); - return; - } - if (psd == INVALID_HANDLE_VALUE) - { - win_skip("GetShellSecurityDescriptor is broken on IE5\n"); - return; - } ok(psd!=NULL, "GetShellSecurityDescriptor failed\n"); if (psd!=NULL) { @@ -822,9 +787,6 @@ static void test_SHPackDispParams(void) VARIANT vars[10]; HRESULT hres; - if(!pSHPackDispParams) - win_skip("SHPackSidpParams not available\n"); - memset(&params, 0xc0, sizeof(params)); memset(vars, 0xc0, sizeof(vars)); hres = pSHPackDispParams(&params, vars, 1, VT_I4, 0xdeadbeef); @@ -1495,12 +1457,6 @@ static void test_IConnectionPoint(void) DISPPARAMS params; VARIANT vars[10]; - if (!pIConnectionPoint_SimpleInvoke || !pConnectToConnectionPoint) - { - win_skip("IConnectionPoint Apis not present\n"); - return; - } - container = HeapAlloc(GetProcessHeap(),0,sizeof(Contain)); container->IConnectionPointContainer_iface.lpVtbl = &contain_vtbl; container->refCount = 1; @@ -1519,18 +1475,13 @@ static void test_IConnectionPoint(void) rc = pIConnectionPoint_SimpleInvoke(point,0xa0,NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); - if (pSHPackDispParams) - { - memset(&params, 0xc0, sizeof(params)); - memset(vars, 0xc0, sizeof(vars)); - rc = pSHPackDispParams(&params, vars, 2, VT_I4, 0xdeadbeef, VT_BSTR, 0xdeadcafe); - ok(rc == S_OK, "SHPackDispParams failed: %08x\n", rc); + memset(&params, 0xc0, sizeof(params)); + memset(vars, 0xc0, sizeof(vars)); + rc = pSHPackDispParams(&params, vars, 2, VT_I4, 0xdeadbeef, VT_BSTR, 0xdeadcafe); + ok(rc == S_OK, "SHPackDispParams failed: %08x\n", rc); - rc = pIConnectionPoint_SimpleInvoke(point,0xa1,&params); - ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); - } - else - win_skip("pSHPackDispParams not present\n"); + rc = pIConnectionPoint_SimpleInvoke(point,0xa1,&params); + ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); @@ -1634,12 +1585,6 @@ static void test_SHPropertyBag_ReadLONG(void) LONG out; static const WCHAR szName1[] = {'n','a','m','e','1',0}; - if (!pSHPropertyBag_ReadLONG) - { - win_skip("SHPropertyBag_ReadLONG not present\n"); - return; - } - pb = HeapAlloc(GetProcessHeap(),0,sizeof(PropBag)); pb->refCount = 1; pb->IPropertyBag_iface.lpVtbl = &prop_vtbl; @@ -1665,12 +1610,6 @@ static void test_SHSetWindowBits(void) DWORD style, styleold; WNDCLASSA clsA; - if(!pSHSetWindowBits) - { - win_skip("SHSetWindowBits is not available\n"); - return; - } - clsA.style = 0; clsA.lpfnWndProc = DefWindowProcA; clsA.cbClsExtra = 0; @@ -1691,8 +1630,7 @@ static void test_SHSetWindowBits(void) SetLastError(0xdeadbeef); style = pSHSetWindowBits(NULL, GWL_STYLE, 0, 0); ok(style == 0, "expected 0 retval, got %d\n", style); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || - broken(GetLastError() == 0xdeadbeef), /* Win9x/WinMe */ + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); /* zero mask, zero flags */ @@ -1742,12 +1680,6 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; - if(!pSHFormatDateTimeA) - { - win_skip("pSHFormatDateTimeA isn't available\n"); - return; - } - if (0) { /* crashes on native */ @@ -1792,8 +1724,7 @@ if (0) SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */ + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); /* now check returned strings */ @@ -1904,12 +1835,6 @@ static void test_SHFormatDateTimeW(void) #define UNICODE_LTR_MARK 0x200e #define UNICODE_RTL_MARK 0x200f - if(!pSHFormatDateTimeW) - { - win_skip("pSHFormatDateTimeW isn't available\n"); - return; - } - if (0) { /* crashes on native */ @@ -1955,8 +1880,7 @@ if (0) ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR)); ok(ret == lstrlenW(buff)+1 || ret == lstrlenW(buff), "expected %d or %d, got %d\n", lstrlenW(buff)+1, lstrlenW(buff), ret); - ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe/NT4 */ + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); /* now check returned strings */ @@ -1966,11 +1890,6 @@ if (0) "expected %d or %d, got %d\n", lstrlenW(buff)+1, lstrlenW(buff), ret); SetLastError(0xdeadbeef); ret = GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff2, sizeof(buff2)/sizeof(WCHAR)); - if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Needed W-functions are not implemented\n"); - return; - } ok(ret == lstrlenW(buff2)+1, "expected %d, got %d\n", lstrlenW(buff2)+1, ret); ok(lstrcmpW(buff, buff2) == 0, "expected equal strings\n"); @@ -2118,24 +2037,11 @@ static void test_SHGetObjectCompatFlags(void) }; static const char compat_path[] = "Software\\Microsoft\\Windows\\CurrentVersion\\ShellCompatibility\\Objects"; - void *pColorAdjustLuma = GetProcAddress(hShlwapi, "ColorAdjustLuma"); CHAR keyA[39]; /* {CLSID} */ HKEY root; DWORD ret; int i; - if (!pSHGetObjectCompatFlags) - { - win_skip("SHGetObjectCompatFlags isn't available\n"); - return; - } - - if (pColorAdjustLuma && pColorAdjustLuma == pSHGetObjectCompatFlags) /* win2k */ - { - win_skip("Skipping SHGetObjectCompatFlags, same ordinal used for ColorAdjustLuma\n"); - return; - } - /* null args */ ret = pSHGetObjectCompatFlags(NULL, NULL); ok(ret == 0, "got %d\n", ret); @@ -2392,14 +2298,6 @@ static void test_IUnknown_QueryServiceExec(void) call_trace_t trace_expected; HRESULT hr; - /* on <=W2K platforms same ordinal used for another export with different - prototype, so skipping using this indirect condition */ - if (is_win2k_and_lower) - { - win_skip("IUnknown_QueryServiceExec is not available\n"); - return; - } - provider = IServiceProviderImpl_Construct(); /* null source pointer */ @@ -2509,14 +2407,6 @@ static void test_IUnknown_ProfferService(void) HRESULT hr; DWORD cookie; - /* on <=W2K platforms same ordinal used for another export with different - prototype, so skipping using this indirect condition */ - if (is_win2k_and_lower) - { - win_skip("IUnknown_ProfferService is not available\n"); - return; - } - provider = IServiceProviderImpl_Construct(); proff = IProfferServiceImpl_Construct(); @@ -2580,12 +2470,6 @@ static void test_SHCreateWorkerWindowA(void) LONG_PTR ret; BOOL res; - if (is_win2k_and_lower) - { - win_skip("SHCreateWorkerWindowA not available\n"); - return; - } - hwnd = pSHCreateWorkerWindowA(0, NULL, 0, 0, 0, 0); ok(hwnd != 0, "expected window\n"); @@ -2746,7 +2630,7 @@ static void test_SHIShellFolder_EnumObjects(void) HRESULT hres; IShellFolder *folder; - if(!pSHIShellFolder_EnumObjects || is_win2k_and_lower){ + if(!pSHIShellFolder_EnumObjects){ /* win7 and later */ win_skip("SHIShellFolder_EnumObjects not available\n"); return; } @@ -2763,7 +2647,7 @@ static void test_SHIShellFolder_EnumObjects(void) ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm); /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */ - hres = pSHGetDesktopFolder(&folder); + hres = SHGetDesktopFolder(&folder); ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres); enm = NULL; @@ -2832,11 +2716,6 @@ static void test_SHGetIniString(void) static const WCHAR testpathW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; WCHAR pathW[MAX_PATH]; - if(!pSHGetIniStringW || is_win2k_and_lower){ - win_skip("SHGetIniStringW is not available\n"); - return; - } - lstrcpyW(pathW, testpathW); if (!write_inifile(pathW)) @@ -2887,11 +2766,6 @@ static void test_SHSetIniString(void) static const WCHAR NewKeyW[] = {'N','e','w','K','e','y',0}; static const WCHAR AValueW[] = {'A','V','a','l','u','e',0}; - if(!pSHSetIniStringW || is_win2k_and_lower){ - win_skip("SHSetIniStringW is not available\n"); - return; - } - if (!write_inifile(TestIniW)) return; @@ -2936,30 +2810,10 @@ static void test_SHGetShellKey(void) static const WCHAR ShellFoldersW[] = { 'S','h','e','l','l',' ','F','o','l','d','e','r','s',0 }; static const WCHAR WineTestW[] = { 'W','i','n','e','T','e','s','t',0 }; - void *pPathBuildRootW = GetProcAddress(hShlwapi, "PathBuildRootW"); DWORD *alloc_data, data, size; HKEY hkey; HRESULT hres; - if (!pSHGetShellKey) - { - win_skip("SHGetShellKey(ordinal 491) isn't available\n"); - return; - } - - /* some win2k */ - if (pPathBuildRootW && pPathBuildRootW == pSHGetShellKey) - { - win_skip("SHGetShellKey(ordinal 491) used for PathBuildRootW\n"); - return; - } - - if (is_win9x || is_win2k_and_lower) - { - win_skip("Ordinal 491 used for another call, skipping SHGetShellKey tests\n"); - return; - } - /* Vista+ limits SHKEY enumeration values */ SetLastError(0xdeadbeef); hkey = pSHGetShellKey(SHKEY_Key_Explorer, ShellFoldersW, FALSE); @@ -2998,12 +2852,6 @@ static void test_SHGetShellKey(void) ok(hkey != NULL, "Can't create key\n"); RegCloseKey(hkey); - if (!pSKGetValueW || !pSKSetValueW || !pSKDeleteValueW || !pSKAllocValueW) - { - win_skip("SKGetValueW, SKSetValueW, SKDeleteValueW or SKAllocValueW not available\n"); - return; - } - size = sizeof(data); hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); @@ -3091,12 +2939,6 @@ static void test_SHSetParentHwnd(void) HWND hwnd, hwnd2, ret; DWORD style; - if (!pSHSetParentHwnd) - { - win_skip("SHSetParentHwnd not available\n"); - return; - } - hwnd = CreateWindowA("Button", "", WS_VISIBLE, 0, 0, 10, 10, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); @@ -3271,14 +3113,6 @@ START_TEST(ordinal) int argc; hShlwapi = GetModuleHandleA("shlwapi.dll"); - is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; - is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ - - /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ - if(!GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx")){ - win_skip("Too old shlwapi version\n"); - return; - } init_pointers(); @@ -3293,12 +3127,6 @@ START_TEST(ordinal) return; } - hmlang = LoadLibraryA("mlang.dll"); - pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); - - hshell32 = LoadLibraryA("shell32.dll"); - pSHGetDesktopFolder = (void *)GetProcAddress(hshell32, "SHGetDesktopFolder"); - test_GetAcceptLanguagesA(); test_SHSearchMapInt(); test_alloc_shared(argc, argv); @@ -3321,7 +3149,4 @@ START_TEST(ordinal) test_SHSetParentHwnd(); test_IUnknown_GetClassID(); test_DllGetVersion(); - - FreeLibrary(hshell32); - FreeLibrary(hmlang); } -- 2.16.1

1 0

[PATCH 2/2] testbot: Add some traces to help diagnose scheduler issues.
by Francois Gouget 19 Feb '18

19 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 036222110..9a0f8bc39 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1012,6 +1012,63 @@ sub _SacrificeVM($$$) return 1; } +sub _DumpHostCounters($$) +{ + my ($Sched, $VM) = @_; + my $Host = _GetSchedHost($Sched, $VM); + return if ($Host->{dumpedcounters}); + + my $Counters = ""; + if ($Host->{active}) + { + $Counters .= " active=$Host->{active}/$Host->{MaxActiveVMs}"; + } + if ($Host->{idle}) + { + $Counters .= " idle=$Host->{idle}". ($Host->{queued} ? "" : "/$Host->{MaxVMsWhenIdle}"); + } + if ($Host->{reverting}) + { + $Counters .= " reverting=$Host->{reverting}/". _GetMaxReverts($Host); + } + for my $Counter ("sleeping", "running", "dirty", "queued") + { + $Counters .= " $Counter=$Host->{$Counter}" if ($Host->{$Counter}); + } + my $HostKey = $VM->GetHost(); + my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || + $HostKey; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$PrettyHost:$Counters\n") if ($Counters); + + $Host->{dumpedcounters} = 1; +} + +sub _DumpHostVMs($$$$) +{ + my ($Sched, $VM, $SortedNeededVMs, $NeededVMs) = @_; + my $Host = _GetSchedHost($Sched, $VM); + return if ($Host->{dumpedvms}); + + _DumpHostCounters($Sched, $VM); + + my @VMInfo; + my $HostKey = $VM->GetHost(); + foreach my $VMKey (@$SortedNeededVMs) + { + $VM = $Sched->{VMs}->GetItem($VMKey); + next if ($VM->GetHost() ne $HostKey); + + push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]); + } + my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || + $HostKey; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$PrettyHost: @VMInfo\n"); + + $Host->{dumpedvms} = 1; +} + sub _RevertVMs($$) { my ($Sched, $NeededVMs) = @_; @@ -1027,6 +1084,7 @@ sub _RevertVMs($$) # Check if the host has reached its reverting VMs limit my $Host = _GetSchedHost($Sched, $VM); next if ($Host->{reverting} >= _GetMaxReverts($Host)); + _DumpHostCounters($Sched, $VM); # Skip this VM if the previous step's tasks are not about to run yet next if (_HasMissingDependencies($Sched, $NeededVMs, $VMKey)); @@ -1071,6 +1129,7 @@ sub _RevertVMs($$) $NeedsSacrifice = ($FutureActive > $Host->{MaxActiveVMs}); } + _DumpHostVMs($Sched, $VM, \@SortedNeededVMs, $NeededVMs); if ($NeedsSacrifice) { # Find an active VM to sacrifice so we can revert this VM in the next -- 2.16.1

1 0

[PATCH 1/2] testbot: Make the job scheduler more extensible.
by Francois Gouget 19 Feb '18

19 Feb '18

- The new scheduler splits the work into smaller steps: assessing the current situation, starting tasks on idle VMs and building a list of needed VMs, reverting the VMs, powering off the remaining VMs, updating the activity records. Each part can be analyzed independently. It uses the $Sched structure to pass information between these functions. - Sometimes a VM that no Task needs must be powered off in order to be able to prepare a VM that is needed. The job of picking which VM to sacrifice is now delegated to _SacrificeVM(). - The scheduler used to handle each VM host independently. As a result it was unable to prepare a VM for the 'next step' if that VM was on another VM host. The lack of a global picture also made many other extensions impossible. The new scheduler handles scheduling on all VM hosts at the same time, thus solving this issue. - This and other improvements mean the scheduler no longer needs to loop over the jobs and tasks multiple times. - In order to respect the per-VM-host limits the scheduler stores the host-related counters and limits in the $Sched->{hosts} table. - The scheduler also used to build multiple lists of VMs to revert depending on whether they were needed now, for the next step, or for future jobs. The new scheduler builds a single prioritised list of VMs to revert which can be handled in one go. It also keeps more information so it can better decide which VM to prepare next. - The scheduler can now also prepare VMs for the 'next step' earlier, thus making it more likely they will be ready in time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 914 ++++++++++++++++++++++++++++------------ 1 file changed, 637 insertions(+), 277 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4ed6e03ff..036222110 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -429,6 +429,26 @@ sub CompareJobPriority return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; } +=pod +=over 12 + +=item C<CheckJobs()> + +Goes through the list of Jobs and updates their status. As a side-effect this +detects failed builds, dead child processes, etc. + +=back +=cut + +sub CheckJobs() +{ + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Status", ["queued", "running"]); + map { $_->UpdateStatus(); } @{$Jobs->GetItems()}; + + return undef; +} + sub min(@) { my $m = shift @_; @@ -436,304 +456,658 @@ sub min(@) return $m; } +sub _GetSchedHost($$) +{ + my ($Sched, $VM) = @_; + + my $HostKey = $VM->GetHost(); + if (!$Sched->{hosts}->{$HostKey}) + { + $Sched->{hosts}->{$HostKey} = { + active => 0, + idle => 0, + reverting => 0, + sleeping => 0, + running => 0, + dirty => 0, + MaxRevertingVMs => $MaxRevertingVMs, + MaxRevertsWhileRunningVMs => $MaxRevertsWhileRunningVMs, + MaxActiveVMs => $MaxActiveVMs, + MaxVMsWhenIdle => $MaxVMsWhenIdle, + }; + } + return $Sched->{hosts}->{$HostKey}; +} + +sub _GetMaxReverts($) +{ + my ($Host) = @_; + return ($Host->{running} > 0) ? + $Host->{MaxRevertsWhileRunningVMs} : + $Host->{MaxRevertingVMs}; +} + =pod =over 12 -=item C<ScheduleOnHost()> +=item C<_CanScheduleOnVM()> -This manages the VMs and WineTestBot::Task objects corresponding to the -hypervisors of a given host. To stay within the host's resource limits the -scheduler must take the following constraints into account: -=over +Checks if a task or VM operation can be performed on the specified VM. -=item * +=back +=cut -Jobs should be run in decreasing order of priority. +sub _CanScheduleOnVM($$) +{ + my ($Sched, $VM) = @_; -=item * + return 1 if ($VM->Status eq "off"); -A Job's Steps must be run in sequential order. + # If the VM is busy it cannot be taken over for a new task + my $VMKey = $VM->GetKey(); + return 0 if ($Sched->{busyvms}->{$VMKey}); + + # A process may be working on the VM even though it is not busy (e.g. if it + # is sleeping). In that case just wait. + return !$VM->ChildPid; +} + +=pod +=over 12 + +=item C<_CheckAndClassifyVMs()> + +Checks the VMs state consistency, counts the VMs in each state and classifies +them. + +=over =item * -A Step's tasks can be run in parallel but only one task can be running in a VM -at a given time. Also a VM must be prepared before it can run its task, see the -VM Statuses. +Checks that each VM's state is consistent and fixes the VM state if not. For +instance, if Status == running then the VM should have a child process. If +there is no such process, or if it died, then the VM should be brought back +to a coherent state, typically by marking it dirty so it is either powered off +or reverted. =item * -The number of active VMs on the host must be kept under $MaxActiveVMs. This -includes any VM using resources, including those that are being reverted. The -rational behind this limit is that the host may not be able to run more VMs -simultaneously, typically due to memory or CPU constraints. Also note that -this limit must be respected even if there is more than one hypervisor running -on the host. +Counts the VMs in each state so the scheduler can respect the limits put on the +number of simultaneous active VMs, reverting VMs, and so on. =item * -The number of VMs being reverted on the host at a given time must be kept under -$MaxRevertingVMs, or $MaxRevertsWhileRunningVMs if some VMs are currently -running tests. This may be set to 1 in case the hypervisor gets confused when -reverting too many VMs at once. +Puts the VMs in one of three sets: +- The set of busyvms. + This is the set of VMs that are doing something important, for instance + running a Task, and should not be messed with. +- The set of lambvms. + This is the set of VMs that use resources (they are powered on), but are + not doing anything important (idle, sleeping and dirty VMs). If the scheduler + is hitting the limits but still needs to power on one more VM, it can power + off one of these to make room. +- The set of powered off VMs. + These are the VMs which are in neither the busyvms nor the lambvms set. Since + they are powered off they are not using resources. =item * -Once there are no jobs to run anymore the scheduler can prepare up to -$MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. -This can be set to 0 to minimize the TestBot resource usage when idle. -This can also be set to a value greater than $MaxActiveVMs. Then only -$MaxActiveVMs tasks will be run simultaneously but the extra idle VMs will be -kept on standby so they are ready when their turn comes. +Each VM is given a priority describing the likelihood that it will be needed +by a future job. When no other VM is running this can be used to decide which +VMs to start in advance. -=cut +=back =back =cut -sub ScheduleOnHost($$$$) +sub _CheckAndClassifyVMs() { - my ($ScopeObject, $SortedJobs, $Hypervisors, $Records) = @_; - - my $HostVMs = CreateVMs($ScopeObject); - $HostVMs->FilterEnabledRole(); - $HostVMs->FilterHypervisors($Hypervisors); + my $Sched = { + VMs => CreateVMs(), + hosts => {}, + busyvms => {}, + lambvms=> {}, + nicefuture => {}, + runnable => 0, + queued => 0, + recordgroups => CreateRecordGroups(), + }; + $Sched->{recordgroup} = $Sched->{recordgroups}->Add(); + $Sched->{records} = $Sched->{recordgroup}->Records; + # Save the new RecordGroup now so its Id is lower than those of the groups + # created by the scripts called from the scheduler. + $Sched->{recordgroups}->Save(); + my $FoundVMErrors; # Count the VMs that are 'active', that is, that use resources on the host, # and those that are reverting. Also build a prioritized list of those that # are ready to run tests: the idle ones. - my ($RevertingCount, $RunningCount, $IdleCount) = (0, 0, 0); - my (%VMPriorities, %IdleVMs, @DirtyVMs); - foreach my $VM (@{$HostVMs->GetItems()}) + foreach my $VM (@{$Sched->{VMs}->GetItems()}) { my $VMKey = $VM->GetKey(); - my $VMStatus = $VM->Status; - if ($VMStatus eq "reverting") + if (!$VM->HasEnabledRole()) { - $RevertingCount++; + # Don't schedule anything on this VM and otherwise ignore it + $Sched->{busyvms}->{$VMKey} = 1; + next; } - elsif ($VMStatus eq "running") - { - $RunningCount++; - } - elsif ($VMStatus eq "offline") + + my $Host = _GetSchedHost($Sched, $VM); + if ($VM->HasRunningChild()) { - if (!$VM->HasRunningChild()) + if ($VM->Status =~ /^(?:dirty|running|reverting)$/) { - $VM->RecordResult($Records, "boterror process died"); - my $ErrMessage = $VM->RunMonitor(); - return $ErrMessage if (defined $ErrMessage); + $Sched->{busyvms}->{$VMKey} = 1; + $Host->{$VM->Status}++; + $Host->{active}++; + } + elsif ($VM->Status eq "sleeping") + { + # Note that in the case of powered off VM snapshots, a sleeping VM is + # in fact booting up thus taking CPU and I/O resources. + # So don't count it as idle. + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{sleeping}++; + $Host->{active}++; + } + elsif ($VM->Status eq "offline") + { + # The VM cannot be used until it comes back online + $Sched->{busyvms}->{$VMKey} = 1; + } + elsif ($VM->Status eq "maintenance") + { + # Maintenance VMs should not have a child process! + $FoundVMErrors = 1; + $VM->KillChild(); + $VM->Save(); + $VM->RecordResult($Sched->{records}, "boterror unexpected process"); + # And the scheduler should not touch them + $Sched->{busyvms}->{$VMKey} = 1; + } + elsif ($VM->Status =~ /^(?:idle|off)$/) + { + # idle and off VMs should not have a child process! + # Mark the VM dirty so a poweroff or revert brings it to a known state. + $FoundVMErrors = 1; + $VM->KillChild(); + $VM->Status("dirty"); + $VM->Save(); + $VM->RecordResult($Sched->{records}, "boterror unexpected process"); + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{dirty}++; + $Host->{active}++; + } + else + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Unexpected $VMKey status ". $VM->Status ."\n"); + $FoundVMErrors = 1; + # Don't interfere with this VM + $Sched->{busyvms}->{$VMKey} = 1; } } else { - my $Priority = $VM->Type eq "build" ? 10 : - $VM->Role ne "base" ? 0 : - $VM->Type eq "win32" ? 1 : 2; - $VMPriorities{$VMKey} = $Priority; - - # Consider sleeping VMs to be 'almost idle'. We will check their real - # status before starting a job on them anyway. But if there is no such - # job, then they are expandable just like idle VMs. - if ($VMStatus eq "idle" || $VMStatus eq "sleeping") + if (defined $VM->ChildPid or + $VM->Status =~ /^(?:running|reverting|sleeping)$/) { - $IdleCount++; - $IdleVMs{$VMKey} = 1; + # The VM is missing its child process or it died unexpectedly. Mark + # the VM dirty so a revert or shutdown brings it back to a known state. + $FoundVMErrors = 1; + $VM->ChildPid(undef); + $VM->Status("dirty"); + $VM->Save(); + $VM->RecordResult($Sched->{records}, "boterror process died"); + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{dirty}++; + $Host->{active}++; } - elsif ($VMStatus eq "dirty") + elsif ($VM->Status =~ /^(?:dirty|idle)$/) { - push @DirtyVMs, $VMKey; + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{$VM->Status}++; + $Host->{active}++; } + elsif ($VM->Status eq "offline") + { + my $ErrMessage = $VM->RunMonitor(); + return ($ErrMessage, undef) if (defined $ErrMessage); + # Ignore the VM for this round since we cannot use it + $Sched->{busyvms}->{$VMKey} = 1; + } + elsif ($VM->Status eq "maintenance") + { + # Don't touch the VM while the administrator is working on it + $Sched->{busyvms}->{$VMKey} = 1; + } + elsif ($VM->Status ne "off") + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Unexpected $VMKey status ". $VM->Status ."\n"); + $FoundVMErrors = 1; + # Don't interfere with this VM + $Sched->{busyvms}->{$VMKey} = 1; + } + # Note that off VMs are neither in busyvms nor lambvms } + + $Sched->{nicefuture}->{$VMKey} = + ($VM->Role eq "base" ? 0 : + $VM->Role eq "winetest" ? 10 : + 20) + # extra + ($VM->Type eq "build" ? 0 : + $VM->Type eq "win64" ? 1 : + 2); # win32 + } + + # If a VM was in an inconsistent state, update the jobs status fields before + # continuing with the scheduling. + CheckJobs() if ($FoundVMErrors); + + return (undef, $Sched); +} + +=pod +=over 12 + +=item C<_AddNeededVM()> + +Adds the specified VM to the list of VMs needed by queued tasks, together with +priority information. The priority information is stored in an array which +contains: + +=over + +=item [0] + +The VM's position in the Jobs list. Newer jobs give precedence to older ones. +Note that the position within a job ($Step->No and $Task->No) does not matter. +What counts is getting the job results to the developer. + +=item [1] + +The VM Status: dirty VMs are given a small priority boost since they are +likely to already be in the host's memory. + +=item [2] + +The number of Tasks that need the VM. Give priority to VMs that are needed by +more Tasks so we don't end up in a situation where all the tasks need the same +VM, which cannot be parallelized. + +=item [3] + +If the VM is needed for a 'next step', then this lists its dependencies. +The dependencies are the VMs that are still needed by a task in the current +step. If any VM in the dependencies list is not yet being prepared to run +a task, then it is too early to start preparing this VM for the next step. + +=back + +=back +=cut + +sub _AddNeededVM($$$;$) +{ + my ($NeededVMs, $VM, $Niceness, $Dependencies) = @_; + + my $VMKey = $VM->GetKey(); + if (!$NeededVMs->{$VMKey}) + { + my $Hot = ($VM->Status ne "off") ? 1 : 0; + my $PendingReverts = ($VM->Status !~ /^(?:idle|reverting|sleeping)$/) ? 1 : 0; + $NeededVMs->{$VMKey} = [$Niceness, $Hot, $PendingReverts, $Dependencies]; + return 1; } - # It usually takes longer to revert a VM than to run a test. So readyness - # (idleness) trumps the Job priority and thus we start jobs on the idle VMs - # right away. Then we build a prioritized list of VMs to revert. - my (%VMsToRevert, @VMsNext); - my ($RevertNiceness, $SleepingCount) = (0, 0); - foreach my $Job (@$SortedJobs) + # One more task needs this VM + $NeededVMs->{$VMKey}->[2]++; + + # Although we process the jobs in decreasing priority order, the VM may + # have been added for a 'next step' task and thus with a much increased + # niceness and dependencies compared to the jobs that follow. + if ($Niceness < $NeededVMs->{$VMKey}->[0]) + { + $NeededVMs->{$VMKey}->[0] = $Niceness; + $NeededVMs->{$VMKey}->[3] = $Dependencies; + return 1; + } + + return 0; +} + +sub _GetNiceness($$) +{ + my ($NeededVMs, $VMKey) = @_; + return $NeededVMs->{$VMKey}->[0]; +} + +sub _CompareNeededVMs($$$) +{ + my ($NeededVMs, $VMKey1, $VMKey2) = @_; + + my $Data1 = $NeededVMs->{$VMKey1}; + my $Data2 = $NeededVMs->{$VMKey2}; + return $Data1->[0] <=> $Data2->[0] || # Lower niceness jobs first + $Data2->[1] <=> $Data1->[1] || # Hot VMs first + $Data2->[2] <=> $Data1->[2]; # Needed by more tasks first +} + +sub _HasMissingDependencies($$$) +{ + my ($Sched, $NeededVMs, $VMKey) = @_; + + my $Data = $NeededVMs->{$VMKey}; + return undef if (!$Data->[3]); + + foreach my $DepVM (@{$Data->[3]}) { + return 1 if ($DepVM->Status !~ /^(?:reverting|sleeping|running)$/); + } + return undef; +} + +my $NEXT_BASE = 1000; +my $FUTURE_BASE = 2000; + +=pod +=over 12 + +=item C<_ScheduleTasks()> + +Runs the tasks on idle VMs, and builds a list of the VMs that will be needed +next. + +=back +=cut + +sub _ScheduleTasks($) +{ + my ($Sched) = @_; + + # The set of VMs needed by the runnable, 'next step' and future tasks + my $NeededVMs = {}; + + # Process the jobs in decreasing priority order + my $JobRank; + my $Jobs = CreateJobs($Sched->{VMs}); + $Jobs->AddFilter("Status", ["queued", "running"]); + foreach my $Job (sort CompareJobPriority @{$Jobs->GetItems()}) + { + $JobRank++; + + # The list of VMs that should be getting ready to run + # before we prepare the next step + my $PreviousVMs = []; + + my $StepRank = 0; my $Steps = $Job->Steps; $Steps->AddFilter("Status", ["queued", "running"]); - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - if (@SortedSteps != 0) + foreach my $Step (sort { $a->No <=> $b->No } @{$Steps->GetItems()}) { - my $Step = $SortedSteps[0]; - $Step->HandleStaging(); - my $PrepareNextStep; my $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - my @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; - foreach my $Task (@SortedTasks) + $Sched->{queued} += $Tasks->GetItemsCount(); + + # StepRank 0 contains the runnable tasks, 1 the 'may soon be runnable' + # ones, and 2 and greater tasks we don't care about yet + next if ($StepRank >= 2); + if ($StepRank == 0) + { + $Step->HandleStaging() if ($Step->Status eq "queued"); + $Sched->{runnable} += $Tasks->GetItemsCount(); + } + elsif (!$PreviousVMs) + { + # The previous step is nowhere near done so skip this one for now + next; + } + + my $StepVMs = []; + foreach my $Task (@{$Tasks->GetItems()}) { my $VM = $Task->VM; - my $VMKey = $VM->GetKey(); - next if (!$HostVMs->ItemExists($VMKey) || exists $VMsToRevert{$VMKey}); + next if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()); - my $VMStatus = $VM->Status; - if ($VMStatus eq "idle") + if ($StepRank == 1) { + # Passing $PreviousVMs ensures this VM will be reverted if and only + # if all of the previous step's tasks are about to run. + # See _HasMissingDependencies(). + _AddNeededVM($NeededVMs, $VM, $NEXT_BASE + $JobRank, $PreviousVMs); + next; + } + + if (!_AddNeededVM($NeededVMs, $VM, $JobRank)) + { + # This VM is in $NeededVMs already which means it is already + # scheduled to be reverted for a task with a higher priority. + # So this task won't be run before a while and thus there is + # no point in preparing the next step. + $StepVMs = undef; + next; + } + + # It's not worth preparing the next step for tasks that take so long + $StepVMs = undef if ($Task->Timeout > $BuildTimeout); + + my $VMKey = $VM->GetKey(); + if ($VM->Status eq "idle") + { + # Most of the time reverting a VM takes longer than running a task. + # So if a VM is ready (i.e. idle) we can start the first task we + # find for it, even if we could revert another VM to run a higher + # priority job. # Even if we cannot start the task right away this VM is not a # candidate for shutdown since it will be needed next. - $IdleVMs{$VMKey} = 0; + delete $Sched->{lambvms}->{$VMKey}; - if ($RunningCount < $MaxActiveVMs and - ($RevertingCount == 0 || $RevertingCount < $MaxRevertsWhileRunningVMs)) + my $Host = _GetSchedHost($Sched, $VM); + if ($Host->{active} - $Host->{idle} < $Host->{MaxActiveVMs} and + ($Host->{reverting} == 0 or + $Host->{reverting} <= $Host->{MaxRevertsWhileRunningVMs})) { + $Sched->{busyvms}->{$VMKey} = 1; + $VM->RecordStatus($Sched->{records}, join(" ", "running", $Job->Id, $Step->No, $Task->No)); my $ErrMessage = $Task->Run($Step); - return $ErrMessage if (defined $ErrMessage); - $VM->RecordStatus($Records, join(" ", "running", $Job->Id, $Step->No, $Task->No)); + return ($ErrMessage, undef) if (defined $ErrMessage); + $Job->UpdateStatus(); - $IdleCount--; - $RunningCount++; - $PrepareNextStep = 1; + $Host->{idle}--; + $Host->{running}++; } } - elsif ($VMStatus eq "sleeping" and $IdleVMs{$VMKey}) + elsif ($VM->Status =~ /^(?:reverting|sleeping)$/) { - # It's not running jobs yet but soon will be - # so it's not a candidate for shutdown or revert. - $IdleVMs{$VMKey} = 0; - $IdleCount--; - $SleepingCount++; - $PrepareNextStep = 1; + # The VM is not running jobs yet but soon will be so it is not a + # candidate for shutdown or sacrifices. + delete $Sched->{lambvms}->{$VMKey}; } - elsif (($VMStatus eq "off" or $VMStatus eq "dirty") and - !$VM->HasRunningChild()) + elsif ($VM->Status ne "off" and !$Sched->{lambvms}->{$VMKey}) { - $RevertNiceness++; - $VMsToRevert{$VMKey} = $RevertNiceness; - } - } - if ($PrepareNextStep && @SortedSteps >= 2) - { - # Build a list of VMs we will need next - my $Step = $SortedSteps[1]; - $Tasks = $Step->Tasks; - $Tasks->AddFilter("Status", ["queued"]); - @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; - foreach my $Task (@SortedTasks) - { - my $VM = $Task->VM; - my $VMKey = $VM->GetKey(); - push @VMsNext, $VMKey; - # If idle already this is not a candidate for shutdown - $IdleVMs{$VMKey} = 0; + # We cannot use the VM because it is busy (running another task, + # offline, etc.). So it is too early to prepare the next step. + $StepVMs = undef; } + push @$StepVMs, $VM if ($StepVMs); } + $PreviousVMs = $StepVMs; + $StepRank++; } } - # Figure out how many VMs we will actually be able to revert now and only - # keep the highest priority ones. - my @SortedVMsToRevert = sort { $VMsToRevert{$a} <=> $VMsToRevert{$b} } keys %VMsToRevert; - my $MaxReverts = ($RunningCount > 0) ? - $MaxRevertsWhileRunningVMs : $MaxRevertingVMs; - my $ActiveCount = $IdleCount + $RunningCount + $RevertingCount + $SleepingCount + @DirtyVMs; - # This is the number of VMs we would revert if idle and dirty VMs did not - # stand in the way. And those that do will be shut down. - my $RevertableCount = min(scalar(@SortedVMsToRevert), - $MaxReverts - $RevertingCount, - $MaxActiveVMs - ($ActiveCount - $IdleCount - @DirtyVMs)); - if ($RevertableCount < @SortedVMsToRevert) + # Finally add some VMs with a very low priority for future jobs. + foreach my $VM (@{$Sched->{VMs}->GetItems()}) { - $RevertableCount = 0 if ($RevertableCount < 0); - for (my $i = $RevertableCount; $i < @SortedVMsToRevert; $i++) - { - my $VMKey = $SortedVMsToRevert[$i]; - delete $VMsToRevert{$VMKey}; - } - splice @SortedVMsToRevert, $RevertableCount; + next if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()); + my $VMKey = $VM->GetKey(); + my $Niceness = $FUTURE_BASE + $Sched->{nicefuture}->{$VMKey}; + _AddNeededVM($NeededVMs, $VM, $Niceness); } - # Power off all the VMs that we won't be reverting now so they don't waste - # resources while waiting for their turn. - foreach my $VMKey (@DirtyVMs) - { - next if (exists $VMsToRevert{$VMKey}); + return (undef, $NeededVMs); +} - my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status ne "dirty" or $VM->HasRunningChild()); +=pod +=over 12 - my $ErrMessage = $VM->RunPowerOff(); - return $ErrMessage if (defined $ErrMessage); - $VM->RecordStatus($Records, "dirty poweroff"); - } +=item C<_SacrificeVM()> - # Power off some idle VMs we don't need immediately so we can revert more - # of the VMs we need now. - my $PlannedActiveCount = $ActiveCount - @DirtyVMs + @SortedVMsToRevert; - if ($IdleCount > 0 && @SortedVMsToRevert > 0 && - $PlannedActiveCount > $MaxActiveVMs) - { - # Sort from least important to most important - my @SortedIdleVMs = sort { $VMPriorities{$a} <=> $VMPriorities{$b} } keys %IdleVMs; - foreach my $VMKey (@SortedIdleVMs) - { - my $VM = $HostVMs->GetItem($VMKey); - next if (!$IdleVMs{$VMKey}); +Looks for and powers off a VM we don't need now in order to free resources +for one we do need now. - my $ErrMessage = $VM->RunPowerOff(); - return $ErrMessage if (defined $ErrMessage); - $VM->RecordStatus($Records, "dirty poweroff"); - $PlannedActiveCount--; - last if ($PlannedActiveCount <= $MaxActiveVMs); - } - # The scheduler will be run again when these VMs have been powered off and - # then we will do the reverts. In the meantime don't change $ActiveCount. - } +This is a helper for _RevertVMs(). - # Revert the VMs that are blocking jobs - foreach my $VMKey (@SortedVMsToRevert) +=back +=cut + +sub _SacrificeVM($$$) +{ + my ($Sched, $NeededVMs, $VM) =@_; + my $VMKey = $VM->GetKey(); + my $Host = _GetSchedHost($Sched, $VM); + + # Grab the lowest priority lamb and sacrifice it + my $ForFutureVM = (_GetNiceness($NeededVMs, $VMKey) >= $FUTURE_BASE); + my $NiceFuture = $Sched->{nicefuture}; + my ($Victim, $VictimKey, $VictimStatusPrio); + foreach my $CandidateKey (keys %{$Sched->{lambvms}}) { - last if ($RevertingCount == $MaxReverts); + my $Candidate = $Sched->{VMs}->GetItem($CandidateKey); - my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status eq "off" and $ActiveCount >= $MaxActiveVMs); + # Check that the candidate is on the right host + my $CandidateHost = _GetSchedHost($Sched, $Candidate); + next if ($CandidateHost != $Host); - delete $VMPriorities{$VMKey}; - my $ErrMessage = $VM->RunRevert(); - return $ErrMessage if (defined $ErrMessage); + # Don't sacrifice idle / sleeping VMs for future tasks + next if ($ForFutureVM and $Candidate->Status =~ /^(?:idle|sleeping)/); - $RevertingCount++; - $ActiveCount++ if ($VM->Status eq "off"); + # Don't sacrifice more important VMs + next if (_CompareNeededVMs($NeededVMs, $CandidateKey, $VMKey) <= 0); + + my $CandidateStatusPrio = $Candidate->Status eq "idle" ? 2 : + $Candidate->Status eq "sleeping" ? 1 : + 0; # Status eq dirty + if ($Victim) + { + my $Cmp = $VictimStatusPrio <=> $CandidateStatusPrio || + $NiceFuture->{$CandidateKey} <=> $NiceFuture->{$VictimKey}; + next if ($Cmp <= 0); + } + + $Victim = $Candidate; + $VictimKey = $CandidateKey; + $VictimStatusPrio = $CandidateStatusPrio; } + return undef if (!$Victim); + + delete $Sched->{lambvms}->{$VictimKey}; + $Sched->{busyvms}->{$VictimKey} = 1; + $Host->{$Victim->Status}--; + $Host->{dirty}++; + $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); + $Victim->RunPowerOff(); + return 1; +} - # Prepare some VMs for the next step of the current jobs - foreach my $VMKey (@VMsNext) +sub _RevertVMs($$) +{ + my ($Sched, $NeededVMs) = @_; + + # Sort the VMs that tasks need by decreasing priority order and revert them + my @SortedNeededVMs = sort { _CompareNeededVMs($NeededVMs, $a, $b) } keys %{$NeededVMs}; + foreach my $VMKey (@SortedNeededVMs) { - last if ($RevertingCount == $MaxReverts); - last if ($ActiveCount >= $MaxActiveVMs); + my $VM = $Sched->{VMs}->GetItem($VMKey); + my $VMStatus = $VM->Status; + next if ($VMStatus eq "idle"); - my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status ne "off"); + # Check if the host has reached its reverting VMs limit + my $Host = _GetSchedHost($Sched, $VM); + next if ($Host->{reverting} >= _GetMaxReverts($Host)); - my $ErrMessage = $VM->RunRevert(); - return $ErrMessage if (defined $ErrMessage); - $RevertingCount++; - $ActiveCount++; - } + # Skip this VM if the previous step's tasks are not about to run yet + next if (_HasMissingDependencies($Sched, $NeededVMs, $VMKey)); + next if (!_CanScheduleOnVM($Sched, $VM)); - # Finally, if we are otherwise idle, prepare some VMs for future jobs - if ($ActiveCount == $IdleCount && $ActiveCount < $MaxVMsWhenIdle) - { - # Sort from most important to least important - my @SortedVMs = sort { $VMPriorities{$b} <=> $VMPriorities{$a} } keys %VMPriorities; - foreach my $VMKey (@SortedVMs) + my $NeedsSacrifice; + if (_GetNiceness($NeededVMs, $VMKey) >= $FUTURE_BASE) { - last if ($RevertingCount == $MaxReverts); - last if ($ActiveCount >= $MaxVMsWhenIdle); - - my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status ne "off"); + if (!exists $Host->{isidle}) + { + # Only start preparing VMs for future jobs on a host which is idle. + # FIXME As a proxy we currently check that the host only has idle VMs. + # This is a bad proxy because: + # - The host could still have pending tasks for a 'next step'. Once + # those get closer to running, preparing those would be better than + # preparing future VMs. + # - Checking there are no queued tasks on that host would be better + # but this information is not available on a per-host basis. + # - Also the number of queued tasks includes tasks scheduled to run + # on maintenance and retired/deleted VMs. Any such task would prevent + # preparing future VMs for no good reason. + # - It forces the host to go through an extra poweroff during which we + # lose track of which VM is 'hot'. + # - However on startup this helps ensure that we are not prevented + # from preparing the best VM (e.g. build) just because it is still + # being checked (i.e. marked dirty). + $Host->{isidle} = ($Host->{active} == $Host->{idle}); + } + if (!$Host->{isidle} or $Host->{MaxVMsWhenIdle} == 0) + { + # The TestBot is busy or does not prepare VMs when idle + next; + } + # To not exceed the limit we must take into account VMs that are not yet + # idle but will soon be. + my $FutureIdle = $Host->{idle} + $Host->{reverting} + $Host->{sleeping} + ($VMStatus eq "off" ? 1 : 0); + $NeedsSacrifice = ($FutureIdle > $Host->{MaxVMsWhenIdle}); + } + else + { + my $FutureActive = $Host->{active} + ($VMStatus eq "off" ? 1 : 0); + $NeedsSacrifice = ($FutureActive > $Host->{MaxActiveVMs}); + } + if ($NeedsSacrifice) + { + # Find an active VM to sacrifice so we can revert this VM in the next + # scheduler round + last if (!_SacrificeVM($Sched, $NeededVMs, $VM)); + delete $Sched->{lambvms}->{$VMKey}; + # The $Host counters must account for the coming revert. This means + # active is unchanged: -1 for the sacrificed VM and +1 for the revert. + $Host->{reverting}++; + } + else + { + delete $Sched->{lambvms}->{$VMKey}; + $Sched->{busyvms}->{$VMKey} = 1; my $ErrMessage = $VM->RunRevert(); return $ErrMessage if (defined $ErrMessage); - $RevertingCount++; - $ActiveCount++; + $Host->{active}++ if ($VMStatus eq "off"); + $Host->{reverting}++; } } + return undef; +} +sub _PowerOffDirtyVMs($) +{ + my ($Sched) = @_; + + # Power off any still dirty VM + foreach my $VMKey (keys %{$Sched->{lambvms}}) + { + my $VM = $Sched->{VMs}->GetItem($VMKey); + next if ($VM->Status ne "dirty"); + + $VM->RecordStatus($Sched->{records}, "dirty poweroff"); + my $ErrMessage = $VM->RunPowerOff(); + return $ErrMessage if (defined $ErrMessage); + } return undef; } @@ -744,106 +1118,92 @@ my $_LastTaskCounts = ""; =item C<ScheduleJobs()> -Goes through the WineTestBot hosts and schedules the Job tasks on each of -them using WineTestBot::Jobs::ScheduleOnHost(). +Goes through the pending Jobs to run their queued Tasks. This implies preparing +the VMs while staying within the VM hosts resource limits. In particular this +means taking the following constraints into account: + +=over + +=item * + +Jobs should be run in decreasing order of priority. + +=item * + +A Job's Steps must be run in sequential order. + +=item * + +A Step's tasks can be run in parallel but only one task can be running in a VM +at a given time. Also a VM must be prepared before it can run its task, see the +VM Statuses. + +=item * + +The number of active VMs on the host must be kept under $MaxActiveVMs. Any +VM using resources counts as an active VM, including those that are being +reverted. This limit is meant to ensure the VM host will have enough memory, +CPU or I/O resources for all the active VMs. Also note that this limit must be +respected even if there is more than one hypervisor running on the host. + +=item * + +The number of VMs being reverted on the host at a given time must be kept under +$MaxRevertingVMs, or $MaxRevertsWhileRunningVMs if some VMs are currently +running tests. This may be set to 1 in case the hypervisor gets confused when +reverting too many VMs at once. + +=item * + +Once there are no jobs to run anymore the scheduler can prepare up to +$MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. +This can be set to 0 to minimize the TestBot resource usage when idle. +This can also be set to a value greater than $MaxActiveVMs. Then only +$MaxActiveVMs tasks will be run simultaneously but the extra idle VMs will be +kept on standby so they are ready when their turn comes. + +=back =back =cut sub ScheduleJobs() { - my $RecordGroups = CreateRecordGroups(); - my $RecordGroup = $RecordGroups->Add(); - my $Records = $RecordGroup->Records; - # Save the new RecordGroup now so its Id is lower than those of the groups - # created by the scripts called from the scheduler. - $RecordGroups->Save(); + my ($ErrMessage, $Sched) = _CheckAndClassifyVMs(); + return $ErrMessage if ($ErrMessage); - my $Jobs = CreateJobs(); - $Jobs->AddFilter("Status", ["queued", "running"]); - my @SortedJobs = sort CompareJobPriority @{$Jobs->GetItems()}; - # Note that even if there are no jobs to schedule - # we should check if there are VMs to revert + my $NeededVMs; + ($ErrMessage, $NeededVMs) = _ScheduleTasks($Sched); + return $ErrMessage if ($ErrMessage); - # Count the runnable and queued tasks for the record - my ($RunnableTasks, $QueuedTasks) = (0, 0); - foreach my $Job (@SortedJobs) - { - my $Steps = $Job->Steps; - $Steps->AddFilter("Status", ["queued", "running"]); - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - next if (!@SortedSteps); + $ErrMessage = _RevertVMs($Sched, $NeededVMs); + return $ErrMessage if ($ErrMessage); - my $Tasks = $SortedSteps[0]->Tasks; - $Tasks->AddFilter("Status", ["queued"]); - $RunnableTasks += @{$Tasks->GetItems()}; - - foreach my $Step (@SortedSteps) - { - my $Tasks = $Step->Tasks; - $Tasks->AddFilter("Status", ["queued"]); - $QueuedTasks += scalar(@{$Tasks->GetItems()}); - } - } - - my %Hosts; - my $VMs = CreateVMs($Jobs); - $VMs->FilterEnabledRole(); - foreach my $VM (@{$VMs->GetItems()}) - { - my $Host = $VM->GetHost(); - $Hosts{$Host}->{$VM->VirtURI} = 1; - } - - my @ErrMessages; - foreach my $Host (keys %Hosts) - { - my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors, $Records); - push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); - } + $ErrMessage = _PowerOffDirtyVMs($Sched); + return $ErrMessage if ($ErrMessage); # Note that any VM Status or Role change will trigger ScheduleJobs() so this - # records all VM state changes. - $VMs = CreateVMs(); - map { $_->RecordStatus($Records) } (@{$VMs->GetItems()}); - if (@{$Records->GetItems()}) + # records all not yet recorded VM state changes, even those not initiated by + # the scheduler. + map { $_->RecordStatus($Sched->{records}) } @{$Sched->{VMs}->GetItems()}; + + if (@{$Sched->{records}->GetItems()}) { # FIXME Add the number of tasks scheduled to run on a maintenance, retired # or deleted VM... - my $TaskCounts = "$RunnableTasks $QueuedTasks 0"; + my $TaskCounts = "$Sched->{runnable} $Sched->{queued} 0"; if ($TaskCounts ne $_LastTaskCounts) { - $Records->AddRecord('tasks', 'counters', $TaskCounts); + $Sched->{records}->AddRecord('tasks', 'counters', $TaskCounts); $_LastTaskCounts = $TaskCounts; } - $RecordGroups->Save(); + $Sched->{recordgroups}->Save(); } else { - $RecordGroups->DeleteItem($RecordGroup); + $Sched->{recordgroups}->DeleteItem($Sched->{recordgroup}); } - return @ErrMessages ? join("\n", @ErrMessages) : undef; -} - -=pod -=over 12 - -=item C<CheckJobs()> - -Goes through the list of Jobs and updates their status. As a side-effect this -detects failed builds, dead child processes, etc. - -=back -=cut - -sub CheckJobs() -{ - my $Jobs = CreateJobs(); - $Jobs->AddFilter("Status", ["queued", "running"]); - map { $_->UpdateStatus(); } @{$Jobs->GetItems()}; - return undef; } -- 2.16.1

1 0

[PATCH 5/5] ddraw: Compare with the correct view in ddraw_surface_delete_attached_surface().
by Henri Verbeet 18 Feb '18

18 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 739e68f..30276b4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2069,7 +2069,7 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa * particular, modify the QueryInterface() pointer in the surface vtbl * but don't cleanup properly after the relevant dll is unloaded. */ if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER - && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == surface->wined3d_rtv) + && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == attachment->wined3d_rtv) wined3d_device_set_depth_stencil_view(surface->ddraw->wined3d_device, NULL); wined3d_mutex_unlock(); -- 2.1.4

1 0

[PATCH 2/5] wined3d: Split WINED3D_RESOURCE_ACCESS_MAP into WINED3D_RESOURCE_ACCESS_MAP_R and WINED3D_RESOURCE_ACCESS_MAP_W.
by Henri Verbeet 18 Feb '18

18 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 12 ++++-------- dlls/d3d11/tests/d3d11.c | 6 ++---- dlls/d3d11/utils.c | 12 ++++++------ dlls/d3d8/buffer.c | 6 ++++-- dlls/d3d8/d3d8_private.h | 7 ++++--- dlls/d3d8/device.c | 7 ++++--- dlls/d3d8/texture.c | 6 ++++-- dlls/d3d9/buffer.c | 6 ++++-- dlls/d3d9/d3d9_private.h | 7 ++++--- dlls/d3d9/device.c | 7 ++++--- dlls/d3d9/texture.c | 6 ++++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 7 ++++--- dlls/ddraw/surface.c | 7 ++++--- dlls/ddraw/vertexbuffer.c | 4 ++-- dlls/wined3d/resource.c | 10 ++++++++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 3 ++- include/wine/wined3d.h | 3 ++- 20 files changed, 70 insertions(+), 54 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6607059..0903ab1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8199,28 +8199,26 @@ static void check_buffer_cpu_access_(unsigned int line, ID3D10Buffer *buffer, expected_hr = cpu_read ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_READ, 0, &data); - todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); expected_hr = !dynamic && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_WRITE, 0, &data); - todo_wine_if(expected_hr != S_OK && cpu_access) + todo_wine_if(dynamic && cpu_write) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); expected_hr = cpu_read && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_READ_WRITE, 0, &data); - todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ_WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); expected_hr = dynamic ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_WRITE_DISCARD, 0, &data); - todo_wine_if(expected_hr != S_OK && cpu_access) + todo_wine_if(!dynamic && cpu_write) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE_DISCARD.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); @@ -8254,28 +8252,26 @@ static void check_texture_cpu_access_(unsigned int line, ID3D10Texture2D *textur expected_hr = cpu_read ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); expected_hr = !dynamic && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) + todo_wine_if(dynamic && cpu_write) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); expected_hr = cpu_read && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ_WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); expected_hr = dynamic ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_WRITE_DISCARD, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) + todo_wine_if(!dynamic && cpu_write) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE_DISCARD.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index af8fc7b..35551d0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11029,7 +11029,6 @@ static void check_resource_cpu_access_(unsigned int line, ID3D11DeviceContext *c expected_hr = cpu_read ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_READ, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); @@ -11037,21 +11036,20 @@ static void check_resource_cpu_access_(unsigned int line, ID3D11DeviceContext *c /* WRITE_DISCARD and WRITE_NO_OVERWRITE are the only allowed options for dynamic resources. */ expected_hr = !dynamic && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) + todo_wine_if(dynamic && cpu_write) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); expected_hr = cpu_read && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_READ_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ_WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); expected_hr = dynamic ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); - todo_wine_if(expected_hr != S_OK && cpu_access) + todo_wine_if(!dynamic && cpu_write) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE_DISCARD.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 5c6add7..cd226b2 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -801,12 +801,12 @@ unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) unsigned int access; access = usage == D3D11_USAGE_STAGING ? WINED3D_RESOURCE_ACCESS_CPU : WINED3D_RESOURCE_ACCESS_GPU; - if (cpu_access) - { - if (~cpu_access & (D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ)) - FIXME("Ignoring CPU access flags %#x.\n", cpu_access); - access |= WINED3D_RESOURCE_ACCESS_MAP; - } + if (cpu_access & D3D11_CPU_ACCESS_WRITE) + access |= WINED3D_RESOURCE_ACCESS_MAP_W; + if (cpu_access & D3D11_CPU_ACCESS_READ) + access |= WINED3D_RESOURCE_ACCESS_MAP_R; + if (cpu_access &= ~(D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ)) + FIXME("Unhandled CPU access flags %#x.\n", cpu_access); return access; } diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index d4d73ad..fb6b7bc 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -289,7 +289,8 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -577,7 +578,8 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index ecde77a..cba5dd6 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -304,13 +304,14 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int { case D3DPOOL_DEFAULT: if (usage & D3DUSAGE_DYNAMIC) - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; return WINED3D_RESOURCE_ACCESS_GPU; case D3DPOOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; case D3DPOOL_SYSTEMMEM: case D3DPOOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; default: return 0; } diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 090d196..5daf6f4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1077,7 +1077,8 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; desc.height = height; desc.depth = 1; @@ -2170,7 +2171,7 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2265,7 +2266,7 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index d81c3bc..f7ccdc7 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1110,7 +1110,8 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; desc.height = height; desc.depth = 1; @@ -1157,7 +1158,8 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = edge_length; desc.height = edge_length; desc.depth = 1; diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 04c87c8..36a6ae3 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -290,7 +290,8 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -576,7 +577,8 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 92bbacd..ee385d9 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -321,13 +321,14 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int { case D3DPOOL_DEFAULT: if (usage & D3DUSAGE_DYNAMIC) - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; return WINED3D_RESOURCE_ACCESS_GPU; case D3DPOOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; case D3DPOOL_SYSTEMMEM: case D3DPOOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; default: return 0; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b278d6d..5f88278 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1348,7 +1348,8 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; desc.height = height; desc.depth = 1; @@ -2675,7 +2676,7 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2780,7 +2781,7 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ec00776..e7efe73 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1314,7 +1314,8 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; desc.height = height; desc.depth = 1; @@ -1385,7 +1386,8 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = edge_length; desc.height = edge_length; desc.depth = 1; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 463d036..c2d87dd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3471,7 +3471,7 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -3663,7 +3663,7 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 19ef9c0..497287e 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -131,7 +131,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, desc.byte_width = new_size * sizeof(*indices); desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -621,7 +622,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DVERTEX); desc.usage = 0; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -631,7 +632,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8280990..739e68f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6012,7 +6012,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = 0; - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; wined3d_desc.depth = 1; @@ -6101,7 +6101,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; } else { @@ -6115,7 +6116,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP; + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; } diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index b661e73..3ad8f7e 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -125,9 +125,9 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer desc.usage |= WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; else - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ac36183..97f7aec 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -349,9 +349,15 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i return E_INVALIDARG; } - if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) + if ((flags & WINED3D_MAP_READ) && !(resource->access & WINED3D_RESOURCE_ACCESS_MAP_R)) { - WARN("Resource is not mappable.\n"); + WARN("Resource does not have MAP_R access.\n"); + return E_INVALIDARG; + } + + if ((flags & WINED3D_MAP_WRITE) && !(resource->access & WINED3D_RESOURCE_ACCESS_MAP_W)) + { + WARN("Resource does not have MAP_W access.\n"); return E_INVALIDARG; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7cf9c21..c3fabef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1330,7 +1330,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_SCRATCH | WINED3DUSAGE_PRIVATE; - desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = wined3d_texture_get_level_width(src_texture, texture_level); desc.height = wined3d_texture_get_level_height(src_texture, texture_level); desc.depth = 1; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 77ba007..58d4116 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -369,7 +369,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } wined3d_resource_update_draw_binding(&texture->resource); if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) - texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP; + texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture->texture_ops = texture_ops; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 78934af..10cfa25 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4156,7 +4156,8 @@ const char *wined3d_debug_resource_access(DWORD access) #define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); - ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP_R); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP_W); #undef ACCESS_TO_STR if (access) FIXME("Unrecognised access flag(s) %#x.\n", access); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f329c6f..b6a2ec3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -52,7 +52,8 @@ #define WINED3D_RESOURCE_ACCESS_GPU 0x1u #define WINED3D_RESOURCE_ACCESS_CPU 0x2u -#define WINED3D_RESOURCE_ACCESS_MAP 0x4u +#define WINED3D_RESOURCE_ACCESS_MAP_R 0x4u +#define WINED3D_RESOURCE_ACCESS_MAP_W 0x8u enum wined3d_light_type { -- 2.1.4

1 0

[PATCH 1/5] wined3d: Introduce separate read and write resource map flags.
by Henri Verbeet 18 Feb '18

18 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/utils.c | 12 +++++++----- dlls/d3d8/device.c | 17 +++++++++++------ dlls/d3d9/device.c | 17 +++++++++++------ dlls/ddraw/device.c | 14 +++++++------- dlls/ddraw/executebuffer.c | 7 +++---- dlls/ddraw/surface.c | 4 ++-- dlls/ddraw/utils.c | 11 ++++++++--- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/resource.c | 38 +++++++++++++++++++++++++------------- dlls/wined3d/surface.c | 17 +++++++++-------- dlls/wined3d/texture.c | 5 +++-- include/wine/wined3d.h | 13 +++++++------ 14 files changed, 103 insertions(+), 72 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 3a48907..5c6add7 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -758,21 +758,23 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) switch (map_type) { case D3D11_MAP_WRITE: + return WINED3D_MAP_WRITE; + case D3D11_MAP_READ_WRITE: - return 0; + return WINED3D_MAP_READ | WINED3D_MAP_WRITE; case D3D11_MAP_READ: - return WINED3D_MAP_READONLY; + return WINED3D_MAP_READ; case D3D11_MAP_WRITE_DISCARD: - return WINED3D_MAP_DISCARD; + return WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD; case D3D11_MAP_WRITE_NO_OVERWRITE: - return WINED3D_MAP_NOOVERWRITE; + return WINED3D_MAP_WRITE | WINED3D_MAP_NOOVERWRITE; default: FIXME("Unhandled map_type %#x.\n", map_type); - return 0; + return WINED3D_MAP_READ | WINED3D_MAP_WRITE; } } diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fc40026..090d196 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -143,15 +143,20 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) { - static const unsigned int handled = D3DLOCK_READONLY - | D3DLOCK_NOSYSLOCK + static const unsigned int handled = D3DLOCK_NOSYSLOCK | D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD | D3DLOCK_NO_DIRTY_UPDATE; unsigned int wined3d_flags; wined3d_flags = flags & handled; - flags &= ~handled; + if (!(flags & (D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD))) + wined3d_flags |= WINED3D_MAP_READ; + if (!(flags & D3DLOCK_READONLY)) + wined3d_flags |= WINED3D_MAP_WRITE; + if (!(wined3d_flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) + wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; + flags &= ~(handled | D3DLOCK_READONLY); if (flags) FIXME("Unhandled flags %#x.\n", flags); @@ -2225,7 +2230,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, wined3d_box.right = vb_pos + size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, data, size); wined3d_resource_unmap(vb, 0); @@ -2326,7 +2331,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_box.right = vb_pos + vtx_size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); @@ -2348,7 +2353,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_box.right = ib_pos + idx_size; ib = wined3d_buffer_get_resource(device->index_buffer); if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, index_data, idx_size); wined3d_resource_unmap(ib, 0); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c057c77..b278d6d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -162,8 +162,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) { - static const unsigned int handled = D3DLOCK_READONLY - | D3DLOCK_NOSYSLOCK + static const unsigned int handled = D3DLOCK_NOSYSLOCK | D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD | D3DLOCK_DONOTWAIT @@ -171,7 +170,13 @@ unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - flags &= ~handled; + if (!(flags & (D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD))) + wined3d_flags |= WINED3D_MAP_READ; + if (!(flags & D3DLOCK_READONLY)) + wined3d_flags |= WINED3D_MAP_WRITE; + if (!(wined3d_flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) + wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; + flags &= ~(handled | D3DLOCK_READONLY); if (flags) FIXME("Unhandled flags %#x.\n", flags); @@ -2737,7 +2742,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_box.right = vb_pos + size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, data, size); wined3d_resource_unmap(vb, 0); @@ -2848,7 +2853,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_box.right = vb_pos + vtx_size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); @@ -2870,7 +2875,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_box.right = ib_pos + idx_size; ib = wined3d_buffer_get_resource(device->index_buffer); if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, index_data, idx_size); wined3d_resource_unmap(ib, 0); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d31d598..463d036 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3533,7 +3533,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, wined3d_box.right = vb_pos + size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, vertices, size); wined3d_resource_unmap(vb, 0); @@ -3725,7 +3725,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_box.right = vb_pos + vtx_size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, vertices, vtx_size); wined3d_resource_unmap(vb, 0); @@ -3742,7 +3742,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_box.right = ib_pos + idx_size; ib = wined3d_buffer_get_resource(device->index_buffer); if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, indices, idx_size); wined3d_resource_unmap(ib, 0); @@ -4056,7 +4056,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM wined3d_box.right = vb_pos + dst_size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; pack_strided_data(wined3d_map_desc.data, vertex_count, strided_data, fvf); wined3d_resource_unmap(vb, 0); @@ -4172,7 +4172,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_box.right = vb_pos + vtx_dst_size; vb = wined3d_buffer_get_resource(device->vertex_buffer); if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; pack_strided_data(wined3d_map_desc.data, vertex_count, strided_data, fvf); wined3d_resource_unmap(vb, 0); @@ -4189,7 +4189,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_box.right = ib_pos + idx_size; ib = wined3d_buffer_get_resource(device->index_buffer); if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) goto done; memcpy(wined3d_map_desc.data, indices, idx_size); wined3d_resource_unmap(ib, 0); @@ -4409,7 +4409,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_box.right = ib_pos + index_count * sizeof(WORD); ib = wined3d_buffer_get_resource(device->index_buffer); if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) + WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) { ERR("Failed to map buffer, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b47606a..19ef9c0 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -152,9 +152,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, box.left = index_pos * sizeof(*indices); box.right = (index_pos + index_count) * sizeof(*indices); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->index_buffer), 0, - &map_desc, &box, index_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->index_buffer), 0, &map_desc, + &box, WINED3D_MAP_WRITE | (index_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) return hr; indices = map_desc.data; @@ -661,7 +660,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); if (FAILED(hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), - 0, &map_desc, &box, 0))) + 0, &map_desc, &box, WINED3D_MAP_WRITE))) return hr; memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f09aaba..8280990 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5281,7 +5281,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu } if (FAILED(hr = wined3d_resource_map(src_resource, - src_surface->sub_resource_idx, &src_map_desc, NULL, 0))) + src_surface->sub_resource_idx, &src_map_desc, NULL, WINED3D_MAP_READ))) { ERR("Failed to lock source surface, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -5289,7 +5289,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu } if (FAILED(hr = wined3d_resource_map(dst_resource, - dst_surface->sub_resource_idx, &dst_map_desc, NULL, 0))) + dst_surface->sub_resource_idx, &dst_map_desc, NULL, WINED3D_MAP_WRITE))) { ERR("Failed to lock destination surface, hr %#x.\n", hr); wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index bb75666..0170fcd 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -563,17 +563,22 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) { - static const unsigned int handled = DDLOCK_READONLY - | DDLOCK_NOSYSLOCK + static const unsigned int handled = DDLOCK_NOSYSLOCK | DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS | DDLOCK_DONOTWAIT; unsigned int wined3d_flags; wined3d_flags = flags & handled; + if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS))) + wined3d_flags |= WINED3D_MAP_READ; + if (!(flags & DDLOCK_READONLY)) + wined3d_flags |= WINED3D_MAP_WRITE; + if (!(wined3d_flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) + wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; if (flags & DDLOCK_NODIRTYUPDATE) wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; - flags &= ~(handled | DDLOCK_WAIT | DDLOCK_NODIRTYUPDATE); + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_NODIRTYUPDATE); if (flags) FIXME("Unhandled flags %#x.\n", flags); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c1dfc56..1055326 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1024,8 +1024,8 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) - || ((flags & WINED3D_MAP_READONLY) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) + if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) + || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) @@ -1035,7 +1035,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI context_release(context); } - if (!(flags & WINED3D_MAP_READONLY)) + if (flags & WINED3D_MAP_WRITE) wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } else @@ -1050,7 +1050,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI else wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); - if (!(flags & WINED3D_MAP_READONLY)) + if (flags & WINED3D_MAP_WRITE) buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); if ((flags & WINED3D_MAP_DISCARD) && buffer->resource.heap_memory) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b97dff5..9b6c19e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2837,8 +2837,8 @@ void context_copy_bo_address(struct wined3d_context *context, } else { - src_ptr = context_map_bo_address(context, src, size, src_binding, WINED3D_MAP_READONLY); - dst_ptr = context_map_bo_address(context, dst, size, dst_binding, 0); + src_ptr = context_map_bo_address(context, src, size, src_binding, WINED3D_MAP_READ); + dst_ptr = context_map_bo_address(context, dst, size, dst_binding, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17103cc..6e275e1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3078,7 +3078,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO vertex_size = get_flexible_vertex_size(DestFVF); box.left = dwDestIndex * vertex_size; box.right = box.left + dwCount * vertex_size; - if (FAILED(hr = wined3d_resource_map(&dest->resource, 0, &map_desc, &box, 0))) + if (FAILED(hr = wined3d_resource_map(&dest->resource, 0, &map_desc, &box, WINED3D_MAP_WRITE))) { WARN("Failed to map buffer, hr %#x.\n", hr); return hr; @@ -3342,7 +3342,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, resource = &state->streams[e->stream_idx].buffer->resource; box.left = src_start_idx * e->stride; box.right = box.left + vertex_count * e->stride; - if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) ERR("Failed to map resource.\n"); e->data.buffer_object = 0; e->data.addr += (ULONG_PTR)map_desc.data; @@ -4499,7 +4499,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined struct wined3d_texture *texture; HRESULT hr; - if (FAILED(wined3d_resource_map(&cursor_image->resource, sub_resource_idx, &map_desc, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_resource_map(&cursor_image->resource, sub_resource_idx, &map_desc, NULL, WINED3D_MAP_READ))) { ERR("Failed to map source texture.\n"); return NULL; @@ -4603,7 +4603,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device memset(mask_bits, 0xff, mask_size); wined3d_resource_map(&texture->resource, sub_resource_idx, &map_desc, NULL, - WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); + WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READ); cursor_info.fIcon = FALSE; cursor_info.xHotspot = x_hotspot; cursor_info.yHotspot = y_hotspot; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ddc157b..ac36183 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -306,17 +306,17 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource * { /* Not all flags make sense together, but Windows never returns an error. * Catch the cases that could cause issues. */ - if (flags & WINED3D_MAP_READONLY) + if (flags & WINED3D_MAP_READ) { if (flags & WINED3D_MAP_DISCARD) { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); - return 0; + WARN("WINED3D_MAP_READ combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); + return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); } if (flags & WINED3D_MAP_NOOVERWRITE) { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); - return 0; + WARN("WINED3D_MAP_READ combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); + return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); } } else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) @@ -324,7 +324,7 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource * if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) { WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; + return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); } if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) @@ -343,6 +343,12 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); + if (!(flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) + { + WARN("No read/write flags specified.\n"); + return E_INVALIDARG; + } + if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) { WARN("Resource is not mappable.\n"); @@ -399,9 +405,9 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) { GLbitfield ret = 0; - if (!(d3d_flags & WINED3D_MAP_READONLY)) + if (d3d_flags & WINED3D_MAP_WRITE) ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; - if (!(d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) + if (d3d_flags & WINED3D_MAP_READ) ret |= GL_MAP_READ_BIT; if (d3d_flags & WINED3D_MAP_DISCARD) @@ -414,11 +420,17 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) { - if (d3d_flags & WINED3D_MAP_READONLY) - return GL_READ_ONLY_ARB; - if (d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - return GL_WRITE_ONLY_ARB; - return GL_READ_WRITE_ARB; + switch (d3d_flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE)) + { + case WINED3D_MAP_READ: + return GL_READ_ONLY_ARB; + + case WINED3D_MAP_WRITE: + return GL_WRITE_ONLY_ARB; + + default: + return GL_READ_WRITE_ARB; + } } BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5cb9cda..7cf9c21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1369,9 +1369,9 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_get_memory(dst_texture, 0, &dst_data, map_binding); src = context_map_bo_address(context, &src_data, - src_texture->sub_resources[sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); + src_texture->sub_resources[sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); dst = context_map_bo_address(context, - &dst_data, dst_texture->sub_resources[0].size, GL_PIXEL_UNPACK_BUFFER, 0); + &dst_data, dst_texture->sub_resources[0].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); @@ -2325,7 +2325,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, wined3d_format_calculate_pitch(&format, 1, width, height, &dst_row_pitch, &dst_slice_pitch); src_mem = context_map_bo_address(context, &data, src_slice_pitch, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READONLY); + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (!(dst_mem = heap_alloc(dst_slice_pitch))) { ERR("Out of memory (%u).\n", dst_slice_pitch); @@ -2349,7 +2349,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, width, height, &dst_row_pitch, &dst_slice_pitch); src_mem = context_map_bo_address(context, &data, src_slice_pitch, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READONLY); + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (!(dst_mem = heap_alloc(dst_slice_pitch))) { ERR("Out of memory (%u).\n", dst_slice_pitch); @@ -3113,7 +3113,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); dst_map.data = context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); + dst_texture->sub_resources[dst_sub_resource_idx].size, + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); src_map = dst_map; src_format = dst_texture->resource.format; @@ -3149,7 +3150,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_get_pitch(src_texture, texture_level, &src_map.row_pitch, &src_map.slice_pitch); wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &src_data, map_binding); src_map.data = context_map_bo_address(context, &src_data, - src_texture->sub_resources[src_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); + src_texture->sub_resources[src_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); map_binding = dst_texture->resource.map_binding; texture_level = dst_sub_resource_idx % dst_texture->level_count; @@ -3159,7 +3160,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); dst_map.data = context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); + dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); } flags &= ~WINED3D_BLT_RAW; @@ -3600,7 +3601,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, &map.row_pitch, &map.slice_pitch); wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); map.data = context_map_bo_address(context, &data, - texture->sub_resources[view->sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); + texture->sub_resources[view->sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); map.data = (BYTE *)map.data + (box->front * map.slice_pitch) + ((box->top / view->format->block_height) * map.row_pitch) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 57e6427..77ba007 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1224,7 +1224,8 @@ static void texture2d_create_dc(void *object) wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); desc.pMemory = context_map_bo_address(context, &data, - texture->sub_resources[sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); + texture->sub_resources[sub_resource_idx].size, + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); if (context) context_release(context); @@ -1903,7 +1904,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return E_OUTOFMEMORY; } - if (!(flags & WINED3D_MAP_READONLY) + if (flags & WINED3D_MAP_WRITE && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1e3c08b..f329c6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -912,12 +912,13 @@ enum wined3d_shader_byte_code_format #define WINED3DUSAGE_QUERY_WRAPANDMIP 0x00200000 #define WINED3DUSAGE_QUERY_MASK 0x003f8400 -#define WINED3D_MAP_READONLY 0x0010 -#define WINED3D_MAP_NOSYSLOCK 0x0800 -#define WINED3D_MAP_NOOVERWRITE 0x1000 -#define WINED3D_MAP_DISCARD 0x2000 -#define WINED3D_MAP_DONOTWAIT 0x4000 -#define WINED3D_MAP_NO_DIRTY_UPDATE 0x8000 +#define WINED3D_MAP_NOSYSLOCK 0x00000800 +#define WINED3D_MAP_NOOVERWRITE 0x00001000 +#define WINED3D_MAP_DISCARD 0x00002000 +#define WINED3D_MAP_DONOTWAIT 0x00004000 +#define WINED3D_MAP_NO_DIRTY_UPDATE 0x00008000 +#define WINED3D_MAP_WRITE 0x40000000 +#define WINED3D_MAP_READ 0x80000000 #define WINED3DPRESENT_RATE_DEFAULT 0x00000000 -- 2.1.4

1 0

[PATCH 1/5] shell32/tests: Add a basic test for NewMenu object creation
by Nikolay Sivov 18 Feb '18

18 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shlview.c | 30 ++++++++++++++++++++++++++++++ include/shlguid.h | 1 + 2 files changed, 31 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 76855067c0..f31d16e5e2 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1476,6 +1476,35 @@ if (0) IShellFolder_Release(desktop); } +static void test_newmenu(void) +{ + IUnknown *unk, *unk2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); +todo_wine + ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); + if (hr != S_OK) + { + skip("NewMenu is not supported.\n"); + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IShellExtInit, (void **)&unk2); + ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); + ok(hr == S_OK, "Failed to get IContextMenu3, hr %#x.\n", hr); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2); + ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#x.\n", hr); + IUnknown_Release(unk2); + + IUnknown_Release(unk); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1491,6 +1520,7 @@ START_TEST(shlview) test_IOleCommandTarget(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); + test_newmenu(); OleUninitialize(); } diff --git a/include/shlguid.h b/include/shlguid.h index 028cb61f28..687bbec79e 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -146,6 +146,7 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); +DEFINE_GUID(CLSID_NewMenu, 0xd969a300, 0xe7ff, 0x11d0, 0xa9, 0x3b, 0x0, 0xa0, 0xc9, 0xf, 0x27, 0x19); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); -- 2.16.1

1 4

[PATCH v2] uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions
by Fabian Maurer 18 Feb '18

18 Feb '18

v2: Make enums [v1_enum] Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/uiribbon.idl | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/include/uiribbon.idl b/include/uiribbon.idl index 6759400be5..efb70d8e4f 100644 --- a/include/uiribbon.idl +++ b/include/uiribbon.idl @@ -64,6 +64,17 @@ typedef enum UI_COMMANDTYPE { UI_COMMANDTYPE_COLORCOLLECTION, } UI_COMMANDTYPE; +typedef [v1_enum] enum UI_OWNERSHIP { + UI_OWNERSHIP_TRANSFER = 0, + UI_OWNERSHIP_COPY = 1, +} UI_OWNERSHIP; + +typedef [v1_enum] enum UI_COLLECTIONCHANGE { + UI_COLLECTIONCHANGE_INSERT = 0, + UI_COLLECTIONCHANGE_REMOVE = 1, + UI_COLLECTIONCHANGE_REPLACE = 2, + UI_COLLECTIONCHANGE_RESET = 3 +} UI_COLLECTIONCHANGE; [ object, @@ -174,9 +185,126 @@ interface IUIFramework : IUnknown ); } +[ + object, + uuid(23c8c838-4de6-436b-ab01-5554bb7c30dd), + local, + pointer_default(unique) +] +interface IUIImage : IUnknown +{ + HRESULT GetBitmap( + [out] HBITMAP *bitmap + ); +} + +[ + object, + uuid(803982ab-370a-4f7e-a9e7-8784036a6e26), + local, + pointer_default(unique) +] +interface IUIRibbon : IUnknown +{ + HRESULT GetHeight( + [out] UINT32 *cy + ); + HRESULT LoadSettingsFromStream( + [in] IStream *pStream + ); + HRESULT SaveSettingsToStream( + [in] IStream *pStream + ); +} + +[ + object, + uuid(df4f45bf-6f9d-4dd7-9d68-d8f9cd18c4db), + local, + pointer_default(unique) +] +interface IUICollection : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count + ); + HRESULT GetItem( + [in] UINT32 index, + [out] IUnknown **item + ); + HRESULT Add( + [in] IUnknown *item + ); + HRESULT Insert( + [in] UINT32 index, + [in] IUnknown *item + ); + HRESULT RemoveAt( + [in] UINT32 index + ); + HRESULT Replace( + [in] UINT32 indexReplaced, + [in] IUnknown *itemReplaceWith + ); + HRESULT Clear(); +} + +[ + object, + uuid(eea11f37-7c46-437c-8e55-b52122b29293), + local, + pointer_default(unique) +] +interface IUIContextualUI : IUnknown +{ + HRESULT ShowAtLocation( + INT32 x, + INT32 y + ); +} + +[ + object, + uuid(6502ae91-a14d-44b5-bbd0-62aacc581d52), + local, + pointer_default(unique) +] +interface IUICollectionChangedEvent : IUnknown +{ + HRESULT OnChanged( + [in] UI_COLLECTIONCHANGE action, + [in] UINT32 oldIndex, + [in] IUnknown *oldItem, + [in] UINT32 newIndex, + [in] IUnknown *newItem + ); +} + +[ + object, + uuid(18aba7f3-4c1c-4ba2-bf6c-f5c3326fa816), + local, + pointer_default(unique) +] +interface IUIImageFromBitmap : IUnknown +{ + HRESULT CreateImage( + [in] HBITMAP bitmap, + [in] UI_OWNERSHIP options, + [out] IUIImage **image + ); +} + + [ helpstring("UIRibbonFramework Object"), threading(apartment), uuid(926749fa-2615-4987-8845-c33e65f2b957) ] coclass UIRibbonFramework { interface IUIFramework; } + +[ + threading(apartment), + uuid(0f7434b6-59b6-4250-999e-d168d6ae4293) +] +coclass UIRibbonImageFromBitmapFactory { interface IUIImageFromBitmap; } -- 2.16.2

1 0

[PATCH] uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions
by Fabian Maurer 18 Feb '18

18 Feb '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/uiribbon.idl | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/include/uiribbon.idl b/include/uiribbon.idl index 6759400be5..680ca2dd44 100644 --- a/include/uiribbon.idl +++ b/include/uiribbon.idl @@ -64,6 +64,17 @@ typedef enum UI_COMMANDTYPE { UI_COMMANDTYPE_COLORCOLLECTION, } UI_COMMANDTYPE; +typedef enum UI_OWNERSHIP { + UI_OWNERSHIP_TRANSFER = 0, + UI_OWNERSHIP_COPY = 1, +} UI_OWNERSHIP; + +typedef enum UI_COLLECTIONCHANGE { + UI_COLLECTIONCHANGE_INSERT = 0, + UI_COLLECTIONCHANGE_REMOVE = 1, + UI_COLLECTIONCHANGE_REPLACE = 2, + UI_COLLECTIONCHANGE_RESET = 3 +} UI_COLLECTIONCHANGE; [ object, @@ -174,9 +185,126 @@ interface IUIFramework : IUnknown ); } +[ + object, + uuid(23c8c838-4de6-436b-ab01-5554bb7c30dd), + local, + pointer_default(unique) +] +interface IUIImage : IUnknown +{ + HRESULT GetBitmap( + [out] HBITMAP *bitmap + ); +} + +[ + object, + uuid(803982ab-370a-4f7e-a9e7-8784036a6e26), + local, + pointer_default(unique) +] +interface IUIRibbon : IUnknown +{ + HRESULT GetHeight( + [out] UINT32 *cy + ); + HRESULT LoadSettingsFromStream( + [in] IStream *pStream + ); + HRESULT SaveSettingsToStream( + [in] IStream *pStream + ); +} + +[ + object, + uuid(df4f45bf-6f9d-4dd7-9d68-d8f9cd18c4db), + local, + pointer_default(unique) +] +interface IUICollection : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count + ); + HRESULT GetItem( + [in] UINT32 index, + [out] IUnknown **item + ); + HRESULT Add( + [in] IUnknown *item + ); + HRESULT Insert( + [in] UINT32 index, + [in] IUnknown *item + ); + HRESULT RemoveAt( + [in] UINT32 index + ); + HRESULT Replace( + [in] UINT32 indexReplaced, + [in] IUnknown *itemReplaceWith + ); + HRESULT Clear(); +} + +[ + object, + uuid(eea11f37-7c46-437c-8e55-b52122b29293), + local, + pointer_default(unique) +] +interface IUIContextualUI : IUnknown +{ + HRESULT ShowAtLocation( + INT32 x, + INT32 y + ); +} + +[ + object, + uuid(6502ae91-a14d-44b5-bbd0-62aacc581d52), + local, + pointer_default(unique) +] +interface IUICollectionChangedEvent : IUnknown +{ + HRESULT OnChanged( + [in] UI_COLLECTIONCHANGE action, + [in] UINT32 oldIndex, + [in] IUnknown *oldItem, + [in] UINT32 newIndex, + [in] IUnknown *newItem + ); +} + +[ + object, + uuid(18aba7f3-4c1c-4ba2-bf6c-f5c3326fa816), + local, + pointer_default(unique) +] +interface IUIImageFromBitmap : IUnknown +{ + HRESULT CreateImage( + [in] HBITMAP bitmap, + [in] UI_OWNERSHIP options, + [out] IUIImage **image + ); +} + + [ helpstring("UIRibbonFramework Object"), threading(apartment), uuid(926749fa-2615-4987-8845-c33e65f2b957) ] coclass UIRibbonFramework { interface IUIFramework; } + +[ + threading(apartment), + uuid(0f7434b6-59b6-4250-999e-d168d6ae4293) +] +coclass UIRibbonImageFromBitmapFactory { interface IUIImageFromBitmap; } -- 2.16.2

2 1

[PATCH] propsys: Add PropVariantToStringWithDefault and tests
by Fabian Maurer 17 Feb '18

17 Feb '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++ dlls/propsys/tests/propsys.c | 101 +++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 86a5e696eb..f518519276 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -137,7 +137,7 @@ @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc -@ stub PropVariantToStringWithDefault +@ stdcall PropVariantToStringWithDefault(ptr wstr) @ stdcall PropVariantToUInt16(ptr ptr) @ stub PropVariantToUInt16Vector @ stub PropVariantToUInt16VectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 3e3b502675..e6d4eba57c 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -337,6 +337,24 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) return hr; } +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) +{ + static const WCHAR str_empty[] = {0}; + if (propvarIn->vt == VT_BSTR) + { + if (propvarIn->u.bstrVal == NULL) + return str_empty; + + return propvarIn->u.bstrVal; + } + + if (propvarIn->vt == VT_LPWSTR && propvarIn->u.pwszVal != NULL) + return propvarIn->u.pwszVal; + + return pszDefault; +} + + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 327c606b33..a6c7023527 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1094,6 +1094,106 @@ static void test_PropVariantToBoolean(void) ok(val == TRUE, "Unexpected value %d\n", val); } +static void test_PropVariantToStringWithDefault(void) +{ + PROPVARIANT propvar; + static WCHAR default_value[] = {'t', 'e', 's', 't', 0}; + static WCHAR wstr_test2[] = {'t', 'e', 's', 't', '2', 0}; + static WCHAR wstr_empty[] = {0}; + static WCHAR wstr_space[] = {' ', 0}; + static CHAR str_test2[] = "test2"; + static CHAR str_empty[] = ""; + static CHAR str_space[] = " "; + LPCWSTR result; + + propvar.vt = VT_EMPTY; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_TRUE; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_I4; + propvar.u.lVal = 15; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPWSTR */ + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_empty, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_space, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_test2, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPSTR */ + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_BSTR */ + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_empty); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_space); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_space), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_test2); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_test2), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); +} + static void test_PropVariantChangeType_LPWSTR(void) { PROPVARIANT dest, src; @@ -1143,4 +1243,5 @@ START_TEST(propsys) test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); + test_PropVariantToStringWithDefault(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4dc3521a02..ced51ec295 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -77,6 +77,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.16.2

1 0

Distributing new versions of Wine via sourceforge.net?
by Gerald Pfeifer 17 Feb '18

17 Feb '18

Hi there, I noticed that unlike older versions Wine 3.2 is not available at https://sourceforge.net/projects/wine/files/Source/ . Is this a permanent change (Sourceforge is not listed at https://wiki.winehq.org/Download anyway), or just a temporary omission? Gerald

2 2

[PATCH] ping: Implemented -n functionality.
by Isira Seneviratne 17 Feb '18

17 Feb '18

4 3

[PATCH 1/2] ntdll: Parse execution level information in manifest data
by Nikolay Sivov 17 Feb '18

17 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/actctx.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 157 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 956f2559eb..3ba407d83a 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -490,17 +490,19 @@ enum assembly_type struct assembly { - enum assembly_type type; - struct assembly_identity id; - struct file_info manifest; - WCHAR *directory; - BOOL no_inherit; - struct dll_redirect *dlls; - unsigned int num_dlls; - unsigned int allocated_dlls; - struct entity_array entities; - COMPATIBILITY_CONTEXT_ELEMENT* compat_contexts; - ULONG num_compat_contexts; + enum assembly_type type; + struct assembly_identity id; + struct file_info manifest; + WCHAR *directory; + BOOL no_inherit; + struct dll_redirect *dlls; + unsigned int num_dlls; + unsigned int allocated_dlls; + struct entity_array entities; + COMPATIBILITY_CONTEXT_ELEMENT *compat_contexts; + ULONG num_compat_contexts; + ACTCTX_REQUESTED_RUN_LEVEL run_level; + ULONG ui_access; }; enum context_sections @@ -629,6 +631,10 @@ static const WCHAR compatibilityNSW[] = {'u','r','n',':','s','c','h','e','m','a' static const WCHAR applicationW[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR supportedOSW[] = {'s','u','p','p','o','r','t','e','d','O','S',0}; static const WCHAR IdW[] = {'I','d',0}; +static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e','d','E','x','e','c','u','t','i','o','n','L','e','v','e','l',0}; +static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; +static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; +static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; struct olemisc_entry { @@ -2317,6 +2323,141 @@ static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly return ret; } +static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +{ + static const WCHAR levelW[] = {'l','e','v','e','l',0}; + static const WCHAR asInvokerW[] = {'a','s','I','n','v','o','k','e','r',0}; + static const WCHAR requireAdministratorW[] = {'r','e','q','u','i','r','e','A','d','m','i','n','i','s','t','r','a','t','o','r',0}; + static const WCHAR highestAvailableW[] = {'h','i','g','h','e','s','t','A','v','a','i','l','a','b','l','e',0}; + static const WCHAR uiAccessW[] = {'u','i','A','c','c','e','s','s',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, ret = TRUE, error; + + /* Multiple requestedExecutionLevel elements are not supported. */ + if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) + return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, levelW)) + { + if (xmlstr_cmpi(&attr_value, asInvokerW)) + assembly->run_level = ACTCTX_RUN_LEVEL_AS_INVOKER; + else if (xmlstr_cmpi(&attr_value, highestAvailableW)) + assembly->run_level = ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE; + else if (xmlstr_cmpi(&attr_value, requireAdministratorW)) + assembly->run_level = ACTCTX_RUN_LEVEL_REQUIRE_ADMIN; + else + FIXME("unknown execution level: %s\n", debugstr_xmlstr(&attr_value)); + } + else if (xmlstr_cmp(&attr_name, uiAccessW)) + { + if (xmlstr_cmpi(&attr_value, falseW)) + assembly->ui_access = FALSE; + else if (xmlstr_cmpi(&attr_value, trueW)) + assembly->ui_access = TRUE; + else + FIXME("unknown uiAccess value: %s\n", debugstr_xmlstr(&attr_value)); + } + else + FIXME("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + } + + if (error) return FALSE; + if (end) return TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, requestedExecutionLevelW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + FIXME("unknown element %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_requested_privileges_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, requestedPrivilegesW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, requestedExecutionLevelW)) + ret = parse_requested_execution_level_elem(xmlbuf, assembly, acl); + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_security_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, securityW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, requestedPrivilegesW)) + ret = parse_requested_privileges_elem(xmlbuf, assembly, acl); + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_trust_info_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, trustInfoW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, securityW)) + ret = parse_security_elem(xmlbuf, assembly, acl); + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, struct assembly* assembly, struct assembly_identity* expected_ai) @@ -2405,6 +2546,11 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_clr_surrogate_elem(xmlbuf, assembly, acl); } + else if (xml_elem_cmp(&elem, trustInfoW, asmv2W) || + xml_elem_cmp(&elem, trustInfoW, asmv1W)) + { + ret = parse_trust_info_elem(xmlbuf, assembly, acl); + } else if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; -- 2.16.1

1 1

[PATCH v7] windowscodecs: Fix data corruption for Adobe CMYK JPEGs
by Anton Romanov 17 Feb '18

17 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43520 Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/windowscodecs/jpegformat.c | 10 ++- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/jpegformat.c | 145 ++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/tests/jpegformat.c diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ef050ba688..805ab9e552 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -680,9 +680,15 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); + DWORD *pDwordDataEnd = pDwordData + stride * This->cinfo.output_scanline; + /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; + while(pDwordData < pDwordDataEnd) + *pDwordData++ ^= 0xffffffff; + } + } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index b1e78f995c..3d64210ba0 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -13,4 +13,5 @@ C_SRCS = \ pngformat.c \ propertybag.c \ stream.c \ + jpegformat.c \ tiffformat.c diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c new file mode 100644 index 0000000000..c1e46c4869 --- /dev/null +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -0,0 +1,145 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char jpeg_adobe_cmyk_1x5[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x01\x2c" + "\x01\x2c\x00\x00\xff\xee\x00\x0e\x41\x64\x6f\x62\x65\x00\x64\x00" + "\x00\x00\x00\x02\xff\xfe\x00\x13\x43\x72\x65\x61\x74\x65\x64\x20" + "\x77\x69\x74\x68\x20\x47\x49\x4d\x50\xff\xdb\x00\x43\x00\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb" + "\x00\x43\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\xff\xc0\x00\x14\x08\x00\x05\x00\x01\x04\x01\x11\x00" + "\x02\x11\x01\x03\x11\x01\x04\x11\x00\xff\xc4\x00\x15\x00\x01\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x08" + "\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\xff\xc4\x00\x14" + "\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\xff\xda\x00\x0e\x04\x01\x00\x02\x11\x03\x11\x04\x00\x00" + "\x3f\x00\x40\x44\x02\x1e\xa4\x1f\xff\xd9"; + +static void test_decode_adobe_cmyk(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hjpegdata; + char *jpegdata; + IStream *jpegstream; + GUID guidresult; + UINT count=0, width=0, height=0; + BYTE imagedata[5 * 4] = {1}; + UINT i; + + const BYTE expected_imagedata[5 * 4] = { + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + }; + + const BYTE expected_imagedata_24bpp[5 * 4] = { + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + }; + + hr = CoCreateInstance(&CLSID_WICJpegDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); + ok(hjpegdata != 0, "GlobalAlloc failed\n"); + if (hjpegdata) + { + jpegdata = GlobalLock(hjpegdata); + memcpy(jpegdata, jpeg_adobe_cmyk_1x5, sizeof(jpeg_adobe_cmyk_1x5)); + GlobalUnlock(hjpegdata); + + hr = CreateStreamOnHGlobal(hjpegdata, FALSE, &jpegstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, jpegstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatJpeg), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppCMYK) || + broken(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR)), /* xp/2003 */ + "unexpected pixel format: %s\n", wine_dbgstr_guid(&guidresult)); + + /* We want to be sure our state tracking will not impact output + * data on subsequent calls */ + for(i=2; i>0; --i) + { + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ + "unexpected image data\n"); + } + IWICBitmapFrameDecode_Release(framedecode); + } + IStream_Release(jpegstream); + } + GlobalFree(hjpegdata); + } + IWICBitmapDecoder_Release(decoder); +} + + +START_TEST(jpegformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode_adobe_cmyk(); + + CoUninitialize(); +} -- 2.16.1

1 1

[PATCH v8] windowscodecs: Fix data corruption for Adobe CMYK JPEGs
by Anton Romanov 17 Feb '18

17 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43520 Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/windowscodecs/jpegformat.c | 10 ++- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/jpegformat.c | 145 ++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/tests/jpegformat.c diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ef050ba688..805ab9e552 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -680,9 +680,15 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); + DWORD *pDwordDataEnd = pDwordData + stride * This->cinfo.output_scanline; + /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; + while(pDwordData < pDwordDataEnd) + *pDwordData++ ^= 0xffffffff; + } + } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index b1e78f995c..3d64210ba0 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -13,4 +13,5 @@ C_SRCS = \ pngformat.c \ propertybag.c \ stream.c \ + jpegformat.c \ tiffformat.c diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c new file mode 100644 index 0000000000..c1e46c4869 --- /dev/null +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -0,0 +1,145 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char jpeg_adobe_cmyk_1x5[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x01\x2c" + "\x01\x2c\x00\x00\xff\xee\x00\x0e\x41\x64\x6f\x62\x65\x00\x64\x00" + "\x00\x00\x00\x02\xff\xfe\x00\x13\x43\x72\x65\x61\x74\x65\x64\x20" + "\x77\x69\x74\x68\x20\x47\x49\x4d\x50\xff\xdb\x00\x43\x00\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb" + "\x00\x43\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\xff\xc0\x00\x14\x08\x00\x05\x00\x01\x04\x01\x11\x00" + "\x02\x11\x01\x03\x11\x01\x04\x11\x00\xff\xc4\x00\x15\x00\x01\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x08" + "\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\xff\xc4\x00\x14" + "\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\xff\xda\x00\x0e\x04\x01\x00\x02\x11\x03\x11\x04\x00\x00" + "\x3f\x00\x40\x44\x02\x1e\xa4\x1f\xff\xd9"; + +static void test_decode_adobe_cmyk(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hjpegdata; + char *jpegdata; + IStream *jpegstream; + GUID guidresult; + UINT count=0, width=0, height=0; + BYTE imagedata[5 * 4] = {1}; + UINT i; + + const BYTE expected_imagedata[5 * 4] = { + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + }; + + const BYTE expected_imagedata_24bpp[5 * 4] = { + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + }; + + hr = CoCreateInstance(&CLSID_WICJpegDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); + ok(hjpegdata != 0, "GlobalAlloc failed\n"); + if (hjpegdata) + { + jpegdata = GlobalLock(hjpegdata); + memcpy(jpegdata, jpeg_adobe_cmyk_1x5, sizeof(jpeg_adobe_cmyk_1x5)); + GlobalUnlock(hjpegdata); + + hr = CreateStreamOnHGlobal(hjpegdata, FALSE, &jpegstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, jpegstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatJpeg), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppCMYK) || + broken(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR)), /* xp/2003 */ + "unexpected pixel format: %s\n", wine_dbgstr_guid(&guidresult)); + + /* We want to be sure our state tracking will not impact output + * data on subsequent calls */ + for(i=2; i>0; --i) + { + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ + "unexpected image data\n"); + } + IWICBitmapFrameDecode_Release(framedecode); + } + IStream_Release(jpegstream); + } + GlobalFree(hjpegdata); + } + IWICBitmapDecoder_Release(decoder); +} + + +START_TEST(jpegformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode_adobe_cmyk(); + + CoUninitialize(); +} -- 2.16.1

1 0

[PATCH 3/4] [v3] gdi32/tests: Add text metrics tests in synthetic bold bitmap fonts.
by Akihiro Sagawa 17 Feb '18

17 Feb '18

v3, test in various DC transforms (see PATCH 2/4 for details). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-)

1 1

[PATCH 4/4] gdi32: Fix text metrics in synthetic bold bitmap fonts. (rebased)
by Akihiro Sagawa 17 Feb '18

17 Feb '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 9 +++++++-- dlls/gdi32/tests/font.c | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-)

1 0

[PATCH 2/4] gdi32/tests: Add synthetic bold metrics tests with various DC transforms.
by Akihiro Sagawa 17 Feb '18

17 Feb '18

Newly add this change before adding bitmap font tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-)

1 0

[PATCH 1/4] gdi32: Fix synthetic bold outline text metrics. (resend)
by Akihiro Sagawa 17 Feb '18

17 Feb '18

Without this fix, synthetic tmAveCharWidth value unintentionally affects SCALE_X calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH v5] windowscodecs: Fix data corruption for Adobe CMYK JPEGs
by Anton Romanov 16 Feb '18

16 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43520 Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/windowscodecs/jpegformat.c | 10 ++- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/jpegformat.c | 129 ++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/tests/jpegformat.c diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ef050ba688..a85150c290 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -680,9 +680,15 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); + DWORD *pDwordDataEnd = pDwordData + stride * max_rows; + /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; + while(pDwordData < pDwordDataEnd) + *pDwordData++ ^= 0xffffffff; + } + } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index b1e78f995c..3d64210ba0 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -13,4 +13,5 @@ C_SRCS = \ pngformat.c \ propertybag.c \ stream.c \ + jpegformat.c \ tiffformat.c diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c new file mode 100644 index 0000000000..4bd57d0743 --- /dev/null +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -0,0 +1,129 @@ +#define COBJMACROS + +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char jpeg_adobe_cmyk_1x5[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x01\x2c" + "\x01\x2c\x00\x00\xff\xee\x00\x0e\x41\x64\x6f\x62\x65\x00\x64\x00" + "\x00\x00\x00\x02\xff\xfe\x00\x13\x43\x72\x65\x61\x74\x65\x64\x20" + "\x77\x69\x74\x68\x20\x47\x49\x4d\x50\xff\xdb\x00\x43\x00\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb" + "\x00\x43\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\xff\xc0\x00\x14\x08\x00\x05\x00\x01\x04\x01\x11\x00" + "\x02\x11\x01\x03\x11\x01\x04\x11\x00\xff\xc4\x00\x15\x00\x01\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x08" + "\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\xff\xc4\x00\x14" + "\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\xff\xda\x00\x0e\x04\x01\x00\x02\x11\x03\x11\x04\x00\x00" + "\x3f\x00\x40\x44\x02\x1e\xa4\x1f\xff\xd9"; + +static void test_decode_adobe_cmyk(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hjpegdata; + char *jpegdata; + IStream *jpegstream; + GUID guidresult; + UINT count=0, width=0, height=0; + BYTE imagedata[5 * 4] = {1}; + UINT i; + + const BYTE expected_imagedata[5 * 4] = { + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + }; + + const BYTE expected_imagedata_24bpp[5 * 4] = { + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + }; + + hr = CoCreateInstance(&CLSID_WICJpegDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); + ok(hjpegdata != 0, "GlobalAlloc failed\n"); + if (hjpegdata) + { + jpegdata = GlobalLock(hjpegdata); + memcpy(jpegdata, jpeg_adobe_cmyk_1x5, sizeof(jpeg_adobe_cmyk_1x5)); + GlobalUnlock(hjpegdata); + + hr = CreateStreamOnHGlobal(hjpegdata, FALSE, &jpegstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, jpegstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatJpeg), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppCMYK) || + broken(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR)), /* xp/2003 */ + "unexpected pixel format: %s\n", wine_dbgstr_guid(&guidresult)); + + /* We want to be sure our state tracking will not impact output + * data on subsequent calls */ + for(i=2; i>0; --i) + { + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ + "unexpected image data\n"); + } + IWICBitmapFrameDecode_Release(framedecode); + } + IStream_Release(jpegstream); + } + GlobalFree(hjpegdata); + } + IWICBitmapDecoder_Release(decoder); +} + + +START_TEST(jpegformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode_adobe_cmyk(); + + CoUninitialize(); +} -- 2.16.1

2 2

[PATCH v6] windowscodecs: Fix data corruption for Adobe CMYK JPEGs
by Anton Romanov 16 Feb '18

16 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43520 Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/windowscodecs/jpegformat.c | 10 ++- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/jpegformat.c | 129 ++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/tests/jpegformat.c diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ef050ba688..805ab9e552 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -680,9 +680,15 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); + DWORD *pDwordDataEnd = pDwordData + stride * This->cinfo.output_scanline; + /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; + while(pDwordData < pDwordDataEnd) + *pDwordData++ ^= 0xffffffff; + } + } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index b1e78f995c..3d64210ba0 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -13,4 +13,5 @@ C_SRCS = \ pngformat.c \ propertybag.c \ stream.c \ + jpegformat.c \ tiffformat.c diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c new file mode 100644 index 0000000000..4bd57d0743 --- /dev/null +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -0,0 +1,129 @@ +#define COBJMACROS + +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char jpeg_adobe_cmyk_1x5[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x01\x2c" + "\x01\x2c\x00\x00\xff\xee\x00\x0e\x41\x64\x6f\x62\x65\x00\x64\x00" + "\x00\x00\x00\x02\xff\xfe\x00\x13\x43\x72\x65\x61\x74\x65\x64\x20" + "\x77\x69\x74\x68\x20\x47\x49\x4d\x50\xff\xdb\x00\x43\x00\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb" + "\x00\x43\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\xff\xc0\x00\x14\x08\x00\x05\x00\x01\x04\x01\x11\x00" + "\x02\x11\x01\x03\x11\x01\x04\x11\x00\xff\xc4\x00\x15\x00\x01\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x08" + "\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\xff\xc4\x00\x14" + "\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\xff\xda\x00\x0e\x04\x01\x00\x02\x11\x03\x11\x04\x00\x00" + "\x3f\x00\x40\x44\x02\x1e\xa4\x1f\xff\xd9"; + +static void test_decode_adobe_cmyk(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hjpegdata; + char *jpegdata; + IStream *jpegstream; + GUID guidresult; + UINT count=0, width=0, height=0; + BYTE imagedata[5 * 4] = {1}; + UINT i; + + const BYTE expected_imagedata[5 * 4] = { + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + }; + + const BYTE expected_imagedata_24bpp[5 * 4] = { + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + }; + + hr = CoCreateInstance(&CLSID_WICJpegDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); + ok(hjpegdata != 0, "GlobalAlloc failed\n"); + if (hjpegdata) + { + jpegdata = GlobalLock(hjpegdata); + memcpy(jpegdata, jpeg_adobe_cmyk_1x5, sizeof(jpeg_adobe_cmyk_1x5)); + GlobalUnlock(hjpegdata); + + hr = CreateStreamOnHGlobal(hjpegdata, FALSE, &jpegstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, jpegstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatJpeg), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppCMYK) || + broken(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR)), /* xp/2003 */ + "unexpected pixel format: %s\n", wine_dbgstr_guid(&guidresult)); + + /* We want to be sure our state tracking will not impact output + * data on subsequent calls */ + for(i=2; i>0; --i) + { + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ + "unexpected image data\n"); + } + IWICBitmapFrameDecode_Release(framedecode); + } + IStream_Release(jpegstream); + } + GlobalFree(hjpegdata); + } + IWICBitmapDecoder_Release(decoder); +} + + +START_TEST(jpegformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode_adobe_cmyk(); + + CoUninitialize(); +} -- 2.16.1

1 0

[PATCH] windowscodecs: tiffformat: Fix TiffFrameDecode_GetResolution, add test
by joachim.priesner＠web.de 16 Feb '18

16 Feb '18

From: Joachim Priesner <joachim.priesner(a)web.de> The behavior for the invalid resolution case is different for Windows XP and Server 2003. Implement the behavior of current Windows versions, but allow the old behavior in the test. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> --- dlls/windowscodecs/tests/tiffformat.c | 137 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tiffformat.c | 60 +++++++-------- 2 files changed, 162 insertions(+), 35 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index e4a4b66ea8..f00b20f7bb 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> #include <stdarg.h> #include <stdio.h> @@ -84,8 +85,8 @@ static const struct tiff_1bpp_data { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ }, 0, @@ -124,8 +125,8 @@ static const struct tiff_8bpp_alpha { 0x115, IFD_SHORT, 1, 2 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ { 0x117, IFD_LONG, 1, 8 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, /* YRESOLUTION */ { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ { 0x152, IFD_SHORT, 1, 1 } /* EXTRASAMPLES: 1 - Associated alpha with pre-multiplied color */ @@ -134,6 +135,81 @@ static const struct tiff_8bpp_alpha { 96, 1 }, { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } }; + +static const struct tiff_resolution_test_data +{ + struct IFD_rational resx; + struct IFD_rational resy; + LONG resolution_unit; + double expected_dpi_x; + double expected_dpi_y; + /* if != 0: values for different behavior of some Windows versions */ + double broken_dpi_x; + double broken_dpi_y; +} tiff_resolution_test_data[] = +{ + { { 100, 1 }, { 50, 1 }, 0, 100.0, 50.0, 0, 0 }, /* invalid resolution unit */ + { { 50, 1 }, { 100, 1 }, 0, 50.0, 100.0, 0, 0 }, + + { { 100, 1 }, { 50, 1 }, 1, 100.0, 50.0, 0, 0 }, /* RESUNIT_NONE */ + { { 50, 1 }, { 100, 1 }, 1, 50.0, 100.0, 0, 0 }, + + { { 49, 1 }, { 49, 1 }, 2, 49.0, 49.0, 0, 0 }, /* same resolution for both X and Y */ + { { 33, 1 }, { 55, 1 }, 2, 33.0, 55.0, 0, 0 }, /* different resolutions for X and Y */ + { { 50, 2 }, { 66, 3 }, 2, 25.0, 22.0, 0, 0 }, /* denominator != 1 */ + + { { 100, 1 }, { 200, 1 }, 3, 254.0, 508.0, 0, 0 }, /* unit = centimeters */ + + /* XP and Server 2003 do not discard both resolution values if only one of them is invalid */ + { { 0, 1 }, { 29, 1 }, 2, 96.0, 96.0, 0, 29.0 }, /* resolution 0 */ + { { 58, 1 }, { 29, 0 }, 2, 96.0, 96.0, 58.0, 0 }, /* denominator 0 (division by zero) */ + + /* XP and Server 2003 convert the fallback value of 96 dpi to 243.84 dots per centimeter. */ + { { 0, 1 }, { 100, 1 }, 3, 96.0, 96.0, 243.84, 254.0 }, /* resolution 0 and unit = centimeters */ + { { 50, 1 }, { 72, 0 }, 3, 96.0, 96.0, 127.0, 243.84 } /* denominator 0 and unit = centimeters */ +}; + +static struct tiff_resolution_image_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[13]; + ULONG next_IFD; + struct IFD_rational resx; + struct IFD_rational resy; + BYTE pixel_data[4]; +} tiff_resolution_image_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_resolution_image_data, number_of_entries), + 13, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 1 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_resolution_image_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_resolution_image_data, resx) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_resolution_image_data, resy) }, /* YRESOLUTION */ + { 0x128, IFD_SHORT, 1, 1 }, /* RESOLUTIONUNIT -- value will be filled with test data */ + }, + 0, + { 72, 1 }, /* value will be filled with test data */ + { 72, 1 }, /* value will be filled with test data */ + { 0x11, 0x22, 0x33, 0 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -370,6 +446,58 @@ static void test_tiff_8bpp_alpha(void) IWICBitmapDecoder_Release(decoder); } +static void test_tiff_resolution(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + double dpi_x, dpi_y; + int i; + + for (i = 0; i < sizeof(tiff_resolution_test_data)/sizeof(tiff_resolution_test_data[0]); i++) + { + const struct tiff_resolution_test_data *test_data = &tiff_resolution_test_data[i]; + tiff_resolution_image_data.resx = test_data->resx; + tiff_resolution_image_data.resy = test_data->resy; + tiff_resolution_image_data.entry[12].value = test_data->resolution_unit; + + decoder = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data)); + ok(decoder != 0, "%d: Failed to load TIFF image data\n", i); + if (!decoder) continue; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "%d: GetFrame error %#x\n", i, hr); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "%d: GetResolution error %#x\n", i, hr); + + if (test_data->broken_dpi_x != 0) + { + ok(fabs(dpi_x - test_data->expected_dpi_x) < 0.01 || broken(fabs(dpi_x - test_data->broken_dpi_x) < 0.01), + "%d: x: expected %f or %f, got %f\n", i, test_data->expected_dpi_x, test_data->broken_dpi_x, dpi_x); + } + else + { + ok(fabs(dpi_x - test_data->expected_dpi_x) < 0.01, + "%d: x: expected %f, got %f\n", i, test_data->expected_dpi_x, dpi_x); + } + + if (test_data->broken_dpi_y != 0) + { + ok(fabs(dpi_y - test_data->expected_dpi_y) < 0.01 || broken(fabs(dpi_y - test_data->broken_dpi_y) < 0.01), + "%d: y: expected %f or %f, got %f\n", i, test_data->expected_dpi_y, test_data->broken_dpi_y, dpi_y); + } + else + { + ok(fabs(dpi_y - test_data->expected_dpi_y) < 0.01, + "%d: y: expected %f, got %f\n", i, test_data->expected_dpi_y, dpi_y); + } + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); + } +} + START_TEST(tiffformat) { HRESULT hr; @@ -384,6 +512,7 @@ START_TEST(tiffformat) test_tiff_palette(); test_QueryCapability(); test_tiff_8bpp_alpha(); + test_tiff_resolution(); IWICImagingFactory_Release(factory); CoUninitialize(); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a0eec53f5f..e7d4d444c7 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -529,21 +529,17 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->resolution_unit = 0; pTIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &decode_info->resolution_unit); - if (decode_info->resolution_unit != 0) + + ret = pTIFFGetField(tiff, TIFFTAG_XRESOLUTION, &decode_info->xres); + if (!ret) { - ret = pTIFFGetField(tiff, TIFFTAG_XRESOLUTION, &decode_info->xres); - if (!ret) - { - WARN("missing X resolution\n"); - decode_info->resolution_unit = 0; - } + WARN("missing X resolution\n"); + } - ret = pTIFFGetField(tiff, TIFFTAG_YRESOLUTION, &decode_info->yres); - if (!ret) - { - WARN("missing Y resolution\n"); - decode_info->resolution_unit = 0; - } + ret = pTIFFGetField(tiff, TIFFTAG_YRESOLUTION, &decode_info->yres); + if (!ret) + { + WARN("missing Y resolution\n"); } return S_OK; @@ -893,26 +889,28 @@ static HRESULT WINAPI TiffFrameDecode_GetResolution(IWICBitmapFrameDecode *iface { TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); - switch (This->decode_info.resolution_unit) + if (This->decode_info.xres == 0 || This->decode_info.yres == 0) { - default: - FIXME("unknown resolution unit %i\n", This->decode_info.resolution_unit); - /* fall through */ - case 0: /* Not set */ *pDpiX = *pDpiY = 96.0; - break; - case 1: /* Relative measurements */ - *pDpiX = 96.0; - *pDpiY = 96.0 * This->decode_info.yres / This->decode_info.xres; - break; - case 2: /* Inch */ - *pDpiX = This->decode_info.xres; - *pDpiY = This->decode_info.yres; - break; - case 3: /* Centimeter */ - *pDpiX = This->decode_info.xres / 2.54; - *pDpiY = This->decode_info.yres / 2.54; - break; + } + else + { + switch (This->decode_info.resolution_unit) + { + default: + FIXME("unknown resolution unit %i\n", This->decode_info.resolution_unit); + /* fall through */ + case 0: /* Not set */ + case 1: /* Relative measurements */ + case 2: /* Inch */ + *pDpiX = This->decode_info.xres; + *pDpiY = This->decode_info.yres; + break; + case 3: /* Centimeter */ + *pDpiX = This->decode_info.xres * 2.54; + *pDpiY = This->decode_info.yres * 2.54; + break; + } } TRACE("(%p) <-- %f,%f unit=%i\n", iface, *pDpiX, *pDpiY, This->decode_info.resolution_unit); -- 2.15.1

3 4

[PATCH] wincodecs: Create default encoder options for BMP encoder
by Nikolay Sivov 16 Feb '18

16 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/bmpencode.c | 11 ++++++++++- dlls/windowscodecs/tests/converter.c | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 047154e6cc..afd0baf12d 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -72,6 +72,8 @@ typedef struct BmpFrameEncode { BOOL committed; } BmpFrameEncode; +static const WCHAR wszEnableV5Header32bppBGRA[] = {'E','n','a','b','l','e','V','5','H','e','a','d','e','r','3','2','b','p','p','B','G','R','A',0}; + static inline BmpFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) { return CONTAINING_RECORD(iface, BmpFrameEncode, IWICBitmapFrameEncode_iface); @@ -135,6 +137,9 @@ static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, if (This->initialized) return WINCODEC_ERR_WRONGSTATE; + if (pIEncoderOptions) + WARN("ignoring encoder options.\n"); + This->initialized = TRUE; return S_OK; @@ -501,6 +506,10 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); BmpFrameEncode *encode; HRESULT hr; + static const PROPBAG2 opts[1] = + { + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszEnableV5Header32bppBGRA }, + }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -510,7 +519,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) return hr; } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 80423dc54e..690e787be6 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -467,6 +467,7 @@ static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; +static const WCHAR wszEnableV5Header32bppBGRA[] = {'E','n','a','b','l','e','V','5','H','e','a','d','e','r','3','2','b','p','p','B','G','R','A',0}; static const struct property_opt_test_data testdata_tiff_props[] = { { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, @@ -490,6 +491,11 @@ static const struct property_opt_test_data testdata_jpeg_props[] = { { NULL } }; +static const struct property_opt_test_data testdata_bmp_props[] = { + { wszEnableV5Header32bppBGRA, VT_BOOL, VT_BOOL, VARIANT_FALSE, 0.0f, TRUE }, /* Supported since Win7 */ + { NULL } +}; + static int find_property_index(const WCHAR* name, PROPBAG2* all_props, int all_prop_cnt) { int i; @@ -616,6 +622,8 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o test_specific_encoder_properties(options, testdata_png_props, all_props, cProperties2); else if (IsEqualCLSID(clsid_encoder, &CLSID_WICJpegEncoder)) test_specific_encoder_properties(options, testdata_jpeg_props, all_props, cProperties2); + else if (IsEqualCLSID(clsid_encoder, &CLSID_WICBmpEncoder)) + test_specific_encoder_properties(options, testdata_bmp_props, all_props, cProperties2); for (i=0; i < cProperties2; i++) { -- 2.15.1

2 1

Correctly importing uuid
by Anton Romanov 16 Feb '18

16 Feb '18

Hi all, I'm working on dlls/wmp and I have added code that now requires GUID_NULL. Instead of duplicating its definition I was trying to add "uuid" to IMPORTS section of Makefile. When I do that I get get multiple definitions of various GUIDs. To fix that I have removed #include "initguid.h" from wmp_main.c . That fixes multiple definitions however this brings undefined references such as: wine/dlls/wmp/oleobj.c:255: undefined reference to `IID_IWMPCore' x86_64-pc-linux-gnu/bin/ld: oleobj.o: relocation R_386_GOTOFF against undefined hidden symbol `IID_IWMPCore' can not be used when making a shared object now. It is unclear to me what is the right way to fix this issue. Can someone shed some light on a proper way to do that? (I can solve that by duplicating GUID_NULL definition but I was said that its not needed) Thanks!

3 6

[PATCH 10/10] amstream: Use streams as pins in MediaStreamFilter.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastreamfilter.c | 185 ++------------------------------------ dlls/amstream/tests/amstream.c | 4 + 2 files changed, 10 insertions(+), 179 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index c14e8ac7dd..5abcb2f65f 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -34,38 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); -typedef struct MediaStreamFilter_InputPin -{ - BaseInputPin pin; -} MediaStreamFilter_InputPin; - -static const IPinVtbl MediaStreamFilter_InputPin_Vtbl = -{ - BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, - BaseInputPinImpl_Connect, - BaseInputPinImpl_ReceiveConnection, - BasePinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseInputPinImpl_EndOfStream, - BaseInputPinImpl_BeginFlush, - BaseInputPinImpl_EndFlush, - BasePinImpl_NewSegment -}; - typedef struct { BaseFilter filter; ULONG nb_streams; IAMMediaStream** streams; - IPin** pins; } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -73,133 +45,6 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamF return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); } -static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) -{ - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter((IMediaStreamFilter*)This->pinInfo.pFilter); - MSPID purpose_id; - ULONG i; - - TRACE("Checking media type %s - %s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype)); - - /* Find which stream is associated with the pin */ - for (i = 0; i < filter->nb_streams; i++) - if (&This->IPin_iface == filter->pins[i]) - break; - - if (i == filter->nb_streams) - return S_FALSE; - - if (FAILED(IAMMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) - return S_FALSE; - - TRACE("Checking stream with purpose id %s\n", debugstr_guid(&purpose_id)); - - if (IsEqualGUID(&purpose_id, &MSPID_PrimaryVideo) && IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video)) - { - if (IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB1) || - IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB4) || - IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8) || - IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || - IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB555) || - IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || - IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB32)) - { - TRACE("Video sub-type %s matches\n", debugstr_guid(&pmt->subtype)); - return S_OK; - } - } - else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio) && IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio)) - { - if (IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_PCM)) - { - TRACE("Audio sub-type %s matches\n", debugstr_guid(&pmt->subtype)); - return S_OK; - } - } - - return S_FALSE; -} - -static LONG WINAPI BasePinImp_GetMediaTypeVersion(BasePin *This) -{ - return 0; -} - -static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA_TYPE *amt) -{ - IMediaStreamFilterImpl *filter = (IMediaStreamFilterImpl*)This->pinInfo.pFilter; - MSPID purpose_id; - ULONG i; - - /* FIXME: Reset structure as we only fill majortype and minortype for now */ - ZeroMemory(amt, sizeof(*amt)); - - /* Find which stream is associated with the pin */ - for (i = 0; i < filter->nb_streams; i++) - if (&This->IPin_iface == filter->pins[i]) - break; - - if (i == filter->nb_streams) - return S_FALSE; - - if (FAILED(IAMMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) - return S_FALSE; - - TRACE("Processing stream with purpose id %s\n", debugstr_guid(&purpose_id)); - - if (IsEqualGUID(&purpose_id, &MSPID_PrimaryVideo)) - { - amt->majortype = MEDIATYPE_Video; - - switch (index) - { - case 0: - amt->subtype = MEDIASUBTYPE_RGB1; - break; - case 1: - amt->subtype = MEDIASUBTYPE_RGB4; - break; - case 2: - amt->subtype = MEDIASUBTYPE_RGB8; - break; - case 3: - amt->subtype = MEDIASUBTYPE_RGB565; - break; - case 4: - amt->subtype = MEDIASUBTYPE_RGB555; - break; - case 5: - amt->subtype = MEDIASUBTYPE_RGB24; - break; - case 6: - amt->subtype = MEDIASUBTYPE_RGB32; - break; - default: - return S_FALSE; - } - } - else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio)) - { - if (index) - return S_FALSE; - - amt->majortype = MEDIATYPE_Audio; - amt->subtype = MEDIASUBTYPE_PCM; - } - - return S_OK; -} - -static const BaseInputPinFuncTable input_BaseInputFuncTable = { - { - BasePinImpl_CheckMediaType, - NULL, - BasePinImp_GetMediaTypeVersion, - BasePinImp_GetMediaType - }, - NULL -}; - /*** IUnknown methods ***/ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface) @@ -246,11 +91,10 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) ULONG i; for (i = 0; i < This->nb_streams; i++) { + IAMMediaStream_JoinFilter(This->streams[i], NULL); IAMMediaStream_Release(This->streams[i]); - IPin_Release(This->pins[i]); } CoTaskMemFree(This->streams); - CoTaskMemFree(This->pins); BaseFilter_Destroy(&This->filter); HeapFree(GetProcessHeap(), 0, This); } @@ -344,11 +188,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); IAMMediaStream** streams; - IPin** pins; - MediaStreamFilter_InputPin* pin; HRESULT hr; - PIN_INFO info; - MSPID purpose_id; TRACE("(%p)->(%p)\n", iface, pAMMediaStream); @@ -356,25 +196,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i if (!streams) return E_OUTOFMEMORY; This->streams = streams; - pins = CoTaskMemRealloc(This->pins, (This->nb_streams + 1) * sizeof(IPin*)); - if (!pins) - return E_OUTOFMEMORY; - This->pins = pins; - info.pFilter = &This->filter.IBaseFilter_iface; - info.dir = PINDIR_INPUT; - hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); - if (FAILED(hr)) - return hr; - /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ - info.achName[0] = 'I'; - StringFromGUID2(&purpose_id, info.achName + 1, 40); - hr = BaseInputPin_Construct(&MediaStreamFilter_InputPin_Vtbl, sizeof(BaseInputPin), &info, - &input_BaseInputFuncTable, &This->filter.csFilter, NULL, &This->pins[This->nb_streams]); + + hr = IAMMediaStream_JoinFilter(pAMMediaStream, iface); if (FAILED(hr)) return hr; - pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; - pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; This->streams[This->nb_streams] = pAMMediaStream; This->nb_streams++; @@ -488,8 +314,9 @@ static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) if (pos < This->nb_streams) { - IPin_AddRef(This->pins[pos]); - return This->pins[pos]; + IPin *pin = NULL; + IAMMediaStream_QueryInterface(This->streams[pos], &IID_IPin, (void **)&pin); + return pin; } return NULL; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 05957df425..70cd18de1b 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -483,6 +483,10 @@ static void test_media_streams(void) ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); ok(nb_media_types > 0, "nb_media_types should be >0\n"); IEnumMediaTypes_Release(enum_media_types); + hr = IMediaStream_QueryInterface(i ? audio_stream : video_stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + ok(pin == pins[i], "Pin is %p instead of %p\n", pins[i], pin); + IPin_Release(pin); IPin_Release(pins[i]); } IEnumPins_Release(enum_pins); -- 2.14.1

1 0

[PATCH 09/10] amstream: Store streams as IAMMediaStream in MediaStreamFilter.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastreamfilter.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 3eeafd302b..c14e8ac7dd 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -64,7 +64,7 @@ static const IPinVtbl MediaStreamFilter_InputPin_Vtbl = typedef struct { BaseFilter filter; ULONG nb_streams; - IMediaStream** streams; + IAMMediaStream** streams; IPin** pins; } IMediaStreamFilterImpl; @@ -89,7 +89,7 @@ static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_T if (i == filter->nb_streams) return S_FALSE; - if (FAILED(IMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) + if (FAILED(IAMMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) return S_FALSE; TRACE("Checking stream with purpose id %s\n", debugstr_guid(&purpose_id)); @@ -142,7 +142,7 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA if (i == filter->nb_streams) return S_FALSE; - if (FAILED(IMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) + if (FAILED(IAMMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) return S_FALSE; TRACE("Processing stream with purpose id %s\n", debugstr_guid(&purpose_id)); @@ -246,7 +246,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) ULONG i; for (i = 0; i < This->nb_streams; i++) { - IMediaStream_Release(This->streams[i]); + IAMMediaStream_Release(This->streams[i]); IPin_Release(This->pins[i]); } CoTaskMemFree(This->streams); @@ -343,7 +343,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* iface, IAMMediaStream *pAMMediaStream) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - IMediaStream** streams; + IAMMediaStream** streams; IPin** pins; MediaStreamFilter_InputPin* pin; HRESULT hr; @@ -352,7 +352,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i TRACE("(%p)->(%p)\n", iface, pAMMediaStream); - streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IMediaStream*)); + streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IAMMediaStream*)); if (!streams) return E_OUTOFMEMORY; This->streams = streams; @@ -375,7 +375,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; - This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; + This->streams[This->nb_streams] = pAMMediaStream; This->nb_streams++; IAMMediaStream_AddRef(pAMMediaStream); @@ -393,10 +393,10 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* i for (i = 0; i < This->nb_streams; i++) { - IMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); + IAMMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); if (IsEqualIID(&purpose_id, idPurpose)) { - *ppMediaStream = This->streams[i]; + *ppMediaStream = (IMediaStream *)This->streams[i]; IMediaStream_AddRef(*ppMediaStream); return S_OK; } -- 2.14.1

1 0

[PATCH 08/10] amstream: Implement AMAudioStream::JoinFilter.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 82454edb64..58f9f204b3 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -837,9 +837,11 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStr { AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, media_stream_filter); + TRACE("(%p/%p)->(%p)\n", This, iface, media_stream_filter); - return S_FALSE; + This->input_pin->pin.pin.pinInfo.pFilter = (IBaseFilter *)media_stream_filter; + + return S_OK; } static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) -- 2.14.1

1 0

[PATCH 07/10] amstream: Implement CheckMediaType for AMAudioStream based on code from mediastreamfilter.c.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index b6f591ad25..82454edb64 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1080,9 +1080,18 @@ static HRESULT WINAPI AudioMediaStreamInputPin_CheckMediaType(BasePin *base, con { AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(&base->IPin_iface); - FIXME("(%p)->(%p) stub!\n", This, media_type); + TRACE("(%p)->(%p)\n", This, media_type); - return E_NOTIMPL; + if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Audio)) + { + if (IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_PCM)) + { + TRACE("Audio sub-type %s matches\n", debugstr_guid(&media_type->subtype)); + return S_OK; + } + } + + return S_OK; } static LONG WINAPI AudioMediaStreamInputPin_GetMediaTypeVersion(BasePin *base) -- 2.14.1

1 0

[PATCH 06/10] amstream: Implement GetMediaType for AMAudioStream based on code from mediastreamfilter.c.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index e308f0f51b..b6f591ad25 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1094,9 +1094,18 @@ static HRESULT WINAPI AudioMediaStreamInputPin_GetMediaType(BasePin *base, int i { AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(&base->IPin_iface); - FIXME("(%p)->(%d,%p) stub!\n", This, index, media_type); + TRACE("(%p)->(%d,%p)\n", This, index, media_type); - return E_NOTIMPL; + /* FIXME: Reset structure as we only fill majortype and minortype for now */ + ZeroMemory(media_type, sizeof(*media_type)); + + if (index) + return S_FALSE; + + media_type->majortype = MEDIATYPE_Audio; + media_type->subtype = MEDIASUBTYPE_PCM; + + return S_OK; } static HRESULT WINAPI AudioMediaStreamInputPin_Receive(BaseInputPin *base, IMediaSample *sample) -- 2.14.1

1 0

[PATCH 05/10] amstream: Add stub IPin and IMemInputPin to AMAudioStream.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 138 +++++++++++++++++++++++++++++++++++++++++ dlls/amstream/tests/amstream.c | 6 ++ 2 files changed, 144 insertions(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 028434124a..e308f0f51b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -644,13 +644,22 @@ out_object: return hr; } +struct AudioMediaStreamImpl; + typedef struct { + BaseInputPin pin; + struct AudioMediaStreamImpl *parent; +} AudioMediaStreamInputPin; + +typedef struct AudioMediaStreamImpl { IAMMediaStream IAMMediaStream_iface; IAudioMediaStream IAudioMediaStream_iface; LONG ref; IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; + AudioMediaStreamInputPin *input_pin; + CRITICAL_SECTION critical_section; } AudioMediaStreamImpl; static inline AudioMediaStreamImpl *impl_from_AudioMediaStream_IAMMediaStream(IAMMediaStream *iface) @@ -680,6 +689,18 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMedi *ret_iface = &This->IAudioMediaStream_iface; return S_OK; } + else if (IsEqualGUID(riid, &IID_IPin)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = &This->input_pin->pin.pin.IPin_iface; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IMemInputPin)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = &This->input_pin->pin.IMemInputPin_iface; + return S_OK; + } ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; @@ -703,7 +724,11 @@ static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream * TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); if (!ref) + { + BaseInputPin_Destroy((BaseInputPin *)This->input_pin); + DeleteCriticalSection(&This->critical_section); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -1002,10 +1027,104 @@ static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_IAudioMediaStream AudioMediaStreamImpl_IAudioMediaStream_CreateSample }; +static inline AudioMediaStreamInputPin *impl_from_AudioMediaStreamInputPin_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, AudioMediaStreamInputPin, pin.pin.IPin_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI AudioMediaStreamInputPin_IPin_QueryInterface(IPin *iface, REFIID riid, void **ret_iface) +{ + AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(iface); + + return IAMMediaStream_QueryInterface(&This->parent->IAMMediaStream_iface, riid, ret_iface); +} + +static ULONG WINAPI AudioMediaStreamInputPin_IPin_AddRef(IPin *iface) +{ + AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(iface); + + return IAMMediaStream_AddRef(&This->parent->IAMMediaStream_iface); +} + +static ULONG WINAPI AudioMediaStreamInputPin_IPin_Release(IPin *iface) +{ + AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(iface); + + return IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); +} + +static const IPinVtbl AudioMediaStreamInputPin_IPin_Vtbl = +{ + AudioMediaStreamInputPin_IPin_QueryInterface, + AudioMediaStreamInputPin_IPin_AddRef, + AudioMediaStreamInputPin_IPin_Release, + BaseInputPinImpl_Connect, + BaseInputPinImpl_ReceiveConnection, + BasePinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BaseInputPinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment, +}; + +static HRESULT WINAPI AudioMediaStreamInputPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *media_type) +{ + AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(&base->IPin_iface); + + FIXME("(%p)->(%p) stub!\n", This, media_type); + + return E_NOTIMPL; +} + +static LONG WINAPI AudioMediaStreamInputPin_GetMediaTypeVersion(BasePin *base) +{ + return 0; +} + +static HRESULT WINAPI AudioMediaStreamInputPin_GetMediaType(BasePin *base, int index, AM_MEDIA_TYPE *media_type) +{ + AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(&base->IPin_iface); + + FIXME("(%p)->(%d,%p) stub!\n", This, index, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AudioMediaStreamInputPin_Receive(BaseInputPin *base, IMediaSample *sample) +{ + AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(&base->pin.IPin_iface); + + FIXME("(%p)->(%p) stub!\n", This, sample); + + return E_NOTIMPL; +} + +static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable = +{ + { + AudioMediaStreamInputPin_CheckMediaType, + NULL, + AudioMediaStreamInputPin_GetMediaTypeVersion, + AudioMediaStreamInputPin_GetMediaType, + }, + AudioMediaStreamInputPin_Receive, +}; + HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { AudioMediaStreamImpl *object; + PIN_INFO pin_info; + HRESULT hr; TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); @@ -1017,6 +1136,20 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAudioMediaStream_Vtbl; object->ref = 1; + InitializeCriticalSection(&object->critical_section); + + pin_info.pFilter = NULL; + pin_info.dir = PINDIR_INPUT; + pin_info.achName[0] = 'I'; + StringFromGUID2(purpose_id, pin_info.achName + 1, MAX_PIN_NAME - 1); + hr = BaseInputPin_Construct(&AudioMediaStreamInputPin_IPin_Vtbl, + sizeof(AudioMediaStreamInputPin), &pin_info, &AudioMediaStreamInputPin_FuncTable, + &object->critical_section, NULL, (IPin **)&object->input_pin); + if (FAILED(hr)) + goto out_object; + + object->input_pin->parent = object; + object->parent = parent; object->purpose_id = *purpose_id; object->stream_type = stream_type; @@ -1024,6 +1157,11 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ *media_stream = &object->IAMMediaStream_iface; return S_OK; + +out_object: + HeapFree(GetProcessHeap(), 0, object); + + return hr; } typedef struct { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index fba83c10e8..05957df425 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -374,6 +374,7 @@ static void test_media_streams(void) { IAMMediaStream* am_media_stream; IMultiMediaStream *multi_media_stream; + IPin *pin = NULL; IDirectDrawMediaStream* ddraw_stream = NULL; IAudioMediaStream* audio_media_stream = NULL; IAudioStreamSample *audio_sample = NULL; @@ -393,6 +394,11 @@ static void test_media_streams(void) IAMMediaStream_Release(am_media_stream); + hr = IMediaStream_QueryInterface(audio_stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + + IPin_Release(pin); + hr = IMediaStream_QueryInterface(audio_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); -- 2.14.1

1 0

[PATCH 04/10] amstream: Implement AMDirectDrawStream::JoinFilter.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 6aad625923..028434124a 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -237,9 +237,11 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMed { DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, media_stream_filter); + TRACE("(%p/%p)->(%p)\n", This, iface, media_stream_filter); - return S_FALSE; + This->input_pin->pin.pin.pinInfo.pFilter = (IBaseFilter *)media_stream_filter; + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) -- 2.14.1

1 0

[PATCH 03/10] amstream: Implement CheckMediaType for AMDirectDrawStream based on code form mediastreamfilter.c.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index d6f5eaf552..6aad625923 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -511,9 +511,24 @@ static HRESULT WINAPI DirectDrawMediaStreamInputPin_CheckMediaType(BasePin *base { DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->IPin_iface); - FIXME("(%p)->(%p) stub!\n", This, media_type); + TRACE("(%p)->(%p)\n", This, media_type); - return E_NOTIMPL; + if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video)) + { + if (IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB1) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB4) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB8) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB565) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB555) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB24) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB32)) + { + TRACE("Video sub-type %s matches\n", debugstr_guid(&media_type->subtype)); + return S_OK; + } + } + + return S_FALSE; } static LONG WINAPI DirectDrawMediaStreamInputPin_GetMediaTypeVersion(BasePin *base) -- 2.14.1

1 0

[PATCH 02/10] amstream: Implement GetMediaType for AMDirectDrawStream based on code from mediastreamfilter.c.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index f8ce58bf0e..d6f5eaf552 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -525,9 +525,41 @@ static HRESULT WINAPI DirectDrawMediaStreamInputPin_GetMediaType(BasePin *base, { DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->IPin_iface); - FIXME("(%p)->(%d,%p) stub!\n", This, index, media_type); + TRACE("(%p)->(%d,%p)\n", This, index, media_type); - return E_NOTIMPL; + /* FIXME: Reset structure as we only fill majortype and minortype for now */ + ZeroMemory(media_type, sizeof(*media_type)); + + media_type->majortype = MEDIATYPE_Video; + + switch (index) + { + case 0: + media_type->subtype = MEDIASUBTYPE_RGB1; + break; + case 1: + media_type->subtype = MEDIASUBTYPE_RGB4; + break; + case 2: + media_type->subtype = MEDIASUBTYPE_RGB8; + break; + case 3: + media_type->subtype = MEDIASUBTYPE_RGB565; + break; + case 4: + media_type->subtype = MEDIASUBTYPE_RGB555; + break; + case 5: + media_type->subtype = MEDIASUBTYPE_RGB24; + break; + case 6: + media_type->subtype = MEDIASUBTYPE_RGB32; + break; + default: + return S_FALSE; + } + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamInputPin_Receive(BaseInputPin *base, IMediaSample *sample) -- 2.14.1

1 0

[PATCH 01/10] amstream: Add stub IPin and IMemInputPin to AMDirectDrawStream.
by Anton Baskanov 16 Feb '18

16 Feb '18

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/mediastream.c | 139 +++++++++++++++++++++++++++++++++++++++++ dlls/amstream/tests/amstream.c | 6 ++ 2 files changed, 145 insertions(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 7a2e013b3e..f8ce58bf0e 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -26,6 +26,9 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "dshow.h" + +#include "wine/strmbase.h" #include "amstream_private.h" @@ -38,7 +41,14 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); +struct DirectDrawMediaStreamImpl; + typedef struct { + BaseInputPin pin; + struct DirectDrawMediaStreamImpl *parent; +} DirectDrawMediaStreamInputPin; + +typedef struct DirectDrawMediaStreamImpl { IAMMediaStream IAMMediaStream_iface; IDirectDrawMediaStream IDirectDrawMediaStream_iface; LONG ref; @@ -46,6 +56,8 @@ typedef struct { MSPID purpose_id; STREAM_TYPE stream_type; IDirectDraw7 *ddraw; + DirectDrawMediaStreamInputPin *input_pin; + CRITICAL_SECTION critical_section; } DirectDrawMediaStreamImpl; static inline DirectDrawMediaStreamImpl *impl_from_DirectDrawMediaStream_IAMMediaStream(IAMMediaStream *iface) @@ -75,6 +87,18 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_QueryInterface(IA *ret_iface = &This->IDirectDrawMediaStream_iface; return S_OK; } + else if (IsEqualGUID(riid, &IID_IPin)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = &This->input_pin->pin.pin.IPin_iface; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IMemInputPin)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = &This->input_pin->pin.IMemInputPin_iface; + return S_OK; + } ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; @@ -99,6 +123,8 @@ static ULONG WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_Release(IAMMediaStr if (!ref) { + BaseInputPin_Destroy((BaseInputPin *)This->input_pin); + DeleteCriticalSection(&This->critical_section); if (This->ddraw) IDirectDraw7_Release(This->ddraw); HeapFree(GetProcessHeap(), 0, This); @@ -432,10 +458,104 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStreamImpl_IDirect DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetTimePerFrame }; +static inline DirectDrawMediaStreamInputPin *impl_from_DirectDrawMediaStreamInputPin_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, DirectDrawMediaStreamInputPin, pin.pin.IPin_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI DirectDrawMediaStreamInputPin_IPin_QueryInterface(IPin *iface, REFIID riid, void **ret_iface) +{ + DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(iface); + + return IAMMediaStream_QueryInterface(&This->parent->IAMMediaStream_iface, riid, ret_iface); +} + +static ULONG WINAPI DirectDrawMediaStreamInputPin_IPin_AddRef(IPin *iface) +{ + DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(iface); + + return IAMMediaStream_AddRef(&This->parent->IAMMediaStream_iface); +} + +static ULONG WINAPI DirectDrawMediaStreamInputPin_IPin_Release(IPin *iface) +{ + DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(iface); + + return IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); +} + +static const IPinVtbl DirectDrawMediaStreamInputPin_IPin_Vtbl = +{ + DirectDrawMediaStreamInputPin_IPin_QueryInterface, + DirectDrawMediaStreamInputPin_IPin_AddRef, + DirectDrawMediaStreamInputPin_IPin_Release, + BaseInputPinImpl_Connect, + BaseInputPinImpl_ReceiveConnection, + BasePinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BaseInputPinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment, +}; + +static HRESULT WINAPI DirectDrawMediaStreamInputPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *media_type) +{ + DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->IPin_iface); + + FIXME("(%p)->(%p) stub!\n", This, media_type); + + return E_NOTIMPL; +} + +static LONG WINAPI DirectDrawMediaStreamInputPin_GetMediaTypeVersion(BasePin *base) +{ + return 0; +} + +static HRESULT WINAPI DirectDrawMediaStreamInputPin_GetMediaType(BasePin *base, int index, AM_MEDIA_TYPE *media_type) +{ + DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->IPin_iface); + + FIXME("(%p)->(%d,%p) stub!\n", This, index, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DirectDrawMediaStreamInputPin_Receive(BaseInputPin *base, IMediaSample *sample) +{ + DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->pin.IPin_iface); + + FIXME("(%p)->(%p) stub!\n", This, sample); + + return E_NOTIMPL; +} + +static const BaseInputPinFuncTable DirectDrawMediaStreamInputPin_FuncTable = +{ + { + DirectDrawMediaStreamInputPin_CheckMediaType, + NULL, + DirectDrawMediaStreamInputPin_GetMediaTypeVersion, + DirectDrawMediaStreamInputPin_GetMediaType, + }, + DirectDrawMediaStreamInputPin_Receive, +}; + HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { DirectDrawMediaStreamImpl *object; + PIN_INFO pin_info; + HRESULT hr; TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); @@ -447,6 +567,20 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Vtbl; object->ref = 1; + InitializeCriticalSection(&object->critical_section); + + pin_info.pFilter = NULL; + pin_info.dir = PINDIR_INPUT; + pin_info.achName[0] = 'I'; + StringFromGUID2(purpose_id, pin_info.achName + 1, MAX_PIN_NAME - 1); + hr = BaseInputPin_Construct(&DirectDrawMediaStreamInputPin_IPin_Vtbl, + sizeof(DirectDrawMediaStreamInputPin), &pin_info, &DirectDrawMediaStreamInputPin_FuncTable, + &object->critical_section, NULL, (IPin **)&object->input_pin); + if (FAILED(hr)) + goto out_object; + + object->input_pin->parent = object; + object->parent = parent; object->purpose_id = *purpose_id; object->stream_type = stream_type; @@ -454,6 +588,11 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ *media_stream = &object->IAMMediaStream_iface; return S_OK; + +out_object: + HeapFree(GetProcessHeap(), 0, object); + + return hr; } typedef struct { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c08f98985b..fba83c10e8 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -258,6 +258,7 @@ static void test_media_streams(void) { IAMMediaStream* am_media_stream; IMultiMediaStream *multi_media_stream; + IPin *pin = NULL; IAudioMediaStream* audio_media_stream; IDirectDrawMediaStream *ddraw_stream = NULL; IDirectDrawStreamSample *ddraw_sample = NULL; @@ -277,6 +278,11 @@ static void test_media_streams(void) IAMMediaStream_Release(am_media_stream); + hr = IMediaStream_QueryInterface(video_stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + + IPin_Release(pin); + hr = IMediaStream_QueryInterface(video_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); -- 2.14.1

1 0

[PATCH 1/5] d3d10core/tests: Add test for alpha to coverage.
by Józef Kucia 16 Feb '18

16 Feb '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 219 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 103b6705e342..9b1b89a653bb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -14636,6 +14636,224 @@ static void test_generate_mips(void) release_test_context(&test_context); } +static void test_alpha_to_coverage(void) +{ + struct ps_cb + { + struct vec2 top; + struct vec2 bottom; + float alpha[2]; + float padding[2]; + }; + + struct d3d10core_test_context test_context; + ID3D10Texture2D *render_targets[3]; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *readback_texture; + ID3D10RenderTargetView *rtvs[3]; + ID3D10BlendState *blend_state; + D3D10_BLEND_DESC blend_desc; + struct resource_readback rb; + UINT quality_level_count; + ID3D10PixelShader *ps; + struct ps_cb cb_data; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + RECT rect; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + float2 top; + float2 bottom; + float alpha1; + float alpha2; + + void main(float4 position : SV_Position, + out float4 target0 : SV_Target0, + out float4 target1 : SV_Target1, + out float4 target2 : SV_Target2) + { + float alpha = all(top <= position.xy) && all(position.xy <= bottom) ? 1.0f : 0.0f; + target0 = float4(0.0f, 1.0f, 0.0f, alpha); + target1 = float4(0.0f, 0.0f, 1.0f, alpha1); + target2 = float4(0.0f, 1.0f, 0.0f, alpha2); + } +#endif + 0x43425844, 0x771ff802, 0xca927279, 0x5bdd75ae, 0xf53cb31b, 0x00000001, 0x00000264, 0x00000003, + 0x0000002c, 0x00000060, 0x000000c4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000005c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000050, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000050, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x52444853, 0x00000198, 0x00000040, 0x00000066, 0x04000059, 0x00208e46, 0x00000000, + 0x00000002, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x02000068, 0x00000001, + 0x0800001d, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000000, + 0x07000001, 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0800001d, + 0x00100062, 0x00000000, 0x00208ba6, 0x00000000, 0x00000000, 0x00101106, 0x00000000, 0x07000001, + 0x00100022, 0x00000000, 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, 0x07000001, 0x00100012, + 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x07000001, 0x00102082, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x08000036, 0x00102072, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, 0x00102072, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x3f800000, 0x00000000, 0x06000036, 0x00102082, 0x00000001, 0x0020800a, + 0x00000000, 0x00000001, 0x08000036, 0x00102072, 0x00000002, 0x00004002, 0x00000000, 0x3f800000, + 0x00000000, 0x00000000, 0x06000036, 0x00102082, 0x00000002, 0x0020801a, 0x00000000, 0x00000001, + 0x0100003e, + }; + static const DWORD colors[] = {0xff00ff00, 0xbfff0000, 0x8000ff00}; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.AlphaToCoverageEnable = TRUE; + for (i = 0; i < ARRAY_SIZE(blend_desc.RenderTargetWriteMask); ++i) + blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL; + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + render_targets[0] = test_context.backbuffer; + rtvs[0] = test_context.backbuffer_rtv; + for (i = 1; i < ARRAY_SIZE(render_targets); ++i) + { + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &render_targets[i]); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, + (ID3D10Resource *)render_targets[i], NULL, &rtvs[i]); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + } + ID3D10Device_OMSetRenderTargets(device, ARRAY_SIZE(rtvs), rtvs, NULL); + + cb_data.top.x = cb_data.top.y = 0.0f; + cb_data.bottom.x = cb_data.bottom.y = 200.0f; + cb_data.alpha[0] = 0.75; + cb_data.alpha[1] = 0.5f; + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(cb_data), &cb_data); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + ID3D10Device_ClearRenderTargetView(device, rtvs[i], white); + draw_quad(&test_context); + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) + { + DWORD expected_color; + + assert(i < ARRAY_SIZE(colors)); + expected_color = colors[i]; + get_texture_readback(render_targets[i], 0, &rb); + SetRect(&rect, 0, 0, 200, 200); + check_readback_data_color(&rb, &rect, expected_color, 1); + SetRect(&rect, 200, 0, 640, 200); + todo_wine + check_readback_data_color(&rb, &rect, 0xffffffff, 1); + SetRect(&rect, 0, 200, 640, 480); + todo_wine + check_readback_data_color(&rb, &rect, 0xffffffff, 1); + release_resource_readback(&rb); + + if (i > 0) + ID3D10Texture2D_Release(render_targets[i]); + render_targets[i] = NULL; + } + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R16G16_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &render_targets[0]); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, + (ID3D10Resource *)render_targets[0], NULL, &rtvs[0]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, ARRAY_SIZE(rtvs), rtvs, NULL); + + ID3D10Device_ClearRenderTargetView(device, rtvs[0], white); + draw_quad(&test_context); + get_texture_readback(render_targets[0], 0, &rb); + SetRect(&rect, 0, 0, 200, 200); + check_readback_data_color(&rb, &rect, 0xffff0000, 1); + SetRect(&rect, 200, 0, 640, 200); + todo_wine + check_readback_data_color(&rb, &rect, 0xffffffff, 1); + SetRect(&rect, 0, 200, 640, 480); + todo_wine + check_readback_data_color(&rb, &rect, 0xffffffff, 1); + release_resource_readback(&rb); + + ID3D10Texture2D_Release(render_targets[0]); + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + ID3D10RenderTargetView_Release(rtvs[i]); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, + texture_desc.Format, 4, &quality_level_count); + if (FAILED(hr)) + { + skip("4xMSAA not supported.\n"); + goto done; + } + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = 0; + + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) + { + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &render_targets[i]); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, + (ID3D10Resource *)render_targets[i], NULL, &rtvs[i]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + } + ID3D10Device_OMSetRenderTargets(device, ARRAY_SIZE(rtvs), rtvs, NULL); + + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + ID3D10Device_ClearRenderTargetView(device, rtvs[i], white); + draw_quad(&test_context); + texture_desc.SampleDesc.Count = 1; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &readback_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) + { + DWORD expected_color; + + assert(i < ARRAY_SIZE(colors)); + expected_color = colors[i]; + + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)readback_texture, 0, + (ID3D10Resource *)render_targets[i], 0, texture_desc.Format); + + get_texture_readback(readback_texture, 0, &rb); + SetRect(&rect, 0, 0, 200, 200); + check_readback_data_color(&rb, &rect, expected_color, 1); + SetRect(&rect, 200, 0, 640, 200); + check_readback_data_color(&rb, &rect, 0xffffffff, 1); + SetRect(&rect, 0, 200, 640, 480); + check_readback_data_color(&rb, &rect, 0xffffffff, 1); + release_resource_readback(&rb); + } + ID3D10Texture2D_Release(readback_texture); + + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) + { + ID3D10Texture2D_Release(render_targets[i]); + ID3D10RenderTargetView_Release(rtvs[i]); + } + +done: + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + ID3D10BlendState_Release(blend_state); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -14716,4 +14934,5 @@ START_TEST(device) test_clip_distance(); test_combined_clip_and_cull_distances(); test_generate_mips(); + test_alpha_to_coverage(); } -- 2.13.6

2 9

[PATCH 1/6] d3d9: Introduce a d3d9_texture_cleanup() function.
by Matteo Bruni 16 Feb '18

16 Feb '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/texture.c | 66 ++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d3662f8498b..ec00776e8d3 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -78,6 +78,23 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource return texture->wined3d_srv; } +static void d3d9_texture_cleanup(struct d3d9_texture *texture) +{ + IDirect3DDevice9Ex *parent_device = texture->parent_device; + struct d3d9_surface *surface; + + wined3d_mutex_lock(); + if (texture->wined3d_srv) + wined3d_shader_resource_view_decref(texture->wined3d_srv); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) + wined3d_rendertarget_view_decref(surface->wined3d_rtv); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parent_device); +} + /* wined3d critical section must be taken by the caller. */ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) { @@ -146,23 +163,7 @@ static ULONG WINAPI d3d9_texture_2d_Release(IDirect3DTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - struct d3d9_surface *surface; - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } @@ -560,25 +561,7 @@ static ULONG WINAPI d3d9_texture_cube_Release(IDirect3DCubeTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - struct d3d9_surface *surface; - - TRACE("Releasing child %p.\n", texture->wined3d_texture); - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } @@ -996,16 +979,7 @@ static ULONG WINAPI d3d9_texture_3d_Release(IDirect3DVolumeTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - - wined3d_mutex_lock(); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } -- 2.13.6

4 12

[PATCH] setupapi/tests: Drop install test workarounds for Windows <= 2000
by Alex Henrie 16 Feb '18

16 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This resolves a Coverity warning. dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/install.c | 182 ++++++++++------------------------------ 2 files changed, 46 insertions(+), 138 deletions(-) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 083e576998..a656441041 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = setupapi.dll -IMPORTS = setupapi user32 advapi32 +IMPORTS = setupapi user32 advapi32 shell32 C_SRCS = \ devinst.c \ diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 3ca7f26acf..72d16a1020 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -39,23 +39,16 @@ static const WCHAR inffileW[] = {'t','e','s','t','.','i','n','f',0}; static char CURR_DIR[MAX_PATH]; /* Notes on InstallHinfSectionA/W: - * - InstallHinfSectionW on Win98 and InstallHinfSectionA on WinXP seem to be stubs - they do not do anything - * and simply return without displaying any error message or setting last error. We test whether - * InstallHinfSectionA sets last error, and if it doesn't we set it to NULL and use the W version if available. - * - These functions do not return a value and do not always set last error to ERROR_SUCCESS when installation still - * occurs (e.g., unquoted inf file with spaces, registry keys are written but last error is 6). Also, on Win98 last error - * is set to ERROR_SUCCESS even if install fails (e.g., quoted inf file with spaces, no registry keys set, MessageBox with - * "Installation Error" displayed). Thus, we must use functional tests (e.g., is registry key created) to determine whether - * or not installation occurred. - * - On installation problems, a MessageBox() is displayed and a Beep() is issued. The MessageBox() is disabled with a - * CBT hook. + * - InstallHinfSectionA on WinXP seems to be a stub - it does not do anything + * and simply returns without displaying any error message or setting last + * error. + * - These functions do not return a value and do not always set last error to + * ERROR_SUCCESS when installation still occurs (e.g., unquoted inf file with + * spaces, registry keys are written but last error is 6). + * - On installation problems, a MessageBox() is displayed and a Beep() is + * issued. The MessageBox() is disabled with a CBT hook. */ -static void (WINAPI *pInstallHinfSectionA)(HWND, HINSTANCE, LPCSTR, INT); -static void (WINAPI *pInstallHinfSectionW)(HWND, HINSTANCE, LPCWSTR, INT); -static BOOL (WINAPI *pSetupGetInfFileListA)(PCSTR, DWORD, PSTR, DWORD, PDWORD); -static BOOL (WINAPI *pSetupGetInfFileListW)(PCWSTR, DWORD, PWSTR, DWORD, PDWORD); - /* * Helpers */ @@ -93,15 +86,11 @@ static const char *cmdline_inf = "[Version]\n" static void run_cmdline(LPCSTR section, int mode, LPCSTR path) { CHAR cmdline[MAX_PATH * 2]; + WCHAR cmdlinew[MAX_PATH * 2]; sprintf(cmdline, "%s %d %s", section, mode, path); - if (pInstallHinfSectionA) pInstallHinfSectionA(NULL, NULL, cmdline, 0); - else - { - WCHAR cmdlinew[MAX_PATH * 2]; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlinew, MAX_PATH*2); - pInstallHinfSectionW(NULL, NULL, cmdlinew, 0); - } + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlinew, MAX_PATH*2); + InstallHinfSectionW(NULL, NULL, cmdlinew, 0); } static void ok_registry(BOOL expectsuccess) @@ -193,17 +182,6 @@ static void test_install_svc_from(void) BOOL ret; SC_HANDLE scm_handle, svc_handle; - /* Bail out if we are on win98 */ - SetLastError(0xdeadbeef); - scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); - - if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); - return; - } - CloseServiceHandle(scm_handle); - /* Basic inf file to satisfy SetupOpenInfFileA */ strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); create_inf_file(inffile, inf); @@ -365,16 +343,10 @@ static void test_driver_install(void) "[Winetest.DriverFiles]\n" "winetest.sys"; - /* Bail out if we are on win98 */ + /* Bail out if we don't have enough rights */ SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); - - if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); - return; - } - else if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights to install the service\n"); return; @@ -421,8 +393,6 @@ static void test_driver_install(void) static void test_profile_items(void) { char path[MAX_PATH], commonprogs[MAX_PATH]; - HMODULE hShell32; - BOOL (WINAPI *pSHGetFolderPathA)(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwFlags, LPSTR pszPath); static const char *inf = "[Version]\n" @@ -440,15 +410,7 @@ static void test_profile_items(void) "Name=TestGroup,4\n" ; - hShell32 = LoadLibraryA("shell32"); - pSHGetFolderPathA = (void*)GetProcAddress(hShell32, "SHGetFolderPathA"); - if (!pSHGetFolderPathA) - { - win_skip("SHGetFolderPathA is not available\n"); - goto cleanup; - } - - if (S_OK != pSHGetFolderPathA(NULL, CSIDL_COMMON_PROGRAMS, NULL, SHGFP_TYPE_CURRENT, commonprogs)) + if (S_OK != SHGetFolderPathA(NULL, CSIDL_COMMON_PROGRAMS, NULL, SHGFP_TYPE_CURRENT, commonprogs)) { skip("No common program files directory exists\n"); goto cleanup; @@ -467,19 +429,12 @@ static void test_profile_items(void) run_cmdline("DefaultInstall", 128, path); snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesA(path)) - { - win_skip("ProfileItems not implemented on this system\n"); - } - else - { - snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); - ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "directory not created\n"); - snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); - ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "link not created\n"); - snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); - ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "group not created\n"); - } + snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "directory not created\n"); + snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "link not created\n"); + snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "group not created\n"); snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); DeleteFileA(path); @@ -493,7 +448,6 @@ static void test_profile_items(void) RemoveDirectoryA(path); cleanup: - if (hShell32) FreeLibrary(hShell32); DeleteFileA(inffile); } @@ -509,12 +463,6 @@ static void test_inffilelistA(void) DWORD expected, outsize; BOOL ret; - if(!pSetupGetInfFileListA) - { - win_skip("SetupGetInfFileListA not present\n"); - return; - } - /* create a private directory, the temp directory may contain some * inf files left over from old installations */ @@ -541,8 +489,8 @@ static void test_inffilelistA(void) /* mixed style */ expected = 3 + strlen(inffile) + strlen(inffile2); - ret = pSetupGetInfFileListA(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, - MAX_PATH, &outsize); + ret = SetupGetInfFileListA(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, + MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListA to succeed!\n"); ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); @@ -579,30 +527,19 @@ static void test_inffilelist(void) DWORD expected, outsize; BOOL ret; - if(!pSetupGetInfFileListW) - { - win_skip("SetupGetInfFileListW not present\n"); - return; - } - /* NULL means %windir%\\inf * get the value as reference */ expected = 0; SetLastError(0xdeadbeef); - ret = pSetupGetInfFileListW(NULL, INF_STYLE_WIN4, NULL, 0, &expected); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("SetupGetInfFileListW not implemented\n"); - return; - } + ret = SetupGetInfFileListW(NULL, INF_STYLE_WIN4, NULL, 0, &expected); ok(ret, "expected SetupGetInfFileListW to succeed! Error: %d\n", GetLastError()); ok(expected > 0, "expected required buffersize to be at least 1\n"); /* check if an empty string doesn't behaves like NULL */ outsize = 0; SetLastError(0xdeadbeef); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); ok(!ret, "expected SetupGetInfFileListW to fail!\n"); /* create a private directory, the temp directory may contain some @@ -632,7 +569,7 @@ static void test_inffilelist(void) MultiByteToWideChar(CP_ACP, 0, "\\not_existent", -1, ptr, MAX_PATH - lstrlenW(dir)); outsize = 0xffffffff; SetLastError(0xdeadbeef); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(outsize == 1, "expected required buffersize to be 1, got %d\n", outsize); ok(ERROR_PATH_NOT_FOUND == GetLastError(), @@ -648,7 +585,7 @@ static void test_inffilelist(void) MultiByteToWideChar(CP_ACP, 0, invalid_inf, -1, ptr+1, MAX_PATH - lstrlenW(dir)); outsize = 0xffffffff; SetLastError(0xdeadbeef); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); ok(!ret, "expected SetupGetInfFileListW to fail!\n"); ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); @@ -658,7 +595,7 @@ static void test_inffilelist(void) dir[1 + lstrlenW(dir)] = 0; dir[lstrlenW(dir)] = '\\'; SetLastError(0xdeadbeef); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); ok(!ret, "expected SetupGetInfFileListW to fail!\n"); ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); @@ -667,7 +604,7 @@ static void test_inffilelist(void) */ *ptr = 0; expected = 3 + strlen(inffile) + strlen(inffile2); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); @@ -678,7 +615,7 @@ static void test_inffilelist(void) /* upper case value */ create_inf_file(inffile2, inf2); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); @@ -690,7 +627,7 @@ static void test_inffilelist(void) */ create_inf_file(inffile2, infNT); expected = 3 + strlen(inffile) + strlen(inffile2); - ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); @@ -701,7 +638,7 @@ static void test_inffilelist(void) /* old style */ expected = 2 + strlen(invalid_inf); - ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT, buffer, MAX_PATH, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_OLDNT, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); @@ -711,8 +648,8 @@ static void test_inffilelist(void) /* mixed style */ expected = 4 + strlen(inffile) + strlen(inffile2) + strlen(invalid_inf); - ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, - MAX_PATH, &outsize); + ret = SetupGetInfFileListW(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, + MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); @@ -787,7 +724,6 @@ static void test_dirid(void) START_TEST(install) { - HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); char temp_path[MAX_PATH], prev_path[MAX_PATH]; DWORD len; @@ -800,49 +736,21 @@ START_TEST(install) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - pInstallHinfSectionA = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionA"); - pInstallHinfSectionW = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionW"); - pSetupGetInfFileListA = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListA"); - pSetupGetInfFileListW = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListW"); + /* Set CBT hook to disallow MessageBox creation in current thread */ + hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + assert(hhook != 0); - if (pInstallHinfSectionA) - { - /* Check if pInstallHinfSectionA sets last error or is a stub (as on WinXP) */ - static const char *minimal_inf = "[Version]\nSignature=\"$Chicago$\"\n"; - char cmdline[MAX_PATH*2]; - BOOL ret; - create_inf_file(inffile, minimal_inf); - sprintf(cmdline, "DefaultInstall 128 %s\\%s", CURR_DIR, inffile); - SetLastError(0xdeadbeef); - pInstallHinfSectionA(NULL, NULL, cmdline, 0); - if (GetLastError() == 0xdeadbeef) - { - skip("InstallHinfSectionA is broken (stub)\n"); - pInstallHinfSectionA = NULL; - } - ret = DeleteFileA(inffile); - ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); - } - if (!pInstallHinfSectionW && !pInstallHinfSectionA) - win_skip("InstallHinfSectionA and InstallHinfSectionW are not available\n"); - else - { - /* Set CBT hook to disallow MessageBox creation in current thread */ - hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); - assert(hhook != 0); + test_cmdline(); + test_registry(); + test_install_svc_from(); + test_driver_install(); + test_dirid(); - test_cmdline(); - test_registry(); - test_install_svc_from(); - test_driver_install(); - test_dirid(); + UnhookWindowsHookEx(hhook); - UnhookWindowsHookEx(hhook); - - /* We have to run this test after the CBT hook is disabled because - ProfileItems needs to create a window on Windows XP. */ - test_profile_items(); - } + /* We have to run this test after the CBT hook is disabled because + ProfileItems needs to create a window on Windows XP. */ + test_profile_items(); test_inffilelist(); test_inffilelistA(); -- 2.16.1

1 0

[PATCH] mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent::which properties implementation.
by Jacek Caban 16 Feb '18

16 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 4 ++++ 2 files changed, 26 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] include: Add IADsADSystemInfo definition.
by Dmitry Timoshkov 16 Feb '18

16 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/iads.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/iads.idl b/include/iads.idl index e7ad5fb549..4a54a2c933 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -777,3 +777,53 @@ interface IDirectorySearch : IUnknown HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } + +/***************************************************************************** + * IADsADSystemInfo interface + */ +[ + odl, + uuid(5bb11929-afd1-11d2-9cb9-0000f87a369e), + dual, + oleautomation +] +interface IADsADSystemInfo : IDispatch +{ + [id(0x00000002), propget] + HRESULT UserName([out, retval] BSTR *retval); + [id(0x00000003), propget] + HRESULT ComputerName([out, retval] BSTR *retval); + [id(0x00000004), propget] + HRESULT SiteName([out, retval] BSTR *retval); + [id(0x00000005), propget] + HRESULT DomainShortName([out, retval] BSTR *retval); + [id(0x00000006), propget] + HRESULT DomainDNSName([out, retval] BSTR *retval); + [id(0x00000007), propget] + HRESULT ForestDNSName([out, retval] BSTR *retval); + [id(0x00000008), propget] + HRESULT PDCRoleOwner([out, retval] BSTR *retval); + [id(0x00000009), propget] + HRESULT SchemaRoleOwner([out, retval] BSTR *retval); + [id(0x0000000a), propget] + HRESULT IsNativeMode([out, retval] VARIANT_BOOL *retval); + [id(0x0000000b)] + HRESULT GetAnyDCName([out, retval] BSTR *retval); + [id(0x0000000c)] + HRESULT GetDCSiteName([in] BSTR server, [out, retval] BSTR *retval); + [id(0x0000000d)] + HRESULT RefreshSchemaCache(); + [id(0x0000000e)] + HRESULT GetTrees([out, retval] VARIANT *retval); +} + +[ + helpstring("AD SystemInfo Object"), + uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), + threading(both) +] +coclass ADSystemInfo +{ + [default] interface IADsADSystemInfo; + interface IDispatch; +} -- 2.16.1

2 8

[PATCH] user32/tests: Test auto-registration for more redirected builtin classes
by Nikolay Sivov 16 Feb '18

16 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/class.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 7701f25c18..a9eee4109c 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1237,6 +1237,9 @@ static void test_comctl32_classes(void) "!Button", "!Edit", "!Static", + "!Listbox", + "!ComboBox", + "!ComboLBox", }; winetest_get_mainargs( &argv ); -- 2.16.1

1 0

[PATCH resend 7/7] winebus.sys: Add SDL to CriticalDeviceDatabase
by Aric Stewart 16 Feb '18

16 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH resend 6/7] winebus.sys: Implement SDL Haptic for controller vibration
by Aric Stewart 16 Feb '18

16 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 110 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 3 deletions(-)

1 0

[PATCH resend 5/7] winebus.sys: map SDL GameControllers if requested
by Aric Stewart 16 Feb '18

16 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 255 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 240 insertions(+), 15 deletions(-)

1 0

[PATCH resend 4/7] winebus.sys: Process SDL device reports
by Aric Stewart 16 Feb '18

16 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 116 ++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/bus_udev.c | 19 +------ dlls/winebus.sys/controller.c | 17 +++++++ dlls/winebus.sys/controller.h | 1 + 4 files changed, 135 insertions(+), 18 deletions(-)

1 0

[PATCH resend 3/7] winebus.sys: Build SDL device report
by Aric Stewart 16 Feb '18

16 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 1 + dlls/winebus.sys/bus_sdl.c | 191 +++++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/bus_udev.c | 95 +-------------------- dlls/winebus.sys/controller.c | 48 +++++++++++ dlls/winebus.sys/controller.h | 96 +++++++++++++++++++++ 5 files changed, 336 insertions(+), 95 deletions(-) create mode 100644 dlls/winebus.sys/controller.c create mode 100644 dlls/winebus.sys/controller.h

1 0

[PATCH resend 2/7] winebus.sys: Support adding and removing SDL devices
by Aric Stewart 16 Feb '18

16 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 240 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 1 deletion(-)

1 0

GSOC Application
by Sidharth Arya 16 Feb '18

16 Feb '18

Sir, I am a fourth year student, pursuing B.Tech in Engineering Physics at Delhi Technological University, New Delhi, India. I would like to work on the project "CMD - implement more robust parser". I had been using windows for about 6 years before i started using Linux. And I have been using Linux for about 4 years, and Wine for two years. So i am familiar with a bit of windows administration, linux, and using Wine. I would be obliged to work with Wine, since it has brought good windows software to the freedom of linux. I have attached my CV in case its needed to review my profile. Looking Forward to working with you. Best Regards, Sidharth Arya

2 1

[PATCH 1/2] comctl32/tests: Replace asserts with regular test checks for Edit tests
by Nikolay Sivov 16 Feb '18

16 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 122 ++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 85 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 0d95df3371..41eb5856e3 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <windows.h> #include <commctrl.h> @@ -545,14 +544,10 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) { HWND handle; - handle = CreateWindowExA(exstyle, - "EDIT", - "Test Text", - style, - 10, 10, 300, 300, - NULL, NULL, hinst, NULL); + handle = CreateWindowExA(exstyle, WC_EDITA, "Text Text", style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); ok (handle != NULL, "CreateWindow EDIT Control failed\n"); - assert (handle); + if (winetest_interactive) ShowWindow (handle, SW_SHOW); return handle; @@ -587,7 +582,6 @@ static HWND create_child_editcontrol (DWORD style, DWORD exstyle) rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, hinst, NULL); ok (parentWnd != NULL, "CreateWindow EDIT Test failed\n"); - assert(parentWnd); editWnd = CreateWindowExA(exstyle, "EDIT", @@ -596,7 +590,6 @@ static HWND create_child_editcontrol (DWORD style, DWORD exstyle) 0, 0, 300, 300, parentWnd, NULL, hinst, NULL); ok (editWnd != NULL, "CreateWindow EDIT Test Text failed\n"); - assert(editWnd); if (winetest_interactive) ShowWindow (parentWnd, SW_SHOW); return editWnd; @@ -743,15 +736,14 @@ static void test_edit_control_2(void) /* Create main and edit windows. */ hwndMain = CreateWindowA(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, 0, 0, 200, 200, NULL, NULL, hinst, NULL); - assert(hwndMain); + ok(hwndMain != NULL, "Failed to create control parent.\n"); if (winetest_interactive) ShowWindow (hwndMain, SW_SHOW); - hwndET2 = CreateWindowA("EDIT", NULL, - WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, - 0, 0, w, h, /* important this not be 0 size. */ - hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); - assert(hwndET2); + hwndET2 = CreateWindowA(WC_EDITA, NULL, WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, w, h, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + ok(hwndET2 != NULL, "Failed to create Edit control.\n"); if (winetest_interactive) ShowWindow (hwndET2, SW_SHOW); @@ -896,16 +888,11 @@ static void test_edit_control_3(void) 0, CW_USEDEFAULT, CW_USEDEFAULT, 10, 10, NULL, NULL, NULL, NULL); - assert(hParent); + ok(hParent != NULL, "Failed to create control parent.\n"); trace("EDIT: Single line, no ES_AUTOHSCROLL\n"); - hWnd = CreateWindowExA(0, - "EDIT", - NULL, - 0, - 10, 10, 50, 50, - hParent, NULL, NULL, NULL); - assert(hWnd); + hWnd = CreateWindowExA(0, WC_EDITA, NULL, 0, 10, 10, 50, 50, hParent, NULL, NULL, NULL); + ok(hWnd != NULL, "Failed to create Edit control.\n"); zero_notify(); SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); @@ -954,13 +941,8 @@ static void test_edit_control_3(void) DestroyWindow(hWnd); trace("EDIT: Single line, ES_AUTOHSCROLL\n"); - hWnd = CreateWindowExA(0, - "EDIT", - NULL, - ES_AUTOHSCROLL, - 10, 10, 50, 50, - hParent, NULL, NULL, NULL); - assert(hWnd); + hWnd = CreateWindowExA(0, WC_EDITA, NULL, ES_AUTOHSCROLL, 10, 10, 50, 50, hParent, NULL, NULL, NULL); + ok(hWnd != NULL, "Failed to create Edit control.\n"); zero_notify(); SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); @@ -1005,13 +987,10 @@ static void test_edit_control_3(void) DestroyWindow(hWnd); trace("EDIT: Multline, no ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); - hWnd = CreateWindowExA(0, - "EDIT", - NULL, - ES_MULTILINE, + hWnd = CreateWindowExA(0, WC_EDITA, NULL, ES_MULTILINE, 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, hParent, NULL, NULL, NULL); - assert(hWnd); + ok(hWnd != NULL, "Failed to create Edit control.\n"); zero_notify(); SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); @@ -1055,13 +1034,10 @@ static void test_edit_control_3(void) DestroyWindow(hWnd); trace("EDIT: Multline, ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); - hWnd = CreateWindowExA(0, - "EDIT", - NULL, - ES_MULTILINE | ES_AUTOHSCROLL, + hWnd = CreateWindowExA(0, WC_EDITA, NULL, ES_MULTILINE | ES_AUTOHSCROLL, 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, hParent, NULL, NULL, NULL); - assert(hWnd); + ok(hWnd != NULL, "Failed to create Edit control.\n"); zero_notify(); SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); @@ -1100,13 +1076,9 @@ static void test_edit_control_3(void) DestroyWindow(hWnd); trace("EDIT: Multline, ES_AUTOHSCROLL and ES_AUTOVSCROLL\n"); - hWnd = CreateWindowExA(0, - "EDIT", - NULL, - ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, - 10, 10, 50, 50, - hParent, NULL, NULL, NULL); - assert(hWnd); + hWnd = CreateWindowExA(0, WC_EDITA, NULL, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 50, 50, hParent, NULL, NULL, NULL); + ok(hWnd != NULL, "Failed to create Edit control.\n"); zero_notify(); SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); @@ -1289,13 +1261,9 @@ static void test_edit_control_5(void) RECT rc; /* first show that a non-child won't do for this test */ - hWnd = CreateWindowExA(0, - "EDIT", - str, - 0, - 10, 10, 1, 1, - NULL, NULL, NULL, NULL); - assert(hWnd); + hWnd = CreateWindowExA(0, WC_EDITA, str, 0, 10, 10, 1, 1, NULL, NULL, NULL, NULL); + ok(hWnd != NULL, "Failed to create Edit control.\n"); + /* size of non-child edit control is (much) bigger than requested */ GetWindowRect( hWnd, &rc); ok( rc.right - rc.left > 20, "size of the window (%d) is smaller than expected\n", @@ -1309,16 +1277,13 @@ static void test_edit_control_5(void) CW_USEDEFAULT, CW_USEDEFAULT, 250, 250, NULL, NULL, hinst, NULL); - assert(parentWnd); + ok(parentWnd != NULL, "Failed to create control parent.\n"); ShowWindow( parentWnd, SW_SHOW); /* single line */ - hWnd = CreateWindowExA(0, - "EDIT", - str, WS_VISIBLE | WS_BORDER | - WS_CHILD, + hWnd = CreateWindowExA(0, WC_EDITA, str, WS_VISIBLE | WS_BORDER | WS_CHILD, rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, parentWnd, NULL, NULL, NULL); - assert(hWnd); + ok(hWnd != NULL, "Failed to create Edit control.\n"); GetClientRect( hWnd, &rc); ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); @@ -1326,13 +1291,10 @@ static void test_edit_control_5(void) ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd); /* multi line */ - hWnd = CreateWindowExA(0, - "EDIT", - str, - WS_CHILD | ES_MULTILINE, + hWnd = CreateWindowExA(0, WC_EDITA, str, WS_CHILD | ES_MULTILINE, rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, parentWnd, NULL, NULL, NULL); - assert(hWnd); + ok(hWnd != NULL, "Failed to create Edit control.\n"); GetClientRect( hWnd, &rc); ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); @@ -1417,14 +1379,9 @@ static void test_edit_control_scroll(void) /* Check the return value when EM_SCROLL doesn't scroll * anything. Should not return true unless any lines were actually * scrolled. */ - hwEdit = CreateWindowA( - "EDIT", - single_line_str, - WS_VSCROLL | ES_MULTILINE, - 1, 1, 100, 100, - NULL, NULL, hinst, NULL); - - assert(hwEdit); + hwEdit = CreateWindowA(WC_EDITA, single_line_str, WS_VSCROLL | ES_MULTILINE, + 1, 1, 100, 100, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create Edit control.\n"); ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); ok(!ret, "Returned %x, expected 0.\n", ret); @@ -1443,13 +1400,9 @@ static void test_edit_control_scroll(void) /* SB_PAGEDOWN while at the beginning of a buffer with few lines should not cause EM_SCROLL to return a negative value of scrolled lines that would put us "before" the beginning. */ - hwEdit = CreateWindowA( - "EDIT", - multiline_str, - WS_VSCROLL | ES_MULTILINE, - 0, 0, 100, 100, - NULL, NULL, hinst, NULL); - assert(hwEdit); + hwEdit = CreateWindowA(WC_EDITA, multiline_str, WS_VSCROLL | ES_MULTILINE, + 0, 0, 100, 100, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create Edit control.\n"); ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); ok(!ret, "Returned %x, expected 0.\n", ret); @@ -2370,13 +2323,12 @@ static void test_contextmenu(void) hwndMain = CreateWindowA(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, hinst, NULL); - assert(hwndMain); + ok(hwndMain != NULL, "Failed to create control parent.\n"); - hwndEdit = CreateWindowA("EDIT", NULL, - WS_CHILD|WS_BORDER|WS_VISIBLE|ES_LEFT|ES_AUTOHSCROLL, + hwndEdit = CreateWindowA(WC_EDITA, NULL, WS_CHILD|WS_BORDER|WS_VISIBLE|ES_LEFT|ES_AUTOHSCROLL, 0, 0, 150, 50, /* important this not be 0 size. */ hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); - assert(hwndEdit); + ok(hwndEdit != NULL, "Failed to create Edit control.\n"); SetFocus(NULL); SetCapture(hwndMain); -- 2.16.1

1 1

[PATCH resend 1/5] makedep: Add build framework for building DLLs in test directories.
by Zebediah Figura 16 Feb '18

16 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Changes from staging version: * use .cross.res extension for cross-compiled resource * use replace_extension() instead of defining a new function * use phony targets in the tests makefile so that the custom DLL is always built * enforce directory name the same way we do for other targets aclocal.m4 | 25 +++++++++ configure | 18 +++++++ tools/make_makefiles | 11 +++- tools/makedep.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 193 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188..a711b20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -540,6 +540,22 @@ $ac_dir/crosstest: __builddeps__ dummy fi } +wine_fn_config_resource () +{ + ac_dir=$[1] + ac_name=$[2] + ac_flags=$[3] + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/$ac_name : "\$.*\$\\."`_crossres.`expr $ac_name : ".*\\.\$.*\$"` + test -n "$DLLEXT" || ac_clean="$ac_dir/$ac_name" + + AS_VAR_IF([enable_tests],[no],[wine_fn_disabled_rules $ac_clean; return]) + + wine_fn_append_file SUBDIRS $ac_dir + wine_fn_clean_rules $ac_clean +} + wine_fn_config_tool () { ac_dir=$[1] @@ -643,6 +659,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) +dnl **** Create a test resource makefile from config.status **** +dnl +dnl Usage: WINE_CONFIG_RESOURCE(dir,flags) +dnl +AC_DEFUN([WINE_CONFIG_RESOURCE],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +m4_pushdef([ac_name],[m4_bpatsubst([$1],[.*/$[^/\]*$$],[\1])])dnl +wine_fn_config_resource $1 ac_name [$2]dnl +m4_popdef([ac_name])]) + dnl **** Create a static lib makefile from config.status **** dnl dnl Usage: WINE_CONFIG_LIB(name,flags) diff --git a/configure b/configure index 83f9b30..8ad89bd 100755 --- a/configure +++ b/configure @@ -8036,6 +8036,24 @@ $ac_dir/crosstest: __builddeps__ dummy fi } +wine_fn_config_resource () +{ + ac_dir=$1 + ac_name=$2 + ac_flags=$3 + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/$ac_name : "\$.*\$\\."`_crossres.`expr $ac_name : ".*\\.\$.*\$"` + test -n "$DLLEXT" || ac_clean="$ac_dir/$ac_name" + + if test "x$enable_tests" = xno; then : + wine_fn_disabled_rules $ac_clean; return +fi + + wine_fn_append_file SUBDIRS $ac_dir + wine_fn_clean_rules $ac_clean +} + wine_fn_config_tool () { ac_dir=$1 diff --git a/tools/make_makefiles b/tools/make_makefiles index f57a7e2..44f0fc2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -224,7 +224,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|RESOURCE|PARENTSRC|APPMODE)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -466,6 +466,15 @@ sub update_makefiles(@) (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; } + elsif (defined($make{"RESOURCE"})) # test resource + { + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; + (my $name = $dir) =~ s/^.*\/(.*)$/$1/; + die "Invalid RESOURCE in $file" unless $make{"RESOURCE"} eq $name; + push @lines, "WINE_CONFIG_RESOURCE($dir$flag_args)\n"; + } elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c index ec339e0..afa061a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -174,6 +174,7 @@ struct makefile const char *parent_dir; const char *module; const char *testdll; + const char *resource; const char *sharedlib; const char *staticlib; const char *staticimplib; @@ -2345,6 +2346,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray includes = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; + struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" ); struct strarray install_rules[NB_INSTALL_RULES]; char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); @@ -2642,7 +2644,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { - int need_cross = make->testdll || + int need_cross = make->testdll || make->resource || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); @@ -2656,7 +2658,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->module || make->staticlib || make->sharedlib || make->testdll) + if (make->module || make->staticlib || make->sharedlib || make->testdll || make->resource) { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); @@ -2710,6 +2712,66 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } + /* rules for resource dlls, call Makefile in subdirectory */ + + if (resource_dlls.count) + { + for (i = 0; i < resource_dlls.count; i++) + { + output( ".PHONY: %s\n", resource_dlls.str[i] ); + output( "%s:\n", resource_dlls.str[i] ); + output( "\t@cd %s && $(MAKE) %s%s\n", resource_dlls.str[i], + resource_dlls.str[i], dll_ext ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.res" )); + for (i = 0; i < resource_dlls.count; i++) + output( " %s", resource_dlls.str[i] ); + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s%s\"", resource_dlls.str[i], + resource_dlls.str[i], resource_dlls.str[i], dll_ext ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.res" ); + strarray_add( &object_files, "resource_dlls.res" ); + + if (crosstarget && (make->testdll || (make->module && make->staticlib))) + { + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( ".PHONY: %s/crossres\n", resource_dlls.str[i] ); + output( "%s/crossres:\n", resource_dlls.str[i] ); + output( "\t@cd %s && $(MAKE) %s\n", resource_dlls.str[i], name ); + free( name ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.cross.res" )); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( " %s/crossres", resource_dlls.str[i] ); + free( name ); + } + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s\"", resource_dlls.str[i], resource_dlls.str[i], name ); + free( name ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.cross.res" ); + strarray_add( &crossobj_files, "resource_dlls.cross.res" ); + } + } + if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; @@ -3101,6 +3163,81 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (make->resource) + { + char *extra_wine_flags = get_expanded_make_variable( make, "WINEFLAGS" ); + char *extra_cross_flags = get_expanded_make_variable( make, "CROSSFLAGS" ); + struct strarray all_libs = empty_strarray; + char *module_path = obj_dir_path( make, make->resource ); + char *spec_file = NULL; + + if (!make->appmode.count) + spec_file = src_dir_path( make, replace_extension( make->resource, ".dll", ".spec" )); + for (i = 0; i < make->imports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", make->imports.str[i] )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "LIBS" )); + + if (*dll_ext) + { + strarray_add( &all_targets, strmake( "%s%s", make->resource, dll_ext )); + strarray_add( &all_targets, strmake( "%s.fake", make->resource )); + output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + } + else + { + strarray_add( &all_targets, make->resource ); + output( "%s:", module_path ); + } + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filenames( target_flags ); + output_filenames( unwind_flags ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_wine_flags) output( " %s", extra_wine_flags ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + + if (crosstarget) + { + char *crossres = replace_extension( make->resource, ".dll", "_crossres.dll" ); + + strarray_add( &clean_files, crossres ); + output( "%s:", obj_dir_path( make, crossres )); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filename( "--lib-suffix=.cross.a" ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_cross_flags) output( " %s", extra_cross_flags ); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } + } + if (!make->disabled) { if (all_targets.count) @@ -3476,6 +3613,7 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); -- 2.7.4

3 9

[Patch] comctl32: fix signedness compilation warning
by vlad.bespalov＠jetstreamsoft.com 16 Feb '18

16 Feb '18

When compiling with clang the following earnings are generated: ../../../dlls/comctl32/taskdialog.c:323:24: warning: taking the absolute value of unsigned type 'unsigned int' has no effect [-Wabsolute-value] int diff_now = abs(line_widths[i] - line_widths[i - 1]); ^ ../../../dlls/comctl32/taskdialog.c:323:24: note: remove the call to 'abs' since unsigned values cannot be negative int diff_now = abs(line_widths[i] - line_widths[i - 1]); ^~~ ../../../dlls/comctl32/taskdialog.c:332:24: warning: taking the absolute value of unsigned type 'unsigned int' has no effect [-Wabsolute-value] diff_changed = abs(2 * buttons[last_button].width + line_widths[i] - line_widths[i - 1]); ^ ../../../dlls/comctl32/taskdialog.c:332:24: note: remove the call to 'abs' since unsigned values cannot be negative diff_changed = abs(2 * buttons[last_button].width + line_widths[i] - line_widths[i - 1]); ^~~ The patch casts first operand to (int) making intent clean. Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com>

1 0

comctl32: tweak node initialization
by Rafał Mużyło 16 Feb '18

16 Feb '18

To make things clear, this patch isn't really correct. This comes from bug 43998, where it's described what's exactly wrong with it. Yet, bugzilla bugs have much worse visibility than wine-devel. So, if someone, who understands the initialization order in treeview, could shed some light on this problem, that should get this patch moving in the correct direction. - how is treeview initialized ? - when can this initialization go wrong the way it does in bug 43998 ? - what would be the proper place for this call (cause doing it *during* painting is most likely wrong) ?

1 0

[PATCH 5/5] wined3d: Enable the multi-threaded command stream by default.
by Henri Verbeet 16 Feb '18

16 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 814a78a..cc0dc25 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,7 +72,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - FALSE, /* No multithreaded CS by default. */ + TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ -- 2.1.4

1 0

[PATCH 4/5] d3d9: Explicitly translate resource map flags.
by Henri Verbeet 16 Feb '18

16 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 19 +++++++++++++++++++ dlls/d3d9/surface.c | 2 +- dlls/d3d9/volume.c | 3 ++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index b7277fe..04c87c8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -194,7 +194,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6ed3994..92bbacd 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -56,6 +56,7 @@ HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLS D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN; void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ff95bef..c057c77 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -160,6 +160,25 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +{ + static const unsigned int handled = D3DLOCK_READONLY + | D3DLOCK_NOSYSLOCK + | D3DLOCK_NOOVERWRITE + | D3DLOCK_DISCARD + | D3DLOCK_DONOTWAIT + | D3DLOCK_NO_DIRTY_UPDATE; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + flags &= ~handled; + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count) { switch (primitive_type) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 813f89c..0605e71 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -249,7 +249,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, flags); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 6c61b99..f4c43bc 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -147,7 +147,8 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), - volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags))) + volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, + wined3dmapflags_from_d3dmapflags(flags)))) map_desc.data = NULL; wined3d_mutex_unlock(); -- 2.1.4

1 0

[PATCH 3/5] d3d8: Explicitly translate resource map flags.
by Henri Verbeet 16 Feb '18

16 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 18 ++++++++++++++++++ dlls/d3d8/surface.c | 2 +- dlls/d3d8/volume.c | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 772a233..d4d73ad 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -193,7 +193,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 5e59065..ecde77a 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -273,6 +273,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a6363d2..fc40026 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -141,6 +141,24 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +{ + static const unsigned int handled = D3DLOCK_READONLY + | D3DLOCK_NOSYSLOCK + | D3DLOCK_NOOVERWRITE + | D3DLOCK_DISCARD + | D3DLOCK_NO_DIRTY_UPDATE; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + flags &= ~handled; + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count) { switch (primitive_type) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 6ad43a4..fff47f5 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -244,7 +244,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, } hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, flags); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index e8ff74b..89aa84f 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -147,7 +147,8 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), - volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags))) + volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, + wined3dmapflags_from_d3dmapflags(flags)))) map_desc.data = NULL; wined3d_mutex_unlock(); -- 2.1.4

1 0

[PATCH 2/5] ddraw: Explicitly translate resource map flags.
by Henri Verbeet 16 Feb '18

16 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 3 ++- dlls/ddraw/utils.c | 20 ++++++++++++++++++++ dlls/ddraw/vertexbuffer.c | 14 ++------------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index af58c11..3cf9b76 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -587,6 +587,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *ddraw_format, BOOL wined3d_colour_from_ddraw_colour(const DDPIXELFORMAT *pf, const struct ddraw_palette *palette, DWORD colour, struct wined3d_color *wined3d_colour) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) DECLSPEC_HIDDEN; void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN; void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN; void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6307911..f09aaba 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -992,7 +992,8 @@ static HRESULT surface_lock(struct ddraw_surface *surface, hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), - surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); + surface->sub_resource_idx, &map_desc, rect ? &box : NULL, + wined3dmapflags_from_ddrawmapflags(flags)); if (FAILED(hr)) { wined3d_mutex_unlock(); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 3785158..bb75666 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -561,6 +561,26 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix return WINED3DFMT_UNKNOWN; } +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) +{ + static const unsigned int handled = DDLOCK_READONLY + | DDLOCK_NOSYSLOCK + | DDLOCK_NOOVERWRITE + | DDLOCK_DISCARDCONTENTS + | DDLOCK_DONOTWAIT; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + if (flags & DDLOCK_NODIRTYUPDATE) + wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_NODIRTYUPDATE); + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static float colour_to_float(DWORD colour, DWORD mask) { if (!mask) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f89b620..b661e73 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -162,26 +162,16 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; HRESULT hr; - DWORD wined3d_flags = 0; TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, flags, data, data_size); if (buffer->version != 7) flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); - /* Writeonly: Pointless. Event: Unsupported by native according to the sdk - * nosyslock: Not applicable - */ if (!(flags & DDLOCK_WAIT)) - wined3d_flags |= WINED3D_MAP_DONOTWAIT; - if (flags & DDLOCK_READONLY) - wined3d_flags |= WINED3D_MAP_READONLY; - if (flags & DDLOCK_NOOVERWRITE) - wined3d_flags |= WINED3D_MAP_NOOVERWRITE; + flags |= DDLOCK_DONOTWAIT; if (flags & DDLOCK_DISCARDCONTENTS) { - wined3d_flags |= WINED3D_MAP_DISCARD; - if (!buffer->dynamic) { struct wined3d_buffer *new_buffer; @@ -211,7 +201,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, } hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, NULL, wined3d_flags); + 0, &wined3d_map_desc, NULL, wined3dmapflags_from_ddrawmapflags(flags)); *data = wined3d_map_desc.data; wined3d_mutex_unlock(); -- 2.1.4

1 0

[PATCH 1/5] d3d11: Set resource access based on usage and CPU access flags.
by Henri Verbeet 16 Feb '18

16 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 16 ++++++++-------- dlls/d3d11/buffer.c | 4 +--- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/tests/d3d11.c | 8 ++++---- dlls/d3d11/texture.c | 8 ++++---- dlls/d3d11/utils.c | 15 +++++++++++++++ dlls/d3d8/volume.c | 2 ++ dlls/d3d9/volume.c | 2 ++ dlls/wined3d/resource.c | 2 +- 9 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 103b670..9b512f9 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8199,28 +8199,28 @@ static void check_buffer_cpu_access_(unsigned int line, ID3D10Buffer *buffer, expected_hr = cpu_read ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_READ, 0, &data); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); expected_hr = !dynamic && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_WRITE, 0, &data); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); expected_hr = cpu_read && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_READ_WRITE, 0, &data); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ_WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); expected_hr = dynamic ? S_OK : E_INVALIDARG; hr = ID3D10Buffer_Map(buffer, D3D10_MAP_WRITE_DISCARD, 0, &data); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE_DISCARD.\n", hr); if (SUCCEEDED(hr)) ID3D10Buffer_Unmap(buffer); @@ -8254,28 +8254,28 @@ static void check_texture_cpu_access_(unsigned int line, ID3D10Texture2D *textur expected_hr = cpu_read ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); expected_hr = !dynamic && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); expected_hr = cpu_read && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ_WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); expected_hr = dynamic ? S_OK : E_INVALIDARG; hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_WRITE_DISCARD, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE_DISCARD.\n", hr); if (SUCCEEDED(hr)) ID3D10Texture2D_Unmap(texture, 0); diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ba49d6d..09778e2 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -452,9 +452,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); wined3d_desc.bind_flags = buffer->desc.BindFlags; - if (~buffer->desc.CPUAccessFlags & (D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ)) - FIXME("Ignoring CPU access flags %#x.\n", buffer->desc.CPUAccessFlags); - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + wined3d_desc.access = wined3d_access_from_d3d11(buffer->desc.Usage, buffer->desc.CPUAccessFlags); wined3d_desc.misc_flags = buffer->desc.MiscFlags; wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 52496d8..f9cfd6c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -74,6 +74,7 @@ struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *re struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; +unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6267eaf..af8fc7b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11029,7 +11029,7 @@ static void check_resource_cpu_access_(unsigned int line, ID3D11DeviceContext *c expected_hr = cpu_read ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_READ, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); @@ -11037,21 +11037,21 @@ static void check_resource_cpu_access_(unsigned int line, ID3D11DeviceContext *c /* WRITE_DISCARD and WRITE_NO_OVERWRITE are the only allowed options for dynamic resources. */ expected_hr = !dynamic && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); expected_hr = cpu_read && cpu_write ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_READ_WRITE, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for READ_WRITE.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); expected_hr = dynamic ? S_OK : E_INVALIDARG; hr = ID3D11DeviceContext_Map(context, resource, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); - todo_wine_if(expected_hr != S_OK) + todo_wine_if(expected_hr != S_OK && cpu_access) ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x for WRITE_DISCARD.\n", hr); if (SUCCEEDED(hr)) ID3D11DeviceContext_Unmap(context, resource, 0); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 4315284..2bcbe96 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -517,7 +517,8 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; + wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, + desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; wined3d_desc.depth = 1; @@ -974,9 +975,8 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU; - if (desc->Usage == D3D11_USAGE_STAGING) - wined3d_desc.access |= WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, + desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; wined3d_desc.depth = desc->Depth; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index b3894bb..3885078 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -791,6 +791,21 @@ DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) return wined3d_clear_flags; } +unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) +{ + unsigned int access; + + access = usage == D3D11_USAGE_STAGING ? WINED3D_RESOURCE_ACCESS_CPU : WINED3D_RESOURCE_ACCESS_GPU; + if (cpu_access) + { + if (~cpu_access & (D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ)) + FIXME("Ignoring CPU access flags %#x.\n", cpu_access); + access |= WINED3D_RESOURCE_ACCESS_MAP; + } + + return access; +} + HRESULT d3d_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) { diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 2e14a59..e8ff74b 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -155,6 +155,8 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, locked_box->SlicePitch = map_desc.slice_pitch; locked_box->pBits = map_desc.data; + if (hr == E_INVALIDARG) + return D3DERR_INVALIDCALL; return hr; } diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0fcc2a4..6c61b99 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -155,6 +155,8 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, locked_box->SlicePitch = map_desc.slice_pitch; locked_box->pBits = map_desc.data; + if (hr == E_INVALIDARG) + return D3DERR_INVALIDCALL; return hr; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ca6b2b6..ddc157b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -346,7 +346,7 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) { WARN("Resource is not mappable.\n"); - return WINED3DERR_INVALIDCALL; + return E_INVALIDARG; } flags = wined3d_resource_sanitise_map_flags(resource, flags); -- 2.1.4

1 0

[PATCH v2 2/2] include: Add some wide declarations.
by Daniel Lehman 15 Feb '18

15 Feb '18

2 2

[PATCH 3/4] mshtml: Added IDOMMouseEvent::buttons property implementation.
by Jacek Caban 15 Feb '18

15 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.js | 1 + 2 files changed, 12 insertions(+), 2 deletions(-)

2 1

[PATCH v2] wmp: add IWMPControls stub implementation
by Anton Romanov 15 Feb '18

15 Feb '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/oleobj.c | 3 + dlls/wmp/player.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 20 +++++ dlls/wmp/wmp_private.h | 1 + 4 files changed, 235 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 1baf45a439..b3d65840fc 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -270,6 +270,9 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IWMPSettings)) { TRACE("(%p)->(IID_IWMPSettings %p)\n", This, ppv); *ppv = &This->IWMPSettings_iface; + }else if(IsEqualGUID(riid, &IID_IWMPControls)) { + TRACE("(%p)->(IID_IWMPControls %p)\n", This, ppv); + *ppv = &This->IWMPControls_iface; }else if(IsEqualGUID(riid, &IID_IOleControl)) { TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); *ppv = &This->IOleControl_iface; diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index accf5401ed..64ddfca704 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -32,6 +32,11 @@ static inline WindowsMediaPlayer *impl_from_IWMPPlayer(IWMPPlayer *iface) return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer_iface); } +static inline WindowsMediaPlayer *impl_from_IWMPControls(IWMPControls *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPControls_iface); +} + static HRESULT WINAPI WMPPlayer4_QueryInterface(IWMPPlayer4 *iface, REFIID riid, void **ppv) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); @@ -121,8 +126,12 @@ static HRESULT WINAPI WMPPlayer4_get_playState(IWMPPlayer4 *iface, WMPPlayState static HRESULT WINAPI WMPPlayer4_get_controls(IWMPPlayer4 *iface, IWMPControls **ppControl) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppControl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppControl); + + IWMPControls_AddRef(&This->IWMPControls_iface); + *ppControl = &This->IWMPControls_iface; + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings **ppSettings) @@ -931,9 +940,209 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; +HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, ppIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, plMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pdCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_next(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_play(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d)\n", This, lMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%f)\n", This, dCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWMPControls)) { + *ppv = iface; + }else { + WARN("Unsupported interface (%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPControls_AddRef(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI WMPControls_Release(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI WMPControls_GetTypeInfoCount(IWMPControls *iface, UINT *pctinfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static const IWMPControlsVtbl WMPControlsVtbl = { + WMPControls_QueryInterface, + WMPControls_AddRef, + WMPControls_Release, + WMPControls_GetTypeInfoCount, + WMPControls_GetTypeInfo, + WMPControls_GetIDsOfNames, + WMPControls_Invoke, + WMPControls_get_isAvailable, + WMPControls_play, + WMPControls_stop, + WMPControls_pause, + WMPControls_fastForward, + WMPControls_fastReverse, + WMPControls_get_currentPosition, + WMPControls_put_currentPosition, + WMPControls_get_currentPositionString, + WMPControls_next, + WMPControls_previous, + WMPControls_get_currentItem, + WMPControls_put_currentItem, + WMPControls_get_currentMarker, + WMPControls_put_currentMarker, + WMPControls_playItem, +}; + void init_player_ifaces(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; + wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 46b0b72cd3..67950e0118 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -859,11 +859,31 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPControls *controls; HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + player = NULL; + hres = IWMPControls_QueryInterface(controls, &IID_IWMPPlayer, (void**)&player); + ok(hres != S_OK, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); + ok(player == NULL, "player != NULL\n"); + + IWMPControls_Release(controls); + + controls = NULL; + hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPControls, (void**)&controls); + ok(hres == S_OK, "Getting IWMPControls from IWMPPlayer failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + IWMPControls_Release(controls); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 710793c513..65de6bbd09 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,6 +44,7 @@ struct WindowsMediaPlayer { IWMPPlayer4 IWMPPlayer4_iface; IWMPPlayer IWMPPlayer_iface; IWMPSettings IWMPSettings_iface; + IWMPControls IWMPControls_iface; LONG ref; -- 2.16.1

2 1

[PATCH 4/4] mshtml: Added IDOMEvent::pageX and pageY properties implementation.
by Jacek Caban 15 Feb '18

15 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 25 insertions(+), 4 deletions(-)

1 0

[PATCH 2/4] mshtml: Added IDOMEvent::view property implementation.
by Jacek Caban 15 Feb '18

15 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 27 +++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/tests/events.js | 4 ++++ 3 files changed, 30 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] mshtml: Added IDOMEvent::stopImmediatePropagation implementaition.
by Jacek Caban 15 Feb '18

15 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 11 ++++++++--- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.js | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-)

1 0

[PATCH 1/6] d3d8/tests: Add test for changing multisample type of implicit swapchain.
by Józef Kucia 15 Feb '18

15 Feb '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9efa94329836..6ae17829b818 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8492,9 +8492,64 @@ static void test_clip_planes_limits(void) DestroyWindow(window); } +static void test_swapchain_multisample_reset(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + + if (IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; + present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { - HMODULE d3d8_handle = GetModuleHandleA( "d3d8.dll" ); + HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); WNDCLASSA wc = {0}; IDirect3D8 *d3d8; DEVMODEW current_mode; @@ -8600,6 +8655,7 @@ START_TEST(device) test_format_unknown(); test_destroyed_window(); test_clip_planes_limits(); + test_swapchain_multisample_reset(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.13.6

2 11

[PATCH 1/4] comctl32/edit: Use the global memory allocation helpers
by Nikolay Sivov 15 Feb '18

15 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/edit.c | 67 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index e1a79b1bc8..67d77dafab 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -50,6 +50,7 @@ #include "vsstyle.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(edit); @@ -242,7 +243,7 @@ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT memset(&psa,0,sizeof(SCRIPT_ANALYSIS)); psa.eScript = SCRIPT_UNDEFINED; - es->logAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * get_text_length(es)); + es->logAttr = heap_alloc(sizeof(SCRIPT_LOGATTR) * get_text_length(es)); ScriptBreak(es->text, get_text_length(es), &psa, es->logAttr); } @@ -480,7 +481,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { /* The buffer has been expanded, create a new line and insert it into the link list */ - LINEDEF *new_line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)); + LINEDEF *new_line = heap_alloc_zero(sizeof(*new_line)); new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -490,7 +491,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { /* The previous line merged with this line so we delete this extra entry */ previous_line->next = current_line->next; - HeapFree(GetProcessHeap(), 0, current_line); + heap_free(current_line); current_line = previous_line->next; es->line_count--; continue; @@ -590,7 +591,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (current_line->ssa) { count = ScriptString_pcOutChars(current_line->ssa); - piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); + piDx = heap_alloc(sizeof(INT) * (*count)); ScriptStringGetLogicalWidths(current_line->ssa,piDx); prev = current_line->net_length-1; @@ -600,7 +601,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta } while ( prev > 0 && current_line->width > fw); if (prev<=0) prev = 1; - HeapFree(GetProcessHeap(),0,piDx); + heap_free(piDx); } else prev = (fw / es->char_width); @@ -689,7 +690,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { pnext = current_line->next; EDIT_InvalidateUniscribeData_linedef(current_line); - HeapFree(GetProcessHeap(), 0, current_line); + heap_free(current_line); current_line = pnext; es->line_count--; } @@ -1181,7 +1182,7 @@ static inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; - HeapFree( GetProcessHeap(), 0, es->logAttr ); + heap_free( es->logAttr ); es->logAttr = NULL; EDIT_InvalidateUniscribeData(es); } @@ -2463,7 +2464,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r /* there is something to be deleted */ TRACE("deleting stuff.\n"); bufl = e - s; - buf = HeapAlloc(GetProcessHeap(), 0, (bufl + 1) * sizeof(WCHAR)); + buf = heap_alloc((bufl + 1) * sizeof(WCHAR)); if (!buf) return; memcpy(buf, es->text + s, bufl * sizeof(WCHAR)); buf[bufl] = 0; /* ensure 0 termination */ @@ -2576,7 +2577,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r EDIT_EM_EmptyUndoBuffer(es); } - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); s += strl; @@ -2803,12 +2804,12 @@ static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, const INT *tabs) { if (!(es->style & ES_MULTILINE)) return FALSE; - HeapFree(GetProcessHeap(), 0, es->tabs); + heap_free(es->tabs); es->tabs_count = count; if (!count) es->tabs = NULL; else { - es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); + es->tabs = heap_alloc(count * sizeof(INT)); memcpy(es->tabs, tabs, count * sizeof(INT)); } EDIT_InvalidateUniscribeData(es); @@ -2852,7 +2853,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) ulength = strlenW(es->undo_text); - utext = HeapAlloc(GetProcessHeap(), 0, (ulength + 1) * sizeof(WCHAR)); + utext = heap_alloc((ulength + 1) * sizeof(WCHAR)); strcpyW(utext, es->undo_text); @@ -2866,7 +2867,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) /* send the notification after the selection start and end are set */ EDIT_NOTIFY_PARENT(es, EN_CHANGE); EDIT_EM_ScrollCaret(es); - HeapFree(GetProcessHeap(), 0, utext); + heap_free(utext); TRACE("after UNDO:insertion length = %d, deletion buffer = %s\n", es->undo_insert_count, debugstr_w(es->undo_text)); @@ -4171,7 +4172,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen); + lpCompStr = heap_alloc(buflen); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -4191,11 +4192,11 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) if (dwBufLenAttr) { dwBufLenAttr ++; - lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr+1); + lpCompStrAttr = heap_alloc(dwBufLenAttr + 1); if (!lpCompStrAttr) { ERR("Unable to allocate IME Attribute String\n"); - HeapFree(GetProcessHeap(),0,lpCompStr); + heap_free(lpCompStr); return; } ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, @@ -4222,8 +4223,8 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->selection_start + es->composition_len; - HeapFree(GetProcessHeap(),0,lpCompStrAttr); - HeapFree(GetProcessHeap(),0,lpCompStr); + heap_free(lpCompStrAttr); + heap_free(lpCompStr); } static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) @@ -4237,7 +4238,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen); + lpResultStr = heap_alloc(buflen); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); @@ -4256,7 +4257,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) es->composition_start = es->selection_end; es->composition_len = 0; - HeapFree(GetProcessHeap(),0,lpResultStr); + heap_free(lpResultStr); } static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) @@ -4303,9 +4304,9 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) TRACE("Creating edit control, style = %08x\n", lpcs->style); - if (!(es = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*es)))) - return FALSE; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)es ); + if (!(es = heap_alloc_zero(sizeof(*es)))) + return FALSE; + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)es ); /* * Note: since the EDITSTATE has not been fully initialized yet, @@ -4365,13 +4366,13 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) goto cleanup; es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; - if (!(es->undo_text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (es->buffer_size + 1) * sizeof(WCHAR)))) + if (!(es->undo_text = heap_alloc_zero((es->buffer_size + 1) * sizeof(WCHAR)))) goto cleanup; es->undo_buffer_size = es->buffer_size; if (es->style & ES_MULTILINE) - if (!(es->first_line_def = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)))) - goto cleanup; + if (!(es->first_line_def = heap_alloc_zero(sizeof(LINEDEF)))) + goto cleanup; es->line_count = 1; /* @@ -4395,11 +4396,11 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) cleanup: SetWindowLongPtrW(es->hwndSelf, 0, 0); EDIT_InvalidateUniscribeData(es); - HeapFree(GetProcessHeap(), 0, es->first_line_def); - HeapFree(GetProcessHeap(), 0, es->undo_text); + heap_free(es->first_line_def); + heap_free(es->undo_text); if (es->hloc32W) LocalFree(es->hloc32W); - HeapFree(GetProcessHeap(), 0, es->logAttr); - HeapFree(GetProcessHeap(), 0, es); + heap_free(es->logAttr); + heap_free(es); return FALSE; } @@ -4482,13 +4483,13 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) while (pc) { pp = pc->next; - HeapFree(GetProcessHeap(), 0, pc); + heap_free(pc); pc = pp; } SetWindowLongPtrW( es->hwndSelf, 0, 0 ); - HeapFree(GetProcessHeap(), 0, es->undo_text); - HeapFree(GetProcessHeap(), 0, es); + heap_free(es->undo_text); + heap_free(es); return 0; } -- 2.15.1

3 5

[PATCH vkd3d 1/5] include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.
by Józef Kucia 15 Feb '18

15 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 10 ---------- include/vkd3d_d3dcommon.idl | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2ccfa22d344f..5bfc76718873 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -66,16 +66,6 @@ const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3; const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4); -typedef enum D3D_PRIMITIVE_TOPOLOGY -{ - D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, - D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, -} D3D_PRIMITIVE_TOPOLOGY; - typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT { D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0x0, diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 1ddfce3c3d34..a874b6c869dd 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -20,6 +20,16 @@ import "vkd3d_windows.h"; #include "vkd3d_unknown.idl" +typedef enum D3D_PRIMITIVE_TOPOLOGY +{ + D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, + D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, + D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, +} D3D_PRIMITIVE_TOPOLOGY; + typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100, -- 2.13.6

2 9

[PATCH v2 1/2] include: Add some tchar forwards.
by Daniel Lehman 15 Feb '18

15 Feb '18

V2: remove old

2 1

[PATCH 1/2] msvcrt: Fix _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s
by Kirill Erofeev 15 Feb '18

15 Feb '18

- in some cases the last '\' was not appended to curPath. (reason: char next to the last one was checked for delimiter) - not all PATH list elements processed in case leading ';' or double ';' are present in environment variable. I.e empty element stops further processing. Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> --- dlls/msvcrt/dir.c | 177 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 97 insertions(+), 80 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index f4edc28..5f094e1 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1658,6 +1658,8 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) { char*envVal, *penv; char curPath[MAX_PATH]; + MSVCRT_size_t path_len; + const MSVCRT_size_t fname_len = strlen(file); *buf = '\0'; @@ -1686,30 +1688,33 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) char *end = penv; while(*end && *end != ';') end++; /* Find end of next path */ - if (penv == end || !*penv) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - memcpy(curPath, penv, end - penv); - if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') - { - curPath[end - penv] = '\\'; - curPath[end - penv + 1] = '\0'; - } - else - curPath[end - penv] = '\0'; + path_len = end - penv; - strcat(curPath, file); - TRACE("Checking for file %s\n", curPath); - if (GetFileAttributesA( curPath ) != INVALID_FILE_ATTRIBUTES) + if (penv != end && *penv && + (path_len + fname_len) < MAX_PATH)/*If temporary buffer is not enough just skip. Other way is to use dynamic memory. We will not.*/ { - strcpy(buf, curPath); - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; /* Found */ + memcpy(curPath, penv, path_len); + if (curPath[path_len - 1] != '/' && curPath[path_len - 1] != '\\') + { + curPath[path_len] = '\\'; + curPath[path_len + 1] = '\0'; + } + else + curPath[path_len] = '\0'; + + strcat(curPath, file); + TRACE("Checking for file %s\n", curPath); + if (GetFileAttributesA( curPath ) != INVALID_FILE_ATTRIBUTES) + { + strcpy(buf, curPath); + break; /* Found */ + } } penv = *end ? end + 1 : end; - } while(1); + } while(*penv); + + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + return; } /********************************************************************* @@ -1719,6 +1724,8 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC { char*envVal, *penv; char curPath[MAX_PATH]; + MSVCRT_size_t path_len; + const MSVCRT_size_t fname_len = strlen(file); if (!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EINVAL; if (!MSVCRT_CHECK_PMT(buf != NULL)) return MSVCRT_EINVAL; @@ -1750,34 +1757,36 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC char *end = penv; while(*end && *end != ';') end++; /* Find end of next path */ - if (penv == end || !*penv) - { - *MSVCRT__errno() = MSVCRT_ENOENT; - return MSVCRT_ENOENT; - } - memcpy(curPath, penv, end - penv); - if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') + path_len = end - penv; + if (penv != end && *penv && + (path_len + fname_len) < MAX_PATH)/*If temporary buffer is not enough just skip. Other way is to use dynamic memory. We will not.*/ { - curPath[end - penv] = '\\'; - curPath[end - penv + 1] = '\0'; - } - else - curPath[end - penv] = '\0'; + memcpy(curPath, penv, path_len); + if (curPath[path_len - 1] != '/' && curPath[path_len - 1] != '\\') + { + curPath[path_len] = '\\'; + curPath[path_len + 1] = '\0'; + } + else + curPath[path_len] = '\0'; - strcat(curPath, file); - TRACE("Checking for file %s\n", curPath); - if (GetFileAttributesA( curPath ) != INVALID_FILE_ATTRIBUTES) - { - if (strlen(curPath) + 1 > count) + strcat(curPath, file); + TRACE("Checking for file %s\n", curPath); + if (GetFileAttributesA( curPath ) != INVALID_FILE_ATTRIBUTES) { + if (strlen(curPath) + 1 > count) + { MSVCRT_INVALID_PMT("buf[count] is too small", MSVCRT_ERANGE); return MSVCRT_ERANGE; + } + strcpy(buf, curPath); + return 0; } - strcpy(buf, curPath); - return 0; } penv = *end ? end + 1 : end; - } while(1); + } while(*penv); + *MSVCRT__errno() = MSVCRT_ENOENT; + return MSVCRT_ENOENT; } /********************************************************************* @@ -1789,6 +1798,8 @@ void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* { MSVCRT_wchar_t *envVal, *penv; MSVCRT_wchar_t curPath[MAX_PATH]; + MSVCRT_size_t path_len; + const MSVCRT_size_t fname_len = strlenW(file); *buf = '\0'; @@ -1817,30 +1828,31 @@ void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* MSVCRT_wchar_t *end = penv; while(*end && *end != ';') end++; /* Find end of next path */ - if (penv == end || !*penv) + path_len = end - penv; + if (penv != end && *penv && + (path_len + fname_len) < MAX_PATH)/*If temporary buffer is not enough just skip. Other way is to use dynamic memory. We will not.*/ { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - memcpy(curPath, penv, (end - penv) * sizeof(MSVCRT_wchar_t)); - if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') - { - curPath[end - penv] = '\\'; - curPath[end - penv + 1] = '\0'; - } - else - curPath[end - penv] = '\0'; + memcpy(curPath, penv, path_len * sizeof(MSVCRT_wchar_t)); + if (curPath[path_len - 1] != '/' && curPath[path_len - 1] != '\\') + { + curPath[path_len] = '\\'; + curPath[path_len + 1] = '\0'; + } + else + curPath[end - penv] = '\0'; - strcatW(curPath, file); - TRACE("Checking for file %s\n", debugstr_w(curPath)); - if (GetFileAttributesW( curPath ) != INVALID_FILE_ATTRIBUTES) - { - strcpyW(buf, curPath); - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; /* Found */ + strcatW(curPath, file); + TRACE("Checking for file %s\n", debugstr_w(curPath)); + if (GetFileAttributesW( curPath ) != INVALID_FILE_ATTRIBUTES) + { + strcpyW(buf, curPath); + break; /* Found */ + } } penv = *end ? end + 1 : end; - } while(1); + } while(*penv); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + return; } /********************************************************************* @@ -1851,6 +1863,8 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* { MSVCRT_wchar_t* envVal, *penv; MSVCRT_wchar_t curPath[MAX_PATH]; + MSVCRT_size_t path_len; + const MSVCRT_size_t fname_len = strlenW(file); if (!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EINVAL; if (!MSVCRT_CHECK_PMT(buf != NULL)) return MSVCRT_EINVAL; @@ -1882,32 +1896,35 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* MSVCRT_wchar_t *end = penv; while(*end && *end != ';') end++; /* Find end of next path */ - if (penv == end || !*penv) + path_len = end - penv; + if (penv != end && *penv && + (path_len + fname_len) < MAX_PATH)/*If temporary buffer is not enough just skip. Other way is to use dynamic memory. We will not.*/ { - *MSVCRT__errno() = MSVCRT_ENOENT; - return MSVCRT_ENOENT; - } - memcpy(curPath, penv, (end - penv) * sizeof(MSVCRT_wchar_t)); - if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') - { - curPath[end - penv] = '\\'; - curPath[end - penv + 1] = '\0'; - } - else - curPath[end - penv] = '\0'; + memcpy(curPath, penv, path_len * sizeof(MSVCRT_wchar_t)); + if (curPath[path_len - 1] != '/' && curPath[path_len - 1] != '\\') + { + curPath[path_len] = '\\'; + curPath[path_len + 1] = '\0'; + } + else + curPath[path_len] = '\0'; - strcatW(curPath, file); - TRACE("Checking for file %s\n", debugstr_w(curPath)); - if (GetFileAttributesW( curPath ) != INVALID_FILE_ATTRIBUTES) - { - if (strlenW(curPath) + 1 > count) + strcatW(curPath, file); + TRACE("Checking for file %s\n", debugstr_w(curPath)); + if (GetFileAttributesW( curPath ) != INVALID_FILE_ATTRIBUTES) { + if (strlenW(curPath) + 1 > count) + { MSVCRT_INVALID_PMT("buf[count] is too small", MSVCRT_ERANGE); return MSVCRT_ERANGE; + } + strcpyW(buf, curPath); + return 0; } - strcpyW(buf, curPath); - return 0; } penv = *end ? end + 1 : end; - } while(1); + } while(*penv); + *MSVCRT__errno() = MSVCRT_ENOENT; + return MSVCRT_ENOENT; } + -- 2.7.4

1 1

[PATCH 5/5] dxgi/tests: Introduce an ARRAY_SIZE macro.
by Henri Verbeet 15 Feb '18

15 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 148cd73..8351a32 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -23,6 +23,10 @@ #include "d3d11.h" #include "wine/test.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + enum frame_latency { DEFAULT_FRAME_LATENCY = 3, @@ -1179,7 +1183,7 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); - for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) + for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; @@ -1275,7 +1279,7 @@ static void test_create_swapchain(void) creation_desc.Windowed = FALSE; - for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) + for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; @@ -1637,16 +1641,16 @@ static void test_get_containing_output(void) break; } - for (j = 0; j < sizeof(offsets) / sizeof(*offsets); ++j) + for (j = 0; j < ARRAY_SIZE(offsets); ++j) { - unsigned int idx = (sizeof(offsets) / sizeof(*offsets)) * i + j; - assert(idx < sizeof(points) / sizeof(*points)); + unsigned int idx = ARRAY_SIZE(offsets) * i + j; + assert(idx < ARRAY_SIZE(points)); points[idx].x = x + offsets[j].x; points[idx].y = y + offsets[j].y; } } - for (i = 0; i < sizeof(points) / sizeof(*points); ++i) + for (i = 0; i < ARRAY_SIZE(points); ++i) { ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); @@ -2089,7 +2093,7 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, expected_state = *state; e = &expected_state.fullscreen_state; - for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { SetRect(&e->client_rect, 0, 0, sizes[i].width, sizes[i].height); e->window_rect = e->client_rect; @@ -2260,7 +2264,7 @@ static void test_resize_target(void) swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { swapchain_desc.Flags = tests[i].flags; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, @@ -2425,7 +2429,7 @@ static void test_inexact_modes(void) check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); - for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { /* Test CreateSwapChain(). */ swapchain_desc.BufferDesc.Width = sizes[i].width; @@ -3190,7 +3194,7 @@ static void test_swapchain_parameters(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&desc, 0, sizeof(desc)); desc.BufferDesc.Width = registry_mode.dmPelsWidth; @@ -3278,7 +3282,7 @@ static void test_swapchain_parameters(void) IDXGISwapChain_Release(swapchain); } - for (i = 0; i < sizeof(usage_tests) / sizeof(*usage_tests); ++i) + for (i = 0; i < ARRAY_SIZE(usage_tests); ++i) { usage = usage_tests[i]; -- 2.1.4

1 0

[PATCH 4/5] dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd().
by Henri Verbeet 15 Feb '18

15 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 ++++++++++--- dlls/wined3d/swapchain.c | 3 ++- include/wine/wined3d.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 00ca122..7fc3279 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -275,12 +275,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + min_buffer_count = 1; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + min_buffer_count = 2; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -303,8 +313,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->SwapEffect) - FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) @@ -319,7 +327,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = window; wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2729df2..0d76b67 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -505,7 +505,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD + || swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP_DISCARD) wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], 0, WINED3D_LOCATION_DISCARDED); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 22bb2d8..1e3c08b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -507,6 +507,7 @@ enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD, WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_DISCARD, WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, WINED3D_SWAP_EFFECT_COPY, WINED3D_SWAP_EFFECT_COPY_VSYNC, -- 2.1.4

1 0

[PATCH 3/5] d3d9: Explicitly translate swap effects.
by Henri Verbeet 15 Feb '18

15 Feb '18

Note that previously D3DSWAPEFFECT_OVERLAY would get mapped to WINED3D_SWAP_EFFECT_COPY_VSYNC. That didn't matter so much because neither is currently implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- include/wine/wined3d.h | 10 ++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4c1006c..ff95bef 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,6 +186,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_OVERLAY: + return D3DSWAPEFFECT_OVERLAY; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return D3DSWAPEFFECT_FLIPEX; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -195,7 +215,7 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -206,6 +226,26 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_OVERLAY: + return WINED3D_SWAP_EFFECT_OVERLAY; + case D3DSWAPEFFECT_FLIPEX: + return WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) { @@ -232,7 +272,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cca4476..22bb2d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -505,10 +505,12 @@ enum wined3d_patch_edge_style enum wined3d_swap_effect { - WINED3D_SWAP_EFFECT_DISCARD = 1, - WINED3D_SWAP_EFFECT_SEQUENTIAL = 2, - WINED3D_SWAP_EFFECT_COPY = 3, - WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, + WINED3D_SWAP_EFFECT_DISCARD, + WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, + WINED3D_SWAP_EFFECT_COPY, + WINED3D_SWAP_EFFECT_COPY_VSYNC, + WINED3D_SWAP_EFFECT_OVERLAY, }; enum wined3d_sampler_state -- 2.1.4

1 0

[PATCH 2/5] d3d8: Explicitly translate swap effects.
by Henri Verbeet 15 Feb '18

15 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 615f8c7..a6363d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -167,6 +167,24 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_COPY_VSYNC: + return D3DSWAPEFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -175,7 +193,7 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -186,6 +204,24 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_COPY_VSYNC: + return WINED3D_SWAP_EFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -210,7 +246,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; -- 2.1.4

1 0

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-devel