December 2009 - Wine-commits

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: Support for adding 32-bit exports in 16-bit spec files.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: d097eef922d5c3e17fe67cce8011ebd2da955864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d097eef922d5c3e17fe67cce8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 22:42:58 2009 +0100 winebuild: Support for adding 32-bit exports in 16-bit spec files. --- tools/winebuild/build.h | 1 + tools/winebuild/parser.c | 79 +++++++++++++++++++++++++++++----------------- tools/winebuild/spec16.c | 3 ++ 3 files changed, 54 insertions(+), 29 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e47278a..64ad5b1 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -146,6 +146,7 @@ extern enum target_platform target_platform; #define FLAG_FORWARD 0x100 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ +#define FLAG_EXPORT32 0x400 /* 32-bit export in 16-bit spec file */ #define FLAG_CPU(cpu) (0x01000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 57807ed..d08a190 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -228,25 +228,17 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) { const char *token; unsigned int i; + int is_win32 = (spec->type == SPEC_WIN32) || (odp->flags & FLAG_EXPORT32); - switch(spec->type) + if (!is_win32 && odp->type == TYPE_STDCALL) { - case SPEC_WIN16: - if (odp->type == TYPE_STDCALL) - { - error( "'stdcall' not supported for Win16\n" ); - return 0; - } - break; - case SPEC_WIN32: - if (odp->type == TYPE_PASCAL) - { - error( "'pascal' not supported for Win32\n" ); - return 0; - } - break; - default: - break; + error( "'stdcall' not supported for Win16\n" ); + return 0; + } + if (is_win32 && odp->type == TYPE_PASCAL) + { + error( "'pascal' not supported for Win32\n" ); + return 0; } if (!(token = GetToken(0))) return 0; @@ -288,7 +280,7 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) return 0; } - if (spec->type == SPEC_WIN32) + if (is_win32) { if (strcmp(token, "long") && strcmp(token, "ptr") && @@ -296,7 +288,7 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) strcmp(token, "wstr") && strcmp(token, "double")) { - error( "Type '%s' not supported for Win32\n", token ); + error( "Type '%s' not supported for Win32 function\n", token ); return 0; } } @@ -325,7 +317,7 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->link_name = xstrdup( token ); if (strchr( odp->link_name, '.' )) { - if (spec->type == SPEC_WIN16) + if (!is_win32) { error( "Forwarded functions not supported for Win16\n" ); return 0; @@ -421,7 +413,7 @@ static int parse_spec_extern( ORDDEF *odp, DLLSPEC *spec ) * * Parse the optional flags for an entry point in a .spec file. */ -static const char *parse_spec_flags( ORDDEF *odp ) +static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) { unsigned int i; const char *token; @@ -436,7 +428,12 @@ static const char *parse_spec_flags( ORDDEF *odp ) while (cpu_name) { if (!strcmp( cpu_name, "win32" )) - odp->flags |= FLAG_CPU_WIN32; + { + if (spec->type == SPEC_WIN32) + odp->flags |= FLAG_CPU_WIN32; + else + odp->flags |= FLAG_EXPORT32; + } else if (!strcmp( cpu_name, "win64" )) odp->flags |= FLAG_CPU_WIN64; else @@ -499,7 +496,13 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) } if (!(token = GetToken(0))) goto error; - if (*token == '-' && !(token = parse_spec_flags( odp ))) goto error; + if (*token == '-' && !(token = parse_spec_flags( spec, odp ))) goto error; + + if (ordinal == -1 && spec->type != SPEC_WIN32 && !(odp->flags & FLAG_EXPORT32)) + { + error( "'@' ordinals not supported for Win16\n" ); + goto error; + } odp->name = xstrdup( token ); odp->lineno = current_line; @@ -650,7 +653,8 @@ static void assign_names( DLLSPEC *spec ) { const char *name1 = all_names[i]->name ? all_names[i]->name : all_names[i]->export_name; const char *name2 = all_names[i+1]->name ? all_names[i+1]->name : all_names[i+1]->export_name; - if (!strcmp( name1, name2 )) + if (!strcmp( name1, name2 ) && + !((all_names[i]->flags ^ all_names[i+1]->flags) & FLAG_EXPORT32)) { current_line = max( all_names[i]->lineno, all_names[i+1]->lineno ); error( "'%s' redefined\n%s:%d: First defined here\n", @@ -737,12 +741,14 @@ static void assign_ordinals( DLLSPEC *spec ) */ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) { + int i; ORDDEF *odp; /* add an export for the NE module */ odp = add_entry_point( spec32 ); odp->type = TYPE_EXTERN; + odp->flags = FLAG_PRIVATE; odp->name = xstrdup( "__wine_spec_dos_header" ); odp->lineno = 0; odp->ordinal = 1; @@ -752,12 +758,32 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) { odp = add_entry_point( spec32 ); odp->type = TYPE_EXTERN; + odp->flags = FLAG_PRIVATE; odp->name = xstrdup( "__wine_spec_main_module" ); odp->lineno = 0; odp->ordinal = 2; odp->link_name = xstrdup( ".L__wine_spec_main_module" ); } + /* add the explicit win32 exports */ + + for (i = 1; i <= spec16->limit; i++) + { + ORDDEF *odp16 = spec16->ordinals[i]; + + if (!odp16 || !odp16->name) continue; + if (!(odp16->flags & FLAG_EXPORT32)) continue; + + odp = add_entry_point( spec32 ); + odp->flags = odp16->flags & ~FLAG_EXPORT32; + odp->type = odp16->type; + odp->name = xstrdup( odp16->name ); + odp->lineno = odp16->lineno; + odp->ordinal = -1; + odp->link_name = xstrdup( odp16->link_name ); + strcpy( odp->u.func.arg_types, odp16->u.func.arg_types ); + } + assign_names( spec32 ); assign_ordinals( spec32 ); } @@ -783,11 +809,6 @@ int parse_spec_file( FILE *file, DLLSPEC *spec ) if (!(token = GetToken(1))) continue; if (strcmp(token, "@") == 0) { - if (spec->type != SPEC_WIN32) - { - error( "'@' ordinals not supported for Win16\n" ); - continue; - } if (!parse_spec_ordinal( -1, spec )) continue; } else if (IsNumberString(token)) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index a0a962f..93c0822 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -57,6 +57,7 @@ static const char * const nop_sequence[4] = static inline int is_function( const ORDDEF *odp ) { + if (odp->flags & FLAG_EXPORT32) return 0; return (odp->type == TYPE_CDECL || odp->type == TYPE_PASCAL || odp->type == TYPE_VARARGS || @@ -130,6 +131,7 @@ static void output_entry_table( DLLSPEC *spec ) int selector = 0; ORDDEF *odp = spec->ordinals[i]; if (!odp) continue; + if (odp->flags & FLAG_EXPORT32) continue; switch (odp->type) { @@ -704,6 +706,7 @@ static void output_module16( DLLSPEC *spec ) { ORDDEF *odp = spec->ordinals[i]; if (!odp || !odp->name[0]) continue; + if (odp->flags & FLAG_EXPORT32) continue; output_resident_name( odp->name, i ); } output( "\t.byte 0\n" );

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: 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

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

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

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

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

