Patch Win32api diff'd from 2.0

Do I need to break it up to to multi emails also?

Thanks
Steven

Changelog:
        Patch by KJK:Hyperion
        shlobj.h - add missing definitions
        windef.h - fix a few typedefs
        wingdi.h - add missing definitions and update a structure
        winuser.h - fix monitor definitions and multi-monitor typedefs

diff -u .\shlobj.h \devtools\mingw\include\shlobj.h
--- .\shlobj.h	Wed Aug 28 23:59:30 2002
+++ \devtools\mingw\include\shlobj.h	Thu Sep 19 00:09:35 2002
@@ -150,12 +150,36 @@
 #define CSIDL_COMMON_DESKTOPDIRECTORY	25
 #define CSIDL_APPDATA   26
 #define CSIDL_PRINTHOOD 27
+#define CSIDL_LOCAL_APPDATA 28
 #define CSIDL_ALTSTARTUP    29
 #define CSIDL_COMMON_ALTSTARTUP	30
 #define CSIDL_COMMON_FAVORITES	31
 #define CSIDL_INTERNET_CACHE   32
 #define CSIDL_COOKIES	33
 #define CSIDL_HISTORY	34
+#define CSIDL_COMMON_APPDATA 35
+#define CSIDL_WINDOWS        36
+#define CSIDL_SYSTEM         37
+#define CSIDL_PROGRAM_FILES  38
+#define CSIDL_MYPICTURES     39
+#define CSIDL_PROFILE        40
+#define CSIDL_SYSTEMX86      41
+#define CSIDL_PROGRAM_FILESX86 42
+#define CSIDL_PROGRAM_FILES_COMMON 43
+#define CSIDL_PROGRAM_FILES_COMMONX86 44
+#define CSIDL_COMMON_TEMPLATES 45
+#define CSIDL_COMMON_DOCUMENTS 46
+#define CSIDL_COMMON_ADMINTOOLS 47
+#define CSIDL_ADMINTOOLS 48
+#define CSIDL_CONNECTIONS 49
+#define CSIDL_COMMON_MUSIC 53
+#define CSIDL_COMMON_PICTURES 54
+#define CSIDL_COMMON_VIDEO 55
+#define CSIDL_RESOURCES 56
+#define CSIDL_RESOURCES_LOCALIZED 57
+#define CSIDL_COMMON_OEM_LINKS 58
+#define CSIDL_CDBURN_AREA 59
+#define CSIDL_COMPUTERSNEARME 61
 #define CFSTR_SHELLIDLIST	TEXT("Shell IDList Array")
 #define CFSTR_SHELLIDLISTOFFSET	TEXT("Shell Object Offsets")
 #define CFSTR_NETRESOURCES	TEXT("Net Resource")
diff -u .\windef.h \devtools\mingw\include\windef.h
--- .\windef.h	Wed Aug 28 23:59:30 2002
+++ \devtools\mingw\include\windef.h	Thu Sep 19 00:10:45 2002
@@ -234,9 +234,9 @@
 
 #include <winnt.h>
 
-typedef UINT WPARAM;
-typedef LONG LPARAM;
-typedef LONG LRESULT;
+typedef UINT_PTR WPARAM;
+typedef LONG_PTR LPARAM;
+typedef LONG_PTR LRESULT;
 #ifndef _HRESULT_DEFINED
 typedef LONG HRESULT;
 #define _HRESULT_DEFINED
diff -u .\wingdi.h \devtools\mingw\include\wingdi.h
--- .\wingdi.h	Wed Aug 28 23:59:30 2002
+++ \devtools\mingw\include\wingdi.h	Thu Sep 19 18:34:37 2002
@@ -1160,6 +1160,13 @@
 #define AC_SRC_OVER 0
 #define LAYOUT_RTL 1
 #define LAYOUT_BITMAPORIENTATIONPRESERVED 8
