Fixed widestring version of getversionex as per bug #3440 (Alexey Barkovoy)

This commit is contained in:
michael 2004-12-18 20:00:59 +00:00
parent 14b11ebf16
commit fd0533ed3c
4 changed files with 37 additions and 7 deletions

View File

@ -586,7 +586,7 @@ function GetUserObjectInformationW(hObj: THandle; nIndex: Integer; pvInfo: Point
function GetUserObjectSecurity(hObj: THandle; var pSIRequested: DWORD; pSID: PSecurityDescriptor; nLength: DWORD; var lpnLengthNeeded: DWORD): BOOL; external 'user32' name 'GetUserObjectSecurity';
function GetVersionEx(var lpVersionInformation: TOSVersionInfo): BOOL;external 'kernel32' name 'GetVersionExA';
function GetVersionExA(var lpVersionInformation: TOSVersionInfo): BOOL; external 'kernel32' name 'GetVersionExA';
function GetVersionExW(var lpVersionInformation: TOSVersionInfo): BOOL; external 'kernel32' name 'GetVersionExW';
function GetVersionExW(var lpVersionInformation: TOSVersionInfoW): BOOL; external 'kernel32' name 'GetVersionExW';
function GetViewportExtEx(DC: HDC; var Size: TSize): BOOL; external 'gdi32' name 'GetViewportExtEx';
function GetViewportOrgEx(DC: HDC; var Point: TPoint): BOOL; external 'gdi32' name 'GetViewportOrgEx';
function GetVolumeInformation(lpRootPathName: PChar; lpVolumeNameBuffer: PChar; nVolumeNameSize: DWORD; lpVolumeSerialNumber: PDWORD; var lpMaximumComponentLength, lpFileSystemFlags: DWORD;
@ -1059,7 +1059,10 @@ end;
{
$Log$
Revision 1.27 2004-11-07 20:46:27 marco
Revision 1.28 2004-12-18 20:00:59 michael
Fixed widestring version of getversionex as per bug 3440 (Alexey Barkovoy)
Revision 1.27 2004/11/07 20:46:27 marco
* fix for 3299
Revision 1.26 2004/11/07 20:25:02 marco

View File

@ -4577,6 +4577,23 @@
TOSVERSIONINFO = OSVERSIONINFO;
POSVERSIONINFO = ^OSVERSIONINFO;
OSVERSIONINFOW = record
dwOSVersionInfoSize : DWORD;
dwMajorVersion : DWORD;
dwMinorVersion : DWORD;
dwBuildNumber : DWORD;
dwPlatformId : DWORD;
szCSDVersion : array[0..127] of WCHAR;
end;
LPOSVERSIONINFOW = ^OSVERSIONINFOW;
_OSVERSIONINFOW = OSVERSIONINFOW;
TOSVERSIONINFOW = OSVERSIONINFOW;
POSVERSIONINFOW = ^OSVERSIONINFOW;
TEXTMETRIC = record
tmHeight : LONG;
tmAscent : LONG;
@ -7119,7 +7136,10 @@ type
{
$Log$
Revision 1.28 2004-11-07 20:46:27 marco
Revision 1.29 2004-12-18 20:00:59 michael
Fixed widestring version of getversionex as per bug 3440 (Alexey Barkovoy)
Revision 1.28 2004/11/07 20:46:27 marco
* fix for 3299
Revision 1.27 2004/11/07 20:25:02 marco

View File

@ -344,7 +344,8 @@ function CreateProcess(lpApplicationName:LPCWSTR; lpCommandLine:LPWSTR; lpProces
procedure GetStartupInfo(lpStartupInfo:LPSTARTUPINFO); external 'kernel32' name 'GetStartupInfoW';
function FindFirstFile(lpFileName:LPCWSTR; lpFindFileData:LPWIN32_FIND_DATA):HANDLE; external 'kernel32' name 'FindFirstFileW';
function FindNextFile(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; external 'kernel32' name 'FindNextFileW';
function GetVersionEx(VersionInformation:LPOSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExW';
function GetVersionEx(VersionInformation:LPOSVERSIONINFOW):WINBOOL; external 'kernel32' name 'GetVersionExW';
function GetVersionExW(VersionInformation:LPOSVERSIONINFOW):WINBOOL; external 'kernel32' name 'GetVersionExW';
function CreateWindow(lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint;Y:longint; nWidth:longint; nHeight:longint; hWndParent:HWND; hMenu:HMENU;hInstance:HINST; lpParam:LPVOID):HWND;
function CreateDialog(hInstance:HINST; lpName:LPCWSTR; hWndParent:HWND; lpDialogFunc:DLGPROC):HWND;
function CreateDialogIndirect(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndParent:HWND; lpDialogFunc:DLGPROC):HWND;
@ -492,7 +493,10 @@ end;
{
$Log$
Revision 1.11 2004-11-07 20:46:27 marco
Revision 1.12 2004-12-18 20:00:59 michael
Fixed widestring version of getversionex as per bug 3440 (Alexey Barkovoy)
Revision 1.11 2004/11/07 20:46:27 marco
* fix for 3299
Revision 1.10 2004/11/07 20:25:02 marco

View File

@ -344,7 +344,7 @@ function CreateProcessW(lpApplicationName:LPCWSTR; lpCommandLine:LPWSTR; lpProce
procedure GetStartupInfoW(lpStartupInfo:LPSTARTUPINFO); external 'kernel32' name 'GetStartupInfoW';
function FindFirstFileW(lpFileName:LPCWSTR; lpFindFileData:LPWIN32_FIND_DATA):HANDLE; external 'kernel32' name 'FindFirstFileW';
function FindNextFileW(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; external 'kernel32' name 'FindNextFileW';
function GetVersionExW(VersionInformation:LPOSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExW';
function GetVersionExW(VersionInformation:LPOSVERSIONINFOW):WINBOOL; external 'kernel32' name 'GetVersionExW';
function CreateWindowW(lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint;Y:longint; nWidth:longint; nHeight:longint; hWndParent:HWND; hMenu:HMENU;hInstance:HINST; lpParam:LPVOID):HWND;
function CreateDialogW(hInstance:HINST; lpName:LPCWSTR; hWndParent:HWND; lpDialogFunc:DLGPROC):HWND;
function CreateDialogIndirectW(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndParent:HWND; lpDialogFunc:DLGPROC):HWND;
@ -492,7 +492,10 @@ end;
{
$Log$
Revision 1.11 2004-11-07 20:46:27 marco
Revision 1.12 2004-12-18 20:00:59 michael
Fixed widestring version of getversionex as per bug 3440 (Alexey Barkovoy)
Revision 1.11 2004/11/07 20:46:27 marco
* fix for 3299
Revision 1.10 2004/11/07 20:25:02 marco