December 2006 - Wine-Commits

Stefan Dösinger : wined3d: Temporary disable nvrc junk texture skipping.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 1e264e5dd4f01f5450fd0be79cec78ed979035c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e264e5dd4f01f5450fd0be79… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 22:37:37 2006 +0100 wined3d: Temporary disable nvrc junk texture skipping. --- dlls/wined3d/drawprim.c | 8 +++--- dlls/wined3d/stateblock.c | 65 ++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6ac7462..88a3f90 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1166,7 +1166,7 @@ static void loadVertexData(IWineD3DDevic continue; } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) { + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/ TRUE) { /* Select the correct texture stage */ GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); } @@ -1204,7 +1204,7 @@ static void loadVertexData(IWineD3DDevic glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) ++texture_idx; + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/ TRUE) ++texture_idx; } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { for (textureNo = texture_idx; textureNo < GL_LIMITS(textures); ++textureNo) { @@ -1479,7 +1479,7 @@ static void drawStridedSlow(IWineD3DDevi } } } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) ++texture_idx; + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/TRUE) ++texture_idx; } /* End of textures */ /* Diffuse -------------------------------- */ @@ -1911,7 +1911,7 @@ static void drawPrimitiveUploadTextures( /* WINED3DTOP_DISABLE disables the current & any higher texture stages */ if (This->stateBlock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) break; - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[i]) { + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[i]*/ TRUE) { texture_idx = current_sampler++; /* Active the texture unit corresponding to the current texture stage */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 98904cc..e7e0f3a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1026,46 +1026,45 @@ static HRESULT WINAPI IWineD3DStateBloc bound. We emulate this by creating dummy textures and binding them to each texture stage, but disable all stages by default. Hence if a stage is enabled then the default texture will kick in until replaced by a SetTexture call */ - if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - ENTER_GL(); - - for (i = 0; i < GL_LIMITS(texture_stages); i++) { - GLubyte white = 255; - - /* Note this avoids calling settexture, so pretend it has been called */ - This->set.textures[i] = TRUE; - This->changed.textures[i] = TRUE; - This->textures[i] = NULL; - - /* Make appropriate texture active */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); - } else if (i > 0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - } + ENTER_GL(); + + for (i = 0; i < GL_LIMITS(texture_stages); i++) { + GLubyte white = 255; + + /* Note this avoids calling settexture, so pretend it has been called */ + This->set.textures[i] = TRUE; + This->changed.textures[i] = TRUE; + This->textures[i] = NULL; + + /* Make appropriate texture active */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + } else if (i > 0) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + } - /* Generate an opengl texture name */ - glGenTextures(1, &ThisDevice->dummyTextureName[i]); - checkGLcall("glGenTextures"); - TRACE("Dummy Texture %d given name %d\n", i, ThisDevice->dummyTextureName[i]); + /* Generate an opengl texture name */ + glGenTextures(1, &ThisDevice->dummyTextureName[i]); + checkGLcall("glGenTextures"); + TRACE("Dummy Texture %d given name %d\n", i, ThisDevice->dummyTextureName[i]); - /* Generate a dummy 1d texture */ - This->textureDimensions[i] = GL_TEXTURE_1D; - glBindTexture(GL_TEXTURE_1D, ThisDevice->dummyTextureName[i]); - checkGLcall("glBindTexture"); + /* Generate a dummy 1d texture */ + This->textureDimensions[i] = GL_TEXTURE_1D; + glBindTexture(GL_TEXTURE_1D, ThisDevice->dummyTextureName[i]); + checkGLcall("glBindTexture"); - glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); - checkGLcall("glTexImage1D"); + glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); + checkGLcall("glTexImage1D"); #if 1 /* TODO: move the setting texture states off to basetexture */ - /* Reapply all the texture state information to this texture */ - IWineD3DDevice_SetupTextureStates(device, i, i, REAPPLY_ALL); + /* Reapply all the texture state information to this texture */ + IWineD3DDevice_SetupTextureStates(device, i, i, REAPPLY_ALL); #endif - } - - LEAVE_GL(); } + LEAVE_GL(); + + /* Defaulting palettes - Note these are device wide but reinitialized here for convenience*/ for (i = 0; i < MAX_PALETTES; ++i) { int j;

