wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexandre Julliard : winebuild: Allow optional keywords to be in any order in a .def file.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 4939acf0ace95e5c090e2c0b118c4c0ab9eb76f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4939acf0ace95e5c090e2c0b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 23:23:54 2009 +0100 winebuild: Allow optional keywords to be in any order in a .def file. --- tools/winebuild/parser.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 642ccac..57807ed 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -945,33 +945,34 @@ static int parse_def_export( char *name, DLLSPEC *spec ) /* check for other optional keywords */ - if (token && !strcmp( token, "NONAME" )) + while (token) { - if (odp->ordinal == -1) + if (!strcmp( token, "NONAME" )) { - error( "NONAME requires an ordinal\n" ); + if (odp->ordinal == -1) + { + error( "NONAME requires an ordinal\n" ); + goto error; + } + odp->export_name = odp->name; + odp->name = NULL; + odp->flags |= FLAG_NONAME; + } + else if (!strcmp( token, "PRIVATE" )) + { + odp->flags |= FLAG_PRIVATE; + } + else if (!strcmp( token, "DATA" )) + { + odp->type = TYPE_EXTERN; + } + else + { + error( "Garbage text '%s' found at end of export declaration\n", token ); goto error; } - odp->export_name = odp->name; - odp->name = NULL; - odp->flags |= FLAG_NONAME; token = GetToken(1); } - if (token && !strcmp( token, "PRIVATE" )) - { - odp->flags |= FLAG_PRIVATE; - token = GetToken(1); - } - if (token && !strcmp( token, "DATA" )) - { - odp->type = TYPE_EXTERN; - token = GetToken(1); - } - if (token) - { - error( "Garbage text '%s' found at end of export declaration\n", token ); - goto error; - } return 1; error:

1 0

Alexandre Julliard : winebuild: Don't check variables for undefined exports .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: c4c6fcaff70caf3aa1963901acfcdcc7891f9466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c6fcaff70caf3aa1963901a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 21:42:37 2009 +0100 winebuild: Don't check variables for undefined exports. --- tools/winebuild/import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d41a754..0caaffd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -466,7 +466,7 @@ static void check_undefined_exports( DLLSPEC *spec ) for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; if (find_name( odp->link_name, &undef_symbols )) {

1 0

Nikolay Sivov : user32/tests: Add tests for invalid index in GetSysColorBrush().
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 2a0fca79ae3d342b53ebdcf22856426ebe4f8921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0fca79ae3d342b53ebdcf22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 29 15:48:24 2009 +0300 user32/tests: Add tests for invalid index in GetSysColorBrush(). --- dlls/user32/tests/sysparams.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index dd1e708..a9b79fa 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2764,6 +2764,27 @@ static void test_EnumDisplaySettings(void) } } +static void test_GetSysColorBrush(void) +{ + HBRUSH hbr; + + SetLastError(0xdeadbeef); + hbr = GetSysColorBrush(-1); + todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); + /* greater than max index */ + hbr = GetSysColorBrush(COLOR_MENUBAR); + if (hbr) + { + SetLastError(0xdeadbeef); + hbr = GetSysColorBrush(COLOR_MENUBAR + 1); + todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); + } + else + win_skip("COLOR_MENUBAR unsupported\n"); +} + START_TEST(sysparams) { int argc; @@ -2794,6 +2815,7 @@ START_TEST(sysparams) test_GetSystemMetrics( ); trace("testing EnumDisplaySettings vs GetDeviceCaps\n"); test_EnumDisplaySettings( ); + test_GetSysColorBrush( ); change_counter = 0; change_last_param = 0;

1 0

Eric Pouech : dbghelp: Silence a couple of FIXMEs for C++ code.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 878f287366632cbc0b122d446e7e09ff5a74af93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878f287366632cbc0b122d446… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 29 13:02:39 2009 +0100 dbghelp: Silence a couple of FIXMEs for C++ code. Reported by Jacek Caban. --- dlls/dbghelp/dwarf.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d9e52d3..855f8c0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1243,6 +1243,10 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_union_type: case DW_TAG_typedef: /* FIXME: we need to handle nested udt definitions */ + case DW_TAG_inheritance: + case DW_TAG_subprogram: + case DW_TAG_variable: + /* FIXME: some C++ related stuff */ break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %s\n", @@ -1834,6 +1838,11 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_parse_variable(&subpgm, NULL, di); } break; + /* silence a couple of C++ defines */ + case DW_TAG_namespace: + case DW_TAG_imported_module: + case DW_TAG_imported_declaration: + break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %lu\n", di->abbrev->tag, dwarf2_debug_ctx(ctx), di->abbrev->entry_code);

