Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70031: [DXSDK] Update d3dx9shader.h. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:40:43 2015 New Revision: 70031 URL: http://svn.reactos.org/svn/reactos?rev=70031&view=rev Log: [DXSDK] Update d3dx9shader.h. CORE-10536 Modified: trunk/reactos/include/dxsdk/d3dx9shader.h Modified: trunk/reactos/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shader.… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9shader.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/d3dx9shader.h [iso-8859-1] Sun Nov 22 15:40:43 2015 @@ -305,6 +305,43 @@ typedef struct ID3DXInclude *LPD3DXINCLUDE; +typedef struct _D3DXFRAGMENT_DESC +{ + const char *Name; + DWORD Target; + +} D3DXFRAGMENT_DESC, *LPD3DXFRAGMENT_DESC; + + +DEFINE_GUID(IID_ID3DXFragmentLinker, 0x1a2c0cc2, 0xe5b6, 0x4ebc, 0x9e, 0x8d, 0x39, 0xe, 0x5, 0x78, 0x11, 0xb6); + +#define INTERFACE ID3DXFragmentLinker +DECLARE_INTERFACE_(ID3DXFragmentLinker, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE; + STDMETHOD_(UINT, GetNumberOfFragments)(THIS) PURE; + + STDMETHOD_(D3DXHANDLE, GetFragmentHandleByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetFragmentHandleByName)(THIS_ const char *name) PURE; + STDMETHOD(GetFragmentDesc)(THIS_ D3DXHANDLE name, D3DXFRAGMENT_DESC *frag_desc) PURE; + + STDMETHOD(AddFragments)(THIS_ const DWORD *fragments) PURE; + + STDMETHOD(GetAllFragments)(THIS_ ID3DXBuffer **buffer) PURE; + STDMETHOD(GetFragment)(THIS_ D3DXHANDLE name, ID3DXBuffer **buffer) PURE; + + STDMETHOD(LinkShader)(THIS_ const char *profile, DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, ID3DXBuffer **buffer, ID3DXBuffer **errors) PURE; + STDMETHOD(LinkVertexShader)(THIS_ const char *profile, DWORD flags, const D3DXHANDLE *fragment_handles, UINT fragments, IDirect3DVertexShader9 **shader, ID3DXBuffer **errors) PURE; + STDMETHOD(LinkPixelShader)(THIS_ const char *profile, DWORD flags, const D3DXHANDLE *fragment_handles, UINT fragments, IDirect3DPixelShader9 **shader, ID3DXBuffer **errors) PURE; + + STDMETHOD(ClearCache)(THIS) PURE; +}; +#undef INTERFACE + #ifdef __cplusplus extern "C" { #endif @@ -316,6 +353,7 @@ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const void **data, UINT *size); HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count); HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, UINT *count); +HRESULT WINAPI D3DXGetShaderOuputSemantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, UINT *count); HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages); @@ -377,6 +415,9 @@ HRESULT WINAPI D3DXGetShaderOutputSemantics(const DWORD *pFunction, D3DXSEMANTIC *pSemantics, UINT *pCount); HRESULT WINAPI D3DXCreateTextureShader(const DWORD *pFunction, ID3DXTextureShader **ppTextureShader); + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker); +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker); #ifdef __cplusplus }

1 0