1 0

Alexandre Julliard : ntdll: Fix the libdl refcount when loading the same builtin twice.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 2a1dc157903453e39606e72b27e9a8ae2d1c6dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1dc157903453e39606e72b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 15:54:27 2006 +0100 ntdll: Fix the libdl refcount when loading the same builtin twice. --- dlls/kernel32/tests/module.c | 2 +- dlls/ntdll/loader.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 340d646..d3f64a8 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -179,7 +179,7 @@ static void testNestedLoadLibraryA(void) /* Try to load the dll again, if refcounting is ok, this should work */ hModule1 = LoadLibraryA(path1); - todo_wine ok(hModule1 != NULL, "LoadLibrary(%s) failed\n", path1); + ok(hModule1 != NULL, "LoadLibrary(%s) failed\n", path1); if (hModule1 != NULL) ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 23c6e3b..98b83b7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1553,7 +1553,11 @@ static NTSTATUS load_builtin_dll( LPCWST } } - if (info.status != STATUS_SUCCESS) return info.status; + if (info.status != STATUS_SUCCESS) + { + wine_dll_unload( handle ); + return info.status; + } if (!info.wm) { @@ -1574,6 +1578,7 @@ static NTSTATUS load_builtin_dll( LPCWST break; } } + wine_dll_unload( handle ); /* release the libdl refcount */ if (!info.wm) return STATUS_INVALID_IMAGE_FORMAT; if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; }

1 0

Francois Gouget : kernel32/tests: Test loading and unloading of builtin dlls.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 1d6db94ee279901b056acdca1340661ada155854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6db94ee279901b056acdca1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 20 15:02:15 2006 +0100 kernel32/tests: Test loading and unloading of builtin dlls. --- dlls/kernel32/tests/module.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 326a80e..340d646 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -128,6 +128,62 @@ static void testLoadLibraryA(void) FreeLibrary(hModule); } +static void testNestedLoadLibraryA(void) +{ + static const char dllname[] = "shell32.dll"; + char path1[MAX_PATH], path2[MAX_PATH]; + HMODULE hModule1, hModule2, hModule3; + + /* This is not really a Windows conformance test, but more a Wine + * regression test. Wine's builtin dlls can be loaded from multiple paths, + * and this test tries to make sure that Wine does not get confused and + * really unloads the Unix .so file at the right time. Failure to do so + * will result in the dll being unloadable. + * This test must be done with a dll that can be unloaded, which means: + * - it must not already be loaded + * - it must not have a 16-bit counterpart + */ + GetWindowsDirectory(path1, sizeof(path1)); + strcat(path1, "\\system\\"); + strcat(path1, dllname); + hModule1 = LoadLibraryA(path1); + if (!hModule1) + { + /* We must be on Windows NT, so we cannot test */ + return; + } + + GetWindowsDirectory(path2, sizeof(path2)); + strcat(path2, "\\system32\\"); + strcat(path2, dllname); + hModule2 = LoadLibraryA(path2); + if (!hModule2) + { + /* We must be on Windows 9x, so we cannot test */ + ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); + return; + } + + /* The first LoadLibrary() call may have registered the dll under the + * system32 path. So load it, again, under the '...\system\...' path so + * Wine does not immediately notice that it is already loaded. + */ + hModule3 = LoadLibraryA(path1); + ok(hModule3 != NULL, "LoadLibrary(%s) failed\n", path1); + + /* Now fully unload the dll */ + ok(FreeLibrary(hModule3), "FreeLibrary() failed\n"); + ok(FreeLibrary(hModule2), "FreeLibrary() failed\n"); + ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); + ok(GetModuleHandle(dllname) == NULL, "%s was not fully unloaded", dllname); + + /* Try to load the dll again, if refcounting is ok, this should work */ + hModule1 = LoadLibraryA(path1); + todo_wine ok(hModule1 != NULL, "LoadLibrary(%s) failed\n", path1); + if (hModule1 != NULL) + ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); +} + static void testLoadLibraryA_Wrong(void) { HMODULE hModule; @@ -179,6 +235,7 @@ START_TEST(module) testGetModuleFileName_Wrong(); testLoadLibraryA(); + testNestedLoadLibraryA(); testLoadLibraryA_Wrong(); testGetProcAddress_Wrong(); }

