December 2009 - Wine-Commits

Alexandre Julliard : ntdll: Move the LDT locking functions to the i386-specific code.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 82f393dda185a3f3356d930d3d42855c50718710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f393dda185a3f3356d930d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 22:10:50 2009 +0100 ntdll: Move the LDT locking functions to the i386-specific code. --- dlls/ntdll/signal_i386.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 37 ------------------------------------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a4bb95d..5a919b3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2004,6 +2004,40 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) } +/*********************************************************************** + * locking for LDT routines + */ +static RTL_CRITICAL_SECTION ldt_section; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &ldt_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": ldt_section") } +}; +static RTL_CRITICAL_SECTION ldt_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static sigset_t ldt_sigset; + +static void ldt_lock(void) +{ + sigset_t sigset; + + pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); + RtlEnterCriticalSection( &ldt_section ); + if (ldt_section.RecursionCount == 1) ldt_sigset = sigset; +} + +static void ldt_unlock(void) +{ + if (ldt_section.RecursionCount == 1) + { + sigset_t sigset = ldt_sigset; + RtlLeaveCriticalSection( &ldt_section ); + pthread_sigmask( SIG_SETMASK, &sigset, NULL ); + } + else RtlLeaveCriticalSection( &ldt_section ); +} + + /********************************************************************** * signal_alloc_thread */ @@ -2146,6 +2180,7 @@ void signal_init_process(void) if (sigaction( SIGUSR2, &sig_act, NULL ) == -1) goto error; #endif + wine_ldt_init_locking( ldt_lock, ldt_unlock ); return; error: diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c370651..929d443 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -66,40 +66,6 @@ static RTL_BITMAP fls_bitmap; static LIST_ENTRY tls_links; static int nb_threads = 1; -static RTL_CRITICAL_SECTION ldt_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &ldt_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": ldt_section") } -}; -static RTL_CRITICAL_SECTION ldt_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static sigset_t ldt_sigset; - -/*********************************************************************** - * locking for LDT routines - */ -static void ldt_lock(void) -{ - sigset_t sigset; - - pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); - RtlEnterCriticalSection( &ldt_section ); - if (ldt_section.RecursionCount == 1) ldt_sigset = sigset; -} - -static void ldt_unlock(void) -{ - if (ldt_section.RecursionCount == 1) - { - sigset_t sigset = ldt_sigset; - RtlLeaveCriticalSection( &ldt_section ); - pthread_sigmask( SIG_SETMASK, &sigset, NULL ); - } - else RtlLeaveCriticalSection( &ldt_section ); -} - - /*********************************************************************** * get_unicode_string * @@ -369,9 +335,6 @@ HANDLE thread_init(void) wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); } - /* initialize LDT locking */ - wine_ldt_init_locking( ldt_lock, ldt_unlock ); - /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); user_shared_data->SystemTime.LowPart = now.u.LowPart;

1 0

Alexandre Julliard : ntoskrnl: Duplicate the necessary part of instruction emulation to avoid importing kernel .
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: b3878802695ef47cc216f4319d2a2db17d047ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3878802695ef47cc216f4319… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 30 20:39:47 2009 +0100 ntoskrnl: Duplicate the necessary part of instruction emulation to avoid importing kernel. --- dlls/krnl386.exe16/krnl386.exe16.spec | 3 - dlls/ntoskrnl.exe/Makefile.in | 3 +- dlls/ntoskrnl.exe/instr.c | 449 +++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.c | 24 +-- 4 files changed, 454 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3878802695ef47cc216f…

1 0

