Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64303: [QEDIT] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:42:33 2014 New Revision: 64303 URL: http://svn.reactos.org/svn/reactos?rev=64303&view=rev Log: [QEDIT] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] Fri Sep 26 09:42:33 2014 @@ -347,7 +347,7 @@ if (SUCCEEDED(hr)) { - hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); + hr = CLSIDFromString(V_BSTR(pvar), pclsid); VariantClear(pvar); V_VT(pvar) = VT_BSTR; } @@ -356,8 +356,7 @@ hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); if (SUCCEEDED(hr)) - TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), - debugstr_w(V_UNION(pvar, bstrVal))); + TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar))); if (pPropBagCat) IPropertyBag_Release(pPropBagCat); @@ -430,8 +429,7 @@ continue; } - hr = IGraphBuilder_AddFilter(This->graph, splitter, - V_UNION(&var, bstrVal)); + hr = IGraphBuilder_AddFilter(This->graph, splitter, V_BSTR(&var)); VariantClear(&var); This->splitter = splitter; if (FAILED(hr)) 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] Fri Sep 26 09:42:33 2014 @@ -44,7 +44,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17 -reactos/dll/directx/wine/qedit # Synced to Wine-1.7.17 +reactos/dll/directx/wine/qedit # Synced to Wine-1.7.27 reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.27

1 0