[akhaldi] 70030: [D3DX9_*] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:39:50 2015 New Revision: 70030 URL: http://svn.reactos.org/svn/reactos?rev=70030&view=rev Log: [D3DX9_*] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec Modified: trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -280,7 +280,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -280,7 +280,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -284,7 +284,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -284,7 +284,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -289,7 +289,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -289,7 +289,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -289,7 +289,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -286,7 +286,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -291,7 +291,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -63,3 +63,21 @@ else return FALSE; } + +/*********************************************************************** + * D3DXDebugMute + * Returns always FALSE for us. + */ +BOOL WINAPI D3DXDebugMute(BOOL mute) +{ + return FALSE; +} + +/*********************************************************************** + * D3DXGetDriverLevel. + * Returns always 900 (DX 9) for us + */ +UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device) +{ + return 900; +} Modified: trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -291,7 +291,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -291,7 +291,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -293,7 +293,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -293,7 +293,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -293,7 +293,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -293,7 +293,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -293,7 +293,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -66,8 +66,6 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectA @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectW @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) d3dx9_36.D3DXCreateFontW -@ stdcall D3DXCreateFragmentLinker(ptr long ptr) d3dx9_36.D3DXCreateFragmentLinker -@ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) d3dx9_36.D3DXCreateFragmentLinkerEx @ stdcall D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) d3dx9_36.D3DXCreateKeyframedAnimationSet @ stdcall D3DXCreateLine(ptr ptr) d3dx9_36.D3DXCreateLine @ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack @@ -293,7 +291,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize Modified: trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_43/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43.spec [iso-8859-1] Sun Nov 22 15:39:50 2015 @@ -286,7 +286,7 @@ @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize

1 0

[akhaldi] 70029: [DXSDK] Update d3dx9mesh.h. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:31:57 2015 New Revision: 70029 URL: http://svn.reactos.org/svn/reactos?rev=70029&view=rev Log: [DXSDK] Update d3dx9mesh.h. CORE-10536 Modified: trunk/reactos/include/dxsdk/d3dx9mesh.h Modified: trunk/reactos/include/dxsdk/d3dx9mesh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9mesh.h?… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9mesh.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/d3dx9mesh.h [iso-8859-1] Sun Nov 22 15:31:57 2015 @@ -836,11 +836,11 @@ HRESULT WINAPI D3DXSplitMesh(ID3DXMesh *mesh_in, const DWORD *adjacency_in, const DWORD max_size, const DWORD flags, DWORD *mesh_out_count, ID3DXBuffer **mesh_out, ID3DXBuffer **adjacency_out, ID3DXBuffer **face_remap_out, ID3DXBuffer **vertex_remap_out); -HRESULT WINAPI D3DXTesselateNPatches(ID3DXMesh *mesh_in, const DWORD *adjacency_in, float segment_count, +HRESULT WINAPI D3DXTessellateNPatches(ID3DXMesh *mesh_in, const DWORD *adjacency_in, float segment_count, BOOL quad_interp, ID3DXMesh **mesh_out, ID3DXBuffer **adjacency_out); -HRESULT WINAPI D3DXTesselateRectPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, +HRESULT WINAPI D3DXTessellateRectPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, const D3DVERTEXELEMENT9 *declaration, const D3DRECTPATCH_INFO *patch_info, struct ID3DXMesh *mesh); -HRESULT WINAPI D3DXTesselateTriPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, +HRESULT WINAPI D3DXTessellateTriPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, const D3DVERTEXELEMENT9 *declaration, const D3DTRIPATCH_INFO *patch_info, struct ID3DXMesh *mesh); HRESULT WINAPI D3DXTriPatchSize(const FLOAT *segment_count, DWORD *num_triangles, DWORD *num_vertices);

1 0

