wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Hans Leidekker : fusion: Implement IAssemblyCache::UninstallAssembly.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 25ba5c8b593e5763407a036d614d980a82d1ce9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ba5c8b593e5763407a036d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:57 2012 +0200 fusion: Implement IAssemblyCache::UninstallAssembly. --- dlls/fusion/asmcache.c | 71 ++++++++++++++++++++++++++++++++++++++++- dlls/fusion/tests/asmcache.c | 46 +++++++++------------------ 2 files changed, 84 insertions(+), 33 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index fe4e12a..d0b45c7 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -183,10 +183,77 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface LPCFUSION_INSTALL_REFERENCE pRefData, ULONG *pulDisposition) { - FIXME("(%p, %d, %s, %p, %p) stub!\n", iface, dwFlags, + HRESULT hr; + IAssemblyName *asmname, *next = NULL; + IAssemblyEnum *asmenum = NULL; + WCHAR *p, *path = NULL; + ULONG disp; + DWORD len; + + TRACE("(%p, 0%08x, %s, %p, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pRefData, pulDisposition); - return E_NOTIMPL; + if (pRefData) + { + FIXME("application reference not supported\n"); + return E_NOTIMPL; + } + hr = CreateAssemblyNameObject( &asmname, pszAssemblyName, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) + return hr; + + hr = CreateAssemblyEnum( &asmenum, NULL, asmname, ASM_CACHE_GAC, NULL ); + if (FAILED( hr )) + goto done; + + hr = IAssemblyEnum_GetNextAssembly( asmenum, NULL, &next, 0 ); + if (hr == S_FALSE) + { + if (pulDisposition) + *pulDisposition = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + goto done; + } + hr = IAssemblyName_GetPath( next, NULL, &len ); + if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + goto done; + + if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IAssemblyName_GetPath( next, path, &len ); + if (FAILED( hr )) + goto done; + + if (DeleteFileW( path )) + { + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + } + } + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED; + hr = S_OK; + } + else + { + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + hr = S_FALSE; + } + if (pulDisposition) *pulDisposition = disp; + +done: + IAssemblyName_Release( asmname ); + if (next) IAssemblyName_Release( next ); + if (asmenum) IAssemblyEnum_Release( asmenum ); + HeapFree( GetProcessHeap(), 0, path ); + return hr; } static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface, diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 3910488..141e442 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -888,7 +888,6 @@ static void test_InstallAssembly(void) ULONG disp; DWORD attr; char dllpath[MAX_PATH]; - UINT size; static const WCHAR empty[] = {0}; static const WCHAR noext[] = {'f','i','l','e',0}; @@ -942,7 +941,7 @@ static void test_InstallAssembly(void) hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - size = GetWindowsDirectoryA(dllpath, MAX_PATH); + GetWindowsDirectoryA(dllpath, MAX_PATH); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); attr = GetFileAttributes(dllpath); @@ -951,19 +950,18 @@ static void test_InstallAssembly(void) /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - /* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + attr = GetFileAttributes(dllpath); + ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); + + disp = 0xf00dbad; + hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll"); @@ -987,8 +985,6 @@ static void test_QueryAssemblyInfo(void) HRESULT hr; DWORD size; ULONG disp; - char dllpath[MAX_PATH]; - UINT len; static const WCHAR empty[] = {0}; static const WCHAR commasep[] = {',',' ',0}; @@ -1503,21 +1499,9 @@ static void test_QueryAssemblyInfo(void) /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } - - /* FIXME: remove once UninstallAssembly is implemented */ - len = GetWindowsDirectoryA(dllpath, MAX_PATH); - strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - DeleteFileA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll");

1 0

Hans Leidekker : msi: Avoid a crash in get_registered_local_package.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 89e95aa92c5d56fbb267189b2353401e2d848c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e95aa92c5d56fbb267189b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:46 2012 +0200 msi: Avoid a crash in get_registered_local_package. --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ca836ec..2077396 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1455,6 +1455,9 @@ static UINT get_registered_local_package( const WCHAR *product, const WCHAR *pac if (!strcmpiW( package, unsquashed )) { WCHAR *filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); + if (!filename) + goto done; + strcpyW( localfile, filename ); msi_free( filename ); r = ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Don't free cached tables in MsiDatabaseCommit.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: fde66de6a5c86db4daee1b5c11052288af21d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde66de6a5c86db4daee1b5c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:31 2012 +0200 msi: Don't free cached tables in MsiDatabaseCommit. --- dlls/msi/table.c | 3 -- dlls/msi/tests/package.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 54743bd..dd25fbb 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2195,9 +2195,6 @@ UINT MSI_CommitTables( MSIDATABASE *db ) } } - /* force everything to reload next time */ - free_cached_tables( db ); - hr = IStorage_Commit( db->storage, 0 ); if (FAILED( hr )) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index fc77c03..8cf8f27 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8746,6 +8746,52 @@ error: DeleteFileA( msifile ); } +static void test_MsiDatabaseCommit(void) +{ + UINT r; + MSIHANDLE hdb, hpkg = 0; + char buf[32], package[12]; + DWORD sz; + + hdb = create_package_db(); + ok( hdb, "failed to create database\n" ); + + r = create_property_table( hdb ); + ok( r == ERROR_SUCCESS, "can't create Property table %u\n", r ); + + sprintf( package, "#%u", hdb ); + r = MsiOpenPackage( package, &hpkg ); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + r = MsiSetPropertyA( hpkg, "PROP", "value" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + buf[0] = 0; + sz = sizeof(buf); + r = MsiGetPropertyA( hpkg, "PROP", buf, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetPropertyA returned %u\n", r ); + ok( !lstrcmpA( buf, "value" ), "got \"%s\"\n", buf ); + + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS, "MsiDatabaseCommit returned %u\n", r ); + + buf[0] = 0; + sz = sizeof(buf); + r = MsiGetPropertyA( hpkg, "PROP", buf, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetPropertyA returned %u\n", r ); + ok( !lstrcmpA( buf, "value" ), "got \"%s\"\n", buf ); + + MsiCloseHandle( hpkg ); +error: + MsiCloseHandle( hdb ); + DeleteFileA( msifile ); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -8802,6 +8848,7 @@ START_TEST(package) test_MsiApplyMultiplePatches(); test_MsiApplyPatch(); test_MsiEnumComponentCosts(); + test_MsiDatabaseCommit(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Henri Verbeet : wined3d: Move the resource bind_count field up to wined3d_resource.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: de43de510ac9042970f16591b6a30e8f8c7bd43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de43de510ac9042970f16591b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:22 2012 +0200 wined3d: Move the resource bind_count field up to wined3d_resource. --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 495fe2f..e4f3668 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -767,7 +767,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->bind_count > 0) + if (device->isInDraw && buffer->resource.bind_count > 0) { decl_changed = buffer_find_decl(buffer); buffer->flags |= WINED3D_BUFFER_HASDESC; @@ -836,7 +836,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) FIXME("Too many full buffer conversions, stopping converting.\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - if (buffer->bind_count) + if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); return; } @@ -1063,7 +1063,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("Dynamic buffer, dropping VBO\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - if (buffer->bind_count) + if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); } else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ad30afa..e477021 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1696,12 +1696,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI if (buffer) { - InterlockedIncrement(&buffer->bind_count); + InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); } if (prev_buffer) { - InterlockedDecrement(&prev_buffer->bind_count); + InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); } @@ -2328,12 +2328,12 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, device_invalidate_state(device, STATE_INDEXBUFFER); if (buffer) { - InterlockedIncrement(&buffer->bind_count); + InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); } if (prev_buffer) { - InterlockedDecrement(&prev_buffer->bind_count); + InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); } } @@ -3669,7 +3669,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, if (texture) { - LONG bind_count = InterlockedIncrement(&texture->bind_count); + LONG bind_count = InterlockedIncrement(&texture->resource.bind_count); wined3d_texture_incref(texture); @@ -3691,7 +3691,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, if (prev) { - LONG bind_count = InterlockedDecrement(&prev->bind_count); + LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); wined3d_texture_decref(prev); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cc7edb0..94589ae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -502,7 +502,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) texture->texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; texture->texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - if (texture->bind_count) + if (texture->resource.bind_count) device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler)); } @@ -1056,7 +1056,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB /* TODO: Use already acquired context when possible. */ context = context_acquire(device, NULL); - if (texture->bind_count > 0) + if (texture->resource.bind_count > 0) { BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; BOOL sampler_srgb = texture_srgb_mode(texture, srgb); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0a110f8..92b259e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1837,6 +1837,7 @@ struct wined3d_resource_ops struct wined3d_resource { LONG ref; + LONG bind_count; struct wined3d_device *device; enum wined3d_resource_type type; const struct wined3d_format *format; @@ -1929,7 +1930,6 @@ struct wined3d_texture float pow2_matrix[16]; UINT lod; enum wined3d_texture_filter_type filter_type; - LONG bind_count; DWORD sampler; DWORD flags; const struct min_lookup *min_mip_lookup; @@ -2408,7 +2408,6 @@ struct wined3d_buffer GLenum buffer_object_usage; GLenum buffer_type_hint; UINT buffer_object_size; - LONG bind_count; DWORD flags; LONG lock_count;

1 0

Henri Verbeet : ddraw: Get rid of IClassFactoryImpl.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 9fd2d34d6887aef5e7f9d2b3b87a0f78780cbdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd2d34d6887aef5e7f9d2b3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:21 2012 +0200 ddraw: Get rid of IClassFactoryImpl. --- dlls/ddraw/main.c | 65 ++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 400bb30..db79184 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -511,21 +511,17 @@ static const struct object_creation_info object_creation[] = { &CLSID_DirectDrawClipper, CF_CreateDirectDrawClipper } }; - -/****************************************************************************** - * DirectDraw ClassFactory implementation - ******************************************************************************/ -typedef struct +struct ddraw_class_factory { IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct ddraw_class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD(iface, struct ddraw_class_factory, IClassFactory_iface); } /******************************************************************************* @@ -542,16 +538,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) * Failure: E_NOINTERFACE * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, - void **obj) +static HRESULT WINAPI ddraw_class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *obj = iface; + *out = iface; return S_OK; } @@ -569,12 +564,12 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory * * The new refcount * *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) +static ULONG WINAPI ddraw_class_factory_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); - TRACE("%p increasing refcount to %u.\n", This, ref); + TRACE("%p increasing refcount to %u.\n", factory, ref); return ref; } @@ -589,15 +584,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) * The new refcount * *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) +static ULONG WINAPI ddraw_class_factory_Release(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); - TRACE("%p decreasing refcount to %u.\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", factory, ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + HeapFree(GetProcessHeap(), 0, factory); return ref; } @@ -615,15 +610,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * ??? * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, - IUnknown *UnkOuter, REFIID riid, void **obj) +static HRESULT WINAPI ddraw_class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer_unknown, REFIID riid, void **out) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); - TRACE("iface %p, outer_unknown %p, riid %s, object %p.\n", - iface, UnkOuter, debugstr_guid(riid), obj); + TRACE("iface %p, outer_unknown %p, riid %s, out %p.\n", + iface, outer_unknown, debugstr_guid(riid), out); - return This->pfnCreateInstance(UnkOuter, riid, obj); + return factory->pfnCreateInstance(outer_unknown, riid, out); } /******************************************************************************* @@ -638,7 +633,7 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory * * S_OK, because it's a stub * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock) +static HRESULT WINAPI ddraw_class_factory_LockServer(IClassFactory *iface, BOOL dolock) { FIXME("iface %p, dolock %#x stub!\n", iface, dolock); @@ -650,11 +645,11 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *ifac *******************************************************************************/ static const IClassFactoryVtbl IClassFactory_Vtbl = { - IDirectDrawClassFactoryImpl_QueryInterface, - IDirectDrawClassFactoryImpl_AddRef, - IDirectDrawClassFactoryImpl_Release, - IDirectDrawClassFactoryImpl_CreateInstance, - IDirectDrawClassFactoryImpl_LockServer + ddraw_class_factory_QueryInterface, + ddraw_class_factory_AddRef, + ddraw_class_factory_Release, + ddraw_class_factory_CreateInstance, + ddraw_class_factory_LockServer }; /******************************************************************************* @@ -676,8 +671,8 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + struct ddraw_class_factory *factory; unsigned int i; - IClassFactoryImpl *factory; TRACE("rclsid %s, riid %s, object %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetTexture( ).
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 3e2d9462909558e2261000eab10936deea20a0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2d9462909558e2261000eab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:20 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetTexture(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 812de68..c5dc834 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1691,6 +1691,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface, { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; + struct d3d9_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); @@ -1703,7 +1704,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface, hr = wined3d_device_get_texture(This->wined3d_device, Stage, &wined3d_texture); if (SUCCEEDED(hr) && wined3d_texture) { - *ppTexture = wined3d_texture_get_parent(wined3d_texture); + texture_impl = wined3d_texture_get_parent(wined3d_texture); + *ppTexture = &texture_impl->IDirect3DBaseTexture9_iface; IDirect3DBaseTexture9_AddRef(*ppTexture); wined3d_texture_decref(wined3d_texture); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetDepthStencilSurface ().
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: e333334450eaf6f4c984e5d3fbb17f4f7a5583e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e333334450eaf6f4c984e5d3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:19 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetDepthStencilSurface(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a88dc73..812de68 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1244,6 +1244,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(IDirect3DDevic { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface); @@ -1256,7 +1257,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(IDirect3DDevic hr = wined3d_device_get_depth_stencil(This->wined3d_device, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppZStencilSurface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppZStencilSurface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppZStencilSurface); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetRenderTarget ().
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 6a03dbf111720a52712034f6c579a45444915457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03dbf111720a52712034f6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:18 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetRenderTarget(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 943c608..a88dc73 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1188,6 +1188,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, idx %u, surface %p.\n", iface, RenderTargetIndex, ppRenderTarget); @@ -1206,7 +1207,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i hr = wined3d_device_get_render_target(This->wined3d_device, RenderTargetIndex, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppRenderTarget = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); }

1 0

Frédéric Delanoy : Add link to translated FAQ in French help page (resend)
by Jeremy Newman 26 Apr '12

26 Apr '12

Module: website Branch: master Commit: adb4e5970b75d6ad958bfd7f3aa6bd8079d82ab0 URL: http://source.winehq.org/git/website.git/?a=commit;h=adb4e5970b75d6ad958bfd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Apr 26 08:35:50 2012 +0200 Add link to translated FAQ in French help page (resend) --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index 99569eb..aa18446 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -24,11 +24,11 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"><br>FAQ</a> + <a href="http://wiki.winehq.org/FAQ_fr"><img src="{$root}/images/faq.png"><br>FAQ</a> </td> <td valign="top"> Des réponses rapides à la plupart des questions sont disponibles dans la - <a href="http://wiki.winehq.org/FAQ">FAQ</a>. + <a href="http://wiki.winehq.org/FAQ_fr">FAQ</a>. C'est le premier endroit à visiter pour obtenir une réponse à vos questions. </td> </tr>

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 2551ff7d5cc7821453d741171362aa4db2e39af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ff7d5cc7821453d741171… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Apr 25 21:21:41 2012 +0900 po: Update Korean translation. --- po/ko.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index 07c0bb7..7a4c1a9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3520,16 +3520,12 @@ msgid "URI to be decoded is incorrect" msgstr "해독하는 URI가 올바르지 않음" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "열거 값이 범위를 벗어남.\n" +msgstr "분수 값이 범위를 벗어남" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "첨자가 범위를 벗어남" +msgstr "정밀도 범위를 벗어남" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
72
Older →

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 April 2012