November 2008 - Wine-commits

Ricardo Filipe : msxml3: Check some dead store results (llvm/clang).
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: e5e301b7a55cfbf9fff5890889159ffe77efffd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e301b7a55cfbf9fff589088… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu Nov 13 13:33:27 2008 +0000 msxml3: Check some dead store results (llvm/clang). --- dlls/msxml3/saxreader.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5b16663..9fc226a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1168,6 +1168,13 @@ static void libxmlEndElementNS( Prefix, SysStringLen(Prefix)); SysFreeString(Prefix); + + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + } } @@ -1218,6 +1225,12 @@ static void libxmlCharacters( Chars, SysStringLen(Chars)); SysFreeString(Chars); + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + This->column += end-cur+1; if(lastEvent) @@ -1772,7 +1785,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz hr = SAXLocator_create(This, &locator, vbInterface); if(FAILED(hr)) - return E_FAIL; + return hr; locator->pParserCtxt = xmlCreateMemoryParserCtxt(buffer, size); if(!locator->pParserCtxt) @@ -1797,7 +1810,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz } ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); - return S_OK; + return hr; } static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInterface) @@ -1813,7 +1826,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt hr = SAXLocator_create(This, &locator, vbInterface); if(FAILED(hr)) - return E_FAIL; + return hr; locator->pParserCtxt = xmlCreatePushParserCtxt( &locator->saxreader->sax, locator,

1 0

Henri Verbeet : dxgi: Implement IDXGIAdapter::GetParent().
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: 5ee75364489dc0bb3a355926e5d53887cc042871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee75364489dc0bb3a355926e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 20 13:32:00 2008 +0100 dxgi: Implement IDXGIAdapter::GetParent(). --- dlls/dxgi/adapter.c | 6 ++++-- dlls/dxgi/dxgi_main.c | 1 + dlls/dxgi/dxgi_private.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 54e5143..d2c64ad 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -99,9 +99,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IWineDXGIAdapter *i static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_adapter *This = (struct dxgi_adapter *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p\n", iface, debugstr_guid(riid), parent); + + return IDXGIFactory_QueryInterface(This->parent, riid, parent); } /* IDXGIAdapter methods */ diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index a6dc5e6..370fcdd 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -126,6 +126,7 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) adapter->vtbl = &dxgi_adapter_vtbl; adapter->refcount = 1; adapter->ordinal = i; + adapter->parent = (IDXGIFactory *)object; object->adapters[i] = (IDXGIAdapter *)adapter; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 25c54cb..95cfe58 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -66,6 +66,7 @@ extern const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl; struct dxgi_adapter { const struct IWineDXGIAdapterVtbl *vtbl; + IDXGIFactory *parent; LONG refcount; UINT ordinal; };

1 0

Henri Verbeet : dxgi: Implement IDXGIDevice::GetAdapter().
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: ba532a3edba9677b8660df10513c2d13cb711c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba532a3edba9677b8660df105… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 20 13:32:00 2008 +0100 dxgi: Implement IDXGIDevice::GetAdapter(). --- dlls/dxgi/device.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7ccece6..1b82b2a 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -117,9 +117,24 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IDXGIDevice *iface, REFII static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IDXGIDevice *iface, IDXGIAdapter **adapter) { - FIXME("iface %p, adapter %p stub!\n", iface, adapter); + struct dxgi_device *This = (struct dxgi_device *)iface; + WINED3DDEVICE_CREATION_PARAMETERS create_parameters; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, adapter %p\n", iface, adapter); + + EnterCriticalSection(&dxgi_cs); + + hr = IWineD3DDevice_GetCreationParameters(This->wined3d_device, &create_parameters); + if (FAILED(hr)) + { + LeaveCriticalSection(&dxgi_cs); + return hr; + } + + LeaveCriticalSection(&dxgi_cs); + + return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.AdapterOrdinal, adapter); } static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice *iface,

1 0

Henri Verbeet : wined3d: Remove some unused code.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: ba78f072e2904323f38f078f214d003187ef715d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba78f072e2904323f38f078f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 20 13:32:00 2008 +0100 wined3d: Remove some unused code. --- dlls/wined3d/wined3d_private.h | 15 -------- include/wine/wined3d_types.h | 77 ---------------------------------------- 2 files changed, 0 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3fdf38..fb05ec0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2308,17 +2308,10 @@ typedef struct IWineD3DVertexShaderImpl { attrib_declaration swizzled_attribs [MAX_ATTRIBS]; UINT num_swizzled_attribs; - /* run time data... */ - VSHADERDATA *data; UINT min_rel_offset, max_rel_offset; UINT rel_offset; UINT recompile_count; -#if 0 /* needs reworking */ - /* run time data */ - VSHADERINPUTDATA input; - VSHADEROUTPUTDATA output; -#endif } IWineD3DVertexShaderImpl; extern const SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[]; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; @@ -2354,9 +2347,6 @@ typedef struct IWineD3DPixelShaderImpl { BOOL input_reg_used[MAX_REG_INPUT]; int declared_in_count; - /* run time data */ - PSHADERDATA *data; - /* Some information about the shader behavior */ struct stb_const_desc bumpenvmatconst[MAX_TEXTURES]; char numbumpenvmatconsts; @@ -2369,11 +2359,6 @@ typedef struct IWineD3DPixelShaderImpl { BOOL render_offscreen; UINT height; enum vertexprocessing_mode vertexprocessing; - -#if 0 /* needs reworking */ - PSHADERINPUTDATA input; - PSHADEROUTPUTDATA output; -#endif } IWineD3DPixelShaderImpl; extern const SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[]; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 28e5525..a389ab7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -123,83 +123,6 @@ typedef struct _WINED3DLINEPATTERN { WORD wLinePattern; } WINED3DLINEPATTERN; -#define WINED3D_VSHADER_MAX_CONSTANTS 96 -#define WINED3D_PSHADER_MAX_CONSTANTS 32 - -typedef struct _WINED3DVECTOR_3 { - float x; - float y; - float z; -} WINED3DVECTOR_3; - -typedef struct _WINED3DVECTOR_4 { - float x; - float y; - float z; - float w; -} WINED3DVECTOR_4; - -typedef struct WINED3DSHADERVECTOR { - float x; - float y; - float z; - float w; -} WINED3DSHADERVECTOR; - -typedef struct WINED3DSHADERSCALAR { - float x; -} WINED3DSHADERSCALAR; - -typedef WINED3DSHADERVECTOR WINEVSHADERCONSTANTS8[WINED3D_VSHADER_MAX_CONSTANTS]; - -typedef struct VSHADERDATA { - /** Run Time Shader Function Constants */ - /*D3DXBUFFER* constants;*/ - WINEVSHADERCONSTANTS8 C; - /** Shader Code as char ... */ - CONST DWORD* code; - UINT codeLength; -} VSHADERDATA; - -/** temporary here waiting for buffer code */ -typedef struct VSHADERINPUTDATA { - WINED3DSHADERVECTOR V[17]; -} WINEVSHADERINPUTDATA; - -/** temporary here waiting for buffer code */ -typedef struct VSHADEROUTPUTDATA { - WINED3DSHADERVECTOR oPos; - WINED3DSHADERVECTOR oD[2]; - WINED3DSHADERVECTOR oT[8]; - WINED3DSHADERVECTOR oFog; - WINED3DSHADERVECTOR oPts; -} WINEVSHADEROUTPUTDATA; - -typedef WINED3DSHADERVECTOR WINEPSHADERCONSTANTS8[WINED3D_PSHADER_MAX_CONSTANTS]; - -typedef struct PSHADERDATA { - /** Run Time Shader Function Constants */ - /*D3DXBUFFER* constants;*/ - WINEPSHADERCONSTANTS8 C; - /** Shader Code as char ... */ - CONST DWORD* code; - UINT codeLength; -} PSHADERDATA; - -/** temporary here waiting for buffer code */ -typedef struct PSHADERINPUTDATA { - WINED3DSHADERVECTOR V[2]; - WINED3DSHADERVECTOR T[8]; - WINED3DSHADERVECTOR S[16]; - /*D3DSHADERVECTOR R[12];*/ -} WINEPSHADERINPUTDATA; - -/** temporary here waiting for buffer code */ -typedef struct PSHADEROUTPUTDATA { - WINED3DSHADERVECTOR oC[4]; - WINED3DSHADERVECTOR oDepth; -} WINEPSHADEROUTPUTDATA; - /***************************************************************************** * WineD3D Structures to be used when d3d8 and d3d9 are incompatible */

1 0

Henri Verbeet : wined3d: Don' t use the same GUID for IWineD3D and IWineD3DDevice.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: 41de62f71d9ea49e2a2b2da9795515d3a363b04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41de62f71d9ea49e2a2b2da97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 20 13:32:00 2008 +0100 wined3d: Don't use the same GUID for IWineD3D and IWineD3DDevice. --- include/wine/wined3d_interface.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 2188176..8443767 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -116,9 +116,9 @@ DEFINE_GUID(IID_IWineD3D, DEFINE_GUID(IID_IWineD3DBase, 0x46799311, 0x8e0e, 0x40ce, 0xb2, 0xec, 0xdd, 0xb9, 0x9f, 0x18, 0xfc, 0xb4); -/* {108F9C44-6F30-11d9-C687-00046142C14F} */ +/* {6d10a2ce-09d0-4a53-a427-11388f9f8ca5} */ DEFINE_GUID(IID_IWineD3DDevice, -0x108f9c44, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); +0x6d10a2ce, 0x09d0, 0x4a53, 0xa4, 0x27, 0x11, 0x38, 0x8f, 0x9f, 0x8c, 0xa5); /* {f756720c-32b9-4439-b5a3-1d6c97037d9e} */ DEFINE_GUID(IID_IWineD3DPalette,

1 0

Henri Verbeet : wined3d: wined3d_gl.h should be internal to wined3d.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: 8899f3412b220adf7c7ba99fb5028b6e0ef9e48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8899f3412b220adf7c7ba99fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 20 13:32:00 2008 +0100 wined3d: wined3d_gl.h should be internal to wined3d. --- {include/wine => dlls/wined3d}/wined3d_gl.h | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/wine/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h similarity index 99% rename from include/wine/wined3d_gl.h rename to dlls/wined3d/wined3d_gl.h index 6036688..4dba7d2 100644 --- a/include/wine/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1965,8 +1965,8 @@ typedef void (WINE_GLAPI * PGLFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint le /* GL_EXT_texture_env_dot3 */ #ifndef GL_EXT_texture_env_dot3 #define GL_EXT_texture_env_dot3 1 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 +#define GL_DOT3_RGB_EXT 0x8740 +#define GL_DOT3_RGBA_EXT 0x8741 #endif /* GL_EXT_texture_lod_bias */ #ifndef GL_EXT_texture_lod_bias @@ -2740,7 +2740,7 @@ typedef void (WINE_GLAPI * PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage #endif /** - * Point sprites + * Point sprites */ /* GL_ARB_point_sprite */ #ifndef GL_ARB_point_sprite @@ -2749,11 +2749,11 @@ typedef void (WINE_GLAPI * PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage #define GL_COORD_REPLACE_ARB 0x8862 #endif /** - * @TODO: GL_NV_point_sprite + * @TODO: GL_NV_point_sprite */ /** - * Occlusion Queries + * Occlusion Queries */ /* GL_ARB_occlusion_query */ #ifndef GL_ARB_occlusion_query @@ -3192,8 +3192,8 @@ typedef void (WINE_GLAPI * PGLFNVERTEXATTRIBPOINTERPROC) (GLuint index, GLint si /**************************************************** - * OpenGL Official Version - * defines + * OpenGL Official Version + * defines ****************************************************/ /* GL_VERSION_1_3 */ #if !defined(GL_DOT3_RGBA) @@ -3396,7 +3396,7 @@ typedef enum _GL_SupportedExt { /**************************************************** - * #Defines + * #Defines ****************************************************/ #define GL_EXT_FUNCS_GEN \ /** ARB Extensions **/ \ @@ -3809,7 +3809,7 @@ typedef BOOL (WINAPI * WINED3D_PFNWGLSETPIXELFORMATWINE) (HDC hdc, int iPixelFor /**************************************************** - * Structures + * Structures ****************************************************/ typedef struct { @@ -3840,7 +3840,7 @@ typedef struct _WineD3D_GL_Info { DWORD driver_version_hipart; CHAR gl_renderer[255]; /** - * CAPS Constants + * CAPS Constants */ UINT max_buffers; UINT max_lights; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae7e3df..c3fdf38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -40,7 +40,7 @@ #include "wined3d_private_types.h" #include "wine/wined3d_interface.h" #include "wine/wined3d_caps.h" -#include "wine/wined3d_gl.h" +#include "wined3d_gl.h" #include "wine/list.h" /* Hash table functions */

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement MmGetSystemRoutineAddress.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: 4defc2b50a27cd7f3cf3907d31c37d6c3506d1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4defc2b50a27cd7f3cf3907d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 17 21:01:10 2008 +1100 ntoskrnl.exe: Implement MmGetSystemRoutineAddress. --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e4b0ea5..c41d289 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1071,6 +1071,36 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE return STATUS_SUCCESS; } +/*********************************************************************** + * MmGetSystemRoutineAddress (NTOSKRNL.EXE.@) + */ +PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) +{ + HMODULE hMod; + STRING routineNameA; + PVOID pFunc = NULL; + + static const WCHAR ntoskrnlW[] = {'n','t','o','s','k','r','n','l','.','e','x','e',0}; + static const WCHAR halW[] = {'h','a','l','.','d','l','l',0}; + + if (!SystemRoutineName) return NULL; + + if (RtlUnicodeStringToAnsiString( &routineNameA, SystemRoutineName, TRUE ) == STATUS_SUCCESS) + { + /* We only support functions exported from ntoskrnl.exe or hal.dll */ + hMod = GetModuleHandleW( ntoskrnlW ); + pFunc = GetProcAddress( hMod, routineNameA.Buffer ); + if (!pFunc) + { + hMod = GetModuleHandleW( halW ); + if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); + } + RtlFreeAnsiString( &routineNameA ); + } + + TRACE( "%s -> %p\n", debugstr_us(SystemRoutineName), pFunc ); + return pFunc; +} /***************************************************** * DllMain diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7d543d4..9303d03 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -675,7 +675,7 @@ @ stub MmFreePagesFromMdl @ stub MmGetPhysicalAddress @ stub MmGetPhysicalMemoryRanges -@ stub MmGetSystemRoutineAddress +@ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical @ stub MmGrowKernelStack @ stub MmHighestUserAddress

1 0

Stefan Dösinger : wined3d: Rename the fragment ffp desc structures.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: 5c79a9f437ab4a1f1d4648249debd999fff63afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c79a9f437ab4a1f1d4648249… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 7 17:15:29 2008 +0100 wined3d: Rename the fragment ffp desc structures. This reflects the fact that they describe the fragment pipeline. The vertex pipeline will use its own structures. --- dlls/wined3d/arb_program_shader.c | 14 +++++++------- dlls/wined3d/ati_fragment_shader.c | 12 ++++++------ dlls/wined3d/utils.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cb89892..12148e6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2372,7 +2372,7 @@ const shader_backend_t arb_program_shader_backend = { struct arbfp_ffp_desc { - struct ffp_desc parent; + struct ffp_frag_desc parent; GLuint shader; unsigned int num_textures_used; }; @@ -2401,7 +2401,7 @@ static HRESULT arbfp_alloc(IWineD3DDevice *iface) { if(!This->fragment_priv) return E_OUTOFMEMORY; } priv = (struct shader_arb_priv *) This->fragment_priv; - priv->fragment_shaders = hash_table_create(ffp_program_key_hash, ffp_program_key_compare); + priv->fragment_shaders = hash_table_create(ffp_frag_program_key_hash, ffp_frag_program_key_compare); priv->use_arbfp_fixed_func = TRUE; return WINED3D_OK; } @@ -2792,7 +2792,7 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, } /* The stateblock is passed for GLINFO_LOCATION */ -static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateBlockImpl *stateblock) { +static GLuint gen_arbfp_ffp_shader(struct ffp_frag_settings *settings, IWineD3DStateBlockImpl *stateblock) { unsigned int stage; SHADER_BUFFER buffer; BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; @@ -3060,7 +3060,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct shader_arb_priv *priv = (struct shader_arb_priv *) device->fragment_priv; BOOL use_pshader = use_ps(device); BOOL use_vshader = use_vs(device); - struct ffp_settings settings; + struct ffp_frag_settings settings; struct arbfp_ffp_desc *desc; unsigned int i; @@ -3082,8 +3082,8 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, IWineD3DPixelShader_CompileShader(stateblock->pixelShader); } else { /* Find or create a shader implementing the fixed function pipeline settings, then activate it */ - gen_ffp_op(stateblock, &settings, FALSE); - desc = (struct arbfp_ffp_desc *) find_ffp_shader(priv->fragment_shaders, &settings); + gen_ffp_frag_op(stateblock, &settings, FALSE); + desc = (struct arbfp_ffp_desc *) find_ffp_frag_shader(priv->fragment_shaders, &settings); if(!desc) { desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); if(!desc) { @@ -3098,7 +3098,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, memcpy(&desc->parent.settings, &settings, sizeof(settings)); desc->shader = gen_arbfp_ffp_shader(&settings, stateblock); - add_ffp_shader(priv->fragment_shaders, &desc->parent); + add_ffp_frag_shader(priv->fragment_shaders, &desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", desc); } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 10100e2..a53108e 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); /* GL_ATI_fragment_shader specific fixed function pipeline description. "Inherits" from the common one */ struct atifs_ffp_desc { - struct ffp_desc parent; + struct ffp_frag_desc parent; GLuint shader; unsigned int num_textures_used; }; @@ -803,13 +803,13 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *This = stateblock->wineD3DDevice; struct atifs_ffp_desc *desc; - struct ffp_settings settings; + struct ffp_frag_settings settings; struct atifs_private_data *priv = (struct atifs_private_data *) This->fragment_priv; DWORD mapped_stage; unsigned int i; - gen_ffp_op(stateblock, &settings, TRUE); - desc = (struct atifs_ffp_desc *) find_ffp_shader(priv->fragment_shaders, &settings); + gen_ffp_frag_op(stateblock, &settings, TRUE); + desc = (struct atifs_ffp_desc *) find_ffp_frag_shader(priv->fragment_shaders, &settings); if(!desc) { desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); if(!desc) { @@ -824,7 +824,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi memcpy(&desc->parent.settings, &settings, sizeof(settings)); desc->shader = gen_ati_shader(settings.op, &GLINFO_LOCATION); - add_ffp_shader(priv->fragment_shaders, &desc->parent); + add_ffp_frag_shader(priv->fragment_shaders, &desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", desc); } @@ -1074,7 +1074,7 @@ static HRESULT atifs_alloc(IWineD3DDevice *iface) { return E_OUTOFMEMORY; } priv = (struct atifs_private_data *) This->fragment_priv; - priv->fragment_shaders = hash_table_create(ffp_program_key_hash, ffp_program_key_compare); + priv->fragment_shaders = hash_table_create(ffp_frag_program_key_hash, ffp_frag_program_key_compare); return WINED3D_OK; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 93cfc41..b49072f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1793,7 +1793,7 @@ void *hash_table_get(struct hash_table_t *table, void *key) } #define GLINFO_LOCATION stateblock->wineD3DDevice->adapter->gl_info -void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *settings, BOOL ignore_textype) { +void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_settings *settings, BOOL ignore_textype) { #define ARG1 0x01 #define ARG2 0x02 #define ARG0 0x04 @@ -2013,13 +2013,13 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting } #undef GLINFO_LOCATION -struct ffp_desc *find_ffp_shader(struct hash_table_t *fragment_shaders, struct ffp_settings *settings) +struct ffp_frag_desc *find_ffp_frag_shader(struct hash_table_t *fragment_shaders, struct ffp_frag_settings *settings) { - return (struct ffp_desc *)hash_table_get(fragment_shaders, settings);} + return (struct ffp_frag_desc *)hash_table_get(fragment_shaders, settings);} -void add_ffp_shader(struct hash_table_t *shaders, struct ffp_desc *desc) { - struct ffp_settings *key = HeapAlloc(GetProcessHeap(), 0, sizeof(*key)); - /* Note that the key is the implementation independent part of the ffp_desc structure, +void add_ffp_frag_shader(struct hash_table_t *shaders, struct ffp_frag_desc *desc) { + struct ffp_frag_settings *key = HeapAlloc(GetProcessHeap(), 0, sizeof(*key)); + /* Note that the key is the implementation independent part of the ffp_frag_desc structure, * whereas desc points to an extended structure with implementation specific parts. * Make a copy of the key because hash_table_put takes ownership of it */ @@ -2121,8 +2121,8 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } #undef GLINFO_LOCATION -unsigned int ffp_program_key_hash(void *key) { - struct ffp_settings *k = (struct ffp_settings *)key; +unsigned int ffp_frag_program_key_hash(void *key) { + struct ffp_frag_settings *k = (struct ffp_frag_settings *)key; unsigned int hash = 0, i; DWORD *blob; @@ -2147,9 +2147,9 @@ unsigned int ffp_program_key_hash(void *key) { return hash; } -BOOL ffp_program_key_compare(void *keya, void *keyb) { - struct ffp_settings *ka = (struct ffp_settings *)keya; - struct ffp_settings *kb = (struct ffp_settings *)keyb; +BOOL ffp_frag_program_key_compare(void *keya, void *keyb) { + struct ffp_frag_settings *ka = (struct ffp_frag_settings *)keya; + struct ffp_frag_settings *kb = (struct ffp_frag_settings *)keyb; return memcmp(ka, kb, sizeof(*ka)) == 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ca1edd..ae7e3df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -853,7 +853,7 @@ struct texture_stage_op WINED3DFORMAT color_correction; }; -struct ffp_settings { +struct ffp_frag_settings { struct texture_stage_op op[MAX_TEXTURES]; enum { FOG_OFF, @@ -865,16 +865,16 @@ struct ffp_settings { unsigned int sRGB_write; }; -struct ffp_desc +struct ffp_frag_desc { - struct ffp_settings settings; + struct ffp_frag_settings settings; }; -void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *settings, BOOL ignore_textype); -struct ffp_desc *find_ffp_shader(struct hash_table_t *fragment_shaders, struct ffp_settings *settings); -void add_ffp_shader(struct hash_table_t *shaders, struct ffp_desc *desc); -BOOL ffp_program_key_compare(void *keya, void *keyb); -unsigned int ffp_program_key_hash(void *key); +void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_settings *settings, BOOL ignore_textype); +struct ffp_frag_desc *find_ffp_frag_shader(struct hash_table_t *fragment_shaders, struct ffp_frag_settings *settings); +void add_ffp_frag_shader(struct hash_table_t *shaders, struct ffp_frag_desc *desc); +BOOL ffp_frag_program_key_compare(void *keya, void *keyb); +unsigned int ffp_frag_program_key_hash(void *key); /***************************************************************************** * IWineD3D implementation structure

1 0

Andrew Talbot : usp10: Sign-compare warnings fix.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: bf92d68330f5f755331a5d7bea70a1e0207f8287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf92d68330f5f755331a5d7be… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 19 21:28:04 2008 +0000 usp10: Sign-compare warnings fix. --- dlls/usp10/usp10.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2bc0617..4af14ae 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1030,7 +1030,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, */ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) { - unsigned int i; + int i; TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); @@ -1220,7 +1220,8 @@ complex_ranges[] = */ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) { - unsigned int i, j; + int i; + unsigned int j; TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); @@ -1336,7 +1337,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) { HRESULT hr; - unsigned int i; + int i; TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); @@ -1400,7 +1401,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars int cChars, DWORD dwFlags, WORD *pwOutGlyphs) { HRESULT hr; - unsigned int i; + int i; TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), cChars, dwFlags, pwOutGlyphs); @@ -1642,7 +1643,7 @@ HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) */ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) { - unsigned int i, j; + int i, j; StringAnalysis *analysis = ssa; TRACE("(%p)\n", ssa); @@ -1721,7 +1722,8 @@ const int * WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa) */ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) { - unsigned int i, j, k; + int i, j; + unsigned int k; StringAnalysis *analysis = ssa; TRACE("(%p)\n", ssa);

1 0

Stefan Dösinger : d3d9: Test psize_min vs psize_max vs psize behavior.
by Alexandre Julliard 20 Nov '08

20 Nov '08

Module: wine Branch: master Commit: cd011661e6d3930c6688b358034818a86bc04c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd011661e6d3930c6688b3580… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 7 17:02:54 2008 +0100 d3d9: Test psize_min vs psize_max vs psize behavior. Add a test that checks what happens if D3DRS_POINTSIZE, D3DRS_POINTSIZE_MIN and POINTSIZE_MAX have conflicting values. D3DRS_POINTSIZE_MAX trumps D3DRS_POINTSIZE_MIN, and both MIN and MAX clamp the D3DRS_POINTSIZE value if it is outside of their range. --- dlls/d3d9/tests/visual.c | 72 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 71 +++++++++++++++++++-------------------------- 2 files changed, 100 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd011661e6d3930c6688b…

1 0