October 2008 - Wine-Commits

Henri Verbeet : dxgi: Implement CreateDXGIFactory().
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 9fbd676b275a530061d420f433d91ac63f5a42a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbd676b275a530061d420f43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 21 15:06:58 2008 +0200 dxgi: Implement CreateDXGIFactory(). --- dlls/dxgi/Makefile.in | 5 +- dlls/dxgi/dxgi.spec | 2 +- dlls/dxgi/dxgi_main.c | 25 +++++++ dlls/dxgi/dxgi_private.h | 8 ++ dlls/dxgi/factory.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 199 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index fde4b40..77b2b97 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -4,10 +4,11 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dxgi.dll IMPORTLIB = dxgi -IMPORTS = kernel32 +IMPORTS = dxguid uuid kernel32 C_SRCS = \ - dxgi_main.c + dxgi_main.c \ + factory.c RC_SRCS = version.rc diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index df2b403..1c5069d 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1 +1 @@ -@ stub CreateDXGIFactory +@ stdcall CreateDXGIFactory(ptr ptr) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index e99ddc7..44b4eee 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -37,3 +37,28 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } + +HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) +{ + struct dxgi_factory *object; + HRESULT hr; + + FIXME("riid %s, factory %p partial stub!\n", debugstr_guid(riid), factory); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate DXGI factory object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &dxgi_factory_vtbl; + object->refcount = 1; + + TRACE("Created IDXGIFactory %p\n", object); + + hr = IDXGIFactory_QueryInterface((IDXGIFactory *)object, riid, factory); + IDXGIFactory_Release((IDXGIFactory *)object); + + return hr; +} diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a03659e..0ca3b41 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -28,4 +28,12 @@ #include "dxgi.h" +/* IDXGIFactory */ +extern const struct IDXGIFactoryVtbl dxgi_factory_vtbl; +struct dxgi_factory +{ + const struct IDXGIFactoryVtbl *vtbl; + LONG refcount; +}; + #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c new file mode 100644 index 0000000..d9593e3 --- /dev/null +++ b/dlls/dxgi/factory.c @@ -0,0 +1,162 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +/* IUnknown methods */ + +HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory* 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_IDXGIFactory)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IDXGIFactory* iface) +{ + struct dxgi_factory *This = (struct dxgi_factory *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory* iface) +{ + struct dxgi_factory *This = (struct dxgi_factory *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* IDXGIObject methods */ + +HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory* 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); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory* iface, + REFGUID guid, const IUnknown *object) +{ + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory* 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); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory* iface, REFIID riid, void **parent) +{ + FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + + return E_NOTIMPL; +} + +/* IDXGIFactory methods */ + +HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory* iface, UINT adapter_idx, IDXGIAdapter **adapter) +{ + FIXME("iface %p, adapter_idx %u, adapter %p stub!\n", iface, adapter_idx, adapter); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory* iface, HWND window, UINT flags) +{ + FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory* iface, HWND *window) +{ + FIXME("iface %p, window %p stub!\n", iface, window); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory* iface, + IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) +{ + FIXME("iface %p, device %p, desc %p, swapchain %p stub!\n", iface, device, desc, swapchain); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory* iface, + HMODULE swrast, IDXGIAdapter **adapter) +{ + FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); + + return E_NOTIMPL; +} + +const struct IDXGIFactoryVtbl dxgi_factory_vtbl = +{ + /* IUnknown methods */ + 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, +};

1 0