1 0

Eric Pouech : winedump: Manage the string table size in PE file format.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 7a685030f61a1c78120bedd2e26a05b057694a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a685030f61a1c78120bedd2e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 29 13:02:33 2009 +0100 winedump: Manage the string table size in PE file format. --- tools/winedump/pe.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1f9c5a7..a2c2f0a 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -373,8 +373,12 @@ static void dump_pe_header(void) void dump_section(const IMAGE_SECTION_HEADER *sectHead, const char* strtable) { - if (strtable && sectHead->Name[0] == '/') /* long section name */ - printf(" %.8s (%s)", sectHead->Name, strtable + atoi((const char*)sectHead->Name + 1)); + unsigned offset; + + /* long section name ? */ + if (strtable && sectHead->Name[0] == '/' && + ((offset = atoi((const char*)sectHead->Name + 1)) < *(DWORD*)strtable)) + printf(" %.8s (%s)", sectHead->Name, strtable + offset); else printf(" %-8.8s", sectHead->Name); printf(" VirtSize: 0x%08x VirtAddr: 0x%08x\n", @@ -456,7 +460,6 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) if (PE_nt_headers->FileHeader.PointerToSymbolTable && PE_nt_headers->FileHeader.NumberOfSymbols) { - /* FIXME: no way to get strtable size */ strtable = (const char*)base + PE_nt_headers->FileHeader.PointerToSymbolTable + PE_nt_headers->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL);

1 0

Gerald Pfeifer : ntdll: Avoid one warning around assert(0).
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: e8158e48cb7aca1e1615608a0248284b22e7afb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8158e48cb7aca1e1615608a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Dec 25 11:14:07 2009 +0100 ntdll: Avoid one warning around assert(0). --- 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 350dd8a..7b124af 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -241,6 +241,7 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; default: assert(0); + return 0; } }

1 0

