June 2006 - Wine-commits - list.winehq.org

Robert Shearman : rpcrt4: Move the packet manipulation from the exception filter to the exception handler .
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 0da8836ff7e9d838689f319f07670083f19a87ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0da8836ff7e9d838689f319… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 19 20:26:57 2006 +0100 rpcrt4: Move the packet manipulation from the exception filter to the exception handler. Remove the unused server_sem variable. --- dlls/rpcrt4/rpc_server.c | 38 ++++++++------------------------------ 1 files changed, 8 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 5beff9a..dd55848 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -47,8 +47,6 @@ #include "rpc_misc.h" #include "rpc_message.h" #include "rpc_defs.h" -#define MAX_THREADS 128 - WINE_DEFAULT_DEBUG_CHANNEL(rpc); typedef struct _RpcPacket @@ -102,10 +100,6 @@ static HANDLE mgr_mutex; /* set when server thread has finished opening connections */ static HANDLE server_ready_event; -static HANDLE server_sem; - -static LONG worker_tls; - static UUID uuid_nil; inline static RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) @@ -153,24 +147,11 @@ static RpcServerInterface* RPCRT4_find_i return cif; } -typedef struct { - PRPC_MESSAGE msg; - void* buf; -} packet_state; - static WINE_EXCEPTION_FILTER(rpc_filter) { - packet_state* state; - PRPC_MESSAGE msg; - state = TlsGetValue(worker_tls); - msg = state->msg; - if (msg->Buffer != state->buf) I_RpcFreeBuffer(msg); - msg->RpcFlags |= WINE_RPCFLAG_EXCEPTION; - msg->BufferLength = sizeof(DWORD); - I_RpcGetBuffer(msg); - *(DWORD*)msg->Buffer = GetExceptionCode(); - WARN("exception caught with code 0x%08lx = %ld\n", *(DWORD*)msg->Buffer, *(DWORD*)msg->Buffer); + WARN("exception caught with code 0x%08lx = %ld\n", GetExceptionCode(), GetExceptionCode()); TRACE("returning failure packet\n"); + /* catch every exception */ return EXCEPTION_EXECUTE_HANDLER; } @@ -178,16 +159,11 @@ static void RPCRT4_process_packet(RpcCon { RpcServerInterface* sif; RPC_DISPATCH_FUNCTION func; - packet_state state; UUID *object_uuid; RpcPktHdr *response; void *buf = msg->Buffer; RPC_STATUS status; - state.msg = msg; - state.buf = buf; - TlsSetValue(worker_tls, &state); - switch (hdr->common.ptype) { case PKT_BIND: TRACE("got bind packet\n"); @@ -279,7 +255,12 @@ static void RPCRT4_process_packet(RpcCon __TRY { if (func) func(msg); } __EXCEPT(rpc_filter) { - /* failure packet was created in rpc_filter */ + if (msg->Buffer != buf) I_RpcFreeBuffer(msg); + /* this will cause a failure packet to be sent in I_RpcSend */ + msg->RpcFlags |= WINE_RPCFLAG_EXCEPTION; + msg->BufferLength = sizeof(DWORD); + I_RpcGetBuffer(msg); + *(DWORD*)msg->Buffer = GetExceptionCode(); } __ENDTRY /* send response packet */ @@ -304,7 +285,6 @@ fail: I_RpcFreeBuffer(msg); msg->Buffer = NULL; RPCRT4_FreeHeader(hdr); - TlsSetValue(worker_tls, NULL); HeapFree(GetProcessHeap(), 0, msg); } @@ -512,8 +492,6 @@ static RPC_STATUS RPCRT4_start_listen(BO if (!mgr_mutex) mgr_mutex = CreateMutexW(NULL, FALSE, NULL); if (!mgr_event) mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!server_ready_event) server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL); - if (!worker_tls) worker_tls = TlsAlloc(); std_listen = TRUE; server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL); CloseHandle(server_thread);

1 0

