September 2009 - Wine-commits

Henri Verbeet : d3d9: Add a separate function for pixel shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 7f1c802b9fc31d36ed826692cd8d83eec9881d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1c802b9fc31d36ed826692c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:11 2009 +0200 d3d9: Add a separate function for pixel shader initialization. --- dlls/d3d9/d3d9_private.h | 5 ++- dlls/d3d9/device.c | 30 +++++++++++++++++++++++++++ dlls/d3d9/pixelshader.c | 50 ++++++++++++--------------------------------- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 839ce5f..6184df2 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -222,8 +222,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(IDirect3DDev UINT StartRegister, const BOOL *pConstantData, UINT BoolCount) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantB(IDirect3DDevice9Ex *iface, UINT StartRegister, BOOL *pConstantData, UINT BoolCount) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(IDirect3DDevice9Ex *iface, - const DWORD *pFunction, IDirect3DPixelShader9 **ppShader) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 *pShader) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *iface, @@ -551,6 +549,9 @@ typedef struct IDirect3DPixelShader9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DPixelShader9Impl; +HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, + IDirect3DDevice9Impl *device, const DWORD *byte_code) DECLSPEC_HIDDEN; + /* --------------- */ /* IDirect3DQuery9 */ /* --------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 28722b2..819e855 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1967,6 +1967,36 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9EX ifac return rc; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(IDirect3DDevice9Ex *iface, + const DWORD *byte_code, IDirect3DPixelShader9 **shader) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DPixelShader9Impl *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + FIXME("Failed to allocate pixel shader memory.\n"); + return E_OUTOFMEMORY; + } + + hr = pixelshader_init(object, This, byte_code); + if (FAILED(hr)) + { + WARN("Failed to initialize pixel shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created pixel shader %p.\n", object); + *shader = (IDirect3DPixelShader9 *)object; + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9EX iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 3795045..11f275d 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -107,49 +107,27 @@ static const IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl = IDirect3DPixelShader9Impl_GetFunction }; +HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, IDirect3DDevice9Impl *device, const DWORD *byte_code) +{ + HRESULT hr; -/* IDirect3DDevice9 IDirect3DPixelShader9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9EX iface, CONST DWORD* pFunction, IDirect3DPixelShader9** ppShader) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IDirect3DPixelShader9Impl *object; - HRESULT hrc = D3D_OK; - - TRACE("(%p) Relay\n", This); - - if (ppShader == NULL) { - TRACE("(%p) Invalid call\n", This); - return D3DERR_INVALIDCALL; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - - if (NULL == object) { - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return E_OUTOFMEMORY; - } - - object->ref = 1; - object->lpVtbl = &Direct3DPixelShader9_Vtbl; + shader->ref = 1; + shader->lpVtbl = &Direct3DPixelShader9_Vtbl; wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction, NULL, - &object->wineD3DPixelShader, (IUnknown *)object); + hr = IWineD3DDevice_CreatePixelShader(device->WineD3DDevice, byte_code, + NULL, &shader->wineD3DPixelShader, (IUnknown *)shader); wined3d_mutex_unlock(); - - if (hrc != D3D_OK) + if (FAILED(hr)) { - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreatePixelShader failed\n", This); - HeapFree(GetProcessHeap(), 0 , object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppShader = (IDirect3DPixelShader9*) object; - TRACE("(%p) : Created pixel shader %p\n", This, object); + WARN("Failed to created wined3d pixel shader, hr %#x.\n", hr); + return hr; } - TRACE("(%p) : returning %p\n", This, *ppShader); - return hrc; + shader->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(shader->parentDevice); + + return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9EX iface, IDirect3DPixelShader9* pShader) {

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_pixel_shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: dde50a4748c7c896b85fdaa8bb40b899d9ac18df URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde50a4748c7c896b85fdaa8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:10 2009 +0200 d3d10core: Add a separate function for d3d10_pixel_shader initialization. --- dlls/d3d10core/d3d10core_private.h | 6 +++--- dlls/d3d10core/device.c | 21 +++------------------ dlls/d3d10core/shader.c | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 320ca69..a698bf0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -153,7 +153,6 @@ struct d3d10_geometry_shader }; /* ID3D10PixelShader */ -extern const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_pixel_shader { const struct ID3D10PixelShaderVtbl *vtbl; @@ -163,8 +162,9 @@ struct d3d10_pixel_shader struct wined3d_shader_signature output_signature; }; -HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, - struct d3d10_shader_info *shader_info) DECLSPEC_HIDDEN; +HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; + HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 4b64a2c..b646d99 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1001,7 +1001,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if { struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_pixel_shader *object; - struct d3d10_shader_info shader_info; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", @@ -1014,29 +1013,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if return E_OUTOFMEMORY; } - object->vtbl = &d3d10_pixel_shader_vtbl; - object->refcount = 1; - - shader_info.output_signature = &object->output_signature; - hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); - if (FAILED(hr)) - { - ERR("Failed to extract shader, hr %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - hr = IWineD3DDevice_CreatePixelShader(This->wined3d_device, - shader_info.shader_code, &object->output_signature, - &object->wined3d_shader, (IUnknown *)object); + hr = d3d10_pixel_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { - ERR("CreatePixelShader failed, hr %#x\n", hr); - shader_free_signature(&object->output_signature); + WARN("Failed to initialize pixel shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } + TRACE("Created pixel shader %p.\n", object); *shader = (ID3D10PixelShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index e96de1f..14f8919 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -48,7 +48,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * return S_OK; } -HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d10_shader_info *shader_info) +static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d10_shader_info *shader_info) { HRESULT hr; @@ -447,7 +447,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D return E_NOTIMPL; } -const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = +static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = { /* IUnknown methods */ d3d10_pixel_shader_QueryInterface, @@ -459,3 +459,33 @@ const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = d3d10_pixel_shader_SetPrivateData, d3d10_pixel_shader_SetPrivateDataInterface, }; + +HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct d3d10_shader_info shader_info; + HRESULT hr; + + shader->vtbl = &d3d10_pixel_shader_vtbl; + shader->refcount = 1; + + shader_info.output_signature = &shader->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x.\n", hr); + return hr; + } + + hr = IWineD3DDevice_CreatePixelShader(device->wined3d_device, + shader_info.shader_code, &shader->output_signature, + &shader->wined3d_shader, (IUnknown *)shader); + if (FAILED(hr)) + { + WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); + shader_free_signature(&shader->output_signature); + return hr; + } + + return S_OK; +}

