February 2007 - Wine-Commits

Francois Gouget : ntdll: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: f3899c2651f824496edd561ff29b153e6ad6bff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3899c2651f824496edd561ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:36:49 2007 +0100 ntdll: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ntdll/misc.c | 2 +- dlls/ntdll/string.c | 4 ++-- tools/winapi/win32.api | 11 ++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 1142133..2f63ebb 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -149,7 +149,7 @@ int CDECL NTDLL_abs( int i ) /********************************************************************* * labs (NTDLL.@) */ -long int CDECL NTDLL_labs( long int i ) +long CDECL NTDLL_labs( long i ) { return labs( i ); } diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 874ead3..731d918 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -105,8 +105,8 @@ void __cdecl NTDLL_qsort( void *base, si /********************************************************************* * _lfind (NTDLL.@) */ -void * __cdecl _lfind( const void *key, const void *base, size_t *nmemb, - size_t size, int(*compar)(const void *, const void *) ) +void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, + unsigned int size, int(*compar)(const void *, const void *) ) { return lfind( key, base, nmemb, size, compar ); } diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 860e52a..5041168 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2816,6 +2816,7 @@ WORD int long obj_handle_t +size_t unsigned int unsigned long @@ -2833,6 +2834,7 @@ ULONGLONG ANSI_STRING * BOOLEAN * +BYTE * CLIENT_ID * CONTEXT * CURDIR * @@ -2895,6 +2897,7 @@ PIMAGE_NT_HEADERS PIMAGE_SECTION_HEADER PIO_APC_ROUTINE PIO_STATUS_BLOCK +PKEY_MULTIPLE_VALUE_INFORMATION PLARGE_INTEGER PLDR_MODULE * PLONG @@ -2914,11 +2917,14 @@ PRTL_THREAD_START_ROUTINE PRTL_USER_PROCESS_PARAMETERS PRTL_WORK_ITEM_ROUTINE PSECURITY_DESCRIPTOR +PSECURITY_DESCRIPTOR * PSECURITY_DESCRIPTOR_CONTROL PSECURITY_QUALITY_OF_SERVICE PSID PSID * PSID_IDENTIFIER_AUTHORITY +PSLIST_ENTRY +PSLIST_HEADER PSTRING PSYSTEM_MODULE_INFORMATION PTIME_FIELDS @@ -2927,6 +2933,7 @@ PTOKEN_GROUPS PTOKEN_PRIVILEGES PULARGE_INTEGER PULONG +PULONG_PTR PUNICODE_STRING PVECTORED_EXCEPTION_HANDLER PVOID @@ -2946,7 +2953,6 @@ RTL_USER_PROCESS_PARAMETERS ** SECURITY_DESCRIPTOR * SIZE_T * STRING * -TEB * UINT * ULONG * ULONGLONG * @@ -2954,9 +2960,12 @@ UNICODE_STRING * USHORT * VOID * WCHAR ** +char ** int * +int (*)(void *, void *) obj_handle_t * union cptable * +unsigned int * va_list va_list * void *

1 0