[akhaldi] 64302: [DXGI] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:40:04 2014 New Revision: 64302 URL: http://svn.reactos.org/svn/reactos?rev=64302&view=rev Log: [DXGI] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt trunk/reactos/dll/directx/wine/dxgi/adapter.c trunk/reactos/dll/directx/wine/dxgi/device.c trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h trunk/reactos/dll/directx/wine/dxgi/factory.c trunk/reactos/dll/directx/wine/dxgi/output.c trunk/reactos/dll/directx/wine/dxgi/surface.c trunk/reactos/dll/directx/wine/dxgi/swapchain.c trunk/reactos/include/reactos/wine/winedxgi.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -23,7 +23,7 @@ set_module_type(dxgi win32dll) target_link_libraries(dxgi uuid dxgi_uuids wine) -add_importlibs(dxgi wined3d msvcrt kernel32 ntdll) +add_importlibs(dxgi wined3d user32 msvcrt kernel32 ntdll) add_dependencies(dxgi wineheaders) add_pch(dxgi dxgi_private.h SOURCE) add_cd_file(TARGET dxgi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dxgi/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/adap… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/adapter.c [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -19,63 +19,60 @@ #include "dxgi_private.h" -static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface) -{ - return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface); -} - -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *iface, REFIID riid, void **object) -{ - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IDXGIAdapter) - || IsEqualGUID(riid, &IID_IDXGIAdapter1) - || IsEqualGUID(riid, &IID_IWineDXGIAdapter)) +#include <assert.h> + +static inline struct dxgi_adapter *impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter1_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter1 *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IDXGIAdapter1) + || IsEqualGUID(iid, &IID_IDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - - *object = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface) -{ - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); - - TRACE("%p increasing refcount to %u\n", This, refcount); +static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter1 *iface) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); + ULONG refcount = InterlockedIncrement(&adapter->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) -{ - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); - - TRACE("%p decreasing refcount to %u\n", This, refcount); +static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter1 *iface) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); + ULONG refcount = InterlockedDecrement(&adapter->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { - IDXGIOutput_Release(This->output); - HeapFree(GetProcessHeap(), 0, This); + IDXGIOutput_Release(adapter->output); + HeapFree(GetProcessHeap(), 0, adapter); } return refcount; } -/* IDXGIObject methods */ - -static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IWineDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter1 *iface, REFGUID guid, UINT data_size, const void *data) { FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -83,7 +80,7 @@ return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IWineDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter1 *iface, REFGUID guid, const IUnknown *object) { FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); @@ -91,7 +88,7 @@ return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IWineDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter1 *iface, REFGUID guid, UINT *data_size, void *data) { FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -99,21 +96,19 @@ return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent) -{ - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); - - TRACE("iface %p, riid %s, parent %p\n", iface, debugstr_guid(riid), parent); - - return IWineDXGIFactory_QueryInterface(This->parent, riid, parent); -} - -/* IDXGIAdapter methods */ - -static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter1 *iface, REFIID iid, void **parent) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); + + TRACE("iface %p, iid %s, parent %p\n", iface, debugstr_guid(iid), parent); + + return IDXGIFactory1_QueryInterface(&adapter->parent->IDXGIFactory1_iface, iid, parent); +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IDXGIAdapter1 *iface, UINT output_idx, IDXGIOutput **output) { - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); @@ -123,7 +118,7 @@ return DXGI_ERROR_NOT_FOUND; } - *output = This->output; + *output = adapter->output; IDXGIOutput_AddRef(*output); TRACE("Returning output %p.\n", output); @@ -131,12 +126,11 @@ return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) -{ - struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IDXGIAdapter1 *iface, DXGI_ADAPTER_DESC1 *desc) +{ + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); struct wined3d_adapter_identifier adapter_id; char description[128]; - struct wined3d *wined3d; HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); @@ -144,15 +138,13 @@ if (!desc) return E_INVALIDARG; - wined3d = IWineDXGIFactory_get_wined3d(adapter->parent); adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; EnterCriticalSection(&dxgi_cs); - hr = wined3d_get_adapter_identifier(wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_decref(wined3d); + hr = wined3d_get_adapter_identifier(adapter->parent->wined3d, adapter->ordinal, 0, &adapter_id); LeaveCriticalSection(&dxgi_cs); if (FAILED(hr)) @@ -178,7 +170,7 @@ return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter1 *iface, DXGI_ADAPTER_DESC *desc) { DXGI_ADAPTER_DESC1 desc1; HRESULT hr; @@ -195,7 +187,7 @@ return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter1 *iface, REFGUID guid, LARGE_INTEGER *umd_version) { FIXME("iface %p, guid %s, umd_version %p stub!\n", iface, debugstr_guid(guid), umd_version); @@ -203,43 +195,34 @@ return E_NOTIMPL; } -/* IWineDXGIAdapter methods */ - -static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface) -{ - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); - - TRACE("iface %p, returning %u\n", iface, This->ordinal); - - return This->ordinal; -} - -static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = -{ - /* IUnknown methods */ +static const struct IDXGIAdapter1Vtbl dxgi_adapter_vtbl = +{ dxgi_adapter_QueryInterface, dxgi_adapter_AddRef, dxgi_adapter_Release, - /* IDXGIObject methods */ dxgi_adapter_SetPrivateData, dxgi_adapter_SetPrivateDataInterface, dxgi_adapter_GetPrivateData, dxgi_adapter_GetParent, - /* IDXGIAdapter methods */ dxgi_adapter_EnumOutputs, dxgi_adapter_GetDesc, dxgi_adapter_CheckInterfaceSupport, - /* IDXGIAdapter1 methods */ dxgi_adapter_GetDesc1, - /* IWineDXGIAdapter methods */ - dxgi_adapter_get_ordinal, }; -HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent, UINT ordinal) +struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &dxgi_adapter_vtbl); + return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter1_iface); +} + +HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *parent, UINT ordinal) { struct dxgi_output *output; - adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; + adapter->IDXGIAdapter1_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->parent = parent; adapter->refcount = 1; adapter->ordinal = ordinal; Modified: trunk/reactos/dll/directx/wine/dxgi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/device.c [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -75,9 +75,10 @@ { if (This->child_layer) IUnknown_Release(This->child_layer); EnterCriticalSection(&dxgi_cs); + wined3d_device_uninit_3d(This->wined3d_device); wined3d_device_decref(This->wined3d_device); LeaveCriticalSection(&dxgi_cs); - IWineDXGIFactory_Release(This->factory); + IDXGIFactory1_Release(This->factory); HeapFree(GetProcessHeap(), 0, This); } @@ -143,7 +144,7 @@ wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); LeaveCriticalSection(&dxgi_cs); - return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); + return IDXGIFactory1_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); } static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *iface, @@ -243,18 +244,6 @@ /* IWineDXGIDevice methods */ -static struct wined3d_device * STDMETHODCALLTYPE dxgi_device_get_wined3d_device(IWineDXGIDevice *iface) -{ - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - - TRACE("iface %p\n", iface); - - EnterCriticalSection(&dxgi_cs); - wined3d_device_incref(This->wined3d_device); - LeaveCriticalSection(&dxgi_cs); - return This->wined3d_device; -} - static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { @@ -271,8 +260,7 @@ return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); - if (FAILED(hr)) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -334,7 +322,6 @@ dxgi_device_SetGPUThreadPriority, dxgi_device_GetGPUThreadPriority, /* IWineDXGIAdapter methods */ - dxgi_device_get_wined3d_device, dxgi_device_create_surface, dxgi_device_create_swapchain, }; @@ -343,90 +330,85 @@ IDXGIFactory *factory, IDXGIAdapter *adapter) { struct wined3d_device_parent *wined3d_device_parent; + struct wined3d_swapchain_desc swapchain_desc; IWineDXGIDeviceParent *dxgi_device_parent; - IWineDXGIAdapter *wine_adapter; - UINT adapter_ordinal; - struct wined3d *wined3d; + struct dxgi_adapter *dxgi_adapter; + struct dxgi_factory *dxgi_factory; void *layer_base; HRESULT hr; WINED3DCAPS caps; + if (!(dxgi_factory = unsafe_impl_from_IDXGIFactory1((IDXGIFactory1 *)factory))) + { + WARN("This is not the factory we're looking for.\n"); + return E_FAIL; + } + + if (!(dxgi_adapter = unsafe_impl_from_IDXGIAdapter1((IDXGIAdapter1 *)adapter))) + { + WARN("This is not the adapter we're looking for.\n"); + return E_FAIL; + } + device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; layer_base = device + 1; - hr = layer->create(layer->id, &layer_base, 0, - device, &IID_IUnknown, (void **)&device->child_layer); - if (FAILED(hr)) + if (FAILED(hr = layer->create(layer->id, &layer_base, 0, + device, &IID_IUnknown, (void **)&device->child_layer))) { WARN("Failed to create device, returning %#x.\n", hr); - goto fail; - } - - hr = IDXGIFactory_QueryInterface(factory, &IID_IWineDXGIFactory, (void **)&device->factory); - if (FAILED(hr)) - { - WARN("This is not the factory we're looking for, returning %#x.\n", hr); - goto fail; - } - wined3d = IWineDXGIFactory_get_wined3d(device->factory); - - hr = IDXGIAdapter_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)&wine_adapter); - if (FAILED(hr)) - { - WARN("This is not the adapter we're looking for, returning %#x.\n", hr); - EnterCriticalSection(&dxgi_cs); - wined3d_decref(wined3d); - LeaveCriticalSection(&dxgi_cs); - goto fail; - } - adapter_ordinal = IWineDXGIAdapter_get_ordinal(wine_adapter); - IWineDXGIAdapter_Release(wine_adapter); - - hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, &IID_IWineDXGIDeviceParent, - (void **)&dxgi_device_parent); - if (FAILED(hr)) + return hr; + } + + if (FAILED(hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, + &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent))) { ERR("DXGI device should implement IWineD3DDeviceParent.\n"); - goto fail; - } - + IUnknown_Release(device->child_layer); + return hr; + } wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); + IWineDXGIDeviceParent_Release(dxgi_device_parent); FIXME("Ignoring adapter type.\n"); - hr = wined3d_get_device_caps(wined3d, adapter_ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); + hr = wined3d_get_device_caps(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) { WARN("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); if (SUCCEEDED(hr)) hr = E_FAIL; - goto fail; + IUnknown_Release(device->child_layer); + return hr; } EnterCriticalSection(&dxgi_cs); - hr = wined3d_device_create(wined3d, adapter_ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, - wined3d_device_parent, &device->wined3d_device); - IWineDXGIDeviceParent_Release(dxgi_device_parent); - wined3d_decref(wined3d); + hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, + NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); LeaveCriticalSection(&dxgi_cs); if (FAILED(hr)) { WARN("Failed to create a wined3d device, returning %#x.\n", hr); - goto fail; - } + IUnknown_Release(device->child_layer); + return hr; + } + + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); + swapchain_desc.windowed = TRUE; + if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc))) + { + ERR("Failed to initialize 3D, hr %#x.\n", hr); + wined3d_device_decref(device->wined3d_device); + IUnknown_Release(device->child_layer); + return hr; + } + + device->factory = &dxgi_factory->IDXGIFactory1_iface; + IDXGIFactory1_AddRef(device->factory); return S_OK; - -fail: - if (device->wined3d_device) - { - EnterCriticalSection(&dxgi_cs); - wined3d_device_decref(device->wined3d_device); - LeaveCriticalSection(&dxgi_cs); - } - if (device->factory) IWineDXGIFactory_Release(device->factory); - if (device->child_layer) IUnknown_Release(device->child_layer); - return hr; -} +} Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -86,15 +86,18 @@ /* IDXGIFactory */ struct dxgi_factory { - IWineDXGIFactory IWineDXGIFactory_iface; + IDXGIFactory1 IDXGIFactory1_iface; LONG refcount; struct wined3d *wined3d; UINT adapter_count; - IWineDXGIAdapter **adapters; + IDXGIAdapter1 **adapters; BOOL extended; + HWND device_window; }; HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) DECLSPEC_HIDDEN; +struct dxgi_factory *unsafe_impl_from_IDXGIFactory1(IDXGIFactory1 *iface) DECLSPEC_HIDDEN; /* IDXGIDevice */ struct dxgi_device @@ -103,7 +106,7 @@ IUnknown *child_layer; LONG refcount; struct wined3d_device *wined3d_device; - IWineDXGIFactory *factory; + IDXGIFactory1 *factory; }; HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, @@ -122,14 +125,15 @@ /* IDXGIAdapter */ struct dxgi_adapter { - IWineDXGIAdapter IWineDXGIAdapter_iface; - IWineDXGIFactory *parent; + IDXGIAdapter1 IDXGIAdapter1_iface; + struct dxgi_factory *parent; LONG refcount; UINT ordinal; IDXGIOutput *output; }; -HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent, UINT ordinal) DECLSPEC_HIDDEN; +HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *parent, UINT ordinal) DECLSPEC_HIDDEN; +struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) DECLSPEC_HIDDEN; /* IDXGISwapChain */ struct dxgi_swapchain @@ -150,8 +154,11 @@ IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; + + DXGI_SURFACE_DESC desc; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ Modified: trunk/reactos/dll/directx/wine/dxgi/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/fact… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/factory.c [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -19,75 +19,74 @@ #include "dxgi_private.h" -static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface) -{ - return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface); -} - -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *iface, REFIID riid, void **object) -{ - struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); - - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IDXGIFactory) - || (factory->extended && IsEqualGUID(riid, &IID_IDXGIFactory1)) - || IsEqualGUID(riid, &IID_IWineDXGIFactory)) +#include <assert.h> + +static inline struct dxgi_factory *impl_from_IDXGIFactory1(IDXGIFactory1 *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_factory, IDXGIFactory1_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory1 *iface, REFIID iid, void **out) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if ((factory->extended && IsEqualGUID(iid, &IID_IDXGIFactory1)) + || IsEqualGUID(iid, &IID_IDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - - *object = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface) -{ - struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); - - TRACE("%p increasing refcount to %u\n", This, refcount); +static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IDXGIFactory1 *iface) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); + ULONG refcount = InterlockedIncrement(&factory->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) -{ - struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); - - TRACE("%p decreasing refcount to %u\n", This, refcount); +static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); + ULONG refcount = InterlockedDecrement(&factory->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { UINT i; - for (i = 0; i < This->adapter_count; ++i) + if (factory->device_window) + DestroyWindow(factory->device_window); + for (i = 0; i < factory->adapter_count; ++i) { - IWineDXGIAdapter_Release(This->adapters[i]); + IDXGIAdapter1_Release(factory->adapters[i]); } - HeapFree(GetProcessHeap(), 0, This->adapters); + HeapFree(GetProcessHeap(), 0, factory->adapters); EnterCriticalSection(&dxgi_cs); - wined3d_decref(This->wined3d); + wined3d_decref(factory->wined3d); LeaveCriticalSection(&dxgi_cs); - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, factory); } return refcount; } -/* IDXGIObject methods */ - -static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory1 *iface, REFGUID guid, UINT data_size, const void *data) { FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -95,7 +94,7 @@ return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory1 *iface, REFGUID guid, const IUnknown *object) { FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); @@ -103,7 +102,7 @@ return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory1 *iface, REFGUID guid, UINT *data_size, void *data) { FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -111,23 +110,21 @@ return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, REFIID riid, void **parent) -{ - WARN("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory1 *iface, REFIID iid, void **parent) +{ + WARN("iface %p, iid %s, parent %p.\n", iface, debugstr_guid(iid), parent); *parent = NULL; return E_NOINTERFACE; } -/* IDXGIFactory methods */ - -static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters1(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters1(IDXGIFactory1 *iface, UINT adapter_idx, IDXGIAdapter1 **adapter) { - struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); - - TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); + + TRACE("iface %p, adapter_idx %u, adapter %p.\n", iface, adapter_idx, adapter); if (!adapter) return DXGI_ERROR_INVALID_CALL; @@ -141,27 +138,27 @@ *adapter = (IDXGIAdapter1 *)factory->adapters[adapter_idx]; IDXGIAdapter1_AddRef(*adapter); - TRACE("Returning adapter %p\n", *adapter); + TRACE("Returning adapter %p.\n", *adapter); return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory1 *iface, UINT adapter_idx, IDXGIAdapter **adapter) { - TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); + TRACE("iface %p, adapter_idx %u, adapter %p.\n", iface, adapter_idx, adapter); return dxgi_factory_EnumAdapters1(iface, adapter_idx, (IDXGIAdapter1 **)adapter); } -static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) -{ - FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); - - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) +static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory1 *iface, HWND window, UINT flags) +{ + FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory1 *iface, HWND *window) { FIXME("iface %p, window %p stub!\n", iface, window); @@ -176,14 +173,12 @@ return rational->Numerator; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; - struct wined3d_device *wined3d_device; IWineDXGIDevice *dxgi_device; - UINT count; HRESULT hr; FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); @@ -193,17 +188,6 @@ { ERR("This is not the device we're looking for\n"); return hr; - } - - wined3d_device = IWineDXGIDevice_get_wined3d_device(dxgi_device); - IWineDXGIDevice_Release(dxgi_device); - - count = wined3d_device_get_swapchain_count(wined3d_device); - if (count) - { - FIXME("Only a single swapchain supported.\n"); - wined3d_device_decref(wined3d_device); - return E_FAIL; } if (!desc->OutputWindow) @@ -236,33 +220,20 @@ wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; - hr = wined3d_device_init_3d(wined3d_device, &wined3d_desc); + hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, &wined3d_swapchain); + IWineDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - WARN("Failed to initialize 3D, returning %#x\n", hr); - wined3d_device_decref(wined3d_device); + WARN("Failed to create swapchain, hr %#x.\n", hr); return hr; } - wined3d_swapchain = wined3d_device_get_swapchain(wined3d_device, 0); - wined3d_device_decref(wined3d_device); - if (!wined3d_swapchain) - { - WARN("Failed to get swapchain.\n"); - return E_FAIL; - } - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - /* FIXME? The swapchain is created with refcount 1 by the wined3d device, - * but the wined3d device can't hold a real reference. */ - - TRACE("Created IDXGISwapChain %p\n", *swapchain); - return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFactory *iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory1 *iface, HMODULE swrast, IDXGIAdapter **adapter) { FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); @@ -270,57 +241,45 @@ return E_NOTIMPL; } -static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IWineDXGIFactory *iface) +static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory1 *iface) { FIXME("iface %p stub!\n", iface); return TRUE; } -/* IWineDXGIFactory methods */ - -static struct wined3d * STDMETHODCALLTYPE dxgi_factory_get_wined3d(IWineDXGIFactory *iface) -{ - struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); - - TRACE("iface %p\n", iface); - - EnterCriticalSection(&dxgi_cs); - wined3d_incref(This->wined3d); - LeaveCriticalSection(&dxgi_cs); - return This->wined3d; -} - -static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = -{ - /* IUnknown methods */ +static const struct IDXGIFactory1Vtbl dxgi_factory_vtbl = +{ dxgi_factory_QueryInterface, dxgi_factory_AddRef, dxgi_factory_Release, - /* IDXGIObject methods */ dxgi_factory_SetPrivateData, dxgi_factory_SetPrivateDataInterface, dxgi_factory_GetPrivateData, dxgi_factory_GetParent, - /* IDXGIFactory methods */ dxgi_factory_EnumAdapters, dxgi_factory_MakeWindowAssociation, dxgi_factory_GetWindowAssociation, dxgi_factory_CreateSwapChain, dxgi_factory_CreateSoftwareAdapter, - /* IDXGIFactory1 methods */ dxgi_factory_EnumAdapters1, dxgi_factory_IsCurrent, - /* IWineDXGIFactory methods */ - dxgi_factory_get_wined3d, }; + +struct dxgi_factory *unsafe_impl_from_IDXGIFactory1(IDXGIFactory1 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &dxgi_factory_vtbl); + return CONTAINING_RECORD(iface, struct dxgi_factory, IDXGIFactory1_iface); +} static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) { HRESULT hr; UINT i; - factory->IWineDXGIFactory_iface.lpVtbl = &dxgi_factory_vtbl; + factory->IDXGIFactory1_iface.lpVtbl = &dxgi_factory_vtbl; factory->refcount = 1; EnterCriticalSection(&dxgi_cs); @@ -352,14 +311,13 @@ for (j = 0; j < i; ++j) { - IWineDXGIAdapter_Release(factory->adapters[j]); + IDXGIAdapter1_Release(factory->adapters[j]); } hr = E_OUTOFMEMORY; goto fail; } - hr = dxgi_adapter_init(adapter, &factory->IWineDXGIFactory_iface, i); - if (FAILED(hr)) + if (FAILED(hr = dxgi_adapter_init(adapter, factory, i))) { UINT j; @@ -368,12 +326,12 @@ HeapFree(GetProcessHeap(), 0, adapter); for (j = 0; j < i; ++j) { - IWineDXGIAdapter_Release(factory->adapters[j]); + IDXGIAdapter1_Release(factory->adapters[j]); } goto fail; } - factory->adapters[i] = &adapter->IWineDXGIAdapter_iface; + factory->adapters[i] = &adapter->IDXGIAdapter1_iface; } factory->extended = extended; @@ -405,8 +363,28 @@ TRACE("Created factory %p.\n", object); - hr = IWineDXGIFactory_QueryInterface(&object->IWineDXGIFactory_iface, riid, factory); - IWineDXGIFactory_Release(&object->IWineDXGIFactory_iface); + hr = IDXGIFactory1_QueryInterface(&object->IDXGIFactory1_iface, riid, factory); + IDXGIFactory1_Release(&object->IDXGIFactory1_iface); return hr; } + +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) +{ + EnterCriticalSection(&dxgi_cs); + + if (!factory->device_window) + { + if (!(factory->device_window = CreateWindowA("static", "DXGI device window", + WS_DISABLED, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + TRACE("Created device window %p for factory %p.\n", factory->device_window, factory); + } + + LeaveCriticalSection(&dxgi_cs); + + return factory->device_window; +} Modified: trunk/reactos/dll/directx/wine/dxgi/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/outp… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/output.c [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -135,7 +135,7 @@ return S_OK; } - wined3d = IWineDXGIFactory_get_wined3d(This->adapter->parent); + wined3d = This->adapter->parent->wined3d; wined3d_format = wined3dformat_from_dxgi_format(format); EnterCriticalSection(&dxgi_cs); @@ -144,7 +144,6 @@ if (!desc) { - wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); *mode_count = max_count; return S_OK; @@ -152,7 +151,6 @@ if (max_count > *mode_count) { - wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); return DXGI_ERROR_MORE_DATA; } @@ -169,7 +167,6 @@ if (FAILED(hr)) { WARN("EnumAdapterModes failed, hr %#x.\n", hr); - wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); return hr; } @@ -182,7 +179,6 @@ desc[i].ScanlineOrdering = mode.scanline_ordering; desc[i].Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ } - wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); return S_OK; Modified: trunk/reactos/dll/directx/wine/dxgi/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/surf… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/surface.c [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -149,9 +149,13 @@ /* IDXGISurface methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); - - return E_NOTIMPL; + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = surface->desc; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) @@ -195,13 +199,15 @@ dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; + surface->desc = *desc; return S_OK; } Modified: trunk/reactos/dll/directx/wine/dxgi/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/swap… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/swapchain.c [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -67,19 +67,7 @@ TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - struct wined3d_device *wined3d_device; - HRESULT hr; - - FIXME("Only a single swapchain is supported\n"); - - wined3d_device = wined3d_swapchain_get_device(This->wined3d_swapchain); - hr = wined3d_device_uninit_3d(wined3d_device); - if (FAILED(hr)) - { - ERR("Uninit3D failed, hr %#x\n", hr); - } - } + wined3d_swapchain_decref(This->wined3d_swapchain); return refcount; } Modified: trunk/reactos/include/reactos/wine/winedxgi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/winedxgi.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winedxgi.idl [iso-8859-1] Fri Sep 26 09:40:04 2014 @@ -21,31 +21,10 @@ [ object, local, - uuid(a07ad9ab-fb01-4574-8bfb-0a70a7373f04) -] -interface IWineDXGIFactory : IDXGIFactory1 -{ - struct wined3d *get_wined3d(); -} - -[ - object, - local, - uuid(ab1de34c-2963-4ffd-8493-40f580e510e5) -] -interface IWineDXGIAdapter : IDXGIAdapter1 -{ - UINT get_ordinal(); -} - -[ - object, - local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] interface IWineDXGIDevice : IDXGIDevice { - struct wined3d_device *get_wined3d_device(); HRESULT create_surface( [in] const DXGI_SURFACE_DESC *desc, [in] DXGI_USAGE usage, 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] Fri Sep 26 09:40:04 2014 @@ -42,7 +42,7 @@ reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.27 reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17 -reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.17 reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17

