December 2008 - Wine-commits

Alexandre Julliard : widl: Use local functions where possible instead of STUB_FORWARDING_FUNCTION in stub vtables .
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 014dcb81e837fdde32a8b659a7d482b87936c581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014dcb81e837fdde32a8b659a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 15:11:26 2008 +0100 widl: Use local functions where possible instead of STUB_FORWARDING_FUNCTION in stub vtables. --- tools/widl/proxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 53d5c9d..95651fc 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -543,7 +543,7 @@ static int write_stub_methods(type_t *iface, int skip) const func_t *cur; int i = 0; - if (iface->ref) i = write_stub_methods(iface->ref, TRUE); + if (iface->ref) i = write_stub_methods(iface->ref, need_delegation(iface)); else return i; /* skip IUnknown */ if (iface->funcs) LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) {

1 0

Alexandre Julliard : server: Add functions for conversions between server object handles and pointer-style handles .
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: d1b3d484f7e452deeb504e8822db86b2def9e8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b3d484f7e452deeb504e882… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 16:05:17 2008 +0100 server: Add functions for conversions between server object handles and pointer-style handles. --- dlls/kernel32/console.c | 16 ++++--- dlls/kernel32/debugger.c | 14 +++--- dlls/kernel32/kernel16.c | 4 +- dlls/kernel32/kernel_private.h | 6 ++- dlls/kernel32/process.c | 38 ++++++++-------- dlls/ntdll/atom.c | 22 +++++----- dlls/ntdll/directory.c | 6 +- dlls/ntdll/exception.c | 8 ++-- dlls/ntdll/file.c | 54 +++++++++++----------- dlls/ntdll/loader.c | 2 +- dlls/ntdll/nt.c | 35 ++++++++------- dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/om.c | 38 ++++++++-------- dlls/ntdll/process.c | 16 +++--- dlls/ntdll/reg.c | 36 ++++++++-------- dlls/ntdll/sec.c | 4 +- dlls/ntdll/serial.c | 8 ++-- dlls/ntdll/server.c | 24 +++++----- dlls/ntdll/sync.c | 85 ++++++++++++++++++----------------- dlls/ntdll/thread.c | 52 +++++++++++----------- dlls/ntdll/virtual.c | 26 ++++++------ dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++--- dlls/user32/message.c | 7 ++- dlls/user32/property.c | 14 +++--- dlls/user32/win.c | 2 +- dlls/user32/winstation.c | 33 +++++++------- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/ws2_32/socket.c | 40 ++++++++-------- include/wine/server.h | 19 +++++++- programs/wineconsole/wineconsole.c | 28 ++++++------ 30 files changed, 341 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1b3d484f7e452deeb504…

1 0

Alexandre Julliard : server: Make object handles ints instead of pointers.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 0d3d456bd05c70eaa387745f083eca63dda6d137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3d456bd05c70eaa387745f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 16:04:20 2008 +0100 server: Make object handles ints instead of pointers. --- include/wine/server_protocol.h | 2 +- server/handle.c | 14 +- server/process.c | 2 +- server/protocol.def | 2 +- server/request.c | 2 +- server/trace.c | 476 ++++++++++++++++++++-------------------- tools/make_requests | 2 +- 7 files changed, 250 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d3d456bd05c70eaa3877…

1 0

Alexandre Julliard : kernel32/tests: Added some tests for behavior of 64-bit kernel handles.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 7749b6e2dd7c53776a076037f6fb410cdb3fccd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7749b6e2dd7c53776a076037f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 13:39:31 2008 +0100 kernel32/tests: Added some tests for behavior of 64-bit kernel handles. --- dlls/kernel32/tests/process.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a01d91b..e5f5e7e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1520,6 +1520,36 @@ static void test_GetProcessVersion(void) CloseHandle(pi.hThread); } +static void test_Handles(void) +{ + HANDLE handle = GetCurrentProcess(); + BOOL ret; + DWORD code; + + ok( handle == (HANDLE)~(ULONG_PTR)0, "invalid current process handle %p\n", handle ); + ret = GetExitCodeProcess( handle, &code ); + ok( ret, "GetExitCodeProcess failed err %u\n", GetLastError() ); +#ifdef _WIN64 + /* truncated handle */ + SetLastError( 0xdeadbeef ); + handle = (HANDLE)((ULONG_PTR)handle & ~0u); + ret = GetExitCodeProcess( handle, &code ); + ok( !ret, "GetExitCodeProcess succeeded for %p\n", handle ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + /* sign-extended handle */ + SetLastError( 0xdeadbeef ); + handle = (HANDLE)((LONG_PTR)(int)(ULONG_PTR)handle); + ret = GetExitCodeProcess( handle, &code ); + ok( ret, "GetExitCodeProcess failed err %u\n", GetLastError() ); + /* invalid high-word */ + SetLastError( 0xdeadbeef ); + handle = (HANDLE)(((ULONG_PTR)handle & ~0u) + ((ULONG_PTR)1 << 32)); + ret = GetExitCodeProcess( handle, &code ); + ok( !ret, "GetExitCodeProcess succeeded for %p\n", handle ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); +#endif +} + START_TEST(process) { int b = init(); @@ -1541,6 +1571,7 @@ START_TEST(process) test_ExitCode(); test_OpenProcess(); test_GetProcessVersion(); + test_Handles(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Alexandre Julliard : include: Fix the 64-bit value of magic handle constants.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: fea2aa55d03aeae73100c25f27bcb0b614f65da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea2aa55d03aeae73100c25f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 15:51:22 2008 +0100 include: Fix the 64-bit value of magic handle constants. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/thread.c | 2 +- include/winbase.h | 16 ++++++++-------- include/wine/test.h | 4 ++-- include/wingdi.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index dcf4ce8..9893181 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3141,7 +3141,7 @@ BOOL WINAPI IsWow64Process(HANDLE hProcess, PBOOL Wow64Process) #undef GetCurrentProcess HANDLE WINAPI GetCurrentProcess(void) { - return (HANDLE)0xffffffff; + return (HANDLE)~(ULONG_PTR)0; } /*********************************************************************** diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b5a3708..b084943 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -557,7 +557,7 @@ VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT boost ) #undef GetCurrentThread HANDLE WINAPI GetCurrentThread(void) { - return (HANDLE)0xfffffffe; + return (HANDLE)~(ULONG_PTR)1; } diff --git a/include/winbase.h b/include/winbase.h index 714a670..6b19a4b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -309,16 +309,16 @@ typedef struct _PROCESS_HEAP_ENTRY #define PROCESS_HEAP_ENTRY_MOVEABLE 0x0010 #define PROCESS_HEAP_ENTRY_DDESHARE 0x0020 -#define INVALID_HANDLE_VALUE ((HANDLE)~0UL) -#define INVALID_FILE_SIZE ((DWORD)~0UL) -#define INVALID_SET_FILE_POINTER ((DWORD)~0UL) -#define INVALID_FILE_ATTRIBUTES ((DWORD)~0UL) +#define INVALID_HANDLE_VALUE ((HANDLE)~(ULONG_PTR)0) +#define INVALID_FILE_SIZE (~0u) +#define INVALID_SET_FILE_POINTER (~0u) +#define INVALID_FILE_ATTRIBUTES (~0u) #define LOCKFILE_FAIL_IMMEDIATELY 1 #define LOCKFILE_EXCLUSIVE_LOCK 2 -#define FLS_OUT_OF_INDEXES ((DWORD)~0UL) -#define TLS_OUT_OF_INDEXES ((DWORD)~0UL) +#define FLS_OUT_OF_INDEXES (~0u) +#define TLS_OUT_OF_INDEXES (~0u) #define SHUTDOWN_NORETRY 1 @@ -2436,8 +2436,8 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVO } #ifdef __WINESRC__ -#define GetCurrentProcess() ((HANDLE)0xffffffff) -#define GetCurrentThread() ((HANDLE)0xfffffffe) +#define GetCurrentProcess() ((HANDLE)~(ULONG_PTR)0) +#define GetCurrentThread() ((HANDLE)~(ULONG_PTR)1) #endif /* WinMain(entry point) must be declared in winbase.h. */ diff --git a/include/wine/test.h b/include/wine/test.h index 62d8c3a..caa3f35 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -40,10 +40,10 @@ #endif #ifndef INVALID_FILE_ATTRIBUTES -#define INVALID_FILE_ATTRIBUTES ((DWORD)~0UL) +#define INVALID_FILE_ATTRIBUTES (~0u) #endif #ifndef INVALID_SET_FILE_POINTER -#define INVALID_SET_FILE_POINTER ((DWORD)~0UL) +#define INVALID_SET_FILE_POINTER (~0u) #endif /* debug level */ diff --git a/include/wingdi.h b/include/wingdi.h index e7be055..ac4ba2b 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3253,8 +3253,8 @@ typedef struct _BLENDFUNCTION #define GRADIENT_FILL_TRIANGLE 0x00000002 #define GRADIENT_FILL_OP_FLAG 0x000000ff -#define GDI_ERROR (0xFFFFFFFFL) -#define HGDI_ERROR ((HANDLE)0xFFFFFFFFL) +#define GDI_ERROR (~0u) +#define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0) /* AddFontResourceEx flags */ #define FR_PRIVATE 0x10

1 0

Henri Verbeet : wined3d: Return early from shader_trace_init() when a NULL pFunction is passed.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 9887d66dad79cfbdb6945a5ae478a7fe5e3c8bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9887d66dad79cfbdb6945a5ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 8 10:30:02 2008 +0100 wined3d: Return early from shader_trace_init() when a NULL pFunction is passed. This is mainly to reduce the size and indentation level of the if-block. --- dlls/wined3d/baseshader.c | 282 +++++++++++++++++++++++--------------------- 1 files changed, 147 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9887d66dad79cfbdb6945…

1 0

Henri Verbeet : wined3d: Avoid disabling numbered arrays if we' re going to enable them afterwards anyway.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 5ad3bbabda43f64764475aa0a190651ddcf38635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad3bbabda43f64764475aa0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 8 10:30:02 2008 +0100 wined3d: Avoid disabling numbered arrays if we're going to enable them afterwards anyway. --- dlls/wined3d/state.c | 99 ++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 65 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6c8e273..0da9842 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3897,10 +3897,27 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { unloadTexCoords(stateblock); } +static inline void unload_numbered_array(IWineD3DStateBlockImpl *stateblock, WineD3DContext *context, int i) +{ + GL_EXTCALL(glDisableVertexAttribArrayARB(i)); + checkGLcall("glDisableVertexAttribArrayARB(reg)"); + /* Some Windows drivers(NV GF 7) use the latest value that was used when drawing with the now + * deactivated stream disabled, some other drivers(ATI, NV GF 8) set the undefined values to 0x00. + * Let's set them to 0x00 to avoid hitting some undefined aspects of OpenGL. All that is really + * important here is the glDisableVertexAttribArrayARB call above. The test shows that the refrast + * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2: Episode Two. + */ + GL_EXTCALL(glVertexAttrib4NubARB(i, 0, 0, 0, 0)); + checkGLcall("glVertexAttrib4NubARB(i, 0, 0, 0, 0)"); + + context->numbered_array_mask &= ~(1 << i); +} + /* This should match any arrays loaded in loadNumberedArrays * TODO: Only load / unload arrays if we have to. */ -static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock) { +static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) +{ /* disable any attribs (this is the same for both GLSL and ARB modes) */ GLint maxAttribs = 16; int i; @@ -3911,20 +3928,12 @@ static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock) { if (glGetError() != GL_NO_ERROR) maxAttribs = 16; for (i = 0; i < maxAttribs; ++i) { - GL_EXTCALL(glDisableVertexAttribArrayARB(i)); - checkGLcall("glDisableVertexAttribArrayARB(reg)"); - /* Some Windows drivers(NV GF 7) use the latest value that was used when drawing with the now - * deactivated stream disabled, some other drivers(ATI, NV GF 8) set the undefined values to 0x00. - * Let's set them to 0x00 to avoid hitting some undefined aspects of OpenGL. All that is really - * important here is the glDisableVertexAttribArrayARB call above. The test shows that the refrast - * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2: Episode Two. - */ - GL_EXTCALL(glVertexAttrib4NubARB(i, 0, 0, 0, 0)); - checkGLcall("glVertexAttrib4NubARB(i, 0, 0, 0, 0)"); + unload_numbered_array(stateblock, context, i); } } -static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, const WineDirect3DVertexStridedData *strided) +static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, + const WineDirect3DVertexStridedData *strided, WineD3DContext *context) { GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; int i; @@ -3936,13 +3945,15 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, const stateblock->wineD3DDevice->instancedDraw = FALSE; for (i = 0; i < MAX_ATTRIBS; i++) { - - if (!strided->u.input[i].lpData && !strided->u.input[i].VBO) + if (!strided->u.input[i].VBO && !strided->u.input[i].lpData) + { + if (context->numbered_array_mask & (1 << i)) unload_numbered_array(stateblock, context, i); continue; + } /* Do not load instance data. It will be specified using glTexCoord by drawprim */ if(stateblock->streamFlags[strided->u.input[i].streamNo] & WINED3DSTREAMSOURCE_INSTANCEDATA) { - GL_EXTCALL(glDisableVertexAttribArrayARB(i)); + if (context->numbered_array_mask & (1 << i)) unload_numbered_array(stateblock, context, i); stateblock->wineD3DDevice->instancedDraw = TRUE; continue; } @@ -3987,8 +3998,13 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, const strided->u.input[i].lpData + stateblock->loadBaseVertexIndex * strided->u.input[i].dwStride + offset[strided->u.input[i].streamNo]) ); - } - GL_EXTCALL(glEnableVertexAttribArrayARB(i)); + } + + if (!(context->numbered_array_mask & (1 << i))) + { + GL_EXTCALL(glEnableVertexAttribArrayARB(i)); + context->numbered_array_mask |= (1 << i); + } } else { /* Stride = 0 means always the same values. glVertexAttribPointerARB doesn't do that. Instead disable the pointer and * set up the attribute statically. But we have to figure out the system memory address. @@ -3998,7 +4014,8 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, const vb = (IWineD3DVertexBufferImpl *) stateblock->streamSource[strided->u.input[i].streamNo]; ptr += (long) vb->resource.allocatedMemory; } - GL_EXTCALL(glDisableVertexAttribArrayARB(i)); + + if (context->numbered_array_mask & (1 << i)) unload_numbered_array(stateblock, context, i); switch(strided->u.input[i].dwType) { case WINED3DDECLTYPE_FLOAT1: @@ -4324,6 +4341,8 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo BOOL fixup = FALSE; WineDirect3DVertexStridedData *dataLocations = &device->strided_streams; BOOL useVertexShaderFunction; + BOOL load_numbered = FALSE; + BOOL load_named = FALSE; if (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { @@ -4357,41 +4376,51 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo useVertexShaderFunction = FALSE; } - /* Unload the old arrays before loading the new ones to get old junk out */ - if(context->numberedArraysLoaded) { - unloadNumberedArrays(stateblock); - context->numberedArraysLoaded = FALSE; - } - if(context->namedArraysLoaded) { - unloadVertexData(stateblock); - context->namedArraysLoaded = FALSE; - } - if(useVertexShaderFunction) { if(((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->half_float_conv_needed && !fixup) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion\n"); device->useDrawStridedSlow = TRUE; - context->numberedArraysLoaded = FALSE; } else { - TRACE("Loading numbered arrays\n"); - loadNumberedArrays(stateblock, dataLocations); + load_numbered = TRUE; device->useDrawStridedSlow = FALSE; - context->numberedArraysLoaded = TRUE; } } else if (fixup || (dataLocations->u.s.pSize.lpData == NULL && dataLocations->u.s.diffuse.lpData == NULL && dataLocations->u.s.specular.lpData == NULL)) { /* Load the vertex data using named arrays */ - TRACE("Loading vertex data\n"); - loadVertexData(stateblock, dataLocations); + load_named = TRUE; device->useDrawStridedSlow = FALSE; - context->namedArraysLoaded = TRUE; } else { TRACE("Not loading vertex data\n"); device->useDrawStridedSlow = TRUE; } + if (context->numberedArraysLoaded && !load_numbered) + { + unloadNumberedArrays(stateblock, context); + context->numberedArraysLoaded = FALSE; + context->numbered_array_mask = 0; + } + else if (context->namedArraysLoaded) + { + unloadVertexData(stateblock); + context->namedArraysLoaded = FALSE; + } + + if (load_numbered) + { + TRACE("Loading numbered arrays\n"); + loadNumberedArrays(stateblock, dataLocations, context); + context->numberedArraysLoaded = TRUE; + } + else if (load_named) + { + TRACE("Loading vertex data\n"); + loadVertexData(stateblock, dataLocations); + context->namedArraysLoaded = TRUE; + } + /* Generate some fixme's if unsupported functionality is being used */ #define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db19c19..359be44 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -776,6 +776,7 @@ struct WineD3DContext { BOOL last_was_vshader; BOOL last_was_foggy_shader; BOOL namedArraysLoaded, numberedArraysLoaded; + DWORD numbered_array_mask; BOOL lastWasPow2Texture[MAX_TEXTURES]; GLenum tracking_parm; /* Which source is tracking current colour */ unsigned char num_untracked_materials;

1 0

Henri Verbeet : wined3d: Explicitly pass the shader version to shader_skip_unrecognized().
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: e18629bedd55e980fac09f595460efa6f8367138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18629bedd55e980fac09f595… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 8 10:30:01 2008 +0100 wined3d: Explicitly pass the shader version to shader_skip_unrecognized(). --- dlls/wined3d/baseshader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a5abf6d..56d3c12 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -136,9 +136,8 @@ static inline int shader_skip_opcode( * Note: This function assumes source or destination token format. * It will not work with specially-formatted tokens like DEF or DCL, * but hopefully those would be recognized */ -static int shader_skip_unrecognized(IWineD3DBaseShader *iface, const DWORD *pToken) +static int shader_skip_unrecognized(const DWORD *pToken, DWORD shader_version) { - DWORD shader_version = ((IWineD3DBaseShaderImpl *)iface)->baseShader.hex_version; int tokens_read = 0; int i = 0; @@ -878,7 +877,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, /* Unknown opcode and its parameters */ if (NULL == curOpcode) { FIXME("Unrecognized opcode: token=0x%08x\n", hw_arg.opcode_token); - pToken += shader_skip_unrecognized(iface, pToken); + pToken += shader_skip_unrecognized(pToken, shader_version); /* Nothing to do */ } else if (WINED3DSIO_DCL == curOpcode->opcode || @@ -1008,7 +1007,7 @@ void shader_trace_init( if (NULL == curOpcode) { int tokens_read; FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); - tokens_read = shader_skip_unrecognized(iface, pToken); + tokens_read = shader_skip_unrecognized(pToken, This->baseShader.hex_version); pToken += tokens_read; len += tokens_read;

1 0

Henri Verbeet : wined3d: Explicitly pass the shader version to shader_get_param().
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 6e677775cef0c69ab82b84892c5ff35778160e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e677775cef0c69ab82b84892… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 8 10:30:01 2008 +0100 wined3d: Explicitly pass the shader version to shader_get_param(). --- dlls/wined3d/baseshader.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index fd5aadf..a5abf6d 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -101,15 +101,14 @@ const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD /* Read a parameter opcode from the input stream, * and possibly a relative addressing token. * Return the number of tokens read */ -static int shader_get_param(IWineD3DBaseShader *iface, const DWORD *pToken, DWORD *param, DWORD *addr_token) +static int shader_get_param(const DWORD *pToken, DWORD shader_version, DWORD *param, DWORD *addr_token) { /* PS >= 3.0 have relative addressing (with token) * VS >= 2.0 have relative addressing (with token) * VS >= 1.0 < 2.0 have relative addressing (without token) * The version check below should work in general */ - IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; - char rel_token = WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2 && + char rel_token = WINED3DSHADER_VERSION_MAJOR(shader_version) >= 2 && ((*pToken & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); *param = *pToken; @@ -147,7 +146,7 @@ static int shader_skip_unrecognized(IWineD3DBaseShader *iface, const DWORD *pTok while (*pToken & 0x80000000) { DWORD param, addr_token; - tokens_read += shader_get_param(iface, pToken, &param, &addr_token); + tokens_read += shader_get_param(pToken, shader_version, &param, &addr_token); pToken += tokens_read; FIXME("Unrecognized opcode param: token=0x%08x " @@ -422,7 +421,7 @@ HRESULT shader_get_registers_used( for (i = 0; i < limit; ++i) { DWORD param, addr_token, reg, regtype; - pToken += shader_get_param(iface, pToken, &param, &addr_token); + pToken += shader_get_param(pToken, shader_version, &param, &addr_token); regtype = shader_get_regtype(param); reg = param & WINED3DSP_REGNUM_MASK; @@ -901,7 +900,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, if (curOpcode->dst_token) { DWORD param, addr_token = 0; - pToken += shader_get_param(iface, pToken, &param, &addr_token); + pToken += shader_get_param(pToken, shader_version, &param, &addr_token); hw_arg.dst = param; hw_arg.dst_addr = addr_token; } @@ -914,7 +913,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, for (i = 0; i < (curOpcode->num_params - curOpcode->dst_token); i++) { DWORD param, addr_token = 0; - pToken += shader_get_param(iface, pToken, &param, &addr_token); + pToken += shader_get_param(pToken, shader_version, &param, &addr_token); hw_arg.src[i] = param; hw_arg.src_addr[i] = addr_token; } @@ -1099,7 +1098,7 @@ void shader_trace_init( if (curOpcode->dst_token) { /* Destination token */ - tokens_read = shader_get_param(iface, pToken, &param, &addr_token); + tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token); pToken += tokens_read; len += tokens_read; @@ -1117,7 +1116,7 @@ void shader_trace_init( /* Other source tokens */ for (i = curOpcode->dst_token; i < curOpcode->num_params; ++i) { - tokens_read = shader_get_param(iface, pToken, &param, &addr_token); + tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token); pToken += tokens_read; len += tokens_read;

1 0

Henri Verbeet : wined3d: Load texture coordinates from the correct streams.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: afd5a53bd099f5aff6005c257ee80a719bbd6dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd5a53bd099f5aff6005c257… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 8 10:30:01 2008 +0100 wined3d: Load texture coordinates from the correct streams. This fixes a regression introduced by commit a2febdd200f7149cff7fe923b7316dcdafca693a. --- dlls/wined3d/drawprim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 28b6c30..7603103 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -395,10 +395,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, const WineDirect3DVertexStrid continue; } - if(sd->u.s.texCoords[textureNo].lpData) + if(sd->u.s.texCoords[coordIdx].lpData) { - texCoords[textureNo] = - sd->u.s.texCoords[textureNo].lpData + streamOffset[sd->u.s.texCoords[textureNo].streamNo]; + texCoords[coordIdx] = + sd->u.s.texCoords[coordIdx].lpData + streamOffset[sd->u.s.texCoords[coordIdx].streamNo]; tex_mask |= (1 << textureNo); } else

1 0