February 2006 - Wine-commits

Francois Gouget : user: Fix ExitWindows().
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 6edd77228dd18f013fb64a22abaaa4da14fde707 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6edd77228dd18f013fb64a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 24 12:58:16 2006 +0100 user: Fix ExitWindows(). - Use 0 to get an infinite timeout with SendMessageTimeoutW(). - Use SendMessageTimeoutW() to send the WM_ENDSESSION messages too so we don't get stuck if a process is hung. - Only send WM_ENDSESSION to windows that received a WM_QUERYENDSESSION message. Also better mimick the Windows behavior. --- dlls/user/user_main.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 7cca47c..0e2d830 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -374,23 +374,25 @@ BOOL WINAPI ExitWindowsEx( UINT flags, D { HWND *phwnd; UINT send_flags; - DWORD_PTR result; + DWORD_PTR result=1; - /* Send a WM_QUERYENDSESSION message to every window */ + /* Send a WM_QUERYENDSESSION / WM_ENDSESSION message pair to + * each window. Note: it might be better to send all the + * WM_QUERYENDSESSION messages, aggregate the results and then + * send all the WM_ENDSESSION messages with the results but + * that's not what Windows does. + */ send_flags=(flags & EWX_FORCEIFHUNG) ? SMTO_ABORTIFHUNG : SMTO_NORMAL; for (phwnd = list; *phwnd; phwnd++) { /* Make sure that the window still exists */ if (!IsWindow( *phwnd )) continue; - if (SendMessageTimeoutW( *phwnd, WM_QUERYENDSESSION, 0, 0, send_flags, INFINITE, &result) && !result) break; - } - result = (*phwnd == NULL); - - /* Now notify all windows that got a WM_QUERYENDSESSION of the result */ - for (phwnd = list; *phwnd; phwnd++) - { - if (!IsWindow( *phwnd )) continue; - SendMessageW( *phwnd, WM_ENDSESSION, result, 0 ); + if (SendMessageTimeoutW( *phwnd, WM_QUERYENDSESSION, 0, 0, send_flags, 0, &result)) + { + DWORD_PTR dummy; + SendMessageTimeoutW( *phwnd, WM_ENDSESSION, result, 0, send_flags, 0, &dummy ); + if (!result) break; + } } HeapFree( GetProcessHeap(), 0, list );

1 0

Alexandre Julliard : x11drv: Make the synchronous option a debug channel instead of a
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: d61ad6cdd7cb6535b0c923df69e8ffc854cb67a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d61ad6cdd7cb6535b0c923d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 21:05:44 2006 +0100 x11drv: Make the synchronous option a debug channel instead of a registry entry to make it easier to use. --- dlls/x11drv/x11drv_main.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 5c10690..55226d4 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -51,6 +51,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +WINE_DECLARE_DEBUG_CHANNEL(synchronous); static CRITICAL_SECTION X11DRV_CritSection; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -86,7 +87,6 @@ int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; -static BOOL synchronous; /* run in synchronous mode? */ static BOOL desktop_dbl_buf = TRUE; static char *desktop_geometry; @@ -224,7 +224,7 @@ static int error_handler( Display *displ error_evt->error_code, error_evt->request_code ); return 0; } - if (synchronous) + if (TRACE_ON(synchronous)) { ERR( "X protocol error: serial=%ld, request_code=%d - breaking into debugger\n", error_evt->serial, error_evt->request_code ); @@ -330,9 +330,6 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) screen_depth = atoi(buffer); - if (!get_config_key( hkey, appkey, "Synchronous", buffer, sizeof(buffer) )) - synchronous = IS_OPTION_TRUE( buffer[0] ); - if (!get_config_key( hkey, appkey, "ClientSideWithCore", buffer, sizeof(buffer) )) client_side_with_core = IS_OPTION_TRUE( buffer[0] ); @@ -417,7 +414,7 @@ static BOOL process_attach(void) XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); - if (synchronous) XSynchronize( display, True ); + if (TRACE_ON(synchronous)) XSynchronize( display, True ); screen_width = WidthOfScreen( screen ); screen_height = HeightOfScreen( screen ); @@ -526,7 +523,7 @@ struct x11drv_thread_data *x11drv_init_t } #endif - if (synchronous) XSynchronize( data->display, True ); + if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); wine_tsx11_unlock(); if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style )))

