wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexandre Julliard : aclocal.m4: Perform a more exhaustive search of the possible naming combinations for Mingw tools .
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: a91fb219a99f236a576454205660d77c5908e27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91fb219a99f236a576454205… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 7 15:36:09 2009 +0100 aclocal.m4: Perform a more exhaustive search of the possible naming combinations for Mingw tools. --- aclocal.m4 | 15 ++++++++++----- configure | 30 +++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f7beb5d..ce3941e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,11 +140,16 @@ dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], -[AC_CHECK_PROGS([$1], - m4_foreach([ac_wine_prefix], - [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, i686-pc-mingw32], - [ac_wine_prefix-$2 ]), - [$3],[$4])]) +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; + x86_64) + ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;; + *) + ac_prefix_list="" ;; +esac +AC_CHECK_PROGS([$1],[$ac_prefix_list],[$3],[$4])]) dnl **** Create nonexistent directories from config.status **** diff --git a/configure b/configure index 4f52528..785c7b1 100755 --- a/configure +++ b/configure @@ -6948,7 +6948,15 @@ fi if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then - for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-pc-mingw32-gcc + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + x86_64) + ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;; + *) + ac_prefix_list="" ;; +esac +for ac_prog in $ac_prefix_list do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6991,7 +6999,15 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool i686-pc-mingw32-dlltool + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-pc-mingw32-dlltool i586-pc-mingw32-dlltool i486-pc-mingw32-dlltool i386-pc-mingw32-dlltool i686-mingw32msvc-dlltool i586-mingw32msvc-dlltool i486-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool " ;; + x86_64) + ac_prefix_list="x86_64-pc-mingw32-dlltool x86_64-w64-mingw32-dlltool " ;; + *) + ac_prefix_list="" ;; +esac +for ac_prog in $ac_prefix_list do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7034,7 +7050,15 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar i686-pc-mingw32-ar + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-pc-mingw32-ar i586-pc-mingw32-ar i486-pc-mingw32-ar i386-pc-mingw32-ar i686-mingw32msvc-ar i586-mingw32msvc-ar i486-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar " ;; + x86_64) + ac_prefix_list="x86_64-pc-mingw32-ar x86_64-w64-mingw32-ar " ;; + *) + ac_prefix_list="" ;; +esac +for ac_prog in $ac_prefix_list do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Nathan Gallaher : ole32: Fix invalid memory access in storage32.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: de239d86fdf61fe1e09bde2aed4b4eb8cb45d49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de239d86fdf61fe1e09bde2ae… Author: Nathan Gallaher <ngallaher(a)deepthought.org> Date: Sun Dec 6 08:30:06 2009 -0500 ole32: Fix invalid memory access in storage32. --- dlls/ole32/storage32.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f54bfdf..3263221 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2280,9 +2280,7 @@ static HRESULT StorageImpl_Construct( goto end; } strcpyW(This->pwcsName, pwcsName); - - memcpy(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN-1); - This->base.filename[DIRENTRY_NAME_BUFFER_LEN-1] = 0; + lstrcpynW(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN); } /*

1 0

Paul Chitescu : services.exe: Reduce Registry access to KEY_READ or MAXIMUM_ALLOWED wherever possible.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 910b191574f5dbcb844e6f9352ce66547075164b URL: http://source.winehq.org/git/wine.git/?a=commit;h=910b191574f5dbcb844e6f935… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Dec 4 17:58:20 2009 +0200 services.exe: Reduce Registry access to KEY_READ or MAXIMUM_ALLOWED wherever possible. --- programs/services/rpc.c | 39 ++++++++++++++++++++++++--------------- programs/services/services.c | 4 ++-- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 6327c9a..c647cc8 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -84,6 +84,21 @@ struct sc_lock struct scmdatabase *db; }; +static void free_config_strings(QUERY_SERVICE_CONFIGW *old_cfg, QUERY_SERVICE_CONFIGW *new_cfg) +{ + if (old_cfg->lpBinaryPathName != new_cfg->lpBinaryPathName) + HeapFree(GetProcessHeap(), 0, old_cfg->lpBinaryPathName); + + if (old_cfg->lpLoadOrderGroup != new_cfg->lpLoadOrderGroup) + HeapFree(GetProcessHeap(), 0, old_cfg->lpLoadOrderGroup); + + if (old_cfg->lpServiceStartName != new_cfg->lpServiceStartName) + HeapFree(GetProcessHeap(), 0, old_cfg->lpServiceStartName); + + if (old_cfg->lpDisplayName != new_cfg->lpDisplayName) + HeapFree(GetProcessHeap(), 0, old_cfg->lpDisplayName); +} + /* Check if the given handle is of the required type and allows the requested access. */ static DWORD validate_context_handle(SC_RPC_HANDLE handle, DWORD type, DWORD needed_access, struct sc_handle **out_hdr) { @@ -546,34 +561,28 @@ DWORD svcctl_ChangeServiceConfigW( /* configuration OK. The strings needs to be duplicated */ if (lpBinaryPathName != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpBinaryPathName); new_entry.config.lpBinaryPathName = strdupW(lpBinaryPathName); - } if (lpLoadOrderGroup != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpLoadOrderGroup); new_entry.config.lpLoadOrderGroup = strdupW(lpLoadOrderGroup); - } if (lpServiceStartName != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpServiceStartName); new_entry.config.lpServiceStartName = strdupW(lpServiceStartName); - } if (lpDisplayName != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpDisplayName); new_entry.config.lpDisplayName = strdupW(lpDisplayName); - } - *service->service_entry = new_entry; - save_service_config(service->service_entry); + /* try to save to Registry, commit or rollback depending on success */ + err = save_service_config(&new_entry); + if (ERROR_SUCCESS == err) + { + free_config_strings(&service->service_entry->config,&new_entry.config); + *service->service_entry = new_entry; + } + else free_config_strings(&new_entry.config,&service->service_entry->config); service_unlock(service->service_entry); - return ERROR_SUCCESS; + return err; } DWORD svcctl_SetServiceStatus( diff --git a/programs/services/services.c b/programs/services/services.c index 24230e4..d6f5e6d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -376,7 +376,7 @@ static DWORD scmdatabase_create(struct scmdatabase **db) InitializeCriticalSection(&(*db)->cs); err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, + REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED, NULL, &(*db)->root_key, NULL); if (err != ERROR_SUCCESS) HeapFree(GetProcessHeap(), 0, *db); @@ -417,7 +417,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) break; WINE_TRACE("Loading service %s\n", wine_dbgstr_w(szName)); - err = RegOpenKeyExW(db->root_key, szName, 0, KEY_READ | KEY_WRITE, &hServiceKey); + err = RegOpenKeyExW(db->root_key, szName, 0, KEY_READ, &hServiceKey); if (err == ERROR_SUCCESS) { err = load_service_config(hServiceKey, entry);

1 0

Paul Chitescu : advapi32: Reduce registry access to MAXIMUM_ALLOWED wherever possible.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7fea0e332fb7b3aa532f3534c89c2620b3706ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fea0e332fb7b3aa532f3534c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Dec 4 17:07:27 2009 +0200 advapi32: Reduce registry access to MAXIMUM_ALLOWED wherever possible. --- dlls/advapi32/registry.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3762908..28eabe3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -137,7 +137,7 @@ static inline HKEY get_special_root_hkey( HKEY hkey ) if ((hkey >= HKEY_SPECIAL_ROOT_FIRST) && (hkey <= HKEY_SPECIAL_ROOT_LAST)) { if (!(ret = special_root_keys[(UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST])) - ret = create_special_root_hkey( hkey, KEY_ALL_ACCESS ); + ret = create_special_root_hkey( hkey, MAXIMUM_ALLOWED ); } return ret; } @@ -233,7 +233,7 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl if (reserved) return ERROR_INVALID_PARAMETER; if (!is_version_nt()) { - access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + access = MAXIMUM_ALLOWED; /* Win95 ignores the access mask */ if (name && *name == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ } if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -279,7 +279,7 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) /* FIXME: previous implementation converted ERROR_INVALID_HANDLE to ERROR_BADKEY, */ /* but at least my version of NT (4.0 SP5) doesn't do this. -- AJ */ return RegCreateKeyExW( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, phkResult, NULL ); + MAXIMUM_ALLOWED, NULL, phkResult, NULL ); } @@ -291,7 +291,7 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) { return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, phkResult, NULL ); + MAXIMUM_ALLOWED, NULL, phkResult, NULL ); } @@ -348,7 +348,7 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acc STRING nameA; NTSTATUS status; - if (!is_version_nt()) access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + if (!is_version_nt()) access = MAXIMUM_ALLOWED; /* Win95 ignores the access mask */ else { /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ @@ -389,7 +389,7 @@ LSTATUS WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) *retkey = hkey; return ERROR_SUCCESS; } - return RegOpenKeyExW( hkey, name, 0, KEY_ALL_ACCESS, retkey ); + return RegOpenKeyExW( hkey, name, 0, MAXIMUM_ALLOWED, retkey ); } @@ -417,7 +417,7 @@ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) *retkey = hkey; return ERROR_SUCCESS; } - return RegOpenKeyExA( hkey, name, 0, KEY_ALL_ACCESS, retkey ); + return RegOpenKeyExA( hkey, name, 0, MAXIMUM_ALLOWED, retkey ); }