Francois Gouget : winapi_check: Fix handling of the -register functions.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: fe7873912804cd7200e11c1551fb7804464b66c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7873912804cd7200e11c155… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:31:57 2007 +0100 winapi_check: Fix handling of the -register functions. Unless specified otherwise they are implemented by a '__regs_' function. Keep track of the '-i386' flag so we can detect CONTEXT* vs. CONTEXT86* mismatches. Remove an unneeded and broken hack meant to fudge the number of parameters. --- tools/winapi/winapi.pm | 8 +++++++- tools/winapi/winapi_local.pm | 31 ++++++++++++++++--------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index e5ed445..eb85d08 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -293,7 +293,10 @@ sub parse_spec_file($$) { $flags =~ s/\s+/ /g; - $internal_name = $external_name if !$internal_name; + if (!$internal_name) + { + $internal_name = ($flags =~ /-register/ ? "__regs_" : "") . $external_name; + } if($flags =~ /-noname/) { # $external_name = "@"; @@ -304,6 +307,9 @@ sub parse_spec_file($$) { $arguments .= "ptr"; $calling_convention .= " -register"; } + if($flags =~ /(?:-i386)/) { + $calling_convention .= " -i386"; + } if ($internal_name =~ /^(.*?)\.(.*?)$/) { my $forward_module = lc($1); diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 01c8ab9..f46d1ec 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -117,11 +117,9 @@ sub _check_function($$$$$$) { my $declared_calling_convention = $winapi->function_internal_calling_convention($internal_name) || ""; my @declared_argument_kinds = split(/\s+/, $winapi->function_internal_arguments($internal_name)); - my $declared_register = 0; - if ($declared_calling_convention =~ /^(\w+) -register$/) { - $declared_register = 1; - $declared_calling_convention = $1; - } + my $declared_register = ($declared_calling_convention =~ / -register\b/); + my $declared_i386 = ($declared_calling_convention =~ /(?:^pascal| -i386)\b/); + $declared_calling_convention =~ s/ .*$//; if(!$declared_register && $implemented_calling_convention ne $declared_calling_convention && @@ -158,12 +156,6 @@ sub _check_function($$$$$$) { } } - if($#argument_types != -1 && $argument_types[$#argument_types] eq "CONTEXT *" && - $internal_name =~ /^(?:RtlRaiseException|RtlUnwind|NtRaiseException)$/) # FIXME: Kludge - { - $#argument_types--; - } - if($internal_name =~ /^(?:NTDLL__ftol|NTDLL__CIpow)$/) { # FIXME: Kludge # ignore } else { @@ -172,7 +164,9 @@ sub _check_function($$$$$$) { my $type = $_; my $kind = "unknown"; $winapi->type_used_in_module($type,$module); - if($type eq "CONTEXT86 *") { + if($type eq "CONTEXT *") { + $kind = "context"; + } elsif($type eq "CONTEXT86 *") { $kind = "context86"; } elsif(!defined($kind = $winapi->translate_argument($type))) { $winapi->declare_argument($type, "unknown"); @@ -200,8 +194,15 @@ sub _check_function($$$$$$) { } } @argument_types; - if ($declared_register && $argument_kinds[$#argument_kinds] ne "context86") { - $output->write("function declared as register, but CONTEXT86 * is not last argument\n"); + if ($declared_register) + { + if (!$declared_i386 && + $argument_kinds[$#argument_kinds] ne "context") { + $output->write("function declared as register, but CONTEXT * is not last argument\n"); + } elsif ($declared_i386 && + $argument_kinds[$#argument_kinds] ne "context86") { + $output->write("function declared as register, but CONTEXT86 * is not last argument\n"); + } } for my $n (0..$#argument_kinds) { @@ -218,7 +219,7 @@ sub _check_function($$$$$$) { $argument_types[$n] = ""; } - if($argument_kinds[$n] eq "context86") { + if($argument_kinds[$n] =~ /^context(?:86)?$/) { # Nothing } elsif(!$winapi->is_allowed_kind($argument_kinds[$n]) || !$winapi->is_allowed_type_in_module($argument_types[$n], $module))

1 0

Francois Gouget : winapi_check: '-register' is compatible with stdcall. So remove this obsolete warning.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 30131979cc1d49b423e10294626ace7122b67b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=30131979cc1d49b423e102946… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:22:45 2007 +0100 winapi_check: '-register' is compatible with stdcall. So remove this obsolete warning. --- tools/winapi/winapi_local.pm | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 2281484..01c8ab9 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -123,14 +123,8 @@ sub _check_function($$$$$$) { $declared_calling_convention = $1; } - if ($declared_register) - { - if ($implemented_calling_convention eq "stdcall") - { - $output->write("-register functions should not be implemented as stdcall\n"); - } - } - elsif($implemented_calling_convention ne $declared_calling_convention && + if(!$declared_register && + $implemented_calling_convention ne $declared_calling_convention && $implemented_calling_convention ne "asm" && !($declared_calling_convention =~ /^pascal/ && $forbidden_return_type) && !($implemented_calling_convention =~ /^(?:cdecl|varargs)$/ && $declared_calling_convention =~ /^(?:cdecl|varargs)$/))

1 0

Francois Gouget : Make winnt.h C++ compatible.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: ac2754b74d8b656b49040753dd5aa01703e93254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2754b74d8b656b49040753d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:22:34 2007 +0100 Make winnt.h C++ compatible. --- include/winnt.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 6d3022b..ff896c9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -30,6 +30,11 @@ #include <string.h> #endif + +#ifdef __cplusplus +extern "C" { +#endif + #define NTAPI __stdcall #if (defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64) || defined(__MINGW32__)) && !defined(MIDL_PASS) @@ -4785,4 +4790,8 @@ ULONGLONG WINAPI VerSetConditionMask(ULO #define VER_AND 6 #define VER_OR 7 +#ifdef __cplusplus +} +#endif + #endif /* _WINNT_ */

1 0

Francois Gouget : ntdsapi: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 65563fd0d0b45385a2aa9d68c49637cd1de50b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65563fd0d0b45385a2aa9d68c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:22:22 2007 +0100 ntdsapi: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 8ae0231..860e52a 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2983,6 +2983,27 @@ PCWSTR PWSTR WCHAR * +%%ntdsapi.dll + +%long + +DWORD +USHORT + +%ptr + +DWORD * + +%str + +LPCSTR +LPSTR + +%wstr + +LPCWSTR +LPWSTR + %%odbc32.dll %long

1 0

Francois Gouget : ntdsapi: Add a commented-out #include directive as a reminder.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 5bdb725f15ddf26a74894bb6cbdc42d1aecf5b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdb725f15ddf26a74894bb6c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:22:13 2007 +0100 ntdsapi: Add a commented-out #include directive as a reminder. --- include/ntdsapi.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 6546cf6..23f1493 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_NTDSAPI_H #define __WINE_NTDSAPI_H +/* FIXME: #include <schedule.h> */ + #ifdef __cplusplus extern "C" { #endif

1 0

Francois Gouget : kernel32: Add prototypes to winbase. h for the SList functions.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 590c4020f24c11cb6453085d18df27f0ca7db4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=590c4020f24c11cb6453085d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:32:10 2007 +0100 kernel32: Add prototypes to winbase.h for the SList functions. --- include/winbase.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 8683976..59e7718 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1752,6 +1752,10 @@ void WINAPI InitializeCriticalSec BOOL WINAPI InitializeCriticalSectionAndSpinCount(CRITICAL_SECTION *,DWORD); BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); +VOID WINAPI InitializeSListHead(PSLIST_HEADER); +PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); +PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); +PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); BOOL WINAPI IsBadCodePtr(FARPROC); BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT); @@ -1890,6 +1894,7 @@ BOOL WINAPI PrivilegedServiceAudi BOOL WINAPI PulseEvent(HANDLE); BOOL WINAPI PurgeComm(HANDLE,DWORD); BOOL WINAPI QueryActCtxW(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T *); +USHORT WINAPI QueryDepthSList(PSLIST_HEADER); DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD); DWORD WINAPI QueryDosDeviceW(LPCWSTR,LPWSTR,DWORD); #define QueryDosDevice WINELIB_NAME_AW(QueryDosDevice)