1 0

[akhaldi] 64301: [DPLAYX] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:22:42 2014 New Revision: 64301 URL: http://svn.reactos.org/svn/reactos?rev=64301&view=rev Log: [DPLAYX] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] Fri Sep 26 09:22:42 2014 @@ -2027,6 +2027,7 @@ obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; obj->numIfaces = 1; + obj->msgtid = 0; obj->ref = 0; obj->refA = 0; obj->ref2 = 0; 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] Fri Sep 26 09:22:42 2014 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.27 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.17 -reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.27 reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.17

1 0

[akhaldi] 64300: [DMUSIC] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:19:09 2014 New Revision: 64300 URL: http://svn.reactos.org/svn/reactos?rev=64300&view=rev Log: [DMUSIC] * Sync with Wine 1.7.27. CORE-8540 Added: trunk/reactos/dll/directx/wine/dmusic/dmobject.c (with props) trunk/reactos/dll/directx/wine/dmusic/dmobject.h (with props) Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt trunk/reactos/dll/directx/wine/dmusic/buffer.c trunk/reactos/dll/directx/wine/dmusic/clock.c trunk/reactos/dll/directx/wine/dmusic/collection.c trunk/reactos/dll/directx/wine/dmusic/dmusic.c trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h trunk/reactos/dll/directx/wine/dmusic/download.c trunk/reactos/dll/directx/wine/dmusic/instrument.c trunk/reactos/dll/directx/wine/dmusic/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -7,6 +7,7 @@ buffer.c clock.c collection.c + dmobject.c dmusic.c dmusic_main.c download.c Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/bu… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -55,8 +55,6 @@ TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -70,9 +68,8 @@ if (!ref) { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - - DMUSIC_UnlockModule(); return ref; } @@ -277,7 +274,6 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) { IDirectMusicBufferImpl* dmbuffer; - HRESULT hr; TRACE("(%p, %p)\n", desc, ret_iface); @@ -288,7 +284,7 @@ return E_OUTOFMEMORY; dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; - dmbuffer->ref = 0; /* Will be inited by QueryInterface */ + dmbuffer->ref = 1; if (IsEqualGUID(&desc->guidBufferFormat, &GUID_NULL)) dmbuffer->format = KSDATAFORMAT_SUBTYPE_MIDI; @@ -302,12 +298,8 @@ return E_OUTOFMEMORY; } - hr = IDirectMusicBufferImpl_QueryInterface((LPDIRECTMUSICBUFFER)dmbuffer, &IID_IDirectMusicBuffer, ret_iface); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, dmbuffer->data); - HeapFree(GetProcessHeap(), 0, dmbuffer); - } - - return hr; -} + DMUSIC_LockModule(); + *ret_iface = &dmbuffer->IDirectMusicBuffer_iface; + + return S_OK; +} Modified: trunk/reactos/dll/directx/wine/dmusic/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/cl… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/clock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/clock.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -48,8 +48,6 @@ TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -60,10 +58,10 @@ TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -121,6 +119,7 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) { IReferenceClockImpl* clock; + HRESULT hr; TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); @@ -131,9 +130,13 @@ } clock->IReferenceClock_iface.lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* Will be inited by QueryInterface */ + clock->ref = 1; clock->rtTime = 0; clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); - return IReferenceClockImpl_QueryInterface((IReferenceClock*)clock, riid, ret_iface); + DMUSIC_LockModule(); + hr = IReferenceClockImpl_QueryInterface(&clock->IReferenceClock_iface, riid, ret_iface); + IReferenceClockImpl_Release(&clock->IReferenceClock_iface); + + return hr; } Modified: trunk/reactos/dll/directx/wine/dmusic/collection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/co… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/collection.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/collection.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -24,26 +24,44 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); -} - -static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicObject_iface); -} - -static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStream *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IPersistStream_iface); -} - /***************************************************************************** * IDirectMusicCollectionImpl implementation */ +typedef struct IDirectMusicCollectionImpl { + IDirectMusicCollection IDirectMusicCollection_iface; + struct dmobject dmobj; + LONG ref; + /* IDirectMusicCollectionImpl fields */ + IStream *pStm; /* stream from which we load collection and later instruments */ + LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ + LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ + CHAR *szCopyright; /* FIXME: should probably be placed somewhere else */ + DLSHEADER *pHeader; + /* pool table */ + POOLTABLE *pPoolTable; + POOLCUE *pPoolCues; + /* instruments */ + struct list Instruments; +} IDirectMusicCollectionImpl; + +static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); +} + +static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface) +{ + return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface); +} + +static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, dmobj.IPersistStream_iface); +} + /* IDirectMusicCollectionImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicCollection *iface, + REFIID riid, void **ret_iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); @@ -54,9 +72,9 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicCollection)) *ret_iface = iface; else if (IsEqualIID(riid, &IID_IDirectMusicObject)) - *ret_iface = &This->IDirectMusicObject_iface; + *ret_iface = &This->dmobj.IDirectMusicObject_iface; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->IPersistStream_iface; + *ret_iface = &This->dmobj.IPersistStream_iface; else { WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); @@ -67,35 +85,34 @@ return S_OK; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - DMUSIC_LockModule(); - return ref; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } /* IDirectMusicCollection Interface follows: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD patch, IDirectMusicInstrument** instrument) +static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicCollection *iface, + DWORD patch, IDirectMusicInstrument **instrument) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; @@ -121,7 +138,8 @@ return DMUS_E_INVALIDPATCH; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD index, DWORD* patch, LPWSTR name, DWORD name_length) +static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicCollection *iface, + DWORD index, DWORD *patch, LPWSTR name, DWORD name_length) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DWORD i = 0; @@ -150,96 +168,14 @@ } static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = { - IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface, - IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef, - IDirectMusicCollectionImpl_IDirectMusicCollection_Release, - IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument, - IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument + IDirectMusicCollectionImpl_QueryInterface, + IDirectMusicCollectionImpl_AddRef, + IDirectMusicCollectionImpl_Release, + IDirectMusicCollectionImpl_GetInstrument, + IDirectMusicCollectionImpl_EnumInstrument }; /* IDirectMusicCollectionImpl IDirectMusicObject part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_QueryInterface(LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ret_iface) -{ - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); - return IDirectMusicCollection_QueryInterface(&This->IDirectMusicCollection_iface, riid, ret_iface); -} - -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_AddRef(LPDIRECTMUSICOBJECT iface) -{ - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); - return IDirectMusicCollection_AddRef(&This->IDirectMusicCollection_iface); -} - -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_Release(LPDIRECTMUSICOBJECT iface) -{ - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); - return IDirectMusicCollection_Release(&This->IDirectMusicCollection_iface); -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) -{ - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, pDesc); - - if (!pDesc) - return E_POINTER; - - memcpy (pDesc, This->pDesc, This->pDesc->dwSize); - - return S_OK; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) -{ - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); - HRESULT ret = S_OK; - - - TRACE("(%p, %p)\n", iface, pDesc); - - if (!pDesc) - return E_POINTER; - - if (TRACE_ON(dmusic)) - { - TRACE("Setting descriptor:\n"); - dump_DMUS_OBJECTDESC(pDesc); - } - - /* According to MSDN, we should copy only given values, not whole struct */ - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - This->pDesc->guidObject = pDesc->guidObject; - if (pDesc->dwValidData & DMUS_OBJ_CLASS) - { - pDesc->dwValidData &= ~DMUS_OBJ_CLASS; - ret = S_FALSE; - } - if (pDesc->dwValidData & DMUS_OBJ_NAME) - lstrcpynW(This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) - lstrcpynW(This->pDesc->wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) - lstrcpynW(This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) - This->pDesc->vVersion = pDesc->vVersion; - if (pDesc->dwValidData & DMUS_OBJ_DATE) - This->pDesc->ftDate = pDesc->ftDate; - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - This->pDesc->llMemLength = pDesc->llMemLength; - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); - } - if (pDesc->dwValidData & DMUS_OBJ_STREAM) { - /* according to MSDN, we copy the stream */ - IStream_Clone (pDesc->pStream, &This->pDesc->pStream); - } - - /* add new flags */ - This->pDesc->dwValidData |= pDesc->dwValidData; - - return ret; -} - static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) { ULONG read; @@ -258,9 +194,10 @@ return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM stream, LPDMUS_OBJECTDESC desc) -{ - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) +{ + struct dmobject *This = impl_from_IDirectMusicObject(iface); DMUS_PRIVATE_CHUNK chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -270,7 +207,7 @@ /* FIXME: should this be determined from stream? */ desc->dwValidData |= DMUS_OBJ_CLASS; - desc->guidClass = This->pDesc->guidClass; + desc->guidClass = This->desc.guidClass; hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); if (FAILED(hr)) @@ -446,45 +383,18 @@ return S_OK; } -static const IDirectMusicObjectVtbl DirectMusicCollection_Object_Vtbl = { - IDirectMusicCollectionImpl_IDirectMusicObject_QueryInterface, - IDirectMusicCollectionImpl_IDirectMusicObject_AddRef, - IDirectMusicCollectionImpl_IDirectMusicObject_Release, - IDirectMusicCollectionImpl_IDirectMusicObject_GetDescriptor, - IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor, - IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor +static const IDirectMusicObjectVtbl dmobject_vtbl = { + dmobj_IDirectMusicObject_QueryInterface, + dmobj_IDirectMusicObject_AddRef, + dmobj_IDirectMusicObject_Release, + dmobj_IDirectMusicObject_GetDescriptor, + dmobj_IDirectMusicObject_SetDescriptor, + IDirectMusicObjectImpl_ParseDescriptor }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_QueryInterface(LPPERSISTSTREAM iface, REFIID riid, LPVOID *ret_iface) -{ - IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); - return IDirectMusicCollection_QueryInterface(&This->IDirectMusicCollection_iface, riid, ret_iface); -} - -static ULONG WINAPI IDirectMusicCollectionImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) -{ - IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); - return IDirectMusicCollection_AddRef(&This->IDirectMusicCollection_iface); -} - -static ULONG WINAPI IDirectMusicCollectionImpl_IPersistStream_Release (LPPERSISTSTREAM iface) -{ - IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); - return IDirectMusicCollection_Release(&This->IDirectMusicCollection_iface); -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPERSISTSTREAM iface, CLSID* pClassID) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, + IStream *stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; @@ -534,14 +444,14 @@ } case FOURCC_DLID: { TRACE_(dmfile)(": DLID (GUID) chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read(stream, &This->pDesc->guidObject, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read(stream, &This->dmobj.desc.guidObject, chunk.dwSize, NULL); break; } case FOURCC_VERS: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read(stream, &This->pDesc->vVersion, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read(stream, &This->dmobj.desc.vVersion, chunk.dwSize, NULL); break; } case FOURCC_PTBL: { @@ -569,9 +479,9 @@ case mmioFOURCC('I','N','A','M'): { CHAR szName[DMUS_MAX_NAME]; TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; IStream_Read(stream, szName, chunk.dwSize, NULL); - MultiByteToWideChar(CP_ACP, 0, szName, -1, This->pDesc->wszName, DMUS_MAX_NAME); + MultiByteToWideChar(CP_ACP, 0, szName, -1, This->dmobj.desc.wszName, DMUS_MAX_NAME); if (even_or_odd(chunk.dwSize)) { ListCount[0]++; liMove.QuadPart = 1; @@ -765,13 +675,13 @@ struct list *listEntry; TRACE("*** IDirectMusicCollection (%p) ***\n", &This->IDirectMusicCollection_iface); - if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) - TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); - if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, - (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); - if (This->pDesc->dwValidData & DMUS_OBJ_NAME) - TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_OBJECT) + TRACE(" - GUID = %s\n", debugstr_dmguid(&This->dmobj.desc.guidObject)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_VERSION) + TRACE(" - Version = %i,%i,%i,%i\n", (This->dmobj.desc.vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionMS & 0x0000FFFF, + (This->dmobj.desc.vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionLS & 0x0000FFFF); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_NAME) + TRACE(" - Name = %s\n", debugstr_w(This->dmobj.desc.wszName)); TRACE(" - Collection header:\n"); TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments); @@ -787,29 +697,18 @@ return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Save(LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax(LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) -{ - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { - IDirectMusicCollectionImpl_IPersistStream_QueryInterface, - IDirectMusicCollectionImpl_IPersistStream_AddRef, - IDirectMusicCollectionImpl_IPersistStream_Release, - IDirectMusicCollectionImpl_IPersistStream_GetClassID, - IDirectMusicCollectionImpl_IPersistStream_IsDirty, - IDirectMusicCollectionImpl_IPersistStream_Load, - IDirectMusicCollectionImpl_IPersistStream_Save, - IDirectMusicCollectionImpl_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + unimpl_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; -/* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; @@ -824,15 +723,15 @@ return E_OUTOFMEMORY; obj->IDirectMusicCollection_iface.lpVtbl = &DirectMusicCollection_Collection_Vtbl; - obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicCollection_Object_Vtbl; - obj->IPersistStream_iface.lpVtbl = &DirectMusicCollection_PersistStream_Vtbl; - obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(obj->pDesc); - obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - obj->pDesc->guidClass = CLSID_DirectMusicCollection; obj->ref = 1; + dmobject_init(&obj->dmobj, &CLSID_DirectMusicCollection, + (IUnknown*)&obj->IDirectMusicCollection_iface); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init (&obj->Instruments); + DMUSIC_LockModule(); hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); Added: trunk/reactos/dll/directx/wine/dmusic/dmobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmobject.c (added) +++ trunk/reactos/dll/directx/wine/dmusic/dmobject.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -0,0 +1,164 @@ +/* + * Base IDirectMusicObject Implementation + * + * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2014 Michael Stefaniuc + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dmusic_private.h" + +/* Generic IDirectMusicObject methods */ +static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface) +{ + return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface); +} + +HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid, + void **ret_iface) +{ + struct dmobject *This = impl_from_IDirectMusicObject(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface); +} + +ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface) +{ + struct dmobject *This = impl_from_IDirectMusicObject(iface); + return IUnknown_AddRef(This->outer_unk); +} + +ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface) +{ + struct dmobject *This = impl_from_IDirectMusicObject(iface); + return IUnknown_Release(This->outer_unk); +} + +HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface, + DMUS_OBJECTDESC *desc) +{ + struct dmobject *This = impl_from_IDirectMusicObject(iface); + + TRACE("(%p/%p)->(%p)\n", iface, This, desc); + + if (!desc) + return E_POINTER; + + memcpy(desc, &This->desc, This->desc.dwSize); + + return S_OK; +} + +HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface, + DMUS_OBJECTDESC *desc) +{ + struct dmobject *This = impl_from_IDirectMusicObject(iface); + HRESULT ret = S_OK; + + TRACE("(%p, %p)\n", iface, desc); + + if (!desc) + return E_POINTER; + + /* Immutable property */ + if (desc->dwValidData & DMUS_OBJ_CLASS) + { + desc->dwValidData &= ~DMUS_OBJ_CLASS; + ret = S_FALSE; + } + /* Set only valid fields */ + if (desc->dwValidData & DMUS_OBJ_OBJECT) + This->desc.guidObject = desc->guidObject; + if (desc->dwValidData & DMUS_OBJ_NAME) + lstrcpynW(This->desc.wszName, desc->wszName, DMUS_MAX_NAME); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + lstrcpynW(This->desc.wszCategory, desc->wszCategory, DMUS_MAX_CATEGORY); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + lstrcpynW(This->desc.wszFileName, desc->wszFileName, DMUS_MAX_FILENAME); + if (desc->dwValidData & DMUS_OBJ_VERSION) + This->desc.vVersion = desc->vVersion; + if (desc->dwValidData & DMUS_OBJ_DATE) + This->desc.ftDate = desc->ftDate; + if (desc->dwValidData & DMUS_OBJ_MEMORY) { + This->desc.llMemLength = desc->llMemLength; + memcpy(This->desc.pbMemData, desc->pbMemData, desc->llMemLength); + } + if (desc->dwValidData & DMUS_OBJ_STREAM) + IStream_Clone(desc->pStream, &This->desc.pStream); + + This->desc.dwValidData |= desc->dwValidData; + + return ret; +} + +/* Generic IPersistStream methods */ +static inline struct dmobject *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, struct dmobject, IPersistStream_iface); +} + +HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid, + void **ret_iface) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface); +} + +ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + return IUnknown_AddRef(This->outer_unk); +} + +ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + return IUnknown_Release(This->outer_unk); +} + +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + TRACE("(%p, %p): method not implemented\n", iface, class); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) +{ + TRACE("(%p): method not implemented, always returning S_FALSE\n", iface); + return S_FALSE; +} + +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) +{ + TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) +{ + TRACE("(%p, %p): method not implemented\n", iface, size); + return E_NOTIMPL; +} + + +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) +{ + dmobj->outer_unk = outer_unk; + dmobj->desc.dwSize = sizeof(dmobj->desc); + dmobj->desc.dwValidData = DMUS_OBJ_CLASS; + dmobj->desc.guidClass = *class; +} Propchange: trunk/reactos/dll/directx/wine/dmusic/dmobject.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/dmusic/dmobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmobject.h (added) +++ trunk/reactos/dll/directx/wine/dmusic/dmobject.h [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -0,0 +1,55 @@ +/* + * Base IDirectMusicObject Implementation + * + * Copyright (C) 2014 Michael Stefaniuc + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma once + +struct dmobject { + IDirectMusicObject IDirectMusicObject_iface; + IPersistStream IPersistStream_iface; + IUnknown *outer_unk; + DMUS_OBJECTDESC desc; +}; + +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; + +/* Generic IDirectMusicObject methods */ +HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid, + void **ret_iface) DECLSPEC_HIDDEN; +ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface) DECLSPEC_HIDDEN; +ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface, + DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; +HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface, + DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +/* Generic IPersistStream methods */ +HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid, + void **ret_iface) DECLSPEC_HIDDEN; +ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; +ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; + +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, + CLSID *class) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, + ULARGE_INTEGER *size) DECLSPEC_HIDDEN; Propchange: trunk/reactos/dll/directx/wine/dmusic/dmobject.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -59,8 +59,6 @@ TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -72,12 +70,12 @@ TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { + IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); - } - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -210,8 +208,10 @@ if (guid_clock) *guid_clock = This->pMasterClock->pClockInfo.guidClock; - if (reference_clock) - *reference_clock = (IReferenceClock*)This->pMasterClock; + if (reference_clock) { + *reference_clock = &This->pMasterClock->IReferenceClock_iface; + IReferenceClock_AddRef(*reference_clock); + } return S_OK; } @@ -414,7 +414,7 @@ return E_OUTOFMEMORY; dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->ref = 1; dmusic->pMasterClock = NULL; dmusic->ppPorts = NULL; dmusic->nrofports = 0; @@ -424,14 +424,11 @@ return ret; } + create_system_ports_list(dmusic); + + DMUSIC_LockModule(); ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); - if (FAILED(ret)) { - IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); - HeapFree(GetProcessHeap(), 0, dmusic); - return ret; - } - - create_system_ports_list(dmusic); - - return S_OK; -} + IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface); + + return ret; +} Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -22,7 +22,7 @@ #ifndef __WINE_DMUSIC_PRIVATE_H #define __WINE_DMUSIC_PRIVATE_H -#include <config.h> +#include <wine/config.h> #include <stdarg.h> @@ -42,6 +42,8 @@ #include <wine/list.h> #include <wine/unicode.h> +#include "dmobject.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmusic); /***************************************************************************** @@ -53,7 +55,6 @@ typedef struct IDirectMusicDownloadImpl IDirectMusicDownloadImpl; typedef struct IReferenceClockImpl IReferenceClockImpl; -typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; typedef struct SynthPortImpl SynthPortImpl; @@ -210,30 +211,6 @@ typedef struct _DMUS_PRIVATE_POOLCUE { struct list entry; /* for listing elements */ } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE; - -/***************************************************************************** - * IDirectMusicCollectionImpl implementation structure - */ -struct IDirectMusicCollectionImpl { - /* IUnknown fields */ - IDirectMusicCollection IDirectMusicCollection_iface; - IDirectMusicObject IDirectMusicObject_iface; - IPersistStream IPersistStream_iface; - LONG ref; - - /* IDirectMusicCollectionImpl fields */ - IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ - LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - LPDMUS_OBJECTDESC pDesc; - CHAR* szCopyright; /* FIXME: should probably placed somewhere else */ - LPDLSHEADER pHeader; - /* pool table */ - LPPOOLTABLE pPoolTable; - LPPOOLCUE pPoolCues; - /* instruments */ - struct list Instruments; -}; /***************************************************************************** * IDirectMusicInstrumentImpl implementation structure @@ -296,13 +273,6 @@ const char* name; } guid_info; -/* used for initialising structs (primarily for DMUS_OBJECTDESC) */ -#define DM_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - #define FE(x) { x, #x } #define GE(x) { &x, #x } Modified: trunk/reactos/dll/directx/wine/dmusic/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/do… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/download.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/download.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -50,8 +50,6 @@ TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -62,10 +60,10 @@ TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -100,5 +98,7 @@ download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; download->ref = 1; *ret_iface = download; + + DMUSIC_LockModule(); return S_OK; } Modified: trunk/reactos/dll/directx/wine/dmusic/instrument.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/in… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/instrument.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/instrument.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -60,8 +60,6 @@ TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -81,9 +79,8 @@ HeapFree(GetProcessHeap(), 0, This->articulations->connections); HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); - } - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -123,16 +120,22 @@ /* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicInstrumentImpl* dminst; - + HRESULT hr; + dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl)); if (NULL == dminst) { *ppobj = NULL; return E_OUTOFMEMORY; } dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; - dminst->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, ppobj); + dminst->ref = 1; + + DMUSIC_LockModule(); + hr = IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, + ppobj); + IDirectMusicInstrument_Release(&dminst->IDirectMusicInstrument_iface); + + return hr; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) Modified: trunk/reactos/dll/directx/wine/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] Fri Sep 26 09:19:09 2014 @@ -69,8 +69,6 @@ TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -85,9 +83,8 @@ { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); - } - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -122,6 +119,7 @@ object->ref = 1; *instrument = &object->IDirectMusicDownloadedInstrument_iface; + DMUSIC_LockModule(); return S_OK; } 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] Fri Sep 26 09:19:09 2014 @@ -37,7 +37,7 @@ reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.27 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.17 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.17 reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26