1 0

Henri Verbeet : wined3d: Add a separate function for pixel shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 8aea1b13026b91692b3cf81369f652ad07224c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aea1b13026b91692b3cf8136… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:09 2009 +0200 wined3d: Add a separate function for pixel shader initialization. --- dlls/wined3d/device.c | 31 +++++++++++-------------------- dlls/wined3d/pixelshader.c | 26 +++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b19f846..5a53899 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1795,37 +1795,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface IWineD3DPixelShader **ppPixelShader, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DPixelShaderImpl *object; /* NOTE: impl allowed, this is a create */ - HRESULT hr = WINED3D_OK; - - if (!pFunction) return WINED3DERR_INVALIDCALL; + IWineD3DPixelShaderImpl *object; + HRESULT hr; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Out of memory\n"); - *ppPixelShader = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; + ERR("Failed to allocate shader memory.\n"); + return E_OUTOFMEMORY; } - object->lpVtbl = &IWineD3DPixelShader_Vtbl; - object->parent = parent; - shader_init(&object->baseShader, iface); - list_add_head(&This->shaders, &object->baseShader.shader_list_entry); - *ppPixelShader = (IWineD3DPixelShader *)object; - - TRACE("(%p) : Created pixel shader %p\n", This, *ppPixelShader); - - hr = IWineD3DPixelShader_SetFunction(*ppPixelShader, pFunction, output_signature); + hr = pixelshader_init(object, This, pFunction, output_signature, parent); if (FAILED(hr)) { - WARN("(%p) : Failed to set function, returning %#x\n", iface, hr); - IWineD3DPixelShader_Release(*ppPixelShader); - *ppPixelShader = NULL; + WARN("Failed to initialize pixel shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); return hr; } - return hr; + TRACE("Created pixel shader %p.\n", object); + *ppPixelShader = (IWineD3DPixelShader *)object; + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6ac145c..ba7be4b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -343,7 +343,7 @@ void pixelshader_update_samplers(struct shader_reg_maps *reg_maps, IWineD3DBaseT } } -const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = +static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = { /*** IUnknown methods ***/ IWineD3DPixelShaderImpl_QueryInterface, @@ -421,3 +421,27 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp } } } + +HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent) +{ + HRESULT hr; + + if (!byte_code) return WINED3DERR_INVALIDCALL; + + shader->lpVtbl = &IWineD3DPixelShader_Vtbl; + shader->parent = parent; + shader_init(&shader->baseShader, (IWineD3DDevice *)device); + list_add_head(&device->shaders, &shader->baseShader.shader_list_entry); + + hr = IWineD3DPixelShader_SetFunction((IWineD3DPixelShader *)shader, byte_code, output_signature); + if (FAILED(hr)) + { + WARN("Failed to set function, hr %#x.\n", hr); + shader_cleanup((IWineD3DBaseShader *)shader); + return hr; + } + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c93b22..f4e1845 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2831,7 +2831,9 @@ typedef struct IWineD3DPixelShaderImpl { } IWineD3DPixelShaderImpl; -extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl DECLSPEC_HIDDEN; +HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent) DECLSPEC_HIDDEN; void pixelshader_update_samplers(struct shader_reg_maps *reg_maps, IWineD3DBaseTexture * const *textures) DECLSPEC_HIDDEN; void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock,