Alexandre Julliard : libwine: Do not export any of the LDT support on non-i386 platforms.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 442512d59f3185278fc97966813a4d23175614d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442512d59f3185278fc979668… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 22:18:01 2009 +0100 libwine: Do not export any of the LDT support on non-i386 platforms. --- include/wine/library.h | 21 ++++----------------- include/winnt.h | 3 --- libs/wine/ldt.c | 10 +--------- libs/wine/wine.def | 8 -------- 4 files changed, 5 insertions(+), 37 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index 9ff1910..8eedf04 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -82,6 +82,8 @@ extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg), void *arg, int top_down ); +#ifdef __i386__ + /* LDT management */ extern void wine_ldt_init_locking( void (*lock_func)(void), void (*unlock_func)(void) ); @@ -92,15 +94,9 @@ extern void *wine_ldt_get_ptr( unsigned short sel, unsigned long offset ); extern unsigned short wine_ldt_alloc_entries( int count ); extern unsigned short wine_ldt_realloc_entries( unsigned short sel, int oldcount, int newcount ); extern void wine_ldt_free_entries( unsigned short sel, int count ); -#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) extern unsigned short wine_ldt_alloc_fs(void); extern void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ); extern void wine_ldt_free_fs( unsigned short sel ); -#else /* __i386__ */ -static inline unsigned short wine_ldt_alloc_fs(void) { return 0x0b; /* pseudo GDT selector */ } -static inline void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) { } -static inline void wine_ldt_free_fs( unsigned short sel ) { } -#endif /* __i386__ */ /* the local copy of the LDT */ extern struct __wine_ldt_copy @@ -123,9 +119,6 @@ static inline void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) ent->BaseLow = (WORD)(ULONG_PTR)base; ent->HighWord.Bits.BaseMid = (BYTE)((ULONG_PTR)base >> 16); ent->HighWord.Bits.BaseHi = (BYTE)((ULONG_PTR)base >> 24); -#ifdef _WIN64 - ent->BaseHigh = (ULONG_PTR)base >> 32; -#endif } static inline void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) { @@ -136,9 +129,6 @@ static inline void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) static inline void *wine_ldt_get_base( const LDT_ENTRY *ent ) { return (void *)(ent->BaseLow | -#ifdef _WIN64 - (ULONG_PTR)ent->BaseHigh << 32 | -#endif (ULONG_PTR)ent->HighWord.Bits.BaseMid << 16 | (ULONG_PTR)ent->HighWord.Bits.BaseHi << 24); } @@ -171,7 +161,6 @@ static inline int wine_ldt_is_empty( const LDT_ENTRY *ent ) /* segment register access */ -#ifdef __i386__ # ifdef __MINGW32__ # define __DEFINE_GET_SEG(seg) \ static inline unsigned short wine_get_##seg(void); \ @@ -200,10 +189,6 @@ static inline int wine_ldt_is_empty( const LDT_ENTRY *ent ) # define __DEFINE_GET_SEG(seg) extern unsigned short wine_get_##seg(void); # define __DEFINE_SET_SEG(seg) extern void wine_set_##seg(unsigned int); # endif /* __GNUC__ || _MSC_VER */ -#else /* __i386__ */ -# define __DEFINE_GET_SEG(seg) static inline unsigned short wine_get_##seg(void) { return 0; } -# define __DEFINE_SET_SEG(seg) static inline void wine_set_##seg(int val) { /* nothing */ } -#endif /* __i386__ */ __DEFINE_GET_SEG(cs) __DEFINE_GET_SEG(ds) @@ -216,6 +201,8 @@ __DEFINE_SET_SEG(gs) #undef __DEFINE_GET_SEG #undef __DEFINE_SET_SEG +#endif /* __i386__ */ + #ifdef __cplusplus } #endif diff --git a/include/winnt.h b/include/winnt.h index 28409af..d4a158e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -866,9 +866,6 @@ typedef struct _LDT_ENTRY { unsigned BaseHi : 8; } Bits; } HighWord; -#ifdef _WIN64 /* FIXME: 64-bit code should not be using the LDT */ - DWORD BaseHigh; -#endif } LDT_ENTRY, *PLDT_ENTRY; /* x86-64 context definitions */ diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 685ed6a..d56790f 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -33,7 +33,7 @@ #include "winbase.h" #include "wine/library.h" -#ifdef __i386__ +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) #ifdef __linux__ @@ -118,8 +118,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #include <i386/user_ldt.h> #endif -#endif /* __i386__ */ - /* local copy of the LDT */ #ifdef __APPLE__ struct __wine_ldt_copy wine_ldt_copy = { { 0, 0, 0 } }; @@ -190,8 +188,6 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry ) if (index < LDT_FIRST_ENTRY) return 0; /* cannot modify reserved entries */ -#ifdef __i386__ - #ifdef linux { struct modify_ldt_s ldt_info; @@ -234,8 +230,6 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry ) exit(1); #endif -#endif /* __i386__ */ - if (ret >= 0) { wine_ldt_copy.base[index] = wine_ldt_get_base(entry); @@ -384,8 +378,6 @@ void wine_ldt_free_entries( unsigned short sel, int count ) } -#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) - static int global_fs_sel = -1; /* global selector for %fs shared among all threads */ /*********************************************************************** diff --git a/libs/wine/wine.def b/libs/wine/wine.def index b94397a..ed315bd 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -86,14 +86,6 @@ EXPORTS wine_init wine_init_argv0_path wine_is_dbcs_leadbyte - wine_ldt_alloc_entries - wine_ldt_free_entries - wine_ldt_get_entry - wine_ldt_get_ptr - wine_ldt_init_locking - wine_ldt_is_system - wine_ldt_realloc_entries - wine_ldt_set_entry wine_pthread_get_functions wine_pthread_set_functions wine_switch_to_stack