1 0

Kai Blin : ws2_32: ws_sockaddr_u2ws should zero the sockaddr_in. sin_zero field.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 6055c667e9aae3245ba3069219a021f2e5467420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6055c667e9aae3245ba306921… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Dec 20 14:08:13 2006 +0100 ws2_32: ws_sockaddr_u2ws should zero the sockaddr_in.sin_zero field. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 76e60cc..d4d6595 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1017,6 +1017,7 @@ static int ws_sockaddr_u2ws(const struct win->sin_family = WS_AF_INET; win->sin_port = uin->sin_port; memcpy(&win->sin_addr,&uin->sin_addr,4); /* 4 bytes = 32 address bits */ + memset(&win->sin_zero, 0, 8); /* Make sure the null padding is null */ *wsaddrlen = sizeof(struct WS_sockaddr_in); return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 45331e9..3a7c4db 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1565,6 +1565,53 @@ static void test_extendedSocketOptions() WSACleanup(); } +static void test_getsockname() +{ + WSADATA wsa; + SOCKET sock; + struct sockaddr_in sa_set, sa_get; + int sa_set_len = sizeof(struct sockaddr_in); + int sa_get_len = sa_set_len; + static const unsigned char null_padding[] = {0,0,0,0,0,0,0,0}; + + if(WSAStartup(MAKEWORD(2,0), &wsa)){ + trace("Winsock failed: 0x%08x. Aborting test\n", WSAGetLastError()); + return; + } + + memset(&sa_set, 0, sa_set_len); + + sa_set.sin_family = AF_INET; + sa_set.sin_port = htons(0); + sa_set.sin_addr.s_addr = htonl(INADDR_ANY); + + if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) < 0){ + trace("Creating the socket failed: 0x%08x\n", WSAGetLastError()); + WSACleanup(); + return; + } + + if(bind(sock, (struct sockaddr *) &sa_set, sa_set_len) < 0){ + trace("Failed to bind socket: 0x%08x\n", WSAGetLastError()); + closesocket(sock); + WSACleanup(); + return; + } + + if(getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len) != 0){ + trace("Failed to call getsockname: 0x%08X\n", WSAGetLastError()); + closesocket(sock); + WSACleanup(); + return; + } + + ok(memcmp(sa_get.sin_zero, null_padding, 8) == 0, + "getsockname did not zero the sockaddr_in structure\n"); + + closesocket(sock); + WSACleanup(); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1595,6 +1642,7 @@ START_TEST( sock ) test_select(); test_accept(); + test_getsockname(); Exit(); }

1 0