[akhaldi] 70028: [AMSTREAM_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:31:28 2015 New Revision: 70028 URL: http://svn.reactos.org/svn/reactos?rev=70028&view=rev Log: [AMSTREAM_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/amstream/amstream.c Modified: trunk/rostests/winetests/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstre… ============================================================================== --- trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] Sun Nov 22 15:31:28 2015 @@ -432,9 +432,9 @@ ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(AM_MEDIA_TYPE), media_types, &nb_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(media_types[0]), media_types, &nb_media_types); ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); - ok(nb_media_types == 0, "nb_media_types should be 0 instead of %u\n", nb_media_types); + ok(nb_media_types > 0, "nb_media_types should be >0\n"); IEnumMediaTypes_Release(enum_media_types); IPin_Release(pins[i]); }

1 0

[akhaldi] 70027: [AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:31:10 2015 New Revision: 70027 URL: http://svn.reactos.org/svn/reactos?rev=70027&view=rev Log: [AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] Sun Nov 22 15:31:10 2015 @@ -102,9 +102,15 @@ { DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); - - return S_FALSE; + TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, @@ -263,9 +269,15 @@ { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); - - return S_FALSE; + TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); + + if (!ppMultiMediaStream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *ppMultiMediaStream = This->parent; + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, @@ -503,9 +515,15 @@ { AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); - - return S_FALSE; + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, @@ -664,9 +682,15 @@ { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream); - - return S_FALSE; + TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream); + + if (!multimedia_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multimedia_stream = This->parent; + + return S_OK; } static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, @@ -995,6 +1019,7 @@ desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; + desc.lpSurface = NULL; hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); IDirectDraw_Release(ddraw); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Nov 22 15:31:10 2015 @@ -21,7 +21,7 @@ The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.47

1 0

[akhaldi] 70026: [DXSDK] Update axcore.idl. CORE-10536
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 15:30:29 2015 New Revision: 70026 URL: http://svn.reactos.org/svn/reactos?rev=70026&view=rev Log: [DXSDK] Update axcore.idl. CORE-10536 Modified: trunk/reactos/include/dxsdk/axcore.idl Modified: trunk/reactos/include/dxsdk/axcore.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/axcore.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/axcore.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/axcore.idl [iso-8859-1] Sun Nov 22 15:30:29 2015 @@ -488,6 +488,7 @@ cpp_quote("#define AM_GBF_NOTASYNCPOINT 2") cpp_quote("#define AM_GBF_NOWAIT 4") +cpp_quote("#define AM_GBF_NODDSURFACELOCK 8") [ object, @@ -668,3 +669,42 @@ { AM_MEDIAEVENT_NONOTIFY = 0x01 }; + +enum _AMSTREAMSELECTINFOFLAGS +{ + AMSTREAMSELECTINFO_ENABLED = 0x1, + AMSTREAMSELECTINFO_EXCLUSIVE = 0x2 +}; + +enum _AMSTREAMSELECTENABLEFLAGS +{ + AMSTREAMSELECTENABLE_ENABLE = 0x1, + AMSTREAMSELECTENABLE_ENABLEALL = 0x2 +}; + +[ +object, +uuid(c1960960-17f5-11d1-abe1-00a0c905f375), +pointer_default(unique) +] +interface IAMStreamSelect : IUnknown +{ + HRESULT Count( + [out] DWORD *streams); + + HRESULT Info( + [in] long index, + [out] AM_MEDIA_TYPE **media_type, + [out] DWORD *flags, + [out] LCID *lcid, + [out] DWORD *group, + [out] WCHAR **name, + [out] IUnknown **object, + [out] IUnknown **unknown); + + HRESULT Enable( + [in] long index, + [in] DWORD flags); +} + +typedef IAMStreamSelect *PAMSTREAMSELECT;

1 0

[pschweitzer] 70025: [IPHLPAPI] - Implement TCPSendIoctl() to issue IOCTLs to network stack. We should use global handles to \Device\Ip & such, but as iphlpapi doesn't have such feature yet, a hack...
by pschweitzer＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: pschweitzer Date: Sun Nov 22 14:47:42 2015 New Revision: 70025 URL: http://svn.reactos.org/svn/reactos?rev=70025&view=rev Log: [IPHLPAPI] - Implement TCPSendIoctl() to issue IOCTLs to network stack. We should use global handles to \Device\Ip & such, but as iphlpapi doesn't have such feature yet, a hack is here to workaround. - Implement SendARP() using the TCPSendIoctl() function. So far, it doesn't work, as tcpip.sys is missing appropriate code path. Added: trunk/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c (with props) Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Sun Nov 22 14:47:42 2015 @@ -12,6 +12,7 @@ dhcp_reactos.c ifenum_reactos.c ipstats_reactos.c + iphlpapi_reactos.c iphlpapi_main.c media.c registry.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sun Nov 22 14:47:42 2015 @@ -2047,7 +2047,6 @@ return ERROR_NOT_SUPPORTED; } - /****************************************************************** * SendARP (IPHLPAPI.@) * @@ -2062,15 +2061,19 @@ * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * FIXME - * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen) { - FIXME("(DestIP 0x%08x, SrcIP 0x%08x, pMacAddr %p, PhyAddrLen %p): stub\n", - DestIP, SrcIP, pMacAddr, PhyAddrLen); - return ERROR_NOT_SUPPORTED; + IPAddr IPs[2]; + ULONG Size; + + if (IsBadWritePtr(pMacAddr, sizeof(ULONG)) || IsBadWritePtr(PhyAddrLen, sizeof(ULONG))) + return ERROR_INVALID_PARAMETER; + + IPs[0] = DestIP; + IPs[1] = SrcIP; + Size = sizeof(IPs); + return TCPSendIoctl(INVALID_HANDLE_VALUE, IOCTL_QUERY_IP_HW_ADDRESS, IPs, &Size, pMacAddr, PhyAddrLen); } Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sun Nov 22 14:47:42 2015 @@ -164,6 +164,7 @@ char *name, DWORD index, IFInfo *ifInfo); +DWORD TCPSendIoctl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, PULONG pInBufferSize, LPVOID lpOutBuffer, PULONG pOutBufferSize); #include <w32api.h> /* This is here until we switch to version 2.5 of the mingw headers */ Added: trunk/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c (added) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c [iso-8859-1] Sun Nov 22 14:47:42 2015 @@ -0,0 +1,85 @@ +/* + * PROJECT: ReactOS Networking + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/iphlpapi/iphlpapi_reactos.c + * PURPOSE: DHCP helper functions for ReactOS + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include "iphlpapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); + +DWORD TCPSendIoctl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, PULONG pInBufferSize, LPVOID lpOutBuffer, PULONG pOutBufferSize) +{ + BOOL Hack = FALSE; + HANDLE Event; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + /* FIXME: We don't have a global handle opened to \Device\Ip, so open one each time + * we need. In a future, it would be cool, just to pass it to TCPSendIoctl using the first arg + */ + if (hDevice == INVALID_HANDLE_VALUE) + { + UNICODE_STRING DevName = RTL_CONSTANT_STRING(L"\\Device\\Ip"); + OBJECT_ATTRIBUTES ObjectAttributes; + + FIXME("Using the handle hack\n"); + Hack = TRUE; + + InitializeObjectAttributes(&ObjectAttributes, + &DevName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&hDevice, GENERIC_EXECUTE, &ObjectAttributes, + &IoStatusBlock, 0, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN_IF, + 0, NULL, 0); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + } + + /* Sync event */ + Event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (Event == NULL) + { + /* FIXME: See upper */ + if (Hack) + { + CloseHandle(hDevice); + } + return GetLastError(); + } + + /* Reinit, and call the networking stack */ + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, Event, NULL, NULL, &IoStatusBlock, dwIoControlCode, lpInBuffer, *pInBufferSize, lpOutBuffer, *pOutBufferSize); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(Event, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* Close & return size info */ + CloseHandle(Event); + *pOutBufferSize = IoStatusBlock.Information; + + /* FIXME: See upper */ + if (Hack) + { + CloseHandle(hDevice); + } + + /* Return result */ + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + return ERROR_SUCCESS; +} Propchange: trunk/reactos/dll/win32/iphlpapi/iphlpapi_reactos.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 70024: [PSDK] Define the IOCTL_QUERY_IP_HW_ADDRESS which allows asking for ARP probe
by pschweitzer＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: pschweitzer Date: Sun Nov 22 14:47:40 2015 New Revision: 70024 URL: http://svn.reactos.org/svn/reactos?rev=70024&view=rev Log: [PSDK] Define the IOCTL_QUERY_IP_HW_ADDRESS which allows asking for ARP probe Modified: trunk/reactos/include/psdk/tcpioctl.h Modified: trunk/reactos/include/psdk/tcpioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tcpioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/tcpioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tcpioctl.h [iso-8859-1] Sun Nov 22 14:47:40 2015 @@ -36,6 +36,9 @@ #define IOCTL_TCP_SET_INFORMATION_EX \ _TCP_CTL_CODE(1, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_QUERY_IP_HW_ADDRESS \ + _TCP_CTL_CODE(15, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_SET_IP_ADDRESS \ _TCP_CTL_CODE(14, METHOD_BUFFERED, FILE_WRITE_ACCESS)

1 0

[tfaber] 70023: [CRT_APITEST] - Add tests for static object destructors. Patch by Mark Jansen. CORE-10562
by tfaber＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: tfaber Date: Sun Nov 22 14:01:04 2015 New Revision: 70023 URL: http://svn.reactos.org/svn/reactos?rev=70023&view=rev Log: [CRT_APITEST] - Add tests for static object destructors. Patch by Mark Jansen. CORE-10562 Modified: trunk/rostests/apitests/crt/static_construct.cpp Modified: trunk/rostests/apitests/crt/static_construct.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/static_const… ============================================================================== --- trunk/rostests/apitests/crt/static_construct.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/static_construct.cpp [iso-8859-1] Sun Nov 22 14:01:04 2015 @@ -3,6 +3,7 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for static C++ object construction * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Mark Jansen */ #include <apitest.h> @@ -101,8 +102,127 @@ ok(values.dtor_counter == 7879, "dtor_counter = %d\n", values.dtor_counter); } +struct shared_memory +{ + int init_count; + int uninit_count; +}; + +static HANDLE g_FileMapping = NULL; +static BOOL g_CreatedFileMapping = FALSE; +static shared_memory* g_Memory = NULL; + +#define MAPPING_NAME L"crt_apitest_static_construct" + +static void map_memory() +{ + if (g_FileMapping) + return; + + g_FileMapping = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, MAPPING_NAME); + if (g_FileMapping) + { + g_CreatedFileMapping = FALSE; + } + else + { + g_FileMapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shared_memory), MAPPING_NAME); + g_CreatedFileMapping = TRUE; + } + if (g_FileMapping == NULL) + { + skip("Could not map shared memory\n"); + return; + } + g_Memory = static_cast<shared_memory*>(MapViewOfFile(g_FileMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(shared_memory))); + if (g_Memory == NULL) + { + skip("Could not map view of shared memory\n"); + CloseHandle(g_FileMapping); + g_FileMapping = NULL; + } + if (g_CreatedFileMapping) + ZeroMemory(g_Memory, sizeof(shared_memory)); +} + +static void unmap_memory() +{ + // we do not clean the mapping in the child, since we want to count all dtor's! + if (g_FileMapping && g_CreatedFileMapping) + { + UnmapViewOfFile(g_Memory); + CloseHandle(g_FileMapping); + g_Memory = NULL; + g_FileMapping = NULL; + } +} + +static struct shared_mem_static +{ + shared_mem_static() + { + map_memory(); + if (g_Memory) + g_Memory->init_count++; + } + + ~shared_mem_static() + { + if (g_Memory) + g_Memory->uninit_count++; + unmap_memory(); + } + +} shared_mem_static; + +static +VOID +TestStaticDestruct(VOID) +{ + ok(g_Memory != NULL, "Expected the mapping to be in place\n"); + ok(g_CreatedFileMapping == TRUE, "Expected to create a new shared section!\n"); + if (g_Memory == NULL) + { + skip("Can't proceed without file mapping\n"); + return; + } + ok(g_Memory->init_count == 1, "Expected init_count to be 1, was: %d\n", g_Memory->init_count); + ok(g_Memory->uninit_count == 0, "Expected uninit_count to be 0, was: %d\n", g_Memory->uninit_count); + + WCHAR path[MAX_PATH]; + // we just need an extra argument to tell the test it's only running to increment the dtor count :) + GetModuleFileNameW(NULL, path, _countof(path)); + WCHAR buf[MAX_PATH+40]; + StringCchPrintfW(buf, _countof(buf), L"\"%ls\" static_construct dummy", path); + + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + BOOL created = CreateProcessW(NULL, buf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(created, "Expected CreateProcess to succeed\n"); + if (created) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + ok(g_Memory->init_count == 2, "Expected init_count to be 2, was: %d\n", g_Memory->init_count); + ok(g_Memory->uninit_count == 1, "Expected uninit_count to be 1, was: %d\n", g_Memory->uninit_count); + } +} + START_TEST(static_construct) { + char **argv; + int argc = winetest_get_mainargs(&argv); + + if (argc >= 3) + { + // we are just here to increment the reference count in the shared section! + ok(g_Memory != NULL, "Expected the shared memory to be mapped!\n"); + ok(g_CreatedFileMapping == FALSE, "Expected the shared memory to be created by my parent!\n"); + return; + } + TestInitStatic(); TestDllStartup(); -} + TestStaticDestruct(); +}

1 0

[tfaber] 70022: [CRT_APITEST] - Fix dll loading in static_construct test CORE-10562
by tfaber＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: tfaber Date: Sun Nov 22 13:51:19 2015 New Revision: 70022 URL: http://svn.reactos.org/svn/reactos?rev=70022&view=rev Log: [CRT_APITEST] - Fix dll loading in static_construct test CORE-10562 Modified: trunk/rostests/apitests/crt/static_construct.cpp Modified: trunk/rostests/apitests/crt/static_construct.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/static_const… ============================================================================== --- trunk/rostests/apitests/crt/static_construct.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/static_construct.cpp [iso-8859-1] Sun Nov 22 13:51:19 2015 @@ -6,6 +6,7 @@ */ #include <apitest.h> +#include <strsafe.h> #include "dll_startup.h" extern "C" @@ -35,7 +36,9 @@ } } init_static; -START_TEST(static_construct) +static +VOID +TestInitStatic(VOID) { ok(static_init_counter_at_startup == 123, "static_init_counter at startup: %d\n", static_init_counter_at_startup); ok(static_construct_counter_at_startup == 789, "static_construct_counter at startup: %d\n", static_construct_counter_at_startup); @@ -46,15 +49,25 @@ ok(static_construct_counter == 790, "static_construct_counter: %d\n", static_construct_counter); ok(init_static.m_counter == 2, "init_static.m_counter: %d\n", init_static.m_counter); ok(init_static.m_uninit == 1, "init_static.m_uninit: %d\n", init_static.m_uninit); +} - counter_values values; +static +VOID +TestDllStartup(VOID) +{ #if defined(TEST_MSVCRT) - HMODULE hDll = LoadLibraryW(L"msvcrt_crt_dll_startup.dll"); + const PCWSTR DllName = L"msvcrt_crt_dll_startup.dll"; #elif defined(TEST_STATIC_CRT) - HMODULE hDll = LoadLibraryW(L"static_crt_dll_startup.dll"); + const PCWSTR DllName = L"static_crt_dll_startup.dll"; #else #error This test only makes sense for static CRT and msvcrt.dll #endif + WCHAR DllPath[MAX_PATH]; + GetModuleFileNameW(NULL, DllPath, _countof(DllPath)); + wcsrchr(DllPath, L'\\')[1] = UNICODE_NULL; + StringCchCatW(DllPath, _countof(DllPath), DllName); + + HMODULE hDll = LoadLibraryW(DllPath); if (hDll == NULL) { skip("Helper dll not found\n"); @@ -67,6 +80,7 @@ FreeLibrary(hDll); return; } + counter_values values; pSetCounterValuesPointer(&values); ok(values.m_uninit_at_startup == 0, "m_uninit_at_startup = %d\n", values.m_uninit_at_startup); ok(values.m_uninit == 1, "m_uninit = %d\n", values.m_uninit); @@ -86,3 +100,9 @@ ok(values.dtor_counter_at_detach == 7878, "dtor_counter_at_detach = %d\n", values.dtor_counter_at_detach); ok(values.dtor_counter == 7879, "dtor_counter = %d\n", values.dtor_counter); } + +START_TEST(static_construct) +{ + TestInitStatic(); + TestDllStartup(); +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs