paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 18:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: fix WindowsVersion variable initialization (fixes bug #0014400)

Browse Source 
git-svn-id: trunk@21384 -
This commit is contained in:
paul 2009-08-21 15:21:04 +00:00
parent 3a36d94ef4
commit ebf57a017e
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/interfaces/win32/win32extra.pas
View File

@ -683,12 +683,13 @@ procedure Initialize;
var
p: Pointer;
begin
if WindowsVersion = wvUnknown then
UpdateWindowsVersion;
GetComboBoxInfo := nil;
GetMenuBarInfo := nil;
GetWindowInfo := nil;
AlphaBlend := @_AlphaBlend;
msimg32handle := LoadLibrary(msimg32lib);
if msimg32handle <> 0
then begin
@ -700,13 +701,16 @@ begin
then begin
// windows 98
// Pointer(AlphaBlend98) := p;
AlphaBlend := @_AlphaBlend98;
Pointer(AlphaBlend) := @_AlphaBlend98;
end
else begin
// other
Pointer(AlphaBlend) := p;
end;
end;
end
else
Pointer(AlphaBlend) := @_AlphaBlend;
p := GetProcAddress(msimg32handle, 'GradientFill');
if p <> nil then
Pointer(GradientFill) := p

51
lcl/interfaces/win32/win32proc.pp
View File

@ -124,6 +124,7 @@ function BitmapToRegion(hBmp: HBITMAP; cTransparentColor: COLORREF = 0; cToleran
{ String functions that may be moved to the RTL in the future }
function WideStrLCopy(dest, source: PWideChar; maxlen: SizeInt): PWideChar;
procedure UpdateWindowsVersion;
type
PStayOnTopWindowsInfo = ^TStayOnTopWindowsInfo;
@ -1747,20 +1748,11 @@ begin
end;
procedure DoInitialization;
procedure UpdateWindowsVersion;
begin
FillChar(DefaultWindowInfo, sizeof(DefaultWindowInfo), 0);
DefaultWindowInfo.DrawItemIndex := -1;
WindowInfoAtom := Windows.GlobalAddAtom('WindowInfo');
ChangedMenus := TList.Create;
{$ifdef WindowsUnicodeSupport}
UnicodeEnabledOS := (Win32Platform = VER_PLATFORM_WIN32_NT);
{$endif}
case Win32MajorVersion of
0..3:;
4: begin
case Win32MajorVersion of
0..3:;
4: begin
if Win32Platform = VER_PLATFORM_WIN32_NT
then WindowsVersion := wvNT4
else
@ -1770,8 +1762,8 @@ begin
else
WindowsVersion :=wv95;
end;
end;
5: begin
end;
5: begin
case Win32MinorVersion of
0: WindowsVersion := wv2000;
1: WindowsVersion := wvXP;
@ -1780,19 +1772,32 @@ begin
// we could detect that based on arch and versioninfo.Producttype
WindowsVersion := wvServer2003;
end;
end;
6: begin
end;
6: begin
case Win32MinorVersion of
0: WindowsVersion := wvVista;
1: WindowsVersion := wv7;
else
WindowsVersion := wvLater;
end;
end;
else
WindowsVersion := wvLater;
end;
end;
else
WindowsVersion := wvLater;
end;
end;
procedure DoInitialization;
begin
FillChar(DefaultWindowInfo, sizeof(DefaultWindowInfo), 0);
DefaultWindowInfo.DrawItemIndex := -1;
WindowInfoAtom := Windows.GlobalAddAtom('WindowInfo');
ChangedMenus := TList.Create;
{$ifdef WindowsUnicodeSupport}
UnicodeEnabledOS := (Win32Platform = VER_PLATFORM_WIN32_NT);
{$endif}
if WindowsVersion = wvUnknown then
UpdateWindowsVersion;
end;
{$IFDEF ASSERT_IS_ON}
@ -1801,11 +1806,9 @@ end;
{$ENDIF}
initialization
DoInitialization;
finalization
Windows.GlobalDeleteAtom(WindowInfoAtom);
WindowInfoAtom := 0;
ChangedMenus.Free;