1 0

[akhaldi] 64299: [DINPUT8] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:07:14 2014 New Revision: 64299 URL: http://svn.reactos.org/svn/reactos?rev=64299&view=rev Log: [DINPUT8] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/dinput8/dinput8_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput8/dinput8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput8/d… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput8/dinput8_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput8/dinput8_main.c [iso-8859-1] Fri Sep 26 09:07:14 2014 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#include <wine/config.h> //#include <assert.h> //#include <stdarg.h> //#include <string.h> 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] Fri Sep 26 09:07:14 2014 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.17 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.17 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.17

1 0

[akhaldi] 64298: [DINPUT_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:04:18 2014 New Revision: 64298 URL: http://svn.reactos.org/svn/reactos?rev=64298&view=rev Log: [DINPUT_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/dinput/dinput.c Modified: trunk/rostests/winetests/dinput/dinput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/dinput.c… ============================================================================== --- trunk/rostests/winetests/dinput/dinput.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/dinput.c [iso-8859-1] Fri Sep 26 09:04:18 2014 @@ -608,6 +608,7 @@ "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); } + IDirectInput_Release(pDI); } START_TEST(dinput)

1 0

[akhaldi] 64297: [DINPUT] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:03:58 2014 New Revision: 64297 URL: http://svn.reactos.org/svn/reactos?rev=64297&view=rev Log: [DINPUT] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/dinput/joystick.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] Fri Sep 26 09:03:58 2014 @@ -403,7 +403,6 @@ TRACE("dwSize: %d\n", lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, - lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" : 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] Fri Sep 26 09:03:58 2014 @@ -35,7 +35,7 @@ reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.27 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dinput # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.17 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.17 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.17

1 0

[akhaldi] 64296: [DEVENUM_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 08:56:56 2014 New Revision: 64296 URL: http://svn.reactos.org/svn/reactos?rev=64296&view=rev Log: [DEVENUM_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/devenum/devenum.c Modified: trunk/rostests/winetests/devenum/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/devenum/devenum… ============================================================================== --- trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] (original) +++ trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] Fri Sep 26 08:56:56 2014 @@ -97,7 +97,7 @@ if (SUCCEEDED(hr)) { if (winetest_debug > 1) - trace(" %s\n", wine_dbgstr_w(V_UNION(&var, bstrVal))); + trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); } else

1 0

[akhaldi] 64295: [DEVENUM] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 08:56:44 2014 New Revision: 64295 URL: http://svn.reactos.org/svn/reactos?rev=64295&view=rev Log: [DEVENUM] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/dll/directx/wine/devenum/devenum_main.c trunk/reactos/dll/directx/wine/devenum/mediacatenum.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Fri Sep 26 08:56:44 2014 @@ -756,7 +756,7 @@ VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = i; + V_I4(&var) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var); @@ -764,7 +764,7 @@ pPropBag = NULL; V_VT(&var) = VT_LPWSTR; - V_UNION(&var, bstrVal) = wocaps.szPname; + V_BSTR(&var) = wocaps.szPname; if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); if (pPropBag) @@ -837,7 +837,7 @@ VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = i; + V_I4(&var) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszWaveInID, &var); @@ -845,7 +845,7 @@ pPropBag = NULL; V_VT(&var) = VT_LPWSTR; - V_UNION(&var, bstrVal) = wicaps.szPname; + V_BSTR(&var) = wicaps.szPname; if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); @@ -947,7 +947,7 @@ OLECHAR wszVfwIndex[] = { 'V','F','W','I','n','d','e','x',0 }; VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = i; + V_I4(&var) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) { res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] Fri Sep 26 08:56:44 2014 @@ -33,7 +33,9 @@ BOOL instance; } register_info; +#ifdef __REACTOS__ static void DEVENUM_RegisterQuartz(void); +#endif /*********************************************************************** * Global string constant definitions @@ -96,8 +98,10 @@ res = __wine_register_resources( DEVENUM_hInstance ); +#ifdef __REACTOS__ /* Quartz is needed for IFilterMapper2 */ DEVENUM_RegisterQuartz(); +#endif /*** ActiveMovieFilter Categories ***/ @@ -146,6 +150,8 @@ return __wine_unregister_resources( DEVENUM_hInstance ); } +#ifdef __REACTOS__ + typedef HRESULT (WINAPI *DllRegisterServer_func)(void); /* calls DllRegisterServer() for the Quartz DLL */ @@ -162,3 +168,5 @@ ERR("Failed to register Quartz. Error was 0x%x)\n", hr); } } + +#endif Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/m… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] Fri Sep 26 08:56:44 2014 @@ -146,15 +146,15 @@ switch (V_VT(pVar)) { case VT_LPWSTR: - V_UNION(pVar, bstrVal) = CoTaskMemAlloc(received); - memcpy(V_UNION(pVar, bstrVal), pData, received); + V_BSTR(pVar) = CoTaskMemAlloc(received); + memcpy(V_BSTR(pVar), pData, received); res = S_OK; break; case VT_EMPTY: V_VT(pVar) = VT_BSTR; /* fall through */ case VT_BSTR: - V_UNION(pVar, bstrVal) = SysAllocStringLen(pData, received/sizeof(WCHAR) - 1); + V_BSTR(pVar) = SysAllocStringLen(pData, received/sizeof(WCHAR) - 1); res = S_OK; break; } @@ -168,7 +168,7 @@ /* fall through */ case VT_I4: case VT_UI4: - V_UNION(pVar, ulVal) = *(DWORD *)pData; + V_I4(pVar) = *(DWORD *)pData; res = S_OK; break; } @@ -186,7 +186,7 @@ V_VT(pVar) = VT_ARRAY | VT_UI1; /* fall through */ case VT_ARRAY | VT_UI1: - if (!(V_UNION(pVar, parray) = SafeArrayCreate(VT_UI1, 1, &bound))) + if (!(V_ARRAY(pVar) = SafeArrayCreate(VT_UI1, 1, &bound))) res = E_OUTOFMEMORY; else res = S_OK; @@ -196,12 +196,12 @@ if (res == E_INVALIDARG) break; - res = SafeArrayAccessData(V_UNION(pVar, parray), &pArrayElements); + res = SafeArrayAccessData(V_ARRAY(pVar), &pArrayElements); if (FAILED(res)) break; CopyMemory(pArrayElements, pData, received); - res = SafeArrayUnaccessData(V_UNION(pVar, parray)); + res = SafeArrayUnaccessData(V_ARRAY(pVar)); break; } } @@ -232,15 +232,15 @@ { case VT_BSTR: case VT_LPWSTR: - TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); - lpData = V_UNION(pVar, bstrVal); + TRACE("writing %s\n", debugstr_w(V_BSTR(pVar))); + lpData = V_BSTR(pVar); dwType = REG_SZ; - cbData = (lstrlenW(V_UNION(pVar, bstrVal)) + 1) * sizeof(WCHAR); + cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR); break; case VT_I4: case VT_UI4: - TRACE("writing %u\n", V_UNION(pVar, ulVal)); - lpData = &V_UNION(pVar, ulVal); + TRACE("writing %u\n", V_UI4(pVar)); + lpData = &V_UI4(pVar); dwType = REG_DWORD; cbData = sizeof(DWORD); break; @@ -249,11 +249,11 @@ LONG lUbound = 0; LONG lLbound = 0; dwType = REG_BINARY; - res = SafeArrayGetLBound(V_UNION(pVar, parray), 1, &lLbound); - res = SafeArrayGetUBound(V_UNION(pVar, parray), 1, &lUbound); + res = SafeArrayGetLBound(V_ARRAY(pVar), 1, &lLbound); + res = SafeArrayGetUBound(V_ARRAY(pVar), 1, &lUbound); cbData = (lUbound - lLbound + 1) /* * sizeof(BYTE)*/; TRACE("cbData: %d\n", cbData); - res = SafeArrayAccessData(V_UNION(pVar, parray), &lpData); + res = SafeArrayAccessData(V_ARRAY(pVar), &lpData); break; } default: @@ -267,7 +267,7 @@ res = E_FAIL; if (V_VT(pVar) & VT_ARRAY) - res = SafeArrayUnaccessData(V_UNION(pVar, parray)); + res = SafeArrayUnaccessData(V_ARRAY(pVar)); return res; } @@ -418,8 +418,8 @@ } if (SUCCEEDED(res)) { - res = CLSIDFromString(V_UNION(&var,bstrVal), &clsID); - CoTaskMemFree(V_UNION(&var, bstrVal)); + res = CLSIDFromString(V_BSTR(&var), &clsID); + CoTaskMemFree(V_BSTR(&var)); } if (SUCCEEDED(res)) { 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] Fri Sep 26 08:56:44 2014 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.27 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 -reactos/dll/directx/wine/devenum # Synced to Wine-1.7.17 +reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.17 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.17 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.17

1 0

[pschweitzer] 64294: [NTFS] - Divert NtfsReadSectors() into NtfsReadDisk() - Reimplement NtfsReadSectors() using NtfsReadDisk()
by pschweitzer＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: pschweitzer Date: Fri Sep 26 06:41:51 2014 New Revision: 64294 URL: http://svn.reactos.org/svn/reactos?rev=64294&view=rev Log: [NTFS] - Divert NtfsReadSectors() into NtfsReadDisk() - Reimplement NtfsReadSectors() using NtfsReadDisk() Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/b… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] Fri Sep 26 06:41:51 2014 @@ -33,39 +33,32 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN ULONG SectorSize, - IN OUT PUCHAR Buffer, - IN BOOLEAN Override) +NtfsReadDisk(IN PDEVICE_OBJECT DeviceObject, + IN LONGLONG StartingOffset, + IN ULONG Length, + IN OUT PUCHAR Buffer, + IN BOOLEAN Override) { PIO_STACK_LOCATION Stack; IO_STATUS_BLOCK IoStatus; LARGE_INTEGER Offset; - ULONG BlockSize; KEVENT Event; PIRP Irp; NTSTATUS Status; + + DPRINT("NtfsReadDisk(%p, %I64x, %u, %p, %d)\n", DeviceObject, StartingOffset, Length, Buffer, Override); KeInitializeEvent(&Event, NotificationEvent, FALSE); - Offset.QuadPart = (LONGLONG)DiskSector * (LONGLONG)SectorSize; - BlockSize = SectorCount * SectorSize; - - DPRINT("NtfsReadSectors(DeviceObject %p, DiskSector %d, Buffer %p)\n", - DeviceObject, DiskSector, Buffer); - DPRINT("Offset %I64x BlockSize %ld\n", - Offset.QuadPart, - BlockSize); + Offset.QuadPart = StartingOffset; DPRINT("Building synchronous FSD Request...\n"); Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, DeviceObject, Buffer, - BlockSize, + Length, &Offset, &Event, &IoStatus); @@ -93,9 +86,26 @@ Status = IoStatus.Status; } - DPRINT("NtfsReadSectors() done (Status %x)\n", Status); + DPRINT("NtfsReadDisk() done (Status %x)\n", Status); return Status; +} + +NTSTATUS +NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject, + IN ULONG DiskSector, + IN ULONG SectorCount, + IN ULONG SectorSize, + IN OUT PUCHAR Buffer, + IN BOOLEAN Override) +{ + LONGLONG Offset; + ULONG BlockSize; + + Offset = (LONGLONG)DiskSector * (LONGLONG)SectorSize; + BlockSize = SectorCount * SectorSize; + + return NtfsReadDisk(DeviceObject, Offset, BlockSize, Buffer, Override); } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Fri Sep 26 06:41:51 2014 @@ -386,6 +386,13 @@ /* blockdev.c */ NTSTATUS +NtfsReadDisk(IN PDEVICE_OBJECT DeviceObject, + IN LONGLONG StartingOffset, + IN ULONG Length, + IN OUT PUCHAR Buffer, + IN BOOLEAN Override); + +NTSTATUS NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject, IN ULONG DiskSector, IN ULONG SectorCount,

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