Henri Verbeet : dxgi: Add a dxgi dll.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 9e376213b352a0ae65b7f6f9e1569558be675f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e376213b352a0ae65b7f6f9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 21 15:06:58 2008 +0200 dxgi: Add a dxgi dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 5 +++++ dlls/dxgi/Makefile.in | 16 ++++++++++++++++ dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 31 +++++++++++++++++++++++++++++++ dlls/dxgi/version.rc | 26 ++++++++++++++++++++++++++ 8 files changed, 128 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6c745f2..844ae89 100755 --- a/configure +++ b/configure @@ -23400,6 +23400,14 @@ dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxerr9/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/dxgi/Makefile" +test "x$enable_dxgi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dxgi" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/dxgi/Makefile: dlls/dxgi/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/dxgi/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxguid/Makefile" test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ dxguid" @@ -26672,6 +26680,7 @@ do "dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;; "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;; "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; + "dlls/dxgi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;; "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0bbe496..d5d3cab 100644 --- a/configure.ac +++ b/configure.ac @@ -1834,6 +1834,7 @@ WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxgi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 12f6584..69d30b9 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -218,6 +218,7 @@ IMPORT_LIBS = \ dpnet/libdpnet.$(IMPLIBEXT) \ dsound/libdsound.$(IMPLIBEXT) \ dwmapi/libdwmapi.$(IMPLIBEXT) \ + dxgi/libdxgi.$(IMPLIBEXT) \ gdi32/libgdi32.$(IMPLIBEXT) \ gdiplus/libgdiplus.$(IMPLIBEXT) \ glu32/libglu32.$(IMPLIBEXT) \ @@ -355,6 +356,7 @@ CROSS_IMPLIBS = \ dpnet/libdpnet.a \ dsound/libdsound.a \ dwmapi/libdwmapi.a \ + dxgi/libdxgi.a \ gdi32/libgdi32.a \ gdiplus/libgdiplus.a \ glu32/libglu32.a \ @@ -581,6 +583,9 @@ dsound/libdsound.def dsound/libdsound.a: dsound/dsound.spec $(WINEBUILD) dwmapi/libdwmapi.def dwmapi/libdwmapi.a: dwmapi/dwmapi.spec $(WINEBUILD) @cd dwmapi && $(MAKE) `basename $@` +dxgi/libdxgi.def dxgi/libdxgi.a: dxgi/dxgi.spec $(WINEBUILD) + @cd dxgi && $(MAKE) `basename $@` + gdi32/libgdi32.def gdi32/libgdi32.a: gdi32/gdi32.spec $(WINEBUILD) @cd gdi32 && $(MAKE) `basename $@` diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in new file mode 100644 index 0000000..fde4b40 --- /dev/null +++ b/dlls/dxgi/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dxgi.dll +IMPORTLIB = dxgi +IMPORTS = kernel32 + +C_SRCS = \ + dxgi_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec new file mode 100644 index 0000000..df2b403 --- /dev/null +++ b/dlls/dxgi/dxgi.spec @@ -0,0 +1 @@ +@ stub CreateDXGIFactory diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c new file mode 100644 index 0000000..e99ddc7 --- /dev/null +++ b/dlls/dxgi/dxgi_main.c @@ -0,0 +1,39 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason %u\n", fdwReason); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h new file mode 100644 index 0000000..a03659e --- /dev/null +++ b/dlls/dxgi/dxgi_private.h @@ -0,0 +1,31 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DXGI_PRIVATE_H +#define __WINE_DXGI_PRIVATE_H + +#include "wine/debug.h" + +#define COBJMACROS +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" + +#include "dxgi.h" + +#endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/version.rc b/dlls/dxgi/version.rc new file mode 100644 index 0000000..bd51eb8 --- /dev/null +++ b/dlls/dxgi/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DXGI" +#define WINE_FILENAME_STR "dxgi.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : d3d10: Add an initial implementation of D3D10CreateDevice() .
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 39cd9f74480e8d51e05e0b00a385d41c18dd28ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=39cd9f74480e8d51e05e0b00a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 21 15:06:58 2008 +0200 d3d10: Add an initial implementation of D3D10CreateDevice(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 24 ++++++++++++++++++++++++ include/d3d10misc.h | 3 +++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index f15453a..0b59175 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,7 +1,7 @@ @ stub D3D10CompileEffectFromMemory @ stub D3D10CompileShader @ stub D3D10CreateBlob -@ stub D3D10CreateDevice +@ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stub D3D10CreateDeviceAndSwapChain @ stub D3D10CreateEffectFromMemory @ stub D3D10CreateEffectPoolFromMemory diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index c0a65f4..6ed1756 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -40,3 +40,27 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } return TRUE; } + +HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) +{ + struct d3d10_device *object; + + FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p partial stub!\n", + adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, device); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D device object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_device_vtbl; + object->refcount = 1; + *device = (ID3D10Device *)object; + + TRACE("Created ID3D10Device %p\n", object); + + return S_OK; +} diff --git a/include/d3d10misc.h b/include/d3d10misc.h index 69b8069..00cf153 100644 --- a/include/d3d10misc.h +++ b/include/d3d10misc.h @@ -32,6 +32,9 @@ typedef enum D3D10_DRIVER_TYPE { D3D10_DRIVER_TYPE_SOFTWARE = 3, } D3D10_DRIVER_TYPE; +HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device); + #ifdef __cplusplus } #endif

1 0

Maarten Lankhorst : quartz: Implement dynamic format changing in directsound renderer.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: b2d20154fa6c644c88af0c08ed4d86170f0df5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d20154fa6c644c88af0c08e… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Tue Oct 21 12:50:36 2008 +0200 quartz: Implement dynamic format changing in directsound renderer. --- dlls/quartz/dsoundrender.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index aae7e68..a92e866 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -238,6 +238,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; + AM_MEDIA_TYPE *amt; TRACE("%p %p\n", iface, pSample); @@ -259,6 +260,39 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) return VFW_E_WRONG_STATE; } + if (IMediaSample_GetMediaType(pSample, &amt) == S_OK) + { + AM_MEDIA_TYPE *orig = &This->pInputPin->pin.mtCurrent; + WAVEFORMATEX *origfmt = (WAVEFORMATEX *)orig->pbFormat; + WAVEFORMATEX *newfmt = (WAVEFORMATEX *)amt->pbFormat; + + if (origfmt->wFormatTag == newfmt->wFormatTag && + origfmt->nChannels == newfmt->nChannels && + origfmt->nBlockAlign == newfmt->nBlockAlign && + origfmt->wBitsPerSample == newfmt->wBitsPerSample && + origfmt->cbSize == newfmt->cbSize) + { + if (origfmt->nSamplesPerSec != newfmt->nSamplesPerSec) + { + hr = IDirectSoundBuffer_SetFrequency(This->dsbuffer, + newfmt->nSamplesPerSec); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->csFilter); + return VFW_E_TYPE_NOT_ACCEPTED; + } + FreeMediaType(orig); + CopyMediaType(orig, amt); + IMediaSample_SetMediaType(pSample, NULL); + } + } + else + { + LeaveCriticalSection(&This->csFilter); + return VFW_E_TYPE_NOT_ACCEPTED; + } + } + SetEvent(This->state_change); hr = IMediaSample_GetPointer(pSample, &pbSrcStream);

