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

Dmitry Timoshkov : ddraw: Do not report DDCAPS_OVERLAY and friends since overlays are not supported.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: c7ae07adf4cbee02df713197d671fa77173e02c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7ae07adf4cbee02df71319… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 15 20:43:42 2006 +0900 ddraw: Do not report DDCAPS_OVERLAY and friends since overlays are not supported. --- dlls/ddraw/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 1868ef2..5c32ab6 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -249,10 +249,11 @@ DDRAW_Create(GUID *guid, /* Initialize the caps */ This->caps.dwSize = sizeof(This->caps); +/* do not report DDCAPS_OVERLAY and friends since we don't support overlays */ #define BLIT_CAPS (DDCAPS_BLT | DDCAPS_BLTCOLORFILL | DDCAPS_BLTDEPTHFILL \ | DDCAPS_BLTSTRETCH | DDCAPS_CANBLTSYSMEM | DDCAPS_CANCLIP \ | DDCAPS_CANCLIPSTRETCHED | DDCAPS_COLORKEY \ - | DDCAPS_COLORKEYHWASSIST | DDCAPS_OVERLAY | DDCAPS_OVERLAYSTRETCH |DDCAPS_ALIGNBOUNDARYSRC ) + | DDCAPS_COLORKEYHWASSIST | DDCAPS_ALIGNBOUNDARYSRC ) #define CKEY_CAPS (DDCKEYCAPS_DESTBLT | DDCKEYCAPS_SRCBLT) #define FX_CAPS (DDFXCAPS_BLTALPHA | DDFXCAPS_BLTMIRRORLEFTRIGHT \ | DDFXCAPS_BLTMIRRORUPDOWN | DDFXCAPS_BLTROTATION90 \

1 0

Alexander Nicolaysen Sørnes : winecfg: Improve wording of virtual desktop explanation.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 5d264f2212c1844ae053c83c03f09108625baf33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d264f2212c1844ae053c83… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 15 15:36:09 2006 +0200 winecfg: Improve wording of virtual desktop explanation. --- programs/winecfg/En.rc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 4184501..3884d7b 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -70,8 +70,7 @@ BEGIN IDC_STATIC,15,37,228,80 CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 - /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", + LTEXT "You can either choose to have all Windows applications confined to a single window acting as a virtual desktop, or to have them behave like your other applications.", IDC_STATIC,15,125,228,28 LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED

1 0

Jeff Latimer : usp10: Remove unnecessary casts in test suite.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: dd8f067fb05c89e6c3cbdac31d8b45ec6e4a9a56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd8f067fb05c89e6c3cbdac… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Aug 15 20:52:37 2006 +1000 usp10: Remove unnecessary casts in test suite. --- dlls/usp10/tests/usp10.c | 102 +++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dd8f067fb05c89e6c3c…

1 0

Juan Lang : crypt32: Implement CertCreateCertificateChainEngine and CertFreeCertificateChainEngine .
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: b633d6a382fb93aff1ca9e14bcf00dfc0ac5d957 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b633d6a382fb93aff1ca9e1… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Aug 14 22:27:31 2006 -0700 crypt32: Implement CertCreateCertificateChainEngine and CertFreeCertificateChainEngine. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/chain.c | 172 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 4 - dlls/crypt32/tests/Makefile.in | 1 dlls/crypt32/tests/chain.c | 108 +++++++++++++++++++++++++ 5 files changed, 284 insertions(+), 2 deletions(-) create mode 100644 dlls/crypt32/chain.c create mode 100644 dlls/crypt32/tests/chain.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b633d6a382fb93aff1c…

1 0

Juan Lang : crypt32: Implement CertCreateCertificateChainEngine and CertFreeCertificateChainEngine .
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: fd3fcc0bdd6fe298ae9d498afaf564fabff4b3d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd3fcc0bdd6fe298ae9d498… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Aug 14 22:27:31 2006 -0700 crypt32: Implement CertCreateCertificateChainEngine and CertFreeCertificateChainEngine. --- include/wincrypt.h | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 309 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fd3fcc0bdd6fe298ae9…

1 0

Alexandre Julliard : loader/kthread: Remove some unneeded #ifdefs, other platforms use pthread now.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: dd0340ef0a0cfd2d80f0f82081425d29bd00a5e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd0340ef0a0cfd2d80f0f82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 12:57:25 2006 +0200 loader/kthread: Remove some unneeded #ifdefs, other platforms use pthread now. --- configure | 4 --- configure.ac | 2 -- include/config.h.in | 6 ----- loader/kthread.c | 64 --------------------------------------------------- 4 files changed, 0 insertions(+), 76 deletions(-) diff --git a/configure b/configure index fda6389..b8d6b8b 100755 --- a/configure +++ b/configure @@ -18346,11 +18346,7 @@ fi - - for ac_func in \ - _lwp_create \ - _lwp_self \ _pclose \ _popen \ _snprintf \ diff --git a/configure.ac b/configure.ac index 951c553..8d89e0c 100644 --- a/configure.ac +++ b/configure.ac @@ -1239,8 +1239,6 @@ fi dnl **** Check for functions **** AC_CHECK_FUNCS(\ - _lwp_create \ - _lwp_self \ _pclose \ _popen \ _snprintf \ diff --git a/include/config.h.in b/include/config.h.in index ee42eeb..3a09075 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -932,12 +932,6 @@ #undef HAVE_XMLREADMEMORY /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM -/* Define to 1 if you have the `_lwp_create' function. */ -#undef HAVE__LWP_CREATE - -/* Define to 1 if you have the `_lwp_self' function. */ -#undef HAVE__LWP_SELF - /* Define to 1 if you have the `_pclose' function. */ #undef HAVE__PCLOSE diff --git a/loader/kthread.c b/loader/kthread.c index 577311b..9c3e0ed 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -58,12 +58,6 @@ #endif #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_SYS_LWP_H -# include <sys/lwp.h> -#endif -#ifdef HAVE_UCONTEXT_H -# include <ucontext.h> -#endif #ifdef HAVE_SCHED_H #include <sched.h> #endif @@ -192,9 +186,6 @@ static void cleanup_thread( void *ptr ) wine_ldt_free_fs( info.teb_sel ); if (info.stack_size) munmap( info.stack_base, info.stack_size ); if (info.teb_size) munmap( info.teb_base, info.teb_size ); -#ifdef HAVE__LWP_CREATE - _lwp_exit(); -#endif _exit( info.exit_status ); } @@ -276,15 +267,6 @@ #elif defined(HAVE_RFORK) : "eax", "edx"); return 0; } -#elif defined(HAVE__LWP_CREATE) - { - ucontext_t context; - _lwp_makecontext( &context, (void(*)(void *))info->entry, info, - NULL, info->stack_base, info->stack_size ); - if ( _lwp_create( &context, 0, NULL ) ) - return -1; - return 0; - } #endif return -1; } @@ -297,7 +279,6 @@ #endif */ static void init_current_teb( struct wine_pthread_thread_info *info ) { -#ifdef __i386__ /* On the i386, the current thread is in the %fs register */ LDT_ENTRY fs_entry; @@ -305,30 +286,10 @@ #ifdef __i386__ wine_ldt_set_limit( &fs_entry, info->teb_size - 1 ); wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT ); wine_ldt_init_fs( info->teb_sel, &fs_entry ); -#elif defined(HAVE__LWP_CREATE) - /* On non-i386 Solaris, we use the LWP private pointer */ - _lwp_setprivate( info->teb_base ); -#elif defined(__powerpc__) - /* On PowerPC, the current TEB is in the gpr13 register */ -# ifdef __APPLE__ - __asm__ __volatile__("mr r13, %0" : : "r" (info->teb_base)); -# else - __asm__ __volatile__("mr 2, %0" : : "r" (info->teb_base)); -# endif -#elif defined(__ALPHA__) - /* FIXME: On Alpha, the current TEB is not accessible to user-space */ -/* __asm__ __volatile__();*/ -#else -# error You must implement init_current_teb for your platform -#endif /* set pid and tid */ info->pid = getpid(); -#ifdef HAVE__LWP_SELF - info->tid = _lwp_self(); -#else info->tid = -1; -#endif } @@ -338,29 +299,7 @@ #endif static void *get_current_teb(void) { void *ret; - -#ifdef __i386__ __asm__( ".byte 0x64\n\tmovl 0x18,%0" : "=r" (ret) ); -#elif defined(HAVE__LWP_CREATE) - ret = _lwp_getprivate(); -#elif defined(__powerpc__) -# ifdef __APPLE__ - __asm__( "mr %0,r13" : "=r" (ret) ); -# else - __asm__( "mr %0,2" : "=r" (ret) ); -# endif -#elif defined(__ALPHA__) - /* 0x00ab is the PAL opcode for rdteb */ - __asm__( "lda $30,8($30)\n\t" - "stq $0,0($30)\n\t" - "call_pal 0x00ab\n\t" - "mov $0,%0\n\t" - "ldq $0,0($30)\n\t" - "lda $30,-8($30)" : "=r" (ret) ); -#else -# error get_current_teb not defined for this architecture -#endif /* __i386__ */ - return ret; } @@ -379,9 +318,6 @@ static void DECLSPEC_NORETURN exit_threa */ static void DECLSPEC_NORETURN abort_thread( long status ) { -#ifdef HAVE__LWP_CREATE - _lwp_exit(); -#endif _exit( status ); }

1 0

Alexandre Julliard : configure: Disable optimization on MacOS because of gcc bug.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: bdeeabeb282358000b6fe1a64ab20514259e92a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bdeeabeb282358000b6fe1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 12:56:33 2006 +0200 configure: Disable optimization on MacOS because of gcc bug. --- configure | 1 + configure.ac | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 767921f..fda6389 100755 --- a/configure +++ b/configure @@ -15300,6 +15300,7 @@ fi *powerpc*) LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" ;; esac + CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/-O1/` ;; *) DLLFLAGS="$DLLFLAGS -fPIC" diff --git a/configure.ac b/configure.ac index de28ba7..951c553 100644 --- a/configure.ac +++ b/configure.ac @@ -1052,6 +1052,9 @@ case $host_os in LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" dnl FIXME ;; esac + dnl Disable optimizations because of force_align_arg_pointer bug + dnl FIXME: should be removed when gcc is fixed + CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/-O1/` ;; *) DLLFLAGS="$DLLFLAGS -fPIC"

1 0

Alexandre Julliard : configure: Use a platform name check for MacOS shared library support,
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 42b81ea0067186494b8687c060d3817ffabad9a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42b81ea0067186494b8687c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 12:55:25 2006 +0200 configure: Use a platform name check for MacOS shared library support, it's completely different from the others anyway. --- configure | 257 ++++++++++++++++++++++------------------------------------ configure.ac | 222 +++++++++++++++++++++++++------------------------- 2 files changed, 207 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=42b81ea0067186494b8…

1 0

Alexandre Julliard : configure: Moved the library checks after the function checks to avoid code duplication .
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: e533e972bf1a12b1236de22f282a936620239167 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e533e972bf1a12b1236de22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 12:11:30 2006 +0200 configure: Moved the library checks after the function checks to avoid code duplication. --- configure | 1404 +++++++++++++++++-------------------------------- configure.ac | 51 +- include/config.h.in | 2 libs/wine/Makefile.in | 2 4 files changed, 516 insertions(+), 943 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e533e972bf1a12b1236…

1 0

Kai Blin : secur32: Fix typo in ISC flags.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 24b680d3f172a568c9d5a7a080921e8b786e6701 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24b680d3f172a568c9d5a7a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Aug 15 02:02:56 2006 +0200 secur32: Fix typo in ISC flags. --- include/sspi.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index 74050b5..621848d 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -276,9 +276,9 @@ #define ISC_REQ_CALL_LEVEL 0 #define ISC_REQ_FRAGMENT_SUPPLIED 0x00002000 #define ISC_REQ_EXTENDED_ERROR 0x00004000 #define ISC_REQ_STREAM 0x00008000 -#define ISC_REQ_INTEGRITY 0x00001000 -#define ISC_REQ_IDENTIFY 0x00002000 -#define ISC_REQ_NULL_SESSION 0x00004000 +#define ISC_REQ_INTEGRITY 0x00010000 +#define ISC_REQ_IDENTIFY 0x00020000 +#define ISC_REQ_NULL_SESSION 0x00040000 #define ISC_REQ_MANUAL_CRED_VALIDATION 0x00080000 #define ISC_REQ_RESERVED1 0x00100000 #define ISC_REQ_FRAGMENT_TO_FIT 0x00200000 @@ -299,9 +299,9 @@ #define ISC_RET_INTERMEDIATE_RETURN 0 #define ISC_RET_CALL_LEVEL 0x00002000 #define ISC_RET_EXTENDED_ERROR 0x00004000 #define ISC_RET_STREAM 0x00008000 -#define ISC_RET_INTEGRITY 0x00001000 -#define ISC_RET_IDENTIFY 0x00002000 -#define ISC_RET_NULL_SESSION 0x00004000 +#define ISC_RET_INTEGRITY 0x00010000 +#define ISC_RET_IDENTIFY 0x00020000 +#define ISC_RET_NULL_SESSION 0x00040000 #define ISC_RET_MANUAL_CRED_VALIDATION 0x00080000 #define ISC_RET_RESERVED1 0x00100000 #define ISC_RET_FRAGMENT_ONLY 0x00200000

1 0