1 0

Alexandre Julliard : shell32: Move the RunDLL_CallEntry16 implementation to shell.dll.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 89df78e2c00e4b6964c15611d7fa80c2797f3e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89df78e2c00e4b6964c15611d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 30 17:29:06 2009 +0100 shell32: Move the RunDLL_CallEntry16 implementation to shell.dll. --- dlls/shell.dll16/shell.c | 25 +++++++++++++++++++++++++ dlls/shell.dll16/shell.dll16.spec | 4 ++++ dlls/shell32/control.c | 28 ---------------------------- dlls/shell32/shell32.spec | 2 +- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 9964b60..b33d3cc 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -612,3 +612,28 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, return HINSTANCE_16( WOWShellExecute( HWND_32(hWnd), lpOperation, lpFile, lpParameters, lpDirectory, iShowCmd, SHELL_Execute16 )); } + + +/************************************************************************* + * RunDLL_CallEntry16 + * + * Only exported from shell32 on Windows, probably imported + * from shell through the 16/32 thunks. + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) +{ + WORD args[5]; + SEGPTR cmdline_seg; + + TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", + proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); + + cmdline_seg = MapLS( cmdline ); + args[4] = HWND_16(hwnd); + args[3] = MapHModuleLS(inst); + args[2] = SELECTOROF(cmdline_seg); + args[1] = OFFSETOF(cmdline_seg); + args[0] = cmdshow; + WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); + UnMapLS( cmdline_seg ); +} diff --git a/dlls/shell.dll16/shell.dll16.spec b/dlls/shell.dll16/shell.dll16.spec index ac36ec7..df03ace 100644 --- a/dlls/shell.dll16/shell.dll16.spec +++ b/dlls/shell.dll16/shell.dll16.spec @@ -43,3 +43,7 @@ # 402 _RUNDLLCHECKDRIVE #32 WCI + +################################################################ +# Wine extensions: functions needed by shell32 +@ stdcall -arch=win32 RunDLL_CallEntry16(long long ptr str long) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index cfea201..730f8a6 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -29,8 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "wine/winbase16.h" -#include "wownt32.h" #include "wine/debug.h" #include "cpl.h" #include "wine/unicode.h" @@ -878,32 +876,6 @@ HRESULT WINAPI Control_FillCache_RunDLLA(HWND hWnd, HANDLE hModule, DWORD w, DWO return Control_FillCache_RunDLLW(hWnd, hModule, w, x); } - -/************************************************************************* - * RunDLL_CallEntry16 [SHELL32.122] - * the name is probably wrong - */ -void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, - LPCSTR cmdline, INT cmdshow ) -{ -#ifdef __i386__ - WORD args[5]; - SEGPTR cmdline_seg; - - TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", - proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); - - cmdline_seg = MapLS( cmdline ); - args[4] = HWND_16(hwnd); - args[3] = MapHModuleLS(inst); - args[2] = SELECTOROF(cmdline_seg); - args[1] = OFFSETOF(cmdline_seg); - args[0] = cmdshow; - WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); - UnMapLS( cmdline_seg ); -#endif -} - /************************************************************************* * CallCPLEntry16 [SHELL32.166] * diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f95690c..fc1347e 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -noname IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -noname RunDLL_CallEntry16(long long long str long) #name wrong? + 122 stdcall -private @(long long long str long) shell.dll16.RunDLL_CallEntry16 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)

1 0

Andrew Nguyen : gdi32: Fix a typo in ScaleViewportExtEx.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: c3e9de0b4c60460daca19eda6de75bc2a15bc93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e9de0b4c60460daca19eda6… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 30 09:42:33 2009 -0600 gdi32: Fix a typo in ScaleViewportExtEx. Spotted by Gregor Schneider. --- dlls/gdi32/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index e199dd3..35bb1ea 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -424,7 +424,7 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, } if ((dc->MapMode != MM_ISOTROPIC) && (dc->MapMode != MM_ANISOTROPIC)) goto done; - if (!xNum || !xDenom || !xNum || !yDenom) + if (!xNum || !xDenom || !yNum || !yDenom) { ret = FALSE; goto done;

1 0

Christian Costa : mciqtz: Improve MCIQTZ_mciSet traces.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: 4e3b5b872e472e4f398ef81818fcb1f6e4c165a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3b5b872e472e4f398ef8181… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 30 11:38:30 2009 +0100 mciqtz: Improve MCIQTZ_mciSet traces. --- dlls/mciqtz32/mciqtz.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 1625a8d..a34caf8 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -436,8 +436,25 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar } } - if (dwFlags & ~MCI_SET_TIME_FORMAT) - FIXME("Flags not supported yet %08lX\n", dwFlags & ~MCI_SET_TIME_FORMAT); + if (dwFlags & MCI_SET_DOOR_OPEN) + FIXME("MCI_SET_DOOR_OPEN not implemented yet\n"); + if (dwFlags & MCI_SET_DOOR_CLOSED) + FIXME("MCI_SET_DOOR_CLOSED not implemented yet\n"); + if (dwFlags & MCI_SET_AUDIO) + FIXME("MCI_SET_AUDIO not implemented yet\n"); + if (dwFlags & MCI_SET_VIDEO) + FIXME("MCI_SET_VIDEO not implemented yet\n"); + if (dwFlags & MCI_SET_ON) + FIXME("MCI_SET_ON not implemented yet\n"); + if (dwFlags & MCI_SET_OFF) + FIXME("MCI_SET_OFF not implemented yet\n"); + if (dwFlags & MCI_SET_AUDIO_LEFT) + FIXME("MCI_SET_AUDIO_LEFT not implemented yet\n"); + if (dwFlags & MCI_SET_AUDIO_RIGHT) + FIXME("MCI_SET_AUDIO_RIGHT not implemented yet\n"); + + if (dwFlags & ~0x7f03 /* All MCI_SET flags mask */) + ERR("Unknown flags %08x\n", dwFlags & ~0x7f03); return 0; }