Alexandre Julliard : include: Get rid of the WINE_NO_LONG_AS_INT ifdefs.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 80cff47c876c85f761d169f05ef712bb1200bb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cff47c876c85f761d169f05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 14:26:08 2006 +0100 include: Get rid of the WINE_NO_LONG_AS_INT ifdefs. --- include/guiddef.h | 2 +- include/windef.h | 2 +- include/wine/debug.h | 16 ---------------- include/wine/test.h | 4 ---- include/winnt.h | 2 +- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 507eb5a..f079983 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -20,7 +20,7 @@ #define GUID_DEFINED typedef struct _GUID { -#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) +#ifdef _MSC_VER unsigned long Data1; #else unsigned int Data1; diff --git a/include/windef.h b/include/windef.h index 6106b7a..fd3d423 100644 --- a/include/windef.h +++ b/include/windef.h @@ -196,7 +196,7 @@ typedef int INT, *PIN typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) +#ifdef _MSC_VER typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; typedef unsigned long ULONG, *PULONG; diff --git a/include/wine/debug.h b/include/wine/debug.h index 661f6d6..c1ef2b5 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -187,11 +187,7 @@ static inline const char *wine_dbgstr_gu { if (!id) return "(null)"; if (!((INT_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04x>", (INT_PTR)id & 0xffff ); -#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) - return wine_dbg_sprintf( "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", -#else return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", -#endif id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); @@ -200,32 +196,20 @@ static inline const char *wine_dbgstr_gu static inline const char *wine_dbgstr_point( const POINT *pt ) { if (!pt) return "(null)"; -#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) - return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y ); -#else return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); -#endif } static inline const char *wine_dbgstr_size( const SIZE *size ) { if (!size) return "(null)"; -#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) - return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy ); -#else return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy ); -#endif } static inline const char *wine_dbgstr_rect( const RECT *rect ) { if (!rect) return "(null)"; -#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) - return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom ); -#else return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); -#endif } static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) diff --git a/include/wine/test.h b/include/wine/test.h index 8ef8a31..eed9d1a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -371,11 +371,7 @@ static int run_test( const char *name ) if (winetest_debug) { -#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64) - fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n", -#else fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n", -#endif name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure" ); diff --git a/include/winnt.h b/include/winnt.h index 651e507..47653eb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -319,7 +319,7 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) +#ifdef _MSC_VER typedef long LONG, *PLONG; #else typedef int LONG, *PLONG;

1 0

Alexandre Julliard : winedbg: Win64 printf format fixes.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 6744929428815a2e8a422a293c72620e25f5ef18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6744929428815a2e8a422a293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 14:17:27 2006 +0100 winedbg: Win64 printf format fixes. --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_i386.c | 14 ++++---- programs/winedbg/break.c | 8 ++--- programs/winedbg/dbg.y | 2 +- programs/winedbg/gdbproxy.c | 73 +++++++++++++++++++-------------------- programs/winedbg/info.c | 32 ++++++++-------- programs/winedbg/memory.c | 12 +++--- programs/winedbg/stack.c | 12 +++--- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 60 +++++++++++++++---------------- programs/winedbg/tgt_minidump.c | 4 +- programs/winedbg/types.c | 12 +++--- programs/winedbg/winedbg.c | 10 +++--- 13 files changed, 118 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6744929428815a2e8a422…

1 0

