Przeglądaj źródła

Merged revisions 424-425 via svnmerge from
/trunk

git-svn-id: branches/fixes_2_0@476 -

peter 20 lat temu
rodzic
commit
2bc1a487ba

+ 1 - 0
.gitattributes

@@ -5928,6 +5928,7 @@ tests/webtbs/tw3977.txt svneol=native#text/plain
 tests/webtbs/tw4010.pp svneol=native#text/plain
 tests/webtbs/tw4013.pp svneol=native#text/plain
 tests/webtbs/tw4038.pp svneol=native#text/plain
+tests/webtbs/tw4043.pp svneol=native#text/plain
 tests/webtbs/tw4055.pp svneol=native#text/plain
 tests/webtbs/tw4058.pp svneol=native#text/plain
 tests/webtbs/tw4078.pp svneol=native#text/plain

+ 2 - 2
rtl/win32/wininc/defines.inc

@@ -676,8 +676,8 @@
      WS_MINIMIZEBOX = $20000;
      WS_OVERLAPPED = 0;
      WS_OVERLAPPEDWINDOW = $cf0000;
-     WS_POPUP = $80000000;
-     WS_POPUPWINDOW = $80880000;
+     WS_POPUP = LONG($80000000);
+     WS_POPUPWINDOW = LONG($80880000);
      WS_SIZEBOX = $40000;
      WS_SYSMENU = $80000;
      WS_TABSTOP = $10000;

+ 2 - 0
rtl/win32/wininc/func.inc

@@ -1233,6 +1233,8 @@ function CommDlg_OpenSave_SetControlText(_hdlg:HWND;_id : longint;_text : LPSTR)
 function CommDlg_OpenSave_HideControl(_hdlg:HWND;_id : longint) : LRESULT;
 function CommDlg_OpenSave_SetDefExt(_hdlg:HWND;_pszext : LPSTR) : LRESULT;
 
+function GetNextWindow(hWnd:HWND; uCmd:UINT):HWND; external 'user32' name 'GetWindow';
+
 function GlobalAllocPtr(flags,cb:DWord):Pointer;
 function GlobalFreePtr(lp:Pointer):Pointer;
 function GlobalUnlockPtr(lp:pointer):Pointer;

+ 14 - 0
tests/webtbs/tw4043.pp

@@ -0,0 +1,14 @@
+{ %target=win32 }
+{ %OPT=-Sew }
+
+uses
+  windows;
+
+var
+  WindowHandle : HWND;
+
+begin
+  WindowHandle:=0;
+  SetWindowLong(WindowHandle, GWL_STYLE, WS_POPUP or WS_CLIPCHILDREN);
+  halt(0);
+end.