--- Merging r24679 into '.':

U    rtl/win/wininc/struct.inc
--- Merging r24698 into '.':
G    rtl/win/wininc/struct.inc
--- Merging r23704 into '.':
U    ide/wcedit.pas
U    ide/wviews.pas
--- Merging r24710 into '.':
G    rtl/win/wininc/struct.inc

# revisions: 24679,24698,23704,24710
r24679 | marco | 2013-05-31 23:39:31 +0200 (Fri, 31 May 2013) | 3 lines
Changed paths:
   M /trunk/rtl/win/wininc/struct.inc

 * wndclass was defined with T stringtypes, even though aliased to -A variants.
   W variants were ok. Rearranged to more normal ifdef unicode setup.
r24698 | marco | 2013-06-01 12:27:39 +0200 (Sat, 01 Jun 2013) | 1 line
Changed paths:
   M /trunk/rtl/win/wininc/struct.inc

 * wndclassex ifdef unicode fixed.
r23704 | pierre | 2013-03-07 14:55:55 +0100 (Thu, 07 Mar 2013) | 1 line
Changed paths:
   M /trunk/ide/wcedit.pas
   M /trunk/ide/wviews.pas

 Fix wrong cursor pos for 64 bit systems, hopefully fixes bug report 23957
r24710 | marco | 2013-06-01 14:51:15 +0200 (Sat, 01 Jun 2013) | 1 line
Changed paths:
   M /trunk/rtl/win/wininc/struct.inc

 * added some newer additions to devmodea also to devmodeb

git-svn-id: branches/fixes_2_6@25016 -

ide/wcedit.pas

@@ -774,7 +774,7 @@ procedure TIndicator.Draw;
 var
   Color: Byte;
   Frame: Char;
-  L: array[0..1] of Longint;
+  L: array[0..1] of PtrInt;
   S: String[15];
   B: TDrawBuffer;
 begin

ide/wviews.pas

@@ -250,7 +250,7 @@ function FormatStrF(const Format: string; var Params): string;
 function FormatStrStr(const Format, Param: string): string;
 function FormatStrStr2(const Format, Param1,Param2: string): string;
 function FormatStrStr3(const Format, Param1,Param2,Param3: string): string;
-function FormatStrInt(const Format: string; L: longint): string;
+function FormatStrInt(const Format: string; L: PtrInt): string;
 
 const UserButtonName : array[1..4] of string[40] = ('User~1~','User~2~','User~3~','User~4~');
 
@@ -2400,7 +2400,7 @@ begin
   FormatStrStr3:=S;
 end;
 
-function FormatStrInt(const Format: string; L: longint): string;
+function FormatStrInt(const Format: string; L: PtrInt): string;
 var S: string;
 begin
   FormatStr(S,Format,L);

rtl/win/wininc/struct.inc

@@ -2087,6 +2087,8 @@ Const
                      dmSize        : WORD;
                      dmDriverExtra  : WORD;
                      dmFields       : DWORD;
+                     case byte of
+                  1: (
                      dmOrientation  : short;
                      dmPaperSize    : short;
                      dmPaperLength  : short;
@@ -2115,6 +2117,11 @@ Const
                      dmReserved2    : DWORD;
                      dmPanningWidth : DWORD;
                      dmPanningHeight: DWORD;
+                     );
+                  2: (dmPosition: POINTL;
+                      dmDisplayOrientation: DWORD;
+                      dmDisplayFixedOutput: DWORD;
+                     );
                    end;
 
      LPDEVMODEW   = ^DEVMODEW;
@@ -6890,7 +6897,7 @@ Const
      TWINDOWPLACEMENT = WINDOWPLACEMENT;
      PWINDOWPLACEMENT = ^WINDOWPLACEMENT;
 
-     WNDCLASS = record
+     WNDCLASSA = record
           style : UINT;
           lpfnWndProc : WNDPROC;
           cbClsExtra : longint;
