December 2009 - Wine-commits

Alexandre Julliard : kernel32: Make krnl386. exe into a stand-alone 16-bit module.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 475b7d226cc062524495268825c3028c2797174d URL: http://source.winehq.org/git/wine.git/?a=commit;h=475b7d226cc06252449526882… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 16:24:00 2009 +0100 kernel32: Make krnl386.exe into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 + configure.ac | 1 + dlls/Makefile.in | 4 - dlls/kernel32/Makefile.in | 42 +-- dlls/kernel32/file.c | 17 +- dlls/kernel32/kernel32.spec | 462 ++++++++++---------- dlls/kernel32/kernel_main.c | 42 +-- dlls/kernel32/kernel_private.h | 5 - dlls/kernel32/module.c | 25 + dlls/krnl386.exe16/Makefile.in | 42 ++ dlls/{kernel32/atom16.c => krnl386.exe16/atom.c} | 0 dlls/{kernel32 => krnl386.exe16}/dosmem.c | 0 dlls/{kernel32/error16.c => krnl386.exe16/error.c} | 0 dlls/{kernel32/file16.c => krnl386.exe16/file.c} | 0 .../global16.c => krnl386.exe16/global.c} | 0 dlls/{kernel32 => krnl386.exe16}/instr.c | 4 - .../kernel16.c => krnl386.exe16/kernel.c} | 51 +++ .../{kernel32 => krnl386.exe16}/kernel16_private.h | 2 - .../krnl386.exe16.spec} | 204 +++++++++ dlls/{kernel32/local16.c => krnl386.exe16/local.c} | 0 dlls/{kernel32 => krnl386.exe16}/ne_module.c | 6 - dlls/{kernel32 => krnl386.exe16}/ne_segment.c | 0 .../registry16.c => krnl386.exe16/registry.c} | 0 dlls/{kernel32/relay16.c => krnl386.exe16/relay.c} | 0 .../resource16.c => krnl386.exe16/resource.c} | 0 dlls/{kernel32 => krnl386.exe16}/selector.c | 5 - dlls/{kernel32/snoop16.c => krnl386.exe16/snoop.c} | 12 - dlls/{kernel32 => krnl386.exe16}/syslevel.c | 2 - dlls/{kernel32 => krnl386.exe16}/task.c | 0 dlls/{kernel32 => krnl386.exe16}/thunk.c | 4 - dlls/{kernel32 => krnl386.exe16}/utthunk.c | 4 - .../version16.rc => krnl386.exe16/version.rc} | 0 dlls/{kernel32 => krnl386.exe16}/vxd.c | 10 +- dlls/{kernel32 => krnl386.exe16}/wowthunk.c | 17 - 35 files changed, 582 insertions(+), 389 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=475b7d226cc0625244952…

1 0

Alexandre Julliard : winedos: Move 16-bit VxD support back into kernel.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: e7715126eb8ab561c592af0c160ca199c6d7f61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7715126eb8ab561c592af0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 12:32:36 2009 +0100 winedos: Move 16-bit VxD support back into kernel. --- .gitignore | 1 - dlls/Makefile.in | 5 +- dlls/krnl386.exe16/kernel16_private.h | 39 + dlls/krnl386.exe16/krnl386.exe16.spec | 20 +- dlls/krnl386.exe16/vxd.c | 1636 ++++++++++++++++++++++++++++++++ dlls/winedos/Makefile.in | 3 - dlls/winedos/int2f.c | 7 +- dlls/winedos/vxd.c | 1682 --------------------------------- 8 files changed, 1698 insertions(+), 1695 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7715126eb8ab561c592a…

1 0

Alexandre Julliard : makefiles: Get rid of all the rules for building old style 16-bit files.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: c6ae9a3c5a3110319b32a0020047462ccf0ce336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ae9a3c5a3110319b32a0020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 12:45:37 2009 +0100 makefiles: Get rid of all the rules for building old style 16-bit files. --- Make.rules.in | 7 +---- configure | 8 ------- configure.ac | 4 --- dlls/Makedll.rules.in | 17 +++++--------- dlls/Makefile.in | 21 +----------------- tools/make_makefiles | 55 ++++++------------------------------------------ 6 files changed, 17 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6ae9a3c5a3110319b32a…

1 0