Juan Lang : crypt32: Fix decoding signed certs and CRLs.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 1811acc2fac11ad63fffe142b19363431ca31c14 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1811acc2fac11ad63fffe14… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jun 19 12:17:04 2006 -0700 crypt32: Fix decoding signed certs and CRLs. --- dlls/crypt32/decode.c | 268 +++++++++++++++++++++++++++++++++---------- dlls/crypt32/tests/encode.c | 27 ++++ 2 files changed, 230 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1811acc2fac11ad63ff…

1 0

Paul Vriens : uxtheme/tests: Added test for IsAppThemed and grouped it with IsThemeActive.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 14b4e851488f2bafc9dbef12ffbb3879fd16744f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14b4e851488f2bafc9dbef1… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Jun 19 21:02:56 2006 +0200 uxtheme/tests: Added test for IsAppThemed and grouped it with IsThemeActive. --- dlls/uxtheme/tests/system.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 5c5fa31..3aa5582 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -26,6 +26,7 @@ #include "uxtheme.h" #include "wine/test.h" static HRESULT (WINAPI * pCloseThemeData)(HTHEME); +static BOOL (WINAPI * pIsAppThemed)(VOID); static BOOL (WINAPI * pIsThemeActive)(VOID); static HTHEME (WINAPI * pOpenThemeData)(HWND, LPCWSTR); static HRESULT (WINAPI * pSetWindowTheme)(HWND, LPCWSTR, LPCWSTR); @@ -50,6 +51,7 @@ static BOOL InitFunctionPtrs(void) if (hUxtheme) { UXTHEME_GET_PROC(CloseThemeData) + UXTHEME_GET_PROC(IsAppThemed) UXTHEME_GET_PROC(IsThemeActive) UXTHEME_GET_PROC(OpenThemeData) UXTHEME_GET_PROC(SetWindowTheme) @@ -57,6 +59,36 @@ static BOOL InitFunctionPtrs(void) return TRUE; } +static void test_IsThemed(void) +{ + BOOL bThemeActive; + BOOL bAppThemed; + + SetLastError(0xdeadbeef); + bThemeActive = pIsThemeActive(); + trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", + GetLastError()); + + /* This test is not themed */ + SetLastError(0xdeadbeef); + bAppThemed = pIsAppThemed(); + + if (bThemeActive) + todo_wine + ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); + else + /* Although Wine currently returns FALSE, the logic behind it is wrong. It is not a todo_wine though in the testing sense */ + ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); + + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", + GetLastError()); +} + static void test_SetWindowTheme(void) { HRESULT hRes; @@ -88,10 +120,6 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08lx\n", - GetLastError()); /* All NULL */ SetLastError(0xdeadbeef); @@ -204,6 +232,11 @@ START_TEST(system) * only show input/return behaviour */ + /* IsThemeActive and IsAppThemed */ + trace("Starting test_IsThemed()\n"); + if (pIsAppThemed && pIsThemeActive) + test_IsThemed(); + /* SetWindowTheme */ trace("Starting test_SetWindowTheme()\n"); if (pSetWindowTheme)

1 0

Jeremy White : msvcrt: Solaris asctime_r compilation fix.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: a73d568ece1cfa2aee857d5b5823c63b7dd51f4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a73d568ece1cfa2aee857d5… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jun 19 22:42:05 2006 +0200 msvcrt: Solaris asctime_r compilation fix. --- dlls/msvcrt/time.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4d8afd5..868a0dc 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -24,6 +24,7 @@ #include "config.h" +#define _POSIX_PTHREAD_SEMANTICS /* switch to a 2 arg style asctime_r on Solaris */ #include <time.h> #ifdef HAVE_SYS_TIMES_H # include <sys/times.h>

1 0