1 0

Maarten Lankhorst : quartz: Fix ACMWrapper to allow mono channels too.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: ca0db5880800b7cff77c0f525d63780a8165b9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0db5880800b7cff77c0f525… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Tue Oct 21 12:50:12 2008 +0200 quartz: Fix ACMWrapper to allow mono channels too. --- dlls/quartz/acmwrapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index f395f82..3c6c28e 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -262,7 +262,7 @@ static HRESULT ACMWrapper_ConnectInput(InputPin *pin, const AM_MEDIA_TYPE * pmt) This->pWfOut = (WAVEFORMATEX*)outpmt->pbFormat; This->pWfOut->wFormatTag = WAVE_FORMAT_PCM; This->pWfOut->wBitsPerSample = 16; - This->pWfOut->nBlockAlign = 4; + This->pWfOut->nBlockAlign = This->pWfOut->wBitsPerSample * This->pWfOut->nChannels / 8; This->pWfOut->cbSize = 0; This->pWfOut->nAvgBytesPerSec = This->pWfOut->nChannels * This->pWfOut->nSamplesPerSec * (This->pWfOut->wBitsPerSample/8);

1 0

Huw Davies : winspool.drv: The fourth parameter of DeviceCapabilitiesW should be an output ptr.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: fca028c8da7cf4a9fb2d3e73d65f0552e3882211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca028c8da7cf4a9fb2d3e73d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 21 11:45:05 2008 +0100 winspool.drv: The fourth parameter of DeviceCapabilitiesW should be an output ptr. --- dlls/winspool.drv/winspool.drv.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index f5994b8..ce29a72 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -96,7 +96,7 @@ @ stub DevQueryPrint @ stdcall DeviceCapabilities(str str long ptr ptr) DeviceCapabilitiesA @ stdcall DeviceCapabilitiesA(str str long ptr ptr) -@ stdcall DeviceCapabilitiesW(wstr wstr long wstr ptr) +@ stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) @ stub DeviceMode @ stub DocumentEvent @ stdcall DocumentPropertiesA(long long ptr ptr ptr long)

1 0