Alexandre Julliard : kernel: Add an import lib for krnl386, and stop importing 16-bit functions from kernel32.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: a18bbec0f04af45514fbfed13444dca8d45991b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18bbec0f04af45514fbfed13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 23:27:48 2009 +0100 kernel: Add an import lib for krnl386, and stop importing 16-bit functions from kernel32. --- .gitignore | 1 + dlls/Makefile.in | 11 + dlls/commdlg.dll16/Makefile.in | 2 +- dlls/compobj.dll16/Makefile.in | 2 +- dlls/ddeml.dll16/Makefile.in | 2 +- dlls/gdi.exe16/Makefile.in | 2 +- dlls/kernel32/kernel32.spec | 360 ++++++++++++++------------------- dlls/krnl386.exe16/Makefile.in | 2 + dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- dlls/lzexpand.dll16/Makefile.in | 2 +- dlls/mmsystem.dll16/Makefile.in | 2 +- dlls/msvideo.dll16/Makefile.in | 2 +- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ole2.dll16/Makefile.in | 2 +- dlls/ole2disp.dll16/Makefile.in | 2 +- dlls/olecli.dll16/Makefile.in | 2 +- dlls/setupx.dll16/Makefile.in | 2 +- dlls/shell.dll16/Makefile.in | 2 +- dlls/storage.dll16/Makefile.in | 2 +- dlls/system.drv16/Makefile.in | 2 +- dlls/toolhelp.dll16/Makefile.in | 2 +- dlls/typelib.dll16/Makefile.in | 2 +- dlls/user.exe16/Makefile.in | 2 +- dlls/ver.dll16/Makefile.in | 2 +- dlls/w32skrnl/Makefile.in | 2 +- dlls/w32sys.dll16/Makefile.in | 2 +- dlls/win32s16.dll16/Makefile.in | 2 +- dlls/winaspi.dll16/Makefile.in | 2 +- dlls/winedos/Makefile.in | 2 +- dlls/wing.dll16/Makefile.in | 2 +- dlls/winsock.dll16/Makefile.in | 2 +- dlls/wow32/Makefile.in | 2 +- programs/winevdm/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 2 +- 35 files changed, 202 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a18bbec0f04af45514fbf…

1 0

Alexandre Julliard : kernel: Get rid of support for loading old style 16-bit files.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: f82ddf5e662da10e442d200f12ac7f8538c7af27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82ddf5e662da10e442d200f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 13:13:53 2009 +0100 kernel: Get rid of support for loading old style 16-bit files. --- dlls/krnl386.exe16/ne_module.c | 107 +--------------------------------------- 1 files changed, 1 insertions(+), 106 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 82e4576..08ed94c 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -67,18 +67,6 @@ struct ne_segment_table_entry_s #define hFirstModule (pThhook->hExeHead) -struct builtin_dll -{ - const IMAGE_DOS_HEADER *header; /* module headers */ - const char *file_name; /* module file name */ -}; - -/* Table of all built-in DLLs */ - -#define MAX_DLLS 50 - -static struct builtin_dll builtin_dlls[MAX_DLLS]; - static HINSTANCE16 NE_LoadModule( LPCSTR name, BOOL lib_only ); static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL call_wep ); @@ -152,79 +140,6 @@ static int NE_strncasecmp( const char *str1, const char *str2, int len ) /*********************************************************************** - * find_dll_descr - * - * Find a descriptor in the list - */ -static const IMAGE_DOS_HEADER *find_dll_descr( const char *dllname, const char **file_name ) -{ - int i; - const IMAGE_DOS_HEADER *mz_header; - const IMAGE_OS2_HEADER *ne_header; - const BYTE *name_table; - - for (i = 0; i < MAX_DLLS; i++) - { - mz_header = builtin_dlls[i].header; - if (mz_header) - { - ne_header = (const IMAGE_OS2_HEADER *)((const char *)mz_header + mz_header->e_lfanew); - name_table = (const BYTE *)ne_header + ne_header->ne_restab; - - /* check the dll file name */ - if (!NE_strcasecmp( builtin_dlls[i].file_name, dllname ) || - /* check the dll module name (without extension) */ - (!NE_strncasecmp( dllname, (const char*)name_table+1, *name_table ) && - !strcmp( dllname + *name_table, ".dll" ))) - { - *file_name = builtin_dlls[i].file_name; - return builtin_dlls[i].header; - } - } - } - return NULL; -} - - -/*********************************************************************** - * __wine_dll_register_16 (KERNEL32.@) - * - * Register a built-in DLL descriptor. - */ -void __wine_dll_register_16( const IMAGE_DOS_HEADER *header, const char *file_name ) -{ - int i; - - for (i = 0; i < MAX_DLLS; i++) - { - if (builtin_dlls[i].header) continue; - builtin_dlls[i].header = header; - builtin_dlls[i].file_name = file_name; - break; - } - assert( i < MAX_DLLS ); -} - - -/*********************************************************************** - * __wine_dll_unregister_16 (KERNEL32.@) - * - * Unregister a built-in DLL descriptor. - */ -void __wine_dll_unregister_16( const IMAGE_DOS_HEADER *header ) -{ - int i; - - for (i = 0; i < MAX_DLLS; i++) - { - if (builtin_dlls[i].header != header) continue; - builtin_dlls[i].header = NULL; - break; - } -} - - -/*********************************************************************** * NE_GetPtr */ NE_MODULE *NE_GetPtr( HMODULE16 hModule ) @@ -1050,7 +965,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ NE_MODULE *pModule; const IMAGE_DOS_HEADER *descr = NULL; const char *file_name = NULL; - char dllname[32], owner[20], *p; + char dllname[32], *p; const char *basename, *main_module; int owner_exists = FALSE; @@ -1103,27 +1018,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ } } } - *p = 0; - /* old-style 16-bit placeholders support, to be removed at some point */ - if (!mod32 && wine_dll_get_owner( dllname, owner, sizeof(owner), &owner_exists ) != -1) - { - mod32 = LoadLibraryA( owner ); - if (mod32) - { - if (!(descr = find_dll_descr( dllname, &file_name ))) - { - FreeLibrary( mod32 ); - owner_exists = 0; - } - } - else - { - /* it's probably disabled by the load order config */ - WARN( "couldn't load owner %s for 16-bit dll %s\n", owner, dllname ); - return ERROR_FILE_NOT_FOUND; - } - } /* loading the 32-bit library can have the side effect of loading the module */ /* if so, simply incr the ref count and return the module */ if (descr && (hModule = GetModuleHandle16( libname )))