Alexandre Julliard : libwine: Remove one more directory level when checking for build dir.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: e43cec76d1308750387a60fd200c0f179826a870 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e43cec76d1308750387a60f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 22:45:28 2006 +0200 libwine: Remove one more directory level when checking for build dir. This way it still works if the libdir we got was libs/wine instead of libs. --- libs/wine/config.c | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index d287c5d..b721108 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -234,12 +234,28 @@ #endif /* HAVE_GETPWUID */ init_server_dir( st.st_dev, st.st_ino ); } +/* check if basedir is a valid build dir by checking for wineserver and ntdll */ +/* helper for running_from_build_dir */ +static inline int is_valid_build_dir( char *basedir, int baselen ) +{ + struct stat st; + + strcpy( basedir + baselen, "/server/wineserver" ); + if (stat( basedir, &st ) == -1) return 0; /* no wineserver found */ + /* check for ntdll too to make sure */ + strcpy( basedir + baselen, "/dlls/ntdll/ntdll.dll.so" ); + if (stat( basedir, &st ) == -1) return 0; /* no ntdll found */ + + basedir[baselen] = 0; + return 1; +} + /* check if we are running from the build directory */ static char *running_from_build_dir( const char *basedir, const char *bindir ) { struct stat st; const char *p; - char *path, *end; + char *path; int res; if (!(path = build_path( bindir, "wineserver" ))) return NULL; @@ -254,24 +270,18 @@ static char *running_from_build_dir( con if (p == basedir) return NULL; path = xmalloc( p - basedir + sizeof("/dlls/ntdll/ntdll.dll.so") ); memcpy( path, basedir, p - basedir ); - end = path + (p - basedir); - strcpy( end, "/server/wineserver" ); - if (stat( path, &st ) == -1) + if (!is_valid_build_dir( path, p - basedir )) { - free( path ); - return NULL; /* no wineserver found */ - } - - /* check for ntdll too to make sure */ - strcpy( end, "/dlls/ntdll/ntdll.dll.so" ); - if (stat( path, &st ) == -1) - { - free( path ); - return NULL; /* no ntdll found */ + /* remove another component */ + while (p > basedir && *p == '/') p--; + while (p > basedir && *p != '/') p--; + if (p == basedir || !is_valid_build_dir( path, p - basedir )) + { + free( path ); + return NULL; + } } - - *end = 0; return path; }

1 0

Mike McCormack : ole32: Implement reading of VT_CF storage properties.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 98d4c2b0495df9c8c8224789c69f2e63aa9d85d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98d4c2b0495df9c8c822478… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 20 03:31:01 2006 +0900 ole32: Implement reading of VT_CF storage properties. --- dlls/ole32/stg_prop.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index ac4a6b6..c59eba1 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -82,6 +82,11 @@ #define CP_UNICODE 1200 #define MAX_VERSION_0_PROP_NAME_LENGTH 256 +#define CFTAG_WINDOWS (-1L) +#define CFTAG_MACINTOSH (-2L) +#define CFTAG_FMTID (-3L) +#define CFTAG_NODATA 0L + /* The format version (and what it implies) is described here: * http://msdn.microsoft.com/library/en-us/stg/stg/format_version.asp */ @@ -1138,6 +1143,26 @@ static HRESULT PropertyStorage_ReadPrope StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.filetime); break; + case VT_CF: + { + DWORD len = 0, type = 0, tag = 0; + + StorageUtl_ReadDWord(data, 0, &len); + StorageUtl_ReadDWord(data, 4, &tag); + StorageUtl_ReadDWord(data, 8, &type); + if (tag == CFTAG_WINDOWS && len > 12) + { + prop->u.pclipdata = CoTaskMemAlloc(sizeof (CLIPDATA)); + prop->u.pclipdata->cbSize = len; + prop->u.pclipdata->ulClipFmt = type; + prop->u.pclipdata->pClipData = CoTaskMemAlloc(len); + memcpy(prop->u.pclipdata->pClipData, data+12, len - 12); + TRACE("returning %p, len %ld\n", prop->u.pclipdata->pClipData, len - 12); + } + else + hr = STG_E_INVALIDPARAMETER; + } + break; default: FIXME("unsupported type %d\n", prop->vt); hr = STG_E_INVALIDPARAMETER;