1 0

Henri Verbeet : wined3d: Don' t free D3D vertex shaders until the wined3d vertex shader is destroyed.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: ca05ef5dd00385f46bb2fe94bce1f13d5860b7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca05ef5dd00385f46bb2fe94b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:08 2009 +0200 wined3d: Don't free D3D vertex shaders until the wined3d vertex shader is destroyed. --- dlls/d3d10core/shader.c | 23 +++++++++++++++++++---- dlls/d3d8/vertexshader.c | 28 +++++++++++++++++++++++++--- dlls/d3d9/vertexshader.c | 25 +++++++++++++++++++++---- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/vertexshader.c | 4 +++- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.idl | 3 ++- 7 files changed, 75 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca05ef5dd00385f46bb2f…

1 0

Henri Verbeet : d3d8: Add a separate function for vertex shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: afed6a3f77dc43e1ccc21cc1099621073b8030a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afed6a3f77dc43e1ccc21cc10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:07 2009 +0200 d3d8: Add a separate function for vertex shader initialization. --- dlls/d3d8/d3d8_private.h | 8 +-- dlls/d3d8/device.c | 122 +++++++++++----------------------------------- dlls/d3d8/vertexshader.c | 90 +++++++++++++++++++++++++++++++++- 3 files changed, 121 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afed6a3f77dc43e1ccc21…

1 0