Alexandre Julliard : kernel32: Get rid of the support for 16-bit resources in 32-bit resource functions.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: e49c54d288c825f0b668f896e81b3f80cafcb857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49c54d288c825f0b668f896e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 20:27:50 2009 +0100 kernel32: Get rid of the support for 16-bit resources in 32-bit resource functions. --- dlls/kernel32/resource.c | 70 +-------------------------------------------- 1 files changed, 2 insertions(+), 68 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 76d2741..8d52397 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -32,7 +32,6 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "wine/winbase16.h" #include "wine/debug.h" #include "wine/exception.h" #include "wine/unicode.h" @@ -90,40 +89,6 @@ static NTSTATUS get_res_nameW( LPCWSTR name, UNICODE_STRING *str ) return STATUS_SUCCESS; } -/* retrieve the resource names for the 16-bit FindResource function */ -static BOOL get_res_name_type_WtoA( LPCWSTR name, LPCWSTR type, LPSTR *nameA, LPSTR *typeA ) -{ - *nameA = *typeA = NULL; - - __TRY - { - if (HIWORD(name)) - { - DWORD len = WideCharToMultiByte( CP_ACP, 0, name, -1, NULL, 0, NULL, NULL ); - *nameA = HeapAlloc( GetProcessHeap(), 0, len ); - if (*nameA) WideCharToMultiByte( CP_ACP, 0, name, -1, *nameA, len, NULL, NULL ); - } - else *nameA = ULongToPtr(LOWORD(name)); - - if (HIWORD(type)) - { - DWORD len = WideCharToMultiByte( CP_ACP, 0, type, -1, NULL, 0, NULL, NULL ); - *typeA = HeapAlloc( GetProcessHeap(), 0, len ); - if (*typeA) WideCharToMultiByte( CP_ACP, 0, type, -1, *typeA, len, NULL, NULL ); - } - else *typeA = ULongToPtr(LOWORD(type)); - } - __EXCEPT_PAGE_FAULT - { - if (HIWORD(*nameA)) HeapFree( GetProcessHeap(), 0, *nameA ); - if (HIWORD(*typeA)) HeapFree( GetProcessHeap(), 0, *typeA ); - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - __ENDTRY - return TRUE; -} - /* implementation of FindResourceExA */ static HRSRC find_resourceA( HMODULE hModule, LPCSTR type, LPCSTR name, WORD lang ) { @@ -198,10 +163,6 @@ HRSRC WINAPI FindResourceExA( HMODULE hModule, LPCSTR type, LPCSTR name, WORD la TRACE( "%p %s %s %04x\n", hModule, debugstr_a(type), debugstr_a(name), lang ); if (!hModule) hModule = GetModuleHandleW(0); - else if (!HIWORD(hModule)) - { - return HRSRC_32( FindResource16( HMODULE_16(hModule), name, type ) ); - } return find_resourceA( hModule, type, name, lang ); } @@ -223,19 +184,6 @@ HRSRC WINAPI FindResourceExW( HMODULE hModule, LPCWSTR type, LPCWSTR name, WORD TRACE( "%p %s %s %04x\n", hModule, debugstr_w(type), debugstr_w(name), lang ); if (!hModule) hModule = GetModuleHandleW(0); - else if (!HIWORD(hModule)) - { - LPSTR nameA, typeA; - HRSRC16 ret; - - if (!get_res_name_type_WtoA( name, type, &nameA, &typeA )) return NULL; - - ret = FindResource16( HMODULE_16(hModule), nameA, typeA ); - if (HIWORD(nameA)) HeapFree( GetProcessHeap(), 0, nameA ); - if (HIWORD(typeA)) HeapFree( GetProcessHeap(), 0, typeA ); - return HRSRC_32(ret); - } - return find_resourceW( hModule, type, name, lang ); } @@ -606,10 +554,6 @@ HGLOBAL WINAPI LoadResource( HINSTANCE hModule, HRSRC hRsrc ) TRACE( "%p %p\n", hModule, hRsrc ); - if (hModule && !HIWORD(hModule)) - /* FIXME: should convert return to 32-bit resource */ - return HGLOBAL_32( LoadResource16( HMODULE_16(hModule), HRSRC_16(hRsrc) ) ); - if (!hRsrc) return 0; if (!hModule) hModule = GetModuleHandleA( NULL ); status = LdrAccessResource( hModule, (IMAGE_RESOURCE_DATA_ENTRY *)hRsrc, &ret, NULL ); @@ -623,13 +567,7 @@ HGLOBAL WINAPI LoadResource( HINSTANCE hModule, HRSRC hRsrc ) */ LPVOID WINAPI LockResource( HGLOBAL handle ) { - TRACE("(%p)\n", handle ); - - if (HIWORD( handle )) /* 32-bit memory handle */ - return handle; - - /* 16-bit memory handle */ - return LockResource16( HGLOBAL_16(handle) ); + return handle; } @@ -638,8 +576,7 @@ LPVOID WINAPI LockResource( HGLOBAL handle ) */ BOOL WINAPI FreeResource( HGLOBAL handle ) { - if (HIWORD(handle)) return 0; /* 32-bit memory handle: nothing to do */ - return FreeResource16( HGLOBAL_16(handle) ); + return 0; } @@ -648,9 +585,6 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) */ DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) { - if (hModule && !HIWORD(hModule)) - return SizeofResource16( HMODULE_16(hModule), HRSRC_16(hRsrc) ); - if (!hRsrc) return 0; return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size; }

1 0