1 0

Francois Gouget : ntdll: ZwRaiseException() is not a register function.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 589fcd8ccf0a18c29da4d55d1c0e900e401d5cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589fcd8ccf0a18c29da4d55d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:26:03 2007 +0100 ntdll: ZwRaiseException() is not a register function. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 827d98d..07c857c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1116,7 +1116,7 @@ @ stdcall ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile # @ stub ZwQueueApcThread -@ stdcall -register ZwRaiseException(ptr ptr long) NtRaiseException +@ stdcall ZwRaiseException(ptr ptr long) NtRaiseException @ stub ZwRaiseHardError @ stdcall ZwReadFile(long long long long long long long long long) NtReadFile # @ stub ZwReadFileScatter

1 0

Francois Gouget : ntdll: The fourth parameter of RtlUnwind() is a pointer, not a long.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 7a37f21a78b657db3a7b5aee8a4ab1063a5b9f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a37f21a78b657db3a7b5aee8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:27:27 2007 +0100 ntdll: The fourth parameter of RtlUnwind() is a pointer, not a long. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 07c857c..e315057 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -885,7 +885,7 @@ # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) # @ stub RtlUnlockMemoryStreamRegion -@ stdcall -register RtlUnwind(ptr ptr ptr long) +@ stdcall -register RtlUnwind(ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long)

1 0

Hwang YunSong(황윤성) : regedit: Updated Korean Resource.
by Alexandre Julliard Feb. 9, 2007

Feb. 9, 2007

Module: wine Branch: master Commit: 997da8d15dde4c464d7f0cdf215833dccdf3bbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997da8d15dde4c464d7f0cdf2… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Feb 8 08:59:52 2007 +0900 regedit: Updated Korean Resource. --- programs/regedit/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index 8d38ddb..5241779 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -46,8 +46,8 @@ BEGIN MENUITEM "��Ʈ�� (&I)...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "��Ʈ�� (&E)...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "��Ʈ��ũ ��Ʈ�� (&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED - MENUITEM "��Ʈ��ũ ��Ʈ�� (&D)...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + MENUITEM "�� Ʈ�� (&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED + MENUITEM "�� Ʈ�� (&D)...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "�μ�(&P)\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR

1 0