1 0

Alexandre Julliard : configure: Added special check for broken linux/capi.h .
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: b079add353c635d43ebb4827c3ab23e8f1ac4af2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b079add353c635d43ebb482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 11:46:17 2006 +0100 configure: Added special check for broken linux/capi.h. --- configure | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 4 +++- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b1258e8..f5a9a93 100755 --- a/configure +++ b/configure @@ -7038,7 +7038,6 @@ done - for ac_header in \ IOKit/IOKitLib.h \ alsa/asoundlib.h \ @@ -7065,7 +7064,6 @@ for ac_header in \ ldap.h \ libaudioio.h \ link.h \ - linux/capi.h \ linux/cdrom.h \ linux/compiler.h \ linux/hdreg.h \ @@ -7351,6 +7349,67 @@ fi +for ac_header in linux/capi.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define __user + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + if test "$have_x" = "yes" then XLIB="-lXext -lX11" diff --git a/configure.ac b/configure.ac index 1fd1100..7c3332f 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,6 @@ AC_CHECK_HEADERS(\ ldap.h \ libaudioio.h \ link.h \ - linux/capi.h \ linux/cdrom.h \ linux/compiler.h \ linux/hdreg.h \ @@ -278,6 +277,9 @@ AC_CHECK_HEADERS(\ ) AC_HEADER_STAT() +dnl Check for broken kernel header that doesn't define __user +AC_CHECK_HEADERS([linux/capi.h],,,[#define __user]) + dnl **** Check for X11 **** if test "$have_x" = "yes"

1 0

Alexandre Julliard : ntdll: Use PROT_NONE instead of 0.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 7bd0cdafc2b1a480f97c2239ee181f66aa4283ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bd0cdafc2b1a480f97c223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 11:31:24 2006 +0100 ntdll: Use PROT_NONE instead of 0. --- dlls/ntdll/virtual.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c33dce6..d17c58d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -443,6 +443,7 @@ static int VIRTUAL_GetUnixProt( BYTE vpr if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE; if (vprot & VPROT_EXEC) prot |= PROT_EXEC; } + if (!prot) prot = PROT_NONE; return prot; }

1 0

Alexandre Julliard : kernel: Don' t request execute permission for DOS memory.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 2ba3d3ac25dfd50cad5c732ffbed26dd2872300a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ba3d3ac25dfd50cad5c732… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 11:31:04 2006 +0100 kernel: Don't request execute permission for DOS memory. --- dlls/kernel/dosmem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c index 7642b27..854d975 100644 --- a/dlls/kernel/dosmem.c +++ b/dlls/kernel/dosmem.c @@ -166,7 +166,7 @@ static char* setup_dos_mem(void) if (wine_mmap_is_in_reserved_area( NULL, DOSMEM_SIZE ) != 1) { addr = wine_anon_mmap( (void *)page_size, DOSMEM_SIZE-page_size, - PROT_READ | PROT_WRITE | PROT_EXEC, 0 ); + PROT_READ | PROT_WRITE, 0 ); if (addr == (void *)page_size) addr = NULL; /* we got what we wanted */ else munmap( addr, DOSMEM_SIZE - page_size ); } @@ -174,7 +174,7 @@ static char* setup_dos_mem(void) if (!addr) { /* now reserve from address 0 */ - wine_anon_mmap( NULL, DOSMEM_SIZE, 0, MAP_FIXED ); + wine_anon_mmap( NULL, DOSMEM_SIZE, PROT_NONE, MAP_FIXED ); /* inform the memory manager that there is a mapping here, but don't commit yet */ VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE | MEM_SYSTEM, PAGE_NOACCESS );

1 0