Alexandre Julliard : kernel32: Don't include kernel_private. h in 16-bit files.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 3a04f5abfce8abd69c0fbc9b48ac3c0a636f1cf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a04f5abfce8abd69c0fbc9b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 22:59:24 2009 +0100 kernel32: Don't include kernel_private.h in 16-bit files. --- dlls/kernel32/dosmem.c | 1 - dlls/kernel32/global16.c | 1 - dlls/kernel32/instr.c | 1 - dlls/kernel32/kernel16.c | 1 - dlls/kernel32/local16.c | 1 - dlls/kernel32/ne_module.c | 1 - dlls/kernel32/ne_segment.c | 1 - dlls/kernel32/relay16.c | 1 - dlls/kernel32/snoop16.c | 1 - dlls/kernel32/syslevel.c | 1 - dlls/kernel32/task.c | 1 - dlls/kernel32/thunk.c | 1 - dlls/kernel32/vxd.c | 2 +- dlls/kernel32/wowthunk.c | 1 - 14 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index 178ed07..5e84d23 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -37,7 +37,6 @@ #include "winternl.h" #include "wine/winbase16.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 4c29389..f0d1af7 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -39,7 +39,6 @@ #include "wine/winbase16.h" #include "winternl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 7f5ddc4..c3aea2d 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -33,7 +33,6 @@ #include "wine/winuser16.h" #include "excpt.h" #include "wine/debug.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/exception.h" diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 77cbd57..fabe2d8 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -27,7 +27,6 @@ #include "wownt32.h" #include "wine/winuser16.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index 3470b31..3eaa6ec 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -36,7 +36,6 @@ #include "wine/winbase16.h" #include "wownt32.h" #include "winternl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 273eb9e..51e2eb5 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -36,7 +36,6 @@ #include "wine/winbase16.h" #include "wownt32.h" #include "winternl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/exception.h" #include "wine/debug.h" diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index 4bc6603..48910e4 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -37,7 +37,6 @@ #include "wownt32.h" #include "winternl.h" #include "wine/library.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c index f5a710f..d7151ac 100644 --- a/dlls/kernel32/relay16.c +++ b/dlls/kernel32/relay16.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "wine/winbase16.h" #include "winternl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/unicode.h" #include "wine/library.h" diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index efa20cd..c6c3032 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -31,7 +31,6 @@ #include "wine/winbase16.h" #include "winternl.h" #include "wine/library.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/syslevel.c b/dlls/kernel32/syslevel.c index 46fdf9a..b37ec7b 100644 --- a/dlls/kernel32/syslevel.c +++ b/dlls/kernel32/syslevel.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "winternl.h" #include "wine/winbase16.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/library.h" #include "wine/debug.h" diff --git a/dlls/kernel32/task.c b/dlls/kernel32/task.c index 1bcf211..06f9d94 100644 --- a/dlls/kernel32/task.c +++ b/dlls/kernel32/task.c @@ -38,7 +38,6 @@ #include "wine/winbase16.h" #include "winternl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index e03d858..fc9c3b4 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -42,7 +42,6 @@ #include "wine/debug.h" #include "wine/library.h" -#include "kernel_private.h" #include "kernel16_private.h" WINE_DEFAULT_DEBUG_CHANNEL(thunk); diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index d8b8dc3..d7b05a8 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -39,7 +39,6 @@ #include "winerror.h" #include "winternl.h" #include "winioctl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/library.h" #include "wine/unicode.h" @@ -49,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); typedef DWORD (WINAPI *VxDCallProc)(DWORD, CONTEXT86 *); +typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED); struct vxd_module { diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index 080ce3a..5dbb4ee 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -32,7 +32,6 @@ #include "wownt32.h" #include "excpt.h" #include "winternl.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/exception.h" #include "wine/debug.h"

1 0

Alexandre Julliard : kernel32: Move the kernel thread data definitions to kernel16_private.h.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: fc5c459d63f09457f18b852c816ce9cf5d00e312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5c459d63f09457f18b852c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 17:26:55 2009 +0100 kernel32: Move the kernel thread data definitions to kernel16_private.h. --- dlls/kernel32/kernel16_private.h | 19 +++++++++++++++++++ dlls/kernel32/kernel_private.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index 7a0e2f5..0509471 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -239,6 +239,9 @@ extern void SNOOP16_RegisterDLL(HMODULE16,LPCSTR); extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16); extern int SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname); +/* syslevel.c */ +extern VOID SYSLEVEL_CheckNotLevel( INT level ); + /* task.c */ extern void TASK_CreateMainTask(void); extern HTASK16 TASK_SpawnTask( NE_MODULE *pModule, WORD cmdShow, @@ -271,6 +274,22 @@ extern DWORD CallTo16_TebSelector; extern SEGPTR CALL32_CBClient_RetAddr; extern SEGPTR CALL32_CBClientEx_RetAddr; +struct tagSYSLEVEL; + +struct kernel_thread_data +{ + WORD stack_sel; /* 16-bit stack selector */ + WORD htask16; /* Win16 task handle */ + DWORD sys_count[4]; /* syslevel mutex entry counters */ + struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ + void *pad[45]; /* change this if you add fields! */ +}; + +static inline struct kernel_thread_data *kernel_get_thread_data(void) +{ + return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; +} + #ifdef __i386__ #define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 9ec20d6..df753d7 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -23,22 +23,6 @@ #include "wine/server.h" -struct tagSYSLEVEL; - -struct kernel_thread_data -{ - WORD stack_sel; /* 16-bit stack selector */ - WORD htask16; /* Win16 task handle */ - DWORD sys_count[4]; /* syslevel mutex entry counters */ - struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ - void *pad[45]; /* change this if you add fields! */ -}; - -static inline struct kernel_thread_data *kernel_get_thread_data(void) -{ - return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; -} - HANDLE WINAPI OpenConsoleW(LPCWSTR, DWORD, BOOL, DWORD); BOOL WINAPI VerifyConsoleIoHandle(HANDLE); HANDLE WINAPI DuplicateConsoleHandle(HANDLE, DWORD, BOOL, DWORD); @@ -68,8 +52,6 @@ extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; extern const WCHAR *DIR_SysWow64; -extern VOID SYSLEVEL_CheckNotLevel( INT level ); - extern void FILE_SetDosError(void); extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ); extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen );

1 0

Alexandre Julliard : kernel32: Link directly to the thunk functions instead of looking up their entry point .
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 84e51e73b4c02a966ad268885c0f5abad3d3e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e51e73b4c02a966ad268885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 17:37:44 2009 +0100 kernel32: Link directly to the thunk functions instead of looking up their entry point. --- dlls/kernel32/thunk.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 78ba2f7..e03d858 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -151,6 +151,10 @@ SEGPTR CALL32_CBClientEx_RetAddr = 0; extern int call_entry_point( void *func, int nb_args, const DWORD *args ); extern void __wine_call_from_16_thunk(void); +extern void FT_Prolog(void); +extern void FT_PrologPrime(void); +extern void QT_Thunk(void); +extern void QT_ThunkPrime(void); /* Push a DWORD on the 32-bit stack */ static inline void stack32_push( CONTEXT86 *context, DWORD val ) @@ -229,7 +233,7 @@ static void _write_ftprolog(LPBYTE relayCode ,DWORD *targetTable) { *x++ = 0x0f;*x++=0xb6;*x++=0xd1; /* movzbl edx,cl */ *x++ = 0x8B;*x++=0x14;*x++=0x95;*(DWORD**)x= targetTable; x+=4; /* mov edx, [4*edx + targetTable] */ - *x++ = 0x68; *(DWORD*)x = (DWORD)GetProcAddress(kernel32_handle,"FT_Prolog"); + *x++ = 0x68; *(void **)x = FT_Prolog; x+=4; /* push FT_Prolog */ *x++ = 0xC3; /* lret */ /* fill rest with 0xCC / int 3 */ @@ -256,7 +260,7 @@ static void _write_qtthunk( *x++ = 0x8A;*x++=0x4D;*x++=0xFC; /* movb cl,[ebp-04] */ *x++ = 0x8B;*x++=0x14;*x++=0x8D;*(DWORD**)x= targetTable; x+=4; /* mov edx, [4*ecx + targetTable */ - *x++ = 0xB8; *(DWORD*)x = (DWORD)GetProcAddress(kernel32_handle,"QT_Thunk"); + *x++ = 0xB8; *(void **)x = QT_Thunk; x+=4; /* mov eax , QT_Thunk */ *x++ = 0xFF; *x++ = 0xE0; /* jmp eax */ /* should fill the rest of the 32 bytes with 0xCC */ @@ -867,9 +871,8 @@ LPVOID WINAPI ThunkInitLSF( /* FIXME: add checks for valid code ... */ /* write pointers to kernel32.89 and kernel32.90 (+ordinal base of 1) */ - *(DWORD*)(thunk+0x35) = (DWORD)GetProcAddress(kernel32_handle,(LPSTR)90); - *(DWORD*)(thunk+0x6D) = (DWORD)GetProcAddress(kernel32_handle,(LPSTR)89); - + *(void **)(thunk+0x35) = QT_ThunkPrime; + *(void **)(thunk+0x6D) = FT_PrologPrime; if (!(addr = _loadthunk( dll16, thkbuf, dll32, NULL, len ))) return 0; @@ -1645,7 +1648,7 @@ static BOOL THUNK_Init(void) { LPBYTE thunk; - ThunkletHeap = HeapCreate( 0, 0x10000, 0x10000 ); + ThunkletHeap = HeapCreate( HEAP_CREATE_ENABLE_EXECUTE, 0x10000, 0x10000 ); if (!ThunkletHeap) return FALSE; ThunkletCodeSel = SELECTOR_AllocBlock( ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE ); @@ -2095,7 +2098,7 @@ SEGPTR WINAPI Get16DLLAddress(HMODULE16 handle, LPSTR func_name) /* jmpl QT_Thunk */ *thunk++ = 0xea; - *(FARPROC *)thunk = GetProcAddress(kernel32_handle,"QT_Thunk"); + *(void **)thunk = QT_Thunk; thunk += sizeof(FARPROC16); *(WORD *)thunk = wine_get_cs();

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
124
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009