Stefan Leichter : ntoskrnl.exe: Add stub for KeSetPriorityThread.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 0190edee7e66167b7ef9db5ac486c3ad690a2519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0190edee7e66167b7ef9db5ac… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 29 10:13:37 2009 +0100 ntoskrnl.exe: Add stub for KeSetPriorityThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e25fae3..e52de4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1110,6 +1110,16 @@ ULONG WINAPI KeQueryTimeIncrement(void) /*********************************************************************** + * KeSetPriorityThread (NTOSKRNL.EXE.@) + */ +KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) +{ + FIXME("(%p %d)\n", Thread, Priority); + return Priority; +} + + +/*********************************************************************** * KeWaitForSingleObject (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 546b150..b319e2e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -612,7 +612,7 @@ @ stub KeSetIdealProcessorThread @ stub KeSetImportanceDpc @ stub KeSetKernelStackSwapEnable -@ stub KeSetPriorityThread +@ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql @ stub KeSetSystemAffinityThread @ stub KeSetTargetProcessorDpc diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8f8a6e1..3a8af73 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1065,6 +1065,7 @@ void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); +KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);

1 0

Alexandre Julliard : kernel32: Don' t store the current codepage in the thread data.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 9ff8da5499130b8fe0abc74b23736f3e4ee5d3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff8da5499130b8fe0abc74b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 17:24:50 2009 +0100 kernel32: Don't store the current codepage in the thread data. --- dlls/kernel32/kernel_private.h | 3 +-- dlls/kernel32/locale.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 9cd4d74..9ec20d6 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -27,12 +27,11 @@ struct tagSYSLEVEL; struct kernel_thread_data { - UINT code_page; /* thread code page */ 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[44]; /* change this if you add fields! */ + void *pad[45]; /* change this if you add fields! */ }; static inline struct kernel_thread_data *kernel_get_thread_data(void) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 834d5b9..d6a8492 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -222,7 +222,8 @@ static const union cptable *get_codepage_table( unsigned int codepage ) case CP_UTF8: break; case CP_THREAD_ACP: - if (!(codepage = kernel_get_thread_data()->code_page)) return ansi_cptable; + if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return ansi_cptable; + codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale ); /* fall through */ default: if (codepage == ansi_cptable->info.codepage) return ansi_cptable; @@ -2057,7 +2058,6 @@ BOOL WINAPI SetThreadLocale( LCID lcid ) } NtCurrentTeb()->CurrentLocale = lcid; - kernel_get_thread_data()->code_page = get_lcid_codepage( lcid ); } return TRUE; }

1 0