1 0

Rob Shearman : shlwapi: Initialise id field of ConPt object in connection point tests.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: 7da10bca338049857eefa5af3cae7bf43419f105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da10bca338049857eefa5af3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 30 13:15:08 2009 +0000 shlwapi: Initialise id field of ConPt object in connection point tests. --- dlls/shlwapi/tests/ordinal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 5227ea7..31fced9 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1095,6 +1095,7 @@ static HRESULT WINAPI Contain_FindConnectionPoint( pt->sinkCount = 0; pt->sink = NULL; pt->container = iface; + pt->id = IID_IDispatch; if (iface->ptCount == 0) iface->pt =HeapAlloc(GetProcessHeap(),0,sizeof(IUnknown*));

1 0

Alexandre Julliard : kernel32: Do not include 16-bit headers in 32-bit files.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: 8268ed978389662c7b43212e008037cae3ce900e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8268ed978389662c7b43212e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 22:19:31 2009 +0100 kernel32: Do not include 16-bit headers in 32-bit files. --- dlls/kernel32/console.c | 1 - dlls/kernel32/module.c | 3 ++- dlls/kernel32/process.c | 3 +-- dlls/kernel32/resource.c | 7 ------- dlls/kernel32/thread.c | 1 - 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 48bcfa4..42344af 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -44,7 +44,6 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" -#include "wine/winbase16.h" #include "wine/server.h" #include "wine/exception.h" #include "wine/unicode.h" diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2308a10..76e1b0f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -31,7 +31,6 @@ #endif #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/winbase16.h" #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -44,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); +#define NE_FFLAGS_LIBMODULE 0x8000 + static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */ static CRITICAL_SECTION dlldir_section; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index eb39f5c..e481e0c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -43,10 +43,9 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/winbase16.h" -#include "wine/winuser16.h" #include "winternl.h" #include "kernel_private.h" +#include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 8d52397..d364739 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -39,13 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); -/* handle conversions */ -#define HRSRC_32(h16) ((HRSRC)(ULONG_PTR)(h16)) -#define HRSRC_16(h32) (LOWORD(h32)) -#define HGLOBAL_32(h16) ((HGLOBAL)(ULONG_PTR)(h16)) -#define HGLOBAL_16(h32) (LOWORD(h32)) -#define HMODULE_16(h32) (LOWORD(h32)) - /* retrieve the resource name to pass to the ntdll functions */ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) { diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 17339ca..6979c36 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -35,7 +35,6 @@ #include "winbase.h" #include "winerror.h" #include "winternl.h" -#include "wine/winbase16.h" #include "wine/exception.h" #include "wine/library.h" #include "wine/server.h"

1 0

Rob Shearman : ntdll: Fix typo in RTL_ReportRegistryValue which caused a counted string to be passed into QueryFunction which expects a nul-terminated string .
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: 3d0f56fb371f3c983ea0c9ab43fb55274b30015d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0f56fb371f3c983ea0c9ab4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 30 13:14:56 2009 +0000 ntdll: Fix typo in RTL_ReportRegistryValue which caused a counted string to be passed into QueryFunction which expects a nul-terminated string. --- dlls/ntdll/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 286dbdb..cb214a7 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -991,7 +991,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if((pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND) || (pInfo->Type != REG_EXPAND_SZ && pInfo->Type != REG_MULTI_SZ)) { - status = pQuery->QueryRoutine(pInfo->Name, pInfo->Type, + status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, ((CHAR*)pInfo) + pInfo->DataOffset, pInfo->DataLength, pContext, pQuery->EntryContext); }

1 0

Steven Edwards : winefile: Replace builtin execute dialog with standard RunFile dialog.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: d6055a4165491af6ca4c1b4b1f1bfea0e8699cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6055a4165491af6ca4c1b4b1… Author: Steven Edwards <sedwards(a)bordeauxgroup.com> Date: Mon Dec 28 11:44:20 2009 -0500 winefile: Replace builtin execute dialog with standard RunFile dialog. --- programs/winefile/Cs.rc | 17 +------------- programs/winefile/Da.rc | 17 +------------- programs/winefile/De.rc | 17 +------------- programs/winefile/En.rc | 17 +------------- programs/winefile/Es.rc | 17 +------------- programs/winefile/Fr.rc | 17 +------------- programs/winefile/Hu.rc | 17 +------------- programs/winefile/It.rc | 17 +------------- programs/winefile/Ja.rc | 17 +------------- programs/winefile/Ko.rc | 17 +------------- programs/winefile/Lt.rc | 17 +------------- programs/winefile/Nl.rc | 17 +------------- programs/winefile/No.rc | 17 +------------- programs/winefile/Pl.rc | 17 +------------- programs/winefile/Pt.rc | 22 +----------------- programs/winefile/Ru.rc | 16 +------------ programs/winefile/Si.rc | 17 +------------- programs/winefile/Sv.rc | 17 +------------- programs/winefile/Tr.rc | 17 +------------- programs/winefile/Zh.rc | 34 +--------------------------- programs/winefile/resource.h | 3 +- programs/winefile/winefile.c | 49 ++++++++--------------------------------- 22 files changed, 33 insertions(+), 380 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6055a4165491af6ca4c1…

1 0