Henri Verbeet : d3d9: Add a separate function for vertex shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: cdb741274a22c768c5e0327cd0b15f8ef00f0f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb741274a22c768c5e0327cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:06 2009 +0200 d3d9: Add a separate function for vertex shader initialization. --- dlls/d3d9/d3d9_private.h | 5 +++-- dlls/d3d9/device.c | 30 ++++++++++++++++++++++++++++++ dlls/d3d9/vertexshader.c | 46 +++++++++++++++------------------------------- 3 files changed, 48 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ebbdcdd..839ce5f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -206,8 +206,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9 IDirect3DVertexDeclaration9 *pDecl) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9Ex *iface, IDirect3DVertexDeclaration9 **ppDecl) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(IDirect3DDevice9Ex *iface, - const DWORD *pFunction, IDirect3DVertexShader9 **ppShader) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 *pShader) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(IDirect3DDevice9Ex *iface, @@ -528,6 +526,9 @@ typedef struct IDirect3DVertexShader9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DVertexShader9Impl; +HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, + IDirect3DDevice9Impl *device, const DWORD *byte_code) DECLSPEC_HIDDEN; + #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 19bdcba..28722b2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1830,6 +1830,36 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9EX iface, DWO return hr; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(IDirect3DDevice9Ex *iface, + const DWORD *byte_code, IDirect3DVertexShader9 **shader) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DVertexShader9Impl *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate vertex shader memory.\n"); + return E_OUTOFMEMORY; + } + + hr = vertexshader_init(object, This, byte_code); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created vertex shader %p.\n", object); + *shader = (IDirect3DVertexShader9 *)object; + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(LPDIRECT3DDEVICE9EX iface, UINT StreamNumber, IDirect3DVertexBuffer9* pStreamData, UINT OffsetInBytes, UINT Stride) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 8a5d5bc..399dadb 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -111,43 +111,27 @@ static const IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl = IDirect3DVertexShader9Impl_GetFunction }; +HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Impl *device, const DWORD *byte_code) +{ + HRESULT hr; -/* IDirect3DDevice9 IDirect3DVertexShader9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface, CONST DWORD* pFunction, IDirect3DVertexShader9** ppShader) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hrc = D3D_OK; - IDirect3DVertexShader9Impl *object; - - /* Setup a stub object for now */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - TRACE("(%p) : pFunction(%p), ppShader(%p)\n", This, pFunction, ppShader); - if (NULL == object) { - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } - - object->ref = 1; - object->lpVtbl = &Direct3DVertexShader9_Vtbl; + shader->ref = 1; + shader->lpVtbl = &Direct3DVertexShader9_Vtbl; wined3d_mutex_lock(); - hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, - NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); + hr = IWineD3DDevice_CreateVertexShader(device->WineD3DDevice, byte_code, + NULL /* output signature */, &shader->wineD3DVertexShader, (IUnknown *)shader); wined3d_mutex_unlock(); - - if (FAILED(hrc)) { - - /* free up object */ - FIXME("Call to IWineD3DDevice_CreateVertexShader failed\n"); - HeapFree(GetProcessHeap(), 0, object); - }else{ - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppShader = (IDirect3DVertexShader9 *)object; - TRACE("(%p) : Created vertex shader %p\n", This, object); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + return hr; } - TRACE("(%p) : returning %p\n", This, *ppShader); - return hrc; + shader->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(shader->parentDevice); + + return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9EX iface, IDirect3DVertexShader9* pShader) {

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_vertex_shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 0a72acc7f487731ab259b6dd88cb72dd0a677622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a72acc7f487731ab259b6dd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:05 2009 +0200 d3d10core: Add a separate function for d3d10_vertex_shader initialization. --- dlls/d3d10core/d3d10core_private.h | 4 +++- dlls/d3d10core/device.c | 21 +++------------------ dlls/d3d10core/shader.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 5d1e6ee..320ca69 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -132,7 +132,6 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ const void *shader_byte_code, SIZE_T shader_byte_code_length) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ -extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_vertex_shader { const struct ID3D10VertexShaderVtbl *vtbl; @@ -142,6 +141,9 @@ struct d3d10_vertex_shader struct wined3d_shader_signature output_signature; }; +HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; + /* ID3D10GeometryShader */ extern const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_geometry_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 5027092..4b64a2c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -935,7 +935,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i { struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_vertex_shader *object; - struct d3d10_shader_info shader_info; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", @@ -948,29 +947,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i return E_OUTOFMEMORY; } - object->vtbl = &d3d10_vertex_shader_vtbl; - object->refcount = 1; - - shader_info.output_signature = &object->output_signature; - hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + hr = d3d10_vertex_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { - ERR("Failed to extract shader, hr %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, - shader_info.shader_code, &object->output_signature, - &object->wined3d_shader, (IUnknown *)object); - if (FAILED(hr)) - { - ERR("CreateVertexShader failed, hr %#x\n", hr); - shader_free_signature(&object->output_signature); + WARN("Failed to initialize vertex shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } + TRACE("Created vertex shader %p.\n", object); *shader = (ID3D10VertexShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 11e080d..197b40a 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -214,7 +214,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3 return E_NOTIMPL; } -const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = +static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = { /* IUnknown methods */ d3d10_vertex_shader_QueryInterface, @@ -227,6 +227,36 @@ const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = d3d10_vertex_shader_SetPrivateDataInterface, }; +HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct d3d10_shader_info shader_info; + HRESULT hr; + + shader->vtbl = &d3d10_vertex_shader_vtbl; + shader->refcount = 1; + + shader_info.output_signature = &shader->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x.\n", hr); + return hr; + } + + hr = IWineD3DDevice_CreateVertexShader(device->wined3d_device, + shader_info.shader_code, &shader->output_signature, + &shader->wined3d_shader, (IUnknown *)shader); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + shader_free_signature(&shader->output_signature); + return hr; + } + + return S_OK; +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10GeometryShader *iface,

1 0

Henri Verbeet : wined3d: Add a separate function for vertex shader initialization.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 462decdfb9116d645fa11a453f6675b46bc2f43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=462decdfb9116d645fa11a453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:04 2009 +0200 wined3d: Add a separate function for vertex shader initialization. --- dlls/wined3d/device.c | 33 ++++++++++++--------------------- dlls/wined3d/vertexshader.c | 26 +++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30912f1..75e173f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1764,38 +1764,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac const DWORD *pFunction, const struct wined3d_shader_signature *output_signature, IWineD3DVertexShader **ppVertexShader, IUnknown *parent) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVertexShaderImpl *object; /* NOTE: impl usage is ok, this is a create */ - HRESULT hr = WINED3D_OK; - - if (!pFunction) return WINED3DERR_INVALIDCALL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DVertexShaderImpl *object; + HRESULT hr; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Out of memory\n"); - *ppVertexShader = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; + ERR("Failed to allocate shader memory.\n"); + return E_OUTOFMEMORY; } - object->lpVtbl = &IWineD3DVertexShader_Vtbl; - object->parent = parent; - shader_init(&object->baseShader, iface); - list_add_head(&This->shaders, &object->baseShader.shader_list_entry); - *ppVertexShader = (IWineD3DVertexShader *)object; - - TRACE("(%p) : Created vertex shader %p\n", This, *ppVertexShader); - - hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, output_signature); + hr = vertexshader_init(object, This, pFunction, output_signature, parent); if (FAILED(hr)) { - WARN("(%p) : Failed to set function, returning %#x\n", iface, hr); - IWineD3DVertexShader_Release(*ppVertexShader); - *ppVertexShader = NULL; + WARN("Failed to initialize vertex shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); return hr; } - return hr; + TRACE("Created vertex shader %p.\n", object); + *ppVertexShader = (IWineD3DVertexShader *)object; + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d24ecd6..ea700ba 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -332,7 +332,7 @@ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertex return WINED3D_OK; } -const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = +static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = { /*** IUnknown methods ***/ IWineD3DVertexShaderImpl_QueryInterface, @@ -352,3 +352,27 @@ void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockIm args->fog_src = stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE ? VS_FOG_COORD : VS_FOG_Z; args->swizzle_map = ((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.swizzle_map; } + +HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent) +{ + HRESULT hr; + + if (!byte_code) return WINED3DERR_INVALIDCALL; + + shader->lpVtbl = &IWineD3DVertexShader_Vtbl; + shader->parent = parent; + shader_init(&shader->baseShader, (IWineD3DDevice *)device); + list_add_head(&device->shaders, &shader->baseShader.shader_list_entry); + + hr = IWineD3DVertexShader_SetFunction((IWineD3DVertexShader *)shader, byte_code, output_signature); + if (FAILED(hr)) + { + WARN("Failed to set function, hr %#x.\n", hr); + shader_cleanup((IWineD3DBaseShader *)shader); + return hr; + } + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11f8c99..784b024 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2775,10 +2775,12 @@ typedef struct IWineD3DVertexShaderImpl { UINT min_rel_offset, max_rel_offset; UINT rel_offset; } IWineD3DVertexShaderImpl; -extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl DECLSPEC_HIDDEN; void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct vs_compile_args *args) DECLSPEC_HIDDEN; +HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DPixelShader implementation structure

1 0