+#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
+#define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002
+#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004
+#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008
+#define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010
+#define DISPLAY_DEVICE_REMOVABLE 0x00000020
+#define DISPLAY_DEVICE_MODESPRUNED 0x08000000
 
 #ifndef RC_INVOKED
 typedef struct _ABC {
@@ -2361,14 +2368,27 @@
 	COLOR16 Blue;
 	COLOR16 Alpha;
 } TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX;
-typedef struct _DISPLAY_DEVICE {
+typedef struct _DISPLAY_DEVICEW {
   DWORD cb;
   WCHAR DeviceName[32];
   WCHAR DeviceString[128];
   DWORD StateFlags;
   WCHAR DeviceID[128];
   WCHAR DeviceKey[128];
-} DISPLAY_DEVICE, *PDISPLAY_DEVICE;
+} DISPLAY_DEVICEW, *PDISPLAY_DEVICEW, *LPDISPLAY_DEVICEW;
+typedef struct _DISPLAY_DEVICEA {
+  DWORD cb;
+  CHAR DeviceName[32];
+  CHAR DeviceString[128];
+  DWORD StateFlags;
+  CHAR DeviceID[128];
+  CHAR DeviceKey[128];
+} DISPLAY_DEVICEA, *PDISPLAY_DEVICEA, *LPDISPLAY_DEVICEA;
+#ifdef UNICODE
+typedef DISPLAY_DEVICEW DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
+#else
+typedef DISPLAY_DEVICEA DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
+#endif
 
 typedef BOOL (CALLBACK *ABORTPROC)(HDC,int);
 typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM);
diff -u .\winuser.h \devtools\mingw\include\winuser.h
--- .\winuser.h	Wed Aug 28 23:59:30 2002
+++ \devtools\mingw\include\winuser.h	Thu Sep 19 00:13:23 2002
@@ -860,6 +860,10 @@
 #else
 #define SM_CMETRICS 83
 #endif
+#define MONITOR_DEFAULTTONULL 0
+#define MONITOR_DEFAULTTOPRIMARY 1
+#define MONITOR_DEFAULTTONEAREST 2
+#define MONITORINFOF_PRIMARY 1
 #define ARW_BOTTOMLEFT 0
 #define ARW_BOTTOMRIGHT 1
 #define ARW_HIDE 8
@@ -1673,6 +1677,7 @@
 #define TPM_BOTTOMALIGN 32
 #define TPM_NONOTIFY 128
 #define TPM_RETURNCMD 256
+#define TPM_RECURSE 1
 #define HELP_COMMAND 0x102
 #define HELP_CONTENTS 3
 #define HELP_CONTEXT 1
@@ -2599,6 +2604,19 @@
 	RECT rcWork;
 	DWORD dwFlags;
 } MONITORINFO,*LPMONITORINFO;
+#define CCHDEVICENAME 32
+#ifdef __cplusplus
+typedef struct tagMONITORINFOEX: public MONITORINFO
+{
+        TCHAR       szDevice[CCHDEVICENAME];
+} MONITORINFOEX, *LPMONITORINFOEX;
+#else
+typedef struct tagMONITORINFOEX
+{
+        MONITORINFO;
+        TCHAR       szDevice[CCHDEVICENAME];
+} MONITORINFOEX, *LPMONITORINFOEX;
+#endif
 typedef struct tagKBDLLHOOKSTRUCT {
 	DWORD vkCode;
 	DWORD scanCode;
@@ -2606,6 +2624,10 @@
 	DWORD time;
 	DWORD dwExtraInfo;
 } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
+typedef struct tagNCCALCSIZE_PARAMS {
+    RECT       rgrc[3];
+    PWINDOWPOS lppos;
+} NCCALCSIZE_PARAMS, *LPNCCALCSIZE_PARAMS;
 #if(WINVER >= 0x0500)
 typedef struct {
   UINT  cbSize;





-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf