October 2009 - Wine-commits

Rico Schüller : d3d10: Add ID3D10EffectRasterizerVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 94d743c5759d3db77e35ca11868b0281dee23a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d743c5759d3db77e35ca118… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:50 2009 +0100 d3d10: Add ID3D10EffectRasterizerVariableVtbl. --- dlls/d3d10/effect.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94d743c5759d3db77e35c…

1 0

Rico Schüller : d3d10: Add ID3D10EffectSamplerVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 48563347856c51ee10d0978158346a104e542803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48563347856c51ee10d097815… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:53 2009 +0100 d3d10: Add ID3D10EffectSamplerVariableVtbl. --- dlls/d3d10/effect.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3fef775..c7c53c6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -55,6 +55,7 @@ static const struct ID3D10EffectMatrixVariableVtbl d3d10_effect_matrix_variable_ static const struct ID3D10EffectBlendVariableVtbl d3d10_effect_blend_variable_vtbl; static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_stencil_variable_vtbl; static const struct ID3D10EffectRasterizerVariableVtbl d3d10_effect_rasterizer_variable_vtbl; +static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variable_vtbl; static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ @@ -88,6 +89,9 @@ static struct d3d10_effect_variable null_depth_stencil_variable = static struct d3d10_effect_variable null_rasterizer_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_rasterizer_variable_vtbl, &null_local_buffer, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; +static struct d3d10_effect_variable null_sampler_variable = + {(ID3D10EffectVariableVtbl *)&d3d10_effect_sampler_variable_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset); @@ -4280,6 +4284,211 @@ static const struct ID3D10EffectRasterizerVariableVtbl d3d10_effect_rasterizer_v d3d10_effect_rasterizer_variable_GetBackingStore, }; +/* ID3D10EffectVariable methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_sampler_variable_IsValid(ID3D10EffectSamplerVariable *iface) +{ + TRACE("iface %p\n", iface); + + return (struct d3d10_effect_variable *)iface != &null_sampler_variable; +} + +static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetType( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_GetType((ID3D10EffectVariable *)iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetDesc(ID3D10EffectSamplerVariable *iface, + D3D10_EFFECT_VARIABLE_DESC *desc) +{ + return d3d10_effect_variable_GetDesc((ID3D10EffectVariable *)iface, desc); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetAnnotationByIndex( + ID3D10EffectSamplerVariable *iface, UINT index) +{ + return d3d10_effect_variable_GetAnnotationByIndex((ID3D10EffectVariable *)iface, index); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetAnnotationByName( + ID3D10EffectSamplerVariable *iface, LPCSTR name) +{ + return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetMemberByIndex( + ID3D10EffectSamplerVariable *iface, UINT index) +{ + return d3d10_effect_variable_GetMemberByIndex((ID3D10EffectVariable *)iface, index); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetMemberByName( + ID3D10EffectSamplerVariable *iface, LPCSTR name) +{ + return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetMemberBySemantic( + ID3D10EffectSamplerVariable *iface, LPCSTR semantic) +{ + return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetElement( + ID3D10EffectSamplerVariable *iface, UINT index) +{ + return d3d10_effect_variable_GetElement((ID3D10EffectVariable *)iface, index); +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetParentConstantBuffer( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_GetParentConstantBuffer((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsScalar( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsScalar((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectVectorVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsVector( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsVector((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsMatrix( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsMatrix((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsString( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsString((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsShaderResource( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsShaderResource((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsRenderTargetView( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsRenderTargetView((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsDepthStencilView( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsDepthStencilView((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsConstantBuffer( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsConstantBuffer((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsShader( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsShader((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsBlend( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsBlend((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsDepthStencil( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsDepthStencil((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsRasterizer( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsRasterizer((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_AsSampler( + ID3D10EffectSamplerVariable *iface) +{ + return d3d10_effect_variable_AsSampler((ID3D10EffectVariable *)iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_SetRawValue(ID3D10EffectSamplerVariable *iface, + void *data, UINT offset, UINT count) +{ + return d3d10_effect_variable_SetRawValue((ID3D10EffectVariable *)iface, data, offset, count); +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetRawValue(ID3D10EffectSamplerVariable *iface, + void *data, UINT offset, UINT count) +{ + return d3d10_effect_variable_GetRawValue((ID3D10EffectVariable *)iface, data, offset, count); +} + +/* ID3D10EffectSamplerVariable methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetSampler(ID3D10EffectSamplerVariable *iface, + UINT index, ID3D10SamplerState **sampler) +{ + FIXME("iface %p, index %u, sampler %p stub!\n", iface, index, sampler); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(ID3D10EffectSamplerVariable *iface, + UINT index, D3D10_SAMPLER_DESC *desc) +{ + FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + + return E_NOTIMPL; +} + + +static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variable_vtbl = +{ + /* ID3D10EffectVariable methods */ + d3d10_effect_sampler_variable_IsValid, + d3d10_effect_sampler_variable_GetType, + d3d10_effect_sampler_variable_GetDesc, + d3d10_effect_sampler_variable_GetAnnotationByIndex, + d3d10_effect_sampler_variable_GetAnnotationByName, + d3d10_effect_sampler_variable_GetMemberByIndex, + d3d10_effect_sampler_variable_GetMemberByName, + d3d10_effect_sampler_variable_GetMemberBySemantic, + d3d10_effect_sampler_variable_GetElement, + d3d10_effect_sampler_variable_GetParentConstantBuffer, + d3d10_effect_sampler_variable_AsScalar, + d3d10_effect_sampler_variable_AsVector, + d3d10_effect_sampler_variable_AsMatrix, + d3d10_effect_sampler_variable_AsString, + d3d10_effect_sampler_variable_AsShaderResource, + d3d10_effect_sampler_variable_AsRenderTargetView, + d3d10_effect_sampler_variable_AsDepthStencilView, + d3d10_effect_sampler_variable_AsConstantBuffer, + d3d10_effect_sampler_variable_AsShader, + d3d10_effect_sampler_variable_AsBlend, + d3d10_effect_sampler_variable_AsDepthStencil, + d3d10_effect_sampler_variable_AsRasterizer, + d3d10_effect_sampler_variable_AsSampler, + d3d10_effect_sampler_variable_SetRawValue, + d3d10_effect_sampler_variable_GetRawValue, + /* ID3D10EffectSamplerVariable methods */ + d3d10_effect_sampler_variable_GetSampler, + d3d10_effect_sampler_variable_GetBackingStore, +}; + /* ID3D10EffectType methods */ static BOOL STDMETHODCALLTYPE d3d10_effect_type_IsValid(ID3D10EffectType *iface)

1 0

Hans Leidekker : msi/tests: Fix a couple of user SID string leaks.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 3f70b078708549c3358c5a1847dcfac631954d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f70b078708549c3358c5a184… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:07:25 2009 +0100 msi/tests: Fix a couple of user SID string leaks. Found by valgrind. --- dlls/msi/tests/install.c | 2 ++ dlls/msi/tests/msi.c | 12 ++++++++++++ dlls/msi/tests/source.c | 6 ++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ed1ebc2..badbb09 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3944,6 +3944,7 @@ static void test_publish_registeruser(void) DeleteFile(msifile); DeleteFile("msitest\\maximus"); RemoveDirectory("msitest"); + LocalFree(usersid); } static void test_publish_processcomponents(void) @@ -4068,6 +4069,7 @@ static void test_publish_processcomponents(void) DeleteFile(msifile); DeleteFile("msitest\\maximus"); RemoveDirectory("msitest"); + LocalFree(usersid); } static void test_publish(void) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index f25d580..8da3499 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1201,6 +1201,7 @@ static void test_MsiQueryFeatureState(void) RegCloseKey(compkey2); RegCloseKey(localkey); RegCloseKey(userkey); + LocalFree(usersid); } static void test_MsiQueryComponentState(void) @@ -1520,6 +1521,7 @@ static void test_MsiQueryComponentState(void) RegDeleteKeyA(compkey, ""); RegCloseKey(prodkey); RegCloseKey(compkey); + LocalFree(usersid); } static void test_MsiGetComponentPath(void) @@ -1872,6 +1874,7 @@ static void test_MsiGetComponentPath(void) RegCloseKey(prodkey); RegCloseKey(compkey); DeleteFileA("C:\\imapath"); + LocalFree(usersid); } static void test_MsiGetProductCode(void) @@ -2128,6 +2131,7 @@ static void test_MsiGetProductCode(void) RegDeleteValueA(compkey, prod2_squashed); RegDeleteKeyA(compkey, ""); RegCloseKey(compkey); + LocalFree(usersid); } static void test_MsiEnumClients(void) @@ -2314,6 +2318,7 @@ static void test_MsiEnumClients(void) RegDeleteValueA(compkey, prod2_squashed); RegDeleteKeyA(compkey, ""); RegCloseKey(compkey); + LocalFree(usersid); } static void get_version_info(LPSTR path, LPSTR *vercheck, LPDWORD verchecksz, @@ -3845,6 +3850,7 @@ static void test_MsiGetProductInfo(void) RegCloseKey(localkey); RegCloseKey(source); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiGetProductInfoEx(void) @@ -6582,6 +6588,7 @@ static void test_MsiGetProductInfoEx(void) RegDeleteValueA(prodkey, "HelpLink"); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } #define INIT_USERINFO() \ @@ -7161,6 +7168,7 @@ static void test_MsiGetUserInfo(void) RegCloseKey(userprod); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiOpenProduct(void) @@ -7473,6 +7481,7 @@ static void test_MsiOpenProduct(void) RegCloseKey(prodkey); DeleteFileA(msifile); + LocalFree(usersid); } static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid) @@ -9201,6 +9210,7 @@ static void test_MsiEnumPatchesEx(void) test_MsiEnumPatchesEx_userunmanaged(NULL, usersid); /* FIXME: Successfully test userunmanaged with a different user */ test_MsiEnumPatchesEx_machine(); + LocalFree(usersid); } static void test_MsiEnumPatches(void) @@ -9864,6 +9874,7 @@ static void test_MsiEnumPatches(void) RegCloseKey(udprod); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiGetPatchInfoEx(void) @@ -10876,6 +10887,7 @@ static void test_MsiGetPatchInfoEx(void) RegCloseKey(props); RegDeleteKeyA(udprod, ""); RegCloseKey(udprod); + LocalFree(usersid); } static void test_MsiEnumProducts(void) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 5a51c66..fd983ae 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -628,6 +628,7 @@ static void test_MsiSourceListGetInfo(void) RegDeleteKeyA(userkey, ""); RegCloseKey(hkey); RegCloseKey(userkey); + LocalFree(usersid); } static void test_MsiSourceListAddSourceEx(void) @@ -1605,6 +1606,7 @@ static void test_MsiSourceListEnumSources(void) RegCloseKey(source); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiSourceListSetInfo(void) @@ -2015,6 +2017,7 @@ static void test_MsiSourceListSetInfo(void) RegCloseKey(source); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiSourceListAddMediaDisk(void) @@ -2312,6 +2315,7 @@ static void test_MsiSourceListAddMediaDisk(void) RegCloseKey(source); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiSourceListEnumMediaDisks(void) @@ -3114,6 +3118,7 @@ static void test_MsiSourceListEnumMediaDisks(void) RegCloseKey(source); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } static void test_MsiSourceListAddSource(void) @@ -3369,6 +3374,7 @@ static void test_MsiSourceListAddSource(void) RegCloseKey(source); RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); + LocalFree(usersid); } START_TEST(source)