1 0

Jeremy White : ntdll: On Solaris, limits.h is required for PATH_MAX.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: d9de5217aeaeec1ccdd1e2c33111a792df73cbb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9de5217aeaeec1ccdd1e2c… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jun 19 22:36:30 2006 +0200 ntdll: On Solaris, limits.h is required for PATH_MAX. --- dlls/ntdll/directory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 970bfa0..14a71b4 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <limits.h> #ifdef HAVE_MNTENT_H #include <mntent.h> #endif

1 0

Jeremy White : winex11.drv: On Solaris, Xutil. h is required to define XRegion.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 3484fa761640a208e6fb4ec036e4ce0e6e357ecd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3484fa761640a208e6fb4ec… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jun 19 22:36:51 2006 +0200 winex11.drv: On Solaris, Xutil.h is required to define XRegion. --- dlls/winex11.drv/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 1da69d3..07b4005 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -22,6 +22,7 @@ #include "config.h" #include <X11/Xlib.h> +#include <X11/Xutil.h> #ifdef HAVE_LIBXSHAPE #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */

1 0

Jeremy White : dbghelp: Fix a Solaris compilation error.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 466d3fe8e5e653e6d09e0c5e1026a582ed6b2132 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=466d3fe8e5e653e6d09e0c5… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jun 19 22:38:20 2006 +0200 dbghelp: Fix a Solaris compilation error. --- dlls/dbghelp/elf_module.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 85561ae..cb56e23 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -22,6 +22,13 @@ #include "config.h" #include "wine/port.h" +#if defined(__svr4__) || defined(__sun) +#define __ELF__ +/* large files are not supported by libelf */ +#undef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 32 +#endif + #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -41,10 +48,6 @@ #endif #include "dbghelp_private.h" -#if defined(__svr4__) || defined(__sun) -#define __ELF__ -#endif - #ifdef HAVE_ELF_H # include <elf.h> #endif

1 0

lostwages/wwn wn20060619_317.xml
by WineHQ 19 Jun '06

19 Jun '06

ChangeSet ID: 25838 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/06/19 15:47:23 Modified files: wwn : wn20060619_317.xml Log message: spelling fixes for WWN #317 Patch: http://cvs.winehq.org/patch.py?id=25838 Old revision New revision Changes Path 1.1 1.2 +3 -2 lostwages/wwn/wn20060619_317.xml Index: lostwages/wwn/wn20060619_317.xml diff -u -p lostwages/wwn/wn20060619_317.xml:1.1 lostwages/wwn/wn20060619_317.xml:1.2 --- lostwages/wwn/wn20060619_317.xml:1.1 19 Jun 2006 20:47:23 -0000 +++ lostwages/wwn/wn20060619_317.xml 19 Jun 2006 20:47:23 -0000 @@ -179,7 +179,7 @@ currently have.</quote> Apparently Vitaliy Margolen picked it up recently and announced some changes: <quote who="Vitaliy Margolen"> -Here is last instalment of safedisc support in Wine. +Here is latest installment of safedisc support in Wine. The major change from last version is the way user space talks to ntoskrnl. Now I'm passing the information through wineserver with a help of 4 server calls. @@ -352,6 +352,7 @@ At the end of the serie, we should have: <li> line number information</li> What's not working yet: +<ul> <li> some variables in functions (when using registers) -< will require CFA parsing (and translation into FPO)</li> <li> single stepping through trampolines (cross-DLL calls). BUT, THIS @@ -363,6 +364,6 @@ What's not working yet: <li> inlined functions are not fully handled (meaning that you won't be able to see the inlined function's argument - but this wasn't available in stabs debug info)</li> -<li> nested types are not correctly handled</li></quote> +<li> nested types are not correctly handled</li></ul></quote> </section></kc>

1 0