May 2017 - Wine-Commits - list.winehq.org

Austin English : api-ms-win-core-com-private-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 80691eecfa2b269233b54fcaa77223b0171a810a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80691eecfa2b269233b54fcaa… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:10 2017 -0500 api-ms-win-core-com-private-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-private-l1-1-0.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec index 13ee601..b0f6b64 100644 --- a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec @@ -1,7 +1,7 @@ +@ stub CLSIDFromOle1Class @ stub CleanupOleStateInAllTls @ stub CleanupTlsOleState @ stub ClearCleanupFlag -@ stub CLSIDFromOle1Class @ stub CoCreateErrorInfo @ stub CoCreateObjectInContext @ stub CoDeactivateObject @@ -39,21 +39,21 @@ @ stub GetHookInterface @ stub HkOleRegisterObject @ stub InternalAppInvokeExceptionFilter -@ stub InternalCallAsProxyExceptionFilter -@ stub InternalCallerIsAppContainer -@ stub InternalCallFrameExceptionFilter -@ stub InternalCanMakeOutCall @ stub InternalCCFreeUnused @ stub InternalCCGetClassInformationForDde @ stub InternalCCGetClassInformationFromKey @ stub InternalCCSetDdeServerWindow @ stub InternalCMLSendReceive +@ stub InternalCallAsProxyExceptionFilter +@ stub InternalCallFrameExceptionFilter +@ stub InternalCallerIsAppContainer +@ stub InternalCanMakeOutCall @ stub InternalCoIsSurrogateProcess -@ stub InternalCompleteObjRef @ stub InternalCoRegisterDisconnectCallback @ stub InternalCoRegisterSurrogatedObject @ stub InternalCoStdMarshalObject @ stub InternalCoUnregisterDisconnectCallback +@ stub InternalCompleteObjRef @ stub InternalCreateCAggId @ stub InternalCreateIdentityHandler @ stub InternalDoATClassCreate @@ -74,10 +74,10 @@ @ stub InternalOleModalLoopBlockFn @ stub InternalRegisterWindowPropInterface @ stub InternalReleaseMarshalObjRef +@ stub InternalSTAInvoke @ stub InternalServerExceptionFilter @ stub InternalSetAptCallCtrlOnTlsIfRequired @ stub InternalSetOleThunkWowPtr -@ stub InternalSTAInvoke @ stub InternalStubInvoke @ stub InternalTlsAllocData @ stub InternalUnmarshalObjRef

1 0