Alexandre Julliard : mountmgr: Reuse create_disk_device to create the initial harddisk0 device.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: b4b49a7d75424a272f30c8b8e76b77df02167c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b49a7d75424a272f30c8b8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 16:11:51 2008 +0200 mountmgr: Reuse create_disk_device to create the initial harddisk0 device. --- dlls/mountmgr.sys/device.c | 29 +++-------------------------- 1 files changed, 3 insertions(+), 26 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 4a1a795..dd98c16 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -579,38 +579,15 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) /* driver entry point for the harddisk driver */ NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { - static const WCHAR harddisk0W[] = {'\\','D','e','v','i','c','e', - '\\','H','a','r','d','d','i','s','k','0',0}; - static const WCHAR physdrive0W[] = {'\\','?','?','\\','P','h','y','s','i','c','a','l','D','r','i','v','e','0',0}; - - UNICODE_STRING nameW, linkW; - DEVICE_OBJECT *device; - NTSTATUS status; struct dos_drive *drive; harddisk_driver = driver; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = harddisk_ioctl; - RtlInitUnicodeString( &nameW, harddisk0W ); - RtlInitUnicodeString( &linkW, physdrive0W ); - if (!(status = IoCreateDevice( driver, sizeof(*drive), &nameW, 0, 0, FALSE, &device ))) - status = IoCreateSymbolicLink( &linkW, &nameW ); - if (status) - { - FIXME( "failed to create device error %x\n", status ); - return status; - } - drive = device->DeviceExtension; - drive->drive = -1; - drive->udi = NULL; - drive->type = DRIVE_FIXED; - drive->name = nameW; - drive->device = device; - drive->devnum.DeviceType = FILE_DEVICE_DISK; - drive->devnum.DeviceNumber = 0; - drive->devnum.PartitionNumber = 0; + /* create a harddisk0 device that isn't assigned to any drive */ + create_disk_device( "harddisk0 placeholder", DRIVE_FIXED, &drive ); create_drive_devices(); - return status; + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : mountmgr: Create a PhysicalDrive symlink for all harddisk devices.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: bb13bbe13d6f76330c9a726bf69ac005d7b094cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb13bbe13d6f76330c9a726bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 16:08:51 2008 +0200 mountmgr: Create a PhysicalDrive symlink for all harddisk devices. --- dlls/mountmgr.sys/device.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 21e0b2c..4a1a795 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -63,6 +63,7 @@ struct dos_drive DWORD type; /* drive type */ DEVICE_OBJECT *device; /* disk device allocated for this drive */ UNICODE_STRING name; /* device name */ + UNICODE_STRING symlink; /* device symlink if any */ STORAGE_DEVICE_NUMBER devnum; /* device number info */ struct mount_point *dosdev; /* DosDevices mount point */ struct mount_point *volume; /* Volume{xxx} mount point */ @@ -139,6 +140,7 @@ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_driv static const WCHAR harddiskW[] = {'\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','%','u',0}; static const WCHAR cdromW[] = {'\\','D','e','v','i','c','e','\\','C','d','R','o','m','%','u',0}; static const WCHAR floppyW[] = {'\\','D','e','v','i','c','e','\\','F','l','o','p','p','y','%','u',0}; + static const WCHAR physdriveW[] = {'\\','?','?','\\','P','h','y','s','i','c','a','l','D','r','i','v','e','%','u',0}; UINT i, first = 0; NTSTATUS status = 0; @@ -185,6 +187,7 @@ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_driv drive->dosdev = NULL; drive->volume = NULL; drive->unix_mount = NULL; + drive->symlink.Buffer = NULL; if (udi) { if (!(drive->udi = HeapAlloc( GetProcessHeap(), 0, strlen(udi)+1 ))) @@ -212,6 +215,15 @@ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_driv drive->devnum.DeviceType = FILE_DEVICE_DISK; if (udi) { + UNICODE_STRING symlink; + + symlink.MaximumLength = sizeof(physdriveW) + 10 * sizeof(WCHAR); + if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength))) + { + sprintfW( symlink.Buffer, physdriveW, i ); + symlink.Length = strlenW(symlink.Buffer) * sizeof(WCHAR); + if (!IoCreateSymbolicLink( &symlink, &name )) drive->symlink = symlink; + } drive->devnum.DeviceNumber = i; drive->devnum.PartitionNumber = 0; } @@ -241,6 +253,11 @@ static void delete_disk_device( struct dos_drive *drive ) list_remove( &drive->entry ); if (drive->dosdev) delete_mount_point( drive->dosdev ); if (drive->volume) delete_mount_point( drive->volume ); + if (drive->symlink.Buffer) + { + IoDeleteSymbolicLink( &drive->symlink ); + RtlFreeUnicodeString( &drive->symlink ); + } RtlFreeHeap( GetProcessHeap(), 0, drive->unix_mount ); RtlFreeHeap( GetProcessHeap(), 0, drive->udi ); RtlFreeUnicodeString( &drive->name );