Henri Verbeet : wined3d: Remove unused IWineD3DVertexShaderImpl fields.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 5ac3ed7f734b5a56611885fa3dfd65e5ecf070d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac3ed7f734b5a56611885fa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 18:42:03 2009 +0200 wined3d: Remove unused IWineD3DVertexShaderImpl fields. --- dlls/wined3d/wined3d_private.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95ca035..11f8c99 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2765,8 +2765,6 @@ typedef struct IWineD3DVertexShaderImpl { /* IWineD3DVertexShaderImpl */ IUnknown *parent; - DWORD usage; - /* The GL shader */ void *backend_priv; @@ -2776,8 +2774,6 @@ typedef struct IWineD3DVertexShaderImpl { UINT min_rel_offset, max_rel_offset; UINT rel_offset; - - UINT recompile_count; } IWineD3DVertexShaderImpl; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : pstorec: Add a typelib resource.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 14428cf22f5bd8ae96223e196585d562d65c3c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=14428cf22f5bd8ae96223e196… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 13:14:55 2009 +0200 pstorec: Add a typelib resource. --- .gitignore | 1 + dlls/pstorec/Makefile.in | 4 ++++ dlls/pstorec/pstorec_tlb.idl | 21 +++++++++++++++++++++ dlls/pstorec/rsrc.rc | 29 +++++++++++++++++++++++++++++ include/pstore.idl | 22 ++++++++++++++++++---- tools/wine.inf.in | 1 + 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5bff9b0..418244e 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,7 @@ dlls/oledb32/convert.h dlls/oledb32/convert_i.c dlls/oledb32/tests/convert.h dlls/oledb32/tests/convert_i.c +dlls/pstorec/pstorec_tlb.tlb dlls/qmgr/qmgr_local.h dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index 4ffedc8..c754081 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -8,6 +8,10 @@ IMPORTS = uuid kernel32 C_SRCS = \ pstorec.c +RC_SRCS = rsrc.rc + +IDL_TLB_SRCS = pstorec_tlb.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/pstorec/pstorec_tlb.idl b/dlls/pstorec/pstorec_tlb.idl new file mode 100644 index 0000000..dff2e9f --- /dev/null +++ b/dlls/pstorec/pstorec_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for pstorec + * + * Copyright 2009 Alexandre Julliard + * + * 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 "pstore.idl" diff --git a/dlls/pstorec/rsrc.rc b/dlls/pstorec/rsrc.rc new file mode 100644 index 0000000..85b6205 --- /dev/null +++ b/dlls/pstorec/rsrc.rc @@ -0,0 +1,29 @@ +/* + * Resource file for pstorec + * + * Copyright 2009 Alexandre Julliard + * + * 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 "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: pstorec_tlb.tlb */ +1 TYPELIB LOADONCALL DISCARDABLE pstorec_tlb.tlb diff --git a/include/pstore.idl b/include/pstore.idl index 62ce00b..590b905 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -34,6 +34,18 @@ typedef DWORD PST_KEY; typedef DWORD PST_PROVIDERCAPABILITIES; typedef GUID PST_PROVIDERID, *PPST_PROVIDERID; +/***************************************************************************** + * PSTOREC library + */ +[ + uuid(5a6f1ebd-2db1-11d0-8c39-00c04fd9126b), + version(1.0), + helpstring("PStore 1.0 Type Library") +] +library PSTORECLib +{ + importlib("stdole2.tlb"); + typedef struct _PST_PROVIDERINFO { DWORD cbSize; @@ -50,27 +62,27 @@ typedef struct _PST_PROMPTINFO LPCWSTR szPrompt; } PST_PROMPTINFO, *PPST_PROMPTINFO; -typedef struct { +typedef struct _PST_ACCESSCLAUSE { DWORD cbSize; PST_ACCESSCLAUSETYPE ClauseType; DWORD cbClauseData; BYTE* pbClauseData; } PST_ACCESSCLAUSE, *PPST_ACCESSCLAUSE; -typedef struct { +typedef struct _PST_ACCESSRULE { DWORD cbSize; PST_ACCESSMODE AccessModeFlags; DWORD cClauses; PST_ACCESSCLAUSE* rgClauses; } PST_ACCESSRULE, *PPST_ACCESSRULE; -typedef struct { +typedef struct _PST_ACCESSRULESET { DWORD cbSize; DWORD cClause; PST_ACCESSRULE* rgRules; } PST_ACCESSRULESET, *PPST_ACCESSRULESET; -typedef struct { +typedef struct _PST_TYPEINFO { DWORD cbSize; LPWSTR szDisplayName; } PST_TYPEINFO, *PPST_TYPEINFO; @@ -259,3 +271,5 @@ interface IPStore : IUnknown [in] DWORD dwFlags, [in] IEnumPStoreItems** ppenum ); } + +}; diff --git a/tools/wine.inf.in b/tools/wine.inf.in index aedf14e..633d807 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2497,6 +2497,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,opengl32.dll 11,,progman.exe 11,,psapi.dll +11,,pstorec.dll 11,,quartz.dll 11,,regsvr32.exe 11,,reg.exe

1 0