1 0

Alexandre Julliard : winebuild: Get rid of the support for building old style 16-bit modules.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: f78890e8caf3b81c55c0b60f86c55ea138d1d631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78890e8caf3b81c55c0b60f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 21:36:43 2009 +0100 winebuild: Get rid of the support for building old style 16-bit modules. --- tools/winebuild/build.h | 1 - tools/winebuild/main.c | 7 --- tools/winebuild/spec16.c | 96 -------------------------------------- tools/winebuild/winebuild.man.in | 12 +++-- 4 files changed, 8 insertions(+), 108 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 8e21a45..06e2887 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -269,7 +269,6 @@ extern void output_res_o_file( DLLSPEC *spec ); extern void BuildRelays16(void); extern void BuildRelays32(void); -extern void BuildSpec16File( DLLSPEC *spec ); extern void BuildSpec32File( DLLSPEC *spec ); extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d04d276..aa487ef 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -633,13 +633,6 @@ int main(int argc, char **argv) if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; if (!spec_file_name) fatal_error( "missing .spec file\n" ); - if (spec->type == SPEC_WIN32 && spec->main_module) /* embedded 16-bit module */ - { - spec->type = SPEC_WIN16; - load_resources( argv, spec ); - if (parse_input_file( spec )) BuildSpec16File( spec ); - break; - } /* fall through */ case MODE_EXE: load_resources( argv, spec ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index c06b4a1..a9e67ad 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -463,81 +463,6 @@ static int sort_func_list( ORDDEF **list, int count, /******************************************************************* - * output_init_code - * - * Output the dll initialization code. - */ -static void output_init_code( const DLLSPEC *spec ) -{ - char name[80]; - - sprintf( name, ".L__wine_spec_%s_init", make_c_identifier(spec->dll_name) ); - - output( "\n/* dll initialization code */\n\n" ); - output( "\t.text\n" ); - output( "\t.align 4\n" ); - output( "\t%s\n", func_declaration(name) ); - output( "%s:\n", name ); - output( "\tsubl $4,%%esp\n" ); - if (UsePIC) - { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - output( "\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - } - else - { - output( "\tpushl $.L__wine_spec_file_name\n" ); - output( "\tpushl $.L__wine_spec_dos_header\n" ); - } - output( "\tcall %s\n", asm_name("__wine_dll_register_16") ); - output( "\taddl $12,%%esp\n" ); - output( "\tret\n" ); - output_function_size( name ); - - sprintf( name, ".L__wine_spec_%s_fini", make_c_identifier(spec->dll_name) ); - - output( "\t.align 4\n" ); - output( "\t%s\n", func_declaration(name) ); - output( "%s:\n", name ); - output( "\tsubl $8,%%esp\n" ); - if (UsePIC) - { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - } - else - { - output( "\tpushl $.L__wine_spec_dos_header\n" ); - } - output( "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); - output( "\taddl $12,%%esp\n" ); - output( "\tret\n" ); - output_function_size( name ); - - if (target_platform == PLATFORM_APPLE) - { - output( "\t.mod_init_func\n" ); - output( "\t.align %d\n", get_alignment(4) ); - output( "\t.long .L__wine_spec_%s_init\n", make_c_identifier(spec->dll_name) ); - output( "\t.mod_term_func\n" ); - output( "\t.align %d\n", get_alignment(4) ); - output( "\t.long .L__wine_spec_%s_fini\n", make_c_identifier(spec->dll_name) ); - } - else - { - output( "\t.section \".init\",\"ax\"\n" ); - output( "\tcall .L__wine_spec_%s_init\n", make_c_identifier(spec->dll_name) ); - output( "\t.section \".fini\",\"ax\"\n" ); - output( "\tcall .L__wine_spec_%s_fini\n", make_c_identifier(spec->dll_name) ); - } -} - - -/******************************************************************* * output_module16 * * Output code for a 16-bit module. @@ -831,27 +756,6 @@ static void output_module16( DLLSPEC *spec ) /******************************************************************* - * BuildSpec16File - * - * Build a Win16 assembly file from a spec file. - */ -void BuildSpec16File( DLLSPEC *spec ) -{ - output_standard_file_header(); - output_module16( spec ); - output_init_code( spec ); - - output( "\n\t%s\n", get_asm_string_section() ); - output( ".L__wine_spec_file_name:\n" ); - output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); - - output_stubs( spec ); - output_get_pc_thunk(); - output_gnu_stack_note(); -} - - -/******************************************************************* * output_spec16_file * * Output the complete data for a spec 16-bit file. diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index e0dd72b..7ca151c 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -167,9 +167,9 @@ option. Generate 32-bit, respectively 64-bit code. .TP .BI \-M,\ --main-module= module -Specify that we are building a 16-bit dll, that will ultimately be -linked together with the 32-bit dll specified in \fImodule\fR. Only -meaningful in \fB--dll\fR mode. +When building a 16-bit dll, set the name of its 32-bit counterpart to +\fImodule\fR. This is used to enforce that the load order for the +16-bit dll matches that of the 32-bit one. .TP .BI \-N,\ --dll-name= dllname Set the internal name of the module. It is only used in Win16 @@ -307,7 +307,11 @@ The entry point will be imported by ordinal instead of by name. The name is still exported. .TP .BI -arch= cpu[,cpu] -The entry point is only available on the specified CPU architecture(s). +The entry point is only available on the specified CPU +architecture(s). The names \fBwin32\fR and \fBwin64\fR match all +32-bit, respectively 64-bit, CPU architectures. In 16-bit dlls, +specifying \fB-arch=win32\fR causes the entry point to be exported +from the 32-bit wrapper module. .SS "Function ordinals" Syntax: .br

1 0

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

31 Dec '09

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 : libwine: Do not export any of the LDT support on non-i386 platforms.
by Alexandre Julliard 31 Dec '09

31 Dec '09

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 : ntoskrnl: Duplicate the necessary part of instruction emulation to avoid importing kernel .
by Alexandre Julliard 31 Dec '09

31 Dec '09

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 : msi: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: dcf1a0c891233457f3e131d2d9c624bdf2b28a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf1a0c891233457f3e131d2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 30 21:24:27 2009 +0100 msi: Fix some pointer cast warnings on 64-bit. --- dlls/msi/join.c | 2 +- dlls/msi/storages.c | 4 ++-- dlls/msi/streams.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 134c569..a577aea 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -259,7 +259,7 @@ static UINT JOIN_find_matching_rows( struct tagMSIVIEW *view, UINT col, if (col == 0 || col > jv->columns) return ERROR_INVALID_PARAMETER; - for (i = (UINT)*handle; i < jv->rows; i++) + for (i = PtrToUlong(*handle); i < jv->rows; i++) { if (view->ops->fetch_int( view, i, col, &row_value ) != ERROR_SUCCESS) continue; diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index a54d46f..6a8134b 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -452,7 +452,7 @@ static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle) { MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; - UINT index = (UINT)*handle; + UINT index = PtrToUlong(*handle); TRACE("(%d, %d): %d\n", *row, col, val); @@ -470,7 +470,7 @@ static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col, index++; } - *handle = (MSIITERHANDLE)++index; + *handle = UlongToPtr(++index); if (index >= sv->num_rows) return ERROR_NO_MORE_ITEMS; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 4825ae6..92de01b 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -420,7 +420,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - UINT index = (UINT)*handle; + UINT index = PtrToUlong(*handle); TRACE("(%d, %d): %d\n", *row, col, val); @@ -438,7 +438,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col, index++; } - *handle = (MSIITERHANDLE)++index; + *handle = UlongToPtr(++index); if (index >= sv->num_rows) return ERROR_NO_MORE_ITEMS;

1 0