1 0

Alexandre Julliard : mountmgr: Create a new harddisk device for dynamic harddisk drives.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 5ea9d65c55ed1ae227ab603c0b66ed579c739dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea9d65c55ed1ae227ab603c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:52:47 2008 +0200 mountmgr: Create a new harddisk device for dynamic harddisk drives. --- dlls/mountmgr.sys/device.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8b68608..21e0b2c 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -134,8 +134,9 @@ static void send_notify( int drive, int code ) /* create the disk device for a given drive */ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_drive **drive_ret ) { - static const WCHAR harddiskW[] = {'\\','D','e','v','i','c','e', - '\\','H','a','r','d','d','i','s','k','V','o','l','u','m','e','%','u',0}; + static const WCHAR harddiskvolW[] = {'\\','D','e','v','i','c','e', + '\\','H','a','r','d','d','i','s','k','V','o','l','u','m','e','%','u',0}; + static const WCHAR harddiskW[] = {'\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','%','u',0}; static const WCHAR cdromW[] = {'\\','D','e','v','i','c','e','\\','C','d','R','o','m','%','u',0}; static const WCHAR floppyW[] = {'\\','D','e','v','i','c','e','\\','F','l','o','p','p','y','%','u',0}; @@ -156,8 +157,12 @@ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_driv break; case DRIVE_FIXED: default: /* FIXME */ - format = harddiskW; - first = 1; /* harddisk volumes start counting from 1 */ + if (udi) format = harddiskW; + else + { + format = harddiskvolW; + first = 1; /* harddisk volumes start counting from 1 */ + } break; } @@ -205,8 +210,16 @@ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_driv case DRIVE_FIXED: default: /* FIXME */ drive->devnum.DeviceType = FILE_DEVICE_DISK; - drive->devnum.DeviceNumber = 0; - drive->devnum.PartitionNumber = i; + if (udi) + { + drive->devnum.DeviceNumber = i; + drive->devnum.PartitionNumber = 0; + } + else + { + drive->devnum.DeviceNumber = 0; + drive->devnum.PartitionNumber = i; + } break; } list_add_tail( &drives_list, &drive->entry );

1 0

Alexandre Julliard : mountmgr: Return the drive pointer from get_dosdevices_path().
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: e6a47f1e8cc087cc17889adc06c6e5b4ae33dd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a47f1e8cc087cc17889adc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:20:42 2008 +0200 mountmgr: Return the drive pointer from get_dosdevices_path(). --- dlls/mountmgr.sys/device.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 2807f60..2c2b6c1 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -70,7 +70,7 @@ static struct list drives_list = LIST_INIT(drives_list); static DRIVER_OBJECT *harddisk_driver; -static char *get_dosdevices_path(void) +static char *get_dosdevices_path( char **drive ) { const char *config_dir = wine_get_config_dir(); size_t len = strlen(config_dir) + sizeof("/dosdevices/a::"); @@ -79,6 +79,7 @@ static char *get_dosdevices_path(void) { strcpy( path, config_dir ); strcat( path, "/dosdevices/a::" ); + *drive = path + len - 4; } return path; } @@ -270,8 +271,7 @@ static int add_drive( const char *device, DWORD type ) if (stat( device, &dev_st ) == -1 || !is_valid_device( &dev_st )) return -1; - if (!(path = get_dosdevices_path())) return -1; - p = path + strlen(path) - 3; + if (!(path = get_dosdevices_path( &p ))) return -1; memset( in_use, 0, sizeof(in_use) ); @@ -332,8 +332,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi char *path, *p; BOOL modified = FALSE; - if (!(path = get_dosdevices_path())) return FALSE; - p = path + strlen(path) - 3; + if (!(path = get_dosdevices_path( &p ))) return FALSE; p[0] = 'a' + drive->drive; p[2] = 0; @@ -372,8 +371,7 @@ static void create_drive_devices(void) struct dos_drive *drive; unsigned int i; - if (!(path = get_dosdevices_path())) return; - p = path + strlen(path) - 3; + if (!(path = get_dosdevices_path( &p ))) return; for (i = 0; i < MAX_DOS_DRIVES; i++) {

1 0