Owen Rudge : wsdapi: Add initial implementation of IWSDXMLContext and WSDXMLCreateContext.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: f4d3dd2cd6492d2092ec3f08bdbe9d0ff529dc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d3dd2cd6492d2092ec3f08b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 18 22:38:43 2017 +0100 wsdapi: Add initial implementation of IWSDXMLContext and WSDXMLCreateContext. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- dlls/wsdapi/xml.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wsdxml.idl | 2 + 3 files changed, 134 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 8ee17cb..fd89be7 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -40,6 +40,6 @@ @ stdcall WSDXMLAddSibling(ptr ptr) @ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) @ stdcall WSDXMLCleanupElement(ptr) -@ stub WSDXMLCreateContext +@ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace @ stub WSDXMLGetValueFromAny diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 1cc45b8..4b150d4 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -213,3 +213,134 @@ HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny) WSDFreeLinkedMemory(pAny); return S_OK; } + +/* IWSDXMLContext implementation */ + +typedef struct IWSDXMLContextImpl +{ + IWSDXMLContext IWSDXMLContext_iface; + LONG ref; +} IWSDXMLContextImpl; + +static inline IWSDXMLContextImpl *impl_from_IWSDXMLContext(IWSDXMLContext *iface) +{ + return CONTAINING_RECORD(iface, IWSDXMLContextImpl, IWSDXMLContext_iface); +} + +static HRESULT WINAPI IWSDXMLContextImpl_QueryInterface(IWSDXMLContext *iface, REFIID riid, void **ppv) +{ + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDXMLContext)) + { + *ppv = &This->IWSDXMLContext_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDXMLContextImpl_AddRef(IWSDXMLContext *iface) +{ + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDXMLContextImpl_Release(IWSDXMLContext *iface) +{ + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + WSDFreeLinkedMemory(This); + } + + return ref; +} + +static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszSuggestedPrefix, WSDXML_NAMESPACE **ppNamespace) +{ + FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszSuggestedPrefix), ppNamespace); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDXMLContextImpl_AddNameToNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName) +{ + FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszName), ppName); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber) +{ + FIXME("(%p, %p, %d, %d)\n", iface, pNamespaces, wNamespacesCount, bLayerNumber); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDXMLContextImpl_SetTypes(IWSDXMLContext *iface, const PCWSDXML_TYPE *pTypes, DWORD dwTypesCount, BYTE bLayerNumber) +{ + FIXME("(%p, %p, %d, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber); + return E_NOTIMPL; +} + +static const IWSDXMLContextVtbl xmlcontext_vtbl = +{ + IWSDXMLContextImpl_QueryInterface, + IWSDXMLContextImpl_AddRef, + IWSDXMLContextImpl_Release, + IWSDXMLContextImpl_AddNamespace, + IWSDXMLContextImpl_AddNameToNamespace, + IWSDXMLContextImpl_SetNamespaces, + IWSDXMLContextImpl_SetTypes +}; + +HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext) +{ + IWSDXMLContextImpl *obj; + + TRACE("(%p)", ppContext); + + if (ppContext == NULL) + { + WARN("Invalid parameter: ppContext == NULL\n"); + return E_POINTER; + } + + *ppContext = NULL; + + obj = WSDAllocateLinkedMemory(NULL, sizeof(*obj)); + + if (!obj) + { + return E_OUTOFMEMORY; + } + + obj->IWSDXMLContext_iface.lpVtbl = &xmlcontext_vtbl; + obj->ref = 1; + + *ppContext = &obj->IWSDXMLContext_iface; + TRACE("Returning iface %p\n", *ppContext); + + return S_OK; +} diff --git a/include/wsdxml.idl b/include/wsdxml.idl index e86d54b..33bd1d9 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -39,3 +39,5 @@ interface IWSDXMLContext : IUnknown HRESULT SetTypes([in, size_is(dwTypesCount)] const PCWSDXML_TYPE* pTypes, [in] DWORD dwTypesCount, [in] BYTE bLayerNumber); }; + +cpp_quote("HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext);")

1 0

Józef Kucia : wined3d: Add support for patch list primitive type.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: c675bf4e825c80ba6b42378e674e6d7decf67055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c675bf4e825c80ba6b42378e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:20:01 2017 +0200 wined3d: Add support for patch list primitive type. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++++ dlls/d3d11/device.c | 24 ++++++++++++++++-------- dlls/d3d11/utils.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/device.c | 12 ++++++------ dlls/d3d9/device.c | 12 ++++++------ dlls/ddraw/device.c | 12 ++++++------ dlls/ddraw/executebuffer.c | 6 +++--- dlls/wined3d/cs.c | 8 ++++++-- dlls/wined3d/device.c | 29 +++++++++++++++++------------ dlls/wined3d/drawprim.c | 6 ++++++ dlls/wined3d/stateblock.c | 1 + dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 7 ++++--- include/wine/wined3d.h | 4 ++-- 14 files changed, 120 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c675bf4e825c80ba6b423…

1 0

Józef Kucia : wined3d: Fix tracing of continuec instruction.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 2b6a82d1012bbae8966bf016d384ab56a36f63c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6a82d1012bbae8966bf016d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:19:54 2017 +0200 wined3d: Fix tracing of continuec instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bbd6718..0f12b69 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2786,6 +2786,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); if (ins.handler_idx == WINED3DSIH_BREAKP + || ins.handler_idx == WINED3DSIH_CONTINUEP || ins.handler_idx == WINED3DSIH_IF || ins.handler_idx == WINED3DSIH_RETP) {

1 0

Austin English : api-ms-win-mm-misc-l1-1-1: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: cb5b795ddf416000f1bd7a26bfcdb0eed6294c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5b795ddf416000f1bd7a26b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:24 2017 -0500 api-ms-win-mm-misc-l1-1-1: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec b/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec index 617092d..2533050 100644 --- a/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec +++ b/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec @@ -3,6 +3,8 @@ @ stdcall DriverCallback(long long long long long long long) winmm.DriverCallback @ stdcall DrvGetModuleHandle(long) winmm.DrvGetModuleHandle @ stdcall GetDriverModuleHandle(long) winmm.GetDriverModuleHandle +@ stdcall OpenDriver(wstr wstr long) winmm.OpenDriver +@ stdcall SendDriverMessage(long long long long) winmm.SendDriverMessage @ stub mmDrvInstall @ stdcall mmioAdvance(long ptr long) winmm.mmioAdvance @ stdcall mmioAscend(long ptr long) winmm.mmioAscend @@ -25,6 +27,4 @@ @ stdcall mmioStringToFOURCCA(str long) winmm.mmioStringToFOURCCA @ stdcall mmioStringToFOURCCW(wstr long) winmm.mmioStringToFOURCCW @ stdcall mmioWrite(long ptr long) winmm.mmioWrite -@ stdcall OpenDriver(wstr wstr long) winmm.OpenDriver -@ stdcall SendDriverMessage(long long long long) winmm.SendDriverMessage @ stub sndOpenSound

1 0

Austin English : api-ms-win-downlevel-shlwapi-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: ffcab750b26d2b571e1411efa83308b66188e45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcab750b26d2b571e1411efa… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:22 2017 -0500 api-ms-win-downlevel-shlwapi-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index 7736645..96d44be 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -84,6 +84,10 @@ @ stdcall SHRegQueryUSValueW( long wstr ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueW @ stdcall SHRegSetUSValueA( str str long ptr long long) shlwapi.SHRegSetUSValueA @ stdcall SHRegSetUSValueW( wstr wstr long ptr long long) shlwapi.SHRegSetUSValueW +@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA +@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA +@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW +@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW @ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW @@ -109,10 +113,6 @@ @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrCmpW(wstr wstr) shlwapi.StrCmpW @ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW -@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA -@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA -@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW -@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW @ stdcall StrDupA(str) shlwapi.StrDupA @ stdcall StrDupW(wstr) shlwapi.StrDupW @ stdcall StrIsIntlEqualA(long str str long) shlwapi.StrIsIntlEqualA

1 0

Austin English : api-ms-win-dx-d3dkmt-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: d72ff092805ee781140accda25d94384227f9835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72ff092805ee781140accda2… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:23 2017 -0500 api-ms-win-dx-d3dkmt-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 15a2d1d..405afb9 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -54,8 +54,8 @@ @ stub D3DKMTOpenResource @ stub D3DKMTOpenResource2 @ stub D3DKMTOpenResourceFromNtHandle -@ stub D3DKMTOpenSynchronizationObject @ stub D3DKMTOpenSyncObjectFromNtHandle +@ stub D3DKMTOpenSynchronizationObject @ stub D3DKMTOutputDuplGetFrameInfo @ stub D3DKMTOutputDuplGetMetaData @ stub D3DKMTOutputDuplGetPointerShapeData @@ -83,9 +83,9 @@ @ stub D3DKMTSetQueuedLimit @ stub D3DKMTSetStereoEnabled @ stub D3DKMTSetVidPnSourceOwner +@ stub D3DKMTShareObjects @ stub D3DKMTSharedPrimaryLockNotification @ stub D3DKMTSharedPrimaryUnLockNotification -@ stub D3DKMTShareObjects @ stub D3DKMTSignalSynchronizationObject @ stub D3DKMTSignalSynchronizationObject2 @ stub D3DKMTUnlock

1 0

Hugh McMaster : reg/tests: Remove two un-needed concatenation backslashes and fix some copy/ paste errors.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 2b27a98bd09e424414aa025e4cce5f90c61a21cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b27a98bd09e424414aa025e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 19 13:19:06 2017 +0000 reg/tests: Remove two un-needed concatenation backslashes and fix some copy/paste errors. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9b19ab4..393e23b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1443,7 +1443,7 @@ static void test_import(void) "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" "5,00,65,00,00,00\n" "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" - " 5,00,65,00,00,00\\\n" + " 5,00,65,00,00,00\n" "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\\n" " 65,00,00,00\n" @@ -1465,8 +1465,8 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine43f"); todo_wine verify_reg_nonexist(hkey, "Wine43g"); todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); - todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine43k"); test_import_str("REGEDIT4\n\n" @@ -2227,7 +2227,7 @@ static void test_import(void) "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" "5,00,65,00,00,00\n" "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" - " 5,00,65,00,00,00\\\n" + " 5,00,65,00,00,00\n" "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\\n" " 65,00,00,00\n" @@ -2249,8 +2249,8 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine43f"); todo_wine verify_reg_nonexist(hkey, "Wine43g"); todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); - todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine43k"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"

1 0

Józef Kucia : wined3d: Recognize hull shader phases.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 2b85e49e1b5dabdd169b15a834a623a3d9c7e505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b85e49e1b5dabdd169b15a83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:19:58 2017 +0200 wined3d: Recognize hull shader phases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +-- dlls/wined3d/shader.c | 89 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 20 ++++++++-- 3 files changed, 106 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 522a30d..5d08a48 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10346,10 +10346,10 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_GATHER4_C */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_PO */ shader_glsl_gather4, /* WINED3DSIH_GE */ shader_glsl_relop, - /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, + /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ shader_glsl_nop, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, - /* WINED3DSIH_HS_FORK_PHASE */ NULL, - /* WINED3DSIH_HS_JOIN_PHASE */ NULL, + /* WINED3DSIH_HS_FORK_PHASE */ shader_glsl_nop, + /* WINED3DSIH_HS_JOIN_PHASE */ shader_glsl_nop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IBFE */ shader_glsl_bitwise_op, /* WINED3DSIH_IEQ */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0f12b69..146ad63 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -900,6 +900,62 @@ static HRESULT shader_reg_maps_add_tgsm(struct wined3d_shader_reg_maps *reg_maps return S_OK; } +static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, + struct wined3d_shader_phase **current_phase, const struct wined3d_shader_instruction *ins, + const DWORD *current_instruction_ptr, const DWORD *previous_instruction_ptr) +{ + struct wined3d_shader_phase *phase; + + if ((phase = *current_phase)) + { + phase->end = previous_instruction_ptr; + *current_phase = NULL; + } + + if (shader->reg_maps.shader_version.type != WINED3D_SHADER_TYPE_HULL) + { + ERR("Unexpected shader type %#x.\n", shader->reg_maps.shader_version.type); + return E_FAIL; + } + + switch (ins->handler_idx) + { + case WINED3DSIH_HS_CONTROL_POINT_PHASE: + if (shader->u.hs.phases.control_point) + { + FIXME("Multiple control point phases.\n"); + HeapFree(GetProcessHeap(), 0, shader->u.hs.phases.control_point); + } + if (!(shader->u.hs.phases.control_point = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, sizeof(*shader->u.hs.phases.control_point)))) + return E_OUTOFMEMORY; + phase = shader->u.hs.phases.control_point; + break; + case WINED3DSIH_HS_FORK_PHASE: + if (!wined3d_array_reserve((void **)&shader->u.hs.phases.fork, + &shader->u.hs.phases.fork_size, shader->u.hs.phases.fork_count + 1, + sizeof(*shader->u.hs.phases.fork))) + return E_OUTOFMEMORY; + phase = &shader->u.hs.phases.fork[shader->u.hs.phases.fork_count++]; + break; + case WINED3DSIH_HS_JOIN_PHASE: + if (!wined3d_array_reserve((void **)&shader->u.hs.phases.join, + &shader->u.hs.phases.join_size, shader->u.hs.phases.join_count + 1, + sizeof(*shader->u.hs.phases.join))) + return E_OUTOFMEMORY; + phase = &shader->u.hs.phases.join[shader->u.hs.phases.join_count++]; + break; + default: + ERR("Unexpected opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); + return E_FAIL; + } + + phase->start = current_instruction_ptr; + *current_phase = phase; + + return WINED3D_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -908,9 +964,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st struct wined3d_shader_signature_element input_signature_elements[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature_elements[MAX_REG_OUTPUT]; unsigned int cur_loop_depth = 0, max_loop_depth = 0; - void *fe_data = shader->frontend_data; struct wined3d_shader_version shader_version; - const DWORD *ptr; + struct wined3d_shader_phase *phase = NULL; + const DWORD *ptr, *prev_ins, *current_ins; + void *fe_data = shader->frontend_data; unsigned int i; HRESULT hr; @@ -921,6 +978,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st list_init(&reg_maps->indexable_temps); fe->shader_read_header(fe_data, &ptr, &shader_version); + prev_ins = current_ins = ptr; reg_maps->shader_version = shader_version; shader_set_limits(shader); @@ -936,6 +994,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { struct wined3d_shader_instruction ins; + current_ins = ptr; /* Fetch opcode. */ fe->shader_read_instruction(fe_data, &ptr, &ins); @@ -1239,6 +1298,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st list_add_head(&shader->constantsB, &lconst->entry); reg_maps->local_bool_consts |= (1u << lconst->idx); } + /* Handle shader phases. */ + else if (ins.handler_idx == WINED3DSIH_HS_CONTROL_POINT_PHASE + || ins.handler_idx == WINED3DSIH_HS_FORK_PHASE + || ins.handler_idx == WINED3DSIH_HS_JOIN_PHASE) + { + if (FAILED(hr = shader_record_shader_phase(shader, &phase, &ins, current_ins, prev_ins))) + return hr; + } /* For subroutine prototypes. */ else if (ins.handler_idx == WINED3DSIH_LABEL) { @@ -1557,9 +1624,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } } + + prev_ins = current_ins; } reg_maps->loop_depth = max_loop_depth; + if (phase) + { + phase->end = prev_ins; + phase = NULL; + } + /* PS before 2.0 don't have explicit color outputs. Instead the value of * R0 is written to the render target. */ if (shader_version.major < 2 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) @@ -2873,8 +2948,16 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { - if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) + if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_HULL) + { + HeapFree(GetProcessHeap(), 0, shader->u.hs.phases.control_point); + HeapFree(GetProcessHeap(), 0, shader->u.hs.phases.fork); + HeapFree(GetProcessHeap(), 0, shader->u.hs.phases.join); + } + else if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) + { HeapFree(GetProcessHeap(), 0, shader->u.gs.so_desc.elements); + } HeapFree(GetProcessHeap(), 0, shader->patch_constant_signature.elements); HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70dd8ed..34548a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3699,9 +3699,11 @@ int shader_addline(struct wined3d_string_buffer *buffer, const char *fmt, ...) P BOOL string_buffer_resize(struct wined3d_string_buffer *buffer, int rc) DECLSPEC_HIDDEN; int shader_vaddline(struct wined3d_string_buffer *buffer, const char *fmt, va_list args) DECLSPEC_HIDDEN; -/* Vertex shader utility functions */ -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; +struct wined3d_shader_phase +{ + const DWORD *start; + const DWORD *end; +}; struct wined3d_vertex_shader { @@ -3710,6 +3712,16 @@ struct wined3d_vertex_shader struct wined3d_hull_shader { + struct + { + struct wined3d_shader_phase *control_point; + unsigned int fork_count; + unsigned int join_count; + struct wined3d_shader_phase *fork; + SIZE_T fork_size; + struct wined3d_shader_phase *join; + SIZE_T join_size; + } phases; unsigned int output_vertex_count; enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; @@ -3796,6 +3808,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; +BOOL vshader_get_input(const struct wined3d_shader *shader, + BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, WORD swizzle_map, struct vs_compile_args *args, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3d11/tests: Strip shaders bytecode.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 61fdb1d92d566727155a08bf4076a2c7ea59401a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fdb1d92d566727155a08bf4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:19:56 2017 +0200 d3d11/tests: Strip shaders bytecode. Shaders should be compiled with /Qstrip_debug and /Qstrip_reflect. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 57 ++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 58c698e..564053b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3667,22 +3667,13 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) }; static const DWORD ps_4_0[] = { - 0x43425844, 0x4da9446f, 0xfbe1f259, 0x3fdb3009, 0x517521fa, 0x00000001, 0x000001ac, - 0x00000005, 0x00000034, 0x0000008c, 0x000000bc, 0x000000f0, 0x00000130, 0x46454452, - 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, - 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, - 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, - 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, - 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, - 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, - 0x0000000e, 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, - 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, - 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, + 0x43425844, 0x08c2b568, 0x17d33120, 0xb7d82948, 0x13a570fb, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000005c, 0x00000090, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; static const DWORD ps_4_0_level_9_0[] = { @@ -10381,29 +10372,19 @@ static void test_swapchain_flip(void) return t1.Sample(s, p); } #endif - 0x43425844, 0x1733542c, 0xf74c6b6a, 0x0fb11eac, 0x76f6a999, 0x00000001, 0x000002cc, 0x00000005, - 0x00000034, 0x000000f4, 0x00000128, 0x0000015c, 0x00000250, 0x46454452, 0x000000b8, 0x00000000, - 0x00000000, 0x00000003, 0x0000001c, 0xffff0400, 0x00000100, 0x00000084, 0x0000007c, 0x00000003, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000007e, 0x00000002, - 0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000001, 0x0000000c, 0x00000081, 0x00000002, - 0x00000005, 0x00000004, 0xffffffff, 0x00000001, 0x00000001, 0x0000000c, 0x30740073, 0x00317400, - 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, - 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x0000002c, 0x00000001, - 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, - 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, - 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, - 0x000000ec, 0x00000040, 0x0000003b, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, - 0x00000000, 0x00005555, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04002064, 0x00101012, - 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x07000031, - 0x00100012, 0x00000000, 0x0010100a, 0x00000000, 0x00004001, 0x43a00000, 0x0304001f, 0x0010000a, - 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, - 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, 0x01000015, 0x0c000045, + 0x43425844, 0xc00961ea, 0x48558efd, 0x5eec7aed, 0xb597e6d1, 0x00000001, 0x00000188, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000ec, 0x00000040, + 0x0000003b, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04002064, 0x00101012, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x07000031, 0x00100012, 0x00000000, + 0x0010100a, 0x00000000, 0x00004001, 0x43a00000, 0x0304001f, 0x0010000a, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00107e46, - 0x00000001, 0x00106000, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000007, 0x00000001, - 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000 + 0x00000000, 0x00106000, 0x00000000, 0x0100003e, 0x01000015, 0x0c000045, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, + 0x00000000, 0x0100003e, }; static const struct vec2 quad[] = {

1 0