Alexandre Julliard : winedbg: Fixed a few data types.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 2bc33389e8969856555b15358db55416eb939b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc33389e8969856555b15358… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 14:10:47 2006 +0100 winedbg: Fixed a few data types. --- programs/winedbg/be_i386.c | 6 +++--- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/gdbproxy.c | 8 ++++---- programs/winedbg/info.c | 4 ++-- programs/winedbg/tgt_minidump.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index f15121d..31bcc96 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -574,7 +574,7 @@ static unsigned be_i386_is_func_call(con #define DR7_ENABLE_MASK(dr) (1<<(DR7_LOCAL_ENABLE_SHIFT+DR7_ENABLE_SIZE*(dr))) #define IS_DR7_SET(ctrl,dr) ((ctrl)&DR7_ENABLE_MASK(dr)) -static inline int be_i386_get_unused_DR(CONTEXT* ctx, unsigned long** r) +static inline int be_i386_get_unused_DR(CONTEXT* ctx, DWORD** r) { if (!IS_DR7_SET(ctx->Dr7, 0)) { @@ -607,7 +607,7 @@ static unsigned be_i386_insert_Xpoint(HA { unsigned char ch; SIZE_T sz; - unsigned long* pr; + DWORD *pr; int reg; unsigned long bits; @@ -630,7 +630,7 @@ static unsigned be_i386_insert_Xpoint(HA bits = DR7_RW_WRITE; hw_bp: if ((reg = be_i386_get_unused_DR(ctx, &pr)) == -1) return 0; - *pr = (unsigned long)addr; + *pr = (DWORD)addr; if (type != be_xpoint_watch_exec) switch (size) { case 4: bits |= DR7_LEN_4; break; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 6e4c010..91d5a78 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -132,7 +132,7 @@ struct dbg_breakpoint xpoint_type : 2, refcount : 13, skipcount : 16; - DWORD info; + unsigned long info; struct /* only used for watchpoints */ { BYTE len : 2; @@ -325,7 +325,7 @@ extern int expr_print(const /* info.c */ extern void print_help(void); extern void info_help(void); -extern void info_win32_module(DWORD mod); +extern void info_win32_module(DWORD64 mod); extern void info_win32_class(HWND hWnd, const char* clsName); extern void info_win32_window(HWND hWnd, BOOL detailed); extern void info_win32_processes(void); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index bb808c2..0b497a0 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -609,7 +609,7 @@ static void handle_debug_event(struct gd } } -static void resume_debuggee(struct gdb_context* gdbctx, unsigned long cont) +static void resume_debuggee(struct gdb_context* gdbctx, DWORD cont) { if (dbg_curr_thread) { @@ -626,7 +626,7 @@ static void resume_debuggee(struct gd } -static void resume_debuggee_thread(struct gdb_context* gdbctx, unsigned long cont, unsigned int threadid) +static void resume_debuggee_thread(struct gdb_context* gdbctx, DWORD cont, unsigned int threadid) { if (dbg_curr_thread) @@ -725,7 +725,7 @@ static void detach_debuggee(struct gdb_c static void get_process_info(struct gdb_context* gdbctx, char* buffer, size_t len) { - unsigned long status; + DWORD status; if (!GetExitCodeProcess(gdbctx->process->handle, &status)) { @@ -760,7 +760,7 @@ static void get_thread_info(struct gdb_c char* buffer, size_t len) { struct dbg_thread* thd; - unsigned long status; + DWORD status; int prio; /* FIXME: use the size of buffer */ diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c5b7b1e..0db9d23 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -198,7 +198,7 @@ static BOOL CALLBACK info_mod_cb(PSTR mo * * Display information about a given module (DLL or EXE), or about all modules */ -void info_win32_module(DWORD base) +void info_win32_module(DWORD64 base) { struct info_module im; int i, j, num_printed = 0; @@ -263,7 +263,7 @@ void info_win32_module(DWORD base) HeapFree(GetProcessHeap(), 0, im.mi); if (base && !num_printed) - dbg_printf("'0x%08lx' is not a valid module address\n", base); + dbg_printf("'0x%lx%08lx' is not a valid module address\n", (DWORD)(base >> 32), (DWORD)base); } struct class_walker diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 274c138..3e68080 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -85,7 +85,7 @@ static inline struct tgt_process_minidum } static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, - void* buffer, DWORD len, DWORD* rlen) + void* buffer, SIZE_T len, SIZE_T* rlen) { ULONG size; MINIDUMP_DIRECTORY* dir; @@ -127,7 +127,7 @@ static BOOL WINAPI tgt_process_minidump_ } static BOOL WINAPI tgt_process_minidump_write(HANDLE hProcess, void* addr, - const void* buffer, DWORD len, DWORD* wlen) + const void* buffer, SIZE_T len, SIZE_T* wlen) { return FALSE; }

1 0

Vitaliy Margolen : dinput: Warp mouse in exclusive cooperation mode only.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 938657b1c1ff1f6c05b3a521a60f3dcfef0d196b URL: http://source.winehq.org/git/wine.git/?a=commit;h=938657b1c1ff1f6c05b3a521a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Dec 20 01:05:42 2006 -0700 dinput: Warp mouse in exclusive cooperation mode only. --- dlls/dinput/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 2894fb6..9ab1b1f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -311,7 +311,7 @@ static LRESULT CALLBACK dinput_mouse_hoo queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Y_POSITION], pt1.y, hook->time, This->dinput->evsequence); - This->need_warp = (pt.x || pt.y); + This->need_warp = (pt.x || pt.y) && dwCoop & DISCL_EXCLUSIVE; break; } case WM_LBUTTONDOWN: @@ -434,7 +434,7 @@ static HRESULT WINAPI SysMouseAImpl_Acqu This->win_centerY = (rect.bottom - rect.top ) / 2; /* Warp the mouse to the center of the window */ - if (!(This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS)) + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { This->mapped_center.x = This->win_centerX; This->mapped_center.y = This->win_centerY; @@ -472,7 +472,7 @@ static HRESULT WINAPI SysMouseAImpl_Unac ERR("this(%p) != current_lock(%p)\n", This, current_lock); /* And put the mouse cursor back where it was at acquire time */ - if (!(This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS)) + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { TRACE(" warping mouse back to (%d , %d)\n", This->org_coords.x, This->org_coords.y); SetCursorPos(This->org_coords.x, This->org_coords.y);

1 0

Vitaliy Margolen : dinput: Use GetCursorPos() to calculate relative mouse movements.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 546c7a502d69050710578ec5293e2cc1e47a4e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=546c7a502d69050710578ec52… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Dec 20 01:03:11 2006 -0700 dinput: Use GetCursorPos() to calculate relative mouse movements. --- dlls/dinput/mouse.c | 142 +++++++++++++++----------------------------------- 1 files changed, 43 insertions(+), 99 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index d93975a..2894fb6 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -37,8 +37,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define MOUSE_HACK - WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Wine mouse driver object instances */ @@ -67,30 +65,22 @@ static const IDirectInputDevice8WVtbl Sy typedef struct SysMouseImpl SysMouseImpl; -typedef enum { - WARP_DONE, /* Warping has been done */ - WARP_NEEDED, /* Warping is needed */ - WARP_STARTED /* Warping has been done, waiting for the warp event */ -} WARP_STATUS; - struct SysMouseImpl { struct IDirectInputDevice2AImpl base; IDirectInputImpl *dinput; - + /* SysMouseAImpl */ - /* Previous position for relative moves */ - LONG prevX, prevY; /* These are used in case of relative -> absolute transitions */ POINT org_coords; POINT mapped_center; DWORD win_centerX, win_centerY; /* warping: whether we need to move mouse back to middle once we * reach window borders (for e.g. shooters, "surface movement" games) */ - WARP_STATUS need_warp; + BOOL need_warp; DWORD last_warped; - + /* This is for mouse reporting. */ DIMOUSESTATE2 m_state; }; @@ -298,65 +288,32 @@ static LRESULT CALLBACK dinput_mouse_hoo EnterCriticalSection(&This->base.crit); dwCoop = This->base.dwCoopLevel; - if (wparam == WM_MOUSEMOVE) { - if (This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS) { - if (hook->pt.x != This->prevX) + switch(wparam) { + case WM_MOUSEMOVE: + { + POINT pt, pt1; + + GetCursorPos(&pt); + This->m_state.lX += pt.x = hook->pt.x - pt.x; + This->m_state.lY += pt.y = hook->pt.y - pt.y; + + if (This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS) + { + pt1.x = This->m_state.lX; + pt1.y = This->m_state.lY; + } else + pt1 = pt; + + if (pt.x) queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_X_POSITION], - hook->pt.x, hook->time, This->dinput->evsequence); - if (hook->pt.y != This->prevY) + pt1.x, hook->time, This->dinput->evsequence); + if (pt.y) queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Y_POSITION], - hook->pt.y, hook->time, This->dinput->evsequence); - } else { - /* Now, warp handling */ - if ((This->need_warp == WARP_STARTED) && - (hook->pt.x == This->mapped_center.x) && (hook->pt.y == This->mapped_center.y)) { - /* Warp has been done... */ - This->need_warp = WARP_DONE; - goto end; - } - - /* Relative mouse input with absolute mouse event : the real fun starts here... */ - if ((This->need_warp == WARP_NEEDED) || - (This->need_warp == WARP_STARTED)) { - if (hook->pt.x != This->prevX) - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_X_POSITION], - hook->pt.x - This->prevX, hook->time, This->dinput->evsequence); - if (hook->pt.y != This->prevY) - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Y_POSITION], - hook->pt.y - This->prevY, hook->time, This->dinput->evsequence); - } else { - /* This is the first time the event handler has been called after a - GetDeviceData or GetDeviceState. */ - if (hook->pt.x != This->mapped_center.x) { - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_X_POSITION], - hook->pt.x - This->mapped_center.x, hook->time, This->dinput->evsequence); - This->need_warp = WARP_NEEDED; - } - - if (hook->pt.y != This->mapped_center.y) { - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Y_POSITION], - hook->pt.y - This->mapped_center.y, hook->time, This->dinput->evsequence); - This->need_warp = WARP_NEEDED; - } - } - } - - This->prevX = hook->pt.x; - This->prevY = hook->pt.y; - - if (This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS) { - This->m_state.lX = hook->pt.x; - This->m_state.lY = hook->pt.y; - } else { - This->m_state.lX = hook->pt.x - This->mapped_center.x; - This->m_state.lY = hook->pt.y - This->mapped_center.y; - } - } - - TRACE(" msg %x pt %d %d (W=%d)\n", - wparam, hook->pt.x, hook->pt.y, !(This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS) && This->need_warp ); - - switch(wparam) { + pt1.y, hook->time, This->dinput->evsequence); + + This->need_warp = (pt.x || pt.y); + break; + } case WM_LBUTTONDOWN: queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_L_POSITION], 0x80, hook->time, This->dinput->evsequence); @@ -394,17 +351,16 @@ static LRESULT CALLBACK dinput_mouse_hoo This->m_state.lZ += wdata; break; } - - TRACE("(X: %d - Y: %d L: %02x M: %02x R: %02x)\n", - This->m_state.lX, This->m_state.lY, + + TRACE("msg %x @ (%d %d): (X: %d - Y: %d L: %02x M: %02x R: %02x)\n", + wparam, hook->pt.x, hook->pt.y, This->m_state.lX, This->m_state.lY, This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]); - + This->dinput->evsequence++; - end: /* Mouse moved -> send event if asked */ if (This->base.hEvent) SetEvent(This->base.hEvent); - + LeaveCriticalSection(&This->base.crit); /* Ignore message */ @@ -457,8 +413,6 @@ static HRESULT WINAPI SysMouseAImpl_Acqu { This->m_state.lX = point.x; This->m_state.lY = point.y; - This->prevX = point.x; - This->prevY = point.y; } else { This->m_state.lX = 0; This->m_state.lY = 0; @@ -489,13 +443,9 @@ static HRESULT WINAPI SysMouseAImpl_Acqu SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime(); -#ifdef MOUSE_HACK - This->need_warp = WARP_DONE; -#else - This->need_warp = WARP_STARTED; -#endif + This->need_warp = FALSE; } - + return DI_OK; } @@ -560,9 +510,10 @@ static HRESULT WINAPI SysMouseAImpl_GetD This->m_state.lY = 0; This->m_state.lZ = 0; } - + /* Check if we need to do a mouse warping */ - if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { + if (This->need_warp && (GetCurrentTime() - This->last_warped > 10)) + { if(!dinput_window_check(This)) { LeaveCriticalSection(&This->base.crit); @@ -572,13 +523,9 @@ static HRESULT WINAPI SysMouseAImpl_GetD SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime(); -#ifdef MOUSE_HACK - This->need_warp = WARP_DONE; -#else - This->need_warp = WARP_STARTED; -#endif + This->need_warp = FALSE; } - + LeaveCriticalSection(&This->base.crit); return DI_OK; @@ -595,20 +542,17 @@ static HRESULT WINAPI SysMouseAImpl_GetD res = IDirectInputDevice2AImpl_GetDeviceData(iface, dodsize, dod, entries, flags); if (FAILED(res)) return res; - + /* Check if we need to do a mouse warping */ - if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { + if (This->need_warp && (GetCurrentTime() - This->last_warped > 10)) + { if(!dinput_window_check(This)) return DIERR_GENERIC; TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime(); -#ifdef MOUSE_HACK - This->need_warp = WARP_DONE; -#else - This->need_warp = WARP_STARTED; -#endif + This->need_warp = FALSE; } return res; }

1 0

Rob Shearman : ole32: Send a causality ID in the ORPCTHIS header for a call .
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: e236edb91ed9fff5de8c792fcf3abe427e9e0872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e236edb91ed9fff5de8c792fc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:37:34 2006 +0000 ole32: Send a causality ID in the ORPCTHIS header for a call. Use the causality ID to determine whether this is a top-level or a nested (called-back) call for the purposes of IMessageFilter::HandleInComingCall. --- dlls/ole32/compobj_private.h | 11 +++++++++++ dlls/ole32/rpc.c | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index aee19f2..f9d1c76 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -168,6 +168,7 @@ struct oletls IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ DWORD inits; /* number of times CoInitializeEx called */ + GUID causality_id; /* unique identifier for each COM call */ }; @@ -273,6 +274,16 @@ static inline APARTMENT* COM_CurrentApt( return COM_CurrentInfo()->apt; } +static inline GUID COM_CurrentCausalityId(void) +{ + struct oletls *info = COM_CurrentInfo(); + if (!info) + return GUID_NULL; + if (IsEqualGUID(&info->causality_id, &GUID_NULL)) + CoCreateGuid(&info->causality_id); + return info->causality_id; +} + #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* helpers for debugging */ diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 586562e..49f5842 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -418,7 +418,7 @@ static HRESULT WINAPI ClientRpcChannelBu message_state->channel_hook_info.iid = *riid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); - message_state->channel_hook_info.uCausality = GUID_NULL; /* FIXME */ + message_state->channel_hook_info.uCausality = COM_CurrentCausalityId(); message_state->channel_hook_info.dwServerPid = 0; /* FIXME */ message_state->channel_hook_info.iMethod = msg->ProcNum; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ @@ -940,6 +940,7 @@ void RPC_ExecuteCall(struct dispatch_par ORPCTHIS orpcthis; ORPC_EXTENT_ARRAY orpc_ext_array; WIRE_ORPC_EXTENT *first_wire_orpc_extent; + GUID old_causality_id; /* handle ORPCTHIS and server extensions */ @@ -977,12 +978,17 @@ void RPC_ExecuteCall(struct dispatch_par { DWORD handlecall; INTERFACEINFO interface_info; + CALLTYPE calltype; interface_info.pUnk = params->iface; interface_info.iid = params->iid; interface_info.wMethod = msg->ProcNum; + if (IsEqualGUID(&orpcthis.cid, &COM_CurrentInfo()->causality_id)) + calltype = CALLTYPE_NESTED; + else /* FIXME: also detect CALLTYPE_TOPLEVEL_CALLPENDING */ + calltype = CALLTYPE_TOPLEVEL; handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, - CALLTYPE_TOPLEVEL /* FIXME */, + calltype, (HTASK)GetCurrentProcessId(), 0 /* FIXME */, &interface_info); @@ -1008,7 +1014,13 @@ void RPC_ExecuteCall(struct dispatch_par /* invoke the method */ + /* save the old causality ID - note: any calls executed while processing + * messages received during the SendReceive will appear to originate from + * this call - this should be checked with what Windows does */ + old_causality_id = COM_CurrentInfo()->causality_id; + COM_CurrentInfo()->causality_id = orpcthis.cid; params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); + COM_CurrentInfo()->causality_id = old_causality_id; message_state = (struct message_state *)msg->Handle; msg->Handle = message_state->binding_handle;

1 0