@@ -6899,15 +6906,13 @@ Const
           hIcon : HICON;
           hCursor : HCURSOR;
           hbrBackground : HBRUSH;
-          lpszMenuName : LPCTSTR;
-          lpszClassName : LPCTSTR;
+          lpszMenuName : LPCSTR;
+          lpszClassName : LPCSTR;
        end;
-     LPWNDCLASS = ^WNDCLASS;
-     _WNDCLASS = WNDCLASS;
-     TWNDCLASS = WNDCLASS;
-     TWNDCLASSA = WNDCLASS;
-     PWNDCLASS = ^WNDCLASS;
-
+     LPWNDCLASSA = ^WNDCLASSA;
+     _WNDCLASSA = WNDCLASSA;
+     TWNDCLASSA = WNDCLASSA;
+     PWNDCLASSA = ^WNDCLASSA;
 
      WNDCLASSW = record
           style : UINT;
@@ -6925,8 +6930,21 @@ Const
      _WNDCLASSW  = WNDCLASSW;
      TWNDCLASSW  = WNDCLASSW;
      PWNDCLASSW  = ^WNDCLASSW;
+     {$ifdef UNICODE}
+     LPWNDCLASS  = LPWNDCLASSW;
+     _WNDCLASS   = _WNDCLASSW;
+     TWNDCLASS   = TWNDCLASSW;
+     PWNDCLASS   = PWNDCLASSW;
+     WNDCLASS    = WNDCLASSW;
+     {$else}
+     LPWNDCLASS  = LPWNDCLASSA;
+     _WNDCLASS   = _WNDCLASSA;
+     TWNDCLASS   = TWNDCLASSA;
+     PWNDCLASS   = PWNDCLASSA;
+     WNDCLASS    = WNDCLASSA;
+     {$endif}
 
-     WNDCLASSEX = record
+     WNDCLASSEXA = record
           cbSize : UINT;
           style : UINT;
           lpfnWndProc : WNDPROC;
@@ -6936,15 +6954,14 @@ Const
           hIcon : HICON;
           hCursor : HCURSOR;
           hbrBackground : HBRUSH;
-          lpszMenuName : LPCTSTR;
-          lpszClassName : LPCTSTR;
+          lpszMenuName : LPCSTR;
+          lpszClassName : LPCSTR;
           hIconSm : HANDLE;
        end;
-     LPWNDCLASSEX = ^WNDCLASSEX;
-     _WNDCLASSEX = WNDCLASSEX;
-     TWNDCLASSEX = WNDCLASSEX;
-     TWNDCLASSEXA = WNDCLASSEX;
-     PWNDCLASSEX = ^WNDCLASSEX;
+     LPWNDCLASSEXA = ^WNDCLASSEXA;
+     _WNDCLASSEXA = WNDCLASSEXA;
+     TWNDCLASSEXA = WNDCLASSEXA;
+     PWNDCLASSEXA = ^WNDCLASSEXA;
 
      WNDCLASSEXW = record
           cbSize : UINT;
@@ -6965,6 +6982,20 @@ Const
      TWNDCLASSEXW  = WNDCLASSEXW;
      PWNDCLASSEXW  = ^WNDCLASSEXW;
 
+     {$ifdef UNICODE}
+     LPWNDClassEx  = LPWNDClassExW;
+     _WNDClassEx   = _WNDClassExW;
+     TWNDClassEx   = TWNDClassExW;
+     PWNDClassEx   = PWNDClassExW;
+     WNDClassEx    = WNDClassExW;
+     {$ELSE}
+     LPWNDClassEx  = LPWNDClassExA;
+     _WNDClassEx   = _WNDClassExA;
+     TWNDClassEx   = TWNDClassExA;
+     PWNDClassEx   = PWNDClassExA;
+     WNDClassEx    = WNDClassExA;
+     {$endif}
+
      CONNECTDLGSTRUCT = record
           cbStructure : DWORD;
           hwndOwner : HWND;