1 0

Maarten Lankhorst : dsound: Move buffer property sets to buffer.c.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7326586517e07604f23d59ebd9e4cf2701e10f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7326586517e07604f23d59ebd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 4 14:09:32 2009 +0100 dsound: Move buffer property sets to buffer.c. --- dlls/dsound/buffer.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/propset.c | 185 ------------------------------------------------ 2 files changed, 187 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7326586517e07604f23d5…

1 0

Huw Davies : xinput1_3: Don't print the contents of [out] parameters.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7c1deca74c35c52fe54c344fbebd347249caf03c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1deca74c35c52fe54c344fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 7 11:33:02 2009 +0000 xinput1_3: Don't print the contents of [out] parameters. Found by Valgrind. --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index f4386b8..fc55cef 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -105,7 +105,7 @@ DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPA DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid) { - FIXME("(%d %s %s) Stub!\n", dwUserIndex, debugstr_guid(pDSoundRenderGuid), debugstr_guid(pDSoundCaptureGuid)); + FIXME("(%d %p %p) Stub!\n", dwUserIndex, pDSoundRenderGuid, pDSoundCaptureGuid); if (dwUserIndex < XUSER_MAX_COUNT) {

1 0

Nikolay Sivov : windowscodecs/tests: Release decoder after use.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: fc7d6b39be9c9975bc0aafb864780d3779f2f15b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7d6b39be9c9975bc0aafb86… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 7 13:42:37 2009 +0300 windowscodecs/tests: Release decoder after use. --- dlls/windowscodecs/tests/bmpformat.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index cf5a6f8..f817df5 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -225,6 +225,8 @@ static void test_decode_24bpp(void) /* cannot querycapability twice */ hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -373,6 +375,7 @@ static void test_decode_1bpp(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -531,6 +534,7 @@ static void test_decode_4bpp(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -710,6 +714,7 @@ static void test_decode_rle8(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -876,6 +881,7 @@ static void test_decode_rle4(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream);

1 0

Henri Verbeet : dxgi: Implement IDXGISurface::GetParent().
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bf1255e2cdda424a70b0db2be0060665cb908451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1255e2cdda424a70b0db2be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:40 2009 +0100 dxgi: Implement IDXGISurface::GetParent(). --- dlls/dxgi/surface.c | 6 ++++-- dlls/dxgi/tests/device.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 0d9aef1..6296c1a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -130,9 +130,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_surface *This = (struct dxgi_surface *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + return IDXGIDevice_QueryInterface(This->device, riid, parent); } /* IDXGIDeviceSubObject methods */ diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 32e87e6..2391c1b 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -153,12 +153,29 @@ static void test_create_surface(IDXGIDevice *device) static void test_parents(IDXGIDevice *device) { + DXGI_SURFACE_DESC surface_desc; + IDXGISurface *surface; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; IUnknown *parent; HRESULT hr; + surface_desc.Width = 512; + surface_desc.Height = 512; + surface_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + surface_desc.SampleDesc.Count = 1; + surface_desc.SampleDesc.Quality = 0; + + hr = IDXGIDevice_CreateSurface(device, &surface_desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + hr = IDXGISurface_GetParent(surface, &IID_IDXGIDevice, (void **)&parent); + IDXGISurface_Release(surface); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(parent == (IUnknown *)device, "Got parent %p, expected %p.\n", parent, device); + IUnknown_Release(parent); + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);

1 0

Henri Verbeet : dxgi: Implement IDXGISurface::GetDevice().
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: a6b9a637e26e3fac4b10ff0496f3d902520d8453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b9a637e26e3fac4b10ff049… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:39 2009 +0100 dxgi: Implement IDXGISurface::GetDevice(). --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/surface.c | 11 ++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7860d0c..eddb1e4 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -274,7 +274,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, outer); + hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 69c9f6c..6151800 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -136,8 +136,9 @@ struct dxgi_surface const struct IUnknownVtbl *inner_unknown_vtbl; IUnknown *outer_unknown; LONG refcount; + IDXGIDevice *device; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1e5038b..0d9aef1 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -72,6 +72,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) if (!refcount) { + IDXGIDevice_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -138,9 +139,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REF static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REFIID riid, void **device) { - FIXME("iface %p, riid %s, device %p stub!\n", iface, debugstr_guid(riid), device); + struct dxgi_surface *This = (struct dxgi_surface *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + return IDXGIDevice_QueryInterface(This->device, riid, device); } /* IDXGISurface methods */ @@ -192,12 +195,14 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) { surface->vtbl = &dxgi_surface_vtbl; surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl; + surface->device = device; + IDXGIDevice_AddRef(device); return S_OK; }

1 0

Henri Verbeet : dxgi: Add a separate function for surface initialization.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4e29ade658188d7e6fc2df57437f9ec3d6dfb671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e29ade658188d7e6fc2df574… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:38 2009 +0100 dxgi: Add a separate function for surface initialization. --- dlls/dxgi/device.c | 19 +++++++------------ dlls/dxgi/dxgi_private.h | 4 ++-- dlls/dxgi/surface.c | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 8562d67..7860d0c 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -262,6 +262,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { struct dxgi_surface *object; + HRESULT hr; FIXME("iface %p, desc %p, usage %#x, shared_resource %p, outer %p, surface %p partial stub!\n", iface, desc, usage, shared_resource, outer, surface); @@ -273,22 +274,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - object->vtbl = &dxgi_surface_vtbl; - object->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; - object->refcount = 1; - - if (outer) - { - object->outer_unknown = outer; - *surface = &object->inner_unknown_vtbl; - } - else + hr = dxgi_surface_init(object, outer); + if (FAILED(hr)) { - object->outer_unknown = (IUnknown *)&object->inner_unknown_vtbl; - *surface = object; + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; } TRACE("Created IDXGISurface %p\n", object); + *surface = outer ? (void *)&object->inner_unknown_vtbl : object; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 033168b..69c9f6c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -130,8 +130,6 @@ struct dxgi_swapchain }; /* IDXGISurface */ -extern const struct IDXGISurfaceVtbl dxgi_surface_vtbl DECLSPEC_HIDDEN; -extern const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl DECLSPEC_HIDDEN; struct dxgi_surface { const struct IDXGISurfaceVtbl *vtbl; @@ -140,4 +138,6 @@ struct dxgi_surface LONG refcount; }; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) DECLSPEC_HIDDEN; + #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index bdbeaf3..1e5038b 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -165,7 +165,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface *iface) return E_NOTIMPL; } -const struct IDXGISurfaceVtbl dxgi_surface_vtbl = +static const struct IDXGISurfaceVtbl dxgi_surface_vtbl = { /* IUnknown methods */ dxgi_surface_QueryInterface, @@ -184,10 +184,20 @@ const struct IDXGISurfaceVtbl dxgi_surface_vtbl = dxgi_surface_Unmap, }; -const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = +static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = { /* IUnknown methods */ dxgi_surface_inner_QueryInterface, dxgi_surface_inner_AddRef, dxgi_surface_inner_Release, }; + +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) +{ + surface->vtbl = &dxgi_surface_vtbl; + surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; + surface->refcount = 1; + surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl; + + return S_OK; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009