Juan Lang : crypt32: Use public functions during serialization rather than relying
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: b48f865f7dd3d2bb0374d1d49b98e4e9de270c6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b48f865f7dd3d2bb0374d1d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 23 17:47:12 2006 -0800 crypt32: Use public functions during serialization rather than relying on the internal format of a certificate. --- dlls/crypt32/store.c | 156 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 113 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b48f865f7dd3d2bb037…

1 0

Juan Lang : crypt32: implement CryptEnumOIDInfo and CryptFindOIDInfo.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 690f98408b610705407dcd3a5e9fc6df4338193c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=690f98408b610705407dcd3… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 23 13:18:13 2006 -0800 crypt32: implement CryptEnumOIDInfo and CryptFindOIDInfo. - implement CryptEnumOIDInfo and CryptFindOIDInfo - implement CertOIDToAlgId and CertAlgIdToOID using CryptFindOIDInfo --- dlls/crypt32/.gitignore | 1 dlls/crypt32/Makefile.in | 2 dlls/crypt32/crypt32.rc | 27 ++ dlls/crypt32/crypt32_En.rc | 166 ++++++++++ dlls/crypt32/crypt32_private.h | 4 dlls/crypt32/cryptres.h | 163 ++++++++++ dlls/crypt32/main.c | 4 dlls/crypt32/oid.c | 649 ++++++++++++++++++++++++++++++++++------ dlls/crypt32/tests/oid.c | 76 +++++ dlls/crypt32/version.rc | 28 ++ include/wincrypt.h | 1 11 files changed, 1026 insertions(+), 95 deletions(-) create mode 100644 dlls/crypt32/crypt32.rc create mode 100644 dlls/crypt32/crypt32_En.rc create mode 100644 dlls/crypt32/cryptres.h create mode 100644 dlls/crypt32/version.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=690f98408b610705407…

1 0

Detlef Riekenberg : winspool/tests: Skip tests, when a remote print server has no RPC
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 110612c137c87cba91faac6b97ff4d395c870ac9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=110612c137c87cba91faac6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 23 16:03:32 2006 +0100 winspool/tests: Skip tests, when a remote print server has no RPC service running. --- dlls/winspool/tests/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index d5990fd..74ab592 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -553,6 +553,8 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); + /* stop here, when a remote Printserver has no RPC-Service running */ + RETURN_ON_DEACTIVATED_SPOOLER(res) ok(res || ((GetLastError() == ERROR_INVALID_DATATYPE) || (GetLastError() == ERROR_ACCESS_DENIED)), "returned %ld with %ld (expected '!=0' or '0' with: " \

1 0

Vitaly Lipatov : ole32/tests: Do not compare returned by DeleteFile value with TRUE.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: a8397e307a6b9a1216c8dc12615d3d02dca8fa62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8397e307a6b9a1216c8dc1… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Feb 23 16:31:59 2006 +0300 ole32/tests: Do not compare returned by DeleteFile value with TRUE. --- dlls/ole32/tests/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 235ca63..4ac4144 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -312,7 +312,7 @@ static void test_storage_stream(void) r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); r = DeleteFileW(filename); - ok(r == TRUE, "file should exist\n"); + ok(r, "file should exist\n"); } static BOOL touch_file(LPCWSTR filename)

1 0

Robert Shearman : ole: Fallthrough from local activation in CoGetClassObject.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: f4a8ba9548499ca8118ad6eb936a01ce4f11cda1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4a8ba9548499ca8118ad6e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Feb 23 19:02:00 2006 +0000 ole: Fallthrough from local activation in CoGetClassObject. If local-server or local-service activation doesn't work in CoGetClassObject then fallthrough instead of returning from the function. --- dlls/ole32/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 67c8655..7057450 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1695,7 +1695,9 @@ HRESULT WINAPI CoGetClassObject( /* Next try out of process */ if (CLSCTX_LOCAL_SERVER & dwClsContext) { - return RPC_GetLocalClassObject(rclsid,iid,ppv); + hres = RPC_GetLocalClassObject(rclsid,iid,ppv); + if (SUCCEEDED(hres)) + return hres; } /* Finally try remote: this requires networked DCOM (a lot of work) */

1 0