1 0

Hans Leidekker : msi: Avoid accessing uninitialized memory in ACTION_AppSearchReg.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 2eb33f5bcb008e88c7adf45bf77b02537ed1cb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb33f5bcb008e88c7adf45bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:07:50 2009 +0100 msi: Avoid accessing uninitialized memory in ACTION_AppSearchReg. Found by valgrind. --- dlls/msi/appsearch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 4ef4087..95daabb 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -445,7 +445,8 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT if (sz == 0) goto end; - if ((ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) + if ((regType == REG_SZ || regType == REG_EXPAND_SZ) && + (ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) *end = '\0'; else ptr = (LPWSTR)value;

1 0

Henri Verbeet : wined3d: Store PCI IDs in wined3d_driver_info instead of wined3d_gl_info.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 2447c8bc3e19230449b6bb9016656d6379f4bb4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2447c8bc3e19230449b6bb901… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:39 2009 +0100 wined3d: Store PCI IDs in wined3d_driver_info instead of wined3d_gl_info. --- dlls/wined3d/directx.c | 95 +++++++++++++++++++++++---------------- dlls/wined3d/utils.c | 8 ++-- dlls/wined3d/wined3d_gl.h | 79 --------------------------------- dlls/wined3d/wined3d_private.h | 83 ++++++++++++++++++++++++++++++++++- 4 files changed, 142 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2447c8bc3e19230449b6b…

1 0

Henri Verbeet : wined3d: Apply PCI ID overrides in init_driver_info() instead of IWineD3DImpl_GetAdapterIdentifier().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 26ba2124079aa5f990d5839704d089329f422936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ba2124079aa5f990d583970… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:40 2009 +0100 wined3d: Apply PCI ID overrides in init_driver_info() instead of IWineD3DImpl_GetAdapterIdentifier(). --- dlls/wined3d/directx.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2367187..9c4fbea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -979,8 +979,20 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, { unsigned int i; + if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) + { + TRACE_(d3d_caps)("Overriding PCI vendor ID with: %04x\n", wined3d_settings.pci_vendor_id); + vendor = wined3d_settings.pci_vendor_id; + } driver_info->vendor = vendor; + + if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) + { + TRACE_(d3d_caps)("Overriding PCI device ID with: %04x\n", wined3d_settings.pci_device_id); + device = wined3d_settings.pci_device_id; + } driver_info->device = device; + driver_info->name = "Display"; driver_info->description = "Direct3D HAL"; driver_info->version_high = MAKEDWORD_VERSION(7, 1); @@ -2352,19 +2364,6 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad pIdentifier->subsystem_id = 0; pIdentifier->revision = 0; memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier)); - - if(wined3d_settings.pci_device_id != PCI_DEVICE_NONE) - { - TRACE_(d3d_caps)("Overriding pci device id with: %x\n", wined3d_settings.pci_device_id); - pIdentifier->device_id = wined3d_settings.pci_device_id; - } - - if(wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) - { - TRACE_(d3d_caps)("Overriding pci vendor id with: %x\n", wined3d_settings.pci_vendor_id); - pIdentifier->vendor_id = wined3d_settings.pci_vendor_id; - } - pIdentifier->whql_level = (Flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Set a driver name appropriate for the vendor in init_driver_info().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 13c4fe72ad1e26eb492b10d87ac80f0363fffc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c4fe72ad1e26eb492b10d87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:41 2009 +0100 wined3d: Set a driver name appropriate for the vendor in init_driver_info(). --- dlls/wined3d/directx.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9c4fbea..ffd3301 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -993,7 +993,22 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } driver_info->device = device; - driver_info->name = "Display"; + switch (vendor) + { + case VENDOR_ATI: + driver_info->name = "ati2dvag.dll"; + break; + + case VENDOR_NVIDIA: + driver_info->name = "nv4_disp.dll"; + break; + + default: + FIXME_(d3d_caps)("Unhandled vendor %04x.\n", vendor); + driver_info->name = "Display"; + break; + } + driver_info->description = "Direct3D HAL"; driver_info->version_high = MAKEDWORD_VERSION(7, 1); driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */

1 0

Henri Verbeet : wined3d: Restore the wglMakeCurrent() call in context_destroy_gl_resources().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 94509f85b563e20ba9be791522f58b1a22a160cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=94509f85b563e20ba9be79152… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:42 2009 +0100 wined3d: Restore the wglMakeCurrent() call in context_destroy_gl_resources(). e3ca576576c46131330353f45990f55045cf7541 removed this call because we don't need it to tell if the context is valid, but we still need it to actually make the context current. --- dlls/wined3d/context.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d4fb7fd..2cbac67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -641,6 +641,18 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource } } +static void context_validate(struct wined3d_context *context) +{ + HWND wnd = WindowFromDC(context->hdc); + + if (wnd != context->win_handle) + { + WARN("DC %p belongs to window %p instead of %p.\n", + context->hdc, wnd, context->win_handle); + context->valid = 0; + } +} + static void context_destroy_gl_resources(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -648,6 +660,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) struct wined3d_event_query *event_query; struct fbo_entry *entry, *entry2; + context_validate(context); + if (context->valid) pwglMakeCurrent(context->hdc, context->glCtx); + ENTER_GL(); LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry) @@ -712,7 +727,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, context->free_event_queries); - if (!pwglMakeCurrent(NULL, NULL)) + if (pwglGetCurrentContext() && !pwglMakeCurrent(NULL, NULL)) { ERR("Failed to disable GL context.\n"); } @@ -801,18 +816,6 @@ BOOL context_set_current(struct wined3d_context *ctx) return TlsSetValue(wined3d_context_tls_idx, ctx); } -static void context_validate(struct wined3d_context *context) -{ - HWND wnd = WindowFromDC(context->hdc); - - if (wnd != context->win_handle) - { - WARN("DC %p belongs to window %p instead of %p.\n", - context->hdc, wnd, context->win_handle); - context->valid = 0; - } -} - /***************************************************************************** * Context_MarkStateDirty *

1 0

Henri Verbeet : wined3d: Restore the thread' s previous GL context in WineD3D_ReleaseFakeGLContext().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 30d2660d99d7a4c38088a439c3ba2ebc258f09d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d2660d99d7a4c38088a439c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:43 2009 +0100 wined3d: Restore the thread's previous GL context in WineD3D_ReleaseFakeGLContext(). --- dlls/wined3d/directx.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ffd3301..2640aa6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -217,6 +217,8 @@ struct wined3d_fake_gl_ctx HDC dc; HWND wnd; HGLRC gl_ctx; + HDC restore_dc; + HGLRC restore_gl_ctx; }; static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -236,6 +238,11 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); + + if (ctx->restore_gl_ctx && !pwglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) + { + ERR_(d3d_caps)("Failed to restore previous GL context.\n"); + } } static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -245,6 +252,9 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) TRACE("getting context...\n"); + ctx->restore_dc = pwglGetCurrentDC(); + ctx->restore_gl_ctx = pwglGetCurrentContext(); + /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); @@ -309,6 +319,10 @@ fail: ctx->dc = NULL; if (ctx->wnd) DestroyWindow(ctx->wnd); ctx->wnd = NULL; + if (ctx->restore_gl_ctx && !pwglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) + { + ERR_(d3d_caps)("Failed to restore previous GL context.\n"); + } return FALSE; }

1 0

Alexandre Julliard : ole32: Specify the full application path when starting rpcss.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 0beaa44d7d0de6f15306257b40bed5bae4b6b60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beaa44d7d0de6f15306257b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:20:34 2009 +0100 ole32: Specify the full application path when starting rpcss.exe. --- dlls/ole32/moniker.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index f65fe8f..a7c5a11 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -124,30 +124,18 @@ static BOOL start_rpcss(void) { PROCESS_INFORMATION pi; STARTUPINFOW si; - static WCHAR cmd[6]; - static const WCHAR rpcss[] = {'r','p','c','s','s',0}; + WCHAR cmd[MAX_PATH]; + static const WCHAR rpcss[] = {'\\','r','p','c','s','s','.','e','x','e',0}; BOOL rslt; TRACE("\n"); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); ZeroMemory(&si, sizeof(STARTUPINFOA)); si.cb = sizeof(STARTUPINFOA); + GetSystemDirectoryW( cmd, MAX_PATH - sizeof(rpcss)/sizeof(WCHAR) ); + strcatW( cmd, rpcss ); - memcpy(cmd, rpcss, sizeof(rpcss)); - - rslt = CreateProcessW( - NULL, /* executable */ - cmd, /* command line */ - NULL, /* process security attributes */ - NULL, /* primary thread security attributes */ - FALSE, /* inherit handles */ - 0, /* creation flags */ - NULL, /* use parent's environment */ - NULL, /* use parent's current directory */ - &si, /* STARTUPINFO pointer */ - &pi /* PROCESS_INFORMATION */ - ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); if (rslt) {

1 0