Removed trailing whitespace.
diff --git a/include/commctrl.h b/include/commctrl.h
index 46e74a7..893a20f 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -247,7 +247,7 @@
DWORD dwDrawStage;
HDC hdc;
RECT rc;
- DWORD dwItemSpec;
+ DWORD dwItemSpec;
UINT uItemState;
LPARAM lItemlParam;
} NMCUSTOMDRAW, *LPNMCUSTOMDRAW;
@@ -513,7 +513,7 @@
DWORD dwRop;
} IMAGELISTDRAWPARAMS, *LPIMAGELISTDRAWPARAMS;
-
+
INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
INT WINAPI ImageList_AddIcon (HIMAGELIST, HICON);
INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
@@ -522,13 +522,13 @@
HIMAGELIST WINAPI ImageList_Create(INT,INT,UINT,INT,INT);
BOOL WINAPI ImageList_Destroy(HIMAGELIST);
BOOL WINAPI ImageList_DragEnter(HWND,INT,INT);
-BOOL WINAPI ImageList_DragLeave(HWND);
+BOOL WINAPI ImageList_DragLeave(HWND);
BOOL WINAPI ImageList_DragMove(INT,INT);
BOOL WINAPI ImageList_DragShowNolock (BOOL);
BOOL WINAPI ImageList_Draw(HIMAGELIST,INT,HDC,INT,INT,UINT);
BOOL WINAPI ImageList_DrawEx(HIMAGELIST,INT,HDC,INT,INT,INT,
INT,COLORREF,COLORREF,UINT);
-BOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
+BOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST);
BOOL WINAPI ImageList_EndDrag(VOID);
COLORREF WINAPI ImageList_GetBkColor(HIMAGELIST);
@@ -641,17 +641,17 @@
/* Header control */
-#define WC_HEADER16 "SysHeader"
-#define WC_HEADERA "SysHeader32"
+#define WC_HEADER16 "SysHeader"
+#define WC_HEADERA "SysHeader32"
static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 };
#define WC_HEADER WINELIB_NAME_AW(WC_HEADER)
-
-#define HDS_HORZ 0x0000
-#define HDS_BUTTONS 0x0002
-#define HDS_HOTTRACK 0x0004
-#define HDS_HIDDEN 0x0008
-#define HDS_DRAGDROP 0x0040
-#define HDS_FULLDRAG 0x0080
+
+#define HDS_HORZ 0x0000
+#define HDS_BUTTONS 0x0002
+#define HDS_HOTTRACK 0x0004
+#define HDS_HIDDEN 0x0008
+#define HDS_DRAGDROP 0x0040
+#define HDS_FULLDRAG 0x0080
#define HDI_WIDTH 0x0001
#define HDI_HEIGHT HDI_WIDTH
@@ -887,7 +887,7 @@
/* Toolbar */
-#define TOOLBARCLASSNAME16 "ToolbarWindow"
+#define TOOLBARCLASSNAME16 "ToolbarWindow"
#define TOOLBARCLASSNAMEA "ToolbarWindow32"
static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r',
'W','i','n','d','o','w','3','2',0 };
@@ -905,7 +905,7 @@
#define TBSTATE_MARKED 0x80
-/* as of _WIN32_IE >= 0x0500 the following symbols are obsolete,
+/* as of _WIN32_IE >= 0x0500 the following symbols are obsolete,
* "everyone" should use the BTNS_... stuff below
*/
#define TBSTYLE_BUTTON 0x00
@@ -932,7 +932,7 @@
#define TBSTYLE_ALTDRAG 0x0400
#define TBSTYLE_FLAT 0x0800
#define TBSTYLE_LIST 0x1000
-#define TBSTYLE_CUSTOMERASE 0x2000
+#define TBSTYLE_CUSTOMERASE 0x2000
#define TBSTYLE_REGISTERDROP 0x4000
#define TBSTYLE_TRANSPARENT 0x8000
#define TBSTYLE_EX_DRAWDDARROWS 0x00000001
@@ -949,7 +949,7 @@
#define TBIF_COMMAND 0x00000020
#define TBIF_SIZE 0x00000040
-#define TBBF_LARGE 0x0001
+#define TBBF_LARGE 0x0001
#define TB_ENABLEBUTTON (WM_USER+1)
#define TB_CHECKBUTTON (WM_USER+2)
@@ -957,9 +957,9 @@
#define TB_HIDEBUTTON (WM_USER+4)
#define TB_INDETERMINATE (WM_USER+5)
#define TB_MARKBUTTON (WM_USER+6)
-#define TB_ISBUTTONENABLED (WM_USER+9)
-#define TB_ISBUTTONCHECKED (WM_USER+10)
-#define TB_ISBUTTONPRESSED (WM_USER+11)
+#define TB_ISBUTTONENABLED (WM_USER+9)
+#define TB_ISBUTTONCHECKED (WM_USER+10)
+#define TB_ISBUTTONPRESSED (WM_USER+11)
#define TB_ISBUTTONHIDDEN (WM_USER+12)
#define TB_ISBUTTONINDETERMINATE (WM_USER+13)
#define TB_ISBUTTONHIGHLIGHTED (WM_USER+14)
@@ -981,8 +981,8 @@
#define TB_SAVERESTOREW (WM_USER+76)
#define TB_SAVERESTORE WINELIB_NAME_AW(TB_SAVERESTORE)
#define TB_CUSTOMIZE (WM_USER+27)
-#define TB_ADDSTRINGA (WM_USER+28)
-#define TB_ADDSTRINGW (WM_USER+77)
+#define TB_ADDSTRINGA (WM_USER+28)
+#define TB_ADDSTRINGW (WM_USER+77)
#define TB_ADDSTRING WINELIB_NAME_AW(TB_ADDSTRING)
#define TB_GETITEMRECT (WM_USER+29)
#define TB_BUTTONSTRUCTSIZE (WM_USER+30)
@@ -1352,7 +1352,7 @@
#define HICF_LMOUSE 0x00000080 /* left mouse button selected */
#define HICF_TOGGLEDROPDOWN 0x00000100 /* Toggle button's dropdown state */
-typedef struct
+typedef struct
{
int iButton;
DWORD dwFlags;
@@ -1362,15 +1362,15 @@
HWND WINAPI
CreateToolbar(HWND, DWORD, UINT, INT, HINSTANCE,
- UINT, LPCOLDTBBUTTON, INT);
-
+ UINT, LPCOLDTBBUTTON, INT);
+
HWND WINAPI
CreateToolbarEx(HWND, DWORD, UINT, INT,
- HINSTANCE, UINT, LPCTBBUTTON,
- INT, INT, INT, INT, INT, UINT);
+ HINSTANCE, UINT, LPCTBBUTTON,
+ INT, INT, INT, INT, INT, UINT);
HBITMAP WINAPI
-CreateMappedBitmap (HINSTANCE, INT, UINT, LPCOLORMAP, INT);
+CreateMappedBitmap (HINSTANCE, INT, UINT, LPCOLORMAP, INT);
/* Tool tips */
@@ -1382,7 +1382,7 @@
#define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS)
#define INFOTIPSIZE 1024
-
+
#define TTS_ALWAYSTIP 0x01
#define TTS_NOPREFIX 0x02
@@ -2098,7 +2098,7 @@
#define TVS_FULLROWSELECT 0x1000
#define TVS_NOSCROLL 0x2000
#define TVS_NONEVENHEIGHT 0x4000
-#define TVS_NOHSCROLL 0x8000
+#define TVS_NOHSCROLL 0x8000
#define TVS_SHAREDIMAGELISTS 0x0000
#define TVS_PRIVATEIMAGELISTS 0x0400
@@ -2341,7 +2341,7 @@
#define TreeView_InsertItemW(hwnd,phdi) \
(HTREEITEM)SendMessageW((hwnd), TVM_INSERTITEMW, 0, \
(LPARAM)(LPTVINSERTSTRUCTW)(phdi))
-#define TreeView_InsertItem WINELIB_NAME_AW(TreeView_InsertItem)
+#define TreeView_InsertItem WINELIB_NAME_AW(TreeView_InsertItem)
#define TreeView_DeleteItem(hwnd, hItem) \
(BOOL)SendMessageA((hwnd), TVM_DELETEITEM, 0, (LPARAM)(HTREEITEM)(hItem))
@@ -2416,12 +2416,12 @@
(BOOL)SendMessageA((hwnd), TVM_GETITEMA, 0, (LPARAM) (TVITEMA *)(pitem))
#define TreeView_GetItemW(hwnd, pitem) \
(BOOL)SendMessageW((hwnd), TVM_GETITEMA, 0, (LPARAM) (TVITEMA *)(pitem))
-#define TreeView_GetItem WINELIB_NAME_AW(TreeView_GetItem)
+#define TreeView_GetItem WINELIB_NAME_AW(TreeView_GetItem)
#define TreeView_SetItemA(hwnd, pitem) \
- (BOOL)SendMessageA((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem))
+ (BOOL)SendMessageA((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem))
#define TreeView_SetItemW(hwnd, pitem) \
- (BOOL)SendMessageW((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem))
+ (BOOL)SendMessageW((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem))
#define TreeView_SetItem WINELIB_NAME_AW(TreeView_SetItem)
#define TreeView_EditLabel(hwnd, hitem) \
@@ -2597,7 +2597,7 @@
#define LVFI_PARAM 0X0001
#define LVFI_STRING 0X0002
#define LVFI_PARTIAL 0X0008
-#define LVFI_WRAP 0X0020
+#define LVFI_WRAP 0X0020
#define LVFI_NEARESTXY 0X0040
#define LVIF_TEXT 0x0001
@@ -2611,7 +2611,7 @@
#define LVIR_BOUNDS 0x0000
#define LVIR_LABEL 0x0002
#define LVIR_ICON 0x0001
-#define LVIR_SELECTBOUNDS 0x0003
+#define LVIR_SELECTBOUNDS 0x0003
#define LVIS_FOCUSED 0x0001
#define LVIS_SELECTED 0x0002
@@ -3181,10 +3181,10 @@
#define ListView_SetItemTextA(hwndLV, i, _iSubItem, _pszText) \
{ LVITEMA _LVi; _LVi.iSubItem = _iSubItem; _LVi.pszText = _pszText;\
- SendMessageA(hwndLV, LVM_SETITEMTEXTA, (WPARAM)i, (LPARAM) (LVITEMA*)&_LVi);}
+ SendMessageA(hwndLV, LVM_SETITEMTEXTA, (WPARAM)i, (LPARAM) (LVITEMA*)&_LVi);}
#define ListView_SetItemTextW(hwndLV, i, _iSubItem, _pszText) \
{ LVITEMW _LVi; _LVi.iSubItem = _iSubItem; _LVi.pszText = _pszText;\
- SendMessageW(hwndLV, LVM_SETITEMTEXTW, (WPARAM)i, (LPARAM) (LVITEMW*)& _LVi);}
+ SendMessageW(hwndLV, LVM_SETITEMTEXTW, (WPARAM)i, (LPARAM) (LVITEMW*)& _LVi);}
#define ListView_SetItemText WINELIB_NAME_AW(ListView_SetItemText)
#define ListView_DeleteItem(hwndLV, i) \
@@ -3755,12 +3755,12 @@
#define MCN_GETDAYSTATE (MCN_FIRST + 3)
#define MCN_SELECT (MCN_FIRST + 4)
-#define MCSC_BACKGROUND 0
-#define MCSC_TEXT 1
-#define MCSC_TITLEBK 2
+#define MCSC_BACKGROUND 0
+#define MCSC_TEXT 1
+#define MCSC_TITLEBK 2
#define MCSC_TITLETEXT 3
-#define MCSC_MONTHBK 4
-#define MCSC_TRAILINGTEXT 5
+#define MCSC_MONTHBK 4
+#define MCSC_TRAILINGTEXT 5
#define MCS_DAYSTATE 0x0001
#define MCS_MULTISELECT 0x0002
@@ -3772,8 +3772,8 @@
#define MCHT_CALENDAR 0x00020000
#define MCHT_TODAYLINK 0x00030000
-#define MCHT_NEXT 0x01000000
-#define MCHT_PREV 0x02000000
+#define MCHT_NEXT 0x01000000
+#define MCHT_PREV 0x02000000
#define MCHT_NOWHERE 0x00000000
#define MCHT_TITLEBK (MCHT_TITLE)
#define MCHT_TITLEMONTH (MCHT_TITLE | 0x0001)
@@ -3790,8 +3790,8 @@
-#define GMR_VISIBLE 0
-#define GMR_DAYSTATE 1
+#define GMR_VISIBLE 0
+#define GMR_DAYSTATE 1
/* Month calendar's structures */
@@ -3800,13 +3800,13 @@
typedef struct {
UINT cbSize;
POINT pt;
- UINT uHit;
+ UINT uHit;
SYSTEMTIME st;
} MCHITTESTINFO, *PMCHITTESTINFO;
typedef struct tagNMSELCHANGE
{
- NMHDR nmhdr;
+ NMHDR nmhdr;
SYSTEMTIME stSelStart;
SYSTEMTIME stSelEnd;
} NMSELCHANGE, *LPNMSELCHANGE;
@@ -3816,7 +3816,7 @@
typedef struct tagNMDAYSTATE
{
- NMHDR nmhdr;
+ NMHDR nmhdr;
SYSTEMTIME stStart;
int cDayState;
LPMONTHDAYSTATE prgDayState;
@@ -3903,13 +3903,13 @@
/* Datetime Notifications */
-#define DTN_DATETIMECHANGE (DTN_FIRST + 1)
-#define DTN_USERSTRINGA (DTN_FIRST + 2)
-#define DTN_WMKEYDOWNA (DTN_FIRST + 3)
-#define DTN_FORMATA (DTN_FIRST + 4)
-#define DTN_FORMATQUERYA (DTN_FIRST + 5)
+#define DTN_DATETIMECHANGE (DTN_FIRST + 1)
+#define DTN_USERSTRINGA (DTN_FIRST + 2)
+#define DTN_WMKEYDOWNA (DTN_FIRST + 3)
+#define DTN_FORMATA (DTN_FIRST + 4)
+#define DTN_FORMATQUERYA (DTN_FIRST + 5)
#define DTN_DROPDOWN (DTN_FIRST + 6)
-#define DTN_CLOSEUP (DTN_FIRST + 7)
+#define DTN_CLOSEUP (DTN_FIRST + 7)
#define DTN_USERSTRINGW (DTN_FIRST + 15)
#define DTN_WMKEYDOWNW (DTN_FIRST + 16)
#define DTN_FORMATW (DTN_FIRST + 17)
@@ -3920,35 +3920,35 @@
#define DTN_FORMAT WINELIB_NAME_AW(DTN_FORMAT)
#define DTN_FORMATQUERY WINELIB_NAME_AW(DTN_FORMATQUERY)
-#define DTS_SHORTDATEFORMAT 0x0000
-#define DTS_UPDOWN 0x0001
-#define DTS_SHOWNONE 0x0002
-#define DTS_LONGDATEFORMAT 0x0004
-#define DTS_TIMEFORMAT 0x0009
-#define DTS_APPCANPARSE 0x0010
-#define DTS_RIGHTALIGN 0x0020
+#define DTS_SHORTDATEFORMAT 0x0000
+#define DTS_UPDOWN 0x0001
+#define DTS_SHOWNONE 0x0002
+#define DTS_LONGDATEFORMAT 0x0004
+#define DTS_TIMEFORMAT 0x0009
+#define DTS_APPCANPARSE 0x0010
+#define DTS_RIGHTALIGN 0x0020
typedef struct tagNMDATETIMECHANGE
{
NMHDR nmhdr;
- DWORD dwFlags;
- SYSTEMTIME st;
+ DWORD dwFlags;
+ SYSTEMTIME st;
} NMDATETIMECHANGE, *LPNMDATETIMECHANGE;
typedef struct tagNMDATETIMESTRINGA
{
NMHDR nmhdr;
- LPCSTR pszUserString;
- SYSTEMTIME st;
- DWORD dwFlags;
+ LPCSTR pszUserString;
+ SYSTEMTIME st;
+ DWORD dwFlags;
} NMDATETIMESTRINGA, *LPNMDATETIMESTRINGA;
typedef struct tagNMDATETIMESTRINGW
{
NMHDR nmhdr;
LPCWSTR pszUserString;
- SYSTEMTIME st;
- DWORD dwFlags;
+ SYSTEMTIME st;
+ DWORD dwFlags;
} NMDATETIMESTRINGW, *LPNMDATETIMESTRINGW;
DECL_WINELIB_TYPE_AW(NMDATETIMESTRING)
@@ -3957,17 +3957,17 @@
typedef struct tagNMDATETIMEWMKEYDOWNA
{
NMHDR nmhdr;
- int nVirtKey;
- LPCSTR pszFormat;
- SYSTEMTIME st;
+ int nVirtKey;
+ LPCSTR pszFormat;
+ SYSTEMTIME st;
} NMDATETIMEWMKEYDOWNA, *LPNMDATETIMEWMKEYDOWNA;
typedef struct tagNMDATETIMEWMKEYDOWNW
{
NMHDR nmhdr;
- int nVirtKey;
- LPCWSTR pszFormat;
- SYSTEMTIME st;
+ int nVirtKey;
+ LPCWSTR pszFormat;
+ SYSTEMTIME st;
} NMDATETIMEWMKEYDOWNW, *LPNMDATETIMEWMKEYDOWNW;
DECL_WINELIB_TYPE_AW(NMDATETIMEWMKEYDOWN)
@@ -3976,18 +3976,18 @@
typedef struct tagNMDATETIMEFORMATA
{
NMHDR nmhdr;
- LPCSTR pszFormat;
- SYSTEMTIME st;
- LPCSTR pszDisplay;
- CHAR szDisplay[64];
+ LPCSTR pszFormat;
+ SYSTEMTIME st;
+ LPCSTR pszDisplay;
+ CHAR szDisplay[64];
} NMDATETIMEFORMATA, *LPNMDATETIMEFORMATA;
typedef struct tagNMDATETIMEFORMATW
{
NMHDR nmhdr;
- LPCWSTR pszFormat;
- SYSTEMTIME st;
+ LPCWSTR pszFormat;
+ SYSTEMTIME st;
LPCWSTR pszDisplay;
WCHAR szDisplay[64];
} NMDATETIMEFORMATW, *LPNMDATETIMEFORMATW;
@@ -3998,15 +3998,15 @@
typedef struct tagNMDATETIMEFORMATQUERYA
{
NMHDR nmhdr;
- LPCSTR pszFormat;
- SIZE szMax;
+ LPCSTR pszFormat;
+ SIZE szMax;
} NMDATETIMEFORMATQUERYA, *LPNMDATETIMEFORMATQUERYA;
typedef struct tagNMDATETIMEFORMATQUERYW
{
NMHDR nmhdr;
- LPCWSTR pszFormat;
- SIZE szMax;
+ LPCWSTR pszFormat;
+ SIZE szMax;
} NMDATETIMEFORMATQUERYW, *LPNMDATETIMEFORMATQUERYW;
DECL_WINELIB_TYPE_AW(NMDATETIMEFORMATQUERY)
@@ -4023,11 +4023,11 @@
#define DateTime_GetSystemtime(hdp, pst) \
- (DWORD)SendMessageA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst))
+ (DWORD)SendMessageA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst))
#define DateTime_SetSystemtime(hdp, gd, pst) \
(BOOL)SendMessageA (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst))
#define DateTime_GetRange(hdp, rgst) \
- (DWORD)SendMessageA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst))
+ (DWORD)SendMessageA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst))
#define DateTime_SetRange(hdp, gd, rgst) \
(BOOL)SendMessageA (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst))
#define DateTime_SetFormat WINELIB_NAME_AW(DateTime_SetFormat)
@@ -4101,7 +4101,7 @@
typedef struct _DPA
{
INT nItemCount;
- LPVOID *ptrs;
+ LPVOID *ptrs;
HANDLE hHeap;
INT nGrow;
INT nMaxCount;
@@ -4125,7 +4125,7 @@
#define DPAS_SORTED 0x0001
#define DPAS_INSERTBEFORE 0x0002
#define DPAS_INSERTAFTER 0x0004
-
+
INT WINAPI DPA_Search (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
#define DPAM_NOSORT 0x0001
diff --git a/include/commdlg.h b/include/commdlg.h
index 0f563fa..7a45061 100644
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -45,7 +45,7 @@
#define OFN_SHAREAWARE 0x00004000
#define OFN_NOREADONLYRETURN 0x00008000
#define OFN_NOTESTFILECREATE 0x00010000
-#define OFN_NONETWORKBUTTON 0x00020000
+#define OFN_NONETWORKBUTTON 0x00020000
#define OFN_NOLONGNAMES 0x00040000
#define OFN_EXPLORER 0x00080000
#define OFN_NODEREFERENCELINKS 0x00100000
@@ -65,7 +65,7 @@
#define SAVE_DIALOG 1
#define OPEN_DIALOG 2
-
+
typedef UINT (CALLBACK *LPOFNHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
typedef struct {
@@ -133,7 +133,7 @@
DECL_WINELIB_TYPE_AW(OFNOTIFY)
DECL_WINELIB_TYPE_AW(LPOFNOTIFY)
-
+
typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef struct {
@@ -205,10 +205,10 @@
LPFRHOOKPROC lpfnHook;
LPCWSTR lpTemplateName;
} FINDREPLACEW, *LPFINDREPLACEW;
-
+
DECL_WINELIB_TYPE_AW(FINDREPLACE)
DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
-
+
#define FR_DOWN 0x00000001
#define FR_WHOLEWORD 0x00000002
#define FR_MATCHCASE 0x00000004
@@ -231,42 +231,42 @@
typedef struct
{
- UINT lStructSize;
- HWND hwndOwner;
- HDC hDC;
- LPLOGFONTA lpLogFont;
- INT iPointSize;
- DWORD Flags;
- COLORREF rgbColors;
- LPARAM lCustData;
- LPCFHOOKPROC lpfnHook;
- LPCSTR lpTemplateName;
- HINSTANCE hInstance;
- LPSTR lpszStyle;
- WORD nFontType;
- WORD ___MISSING_ALIGNMENT__;
- INT nSizeMin;
- INT nSizeMax;
+ UINT lStructSize;
+ HWND hwndOwner;
+ HDC hDC;
+ LPLOGFONTA lpLogFont;
+ INT iPointSize;
+ DWORD Flags;
+ COLORREF rgbColors;
+ LPARAM lCustData;
+ LPCFHOOKPROC lpfnHook;
+ LPCSTR lpTemplateName;
+ HINSTANCE hInstance;
+ LPSTR lpszStyle;
+ WORD nFontType;
+ WORD ___MISSING_ALIGNMENT__;
+ INT nSizeMin;
+ INT nSizeMax;
} CHOOSEFONTA, *LPCHOOSEFONTA;
typedef struct
{
- UINT lStructSize;
- HWND hwndOwner;
- HDC hDC;
- LPLOGFONTW lpLogFont;
- INT iPointSize;
- DWORD Flags;
- COLORREF rgbColors;
- LPARAM lCustData;
- LPCFHOOKPROC lpfnHook;
- LPCWSTR lpTemplateName;
- HINSTANCE hInstance;
- LPWSTR lpszStyle;
- WORD nFontType;
- WORD ___MISSING_ALIGNMENT__;
- INT nSizeMin;
- INT nSizeMax;
+ UINT lStructSize;
+ HWND hwndOwner;
+ HDC hDC;
+ LPLOGFONTW lpLogFont;
+ INT iPointSize;
+ DWORD Flags;
+ COLORREF rgbColors;
+ LPARAM lCustData;
+ LPCFHOOKPROC lpfnHook;
+ LPCWSTR lpTemplateName;
+ HINSTANCE hInstance;
+ LPWSTR lpszStyle;
+ WORD nFontType;
+ WORD ___MISSING_ALIGNMENT__;
+ INT nSizeMin;
+ INT nSizeMax;
} CHOOSEFONTW, *LPCHOOSEFONTW;
DECL_WINELIB_TYPE_AW(CHOOSEFONT)
@@ -627,7 +627,7 @@
BOOL WINAPI ChooseFontW(LPCHOOSEFONTW);
#define ChooseFont WINELIB_NAME_AW(ChooseFont)
-void COMDLG32_SetCommDlgExtendedError(DWORD err);
+void COMDLG32_SetCommDlgExtendedError(DWORD err);
#include "poppack.h"
diff --git a/include/cursoricon.h b/include/cursoricon.h
index 8b39444..f902d34 100644
--- a/include/cursoricon.h
+++ b/include/cursoricon.h
@@ -91,8 +91,8 @@
int width, int height, int colors,
BOOL fCursor, UINT loadflags);
-extern HGLOBAL CURSORICON_ExtCopy(HGLOBAL handle, UINT type,
- INT desiredx, INT desiredy,
+extern HGLOBAL CURSORICON_ExtCopy(HGLOBAL handle, UINT type,
+ INT desiredx, INT desiredy,
UINT flags);
extern void CURSORICON_FreeModuleIcons( HMODULE hModule );
diff --git a/include/d3d.h b/include/d3d.h
index c65b1d6..8d6d956 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -234,7 +234,7 @@
IDirect3D2_METHODS
ICOM_DEFINE(IDirect3D2,IUnknown)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define IDirect3D2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3D2_AddRef(p) ICOM_CALL (AddRef,p)
@@ -267,7 +267,7 @@
IDirect3D3_METHODS
ICOM_DEFINE(IDirect3D3,IUnknown)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define IDirect3D3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3D3_AddRef(p) ICOM_CALL (AddRef,p)
@@ -324,7 +324,7 @@
IDirect3DLight_METHODS
ICOM_DEFINE(IDirect3DLight,IUnknown)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define IDirect3DLight_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DLight_AddRef(p) ICOM_CALL (AddRef,p)
@@ -387,7 +387,7 @@
#define IDirect3DMaterial2_SetMaterial(p,a) ICOM_CALL1(SetMaterial,p,a)
#define IDirect3DMaterial2_GetMaterial(p,a) ICOM_CALL1(GetMaterial,p,a)
#define IDirect3DMaterial2_GetHandle(p,a,b) ICOM_CALL2(GetHandle,p,a,b)
-
+
/*****************************************************************************
* IDirect3DMaterial3 interface
@@ -411,7 +411,7 @@
#define IDirect3DMaterial3_SetMaterial(p,a) ICOM_CALL1(SetMaterial,p,a)
#define IDirect3DMaterial3_GetMaterial(p,a) ICOM_CALL1(GetMaterial,p,a)
#define IDirect3DMaterial3_GetHandle(p,a,b) ICOM_CALL2(GetHandle,p,a,b)
-
+
/*****************************************************************************
* IDirect3DTexture interface
@@ -983,7 +983,7 @@
#define IDirect3DVertexBuffer_ProcessVertices(p,a,b,c,d,e,f,g) ICOM_CALL7(ProcessVertices,p,a,b,c,d,e,f,g)
#define IDirect3DVertexBuffer_GetVertexBufferDesc(p,a) ICOM_CALL1(GetVertexBufferDesc,p,a)
#define IDirect3DVertexBuffer_Optimize(p,a,b) ICOM_CALL2(Optimize,p,a,b)
-
+
/*****************************************************************************
* IDirect3DVertexBuffer7 interface
*/
diff --git a/include/d3dtypes.h b/include/d3dtypes.h
index effd5fe..908ff24 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -696,7 +696,7 @@
D3DTBLEND_ADD = 8,
D3DTBLEND_FORCE_DWORD = 0x7fffffff
} D3DTEXTUREBLEND;
-
+
typedef enum _D3DTEXTUREADDRESS {
D3DTADDRESS_WRAP = 1,
D3DTADDRESS_MIRROR = 2,
diff --git a/include/dde.h b/include/dde.h
index 7062c90..d80888f 100644
--- a/include/dde.h
+++ b/include/dde.h
@@ -75,7 +75,7 @@
BOOL WINAPI DdeSetQualityOfService(HWND hwndClient,
CONST SECURITY_QUALITY_OF_SERVICE *pqosNew,
PSECURITY_QUALITY_OF_SERVICE pqosPrev);
-
+
BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer);
/* lParam packing/unpacking API */
diff --git a/include/ddeml.h b/include/ddeml.h
index b055f8f..5b7a576 100644
--- a/include/ddeml.h
+++ b/include/ddeml.h
@@ -34,7 +34,7 @@
#define CP_WINANSI 1004
#define CP_WINUNICODE 1200
-/* DDE synchronisation constants
+/* DDE synchronisation constants
*/
#define MSGF_DDEMGR 0x8001
@@ -348,7 +348,7 @@
BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
HDDEDATA WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,LPDWORD);
-BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction);
+BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction);
BOOL WINAPI DdeImpersonateClient(HCONV);
BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
HDDEDATA WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD);
diff --git a/include/ddraw.h b/include/ddraw.h
index 7ac35da..29e7943 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -965,7 +965,7 @@
DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/
DWORD dwZBufferBitDepth;/*18: depth of Z buffer requested*/
DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
- } DUMMYUNIONNAME2;
+ } DUMMYUNIONNAME2;
DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
DWORD dwReserved; /* 20:reserved*/
LPVOID lpSurface; /* 24:pointer to the associated surface memory*/
@@ -1006,7 +1006,7 @@
union {
DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/
- DWORD dwFVF; /* 48: vertex format description of vertex buffers */
+ DWORD dwFVF; /* 48: vertex format description of vertex buffers */
} DUMMYUNIONNAME4;
DDSCAPS2 ddsCaps; /* 68: DDraw surface caps */
DWORD dwTextureStage; /* 78: stage in multitexture cascade */
@@ -1320,7 +1320,7 @@
/*****************************************************************************
* IDirectDraw2 interface
*/
-/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of
+/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of
* arguments of SetDisplayMode has changed !
*/
#define ICOM_INTERFACE IDirectDraw2
@@ -1622,7 +1622,7 @@
/*****************************************************************************
* IDirectDrawSurface2 interface
*/
-/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters
+/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters
* have been converted to LPDIRECTDRAWSURFACE2.
*/
#define ICOM_INTERFACE IDirectDrawSurface2
@@ -1717,7 +1717,7 @@
/*****************************************************************************
* IDirectDrawSurface3 interface
*/
-/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters
+/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters
* have been converted to LPDIRECTDRAWSURFACE3.
*/
#define ICOM_INTERFACE IDirectDrawSurface3
diff --git a/include/dinput.h b/include/dinput.h
index d8ce8d1..9eb90e1 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -788,8 +788,8 @@
CHAR szFriendlyName[MAX_PATH];
} DIFILEEFFECT, *LPDIFILEEFFECT;
-typedef const DIFILEEFFECT *LPCDIFILEEFFECT;
-typedef BOOL (CALLBACK *LPDIENUMEFFECTSINFILECALLBACK)(LPCDIFILEEFFECT , LPVOID);
+typedef const DIFILEEFFECT *LPCDIFILEEFFECT;
+typedef BOOL (CALLBACK *LPDIENUMEFFECTSINFILECALLBACK)(LPCDIFILEEFFECT , LPVOID);
/*****************************************************************************
@@ -1092,7 +1092,7 @@
/*** IDirectInput7A methods ***/
#define IDirectInput7A_CreateDeviceEx(p,a,b,c,d) ICOM_CALL4(CreateDeviceEx,p,a,b,c,d)
-/* Export functions */
+/* Export functions */
#ifdef __cplusplus
extern "C" {
diff --git a/include/dispdib.h b/include/dispdib.h
index aaae52c..d4702e7 100644
--- a/include/dispdib.h
+++ b/include/dispdib.h
@@ -1,6 +1,6 @@
/*
* DISPDIB.dll
- *
+ *
* Copyright 1998 Ove KÅven
*
* This library is free software; you can redistribute it and/or
diff --git a/include/dlgs.h b/include/dlgs.h
index 74c5772..0debdc6 100644
--- a/include/dlgs.h
+++ b/include/dlgs.h
@@ -204,7 +204,7 @@
#define FORMATDLGORD31 1543
#define FORMATDLGORD30 1544
#define PAGESETUPDLGORD 1546
-#define NEWFILEOPENORD 1547
+#define NEWFILEOPENORD 1547
#define PRINTDLGEXORD 1549
#define PAGESETUPDLGORDMOTIF 1550
#define COLORMGMTDLGORD 1551
diff --git a/include/docobj.h b/include/docobj.h
index 7b0e54f..4cbdaef 100644
--- a/include/docobj.h
+++ b/include/docobj.h
@@ -60,8 +60,8 @@
WCHAR rgwz[1];
} OLECMDTEXT;
-typedef enum
-{
+typedef enum
+{
PRINTFLAG_MAYBOTHERUSER = 1,
PRINTFLAG_PROMPTUSER = 2,
PRINTFLAG_USERMAYCHANGEPRINTER = 4,
@@ -93,7 +93,7 @@
OLECMDTEXTF_STATUS = 2
} OLECMDTEXTF;
-typedef enum
+typedef enum
{
OLECMDEXECOPT_DODEFAULT = 0,
OLECMDEXECOPT_PROMPTUSER = 1,
@@ -144,39 +144,39 @@
OLECMDID_PREREFRESH = 39
/* iexplorer uses ... 44 */
} OLECMDID;
-
+
#define OLECMDERR_E_FIRST (OLE_E_LAST+1)
#define OLECMDERR_E_NOTSUPPORTED (OLECMDERR_E_FIRST)
#define OLECMDERR_E_DISABLED (OLECMDERR_E_FIRST+1)
#define OLECMDERR_E_NOHELP (OLECMDERR_E_FIRST+2)
#define OLECMDERR_E_CANCELED (OLECMDERR_E_FIRST+3)
#define OLECMDERR_E_UNKNOWNGROUP (OLECMDERR_E_FIRST+4)
-
+
/*****************************************************************************
* Predeclare the interfaces
*/
DEFINE_GUID(IID_IOleDocument, 0xb722bcc5,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IOleDocument IOleDocument, *LPOLEDOCUMENT;
-
+
DEFINE_GUID(IID_IOleDocumentSite, 0xb722bcc7,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IOleDocumentSite IOleDocumentSite, *LPOLEDOCUMENTSITE;
-
+
DEFINE_GUID(IID_IOleDocumentView, 0xb722bcc6,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IOleDocumentView IOleDocumentView, *LPOLEDOCUMENTVIEW;
-
+
DEFINE_GUID(IID_IEnumOleDocumentViews, 0xb722bcc6,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IEnumOleDocumentViews IEnumOleDocumentViews, *LPENUMOLEDOCUMENTVIEWS;
-
+
DEFINE_GUID(IID_IOleCommandTarget, 0xb722bccb,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IOleCommandTarget IOleCommandTarget, *LPOLECOMMANDTARGET;
-
+
DEFINE_GUID(IID_IContinueCallback, 0xb722bcca,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IContinueCallback IContinueCallback, *LPCONTINUECALLBACK;
-
+
DEFINE_GUID(IID_IPrint, 0xb722bcc9,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);
typedef struct IPrint IPrint, *LPPRINT;
-
-
+
+
/*****************************************************************************
* IOleDocument interface
*/
@@ -238,7 +238,7 @@
ICOM_METHOD1(HRESULT,CloseView, DWORD,dwReserved) \
ICOM_METHOD1(HRESULT,SaveViewState, LPSTREAM,pstm) \
ICOM_METHOD1(HRESULT,ApplyViewState,LPSTREAM,pstm) \
- ICOM_METHOD2(HRESULT,Clone, IOleInPlaceSite*,pIPSiteNew, IOleDocumentView**,ppViewNew)
+ ICOM_METHOD2(HRESULT,Clone, IOleInPlaceSite*,pIPSiteNew, IOleDocumentView**,ppViewNew)
#define IOleDocumentView_IMETHODS \
IUnknown_IMETHODS \
IOleDocumentView_METHODS
@@ -273,7 +273,7 @@
ICOM_METHOD3(HRESULT,Next, ULONG,cViews, IOleDocumentView**,rgpView, ULONG*,pcFetched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cViews) \
ICOM_METHOD (HRESULT,Reset) \
- ICOM_METHOD1(HRESULT,Clone, IEnumOleDocumentViews**,ppEnum)
+ ICOM_METHOD1(HRESULT,Clone, IEnumOleDocumentViews**,ppEnum)
#define IEnumOleDocumentViews_IMETHODS \
IUnknown_IMETHODS \
IEnumOleDocumentViews_METHODS
@@ -290,7 +290,7 @@
#define IEnumOleDocumentViews_Reset(p) ICOM_CALL (Reset,p)
#define IEnumOleDocumentViews_Clone(p,a) ICOM_CALL1(Clone,p,a)
-
+
/*****************************************************************************
* IOleCommandTarget interface
*/
@@ -342,13 +342,13 @@
#define IPrint_METHODS \
ICOM_METHOD1(HRESULT,SetInitialPageNum, LONG,nFirstPage) \
ICOM_METHOD2(HRESULT,GetPageInfo, LONG*,pnFirstPage, LONG*,pcPages) \
- ICOM_METHOD8(HRESULT,Print, DWORD,grfFlags, DVTARGETDEVICE**,pptd, PAGESET**,ppPageSet, STGMEDIUM*,pstgmOptions, IContinueCallback*,pcallback, LONG,nFirstPage, LONG*,pcPagesPrinted, LONG*,pnLastPage)
+ ICOM_METHOD8(HRESULT,Print, DWORD,grfFlags, DVTARGETDEVICE**,pptd, PAGESET**,ppPageSet, STGMEDIUM*,pstgmOptions, IContinueCallback*,pcallback, LONG,nFirstPage, LONG*,pcPagesPrinted, LONG*,pnLastPage)
#define IPrint_IMETHODS \
IUnknown_IMETHODS \
IPrint_METHODS
ICOM_DEFINE(IPrint,IUnknown)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define IPrint_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPrint_AddRef(p) ICOM_CALL (AddRef,p)
@@ -357,8 +357,8 @@
#define IPrint_SetInitialPageNum(p,a) ICOM_CALL1(SetInitialPageNum,p,a)
#define IPrint_GetPageInfo(p,a,b) ICOM_CALL2(GetPageInfo,p,a,b)
#define IPrint_Print(p,a,b,c,d,e,f,g) ICOM_CALL7(Print,p,a,b,c,d,e,f,g)
-
-
+
+
#define LPMSODOCUMENT LPOLEDOCUMENT
#define LPMSODOCUMENTSITE LPOLEDOCUMENTSITE
#define LPMSOVIEW LPOLEDOCUMENTVIEW
@@ -369,6 +369,6 @@
#define IID_IMsoView IID_IOleDocumentView
#define IID_IEnumMsoView IID_IEnumOleDocumentViews
#define IID_IMsoCommandTarget IID_IOleCommandTarget
-
+
#endif /* __WINE_DOCOBJ_H */
diff --git a/include/dplay.h b/include/dplay.h
index 4524084..882aefc 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -168,12 +168,12 @@
typedef struct tagDPCAPS
{
DWORD dwSize; /* Size of structure in bytes */
- DWORD dwFlags;
- DWORD dwMaxBufferSize;
+ DWORD dwFlags;
+ DWORD dwMaxBufferSize;
DWORD dwMaxQueueSize; /* Obsolete. */
DWORD dwMaxPlayers; /* Maximum players/groups (local + remote) */
DWORD dwHundredBaud; /* Bandwidth in 100 bits per second units;
- * i.e. 24 is 2400, 96 is 9600, etc.
+ * i.e. 24 is 2400, 96 is 9600, etc.
*/
DWORD dwLatency; /* Estimated latency; 0 = unknown */
DWORD dwMaxLocalPlayers; /* Maximum # of locally created players */
@@ -186,19 +186,19 @@
typedef struct tagDPNAME
{
- DWORD dwSize;
+ DWORD dwSize;
DWORD dwFlags; /* Not used must be 0 */
union /*playerShortName */ /* Player's Handle? */
- {
- LPWSTR lpszShortName;
- LPSTR lpszShortNameA;
+ {
+ LPWSTR lpszShortName;
+ LPSTR lpszShortNameA;
} DUMMYUNIONNAME1;
union /*playerLongName */ /* Player's formal/real name */
- {
- LPWSTR lpszLongName;
- LPSTR lpszLongNameA;
+ {
+ LPWSTR lpszLongName;
+ LPSTR lpszLongNameA;
} DUMMYUNIONNAME2;
} DPNAME, *LPDPNAME;
@@ -230,31 +230,31 @@
typedef struct tagDPSESSIONDESC2
{
- DWORD dwSize;
- DWORD dwFlags;
- GUID guidInstance;
+ DWORD dwSize;
+ DWORD dwFlags;
+ GUID guidInstance;
GUID guidApplication; /* GUID of the DP application, GUID_NULL if
* all applications! */
-
- DWORD dwMaxPlayers;
+
+ DWORD dwMaxPlayers;
DWORD dwCurrentPlayers; /* (read only value) */
union /* Session name */
- {
- LPWSTR lpszSessionName;
- LPSTR lpszSessionNameA;
+ {
+ LPWSTR lpszSessionName;
+ LPSTR lpszSessionNameA;
} DUMMYUNIONNAME1;
union /* Optional password */
- {
- LPWSTR lpszPassword;
- LPSTR lpszPasswordA;
+ {
+ LPWSTR lpszPassword;
+ LPSTR lpszPasswordA;
} DUMMYUNIONNAME2;
- DWORD dwReserved1;
+ DWORD dwReserved1;
DWORD dwReserved2;
- DWORD dwUser1; /* For use by the application */
+ DWORD dwUser1; /* For use by the application */
DWORD dwUser2;
DWORD dwUser3;
DWORD dwUser4;
@@ -279,11 +279,11 @@
typedef struct tagDPLCONNECTION
{
- DWORD dwSize;
- DWORD dwFlags;
- LPDPSESSIONDESC2 lpSessionDesc; /* Ptr to session desc to use for connect */
+ DWORD dwSize;
+ DWORD dwFlags;
+ LPDPSESSIONDESC2 lpSessionDesc; /* Ptr to session desc to use for connect */
LPDPNAME lpPlayerName; /* Ptr to player name structure */
- GUID guidSP; /* GUID of Service Provider to use */
+ GUID guidSP; /* GUID of Service Provider to use */
LPVOID lpAddress; /* Ptr to Address of Service Provider to use */
DWORD dwAddressSize; /* Size of address data */
} DPLCONNECTION, *LPDPLCONNECTION;
@@ -366,7 +366,7 @@
LPGUID lpguidSP,
LPSTR lpSPName, /* ptr to str w/ driver description */
DWORD dwMajorVersion, /* Major # of driver spec in lpguidSP */
- DWORD dwMinorVersion, /* Minor # of driver spec in lpguidSP */
+ DWORD dwMinorVersion, /* Minor # of driver spec in lpguidSP */
LPVOID lpContext); /* User given */
#ifndef __LPCGUID_DEFINED__
@@ -633,7 +633,7 @@
#define IDirectPlay3_GetPlayerFlags(p,a,b) ICOM_CALL2(GetPlayerFlags,p,a,b)
/*****************************************************************************
- * IDirectPlay4 and IDirectPlay4A interface
+ * IDirectPlay4 and IDirectPlay4A interface
*/
#define ICOM_INTERFACE IDirectPlay4
#define IDirectPlay4_METHODS \
@@ -646,7 +646,7 @@
#define IDirectPlay4_IMETHODS \
IDirectPlay3_IMETHODS \
- IDirectPlay4_METHODS
+ IDirectPlay4_METHODS
ICOM_DEFINE(IDirectPlay4,IDirectPlay3)
#undef ICOM_INTERFACE
@@ -732,7 +732,7 @@
#define DPENUMGROUPS_HIDDEN 0x00001000
-/* For DirectPlay::CreatePlayer */
+/* For DirectPlay::CreatePlayer */
#define DPPLAYER_SERVERPLAYER DPENUMPLAYERS_SERVERPLAYER
#define DPPLAYER_SPECTATOR DPENUMPLAYERS_SPECTATOR
#define DPPLAYER_LOCAL DPENUMPLAYERS_LOCAL
@@ -780,8 +780,8 @@
#define DPSEND_MAX_PRIORITY DPSEND_MAX_PRI
-/* For DirectPlay::SetGroupData, DirectPlay::SetGroupName,
- * DirectPlay::SetPlayerData, DirectPlay::SetPlayerName and
+/* For DirectPlay::SetGroupData, DirectPlay::SetGroupName,
+ * DirectPlay::SetPlayerData, DirectPlay::SetPlayerName and
* DirectPlay::SetSessionDesc.
*/
#define DPSET_REMOTE 0x00000000
@@ -846,7 +846,7 @@
/* An async send is done (finished normally, failed or cancelled) */
#define DPSYS_SENDCOMPLETE 0x010d
-/** DirectPlay System Messages **/
+/** DirectPlay System Messages **/
#define DPPLAYERTYPE_GROUP 0x00000000
#define DPPLAYERTYPE_PLAYER 0x00000001
@@ -856,7 +856,7 @@
typedef struct tagDPMSG_GENERIC
{
DWORD dwType; /* Use message type as described above */
-} DPMSG_GENERIC, *LPDPMSG_GENERIC,
+} DPMSG_GENERIC, *LPDPMSG_GENERIC,
DPMSG_HOST, *LPDPMSG_HOST,
DPMSG_SESSIONLOST, *LPDPMSG_SESSIONLOST;
@@ -871,9 +871,9 @@
DPNAME dpnName; /* Name info */
/* dpIdParent and dwFlags are only valid in DirectPlay3 and later. What
- * does that mean about the message size before? -PH */
+ * does that mean about the message size before? -PH */
DPID dpIdParent; /* id of parent group */
- DWORD dwFlags; /* Flags for the player/group */
+ DWORD dwFlags; /* Flags for the player/group */
} DPMSG_CREATEPLAYERORGROUP, *LPDPMSG_CREATEPLAYERORGROUP;
typedef struct tagDPMSG_DESTROYPLAYERORGROUP
@@ -899,8 +899,8 @@
DWORD dwType; /* Use message type as described above */
DPID dpIdGroup; /* Group ID to add player into */
DPID dpIdPlayer; /* ID of player to add */
-} DPMSG_ADDPLAYERTOGROUP, *LPDPMSG_ADDPLAYERTOGROUP,
- DPMSG_DELETEPLAYERFROMGROUP, *LPDPMSG_DELETEPLAYERFROMGROUP;
+} DPMSG_ADDPLAYERTOGROUP, *LPDPMSG_ADDPLAYERTOGROUP,
+ DPMSG_DELETEPLAYERFROMGROUP, *LPDPMSG_DELETEPLAYERFROMGROUP;
/* NOTE: DPMSG_ADDGROUPTOGROUP and DPMSG_DELETEGROUPFROMGROUP are the same */
typedef struct tagDPMSG_ADDGROUPTOGROUP
@@ -914,7 +914,7 @@
typedef struct tagDPMSG_SETPLAYERORGROUPDATA
{
DWORD dwType; /* Use message type as described above */
- DWORD dwPlayerType; /* Use DPPLAYERTYPE_GROUP or DPPLAYERTYPE_PLAYER */
+ DWORD dwPlayerType; /* Use DPPLAYERTYPE_GROUP or DPPLAYERTYPE_PLAYER */
DPID dpId; /* ID of player/group */
LPVOID lpData; /* Pointer to data */
DWORD dwDataSize; /* Size of data */
@@ -971,14 +971,14 @@
{
DWORD dwType; /* Use message type as described above */
DPID idFrom; /* ID from */
- DPID idTo; /* ID to */
- DWORD dwFlags;
+ DPID idTo; /* ID to */
+ DWORD dwFlags;
DWORD dwPriority;
DWORD dwTimeout;
LPVOID lpvContext;
DWORD dwMsgID;
HRESULT hr;
- DWORD dwSendTime; /* When sent ? */
+ DWORD dwSendTime; /* When sent ? */
} DPMSG_SENDCOMPLETE, *LPDPMSG_SENDCOMPLETE;
diff --git a/include/dplobby.h b/include/dplobby.h
index 289220b..470b2ad 100644
--- a/include/dplobby.h
+++ b/include/dplobby.h
@@ -54,7 +54,7 @@
* DirectPlayLobby Property GUIDs used in lobby messages
*/
-/* DPLPROPERTY_MessagesSupported {762CCDA1-D916-11d0-BA39-00C04FD7ED67}.
+/* DPLPROPERTY_MessagesSupported {762CCDA1-D916-11d0-BA39-00C04FD7ED67}.
* Purpose: Request if the lobby supports standard (?).
* Response: Answer is a BOOL. TRUE if supports the standard (?) and FALSE otherwise. Of course, it might not respond at all.
*/
@@ -62,7 +62,7 @@
/* DPLPROPERTY_LobbyGuid {F56920A0-D218-11d0-BA39-00C04FD7ED67}.
* Purpose: Request the GUID that identifies the lobby version that the application is communicating with.
- * Response: The GUID which identifies the lobby version
+ * Response: The GUID which identifies the lobby version
*/
DEFINE_GUID(DPLPROPERTY_LobbyGuid, 0xf56920a0, 0xd218, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
@@ -199,8 +199,8 @@
* EnumAddresses function is used to parse the address data chunks.
*/
-/* DPAID_TotalSize {1318F560-912C-11d0-9DAA-00A0C90A43CB}
- * Chunk purpose: Chunk is a DWORD containing the size of the entire DPADDRESS struct
+/* DPAID_TotalSize {1318F560-912C-11d0-9DAA-00A0C90A43CB}
+ * Chunk purpose: Chunk is a DWORD containing the size of the entire DPADDRESS struct
*/
DEFINE_GUID(DPAID_TotalSize, 0x1318f560, 0x912c, 0x11d0, 0x9d, 0xaa, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb);
@@ -216,7 +216,7 @@
/* DPAID_Phone {78EC89A0-E0AF-11cf-9C4E-00A0C905425E} -- ANSI
* DPAID_PhoneW {BA5A7A70-9DBF-11d0-9CC1-00A0C905425E} -- UNICODE
- * Chunk purpose: Chunk is a phone number in ANSI or UNICODE format
+ * Chunk purpose: Chunk is a phone number in ANSI or UNICODE format
*/
DEFINE_GUID(DPAID_Phone, 0x78ec89a0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
DEFINE_GUID(DPAID_PhoneW, 0xba5a7a70, 0x9dbf, 0x11d0, 0x9c, 0xc1, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
@@ -255,7 +255,7 @@
/* Used for specification of a communication port. Baud rate, stop bits and
- * parity bits can be found in winbase.h. These are flow control constants only.
+ * parity bits can be found in winbase.h. These are flow control constants only.
*/
#define DPCPA_NOFLOW 0 /* no flow control */
#define DPCPA_XONXOFFFLOW 1 /* software flow control */
@@ -274,18 +274,18 @@
-/****************************************************************************
+/****************************************************************************
* Miscellaneous
*/
typedef struct tagDPLAPPINFO
{
- DWORD dwSize;
- GUID guidApplication;
+ DWORD dwSize;
+ GUID guidApplication;
- union
+ union
{
- LPSTR lpszAppNameA;
+ LPSTR lpszAppNameA;
LPWSTR lpszAppName;
} DUMMYUNIONNAME;
diff --git a/include/dsdriver.h b/include/dsdriver.h
index 8426ea6..bee365f 100644
--- a/include/dsdriver.h
+++ b/include/dsdriver.h
@@ -201,7 +201,7 @@
/* Defined property sets */
DEFINE_GUID(DSPROPSETID_DirectSound3DListener, 0x6D047B40, 0x7AF9, 0x11D0, 0x92, 0x94, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
-typedef enum
+typedef enum
{
DSPROPERTY_DIRECTSOUND3DLISTENER_ALL,
DSPROPERTY_DIRECTSOUND3DLISTENER_POSITION,
@@ -215,7 +215,7 @@
} DSPROPERTY_DIRECTSOUND3DLISTENER;
DEFINE_GUID(DSPROPSETID_DirectSound3DBuffer, 0x6D047B41, 0x7AF9, 0x11D0, 0x92, 0x94, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
-typedef enum
+typedef enum
{
DSPROPERTY_DIRECTSOUND3DBUFFER_ALL,
DSPROPERTY_DIRECTSOUND3DBUFFER_POSITION,
@@ -229,7 +229,7 @@
} DSPROPERTY_DIRECTSOUND3DBUFFER;
DEFINE_GUID(DSPROPSETID_DirectSoundSpeakerConfig, 0x6D047B42, 0x7AF9, 0x11D0, 0x92, 0x94, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
-typedef enum
+typedef enum
{
DSPROPERTY_DIRECTSOUNDSPEAKERCONFIG_SPEAKERCONFIG
} DSPROPERTY_DIRECTSOUNDSPEAKERCONFIG;
diff --git a/include/dsound.h b/include/dsound.h
index 6e45b05..dd32f94 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -35,7 +35,7 @@
DEFINE_GUID(IID_IDirectSound, 0x279AFA83,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
typedef struct IDirectSound IDirectSound,*LPDIRECTSOUND;
-DEFINE_GUID(IID_IDirectSoundBuffer, 0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectSoundBuffer, 0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
typedef struct IDirectSoundBuffer IDirectSoundBuffer,*LPDIRECTSOUNDBUFFER,**LPLPDIRECTSOUNDBUFFER;
DEFINE_GUID(IID_IDirectSoundNotify, 0xB0210783,0x89cd,0x11d0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
@@ -44,7 +44,7 @@
DEFINE_GUID(IID_IDirectSound3DListener, 0x279AFA84,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
typedef struct IDirectSound3DListener IDirectSound3DListener,*LPDIRECTSOUND3DLISTENER;
-DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
typedef struct IDirectSound3DBuffer IDirectSound3DBuffer,*LPDIRECTSOUND3DBUFFER;
DEFINE_GUID(IID_IDirectSoundCapture, 0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
@@ -52,7 +52,7 @@
DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xB0210782,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
typedef struct IDirectSoundCaptureBuffer IDirectSoundCaptureBuffer,*LPDIRECTSOUNDCAPTUREBUFFER;
-
+
DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE);
DEFINE_GUID(IID_IKsPropertySet, 0x31EFAC30,0x515C,0x11D0,0xA9,0xAA,0x00,0xAA,0x00,0x61,0xBE,0x93);
@@ -233,7 +233,7 @@
#ifndef __LPCGUID_DEFINED__
#define __LPCGUID_DEFINED__
typedef const GUID *LPCGUID;
-#endif
+#endif
typedef LPVOID* LPLPVOID;
@@ -353,8 +353,8 @@
#undef ICOM_INTERFACE
#define IDirectSoundCapture_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IDirectSoundCapture_AddRef(p) ICOM_CALL (AddRef,p)
-#define IDirectSoundCapture_Release(p) ICOM_CALL (Release,p)
+#define IDirectSoundCapture_AddRef(p) ICOM_CALL (AddRef,p)
+#define IDirectSoundCapture_Release(p) ICOM_CALL (Release,p)
#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) ICOM_CALL3(CreateCaptureBuffer,p,a,b,c)
#define IDirectSoundCapture_GetCaps(p,a) ICOM_CALL (GetCaps,p,a)
#define IDirectSoundCapture_Initialize(p,a) ICOM_CALL (Initialize,p,a)
@@ -372,7 +372,7 @@
ICOM_METHOD7(HRESULT,Lock, DWORD,dwReadCusor, DWORD,dwReadBytes, LPVOID*,lplpvAudioPtr1, LPDWORD,lpdwAudioBytes1, LPVOID*,lplpvAudioPtr2, LPDWORD,lpdwAudioBytes2, DWORD,dwFlags) \
ICOM_METHOD1(HRESULT,Start, DWORD,dwFlags) \
ICOM_METHOD (HRESULT,Stop) \
- ICOM_METHOD4(HRESULT,Unlock, LPVOID,lpvAudioPtr1, DWORD,dwAudioBytes1, LPVOID,lpvAudioPtr2, DWORD,dwAudioBytes2)
+ ICOM_METHOD4(HRESULT,Unlock, LPVOID,lpvAudioPtr1, DWORD,dwAudioBytes1, LPVOID,lpvAudioPtr2, DWORD,dwAudioBytes2)
#define IDirectSoundCaptureBuffer_IMETHODS \
IUnknown_IMETHODS \
@@ -381,14 +381,14 @@
#undef ICOM_INTERFACE
#define IDirectSoundCaptureBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IDirectSoundCaptureBuffer_AddRef(p) ICOM_CALL (AddRef,p)
-#define IDirectSoundCaptureBuffer_Release(p) ICOM_CALL (Release,p)
+#define IDirectSoundCaptureBuffer_AddRef(p) ICOM_CALL (AddRef,p)
+#define IDirectSoundCaptureBuffer_Release(p) ICOM_CALL (Release,p)
#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) ICOM_CALL2(GetCurrentPosition,p,a,b)
-#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) ICOM_CALL3(GetFormat,p,a,b,c)
-#define IDirectSoundCaptureBuffer_GetStatus(p,a) ICOM_CALL1(GetStatus,p,a)
-#define IDirectSoundCaptureBuffer_Initialize(p,a,b) ICOM_CALL2(Initialize,p,a,b)
+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) ICOM_CALL3(GetFormat,p,a,b,c)
+#define IDirectSoundCaptureBuffer_GetStatus(p,a) ICOM_CALL1(GetStatus,p,a)
+#define IDirectSoundCaptureBuffer_Initialize(p,a,b) ICOM_CALL2(Initialize,p,a,b)
#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) ICOM_CALL7(Lock,p,a,b,c,d,e,f,g)
-#define IDirectSoundCaptureBuffer_Start(p,a) ICOM_CALL1(Start,p,a)
+#define IDirectSoundCaptureBuffer_Start(p,a) ICOM_CALL1(Start,p,a)
#define IDirectSoundCaptureBuffer_Stop(p) ICOM_CALL (Stop,p)
#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) ICOM_CALL4(Unlock,p,a,b,c,d)
@@ -459,7 +459,7 @@
} DS3DLISTENER, *LPDS3DLISTENER;
typedef const DS3DLISTENER *LPCDS3DLISTENER;
-
+
#define ICOM_INTERFACE IDirectSound3DListener
#define IDirectSound3DListener_METHODS \
ICOM_METHOD1(HRESULT,GetAllParameters, LPDS3DLISTENER,lpListener) \
diff --git a/include/file.h b/include/file.h
index 09e1f59..25549cc 100644
--- a/include/file.h
+++ b/include/file.h
@@ -117,8 +117,8 @@
extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa );
/* ntdll/cdrom.c.c */
-extern BOOL CDROM_DeviceIoControl(DWORD clientID, HANDLE hDevice, DWORD dwIoControlCode,
- LPVOID lpInBuffer, DWORD nInBufferSize,
+extern BOOL CDROM_DeviceIoControl(DWORD clientID, HANDLE hDevice, DWORD dwIoControlCode,
+ LPVOID lpInBuffer, DWORD nInBufferSize,
LPVOID lpOutBuffer, DWORD nOutBufferSize,
LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
diff --git a/include/gdi.h b/include/gdi.h
index 9fd0550..69af1af 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -273,7 +273,7 @@
#define DC_MEMORY 0x0001 /* It is a memory DC */
#define DC_SAVED 0x0002 /* It is a saved DC */
#define DC_DIRTY 0x0004 /* hVisRgn has to be updated */
-#define DC_THUNKHOOK 0x0008 /* DC hook is in the 16-bit code */
+#define DC_THUNKHOOK 0x0008 /* DC hook is in the 16-bit code */
#define GDI_HEAP_SIZE 0xffe0
@@ -303,7 +303,7 @@
static inline BOOL WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *point)
{
FLOAT x, y;
-
+
/* Check that the viewport-to-world transformation is valid */
if (!dc->vport2WorldValid)
return FALSE;
@@ -327,13 +327,13 @@
static inline BOOL WINE_UNUSED INTERNAL_DPTOLP(DC *dc, LPPOINT point)
{
FLOAT_POINT floatPoint;
-
+
/* Perform operation with floating point */
floatPoint.x=(FLOAT)point->x;
floatPoint.y=(FLOAT)point->y;
if (!INTERNAL_DPTOLP_FLOAT(dc, &floatPoint))
return FALSE;
-
+
/* Round to integers */
point->x = GDI_ROUND(floatPoint.x);
point->y = GDI_ROUND(floatPoint.y);
@@ -347,7 +347,7 @@
static inline void WINE_UNUSED INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point)
{
FLOAT x, y;
-
+
/* Perform the transformation */
x = point->x;
y = point->y;
@@ -365,12 +365,12 @@
static inline void WINE_UNUSED INTERNAL_LPTODP(DC *dc, LPPOINT point)
{
FLOAT_POINT floatPoint;
-
+
/* Perform operation with floating point */
floatPoint.x=(FLOAT)point->x;
floatPoint.y=(FLOAT)point->y;
INTERNAL_LPTODP_FLOAT(dc, &floatPoint);
-
+
/* Round to integers */
point->x = GDI_ROUND(floatPoint.x);
point->y = GDI_ROUND(floatPoint.y);
diff --git a/include/guiddef.h b/include/guiddef.h
index 310cf61..a9dbc40 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -79,11 +79,11 @@
{
return !(guidOne == guidOther);
}
-#endif
+#endif
extern const IID GUID_NULL;
#define IID_NULL GUID_NULL
#define CLSID_NULL GUID_NULL
#define FMTID_NULL GUID_NULL
-
+
#endif /* _GUIDDEF_H_ */
diff --git a/include/imagehlp.h b/include/imagehlp.h
index 0574171..d0cad79 100644
--- a/include/imagehlp.h
+++ b/include/imagehlp.h
@@ -32,7 +32,7 @@
* Types
*/
-typedef PVOID DIGEST_HANDLE;
+typedef PVOID DIGEST_HANDLE;
/***********************************************************************
* Enums/Defines
@@ -161,7 +161,7 @@
typedef struct _WIN_CERTIFICATE {
DWORD dwLength;
- WORD wRevision; /* WIN_CERT_REVISON_xxx */
+ WORD wRevision; /* WIN_CERT_REVISON_xxx */
WORD wCertificateType; /* WIN_CERT_TYPE_xxx */
BYTE bCertificate[ANYSIZE_ARRAY];
} WIN_CERTIFICATE, *PWIN_CERTIFICATE;
@@ -182,7 +182,7 @@
DWORD CheckSum;
DWORD ImageBase;
DWORD SizeOfImage;
-
+
DWORD NumberOfSections;
PIMAGE_SECTION_HEADER Sections;
@@ -305,12 +305,12 @@
);
typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(
- LPSTR SymbolName, ULONG SymbolAddress, ULONG SymbolSize,
+ LPSTR SymbolName, ULONG SymbolAddress, ULONG SymbolSize,
PVOID UserContext
);
typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(
- LPSTR ModuleName, ULONG ModuleBase, ULONG ModuleSize,
+ LPSTR ModuleName, ULONG ModuleBase, ULONG ModuleSize,
PVOID UserContext
);
@@ -351,7 +351,7 @@
PIMAGEHLP_STATUS_ROUTINE StatusRoutine
);
PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
- LPVOID BaseAddress, DWORD FileLength,
+ LPVOID BaseAddress, DWORD FileLength,
LPDWORD HeaderSum, LPDWORD CheckSum
);
BOOL WINAPI EnumerateLoadedModules(
@@ -366,7 +366,7 @@
LPSTR FileName, LPSTR SymbolPath, LPSTR ImageFilePath
);
BOOL WINAPI GetImageConfigInformation(
- PLOADED_IMAGE LoadedImage,
+ PLOADED_IMAGE LoadedImage,
PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation
);
DWORD WINAPI GetImageUnusedHeaderBytes(
@@ -418,7 +418,7 @@
PLOADED_IMAGE LoadedImage
);
PAPI_VERSION WINAPI ImagehlpApiVersion(
- void
+ void
);
PAPI_VERSION WINAPI ImagehlpApiVersionEx(
PAPI_VERSION AppVersion
@@ -460,7 +460,7 @@
PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation
);
BOOL WINAPI SplitSymbols(
- LPSTR ImageName, LPSTR SymbolsPath,
+ LPSTR ImageName, LPSTR SymbolsPath,
LPSTR SymbolFilePath, DWORD Flags
);
BOOL WINAPI StackWalk(
diff --git a/include/initguid.h b/include/initguid.h
index 53993eb..976dd78 100644
--- a/include/initguid.h
+++ b/include/initguid.h
@@ -1,5 +1,5 @@
/*
- * Defines a minimum set of macros create GUID's to keep the size
+ * Defines a minimum set of macros create GUID's to keep the size
* small
*
* This file should be included into "only GUID definition *.h" like
diff --git a/include/instance.h b/include/instance.h
index 93d4f08..5afe987 100644
--- a/include/instance.h
+++ b/include/instance.h
@@ -30,7 +30,7 @@
WORD null; /* Always 0 */
DWORD old_ss_sp WINE_PACKED; /* Stack pointer; used by SwitchTaskTo() */
WORD heap; /* Pointer to the local heap information (if any) */
- WORD atomtable; /* Pointer to the local atom table (if any) */
+ WORD atomtable; /* Pointer to the local atom table (if any) */
WORD stacktop; /* Top of the stack */
WORD stackmin; /* Lowest stack address used so far */
WORD stackbottom; /* Bottom of the stack */
diff --git a/include/miscemu.h b/include/miscemu.h
index fd10e63..14f9e72 100644
--- a/include/miscemu.h
+++ b/include/miscemu.h
@@ -146,7 +146,7 @@
#include "poppack.h"
-/* Index for bios structures stored at f000:e000 */
+/* Index for bios structures stored at f000:e000 */
enum {OFF_VIDEOSTATE,OFF_VIDEOFUNCTIONALITY,OFF_VESAINFO,OFF_VESASTRING,OFF_VESAMODELIST};
extern WORD DOSMEM_AddBiosSysStruct(int,int);
@@ -242,8 +242,8 @@
#define PTR_REAL_TO_LIN(seg,off) \
((void*)(((unsigned int)(seg) << 4) + LOWORD(off)))
-/* NOTE: Interrupts might get called from three modes: real mode, 16-bit, and
- * (via DeviceIoControl) 32-bit. For automatic conversion of pointer
+/* NOTE: Interrupts might get called from three modes: real mode, 16-bit, and
+ * (via DeviceIoControl) 32-bit. For automatic conversion of pointer
* parameters, interrupt handlers should use CTX_SEG_OFF_TO_LIN with
* the contents of a segment register as second and the contents of
* a *32-bit* general register as third parameter, e.g.
diff --git a/include/mmddk.h b/include/mmddk.h
index 2b98e63..f3f917a 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -23,7 +23,7 @@
*
*****************************************************************************
*/
-#ifndef __MMDDK_H
+#ifndef __MMDDK_H
#define __MMDDK_H
#include "mmsystem.h"
@@ -38,7 +38,7 @@
*/
#define MAX_MIDIOUTDRV (16)
-/* ==================================
+/* ==================================
* Multimedia DDK compatible part
* ================================== */
@@ -94,7 +94,7 @@
#define WODM_WRITE 9
#define WODM_PAUSE 10
#define WODM_RESTART 11
-#define WODM_RESET 12
+#define WODM_RESET 12
#define WODM_GETPOS 13
#define WODM_GETPITCH 14
#define WODM_SETPITCH 15
@@ -139,8 +139,8 @@
#define MODM_RESET 9
#define MODM_GETVOLUME 10
#define MODM_SETVOLUME 11
-#define MODM_CACHEPATCHES 12
-#define MODM_CACHEDRUMPATCHES 13
+#define MODM_CACHEPATCHES 12
+#define MODM_CACHEDRUMPATCHES 13
#define MIDM_INIT DRVM_INIT
#define MIDM_GETNUMDEVS 53
@@ -513,9 +513,9 @@
#define DCB_TYPEMASK 0x0007
#define DCB_NOSWITCH 0x0008 /* don't switch stacks for callback */
-BOOL16 WINAPI DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
+BOOL16 WINAPI DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
-BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev,
+BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev,
UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
#include "poppack.h"
diff --git a/include/mmreg.h b/include/mmreg.h
index b899169..7c5c7a5 100644
--- a/include/mmreg.h
+++ b/include/mmreg.h
@@ -59,7 +59,7 @@
DWORD dwDelay;
} ECHOWAVEFILTER, *PECHOWAVEFILTER, *NPECHOWAVEFILTER, *LPECHOWAVEFILTER;
#endif /* WAVEFILTER_ECHO */
-
+
#ifndef _WAVEFORMATEX_
#define _WAVEFORMATEX_
typedef struct _WAVEFORMATEX {
@@ -122,7 +122,7 @@
short iCoef1;
short iCoef2;
} ADPCMCOEFSET;
-typedef ADPCMCOEFSET *PADPCMCOEFSET,
+typedef ADPCMCOEFSET *PADPCMCOEFSET,
*NPADPCMCOEFSET, *LPADPCMCOEFSET;
typedef struct adpcmwaveformat_tag {
@@ -132,35 +132,35 @@
/* FIXME: this should be aCoef[0] */
ADPCMCOEFSET aCoef[1];
} ADPCMWAVEFORMAT;
-typedef ADPCMWAVEFORMAT *PADPCMWAVEFORMAT,
+typedef ADPCMWAVEFORMAT *PADPCMWAVEFORMAT,
*NPADPCMWAVEFORMAT, *LPADPCMWAVEFORMAT;
typedef struct dvi_adpcmwaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} DVIADPCMWAVEFORMAT;
-typedef DVIADPCMWAVEFORMAT *PDVIADPCMWAVEFORMAT,
+typedef DVIADPCMWAVEFORMAT *PDVIADPCMWAVEFORMAT,
*NPDVIADPCMWAVEFORMAT, *LPDVIADPCMWAVEFORMAT;
typedef struct ima_adpcmwaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} IMAADPCMWAVEFORMAT;
-typedef IMAADPCMWAVEFORMAT *PIMAADPCMWAVEFORMAT, *NPIMAADPCMWAVEFORMAT,
+typedef IMAADPCMWAVEFORMAT *PIMAADPCMWAVEFORMAT, *NPIMAADPCMWAVEFORMAT,
*LPIMAADPCMWAVEFORMAT;
typedef struct mediaspace_adpcmwaveformat_tag {
WAVEFORMATEX wfx;
WORD wRevision;
} MEDIASPACEADPCMWAVEFORMAT;
-typedef MEDIASPACEADPCMWAVEFORMAT *PMEDIASPACEADPCMWAVEFORMAT,
+typedef MEDIASPACEADPCMWAVEFORMAT *PMEDIASPACEADPCMWAVEFORMAT,
*NPMEDIASPACEADPCMWAVEFORMAT, *LPMEDIASPACEADPCMWAVEFORMAT;
typedef struct sierra_adpcmwaveformat_tag {
WAVEFORMATEX wfx;
WORD wRevision;
} SIERRAADPCMWAVEFORMAT;
-typedef SIERRAADPCMWAVEFORMAT *PSIERRAADPCMWAVEFORMAT,
+typedef SIERRAADPCMWAVEFORMAT *PSIERRAADPCMWAVEFORMAT,
*NPSIERRAADPCMWAVEFORMAT, *LPSIERRAADPCMWAVEFORMAT;
typedef struct g723_adpcmwaveformat_tag {
@@ -168,7 +168,7 @@
WORD cbExtraSize;
WORD nAuxBlockSize;
} G723_ADPCMWAVEFORMAT;
-typedef G723_ADPCMWAVEFORMAT *PG723_ADPCMWAVEFORMAT,
+typedef G723_ADPCMWAVEFORMAT *PG723_ADPCMWAVEFORMAT,
*NPG723_ADPCMWAVEFORMAT, *LPG723_ADPCMWAVEFORMAT;
typedef struct digistdwaveformat_tag {
@@ -199,7 +199,7 @@
WAVEFORMATEX wfx;
WORD wCompType;
} SONARCWAVEFORMAT;
-typedef SONARCWAVEFORMAT *PSONARCWAVEFORMAT,
+typedef SONARCWAVEFORMAT *PSONARCWAVEFORMAT,
*NPSONARCWAVEFORMAT,*LPSONARCWAVEFORMAT;
typedef struct truespeechwaveformat_tag {
@@ -208,31 +208,31 @@
WORD nSamplesPerBlock;
BYTE abReserved[28];
} TRUESPEECHWAVEFORMAT;
-typedef TRUESPEECHWAVEFORMAT *PTRUESPEECHWAVEFORMAT,
+typedef TRUESPEECHWAVEFORMAT *PTRUESPEECHWAVEFORMAT,
*NPTRUESPEECHWAVEFORMAT, *LPTRUESPEECHWAVEFORMAT;
typedef struct echosc1waveformat_tag {
WAVEFORMATEX wfx;
} ECHOSC1WAVEFORMAT;
-typedef ECHOSC1WAVEFORMAT *PECHOSC1WAVEFORMAT,
+typedef ECHOSC1WAVEFORMAT *PECHOSC1WAVEFORMAT,
*NPECHOSC1WAVEFORMAT, *LPECHOSC1WAVEFORMAT;
typedef struct audiofile_af36waveformat_tag {
WAVEFORMATEX wfx;
} AUDIOFILE_AF36WAVEFORMAT;
-typedef AUDIOFILE_AF36WAVEFORMAT *PAUDIOFILE_AF36WAVEFORMAT,
+typedef AUDIOFILE_AF36WAVEFORMAT *PAUDIOFILE_AF36WAVEFORMAT,
*NPAUDIOFILE_AF36WAVEFORMAT, *LPAUDIOFILE_AF36WAVEFORMAT;
typedef struct aptxwaveformat_tag {
WAVEFORMATEX wfx;
} APTXWAVEFORMAT;
-typedef APTXWAVEFORMAT *PAPTXWAVEFORMAT,
+typedef APTXWAVEFORMAT *PAPTXWAVEFORMAT,
*NPAPTXWAVEFORMAT, *LPAPTXWAVEFORMAT;
typedef struct audiofile_af10waveformat_tag {
WAVEFORMATEX wfx;
} AUDIOFILE_AF10WAVEFORMAT;
-typedef AUDIOFILE_AF10WAVEFORMAT *PAUDIOFILE_AF10WAVEFORMAT,
+typedef AUDIOFILE_AF10WAVEFORMAT *PAUDIOFILE_AF10WAVEFORMAT,
*NPAUDIOFILE_AF10WAVEFORMAT, *LPAUDIOFILE_AF10WAVEFORMAT;
typedef struct dolbyac2waveformat_tag {
@@ -244,49 +244,49 @@
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} GSM610WAVEFORMAT;
-typedef GSM610WAVEFORMAT *PGSM610WAVEFORMAT,
+typedef GSM610WAVEFORMAT *PGSM610WAVEFORMAT,
*NPGSM610WAVEFORMAT, *LPGSM610WAVEFORMAT;
typedef struct adpcmewaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} ADPCMEWAVEFORMAT;
-typedef ADPCMEWAVEFORMAT *PADPCMEWAVEFORMAT,
+typedef ADPCMEWAVEFORMAT *PADPCMEWAVEFORMAT,
*NPADPCMEWAVEFORMAT, *LPADPCMEWAVEFORMAT;
typedef struct contres_vqlpcwaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} CONTRESVQLPCWAVEFORMAT;
-typedef CONTRESVQLPCWAVEFORMAT *PCONTRESVQLPCWAVEFORMAT,
+typedef CONTRESVQLPCWAVEFORMAT *PCONTRESVQLPCWAVEFORMAT,
*NPCONTRESVQLPCWAVEFORMAT, *LPCONTRESVQLPCWAVEFORMAT;
typedef struct digirealwaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} DIGIREALWAVEFORMAT;
-typedef DIGIREALWAVEFORMAT *PDIGIREALWAVEFORMAT,
+typedef DIGIREALWAVEFORMAT *PDIGIREALWAVEFORMAT,
*NPDIGIREALWAVEFORMAT, *LPDIGIREALWAVEFORMAT;
typedef struct digiadpcmmwaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} DIGIADPCMWAVEFORMAT;
-typedef DIGIADPCMWAVEFORMAT *PDIGIADPCMWAVEFORMAT,
+typedef DIGIADPCMWAVEFORMAT *PDIGIADPCMWAVEFORMAT,
*NPDIGIADPCMWAVEFORMAT, *LPDIGIADPCMWAVEFORMAT;
typedef struct contres_cr10waveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} CONTRESCR10WAVEFORMAT;
-typedef CONTRESCR10WAVEFORMAT *PCONTRESCR10WAVEFORMAT,
+typedef CONTRESCR10WAVEFORMAT *PCONTRESCR10WAVEFORMAT,
*NPCONTRESCR10WAVEFORMAT, *LPCONTRESCR10WAVEFORMAT;
typedef struct nms_vbxadpcmmwaveformat_tag {
WAVEFORMATEX wfx;
WORD wSamplesPerBlock;
} NMS_VBXADPCMWAVEFORMAT;
-typedef NMS_VBXADPCMWAVEFORMAT *PNMS_VBXADPCMWAVEFORMAT,
+typedef NMS_VBXADPCMWAVEFORMAT *PNMS_VBXADPCMWAVEFORMAT,
*NPNMS_VBXADPCMWAVEFORMAT, *LPNMS_VBXADPCMWAVEFORMAT;
typedef struct g721_adpcmwaveformat_tag {
@@ -300,21 +300,21 @@
WAVEFORMATEX wfx;
WORD wRevision;
} CREATIVEADPCMWAVEFORMAT;
-typedef CREATIVEADPCMWAVEFORMAT *PCREATIVEADPCMWAVEFORMAT,
+typedef CREATIVEADPCMWAVEFORMAT *PCREATIVEADPCMWAVEFORMAT,
*NPCREATIVEADPCMWAVEFORMAT, *LPCREATIVEADPCMWAVEFORMAT;
typedef struct creative_fastspeech8format_tag {
WAVEFORMATEX wfx;
WORD wRevision;
} CREATIVEFASTSPEECH8WAVEFORMAT;
-typedef CREATIVEFASTSPEECH8WAVEFORMAT *PCREATIVEFASTSPEECH8WAVEFORMAT,
+typedef CREATIVEFASTSPEECH8WAVEFORMAT *PCREATIVEFASTSPEECH8WAVEFORMAT,
*NPCREATIVEFASTSPEECH8WAVEFORMAT, *LPCREATIVEFASTSPEECH8WAVEFORMAT;
typedef struct creative_fastspeech10format_tag {
WAVEFORMATEX wfx;
WORD wRevision;
} CREATIVEFASTSPEECH10WAVEFORMAT;
-typedef CREATIVEFASTSPEECH10WAVEFORMAT *PCREATIVEFASTSPEECH10WAVEFORMAT,
+typedef CREATIVEFASTSPEECH10WAVEFORMAT *PCREATIVEFASTSPEECH10WAVEFORMAT,
*NPCREATIVEFASTSPEECH10WAVEFORMAT, *LPCREATIVEFASTSPEECH10WAVEFORMAT;
typedef struct fmtowns_snd_waveformat_tag {
@@ -327,37 +327,37 @@
typedef struct oligsmwaveformat_tag {
WAVEFORMATEX wfx;
} OLIGSMWAVEFORMAT;
-typedef OLIGSMWAVEFORMAT *POLIGSMWAVEFORMAT,
+typedef OLIGSMWAVEFORMAT *POLIGSMWAVEFORMAT,
*NPOLIGSMWAVEFORMAT, *LPOLIGSMWAVEFORMAT;
typedef struct oliadpcmwaveformat_tag {
WAVEFORMATEX wfx;
} OLIADPCMWAVEFORMAT;
-typedef OLIADPCMWAVEFORMAT *POLIADPCMWAVEFORMAT,
+typedef OLIADPCMWAVEFORMAT *POLIADPCMWAVEFORMAT,
*NPOLIADPCMWAVEFORMAT, *LPOLIADPCMWAVEFORMAT;
typedef struct olicelpwaveformat_tag {
WAVEFORMATEX wfx;
} OLICELPWAVEFORMAT;
-typedef OLICELPWAVEFORMAT *POLICELPWAVEFORMAT,
+typedef OLICELPWAVEFORMAT *POLICELPWAVEFORMAT,
*NPOLICELPWAVEFORMAT, *LPOLICELPWAVEFORMAT;
typedef struct olisbcwaveformat_tag {
WAVEFORMATEX wfx;
} OLISBCWAVEFORMAT;
-typedef OLISBCWAVEFORMAT *POLISBCWAVEFORMAT,
+typedef OLISBCWAVEFORMAT *POLISBCWAVEFORMAT,
*NPOLISBCWAVEFORMAT, *LPOLISBCWAVEFORMAT;
typedef struct olioprwaveformat_tag {
WAVEFORMATEX wfx;
} OLIOPRWAVEFORMAT;
-typedef OLIOPRWAVEFORMAT *POLIOPRWAVEFORMAT,
+typedef OLIOPRWAVEFORMAT *POLIOPRWAVEFORMAT,
*NPOLIOPRWAVEFORMAT, *LPOLIOPRWAVEFORMAT;
typedef struct csimaadpcmwaveformat_tag {
WAVEFORMATEX wfx;
} CSIMAADPCMWAVEFORMAT;
-typedef CSIMAADPCMWAVEFORMAT *PCSIMAADPCMWAVEFORMAT,
+typedef CSIMAADPCMWAVEFORMAT *PCSIMAADPCMWAVEFORMAT,
*NPCSIMAADPCMWAVEFORMAT, *LPCSIMAADPCMWAVEFORMAT;
typedef struct
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 6480927..e84a142 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -25,7 +25,7 @@
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
typedef LPSTR HPSTR; /* a huge version of LPSTR */
typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */
@@ -43,7 +43,7 @@
DECLARE_OLD_HANDLE(HMMIO);
#include "pshpack1.h"
-
+
typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
#define MAXWAVEDRIVERS 10
@@ -51,11 +51,11 @@
#define MAXAUXDRIVERS 10
#define MAXMCIDRIVERS 32
#define MAXMIXERDRIVERS 10
-
+
#define MAXPNAMELEN 32 /* max product name length (including NULL) */
#define MAXERRORLENGTH 128 /* max error text length (including NULL) */
#define MAX_JOYSTICKOEMVXDNAME 260
-
+
typedef WORD VERSION; /* major (high byte), minor (low byte) */
#ifndef _MCIERROR_
@@ -250,7 +250,7 @@
UINT WINAPI mmsystemGetVersion(void);
BOOL WINAPI sndPlaySoundA(LPCSTR lpszSound, UINT fuSound);
BOOL WINAPI sndPlaySoundW(LPCWSTR lpszSound, UINT fuSound);
-#define sndPlaySound WINELIB_NAME_AW(sndPlaySound)
+#define sndPlaySound WINELIB_NAME_AW(sndPlaySound)
BOOL WINAPI PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound);
BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
#define PlaySound WINELIB_NAME_AW(PlaySound)
@@ -493,8 +493,8 @@
/* Only on Win95 and up */
#define MIDI_IO_STATUS 0x00000020L
-/* flags for wFlags parm of
- midiOutCachePatches(),
+/* flags for wFlags parm of
+ midiOutCachePatches(),
midiOutCacheDrumPatches() */
#define MIDI_CACHE_ALL 1
#define MIDI_CACHE_BESTFIT 2
@@ -569,7 +569,7 @@
DWORD dwFlags; /* assorted flags (see defines) */
struct midihdr_tag *lpNext; /* reserved for driver */
DWORD reserved; /* reserved for driver */
- DWORD dwOffset; /* offset of playback in case of
+ DWORD dwOffset; /* offset of playback in case of
* MIDISTRM buffer */
DWORD_PTR dwReserved[8]; /* reserved for driver */
} MIDIHDR, *LPMIDIHDR;
@@ -594,14 +594,14 @@
#define MIDIPROP_TEMPO 0x00000002
#define MIDIPROP_TIMEDIV 0x00000001
-typedef struct {
- DWORD dwDeltaTime; /* Time, in MIDI ticks, between the previous
+typedef struct {
+ DWORD dwDeltaTime; /* Time, in MIDI ticks, between the previous
* event and the current event. */
- DWORD dwStreamID; /* Reserved; must be zero. */
+ DWORD dwStreamID; /* Reserved; must be zero. */
DWORD dwEvent; /* event => see MEVT_XXX macros */
DWORD dwParms[1]; /* extra pmts to dwEvent if F_LONG is set */
} MIDIEVENT, *LPMIDIEVENT;
-
+
#define MEVT_EVENTTYPE(x) ((BYTE) (((x)>>24)&0xFF))
#define MEVT_EVENTPARM(x) ((DWORD) ((x)&0x00FFFFFFL))
@@ -655,7 +655,7 @@
DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD);
MMRESULT WINAPI midiStreamClose(HMIDISTRM hms);
MMRESULT WINAPI midiStreamOpen(HMIDISTRM* phms, LPUINT uDeviceID, DWORD cMidi,
- DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen);
+ DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen);
MMRESULT WINAPI midiStreamOut(HMIDISTRM hms, LPMIDIHDR lpMidiHdr, UINT cbMidiHdr);
MMRESULT WINAPI midiStreamPause(HMIDISTRM hms);
MMRESULT WINAPI midiStreamPosition(HMIDISTRM hms, LPMMTIME lpmmt, UINT cbmmt);
@@ -2207,6 +2207,6 @@
#ifdef __cplusplus
}
-#endif
+#endif
#endif /* __WINE_MMSYSTEM_H */
diff --git a/include/module.h b/include/module.h
index 1e0146a..44e2df9 100644
--- a/include/module.h
+++ b/include/module.h
@@ -106,7 +106,7 @@
FARPROC16 BootApp; /* startup procedure */
FARPROC16 LoadAppSeg; /* procedure to load a segment */
FARPROC16 reserved2;
- FARPROC16 MyAlloc; /* memory allocation procedure,
+ FARPROC16 MyAlloc; /* memory allocation procedure,
* wine must write this field */
FARPROC16 EntryAddrProc;
FARPROC16 ExitProc; /* exit procedure */
@@ -114,7 +114,7 @@
FARPROC16 SetOwner; /* Set Owner procedure, exported by wine */
} SELFLOADHEADER;
-typedef struct
+typedef struct
{
LPSTR lpEnvAddress;
LPSTR lpCmdLine;
diff --git a/include/msacm.h b/include/msacm.h
index d0ea9e7..2eeeec8 100644
--- a/include/msacm.h
+++ b/include/msacm.h
@@ -318,7 +318,7 @@
DWORD fdwEnum;
PWAVEFILTER pwfltrEnum;
-
+
HINSTANCE hInstance;
LPCSTR pszTemplateName;
LPARAM lCustData;
@@ -344,7 +344,7 @@
DWORD fdwEnum;
PWAVEFILTER pwfltrEnum;
-
+
HINSTANCE hInstance;
LPCWSTR pszTemplateName;
LPARAM lCustData;
@@ -411,22 +411,22 @@
{
DWORD cbStruct;
DWORD fdwStyle;
-
+
HWND hwndOwner;
PWAVEFORMATEX pwfx;
DWORD cbwfx;
LPCSTR pszTitle;
-
+
CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
- CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
+ CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
LPSTR pszName;
DWORD cchName;
DWORD fdwEnum;
PWAVEFORMATEX pwfxEnum;
-
+
HINSTANCE hInstance;
LPCSTR pszTemplateName;
LPARAM lCustData;
@@ -437,22 +437,22 @@
{
DWORD cbStruct;
DWORD fdwStyle;
-
+
HWND hwndOwner;
PWAVEFORMATEX pwfx;
DWORD cbwfx;
LPCWSTR pszTitle;
-
+
WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
- WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
+ WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
LPWSTR pszName;
DWORD cchName;
DWORD fdwEnum;
LPWAVEFORMATEX pwfxEnum;
-
+
HINSTANCE hInstance;
LPCWSTR pszTemplateName;
LPARAM lCustData;
@@ -643,11 +643,11 @@
#define acmFilterDetails WINELIB_NAME_AW(acmFilterDetails)
MMRESULT WINAPI acmFilterEnumA(
- HACMDRIVER had, PACMFILTERDETAILSA pafd,
+ HACMDRIVER had, PACMFILTERDETAILSA pafd,
ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
);
MMRESULT WINAPI acmFilterEnumW(
- HACMDRIVER had, PACMFILTERDETAILSW pafd,
+ HACMDRIVER had, PACMFILTERDETAILSW pafd,
ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
);
#define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum)
@@ -744,7 +744,7 @@
HACMSTREAM has, DWORD fdwReset
);
MMRESULT WINAPI acmStreamSize(
- HACMSTREAM has, DWORD cbInput,
+ HACMSTREAM has, DWORD cbInput,
LPDWORD pdwOutputBytes, DWORD fdwSize
);
MMRESULT WINAPI acmStreamUnprepareHeader(
diff --git a/include/msdos.h b/include/msdos.h
index fca4c06..8b50f67 100644
--- a/include/msdos.h
+++ b/include/msdos.h
@@ -126,7 +126,7 @@
#define setword(a,b) do { *(BYTE*)(a) = (b) & 0xff; \
*((BYTE*)((a)+1)) = ((b)>>8) & 0xff;\
} while(0)
-
+
/* dos file attributes */
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index 5572e4d..9757714 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -26,14 +26,14 @@
#define _IORW 0x0080
#define _IOAPPEND 0x0200
#else
-#define MSVCRT__IOREAD 0x0001
-#define MSVCRT__IOWRT 0x0002
-#define MSVCRT__IOMYBUF 0x0008
-#define MSVCRT__IOEOF 0x0010
-#define MSVCRT__IOERR 0x0020
-#define MSVCRT__IOSTRG 0x0040
-#define MSVCRT__IORW 0x0080
-#define MSVCRT__IOAPPEND 0x0200
+#define MSVCRT__IOREAD 0x0001
+#define MSVCRT__IOWRT 0x0002
+#define MSVCRT__IOMYBUF 0x0008
+#define MSVCRT__IOEOF 0x0010
+#define MSVCRT__IOERR 0x0020
+#define MSVCRT__IOSTRG 0x0040
+#define MSVCRT__IORW 0x0080
+#define MSVCRT__IOAPPEND 0x0200
#endif /* USE_MSVCRT_PREFIX */
diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h
index ff0cc4e..fce0b11 100644
--- a/include/msvcrt/wctype.h
+++ b/include/msvcrt/wctype.h
@@ -22,7 +22,7 @@
#define __WINE_USE_MSVCRT
-/* FIXME: winnt.h includes 'ctype.h' which includes 'wctype.h'. So we get
+/* FIXME: winnt.h includes 'ctype.h' which includes 'wctype.h'. So we get
* there but WCHAR is not defined.
*/
/* Some systems might have wchar_t, but we really need 16 bit characters */
diff --git a/include/netspi.h b/include/netspi.h
index a1e9e18..acecf46 100644
--- a/include/netspi.h
+++ b/include/netspi.h
@@ -32,7 +32,7 @@
#define HPROVIDER LPVOID
typedef HPROVIDER *PHPROVIDER;
-typedef struct
+typedef struct
{
DWORD cbStructure;
HWND hwndOwner;
@@ -94,7 +94,7 @@
#define NOTIFY_PRE 0x00
#define NOTIFY_POST 0x01
-typedef struct
+typedef struct
{
DWORD cbStructure;
DWORD dwNotifyStatus;
@@ -103,7 +103,7 @@
} NOTIFYINFO, *LPNOTIFYINFO;
-typedef struct
+typedef struct
{
DWORD cbStructure;
HWND hwndOwner;
@@ -121,7 +121,7 @@
#define CONNECT_CTXT_PROVIDER 0x00000004
#define CONNECT_CTXT_SINGLE 0x00000008
-typedef struct
+typedef struct
{
DWORD cbStructure;
LPSTR lpName;
@@ -131,7 +131,7 @@
} NOTIFYCANCELA, *LPNOTIFYCANCELA;
-typedef struct
+typedef struct
{
DWORD cbStructure;
LPSTR lpRemoteName;
diff --git a/include/nspapi.h b/include/nspapi.h
index 64c1b8f..92e81a1 100644
--- a/include/nspapi.h
+++ b/include/nspapi.h
@@ -47,7 +47,7 @@
/*
* structures
*/
-typedef struct _PROTOCOL_INFOA
+typedef struct _PROTOCOL_INFOA
{
DWORD dwServiceFlags;
INT iAddressFamily;
@@ -59,7 +59,7 @@
LPSTR lpProtocol;
} PROTOCOL_INFOA;
-typedef struct _PROTOCOL_INFOW
+typedef struct _PROTOCOL_INFOW
{
DWORD dwServiceFlags;
INT iAddressFamily;
diff --git a/include/ntddk.h b/include/ntddk.h
index 42a354c..00500b5 100644
--- a/include/ntddk.h
+++ b/include/ntddk.h
@@ -31,24 +31,24 @@
extern "C" {
#endif
-/******************
- * asynchronous I/O
+/******************
+ * asynchronous I/O
*/
#undef Status /* conflict with X11-includes*/
-typedef struct _IO_STATUS_BLOCK
+typedef struct _IO_STATUS_BLOCK
{
union {
NTSTATUS Status;
PVOID Pointer;
} DUMMYUNIONNAME;
ULONG_PTR Information;
-} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
typedef VOID (NTAPI *PIO_APC_ROUTINE) ( PVOID ApcContext, PIO_STATUS_BLOCK IoStatusBlock, ULONG Reserved );
/*
- registry
+ registry
*/
/* key information */
@@ -59,7 +59,7 @@
WCHAR Name[1];
} KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION;
-typedef struct _KEY_NODE_INFORMATION
+typedef struct _KEY_NODE_INFORMATION
{
LARGE_INTEGER LastWriteTime;
ULONG TitleIndex;
@@ -70,7 +70,7 @@
/* Class[1]; */
} KEY_NODE_INFORMATION, *PKEY_NODE_INFORMATION;
-typedef struct _KEY_FULL_INFORMATION
+typedef struct _KEY_FULL_INFORMATION
{
LARGE_INTEGER LastWriteTime;
ULONG TitleIndex;
@@ -85,14 +85,14 @@
WCHAR Class[1];
} KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION;
-typedef enum _KEY_INFORMATION_CLASS
+typedef enum _KEY_INFORMATION_CLASS
{
KeyBasicInformation,
KeyNodeInformation,
KeyFullInformation
} KEY_INFORMATION_CLASS;
-typedef struct _KEY_VALUE_ENTRY
+typedef struct _KEY_VALUE_ENTRY
{
PUNICODE_STRING ValueName;
ULONG DataLength;
@@ -101,7 +101,7 @@
} KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY;
/* value information */
-typedef struct _KEY_VALUE_BASIC_INFORMATION
+typedef struct _KEY_VALUE_BASIC_INFORMATION
{
ULONG TitleIndex;
ULONG Type;
@@ -109,7 +109,7 @@
WCHAR Name[1];
} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION;
-typedef struct _KEY_VALUE_FULL_INFORMATION
+typedef struct _KEY_VALUE_FULL_INFORMATION
{
ULONG TitleIndex;
ULONG Type;
@@ -120,7 +120,7 @@
/* UCHAR Data[1];*/
} KEY_VALUE_FULL_INFORMATION, *PKEY_VALUE_FULL_INFORMATION;
-typedef struct _KEY_VALUE_PARTIAL_INFORMATION
+typedef struct _KEY_VALUE_PARTIAL_INFORMATION
{
ULONG TitleIndex;
ULONG Type;
@@ -128,7 +128,7 @@
UCHAR Data[1];
} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION;
-typedef enum _KEY_VALUE_INFORMATION_CLASS
+typedef enum _KEY_VALUE_INFORMATION_CLASS
{
KeyValueBasicInformation,
KeyValueFullInformation,
@@ -142,7 +142,7 @@
/* thread information */
-typedef enum _THREADINFOCLASS
+typedef enum _THREADINFOCLASS
{ ThreadBasicInformation,
ThreadTimes,
ThreadPriority,
@@ -232,13 +232,13 @@
FileFsMaximumInformation
} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
-typedef enum _SECTION_INHERIT
+typedef enum _SECTION_INHERIT
{
ViewShare = 1,
ViewUnmap = 2
} SECTION_INHERIT;
-
+
/* object information */
typedef enum _OBJECT_INFORMATION_CLASS
@@ -440,11 +440,11 @@
} SYSTEM_TIME_ADJUSTMENT, *PSYSTEM_TIME_ADJUSTMENT;
-typedef struct _SYSTEM_CONFIGURATION_INFO
+typedef struct _SYSTEM_CONFIGURATION_INFO
{
- union
+ union
{ ULONG OemId;
- struct
+ struct
{ WORD ProcessorArchitecture;
WORD Reserved;
} tag1;
@@ -468,7 +468,7 @@
/* parameter ProcessInformationClass */
-typedef enum _PROCESSINFOCLASS
+typedef enum _PROCESSINFOCLASS
{ ProcessBasicInformation,
ProcessQuotaLimits,
ProcessIoCounters,
@@ -501,7 +501,7 @@
/* parameter ProcessInformation (depending on ProcessInformationClass) */
-typedef struct _PROCESS_BASIC_INFORMATION
+typedef struct _PROCESS_BASIC_INFORMATION
{ DWORD ExitStatus;
DWORD PebBaseAddress;
DWORD AffinityMask;
@@ -523,7 +523,7 @@
* timer
*/
-typedef enum _TIMER_TYPE
+typedef enum _TIMER_TYPE
{
NotificationTimer,
SynchronizationTimer
@@ -531,15 +531,15 @@
} TIMER_TYPE;
/* token functions */
-
+
NTSTATUS WINAPI NtOpenProcessToken(
HANDLE ProcessHandle,
- DWORD DesiredAccess,
+ DWORD DesiredAccess,
HANDLE *TokenHandle);
-
+
NTSTATUS WINAPI NtOpenThreadToken(
HANDLE ThreadHandle,
- DWORD DesiredAccess,
+ DWORD DesiredAccess,
BOOLEAN OpenAsSelf,
HANDLE *TokenHandle);
@@ -553,7 +553,7 @@
NTSTATUS WINAPI NtQueryInformationToken(
HANDLE token,
- DWORD tokeninfoclass,
+ DWORD tokeninfoclass,
LPVOID tokeninfo,
DWORD tokeninfolength,
LPDWORD retlen );
@@ -568,19 +568,19 @@
DWORD nSubAuthority4, DWORD nSubAuthority5,
DWORD nSubAuthority6, DWORD nSubAuthority7,
PSID *pSid );
-
+
BOOL WINAPI RtlInitializeSid(
PSID pSid,
PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
BYTE nSubAuthorityCount);
-
+
DWORD WINAPI RtlFreeSid(
PSID pSid);
BOOL WINAPI RtlEqualSid(
PSID pSid1,
PSID pSid2 );
-
+
DWORD WINAPI RtlLengthRequiredSid(
DWORD nrofsubauths);
@@ -598,7 +598,7 @@
DWORD len,
PSID to,
PSID from);
-
+
BOOL WINAPI RtlValidSid(
PSID pSid);
@@ -692,7 +692,7 @@
DWORD xnrofaces,
PACE_HEADER acestart,
DWORD acelen);
-
+
BOOL WINAPI RtlAddAccessAllowedAce(
IN OUT PACL pAcl,
IN DWORD dwAceRevision,
@@ -775,25 +775,25 @@
VOID WINAPI RtlInitializeResource(
LPRTL_RWLOCK);
-
+
VOID WINAPI RtlDeleteResource(
LPRTL_RWLOCK);
-
+
BYTE WINAPI RtlAcquireResourceExclusive(
LPRTL_RWLOCK, BYTE fWait);
-
+
BYTE WINAPI RtlAcquireResourceShared(
LPRTL_RWLOCK, BYTE fWait);
-
+
VOID WINAPI RtlReleaseResource(
LPRTL_RWLOCK);
-
+
VOID WINAPI RtlDumpResource(
LPRTL_RWLOCK);
/* time functions */
-typedef struct _TIME_FIELDS
+typedef struct _TIME_FIELDS
{ CSHORT Year;
CSHORT Month;
CSHORT Day;
@@ -817,11 +817,11 @@
BOOLEAN WINAPI RtlTimeFieldsToTime(
PTIME_FIELDS tfTimeFields,
PLARGE_INTEGER Time);
-
+
VOID WINAPI RtlTimeToElapsedTimeFields(
PLARGE_INTEGER liTime,
PTIME_FIELDS TimeFields);
-
+
void WINAPI NtQuerySystemTime( LARGE_INTEGER *time );
BOOLEAN WINAPI RtlTimeToSecondsSince1980( const FILETIME *time, LPDWORD res );
@@ -920,8 +920,8 @@
DWORD WINAPI RtlDeleteSecurityObject(
DWORD x1);
-
-NTSTATUS WINAPI
+
+NTSTATUS WINAPI
NtQuerySecurityObject(
IN HANDLE Object,
IN SECURITY_INFORMATION RequestedInformation,
@@ -1056,7 +1056,7 @@
BOOLEAN WINAPI RtlDosPathNameToNtPathName_U( LPWSTR from,PUNICODE_STRING us,DWORD x2,DWORD x3);
BOOL WINAPI RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel);
-NTSTATUS WINAPI
+NTSTATUS WINAPI
NtAccessCheck(
IN PSECURITY_DESCRIPTOR SecurityDescriptor,
IN HANDLE ClientToken,
diff --git a/include/ntddstor.h b/include/ntddstor.h
index 1f8f134..7c08940 100644
--- a/include/ntddstor.h
+++ b/include/ntddstor.h
@@ -131,7 +131,7 @@
SYQUEST_EZFLYER,
SYQUEST_SYJET,
AVATAR_F2,
- MP2_8mm
+ MP2_8mm
} STORAGE_MEDIA_TYPE, *PSTORAGE_MEDIA_TYPE;
#define MEDIA_ERASEABLE 0x00000001
@@ -179,7 +179,7 @@
PropertyStandardQuery = 0,
PropertyExistsQuery,
PropertyMaskQuery,
- PropertyQueryMaxDefined
+ PropertyQueryMaxDefined
} STORAGE_QUERY_TYPE, *PSTORAGE_QUERY_TYPE;
typedef enum _STORAGE_PROPERTY_ID {
diff --git a/include/ntdef.h b/include/ntdef.h
index 21f3e0b..61d5b58 100644
--- a/include/ntdef.h
+++ b/include/ntdef.h
@@ -26,7 +26,7 @@
extern "C" {
#endif
-#define NTAPI __stdcall
+#define NTAPI __stdcall
#ifndef IN
#define IN
@@ -48,7 +48,7 @@
typedef NTSTATUS *PNTSTATUS;
typedef short CSHORT;
-typedef CSHORT *PCSHORT;
+typedef CSHORT *PCSHORT;
/* NT lowlevel Strings (handled by Rtl* functions in NTDLL)
@@ -86,7 +86,7 @@
#define OBJ_KERNEL_HANDLE 0x00000200L
#define OBJ_VALID_ATTRIBUTES 0x000003F2L
-typedef struct _OBJECT_ATTRIBUTES
+typedef struct _OBJECT_ATTRIBUTES
{ ULONG Length;
HANDLE RootDirectory;
PUNICODE_STRING ObjectName;
diff --git a/include/ntsecapi.h b/include/ntsecapi.h
index b7765e2..3c548b4 100644
--- a/include/ntsecapi.h
+++ b/include/ntsecapi.h
@@ -33,7 +33,7 @@
NTSTATUS WINAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE);
-typedef enum
+typedef enum
{
PolicyAuditLogInformation = 1,
PolicyAuditEventsInformation,
diff --git a/include/objbase.h b/include/objbase.h
index 9484adb..4aa2c45 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -60,7 +60,7 @@
#endif
#ifndef __WINE__
-/* These macros are msdev's way of defining COM objects.
+/* These macros are msdev's way of defining COM objects.
* They are provided here for use by Winelib developpers.
*/
#define FARSTRUCT
diff --git a/include/ole.h b/include/ole.h
index 8f00d26..d9ef4cb 100644
--- a/include/ole.h
+++ b/include/ole.h
@@ -207,9 +207,9 @@
OLESTATUS (CALLBACK *CreateFromTemplate)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *);
OLESTATUS (CALLBACK *Edit)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *);
OLESTATUS (CALLBACK *Exit)(LPOLESERVER);
- OLESTATUS (CALLBACK *Release)(LPOLESERVER);
- OLESTATUS (CALLBACK *Execute)(LPOLESERVER);
-} OLESERVERVTBL;
+ OLESTATUS (CALLBACK *Release)(LPOLESERVER);
+ OLESTATUS (CALLBACK *Execute)(LPOLESERVER);
+} OLESERVERVTBL;
typedef OLESERVERVTBL *LPOLESERVERVTBL;
typedef struct _OLESERVER {
LPOLESERVERVTBL lpvtbl;
diff --git a/include/ole2.h b/include/ole2.h
index 582fe31..6bed8ee 100644
--- a/include/ole2.h
+++ b/include/ole2.h
@@ -73,11 +73,11 @@
HRESULT WINAPI OleSave(LPPERSISTSTORAGE pPS, LPSTORAGE pStg, BOOL fSameAsLoad);
-HRESULT WINAPI OleRegGetUserType(REFCLSID clsid,
+HRESULT WINAPI OleRegGetUserType(REFCLSID clsid,
DWORD dwFormOfType,
LPOLESTR* pszUserType);
HRESULT WINAPI OleRegGetMiscStatus (REFCLSID clsid, DWORD dwAspect, DWORD* pdwStatus);
-HRESULT WINAPI OleRegEnumFormatEtc (REFCLSID clsid,
+HRESULT WINAPI OleRegEnumFormatEtc (REFCLSID clsid,
DWORD dwDirection,
LPENUMFORMATETC* ppenumFormatetc);
HRESULT WINAPI CreateStreamOnHGlobal (HGLOBAL hGlobal, BOOL fDeleteOnRelease, LPSTREAM* ppstm);
@@ -97,7 +97,7 @@
HRESULT WINAPI OleIsCurrentClipboard(LPDATAOBJECT);
HRESULT WINAPI OleSetClipboard(LPDATAOBJECT);
HRESULT WINAPI OleCreateStaticFromData(LPDATAOBJECT pSrcDataObj, REFIID iid,
- DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,
+ DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,
LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI ReadFmtUserTypeStg(LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lplpszUserType);
HRESULT WINAPI OleLoad(LPSTORAGE pStg, REFIID riid, LPOLECLIENTSITE pClientSite, LPVOID* ppvObj);
diff --git a/include/ole2ver.h b/include/ole2ver.h
index 037ab19..8c2f57d 100644
--- a/include/ole2ver.h
+++ b/include/ole2ver.h
@@ -31,7 +31,7 @@
* Win98 SE original files:
* COMPOBJ: CoBuildVersion 23/700
* OLE2: OleBuildVersion -> COMPOBJ.CoBuildVersion
- * OLE32: CoBuildVersion and Ole~ 23/824
+ * OLE32: CoBuildVersion and Ole~ 23/824
*
* We probably should reorganize the OLE version stuff, i.e.
* use different values for every *BuildVersion function and Win version.
diff --git a/include/oleauto.h b/include/oleauto.h
index 0badc6d..0cae376 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -66,64 +66,64 @@
HRESULT WINAPI
SafeArrayAllocDescriptor(UINT cDims, struct tagSAFEARRAY **ppsaOut);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayAllocData(struct tagSAFEARRAY *psa);
struct tagSAFEARRAY * WINAPI
SafeArrayCreate(VARTYPE vt, UINT cDims, struct tagSAFEARRAYBOUND *rgsabound);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayDestroyDescriptor(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayPutElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayGetElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayLock(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayUnlock(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayGetUBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plUbound);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayGetLBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plLbound);
-UINT WINAPI
+UINT WINAPI
SafeArrayGetDim(struct tagSAFEARRAY *psa);
-UINT WINAPI
+UINT WINAPI
SafeArrayGetElemsize(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayAccessData(struct tagSAFEARRAY *psa, void **ppvData);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayUnaccessData(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayPtrOfIndex(struct tagSAFEARRAY *psa, LONG *rgIndices, void **ppvData);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayCopyData(struct tagSAFEARRAY *psaSource, struct tagSAFEARRAY **psaTarget);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayDestroyData(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayDestroy(struct tagSAFEARRAY *psa);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayCopy(struct tagSAFEARRAY *psa, struct tagSAFEARRAY **ppsaOut);
struct tagSAFEARRAY * WINAPI
SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements);
-HRESULT WINAPI
+HRESULT WINAPI
SafeArrayRedim(struct tagSAFEARRAY *psa, struct tagSAFEARRAYBOUND *psaboundNew);
@@ -626,7 +626,7 @@
#ifdef __cplusplus
} /* extern "C" */
-#endif
+#endif
#endif /*__WINE_OLEAUTO_H*/
diff --git a/include/olectl.h b/include/olectl.h
index 83d78ba..5cb1184 100644
--- a/include/olectl.h
+++ b/include/olectl.h
@@ -68,7 +68,7 @@
0x66504308,0xBE0F,0x101A,0x8B,0xBB,0x00,0xAA,0x00,0x30,0x0C,0xAB);
DEFINE_GUID(GUID_YSIZE,
0x66504309,0xBE0F,0x101A,0x8B,0xBB,0x00,0xAA,0x00,0x30,0x0C,0xAB);
-
+
typedef struct tagOCPFIPARAMS
{
ULONG cbStructSize;
@@ -154,18 +154,18 @@
HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams);
HRESULT WINAPI OleCreatePropertyFrame(
- HWND hwndOwner, UINT x, UINT y,
- LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk,
- ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved,
+ HWND hwndOwner, UINT x, UINT y,
+ LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk,
+ ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved,
LPVOID pvReserved );
-HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
+HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
REFIID reed, LPVOID *lplpvObj );
-HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
+HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
BOOL fOwn, LPVOID * lplpvObj );
-HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid,
+HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid,
LPVOID* lplpvObj);
HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
@@ -253,7 +253,7 @@
#define DISPID_PICT_WIDTH 4
#define DISPID_PICT_HEIGHT 5
#define DISPID_PICT_RENDER 6
-
+
/* Reflected Window Message IDs */
#define OCM__BASE (WM_USER+0x1c00)
#define OCM_COMMAND (OCM__BASE + WM_COMMAND)
diff --git a/include/oledlg.h b/include/oledlg.h
index 5ef5ea1..97a089c 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -102,7 +102,7 @@
#define OLEUI_FALSE 0
#define OLEUI_SUCCESS 1 /* Same as OLEUI_OK */
-#define OLEUI_OK 1 /* OK button pressed */
+#define OLEUI_OK 1 /* OK button pressed */
#define OLEUI_CANCEL 2 /* Cancel button pressed */
#define OPF_OBJECTISLINK 0x00000001L
@@ -117,54 +117,54 @@
*/
typedef struct tagOLEUIINSERTOBJECTA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- CLSID clsid;
- LPSTR lpszFile;
- UINT cchFile;
- UINT cClsidExclude;
- LPCLSID lpClsidExclude;
- IID iid;
- DWORD oleRender;
- LPFORMATETC lpFormatEtc;
- LPOLECLIENTSITE lpIOleClientSite;
- LPSTORAGE lpIStorage;
- LPVOID *ppvObj;
- SCODE sc;
- HGLOBAL hMetaPict;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ CLSID clsid;
+ LPSTR lpszFile;
+ UINT cchFile;
+ UINT cClsidExclude;
+ LPCLSID lpClsidExclude;
+ IID iid;
+ DWORD oleRender;
+ LPFORMATETC lpFormatEtc;
+ LPOLECLIENTSITE lpIOleClientSite;
+ LPSTORAGE lpIStorage;
+ LPVOID *ppvObj;
+ SCODE sc;
+ HGLOBAL hMetaPict;
} OLEUIINSERTOBJECTA, *POLEUIINSERTOBJECTA, *LPOLEUIINSERTOBJECTA;
typedef struct tagOLEUIINSERTOBJECTW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- CLSID clsid;
- LPWSTR lpszFile;
- UINT cchFile;
- UINT cClsidExclude;
- LPCLSID lpClsidExclude;
- IID iid;
- DWORD oleRender;
- LPFORMATETC lpFormatEtc;
- LPOLECLIENTSITE lpIOleClientSite;
- LPSTORAGE lpIStorage;
- LPVOID *ppvObj;
- SCODE sc;
- HGLOBAL hMetaPict;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ CLSID clsid;
+ LPWSTR lpszFile;
+ UINT cchFile;
+ UINT cClsidExclude;
+ LPCLSID lpClsidExclude;
+ IID iid;
+ DWORD oleRender;
+ LPFORMATETC lpFormatEtc;
+ LPOLECLIENTSITE lpIOleClientSite;
+ LPSTORAGE lpIStorage;
+ LPVOID *ppvObj;
+ SCODE sc;
+ HGLOBAL hMetaPict;
} OLEUIINSERTOBJECTW, *POLEUIINSERTOBJECTW, *LPOLEUIINSERTOBJECTW;
DECL_WINELIB_TYPE_AW(OLEUIINSERTOBJECT)
@@ -177,54 +177,54 @@
*/
typedef struct tagOLEUICONVERTA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- CLSID clsid;
- CLSID clsidConvertDefault;
- CLSID clsidActivateDefault;
- CLSID clsidNew;
- DWORD dvAspect;
- WORD wFormat;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ CLSID clsid;
+ CLSID clsidConvertDefault;
+ CLSID clsidActivateDefault;
+ CLSID clsidNew;
+ DWORD dvAspect;
+ WORD wFormat;
BOOL fIsLinkedObject;
- HGLOBAL hMetaPict;
- LPSTR lpszUserType;
- BOOL fObjectsIconChanged;
- LPSTR lpszDefLabel;
- UINT cClsidExclude;
- LPCLSID lpClsidExclude;
+ HGLOBAL hMetaPict;
+ LPSTR lpszUserType;
+ BOOL fObjectsIconChanged;
+ LPSTR lpszDefLabel;
+ UINT cClsidExclude;
+ LPCLSID lpClsidExclude;
} OLEUICONVERTA, *POLEUICONVERTA, *LPOLEUICONVERTA;
typedef struct tagOLEUICONVERTW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- CLSID clsid;
- CLSID clsidConvertDefault;
- CLSID clsidActivateDefault;
- CLSID clsidNew;
- DWORD dvAspect;
- WORD wFormat;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ CLSID clsid;
+ CLSID clsidConvertDefault;
+ CLSID clsidActivateDefault;
+ CLSID clsidNew;
+ DWORD dvAspect;
+ WORD wFormat;
BOOL fIsLinkedObject;
- HGLOBAL hMetaPict;
- LPWSTR lpszUserType;
- BOOL fObjectsIconChanged;
- LPWSTR lpszDefLabel;
- UINT cClsidExclude;
- LPCLSID lpClsidExclude;
+ HGLOBAL hMetaPict;
+ LPWSTR lpszUserType;
+ BOOL fObjectsIconChanged;
+ LPWSTR lpszDefLabel;
+ UINT cClsidExclude;
+ LPCLSID lpClsidExclude;
} OLEUICONVERTW, *POLEUICONVERTW, *LPOLEUICONVERTW;
DECL_WINELIB_TYPE_AW(OLEUICONVERT)
@@ -236,36 +236,36 @@
*/
typedef struct tagOLEUICHANGEICONA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- HGLOBAL hMetaPict;
- CLSID clsid;
- CHAR szIconExe[MAX_PATH];
- INT cchIconExe;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ HGLOBAL hMetaPict;
+ CLSID clsid;
+ CHAR szIconExe[MAX_PATH];
+ INT cchIconExe;
} OLEUICHANGEICONA, *POLEUICHANGEICONA, *LPOLEUICHANGEICONA;
typedef struct tagOLEUICHANGEICONW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- HGLOBAL hMetaPict;
- CLSID clsid;
- WCHAR szIconExe[MAX_PATH];
- INT cchIconExe;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ HGLOBAL hMetaPict;
+ CLSID clsid;
+ WCHAR szIconExe[MAX_PATH];
+ INT cchIconExe;
} OLEUICHANGEICONW, *POLEUICHANGEICONW, *LPOLEUICHANGEICONW;
DECL_WINELIB_TYPE_AW(OLEUICHANGEICON)
@@ -279,7 +279,7 @@
typedef enum tagOLEUIPASTEFLAG
{
- OLEUIPASTE_ENABLEICON = 2048,
+ OLEUIPASTE_ENABLEICON = 2048,
OLEUIPASTE_PASTEONLY = 0,
OLEUIPASTE_PASTE = 512,
OLEUIPASTE_LINKANYTYPE = 1024,
@@ -291,24 +291,24 @@
OLEUIPASTE_LINKTYPE6 = 32,
OLEUIPASTE_LINKTYPE7 = 64,
OLEUIPASTE_LINKTYPE8 = 128
-} OLEUIPASTEFLAG;
+} OLEUIPASTEFLAG;
typedef struct tagOLEUIPASTEENTRYA
{
- FORMATETC fmtetc;
+ FORMATETC fmtetc;
LPCSTR lpstrFormatName;
LPCSTR lpstrResultText;
- DWORD dwFlags;
- DWORD dwScratchSpace;
+ DWORD dwFlags;
+ DWORD dwScratchSpace;
} OLEUIPASTEENTRYA, *POLEUIPASTEENTRYA, *LPOLEUIPASTEENTRYA;
typedef struct tagOLEUIPASTEENTRYW
{
- FORMATETC fmtetc;
+ FORMATETC fmtetc;
LPCWSTR lpstrFormatName;
LPCWSTR lpstrResultText;
- DWORD dwFlags;
- DWORD dwScratchSpace;
+ DWORD dwFlags;
+ DWORD dwScratchSpace;
} OLEUIPASTEENTRYW, *POLEUIPASTEENTRYW, *LPOLEUIPASTEENTRYW;
DECL_WINELIB_TYPE_AW(OLEUIPASTEENTRY)
@@ -317,50 +317,50 @@
typedef struct tagOLEUIPASTESPECIALA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- LPDATAOBJECT lpSrcDataObj;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ LPDATAOBJECT lpSrcDataObj;
LPOLEUIPASTEENTRYA arrPasteEntries;
- INT cPasteEntries;
- UINT* arrLinkTypes;
- INT cLinkTypes;
- UINT cClsidExclude;
- LPCLSID lpClsidExclude;
- INT nSelectedIndex;
- BOOL fLink;
- HGLOBAL hMetaPict;
- SIZEL sizel;
+ INT cPasteEntries;
+ UINT* arrLinkTypes;
+ INT cLinkTypes;
+ UINT cClsidExclude;
+ LPCLSID lpClsidExclude;
+ INT nSelectedIndex;
+ BOOL fLink;
+ HGLOBAL hMetaPict;
+ SIZEL sizel;
} OLEUIPASTESPECIALA, *POLEUIPASTESPECIALA, *LPOLEUIPASTESPECIALA;
typedef struct tagOLEUIPASTESPECIALW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- LPDATAOBJECT lpSrcDataObj;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ LPDATAOBJECT lpSrcDataObj;
LPOLEUIPASTEENTRYW arrPasteEntries;
- INT cPasteEntries;
- UINT* arrLinkTypes;
- INT cLinkTypes;
- UINT cClsidExclude;
- LPCLSID lpClsidExclude;
- INT nSelectedIndex;
- BOOL fLink;
- HGLOBAL hMetaPict;
- SIZEL sizel;
+ INT cPasteEntries;
+ UINT* arrLinkTypes;
+ INT cLinkTypes;
+ UINT cClsidExclude;
+ LPCLSID lpClsidExclude;
+ INT nSelectedIndex;
+ BOOL fLink;
+ HGLOBAL hMetaPict;
+ SIZEL sizel;
} OLEUIPASTESPECIALW, *POLEUIPASTESPECIALW, *LPOLEUIPASTESPECIALW;
DECL_WINELIB_TYPE_AW(OLEUIPASTESPECIAL)
@@ -391,30 +391,30 @@
typedef struct tagOLEUIEDITLINKSW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- LPOLEUILINKCONTAINERW lpOleUILinkContainer;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ LPOLEUILINKCONTAINERW lpOleUILinkContainer;
} OLEUIEDITLINKSW, *POLEUIEDITLINKSW, *LPOLEUIEDITLINKSW;
typedef struct tagOLEUIEDITLINKSA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- LPOLEUILINKCONTAINERA lpOleUILinkContainer;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ LPOLEUILINKCONTAINERA lpOleUILinkContainer;
} OLEUIEDITLINKSA, *POLEUIEDITLINKSA, *LPOLEUIEDITLINKSA;
DECL_WINELIB_TYPE_AW(OLEUIEDITLINKS)
@@ -427,32 +427,32 @@
*/
typedef struct tagOLEUIBUSYA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- HTASK hTask;
- HWND* lphWndDialog;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ HTASK hTask;
+ HWND* lphWndDialog;
} OLEUIBUSYA, *POLEUIBUSYA, *LPOLEUIBUSYA;
typedef struct tagOLEUIBUSYW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- HTASK hTask;
- HWND* lphWndDialog;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ HTASK hTask;
+ HWND* lphWndDialog;
} OLEUIBUSYW, *POLEUIBUSYW, *LPOLEUIBUSYW;
DECL_WINELIB_TYPE_AW(OLEUIBUSY)
@@ -465,25 +465,25 @@
typedef struct tagOLEUIGNRLPROPSA
{
- DWORD cbStruct;
- DWORD dwFlags;
+ DWORD cbStruct;
+ DWORD dwFlags;
DWORD dwReserved1[2];
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
DWORD dwReserved2[3];
- struct tagOLEUIOBJECTPROPSA* lpOP;
+ struct tagOLEUIOBJECTPROPSA* lpOP;
} OLEUIGNRLPROPSA, *POLEUIGNRLPROPSA, *LPOLEUIGNRLPROPSA;
typedef struct tagOLEUIGNRLPROPSW
{
- DWORD cbStruct;
- DWORD dwFlags;
+ DWORD cbStruct;
+ DWORD dwFlags;
DWORD dwReserved1[2];
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
DWORD dwReserved2[3];
- struct tagOLEUIOBJECTPROPSW* lpOP;
+ struct tagOLEUIOBJECTPROPSW* lpOP;
} OLEUIGNRLPROPSW, *POLEUIGNRLPROPSW, *LPOLEUIGNRLPROPSW;
DECL_WINELIB_TYPE_AW(OLEUIGNRLPROPS)
@@ -492,27 +492,27 @@
typedef struct tagOLEUIVIEWPROPSA
{
- DWORD cbStruct;
- DWORD dwFlags;
+ DWORD cbStruct;
+ DWORD dwFlags;
DWORD dwReserved1[2];
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
DWORD dwReserved2[3];
- struct tagOLEUIOBJECTPROPSA* lpOP;
- INT nScaleMin;
+ struct tagOLEUIOBJECTPROPSA* lpOP;
+ INT nScaleMin;
INT nScaleMax;
} OLEUIVIEWPROPSA, *POLEUIVIEWPROPSA, *LPOLEUIVIEWPROPSA;
typedef struct tagOLEUIVIEWPROPSW
{
- DWORD cbStruct;
- DWORD dwFlags;
+ DWORD cbStruct;
+ DWORD dwFlags;
DWORD dwReserved1[2];
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
DWORD dwReserved2[3];
- struct tagOLEUIOBJECTPROPSW* lpOP;
- INT nScaleMin;
+ struct tagOLEUIOBJECTPROPSW* lpOP;
+ INT nScaleMin;
INT nScaleMax;
} OLEUIVIEWPROPSW, *POLEUIVIEWPROPSW, *LPOLEUIVIEWPROPSW;
@@ -521,30 +521,30 @@
DECL_WINELIB_TYPE_AW(LPOLEUIVIEWPROPS)
-#define VPF_SELECTRELATIVE 0x00000001L
-#define VPF_DISABLERELATIVE 0x00000002L
-#define VPF_DISABLESCALE 0x00000004L
+#define VPF_SELECTRELATIVE 0x00000001L
+#define VPF_DISABLERELATIVE 0x00000002L
+#define VPF_DISABLESCALE 0x00000004L
typedef struct tagOLEUILINKPROPSA
{
- DWORD cbStruct;
- DWORD dwFlags;
+ DWORD cbStruct;
+ DWORD dwFlags;
DWORD dwReserved1[2];
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
DWORD dwReserved2[3];
- struct tagOLEUIOBJECTPROPSA* lpOP;
+ struct tagOLEUIOBJECTPROPSA* lpOP;
} OLEUILINKPROPSA, *POLEUILINKPROPSA, *LPOLEUILINKPROPSA;
typedef struct tagOLEUILINKPROPSW
{
- DWORD cbStruct;
- DWORD dwFlags;
+ DWORD cbStruct;
+ DWORD dwFlags;
DWORD dwReserved1[2];
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
DWORD dwReserved2[3];
- struct tagOLEUIOBJECTPROPSW* lpOP;
+ struct tagOLEUIOBJECTPROPSW* lpOP;
} OLEUILINKPROPSW, *POLEUILINKPROPSW, *LPOLEUILINKPROPSW;
DECL_WINELIB_TYPE_AW(OLEUILINKPROPS)
@@ -553,30 +553,30 @@
typedef struct tagOLEUIOBJECTPROPSA
{
- DWORD cbStruct;
- DWORD dwFlags;
- LPPROPSHEETHEADERA lpPS;
- DWORD dwObject;
- LPOLEUIOBJINFOA lpObjInfo;
- DWORD dwLink;
- LPOLEUILINKINFOA lpLinkInfo;
- LPOLEUIGNRLPROPSA lpGP;
- LPOLEUIVIEWPROPSA lpVP;
- LPOLEUILINKPROPSA lpLP;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ LPPROPSHEETHEADERA lpPS;
+ DWORD dwObject;
+ LPOLEUIOBJINFOA lpObjInfo;
+ DWORD dwLink;
+ LPOLEUILINKINFOA lpLinkInfo;
+ LPOLEUIGNRLPROPSA lpGP;
+ LPOLEUIVIEWPROPSA lpVP;
+ LPOLEUILINKPROPSA lpLP;
} OLEUIOBJECTPROPSA, *POLEUIOBJECTPROPSA, *LPOLEUIOBJECTPROPSA;
typedef struct tagOLEUIOBJECTPROPSW
{
- DWORD cbStruct;
- DWORD dwFlags;
- LPPROPSHEETHEADERW lpPS;
- DWORD dwObject;
- LPOLEUIOBJINFOW lpObjInfo;
- DWORD dwLink;
- LPOLEUILINKINFOW lpLinkInfo;
- LPOLEUIGNRLPROPSW lpGP;
- LPOLEUIVIEWPROPSW lpVP;
- LPOLEUILINKPROPSW lpLP;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ LPPROPSHEETHEADERW lpPS;
+ DWORD dwObject;
+ LPOLEUIOBJINFOW lpObjInfo;
+ DWORD dwLink;
+ LPOLEUILINKINFOW lpLinkInfo;
+ LPOLEUIGNRLPROPSW lpGP;
+ LPOLEUIVIEWPROPSW lpVP;
+ LPOLEUILINKPROPSW lpLP;
} OLEUIOBJECTPROPSW, *POLEUIOBJECTPROPSW, *LPOLEUIOBJECTPROPSW;
DECL_WINELIB_TYPE_AW(OLEUIOBJECTPROPS)
@@ -590,45 +590,45 @@
typedef struct tagOLEUICHANGESOURCEW
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCWSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCWSTR lpszTemplate;
- HRSRC hResource;
- OPENFILENAMEW*lpOFN;
- DWORD dwReserved1[4];
- LPOLEUILINKCONTAINERW lpOleUILinkContainer;
- DWORD dwLink;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCWSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCWSTR lpszTemplate;
+ HRSRC hResource;
+ OPENFILENAMEW*lpOFN;
+ DWORD dwReserved1[4];
+ LPOLEUILINKCONTAINERW lpOleUILinkContainer;
+ DWORD dwLink;
LPWSTR lpszDisplayName;
- ULONG nFileLength;
- LPWSTR lpszFrom;
- LPWSTR lpszTo;
+ ULONG nFileLength;
+ LPWSTR lpszFrom;
+ LPWSTR lpszTo;
} OLEUICHANGESOURCEW, *POLEUICHANGESOURCEW, *LPOLEUICHANGESOURCEW;
typedef struct tagOLEUICHANGESOURCEA
{
- DWORD cbStruct;
- DWORD dwFlags;
- HWND hWndOwner;
- LPCSTR lpszCaption;
- LPFNOLEUIHOOK lpfnHook;
- LPARAM lCustData;
- HINSTANCE hInstance;
- LPCSTR lpszTemplate;
- HRSRC hResource;
- OPENFILENAMEA* lpOFN;
- DWORD dwReserved1[4];
- LPOLEUILINKCONTAINERA lpOleUILinkContainer;
- DWORD dwLink;
+ DWORD cbStruct;
+ DWORD dwFlags;
+ HWND hWndOwner;
+ LPCSTR lpszCaption;
+ LPFNOLEUIHOOK lpfnHook;
+ LPARAM lCustData;
+ HINSTANCE hInstance;
+ LPCSTR lpszTemplate;
+ HRSRC hResource;
+ OPENFILENAMEA* lpOFN;
+ DWORD dwReserved1[4];
+ LPOLEUILINKCONTAINERA lpOleUILinkContainer;
+ DWORD dwLink;
LPSTR lpszDisplayName;
- ULONG nFileLength;
- LPSTR lpszFrom;
- LPSTR lpszTo;
+ ULONG nFileLength;
+ LPSTR lpszFrom;
+ LPSTR lpszTo;
} OLEUICHANGESOURCEA, *POLEUICHANGESOURCEA, *LPOLEUICHANGESOURCEA;
@@ -678,7 +678,7 @@
ICOM_METHOD1(HRESULT,CancelLink, DWORD,dwLink)
#define IOleUILinkContainerW_IMETHODS \
IUnknown_IMETHODS \
- IOleUILinkContainerW_METHODS
+ IOleUILinkContainerW_METHODS
ICOM_DEFINE(IOleUILinkContainerW, IUnknown)
#undef ICOM_INTERFACE
@@ -698,8 +698,8 @@
#define IOleUILinkContainer_SetLinkSource(p,a,b,c,d,e) ICOM_CALL5(SetLinkSource,p,a,b,c,d,e)
#define IOleUILinkContainer_GetLinkSource(p,a,b,c,d,e,f,g) ICOM_CALL7(GetLinkSource,p,a,b,c,d,e,f,g)
#define IOleUILinkContainer_OpenLinkSource(p,a) ICOM_CALL1(OpenLinkSource,p,a)
-#define IOleUILinkContainer_UpdateLink(p,a,b,c) ICOM_CALL3(UpdateLink,p,a,b,c)
-#define IOleUILinkContainer_CancelLink(p,a) ICOM_CALL1(CancelLink,p,a)
+#define IOleUILinkContainer_UpdateLink(p,a,b,c) ICOM_CALL3(UpdateLink,p,a,b,c)
+#define IOleUILinkContainer_CancelLink(p,a) ICOM_CALL1(CancelLink,p,a)
#endif
@@ -711,7 +711,7 @@
ICOM_METHOD2(HRESULT,GetLastUpdate, DWORD,dwLink, FILETIME*,lpLastUpdate)
#define IOleUILinkInfoA_IMETHODS \
IOleUILinkContainerA_IMETHODS \
- IOleUILinkInfoA_METHODS
+ IOleUILinkInfoA_METHODS
ICOM_DEFINE(IOleUILinkInfoA, IOleUILinkContainerA)
#undef ICOM_INTERFACE
@@ -720,7 +720,7 @@
ICOM_METHOD2(HRESULT,GetLastUpdate, DWORD,dwLink, FILETIME*,lpLastUpdate)
#define IOleUILinkInfoW_IMETHODS \
IOleUILinkContainerW_IMETHODS \
- IOleUILinkInfoW_METHODS
+ IOleUILinkInfoW_METHODS
ICOM_DEFINE(IOleUILinkInfoW, IOleUILinkContainerW)
#undef ICOM_INTERFACE
@@ -741,8 +741,8 @@
#define IOleUILinkInfo_OpenLinkSource(p,a) ICOM_CALL1(OpenLinkSource,p,a)
#define IOleUILinkInfo_UpdateLink(p,a,b,c) ICOM_CALL3(UpdateLink,p,a,b,c)
#define IOleUILinkInfo_CancelLink(p,a) ICOM_CALL1(CancelLink,p,a)
-/*** IOleUILinkInfo methods ***/
-#define IOleUILinkInfo_GetLastUpdate(p,a,b) ICOM_CALL2(GetLastUpdate,p,a,b)
+/*** IOleUILinkInfo methods ***/
+#define IOleUILinkInfo_GetLastUpdate(p,a,b) ICOM_CALL2(GetLastUpdate,p,a,b)
/*****************************************************************************
@@ -762,7 +762,7 @@
INT,nCurrentScale, BOOL,bRelativeToOrig)
#define IOleUIObjInfoA_IMETHODS \
IUnknown_IMETHODS \
- IOleUIObjInfoA_METHODS
+ IOleUIObjInfoA_METHODS
ICOM_DEFINE(IOleUIObjInfoA, IUnknown)
#undef ICOM_INTERFACE
@@ -780,7 +780,7 @@
INT,nCurrentScale, BOOL,bRelativeToOrig)
#define IOleUIObjInfoW_IMETHODS \
IUnknown_IMETHODS \
- IOleUIObjInfoW_METHODS
+ IOleUIObjInfoW_METHODS
ICOM_DEFINE(IOleUIObjInfoW, IUnknown)
#undef ICOM_INTERFACE
@@ -830,7 +830,7 @@
#define OleUIAddVerbMenu WINELIB_NAME_AW(OleUIAddVerbMenu)
UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial);
UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial);
-#define OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial)
+#define OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial)
#ifdef __cplusplus
diff --git a/include/path.h b/include/path.h
index 944121e..4eba03d 100644
--- a/include/path.h
+++ b/include/path.h
@@ -75,8 +75,8 @@
DWORD polylines);
extern BOOL PATH_PolyPolygon(struct tagDC *dc, const POINT *pt, const INT *counts,
UINT polygons);
-extern BOOL PATH_RoundRect(struct tagDC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width,
- INT ell_height);
+extern BOOL PATH_RoundRect(struct tagDC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width,
+ INT ell_height);
extern BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags);
#endif /* __WINE_PATH_H */
diff --git a/include/prsht.h b/include/prsht.h
index 0f52bd6..0e3f9a0 100644
--- a/include/prsht.h
+++ b/include/prsht.h
@@ -58,7 +58,7 @@
DWORD dwSize;
DWORD dwFlags;
HINSTANCE hInstance;
- union
+ union
{
LPCSTR pszTemplate;
LPCDLGTEMPLATEA pResource;
@@ -84,7 +84,7 @@
DWORD dwSize;
DWORD dwFlags;
HINSTANCE hInstance;
- union
+ union
{
LPCWSTR pszTemplate;
LPCDLGTEMPLATEW pResource;
@@ -200,13 +200,13 @@
* Property sheet support (UNICODE-Winelib)
*/
-DECL_WINELIB_TYPE_AW(PROPSHEETPAGE)
-DECL_WINELIB_TYPE_AW(LPPROPSHEETPAGE)
-DECL_WINELIB_TYPE_AW(LPCPROPSHEETPAGE)
-DECL_WINELIB_TYPE_AW(PROPSHEETHEADER)
-DECL_WINELIB_TYPE_AW(LPPROPSHEETHEADER)
-DECL_WINELIB_TYPE_AW(LPCPROPSHEETHEADER)
-DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK)
+DECL_WINELIB_TYPE_AW(PROPSHEETPAGE)
+DECL_WINELIB_TYPE_AW(LPPROPSHEETPAGE)
+DECL_WINELIB_TYPE_AW(LPCPROPSHEETPAGE)
+DECL_WINELIB_TYPE_AW(PROPSHEETHEADER)
+DECL_WINELIB_TYPE_AW(LPPROPSHEETHEADER)
+DECL_WINELIB_TYPE_AW(LPCPROPSHEETHEADER)
+DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK)
/*
@@ -247,7 +247,7 @@
#define PSH_WIZARDCONTEXTHELP 0x00001000
/*
- * for below IE 5
+ * for below IE 5
* PSH_WIZARD97 0x00002000
*/
#define PSH_WATERMARK 0x00008000
@@ -272,7 +272,7 @@
NMHDR hdr;
LPARAM lParam;
} PSHNOTIFY, *LPPSHNOTIFY;
-
+
#define PSN_FIRST (0U-200U)
#define PSN_LAST (0U-299U)
@@ -293,7 +293,7 @@
#define PSNRET_NOERROR 0
#define PSNRET_INVALID 1
#define PSNRET_INVALID_NOCHANGEPAGE 2
-
+
#define PSM_SETCURSEL (WM_USER + 101)
#define PSM_REMOVEPAGE (WM_USER + 102)
@@ -359,58 +359,58 @@
#define PropSheet_SetCurSel(hDlg, hpage, index) \
SendMessageA(hDlg, PSM_SETCURSEL, (WPARAM)index, (LPARAM)hpage)
-
+
#define PropSheet_RemovePage(hDlg, index, hpage) \
SNDMSG(hDlg, PSM_REMOVEPAGE, index, (LPARAM)hpage)
-
+
#define PropSheet_AddPage(hDlg, hpage) \
SNDMSG(hDlg, PSM_ADDPAGE, 0, (LPARAM)hpage)
-
+
#define PropSheet_Changed(hDlg, hwnd) \
SNDMSG(hDlg, PSM_CHANGED, (WPARAM)hwnd, 0L)
-
+
#define PropSheet_RestartWindows(hDlg) \
SNDMSG(hDlg, PSM_RESTARTWINDOWS, 0, 0L)
-
+
#define PropSheet_RebootSystem(hDlg) \
SNDMSG(hDlg, PSM_REBOOTSYSTEM, 0, 0L)
-
+
#define PropSheet_CancelToClose(hDlg) \
PostMessage(hDlg, PSM_CANCELTOCLOSE, 0, 0L)
-
+
#define PropSheet_QuerySiblings(hDlg, wParam, lParam) \
SNDMSG(hDlg, PSM_QUERYSIBLINGS, wParam, lParam)
-
+
#define PropSheet_UnChanged(hDlg, hwnd) \
SNDMSG(hDlg, PSM_UNCHANGED, (WPARAM)hwnd, 0L)
-
+
#define PropSheet_Apply(hDlg) \
SNDMSG(hDlg, PSM_APPLY, 0, 0L)
-
+
#define PropSheet_SetTitle(hDlg, wStyle, lpszText)\
SNDMSG(hDlg, PSM_SETTITLE, wStyle, (LPARAM)(LPCTSTR)lpszText)
-
+
#define PropSheet_SetWizButtons(hDlg, dwFlags) \
PostMessage(hDlg, PSM_SETWIZBUTTONS, 0, (LPARAM)dwFlags)
-
+
#define PropSheet_PressButton(hDlg, iButton) \
PostMessage(hDlg, PSM_PRESSBUTTON, (WPARAM)iButton, 0)
-
+
#define PropSheet_SetCurSelByID(hDlg, id) \
SNDMSG(hDlg, PSM_SETCURSELID, 0, (LPARAM)id)
#define PropSheet_SetFinishText(hDlg, lpszText) \
SNDMSG(hDlg, PSM_SETFINISHTEXT, 0, (LPARAM)lpszText)
-
+
#define PropSheet_GetTabControl(hDlg) \
(HWND)SNDMSG(hDlg, PSM_GETTABCONTROL, 0, 0)
-
+
#define PropSheet_IsDialogMessage(hDlg, pMsg) \
(BOOL)SNDMSG(hDlg, PSM_ISDIALOGMESSAGE, 0, (LPARAM)pMsg)
-
+
#define PropSheet_GetCurrentPageHwnd(hDlg) \
(HWND)SNDMSG(hDlg, PSM_GETCURRENTPAGEHWND, 0, 0L)
-
+
#ifdef __cplusplus
}
diff --git a/include/psapi.h b/include/psapi.h
index 79f57d5..738e625 100644
--- a/include/psapi.h
+++ b/include/psapi.h
@@ -29,16 +29,16 @@
LPVOID EntryPoint;
} MODULEINFO, *LPMODULEINFO;
-typedef struct _PROCESS_MEMORY_COUNTERS {
- DWORD cb;
+typedef struct _PROCESS_MEMORY_COUNTERS {
+ DWORD cb;
DWORD PageFaultCount;
DWORD PeakWorkingSetSize;
DWORD WorkingSetSize;
DWORD QuotaPeakPagedPoolUsage;
DWORD QuotaPagedPoolUsage;
- DWORD QuotaPeakNonPagedPoolUsage;
+ DWORD QuotaPeakNonPagedPoolUsage;
DWORD QuotaNonPagedPoolUsage;
- DWORD PagefileUsage;
+ DWORD PagefileUsage;
DWORD PeakPagefileUsage;
} PROCESS_MEMORY_COUNTERS;
typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;
diff --git a/include/queue.h b/include/queue.h
index 996e1d6..b53c7b7 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -35,7 +35,7 @@
* It might be necessary to store a pointer to the system message queue
* as well since windows 9x maintains per thread system message queues
*/
-typedef struct tagPERQUEUEDATA
+typedef struct tagPERQUEUEDATA
{
HWND hWndFocus; /* Focus window */
HWND hWndActive; /* Active window */
@@ -66,7 +66,7 @@
HANDLE16 hooks[WH_NB_HOOKS]; /* Task hooks list */
PERQUEUEDATA *pQData; /* pointer to (shared) PERQUEUEDATA structure */
-
+
} MESSAGEQUEUE;
diff --git a/include/ras.h b/include/ras.h
index 77b864b..ea4ae72 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -102,11 +102,11 @@
DWORD WINAPI RasEnumConnectionsA(LPRASCONNA,LPDWORD,LPDWORD);
DWORD WINAPI RasEnumConnectionsW(LPRASCONNW,LPDWORD,LPDWORD);
#define RasEnumConnections WINELIB_NAME_AW(RasEnumConnections)
-DWORD WINAPI RasEnumEntriesA(LPCSTR,LPCSTR,LPRASENTRYNAMEA,LPDWORD,LPDWORD);
-DWORD WINAPI RasEnumEntriesW(LPCWSTR,LPCWSTR,LPRASENTRYNAMEW,LPDWORD,LPDWORD);
+DWORD WINAPI RasEnumEntriesA(LPCSTR,LPCSTR,LPRASENTRYNAMEA,LPDWORD,LPDWORD);
+DWORD WINAPI RasEnumEntriesW(LPCWSTR,LPCWSTR,LPRASENTRYNAMEW,LPDWORD,LPDWORD);
#define RasEnumEntries WINELIB_NAME_AW(RasEnumEntries)
-DWORD WINAPI RasGetEntryDialParamsA(LPCSTR,LPRASDIALPARAMSA,LPBOOL);
-DWORD WINAPI RasGetEntryDialParamsW(LPCWSTR,LPRASDIALPARAMSW,LPBOOL);
+DWORD WINAPI RasGetEntryDialParamsA(LPCSTR,LPRASDIALPARAMSA,LPBOOL);
+DWORD WINAPI RasGetEntryDialParamsW(LPCWSTR,LPRASDIALPARAMSW,LPBOOL);
#define RasGetEntryDialParams WINELIB_NAME_AW(RasGetEntryDialParams)
DWORD WINAPI RasHangUpA(HRASCONN);
DWORD WINAPI RasHangUpW(HRASCONN);
diff --git a/include/richedit.h b/include/richedit.h
index 16214f0..5f305de 100644
--- a/include/richedit.h
+++ b/include/richedit.h
@@ -131,12 +131,12 @@
#define EM_GETSCROLLPOS (WM_USER + 221)
#define EM_SETSCROLLPOS (WM_USER + 222)
-#define EM_SETFONTSIZE (WM_USER + 223)
+#define EM_SETFONTSIZE (WM_USER + 223)
#define EM_GETZOOM (WM_USER + 224)
#define EM_SETZOOM (WM_USER + 225)
/* New notifications */
-#define EN_MSGFILTER 0x0700
+#define EN_MSGFILTER 0x0700
#define EN_REQUESTRESIZE 0x0701
#define EN_SELCHANGE 0x0702
#define EN_DROPFILES 0x0703
diff --git a/include/rpcdce.h b/include/rpcdce.h
index 02912b9..f6d6b64 100644
--- a/include/rpcdce.h
+++ b/include/rpcdce.h
@@ -83,7 +83,7 @@
typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, LPVOID Context );
typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)();
-typedef struct _RPC_POLICY
+typedef struct _RPC_POLICY
{
UINT Length;
ULONG EndpointFlags;
@@ -120,11 +120,11 @@
RPCRTAPI RPC_STATUS RPC_ENTRY
RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv );
-
+
RPCRTAPI RPC_STATUS RPC_ENTRY
RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv,
UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn );
-
+
RPCRTAPI RPC_STATUS RPC_ENTRY
RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv,
UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn );
diff --git a/include/shellapi.h b/include/shellapi.h
index e9a8470..223c138 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -33,7 +33,7 @@
* DragObject
*/
-typedef struct _DRAGINFOA
+typedef struct _DRAGINFOA
{ UINT uSize;
POINT pt;
BOOL fNC;
@@ -41,7 +41,7 @@
DWORD grfKeyState;
} DRAGINFOA, * LPDRAGINFOA;
-typedef struct _DRAGINFOW
+typedef struct _DRAGINFOW
{ UINT uSize;
POINT pt;
BOOL fNC;
@@ -96,7 +96,7 @@
#define ABE_RIGHT 2
#define ABE_BOTTOM 3
-typedef struct _AppBarData
+typedef struct _AppBarData
{ DWORD cbSize;
HWND hWnd;
UINT uCallbackMessage;
@@ -131,7 +131,7 @@
#define SHGFI_SELECTED 0x000010000 /* show icon in selected state */
#define SHGFI_ATTR_SPECIFIED 0x000020000 /* get only specified attributes */
-typedef struct tagSHFILEINFOA
+typedef struct tagSHFILEINFOA
{ HICON hIcon; /* icon */
int iIcon; /* icon index */
DWORD dwAttributes; /* SFGAO_ flags */
@@ -139,7 +139,7 @@
CHAR szTypeName[80]; /* type name */
} SHFILEINFOA;
-typedef struct tagSHFILEINFOW
+typedef struct tagSHFILEINFOW
{ HICON hIcon; /* icon */
int iIcon; /* icon index */
DWORD dwAttributes; /* SFGAO_ flags */
@@ -167,21 +167,21 @@
#define FOF_MULTIDESTFILES 0x0001
#define FOF_CONFIRMMOUSE 0x0002
-#define FOF_SILENT 0x0004
+#define FOF_SILENT 0x0004
#define FOF_RENAMEONCOLLISION 0x0008
-#define FOF_NOCONFIRMATION 0x0010
-#define FOF_WANTMAPPINGHANDLE 0x0020
+#define FOF_NOCONFIRMATION 0x0010
+#define FOF_WANTMAPPINGHANDLE 0x0020
#define FOF_ALLOWUNDO 0x0040
-#define FOF_FILESONLY 0x0080
-#define FOF_SIMPLEPROGRESS 0x0100
-#define FOF_NOCONFIRMMKDIR 0x0200
-#define FOF_NOERRORUI 0x0400
+#define FOF_FILESONLY 0x0080
+#define FOF_SIMPLEPROGRESS 0x0100
+#define FOF_NOCONFIRMMKDIR 0x0200
+#define FOF_NOERRORUI 0x0400
typedef WORD FILEOP_FLAGS;
-#define PO_DELETE 0x0013
-#define PO_RENAME 0x0014
-#define PO_PORTCHANGE 0x0020
+#define PO_DELETE 0x0013
+#define PO_RENAME 0x0014
+#define PO_PORTCHANGE 0x0020
typedef WORD PRINTEROP_FLAGS;
@@ -210,7 +210,7 @@
#define SHFILEOPSTRUCT WINELIB_NAME_AW(SHFILEOPSTRUCT)
#define LPSHFILEOPSTRUCT WINELIB_NAME_AW(LPSHFILEOPSTRUCT)
-DWORD WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);
+DWORD WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);
DWORD WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
#define SHFileOperation WINELIB_NAME_AW(SHFileOperation)
diff --git a/include/shlobj.h b/include/shlobj.h
index 6c1891d..74b9d50 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -30,7 +30,7 @@
#endif /* defined(__cplusplus) */
/****************************************************************************
-* SHITEMID, ITEMIDLIST, PIDL API
+* SHITEMID, ITEMIDLIST, PIDL API
*/
#include "pshpack1.h"
typedef struct
@@ -194,7 +194,7 @@
LPCSTR lpClass;
HKEY hkeyClass;
DWORD dwHotKey;
- union
+ union
{ HANDLE hIcon;
HANDLE hMonitor;
} DUMMYUNIONNAME;
@@ -261,7 +261,7 @@
BFFCALLBACK lpfn;
LPARAM lParam;
INT iImage;
-} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW;
+} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW;
#define BROWSEINFO WINELIB_NAME_AW(BROWSEINFO)
#define PBROWSEINFO WINELIB_NAME_AW(PBROWSEINFO)
@@ -274,7 +274,7 @@
#define BIF_RETURNFSANCESTORS 0x0008
#define BIF_EDITBOX 0x0010
#define BIF_VALIDATE 0x0020
-
+
#define BIF_BROWSEFORCOMPUTER 0x1000
#define BIF_BROWSEFORPRINTER 0x2000
#define BIF_BROWSEINCLUDEFILES 0x4000
@@ -324,7 +324,7 @@
#define SHDID_NET_RESTOFNET 16
#define SHDID_NET_OTHER 17
-typedef struct _SHDESCRIPTIONID
+typedef struct _SHDESCRIPTIONID
{ DWORD dwDescriptionId;
CLSID clsid;
} SHDESCRIPTIONID, *LPSHDESCRIPTIONID;
@@ -349,7 +349,7 @@
* we got using SHCreateShellViewEx()), to notify us of the various things that
* are happening to the shellview (and ask for things too).
*
-* You don't have to support anything here - anything you don't want to
+* You don't have to support anything here - anything you don't want to
* handle, the shell will do itself if you just return E_NOTIMPL. This parameters
* that the shell passes to this function are entirely undocumented.
*
diff --git a/include/snoop.h b/include/snoop.h
index 4cb2a15..d950258 100644
--- a/include/snoop.h
+++ b/include/snoop.h
@@ -1,4 +1,4 @@
-/*
+/*
* Definitions for inter-dll snooping
*
* Copyright 1998 Marcus Meissner
diff --git a/include/spy.h b/include/spy.h
index 938a77c..cbbb38f 100644
--- a/include/spy.h
+++ b/include/spy.h
@@ -2,7 +2,7 @@
* Message Logging functions
*
* Copyright 1994 Bob Amstadt
- * Copyright 1995 Alex Korobka
+ * Copyright 1995 Alex Korobka
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/include/sql.h b/include/sql.h
index 5cc4192..82a7979 100644
--- a/include/sql.h
+++ b/include/sql.h
@@ -638,7 +638,7 @@
SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle,
SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif
+#endif
SQLRETURN WINAPI SQLGetFunctions(SQLHDBC ConnectionHandle,
SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
@@ -743,4 +743,4 @@
#ifdef __cplusplus
}
#endif
-#endif
+#endif
diff --git a/include/sqlext.h b/include/sqlext.h
index 743cfb2..906997b 100644
--- a/include/sqlext.h
+++ b/include/sqlext.h
@@ -60,7 +60,7 @@
#define SQL_CP_STRICT_MATCH 0UL
#define SQL_CP_RELAXED_MATCH 1UL
-#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
+#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
#define SQL_OV_ODBC2 2UL
#define SQL_OV_ODBC3 3UL
@@ -139,7 +139,7 @@
#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
#define SQL_DTC_DONE 0L
-#endif
+#endif
#define SQL_CD_TRUE 1L
#define SQL_CD_FALSE 0L
@@ -187,9 +187,9 @@
#define SQL_ATTR_ROW_OPERATION_PTR 24
#define SQL_ATTR_ROW_STATUS_PTR 25
#define SQL_ATTR_ROWS_FETCHED_PTR 26
-#define SQL_ATTR_ROW_ARRAY_SIZE 27
+#define SQL_ATTR_ROW_ARRAY_SIZE 27
#define SQL_ATTR_SIMULATE_CURSOR SQL_SIMULATE_CURSOR
-#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
+#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
#endif
@@ -303,13 +303,13 @@
#if (ODBCVER >= 0x0300)
#define SQL_DIAG_CURSOR_ROW_COUNT (-1249)
#define SQL_DIAG_ROW_NUMBER (-1248)
-#define SQL_DIAG_COLUMN_NUMBER (-1247)
+#define SQL_DIAG_COLUMN_NUMBER (-1247)
#endif
#define SQL_DATE 9
#if (ODBCVER >= 0x0300)
#define SQL_INTERVAL 10
-#endif
+#endif
#define SQL_TIME 10
#define SQL_TIMESTAMP 11
#define SQL_LONGVARCHAR (-1)
@@ -321,7 +321,7 @@
#define SQL_BIT (-7)
#if (ODBCVER >= 0x0350)
#define SQL_GUID (-11)
-#endif
+#endif
#if (ODBCVER >= 0x0300)
#define SQL_CODE_YEAR 1
@@ -434,7 +434,7 @@
#define SQL_C_ULONG (SQL_C_LONG+SQL_UNSIGNED_OFFSET)
#define SQL_C_USHORT (SQL_C_SHORT+SQL_UNSIGNED_OFFSET)
#define SQL_C_UTINYINT (SQL_TINYINT+SQL_UNSIGNED_OFFSET)
-#define SQL_C_BOOKMARK SQL_C_ULONG
+#define SQL_C_BOOKMARK SQL_C_ULONG
#if (ODBCVER >= 0x0350)
#define SQL_C_GUID SQL_GUID
@@ -554,7 +554,7 @@
#endif
-#define SQL_INFO_FIRST 0
+#define SQL_INFO_FIRST 0
#define SQL_ACTIVE_CONNECTIONS 0
#define SQL_ACTIVE_STATEMENTS 1
#define SQL_DRIVER_HDBC 3
@@ -682,7 +682,7 @@
#define SQL_DROP_VIEW 143
#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1 144
#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2 145
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146
+#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146
#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 147
#define SQL_INDEX_KEYWORDS 148
#define SQL_INFO_SCHEMA_VIEWS 149
@@ -695,8 +695,8 @@
#define SQL_SCHEMA_TERM SQL_OWNER_TERM
#define SQL_SCHEMA_USAGE SQL_OWNER_USAGE
#define SQL_SQL92_DATETIME_FUNCTIONS 155
-#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156
-#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157
+#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156
+#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157
#define SQL_SQL92_GRANT 158
#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS 159
#define SQL_SQL92_PREDICATES 160
@@ -706,7 +706,7 @@
#define SQL_SQL92_STRING_FUNCTIONS 164
#define SQL_SQL92_VALUE_EXPRESSIONS 165
#define SQL_STANDARD_CLI_CONFORMANCE 166
-#define SQL_STATIC_CURSOR_ATTRIBUTES1 167
+#define SQL_STATIC_CURSOR_ATTRIBUTES1 167
#define SQL_STATIC_CURSOR_ATTRIBUTES2 168
#define SQL_AGGREGATE_FUNCTIONS 169
@@ -720,16 +720,16 @@
#if (ODBCVER >= 0x0300)
-#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
+#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
-#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
+#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
+#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
+#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
@@ -799,7 +799,7 @@
#endif
#if (ODBCVER >= 0x0300)
-#define SQL_SSF_CONVERT 0x00000001L
+#define SQL_SSF_CONVERT 0x00000001L
#define SQL_SSF_LOWER 0x00000002L
#define SQL_SSF_UPPER 0x00000004L
#define SQL_SSF_SUBSTRING 0x00000008L
@@ -841,7 +841,7 @@
#define SQL_SNVF_EXTRACT 0x00000008L
#define SQL_SNVF_OCTET_LENGTH 0x00000010L
#define SQL_SNVF_POSITION 0x00000020L
-#endif
+#endif
#define SQL_FN_TD_NOW 0x00000001L
#define SQL_FN_TD_CURDATE 0x00000002L
@@ -871,7 +871,7 @@
#define SQL_SDF_CURRENT_DATE 0x00000001L
#define SQL_SDF_CURRENT_TIME 0x00000002L
#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L
-#endif
+#endif
#define SQL_FN_SYS_USERNAME 0x00000001L
#define SQL_FN_SYS_DBNAME 0x00000002L
@@ -1064,7 +1064,7 @@
#define SQL_AF_MIN 0x00000008L
#define SQL_AF_SUM 0x00000010L
#define SQL_AF_DISTINCT 0x00000020L
-#define SQL_AF_ALL 0x00000040L
+#define SQL_AF_ALL 0x00000040L
#define SQL_SC_SQL92_ENTRY 0x00000001L
#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L
@@ -1104,7 +1104,7 @@
#define SQL_PARC_NO_BATCH 2
#define SQL_PAS_BATCH 1
-#define SQL_PAS_NO_BATCH 2
+#define SQL_PAS_NO_BATCH 2
#define SQL_PAS_NO_SELECT 3
#define SQL_IK_NONE 0x00000000L
@@ -1140,7 +1140,7 @@
#define SQL_AM_CONNECTION 1
#define SQL_AM_STATEMENT 2
-#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
+#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L
#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L
#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L
@@ -1250,7 +1250,7 @@
#define SQL_SG_REFERENCES_COLUMN 0x00000200L
#define SQL_SG_SELECT_TABLE 0x00000400L
#define SQL_SG_UPDATE_TABLE 0x00000800L
-#define SQL_SG_UPDATE_COLUMN 0x00001000L
+#define SQL_SG_UPDATE_COLUMN 0x00001000L
#define SQL_SP_EXISTS 0x00000001L
#define SQL_SP_ISNOTNULL 0x00000002L
@@ -1318,7 +1318,7 @@
#if (ODBCVER >= 0x0300)
#define SQL_FETCH_FIRST_USER 31
#define SQL_FETCH_FIRST_SYSTEM 32
-#endif
+#endif
#define SQL_ENTIRE_ROWSET 0
@@ -1593,12 +1593,12 @@
#define SQL_DAY SQL_CODE_DAY
#define SQL_HOUR SQL_CODE_HOUR
#define SQL_MINUTE SQL_CODE_MINUTE
-#define SQL_SECOND SQL_CODE_SECOND
+#define SQL_SECOND SQL_CODE_SECOND
#define SQL_YEAR_TO_MONTH SQL_CODE_YEAR_TO_MONTH
#define SQL_DAY_TO_HOUR SQL_CODE_DAY_TO_HOUR
#define SQL_DAY_TO_MINUTE SQL_CODE_DAY_TO_MINUTE
#define SQL_DAY_TO_SECOND SQL_CODE_DAY_TO_SECOND
-#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
+#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND
#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND
#endif
@@ -1621,7 +1621,7 @@
#define SQL_CR_CLOSE SQL_CB_CLOSE
#define SQL_CC_PRESERVE SQL_CB_PRESERVE
#define SQL_CR_PRESERVE SQL_CB_PRESERVE
-#define SQL_SCROLL_FORWARD_ONLY 0L
+#define SQL_SCROLL_FORWARD_ONLY 0L
#define SQL_SCROLL_KEYSET_DRIVEN (-1L)
#define SQL_SCROLL_DYNAMIC (-2L)
#define SQL_SCROLL_STATIC (-3L)
@@ -1640,9 +1640,9 @@
DWORD TraceVersion();
/*#define TRACE_ON 0x00000001L*/
-#define TRACE_VS_EVENT_ON 0x00000002L
+#define TRACE_VS_EVENT_ON 0x00000002L
-RETCODE TraceVSControl(DWORD);
+RETCODE TraceVSControl(DWORD);
#define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L
#define ODBC_VS_FLAG_UNICODE_COR 0x00000002L
@@ -1653,7 +1653,7 @@
const GUID *pguidEvent;
DWORD dwFlags;
union {
- WCHAR *wszArg;
+ WCHAR *wszArg;
CHAR *szArg;
} DUMMYUNIONNAME1;
union {
diff --git a/include/storage.h b/include/storage.h
index 665187a..ade3fd1 100644
--- a/include/storage.h
+++ b/include/storage.h
@@ -20,7 +20,7 @@
#define __WINE_STORAGE_H
/* "storage.h" is obsolete, you should include "objbase.h" instead */
-
+
#include "objbase.h"
#endif
diff --git a/include/tapi.h b/include/tapi.h
index ffc8ef5..f64a911 100644
--- a/include/tapi.h
+++ b/include/tapi.h
@@ -1,6 +1,6 @@
/*
* TAPI definitions
- *
+ *
* Copyright (c) 1999 Andreas Mohr
*
* This library is free software; you can redistribute it and/or
@@ -359,7 +359,7 @@
DWORD dwNumEntries;
LINEFORWARD ForwardList[1];
} LINEFORWARDLIST, *LPLINEFORWARDLIST;
-
+
typedef struct linegeneratetone_tag {
DWORD dwFrequency;
DWORD dwCadenceOn;
diff --git a/include/task.h b/include/task.h
index 6865523..a4fc200 100644
--- a/include/task.h
+++ b/include/task.h
@@ -73,8 +73,8 @@
HINSTANCE16, HQUEUE16);
/* Task database. See 'Windows Internals' p. 226.
- * Note that 16-bit OLE 2 libs like to read it directly
- * so we have to keep entry offsets as they are.
+ * Note that 16-bit OLE 2 libs like to read it directly
+ * so we have to keep entry offsets as they are.
*/
typedef struct _TDB
{
diff --git a/include/tchar.h b/include/tchar.h
index 01de609..deead02 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -220,9 +220,9 @@
typedef UCHAR _TUCHARA;
typedef WCHAR _TUCHARW;
DECL_WINELIB_TYPE_AW(_TUCHAR)
-
+
#ifdef __cplusplus
} /* extern "C" */
#endif
-
+
#endif /* __WINE_TCHAR_H */
diff --git a/include/thread.h b/include/thread.h
index 18aa4ae..44648ab 100644
--- a/include/thread.h
+++ b/include/thread.h
@@ -54,7 +54,7 @@
WORD stack_sel; /* 1-- 0e 16-bit stack selector */
DWORD selman_list; /* 1-n 10 Selector manager list */
DWORD user_ptr; /* 12n 14 User pointer */
-/* end of NT_TIB */
+/* end of NT_TIB */
struct _TEB *self; /* 12- 18 Pointer to this structure */
WORD tibflags; /* 1!n 1c Flags (NT: EnvironmentPointer) */
WORD mutex_count; /* 1-n 1e Win16 mutex count */
diff --git a/include/tlhelp32.h b/include/tlhelp32.h
index 1463398..e0fa176 100644
--- a/include/tlhelp32.h
+++ b/include/tlhelp32.h
@@ -37,54 +37,54 @@
HANDLE WINAPI CreateToolhelp32Snapshot(DWORD,DWORD);
/*
- * thread entry list as created by CreateToolHelp32Snapshot
+ * thread entry list as created by CreateToolHelp32Snapshot
*/
typedef struct tagTHREADENTRY32
{
- DWORD dwSize;
- DWORD cntUsage;
- DWORD th32ThreadID;
- DWORD th32OwnerProcessID;
- LONG tpBasePri;
- LONG tpDeltaPri;
- DWORD dwFlags;
-} THREADENTRY32, *PTHREADENTRY32, *LPTHREADENTRY32;
+ DWORD dwSize;
+ DWORD cntUsage;
+ DWORD th32ThreadID;
+ DWORD th32OwnerProcessID;
+ LONG tpBasePri;
+ LONG tpDeltaPri;
+ DWORD dwFlags;
+} THREADENTRY32, *PTHREADENTRY32, *LPTHREADENTRY32;
BOOL WINAPI Thread32First(HANDLE,LPTHREADENTRY32);
BOOL WINAPI Thread32Next(HANDLE,LPTHREADENTRY32);
/*
- * Process entry list as created by CreateToolHelp32Snapshot
+ * Process entry list as created by CreateToolHelp32Snapshot
*/
typedef struct tagPROCESSENTRY32
{
- DWORD dwSize;
- DWORD cntUsage;
- DWORD th32ProcessID;
- DWORD th32DefaultHeapID;
- DWORD th32ModuleID;
- DWORD cntThreads;
- DWORD th32ParentProcessID;
- LONG pcPriClassBase;
- DWORD dwFlags;
- char szExeFile[MAX_PATH];
-} PROCESSENTRY32, *PPROCESSENTRY32, *LPPROCESSENTRY32;
+ DWORD dwSize;
+ DWORD cntUsage;
+ DWORD th32ProcessID;
+ DWORD th32DefaultHeapID;
+ DWORD th32ModuleID;
+ DWORD cntThreads;
+ DWORD th32ParentProcessID;
+ LONG pcPriClassBase;
+ DWORD dwFlags;
+ char szExeFile[MAX_PATH];
+} PROCESSENTRY32, *PPROCESSENTRY32, *LPPROCESSENTRY32;
typedef struct tagPROCESSENTRY32W
{
- DWORD dwSize;
- DWORD cntUsage;
- DWORD th32ProcessID;
- DWORD th32DefaultHeapID;
- DWORD th32ModuleID;
- DWORD cntThreads;
- DWORD th32ParentProcessID;
- LONG pcPriClassBase;
- DWORD dwFlags;
- WCHAR szExeFile[MAX_PATH];
-} PROCESSENTRY32W, *PPROCESSENTRY32W, *LPPROCESSENTRY32W;
+ DWORD dwSize;
+ DWORD cntUsage;
+ DWORD th32ProcessID;
+ DWORD th32DefaultHeapID;
+ DWORD th32ModuleID;
+ DWORD cntThreads;
+ DWORD th32ParentProcessID;
+ LONG pcPriClassBase;
+ DWORD dwFlags;
+ WCHAR szExeFile[MAX_PATH];
+} PROCESSENTRY32W, *PPROCESSENTRY32W, *LPPROCESSENTRY32W;
BOOL WINAPI Process32First(HANDLE,LPPROCESSENTRY32);
BOOL WINAPI Process32FirstW(HANDLE,LPPROCESSENTRY32W);
@@ -100,38 +100,38 @@
#endif
/*
- * Module entry list as created by CreateToolHelp32Snapshot
+ * Module entry list as created by CreateToolHelp32Snapshot
*/
#define MAX_MODULE_NAME32 255
typedef struct tagMODULEENTRY32
{
- DWORD dwSize;
+ DWORD dwSize;
DWORD th32ModuleID;
- DWORD th32ProcessID;
+ DWORD th32ProcessID;
DWORD GlblcntUsage;
DWORD ProccntUsage;
BYTE *modBaseAddr;
DWORD modBaseSize;
DWORD hModule;
char szModule[MAX_MODULE_NAME32 + 1];
- char szExePath[MAX_PATH];
-} MODULEENTRY32, *PMODULEENTRY32, *LPMODULEENTRY32;
+ char szExePath[MAX_PATH];
+} MODULEENTRY32, *PMODULEENTRY32, *LPMODULEENTRY32;
typedef struct tagMODULEENTRY32W
{
- DWORD dwSize;
+ DWORD dwSize;
DWORD th32ModuleID;
- DWORD th32ProcessID;
+ DWORD th32ProcessID;
DWORD GlblcntUsage;
DWORD ProccntUsage;
BYTE *modBaseAddr;
DWORD modBaseSize;
DWORD hModule;
WCHAR szModule[MAX_MODULE_NAME32 + 1];
- WCHAR szExePath[MAX_PATH];
-} MODULEENTRY32W, *PMODULEENTRY32W, *LPMODULEENTRY32W;
+ WCHAR szExePath[MAX_PATH];
+} MODULEENTRY32W, *PMODULEENTRY32W, *LPMODULEENTRY32W;
BOOL WINAPI Module32First(HANDLE,LPMODULEENTRY32);
BOOL WINAPI Module32FirstW(HANDLE,LPMODULEENTRY32W);
diff --git a/include/ver.h b/include/ver.h
index 65ebd61..b224608 100644
--- a/include/ver.h
+++ b/include/ver.h
@@ -1,5 +1,5 @@
/* Definitions for the VERsion infolibrary (VER.DLL)
- *
+ *
* Copyright 1996 Marcus Meissner
*
* This library is free software; you can redistribute it and/or
diff --git a/include/vfw.h b/include/vfw.h
index 4bc7ae0..cb90022 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -401,7 +401,7 @@
LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD dw1, DWORD dw2);
-inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
+inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc,
int xSrc, int ySrc, int dxSrc, int dySrc,
LPBITMAPINFOHEADER lpbiDst, LPVOID lpDst,
@@ -501,7 +501,7 @@
#define ICDrawOpen(fccType, fccHandler, lpbiIn) \
ICLocate(fccType, fccHandler, lpbiIn, NULL, ICMODE_DRAW)
-HANDLE VFWAPI ICImageCompress(HIC hic, UINT uiFlags, LPBITMAPINFO lpbiIn,
+HANDLE VFWAPI ICImageCompress(HIC hic, UINT uiFlags, LPBITMAPINFO lpbiIn,
LPVOID lpBits, LPBITMAPINFO lpbiOut, LONG lQuality,
LONG* plSize);
@@ -625,7 +625,7 @@
inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn,
LPBITMAPINFOHEADER lpbiOut,
- int dxSrc, int dySrc,
+ int dxSrc, int dySrc,
int dxDst, int dyDst,
HIC hicDecomp)
{
@@ -819,7 +819,7 @@
WORD wPriority;
WORD wLanguage;
DWORD dwInitialFrames;
- DWORD dwScale;
+ DWORD dwScale;
DWORD dwRate; /* dwRate / dwScale == samples/second */
DWORD dwStart;
DWORD dwLength; /* In units above... */
@@ -924,7 +924,7 @@
DWORD dwSuggestedBufferSize;
DWORD dwWidth;
DWORD dwHeight;
- DWORD dwScale;
+ DWORD dwScale;
DWORD dwRate;
DWORD dwLength;
DWORD dwEditCount;
@@ -938,7 +938,7 @@
DWORD dwSuggestedBufferSize;
DWORD dwWidth;
DWORD dwHeight;
- DWORD dwScale;
+ DWORD dwScale;
DWORD dwRate;
DWORD dwLength;
DWORD dwEditCount;
@@ -1020,7 +1020,7 @@
#define IAVIStream_WriteData(p,a,b,c) ICOM_CALL3(WriteData,p,a,b,c)
#define IAVIStream_SetInfo(p,a,b) ICOM_CALL2(SetInfo,p,a,b)
-HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler);
+HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler);
HRESULT WINAPI AVIStreamCreate(PAVISTREAM*,LONG,LONG,CLSID*);
HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG size);
@@ -1047,7 +1047,7 @@
#define AVIStreamOpenFromFile WINELIB_NAME_AW(AVIStreamOpenFromFile)
#define AVIStreamFormatSize(pavi, lPos, plSize) \
- AVIStreamReadFormat(pavi, lPos, NULL, plSize)
+ AVIStreamReadFormat(pavi, lPos, NULL, plSize)
/*****************************************************************************
* IAVIFile interface
@@ -1378,7 +1378,7 @@
LPBITMAPINFOHEADER lpbi, INT dxSrc, INT dySrc, UINT wFlags);
BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, INT xDst, INT yDst, INT dxDst, INT dyDst,
- LPBITMAPINFOHEADER lpbi, LPVOID lpBits,
+ LPBITMAPINFOHEADER lpbi, LPVOID lpBits,
INT xSrc, INT ySrc, INT dxSrc, INT dySrc, UINT wFlags);
/* DrawDibDraw flags */
diff --git a/include/winbase.h b/include/winbase.h
index 19447c3..8de1617 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -371,9 +371,9 @@
#define CLRBREAK 9
/* Purge functions for Comm Port */
-#define PURGE_TXABORT 0x0001 /* Kill the pending/current writes to the
+#define PURGE_TXABORT 0x0001 /* Kill the pending/current writes to the
comm port */
-#define PURGE_RXABORT 0x0002 /*Kill the pending/current reads to
+#define PURGE_RXABORT 0x0002 /*Kill the pending/current reads to
the comm port */
#define PURGE_TXCLEAR 0x0004 /* Kill the transmit queue if there*/
#define PURGE_RXCLEAR 0x0008 /* Kill the typeahead buffer if there*/
@@ -395,7 +395,7 @@
#define DTR_CONTROL_HANDSHAKE 2
-#define LMEM_FIXED 0
+#define LMEM_FIXED 0
#define LMEM_MOVEABLE 0x0002
#define LMEM_NOCOMPACT 0x0010
#define LMEM_NODISCARD 0x0020
@@ -694,10 +694,10 @@
struct {
BYTE BaseMid;
BYTE Flags1;/*Declare as bytes to avoid alignment problems */
- BYTE Flags2;
+ BYTE Flags2;
BYTE BaseHi;
} Bytes;
- struct {
+ struct {
unsigned BaseMid : 8;
unsigned Type : 5;
unsigned Dpl : 2;
@@ -730,7 +730,7 @@
* This one seems to be a Win32 only definition. It also is defined with
* WINAPI instead of CALLBACK in the windows headers.
*/
-typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER,
+typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER,
LARGE_INTEGER, DWORD, DWORD, HANDLE,
HANDLE, LPVOID);
@@ -1363,7 +1363,7 @@
#define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid)
BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME);
BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
-BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);
+BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);
BOOL WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,LPVOID);
BOOL WINAPI LookupPrivilegeValueW(LPCWSTR,LPCWSTR,LPVOID);
#define LookupPrivilegeValue WINELIB_NAME_AW(LookupPrivilegeValue)
diff --git a/include/windowsx.h b/include/windowsx.h
index be08c7a..545d081 100644
--- a/include/windowsx.h
+++ b/include/windowsx.h
@@ -17,7 +17,7 @@
#ifndef _INC_WINDOWSX
#define _INC_WINDOWSX
-
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -239,7 +239,7 @@
((int)SendMessage((hwndCtl), CB_ADDSTRING, 0L, (LPARAM)(LPCTSTR)(data)))
#define ComboBox_AddString(hwndCtl, lpsz) \
- ((int)SendMessage((hwndCtl), CB_ADDSTRING, 0L, (LPARAM)(LPCTSTR)(lpsz)))
+ ((int)SendMessage((hwndCtl), CB_ADDSTRING, 0L, (LPARAM)(LPCTSTR)(lpsz)))
#define ComboBox_DeleteString(hwndCtl, index) \
((int)SendMessage((hwndCtl), CB_DELETESTRING, (WPARAM)(int)(index), 0L))
@@ -254,7 +254,7 @@
((int)SendMessage((hwndCtl), CB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(data)))
#define ComboBox_FindString(hwndCtl, indexStart, lpszFind) \
- ((int)SendMessage((hwndCtl), CB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind)))
+ ((int)SendMessage((hwndCtl), CB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind)))
#define ComboBox_FindStringExact(hwndCtl, indexStart, lpszFind) \
((int)SendMessage((hwndCtl), CB_FINDSTRINGEXACT, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind)))
@@ -1384,7 +1384,7 @@
#define FORWARD_WM_DRAWITEM(hwnd, lpDrawItem, fn) \
(void)(fn)((hwnd), WM_DRAWITEM, (WPARAM)(((const DRAWITEMSTRUCT *)lpDrawItem)->CtlID), (LPARAM)(const DRAWITEMSTRUCT *)(lpDrawItem))
-
+
/****** C runtime porting macros ****************************************/
#define _ncalloc calloc
@@ -1432,6 +1432,6 @@
#ifdef __cplusplus
}
#endif
-
+
#endif
diff --git a/include/wine/icmpapi.h b/include/wine/icmpapi.h
index 98cbf13..ba8fab0 100644
--- a/include/wine/icmpapi.h
+++ b/include/wine/icmpapi.h
@@ -1,7 +1,7 @@
/*
* Interface to the ICMP functions.
*
- * This header is not part of the standard headers, it is usually
+ * This header is not part of the standard headers, it is usually
* delivered separately and this is why it is not directly in 'include'.
*
* Depends on ipexport.h (there is no include directive in the original)
diff --git a/include/wine/ipexport.h b/include/wine/ipexport.h
index 9df85fb..371404e 100644
--- a/include/wine/ipexport.h
+++ b/include/wine/ipexport.h
@@ -1,7 +1,7 @@
/*
* Defines the types and macros used by the ICMP API, see icmpapi.h.
*
- * This header is not part of the standard headers, it is usually
+ * This header is not part of the standard headers, it is usually
* delivered separately and this is why it is not directly in 'include'.
*
* Copyright (C) 1999 Francois Gouget
diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index 817f56d..57f2e79 100644
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@@ -1,5 +1,5 @@
/*
- * This file defines the macros and types necessary to define COM interfaces,
+ * This file defines the macros and types necessary to define COM interfaces,
* and the three most basic COM interfaces: IUnknown, IMalloc and IClassFactory.
*
* Copyright (C) 1999 Francois Gouget
@@ -38,7 +38,7 @@
*
* The preferable method for using ICOM_USE_COM_INTERFACE_ATTRIBUTE macro
* would be to define it only for your Winelib application. This allows you
- * to have both binary and Winelib compatibility for C and C++ at the same
+ * to have both binary and Winelib compatibility for C and C++ at the same
* time :)
*/
/* #define ICOM_MSVTABLE_COMPAT 1 */
@@ -85,26 +85,26 @@
* Macros to define a COM interface
*/
/*
- * The goal of the following set of definitions is to provide a way to use the same
- * header file definitions to provide both a C interface and a C++ object oriented
- * interface to COM interfaces. The type of interface is selected automatically
- * depending on the language but it is always possible to get the C interface in C++
+ * The goal of the following set of definitions is to provide a way to use the same
+ * header file definitions to provide both a C interface and a C++ object oriented
+ * interface to COM interfaces. The type of interface is selected automatically
+ * depending on the language but it is always possible to get the C interface in C++
* by defining CINTERFACE.
*
* It is based on the following assumptions:
* - all COM interfaces derive from IUnknown, this should not be a problem.
- * - the header file only defines the interface, the actual fields are defined
+ * - the header file only defines the interface, the actual fields are defined
* separately in the C file implementing the interface.
*
- * The natural approach to this problem would be to make sure we get a C++ class and
+ * The natural approach to this problem would be to make sure we get a C++ class and
* virtual methods in C++ and a structure with a table of pointer to functions in C.
- * Unfortunately the layout of the virtual table is compiler specific, the layout of
- * g++ virtual tables is not the same as that of an egcs virtual table which is not the
- * same as that generated by Visual C+. There are workarounds to make the virtual tables
+ * Unfortunately the layout of the virtual table is compiler specific, the layout of
+ * g++ virtual tables is not the same as that of an egcs virtual table which is not the
+ * same as that generated by Visual C+. There are workarounds to make the virtual tables
* compatible via padding but unfortunately the one which is imposed to the WINE emulator
* by the Windows binaries, i.e. the Visual C++ one, is the most compact of all.
*
- * So the solution I finally adopted does not use virtual tables. Instead I use inline
+ * So the solution I finally adopted does not use virtual tables. Instead I use inline
* non virtual methods that dereference the method pointer themselves and perform the call.
*
* Let's take Direct3D as an example:
@@ -138,41 +138,41 @@
* #endif
*
* Comments:
- * - The ICOM_INTERFACE macro is used in the ICOM_METHOD macros to define the type of the 'this'
- * pointer. Defining this macro here saves us the trouble of having to repeat the interface
- * name everywhere. Note however that because of the way macros work, a macro like ICOM_METHOD1
- * cannot use 'ICOM_INTERFACE##_VTABLE' because this would give 'ICOM_INTERFACE_VTABLE' and not
+ * - The ICOM_INTERFACE macro is used in the ICOM_METHOD macros to define the type of the 'this'
+ * pointer. Defining this macro here saves us the trouble of having to repeat the interface
+ * name everywhere. Note however that because of the way macros work, a macro like ICOM_METHOD1
+ * cannot use 'ICOM_INTERFACE##_VTABLE' because this would give 'ICOM_INTERFACE_VTABLE' and not
* 'IDirect3D_VTABLE'.
- * - ICOM_METHODS defines the methods specific to this interface. It is then aggregated with the
+ * - ICOM_METHODS defines the methods specific to this interface. It is then aggregated with the
* inherited methods to form ICOM_IMETHODS.
- * - ICOM_IMETHODS defines the list of methods that are inheritable from this interface. It must
- * be written manually (rather than using a macro to generate the equivalent code) to avoid
+ * - ICOM_IMETHODS defines the list of methods that are inheritable from this interface. It must
+ * be written manually (rather than using a macro to generate the equivalent code) to avoid
* macro recursion (which compilers don't like).
- * - The ICOM_DEFINE finally declares all the structures necessary for the interface. We have to
+ * - The ICOM_DEFINE finally declares all the structures necessary for the interface. We have to
* explicitly use the interface name for macro expansion reasons again.
- * Inherited methods are inherited in C by using the IDirect3D_METHODS macro and the parent's
- * Xxx_IMETHODS macro. In C++ we need only use the IDirect3D_METHODS since method inheritance
+ * Inherited methods are inherited in C by using the IDirect3D_METHODS macro and the parent's
+ * Xxx_IMETHODS macro. In C++ we need only use the IDirect3D_METHODS since method inheritance
* is taken care of by the language.
- * - In C++ the ICOM_METHOD macros generate a function prototype and a call to a function pointer
- * method. This means using once 't1 p1, t2 p2, ...' and once 'p1, p2' without the types. The
- * only way I found to handle this is to have one ICOM_METHOD macro per number of parameters and
+ * - In C++ the ICOM_METHOD macros generate a function prototype and a call to a function pointer
+ * method. This means using once 't1 p1, t2 p2, ...' and once 'p1, p2' without the types. The
+ * only way I found to handle this is to have one ICOM_METHOD macro per number of parameters and
* to have it take only the type information (with const if necessary) as parameters.
- * The 'undef ICOM_INTERFACE' is here to remind you that using ICOM_INTERFACE in the following
- * macros will not work. This time it's because the ICOM_CALL macro expansion is done only once
- * the 'IDirect3D_Xxx' macro is expanded. And by that time ICOM_INTERFACE will be long gone
+ * The 'undef ICOM_INTERFACE' is here to remind you that using ICOM_INTERFACE in the following
+ * macros will not work. This time it's because the ICOM_CALL macro expansion is done only once
+ * the 'IDirect3D_Xxx' macro is expanded. And by that time ICOM_INTERFACE will be long gone
* anyway.
- * - You may have noticed the double commas after each parameter type. This allows you to put the
- * name of that parameter which I think is good for documentation. It is not required and since
- * I did not know what to put there for this example (I could only find doc about IDirect3D2),
+ * - You may have noticed the double commas after each parameter type. This allows you to put the
+ * name of that parameter which I think is good for documentation. It is not required and since
+ * I did not know what to put there for this example (I could only find doc about IDirect3D2),
* I left them blank.
- * - Finally the set of 'IDirect3D_Xxx' macros is a standard set of macros defined to ease access
- * to the interface methods in C. Unfortunately I don't see any way to avoid having to duplicate
- * the inherited method definitions there. This time I could have used a trick to use only one
+ * - Finally the set of 'IDirect3D_Xxx' macros is a standard set of macros defined to ease access
+ * to the interface methods in C. Unfortunately I don't see any way to avoid having to duplicate
+ * the inherited method definitions there. This time I could have used a trick to use only one
* macro whatever the number of parameters but I prefered to have it work the same way as above.
- * - You probably have noticed that we don't define the fields we need to actually implement this
- * interface: reference count, pointer to other resources and miscellaneous fields. That's
- * because these interfaces are just that: interfaces. They may be implemented more than once, in
- * different contexts and sometimes not even in Wine. Thus it would not make sense to impose
+ * - You probably have noticed that we don't define the fields we need to actually implement this
+ * interface: reference count, pointer to other resources and miscellaneous fields. That's
+ * because these interfaces are just that: interfaces. They may be implemented more than once, in
+ * different contexts and sometimes not even in Wine. Thus it would not make sense to impose
* that the interface contains some specific fields.
*
*
@@ -191,7 +191,7 @@
* HRESULT (*CreateMaterial)(IDirect3D* me, LPDIRECT3DMATERIAL* a, IUnknown* b);
* HRESULT (*CreateViewport)(IDirect3D* me, LPDIRECT3DVIEWPORT* a, IUnknown* b);
* HRESULT (*FindDevice)(IDirect3D* me, LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b);
- * };
+ * };
*
* #ifdef ICOM_CINTERFACE
* // *** IUnknown methods *** //
@@ -208,20 +208,20 @@
* #endif
*
* Comments:
- * - IDirect3D only contains a pointer to the IDirect3D virtual/jump table. This is the only thing
- * the user needs to know to use the interface. Of course the structure we will define to
+ * - IDirect3D only contains a pointer to the IDirect3D virtual/jump table. This is the only thing
+ * the user needs to know to use the interface. Of course the structure we will define to
* implement this interface will have more fields but the first one will match this pointer.
- * - The code generated by ICOM_DEFINE defines both the structure representing the interface and
- * the structure for the jump table. ICOM_DEFINE uses the parent's Xxx_IMETHODS macro to
- * automatically repeat the prototypes of all the inherited methods and then uses IDirect3D_METHODS
+ * - The code generated by ICOM_DEFINE defines both the structure representing the interface and
+ * the structure for the jump table. ICOM_DEFINE uses the parent's Xxx_IMETHODS macro to
+ * automatically repeat the prototypes of all the inherited methods and then uses IDirect3D_METHODS
* to define the IDirect3D methods.
- * - Each method is declared as a pointer to function field in the jump table. The implementation
- * will fill this jump table with appropriate values, probably using a static variable, and
+ * - Each method is declared as a pointer to function field in the jump table. The implementation
+ * will fill this jump table with appropriate values, probably using a static variable, and
* initialize the lpVtbl field to point to this variable.
- * - The IDirect3D_Xxx macros then just derefence the lpVtbl pointer and use the function pointer
- * corresponding to the macro name. This emulates the behavior of a virtual table and should be
+ * - The IDirect3D_Xxx macros then just derefence the lpVtbl pointer and use the function pointer
+ * corresponding to the macro name. This emulates the behavior of a virtual table and should be
* just as fast.
- * - This C code should be quite compatible with the Windows headers both for code that uses COM
+ * - This C code should be quite compatible with the Windows headers both for code that uses COM
* interfaces and for code implementing a COM interface.
*
*
@@ -245,31 +245,31 @@
* private: HRESULT (*FindDevice)(IDirect3D* me, LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b);
* public: inline HRESULT FindDevice(LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b)
* { return ((IDirect3D*)t.lpVtbl)->FindDevice(this,a,b); };
- * };
+ * };
*
* Comments:
- * - In C++ IDirect3D does double duty as both the virtual/jump table and as the interface
- * definition. The reason for this is to avoid having to duplicate the mehod definitions: once
- * to have the function pointers in the jump table and once to have the methods in the interface
- * class. Here one macro can generate both. This means though that the first pointer, t.lpVtbl
- * defined in IUnknown, must be interpreted as the jump table pointer if we interpret the
- * structure as the the interface class, and as the function pointer to the QueryInterface
- * method, t.QueryInterface, if we interpret the structure as the jump table. Fortunately this
+ * - In C++ IDirect3D does double duty as both the virtual/jump table and as the interface
+ * definition. The reason for this is to avoid having to duplicate the mehod definitions: once
+ * to have the function pointers in the jump table and once to have the methods in the interface
+ * class. Here one macro can generate both. This means though that the first pointer, t.lpVtbl
+ * defined in IUnknown, must be interpreted as the jump table pointer if we interpret the
+ * structure as the the interface class, and as the function pointer to the QueryInterface
+ * method, t.QueryInterface, if we interpret the structure as the jump table. Fortunately this
* gymnastic is entirely taken care of in the header of IUnknown.
- * - Of course in C++ we use inheritance so that we don't have to duplicate the method definitions.
- * - Since IDirect3D does double duty, each ICOM_METHOD macro defines both a function pointer and
- * a non-vritual inline method which dereferences it and calls it. This way this method behaves
- * just like a virtual method but does not create a true C++ virtual table which would break the
- * structure layout. If you look at the implementation of these methods you'll notice that they
- * would not work for void functions. We have to return something and fortunately this seems to
+ * - Of course in C++ we use inheritance so that we don't have to duplicate the method definitions.
+ * - Since IDirect3D does double duty, each ICOM_METHOD macro defines both a function pointer and
+ * a non-vritual inline method which dereferences it and calls it. This way this method behaves
+ * just like a virtual method but does not create a true C++ virtual table which would break the
+ * structure layout. If you look at the implementation of these methods you'll notice that they
+ * would not work for void functions. We have to return something and fortunately this seems to
* be what all the COM methods do (otherwise we would need another set of macros).
- * - Note how the ICOM_METHOD generates both function prototypes mixing types and formal parameter
- * names and the method invocation using only the formal parameter name. This is the reason why
+ * - Note how the ICOM_METHOD generates both function prototypes mixing types and formal parameter
+ * names and the method invocation using only the formal parameter name. This is the reason why
* we need different macros to handle different numbers of parameters.
- * - Finally there is no IDirect3D_Xxx macro. These are not needed in C++ unless the CINTERFACE
+ * - Finally there is no IDirect3D_Xxx macro. These are not needed in C++ unless the CINTERFACE
* macro is defined in which case we would not be here.
- * - This C++ code works well for code that just uses COM interfaces. But it will not work with
- * C++ code implement a COM interface. That's because such code assumes the interface methods
+ * - This C++ code works well for code that just uses COM interfaces. But it will not work with
+ * C++ code implement a COM interface. That's because such code assumes the interface methods
* are declared as virtual C++ methods which is not the case here.
*
*
@@ -305,12 +305,12 @@
* };
*
* Comments:
- * - We first define what the interface really contains. This is th e_IDirect3D structure. The
+ * - We first define what the interface really contains. This is th e_IDirect3D structure. The
* first field must of course be the virtual table pointer. Everything else is free.
- * - Then we predeclare our static virtual table variable, we will need its address in some
+ * - Then we predeclare our static virtual table variable, we will need its address in some
* methods to initialize the virtual table pointer of the returned interface objects.
- * - Then we implement the interface methods. To match what has been declared in the header file
- * they must take a pointer to a IDirect3D structure and we must cast it to an _IDirect3D so that
+ * - Then we implement the interface methods. To match what has been declared in the header file
+ * they must take a pointer to a IDirect3D structure and we must cast it to an _IDirect3D so that
* we can manipulate the fields. This is performed by the ICOM_THIS macro.
* - Finally we initialize the virtual table.
*/
@@ -663,7 +663,7 @@
struct IUnknown {
ICOM_VFIELD(IUnknown);
#if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE)
-} __attribute__ ((com_interface));
+} __attribute__ ((com_interface));
#else
};
#endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE */
@@ -683,7 +683,7 @@
ICOM_METHOD (ULONG,AddRef)
ICOM_METHOD (ULONG,Release)
#if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE)
-} __attribute__ ((com_interface));
+} __attribute__ ((com_interface));
#else
};
#endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE */
@@ -821,7 +821,7 @@
HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister);
HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid);
-
+
/*****************************************************************************
* COM Server dll - exports
*/
diff --git a/include/wine/obj_cache.h b/include/wine/obj_cache.h
index f29d50f..6bf5ce8 100644
--- a/include/wine/obj_cache.h
+++ b/include/wine/obj_cache.h
@@ -71,7 +71,7 @@
#define IOleCache_EnumCache(p,a) ICOM_CALL1(EnumCache,p,a)
#define IOleCache_InitCache(p,a) ICOM_CALL1(InitCache,p,a)
#define IOleCache_SetData(p,a,b,c) ICOM_CALL3(SetData,p,a,b,c)
-
+
/*****************************************************************************
* IOleCache2 interface
diff --git a/include/wine/obj_comcat.h b/include/wine/obj_comcat.h
index bc3e45c..203197c 100644
--- a/include/wine/obj_comcat.h
+++ b/include/wine/obj_comcat.h
@@ -61,7 +61,7 @@
DEFINE_GUID(CATID_PersistsToPropertyBag, 0x0DE86A57, 0x2BAA, 0x11CF, 0xA2, 0x29, 0x00, 0xAA, 0x00, 0x3D, 0x73, 0x52);
DEFINE_GUID(CATID_InternetAware, 0x0DE86A58, 0x2BAA, 0x11CF, 0xA2, 0x29, 0x00, 0xAA, 0x00, 0x3D, 0x73, 0x52);
DEFINE_GUID(CATID_DesignTimeUIActivatableControl, 0xF2BB56D1, 0xDB07, 0x11D1, 0xAA, 0x6B, 0x00, 0x60, 0x97, 0xDB, 0x95, 0x39);
-
+
/*****************************************************************************
* Aliases for EnumGUID
*/
diff --git a/include/wine/obj_connection.h b/include/wine/obj_connection.h
index b2f8d85..5f761ce 100644
--- a/include/wine/obj_connection.h
+++ b/include/wine/obj_connection.h
@@ -36,7 +36,7 @@
IUnknown *pUnk;
DWORD dwCookie;
} CONNECTDATA, *LPCONNECTDATA;
-
+
/*****************************************************************************
* Predeclare the interfaces
*/
@@ -151,7 +151,7 @@
#define IEnumConnectionPoints_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumConnectionPoints_Reset(p) ICOM_CALL (Reset,p)
#define IEnumConnectionPoints_Clone(p,a) ICOM_CALL1(Clone,p,a)
-
+
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_contextmenu.h b/include/wine/obj_contextmenu.h
index 9493120..2ccedaa 100644
--- a/include/wine/obj_contextmenu.h
+++ b/include/wine/obj_contextmenu.h
@@ -3,7 +3,7 @@
*
* Undocumented:
* word95 gets a IContextMenu Interface and calls HandleMenuMsg()
- * which should only a member of IContextMenu2.
+ * which should only a member of IContextMenu2.
*
* Copyright (C) 1999 Juergen Schmied
*
@@ -79,7 +79,7 @@
#define CMIC_MASK_PTINVOKE 0x20000000
/*NOTE: When SEE_MASK_HMONITOR is set, hIcon is treated as hMonitor */
-typedef struct tagCMINVOKECOMMANDINFO
+typedef struct tagCMINVOKECOMMANDINFO
{ DWORD cbSize; /* sizeof(CMINVOKECOMMANDINFO) */
DWORD fMask; /* any combination of CMIC_MASK_* */
HWND hwnd; /* might be NULL (indicating no owner window) */
@@ -92,7 +92,7 @@
HANDLE hIcon;
} CMINVOKECOMMANDINFO, *LPCMINVOKECOMMANDINFO;
-typedef struct tagCMInvokeCommandInfoEx
+typedef struct tagCMInvokeCommandInfoEx
{ DWORD cbSize; /* must be sizeof(CMINVOKECOMMANDINFOEX) */
DWORD fMask; /* any combination of CMIC_MASK_* */
HWND hwnd; /* might be NULL (indicating no owner window) */
diff --git a/include/wine/obj_control.h b/include/wine/obj_control.h
index b40c21b..e4a4791 100644
--- a/include/wine/obj_control.h
+++ b/include/wine/obj_control.h
@@ -45,7 +45,7 @@
READYSTATE_INTERACTIVE = 3,
READYSTATE_COMPLETE = 4
} READYSTATE;
-
+
typedef struct tagExtentInfo
{
ULONG cb;
@@ -118,7 +118,7 @@
DVASPECT_TRANSPARENT = 32
} DVASPECT2;
-typedef enum tagHITRESULT
+typedef enum tagHITRESULT
{
HITRESULT_OUTSIDE = 0,
HITRESULT_TRANSPARENT = 1,
@@ -168,13 +168,13 @@
DEFINE_GUID(IID_IViewObjectEx, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); /* FIXME need GUID */
typedef struct IViewObjectEx IViewObjectEx, *LPVIEWOBJECTEX;
-
+
DEFINE_GUID(IID_IProvideClassInfo, 0xb196b283, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
typedef struct IProvideClassInfo IProvideClassInfo, *LPPROVIDECLASSINFO;
-
+
DEFINE_GUID(IID_IProvideClassInfo2, 0xa6bc3ac0, 0xdbaa, 0x11ce, 0x9d, 0xe3, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51);
typedef struct IProvideClassInfo2 IProvideClassInfo2, *LPPROVIDECLASSINFO2;
-
+
/*****************************************************************************
* IOleControl interface
*/
@@ -199,12 +199,12 @@
#define IOleControl_OnMnemonic(p,a) ICOM_CALL1(OnMnemonic,p,a)
#define IOleControl_OnAmbientPropertyChange(p,a) ICOM_CALL1(OnAmbientPropertyChange,p,a)
#define IOleControl_FreezeEvents(p,a) ICOM_CALL1(FreezeEvents,p,a)
-
+
/*****************************************************************************
* IOleControlSite interface
*/
-#define ICOM_INTERFACE IOleControlSite
+#define ICOM_INTERFACE IOleControlSite
#define IOleControlSite_METHODS \
ICOM_METHOD (HRESULT,OnControlInfoChanged) \
ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock) \
@@ -231,8 +231,8 @@
#define IOleControlSite_TranslateAccelerator(p,a,b) ICOM_CALL1(TranslateAccelerator,p,a,b)
#define IOleControlSite_OnFocus(p,a) ICOM_CALL1(OnFocus,p,a)
#define IOleControlSite_ShowPropertyFrame(p) ICOM_CALL1(ShowPropertyFrame,p)
-
-
+
+
/*****************************************************************************
* IOleInPlaceSiteEx interface
*/
@@ -269,7 +269,7 @@
#define IOleInPlaceSiteEx_OnInPlaceActivateEx(p,a,b) ICOM_CALL2(OnInPlaceActivateEx,p,a,b)
#define IOleInPlaceSiteEx_OnInPlaceDeactivateEx(p,a) ICOM_CALL1(OnInPlaceDeactivateEx,p,a)
#define IOleInPlaceSiteEx_RequestUIActivate(p) ICOM_CALL (RequestUIActivate,p)
-
+
/*****************************************************************************
* IOleInPlaceSiteWindowless interface
@@ -355,7 +355,7 @@
/*** IOleInPlaceObjectWindowless methods ***/
#define IOleInPlaceObjectWindowless_OnWindowMessage(p,a,b,c,d) ICOM_CALL4(OnWindowMessage,p,a,b,c,d)
#define IOleInPlaceObjectWindowless_GetDropTarget(p,a) ICOM_CALL1(GetDropTarget,p,a)
-
+
/*****************************************************************************
* IClassFactory2 interface
@@ -430,7 +430,7 @@
#define ICOM_INTERFACE IProvideClassInfo
#define IProvideClassInfo_METHODS \
- ICOM_METHOD1(HRESULT,GetClassInfo, ITypeInfo**,ppTI)
+ ICOM_METHOD1(HRESULT,GetClassInfo, ITypeInfo**,ppTI)
#define IProvideClassInfo_IMETHODS \
IUnknown_IMETHODS \
IProvideClassInfo_METHODS
@@ -445,7 +445,7 @@
#define IProvideClassInfo_GetClassInfo(p,a) ICOM_CALL1(GetClassInfo,p,a)
-
+
/*****************************************************************************
* IProvideClassInfo2 interface
*/
@@ -463,7 +463,7 @@
#define IProvideClassInfo2_AddRef(p) ICOM_CALL (AddRef,p)
#define IProvideClassInfo2_Release(p) ICOM_CALL (Release,p)
/*** IProvideClassInfo methods ***/
-#define IProvideClassInfo2_GetClassInfo(p,a) ICOM_CALL1(GetClassInfo,p,a)
+#define IProvideClassInfo2_GetClassInfo(p,a) ICOM_CALL1(GetClassInfo,p,a)
/*** IProvideClassInfo2 methods ***/
#define IProvideClassInfo2_GetGUID(p,a,b) ICOM_CALL2(GetGUID,p,a,b)
diff --git a/include/wine/obj_dataobject.h b/include/wine/obj_dataobject.h
index 21b01a1..a46778f 100644
--- a/include/wine/obj_dataobject.h
+++ b/include/wine/obj_dataobject.h
@@ -33,7 +33,7 @@
DATADIR_GET = 1,
DATADIR_SET = 2
} DATADIR;
-
+
typedef struct DVTARGETDEVICE16 DVTARGETDEVICE16, *LPDVTARGETDEVICE16;
typedef struct DVTARGETDEVICE DVTARGETDEVICE, *LPDVTARGETDEVICE;
@@ -107,7 +107,7 @@
TYMED_ENHMF = 64,
TYMED_NULL = 0
} TYMED;
-
+
typedef struct tagRemSTGMEDIUM
{
DWORD tymed;
@@ -132,7 +132,7 @@
IStorage *pstg;
} DUMMYUNIONNAME;
IUnknown *pUnkForRelease;
-};
+};
typedef enum tagADVF
{
diff --git a/include/wine/obj_inplace.h b/include/wine/obj_inplace.h
index fe877c0..663d5d4 100644
--- a/include/wine/obj_inplace.h
+++ b/include/wine/obj_inplace.h
@@ -1,6 +1,6 @@
/*
* Defines the COM interfaces and APIs related to structured data storage.
- *
+ *
* Depends on 'obj_base.h'.
*
* Copyright (C) 1999 Paul Quinn
@@ -90,7 +90,7 @@
DWORD fuFlags;
DWORD grfAttribs;
} OLEVERB, *LPOLEVERB;
-
+
typedef enum tagOLELINKBIND
{
OLELINKBIND_EVENIFCLASSDIFF = 1
@@ -118,12 +118,12 @@
OLECONTF_OLNYUSER = 8,
OLECONTF_ONLYIFRUNNING = 16
} OLECONTF;
-
+
typedef HGLOBAL HOLEMENU;
typedef LPRECT LPBORDERWIDTHS;
typedef LPCRECT LPCBORDERWIDTHS;
-
-
+
+
/*****************************************************************************
* Predeclare the interfaces
*/
@@ -267,7 +267,7 @@
#define IOleInPlaceUIWindow_RequestBorderSpace(p,a) ICOM_CALL1(RequestBorderSpace,p,a)
#define IOleInPlaceUIWindow_SetBorderSpace(p,a) ICOM_CALL1(SetBorderSpace,p,a)
#define IOleInPlaceUIWindow_SetActiveObject(p,a,b) ICOM_CALL2(SetActiveObject,p,a,b)
-
+
/*****************************************************************************
* IOleInPlaceFrame interface
@@ -305,7 +305,7 @@
#define IOleInPlaceFrame_SetStatusText ICOM_CALL1(SetStatusText,p,a)
#define IOleInPlaceFrame_EnableModeless ICOM_CALL1(EnableModeless,p,a)
#define IOleInPlaceFrame_TranslateAccelerator ICOM_CALL2(TranslateAccelerator,p,a,b)
-
+
/*****************************************************************************
* IOleInPlaceSite interface
@@ -389,15 +389,15 @@
IParseDisplayName_METHODS
ICOM_DEFINE(IParseDisplayName,IUnknown)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define IParseDisplayName_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IParseDisplayName_AddRef(p) ICOM_CALL (AddRef,p)
#define IParseDisplayName_Release(p) ICOM_CALL (Release,p)
/*** IParseDisplayName methods ***/
#define IParseDisplayName_ParseDisplayName(p,a,b,c,d) ICOM_CALL4(ParseDisplayName,p,a,b,c,d)
-
-
+
+
/*****************************************************************************
* IOleContainer interface
*/
diff --git a/include/wine/obj_marshal.h b/include/wine/obj_marshal.h
index 4d442ec..74e3ef7 100644
--- a/include/wine/obj_marshal.h
+++ b/include/wine/obj_marshal.h
@@ -1,5 +1,5 @@
/*
- * Defines the COM interfaces and APIs that allow an interface to
+ * Defines the COM interfaces and APIs that allow an interface to
* specify a custom marshaling for its objects.
*
* Copyright (C) 1999 Francois Gouget
diff --git a/include/wine/obj_misc.h b/include/wine/obj_misc.h
index c79ec32..19719f3 100644
--- a/include/wine/obj_misc.h
+++ b/include/wine/obj_misc.h
@@ -1,7 +1,7 @@
/*
* Defines miscellaneous COM interfaces and APIs defined in objidl.h.
- * These did not really fit into the other categories, whould have
- * required their own specific category or are too rarely used to be
+ * These did not really fit into the other categories, whould have
+ * required their own specific category or are too rarely used to be
* put in 'obj_base.h'.
*
* Copyright (C) the Wine project
@@ -188,9 +188,9 @@
/* FIXME: unimplemented */
HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew);
-HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid,
+HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid,
LPUNKNOWN pUnkOuter,
- DWORD dwClsContext,
+ DWORD dwClsContext,
COSERVERINFO* pServerInfo,
ULONG cmq,
MULTI_QI* pResults);
diff --git a/include/wine/obj_oleaut.h b/include/wine/obj_oleaut.h
index dc2921b..8bfc8e1 100644
--- a/include/wine/obj_oleaut.h
+++ b/include/wine/obj_oleaut.h
@@ -71,7 +71,7 @@
*/
/*****************************************************************
- * SafeArray defines and structs
+ * SafeArray defines and structs
*/
#define FADF_AUTO ( 0x1 )
@@ -87,18 +87,18 @@
#define FADF_VARIANT ( 0x800 )
#define FADF_RESERVED ( 0xf008 )
-/* Undocumented flags */
-#define FADF_CREATEVECTOR ( 0x2000 ) /* set when the safe array is created using SafeArrayCreateVector */
+/* Undocumented flags */
+#define FADF_CREATEVECTOR ( 0x2000 ) /* set when the safe array is created using SafeArrayCreateVector */
-typedef struct tagSAFEARRAYBOUND
+typedef struct tagSAFEARRAYBOUND
{
ULONG cElements; /* Number of elements in dimension */
LONG lLbound; /* Lower bound of dimension */
} SAFEARRAYBOUND;
typedef struct tagSAFEARRAY
-{
+{
USHORT cDims; /* Count of array dimension */
USHORT fFeatures; /* Flags describing the array */
ULONG cbElements; /* Size of each element */
@@ -241,7 +241,7 @@
UINT cNamedArgs;
} DISPPARAMS;
-typedef struct tagEXCEPINFO
+typedef struct tagEXCEPINFO
{
WORD wCode;
WORD wReserved;
@@ -290,7 +290,7 @@
} DUMMYUNIONNAME;
VARTYPE vt;
} TYPEDESC;
-
+
typedef struct tagELEMDESC
{
TYPEDESC tdesc;
@@ -658,7 +658,7 @@
#define ITypeInfo_ReleaseTypeAttr(p,a) ICOM_CALL1(ReleaseTypeAttr,p,a)
#define ITypeInfo_ReleaseFuncDesc(p,a) ICOM_CALL1(ReleaseFuncDesc,p,a)
#define ITypeInfo_ReleaseVarDesc(p,a) ICOM_CALL1(ReleaseVarDesc,p,a)
-
+
/*****************************************************************************
* ITypeInfo2 interface
@@ -696,10 +696,10 @@
#define ITypeInfo2_IMETHODS \
IUnknown_IMETHODS \
ITypeInfo_METHODS \
- ITypeInfo2_METHODS
+ ITypeInfo2_METHODS
ICOM_DEFINE(ITypeInfo2,ITypeInfo)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define ITypeInfo2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ITypeInfo2_AddRef(p) ICOM_CALL (AddRef,p)
@@ -822,7 +822,7 @@
#define ICOM_INTERFACE ITypeComp
#define ITypeComp_METHODS \
ICOM_METHOD6(HRESULT,Bind, LPOLESTR,szName, ULONG,lHashVal, WORD,wFlags, ITypeInfo**,ppTInfo, DESCKIND*,pDescKind, BINDPTR*,pBindPtr) \
- ICOM_METHOD4(HRESULT,BindType, LPOLESTR,szName, ULONG,lHashVal, ITypeInfo**,ppTInfo, ITypeComp**,ppTComp)
+ ICOM_METHOD4(HRESULT,BindType, LPOLESTR,szName, ULONG,lHashVal, ITypeInfo**,ppTInfo, ITypeComp**,ppTComp)
#define ITypeComp_IMETHODS \
IUnknown_IMETHODS \
ITypeComp_METHODS
@@ -836,7 +836,7 @@
/*** ITypeComp methods ***/
#define ITypeComp_Bind(p,a,b,c,d,e,f) ICOM_CALL6(Bind,p,a,b,c,d,e,f)
#define ITypeComp_BindType(p,a,b,c,d) ICOM_CALL4(BindType,p,a,b,c,d)
-
+
/*****************************************************************************
* IEnumVARIANT interface
*/
@@ -845,7 +845,7 @@
ICOM_METHOD3(HRESULT,Next, ULONG,celt, VARIANT*,rgVar, ULONG*,pCeltFetched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
- ICOM_METHOD1(HRESULT,Clone, IEnumVARIANT**,ppEnum)
+ ICOM_METHOD1(HRESULT,Clone, IEnumVARIANT**,ppEnum)
#define IEnumVARIANT_IMETHODS \
IUnknown_IMETHODS \
IEnumVARIANT_METHODS
@@ -861,6 +861,6 @@
#define IEnumVARIANT_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumVARIANT_Reset(p) ICOM_CALL (Reset,p)
#define IEnumVARIANT_Clone(p,a) ICOM_CALL1(Clone,p,a)
-
+
#endif /* __WINE_WINE_OBJ_OLEAUT_H */
diff --git a/include/wine/obj_olefont.h b/include/wine/obj_olefont.h
index 2761d12..14456e4 100644
--- a/include/wine/obj_olefont.h
+++ b/include/wine/obj_olefont.h
@@ -66,7 +66,7 @@
ICOM_METHOD1(HRESULT, QueryTextMetrics, TEXTMETRICOLE*, ptm) \
ICOM_METHOD1(HRESULT, AddRefHfont, HFONT, hfont) \
ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT, hfont) \
- ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc)
+ ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc)
#define IFont_IMETHODS \
IUnknown_IMEHTODS \
IFont_METHODS
@@ -108,7 +108,7 @@
* IFont interface
*/
#define ICOM_INTERFACE IFontDisp
-#define IFontDisp_METHODS
+#define IFontDisp_METHODS
#define IFontDisp_IMETHODS \
IUnknown_IMETHODS \
IFontDisp_METHODS
diff --git a/include/wine/obj_oleobj.h b/include/wine/obj_oleobj.h
index 5727142..9a351db 100644
--- a/include/wine/obj_oleobj.h
+++ b/include/wine/obj_oleobj.h
@@ -1,6 +1,6 @@
/*
* Defines IOleObject COM and other oleidl.h interfaces
- *
+ *
* Depends on 'obj_base.h'.
*
* Copyright (C) 1999 Paul Quinn
@@ -44,7 +44,7 @@
DWORD dwFullUserTypeName;
DWORD dwSrcOfCopy;
} OBJECTDESCRIPTOR, *LPOBJECTDESCRIPTOR;
-
+
typedef enum tagOLEMISC
{
OLEMISC_RECOMPOSEONRESIZE = 0x1,
@@ -88,7 +88,7 @@
DEFINE_OLEGUID(IID_IEnumOLEVERB, 0x00000104L, 0, 0);
typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
-
+
/*****************************************************************************
* IOleObject interface
*/
@@ -120,7 +120,7 @@
IOleObject_METHODS
ICOM_DEFINE(IOleObject,IUnknown)
#undef ICOM_INTERFACE
-
+
/*** IUnknown methods ***/
#define IOleObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleObject_AddRef(p) ICOM_CALL (AddRef,p)
@@ -147,7 +147,7 @@
#define IOleObject_EnumAdvise(p,a,b) ICOM_CALL1(EnumAdvise,p,a)
#define IOleObject_GetMiscStatus(p,a,b) ICOM_CALL2(GetMiscStatus,p,a,b)
#define IOleObject_SetColorScheme(p,a,b) ICOM_CALL1(SetColorScheme,p,a)
-
+
/*****************************************************************************
* IOleAdviseHolder interface
@@ -177,7 +177,7 @@
#define IOleAdviseHolder_SendOnRename(p,a) ICOM_CALL1(SendOnRename,p,a)
#define IOleAdviseHolder_SendOnSave(p) ICOM_CALL (SendOnSave,p)
#define IOleAdviseHolder_SendOnClose(p) ICOM_CALL (SendOnClose,p)
-
+
/*****************************************************************************
* IEnumOLEVERB interface
@@ -207,6 +207,6 @@
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
-
+
#endif /* __WINE_WINE_OBJ_OLEOBJ_H */
diff --git a/include/wine/obj_oleundo.h b/include/wine/obj_oleundo.h
index db82f82..62930fe 100644
--- a/include/wine/obj_oleundo.h
+++ b/include/wine/obj_oleundo.h
@@ -32,7 +32,7 @@
*/
DEFINE_GUID(IID_IQuickActivate, 0xcf51ed10, 0x62fe, 0x11cf, 0xbf, 0x86, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0x36);
typedef struct IQuickActivate IQuickActivate,*LPQUICKACTIVATE;
-
+
DEFINE_GUID(IID_IPointerInactive, 0x55980ba0, 0x35aa, 0x11cf, 0xb6, 0x71, 0x00, 0xaa, 0x00, 0x4c, 0xd6, 0xd8);
typedef struct IPointerInactive IPointerInactive,*LPPOINTERINACTIVE;
@@ -127,7 +127,7 @@
#define IPointerInactive_METHODS \
ICOM_METHOD1(HRESULT,GetActivationPolicy, DWORD*,pdwPolicy) \
ICOM_METHOD4(HRESULT,OnInactiveMouseMove, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,grfKeyState) \
- ICOM_METHOD5(HRESULT,OnInactiveSetCursor, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,dwMouseMsg, BOOL,fSetAlways)
+ ICOM_METHOD5(HRESULT,OnInactiveSetCursor, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,dwMouseMsg, BOOL,fSetAlways)
#define IPointerInactive_IMETHODS \
IUnknown_IMETHODS \
IPointerInactive_METHODS
@@ -140,7 +140,7 @@
#define IPointerInactive_Release(p) ICOM_CALL (Release,p)
/*** IPointerInactive methods ***/
#define IPointerInactive_GetActivationPolicy(p,a) ICOM_CALL1(GetActivationPolicy,p,a)
-#define IPointerInactive_OnInactiveMoveMouse(p,a,b,c,d) ICOM_CALL4(OnInactiveMoveMouse,p,a,b,c,d)
+#define IPointerInactive_OnInactiveMoveMouse(p,a,b,c,d) ICOM_CALL4(OnInactiveMoveMouse,p,a,b,c,d)
#define IPointerInactive_OnInactiveSetCursor(p,a,b,c,d,e) ICOM_CALL5(OnInactiveSetCursor,p,a,b,d,e)
diff --git a/include/wine/obj_oleview.h b/include/wine/obj_oleview.h
index 7efda2b..2f799e2 100644
--- a/include/wine/obj_oleview.h
+++ b/include/wine/obj_oleview.h
@@ -54,7 +54,7 @@
ICOM_METHOD4(HRESULT,Freeze, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DWORD*,pdwFreeze) \
ICOM_METHOD1(HRESULT,Unfreeze, DWORD,dwFreeze) \
ICOM_METHOD3(HRESULT,SetAdvise, DWORD,aspects, DWORD,advf, IAdviseSink*,pAdvSink) \
- ICOM_METHOD3(HRESULT,GetAdvise, DWORD*,pAspects, DWORD*,pAdvf, IAdviseSink**,ppAdvSink)
+ ICOM_METHOD3(HRESULT,GetAdvise, DWORD*,pAspects, DWORD*,pAdvf, IAdviseSink**,ppAdvSink)
#define IViewObject_IMETHODS \
IUnknown_IMETHODS \
IViewObject_METHODS
@@ -72,7 +72,7 @@
#define IViewObject_Unfreeze(p,a) ICOM_CALL1(Unfreeze,p,a)
#define IViewObject_SetAdvise(p,a,b,c) ICOM_CALL3(SetAdvise,p,a,b,c)
#define IViewObject_GetAdvise(p,a,b,c) ICOM_CALL3(GetAdvise,p,a,b,c)
-
+
/*****************************************************************************
@@ -80,7 +80,7 @@
*/
#define ICOM_INTERFACE IViewObject2
#define IViewObject2_METHODS \
- ICOM_METHOD4(HRESULT,GetExtent, DWORD,dwDrawAspect, LONG,lindex, DVTARGETDEVICE*,ptd, LPSIZEL,lpsizel)
+ ICOM_METHOD4(HRESULT,GetExtent, DWORD,dwDrawAspect, LONG,lindex, DVTARGETDEVICE*,ptd, LPSIZEL,lpsizel)
#define IViewObject2_IMETHODS \
IViewObject_IMETHODS \
IViewObject2_METHODS
diff --git a/include/wine/obj_picture.h b/include/wine/obj_picture.h
index a555624..90e8d2e 100644
--- a/include/wine/obj_picture.h
+++ b/include/wine/obj_picture.h
@@ -68,7 +68,7 @@
ICOM_METHOD1(HRESULT,put_KeepOriginalFormat, BOOL,Keep) \
ICOM_METHOD (HRESULT,PictureChanged) \
ICOM_METHOD3(HRESULT,SaveAsFile, LPSTREAM,pStream, BOOL,fSaveMemCopy, LONG*,pCbSize) \
- ICOM_METHOD1(HRESULT,get_Attributes, DWORD*,pDwAttr)
+ ICOM_METHOD1(HRESULT,get_Attributes, DWORD*,pDwAttr)
#define IPicture_IMETHODS \
IUnknown_IMETHODS \
IPicture_METHODS
@@ -100,7 +100,7 @@
* IPictureDisp interface
*/
#define ICOM_INTERFACE IPictureDisp
-#define IPictureDisp_METHODS
+#define IPictureDisp_METHODS
#define IPictureDisp_IMETHODS \
IDispatch_IMETHODS \
IPictureDisp_METHODS
diff --git a/include/wine/obj_property.h b/include/wine/obj_property.h
index 4dfc883..516fc3f 100644
--- a/include/wine/obj_property.h
+++ b/include/wine/obj_property.h
@@ -82,9 +82,9 @@
DWORD dwType;
VARTYPE vt;
CLIPFORMAT cfType;
- DWORD dwHint;
- LPOLESTR pstrName;
- CLSID clsid;
+ DWORD dwHint;
+ LPOLESTR pstrName;
+ CLSID clsid;
} PROPBAG2;
/*****************************************************************************
@@ -110,10 +110,10 @@
DEFINE_GUID(IID_IPersistMemory, 0xbd1ae5e0L, 0xa6ae, 0x11ce, 0xbd, 0x37, 0x50, 0x42, 0x00, 0xc1, 0x00, 0x00);
typedef struct IPersistMemory IPersistMemory,*LPPERSISTMEMORY;
-
+
DEFINE_GUID(IID_IPersistPropertyBag, 0x37d84f60, 0x42cb, 0x11ce, 0x81, 0x35, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51);
typedef struct IPersistPropertyBag IPersistPropertyBag,*LPPERSISTPROPERTYBAG;
-
+
DEFINE_GUID(IID_IPersistPropertyBag2, 0x22f55881, 0x280b, 0x11d0, 0xa8, 0xa9, 0x00, 0xa0, 0xc9, 0x0c, 0x20, 0x04);
typedef struct IPersistPropertyBag2 IPersistPropertyBag2,*LPPERSISTPROPERTYBAG2;
@@ -122,16 +122,16 @@
DEFINE_GUID(IID_IPropertyBag, 0x55272a00L, 0x42cb, 0x11ce, 0x81, 0x35, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51);
typedef struct IPropertyBag IPropertyBag,*LPPROPERTYBAG;
-
+
DEFINE_GUID(IID_IPropertyBag2, 0x22f55882, 0x280b, 0x11d0, 0xa8, 0xa9, 0x00, 0xa0, 0xc9, 0x0c, 0x20, 0x04);
typedef struct IPropertyBag2 IPropertyBag2,*LPPROPERTYBAG2;
DEFINE_GUID(IID_ISpecifyPropertyPages, 0xb196b28b, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
typedef struct ISpecifyPropertyPages ISpecifyPropertyPages,*LPSPECIFYPROPERTYPAGES;
-
+
DEFINE_GUID(IID_IPerPropertyBrowsing, 0xb196b28b, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
typedef struct IPerPropertyBrowsing IPerPropertyBrowsing,*LPPERPROPERTYBROWSING;
-
+
/*****************************************************************************
* IPropertPage interface
@@ -148,7 +148,7 @@
ICOM_METHOD (HRESULT,IsPageDirty) \
ICOM_METHOD (HRESULT,Apply) \
ICOM_METHOD1(HRESULT,Help, LPCOLESTR,pszHelpDir) \
- ICOM_METHOD1(HRESULT,TranslateAccelerator, MSG*,pMsg)
+ ICOM_METHOD1(HRESULT,TranslateAccelerator, MSG*,pMsg)
#define IPropertyPage_IMETHODS \
IUnknown_IMETHODS \
IPropertyPage_METHODS
@@ -171,7 +171,7 @@
#define IPropertyPage_Apply(p) ICOM_CALL (Apply,p)
#define IPropertyPage_Help(p,a) ICOM_CALL1(Help,p,a)
#define IPropertyPage_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
-
+
/*****************************************************************************
* IPropertPage2 interface
@@ -203,7 +203,7 @@
#define IPropertyPage2_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
/*** IPropertyPage2 methods ***/
#define IPropertyPage2_EditProperty(p,a) ICOM_CALL1(EditProperty,p,a)
-
+
/*****************************************************************************
* IPropertPageSite interface
@@ -218,7 +218,7 @@
IUnknown_IMETHODS \
IPropertyPageSite_METHODS
ICOM_DEFINE(IPropertyPageSite,IUnknown)
-#undef ICOM_INTERFACE
+#undef ICOM_INTERFACE
/*** IUnknown methods ***/
#define IPropertyPageSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -229,7 +229,7 @@
#define IPropertyPageSite_GetLocaleID(p,a) ICOM_CALL1(GetLocaleID,p,a)
#define IPropertyPageSite_GetPageContainer(p,a) ICOM_CALL1(GetPageContainer,p,a)
#define IPropertyPageSite_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
-
+
/*****************************************************************************
* IPropertyNotifySink interface
@@ -252,14 +252,14 @@
#define IPropertyNotifySink_OnChanged(p,a) ICOM_CALL1(OnChanged,p,a)
#define IPropertyNotifySink_OnRequestEdit(p,a) ICOM_CALL1(OnRequestEdit,p,a)
-
+
/*****************************************************************************
* IPropertyNotifySink interface
*/
#define ICOM_INTERFACE ISimpleFrameSite
#define ISimpleFrameSite_METHODS \
ICOM_METHOD6(HRESULT,PreMessageFilter, HWND,hWnd, UINT,msg, WPARAM,wp, LPARAM,lp, LRESULT*,plResult, DWORD*,pwdCookie) \
- ICOM_METHOD6(HRESULT,PostMessageFilter, HWND,hWnd, UINT,msg, WPARAM,wp, LPARAM,lp, LRESULT*,plResult, DWORD,pwdCookie)
+ ICOM_METHOD6(HRESULT,PostMessageFilter, HWND,hWnd, UINT,msg, WPARAM,wp, LPARAM,lp, LRESULT*,plResult, DWORD,pwdCookie)
#define ISimpleFrameSite_IMETHODS \
IUnknown_IMETHODS \
ISimpleFrameSite_METHODS
@@ -304,7 +304,7 @@
#define IPersistStreamInit_GetSizeMax(p,a) ICOM_CALL1(GetSizeMax,p,a)
#define IPersistStreamInit_InitNew(p) ICOM_CALL (InitNew,p)
-
+
/*****************************************************************************
* IPersistMemory interface
*/
@@ -407,7 +407,7 @@
#define IErrorLog_Release(p) ICOM_CALL (Release,p)
/*** IErrorLog methods ***/
#define IErrorLog_AddError(p,a,b) ICOM_CALL2(GetClassID,p,a,b)
-
+
/*****************************************************************************
* IPropertyBag interface
@@ -464,7 +464,7 @@
*/
#define ICOM_INTERFACE ISpecifyPropertyPages
#define ISpecifyPropertyPages_METHODS \
- ICOM_METHOD1(HRESULT,GetPages, CAUUID*,pPages)
+ ICOM_METHOD1(HRESULT,GetPages, CAUUID*,pPages)
#define ISpecifyPropertyPages_IMETHODS \
IUnknown_IMETHODS \
ISpecifyPropertyPages_METHODS
@@ -477,7 +477,7 @@
#define ISpecifyPropertyPages_Release(p) ICOM_CALL (Release,p)
/*** ISpecifyPropertyPages methods ***/
#define ISpecifyPropertyPages_GetPages(p,a) ICOM_CALL1(GetPages,p,a)
-
+
/*****************************************************************************
* IPerPropertyBrowsing interface
@@ -487,7 +487,7 @@
ICOM_METHOD2(HRESULT,GetDisplayString, DISPID,dispID, BSTR*,pBstr) \
ICOM_METHOD2(HRESULT,MapPropertyToPage, DISPID,dispID, CLSID*,pClsid) \
ICOM_METHOD3(HRESULT,GetPredefinedStrings, DISPID,dispID, CALPOLESTR*,pCaStringsOut, CADWORD*,pCaCookiesOut) \
- ICOM_METHOD3(HRESULT,GetPredefinedValue, DISPID,dispID, DWORD,dwCookie, VARIANT*,pVarOut)
+ ICOM_METHOD3(HRESULT,GetPredefinedValue, DISPID,dispID, DWORD,dwCookie, VARIANT*,pVarOut)
#define IPerPropertyBrowsing_IMETHODS \
IUnknown_IMETHODS \
IPerPropertyBrowsing_METHODS
diff --git a/include/wine/obj_propertystorage.h b/include/wine/obj_propertystorage.h
index 451e8bd..bbda9a0 100644
--- a/include/wine/obj_propertystorage.h
+++ b/include/wine/obj_propertystorage.h
@@ -102,7 +102,7 @@
typedef struct tagPROPSPEC
{
ULONG ulKind;
- union
+ union
{
PROPID propid;
LPOLESTR lpwstr;
@@ -179,7 +179,7 @@
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSTG**,ppenum)
#define IEnumSTATPROPSTG_IMETHODS \
IUnknown_IMETHODS \
- IEnumSTATPROPSTG_METHODS
+ IEnumSTATPROPSTG_METHODS
ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
#undef ICOM_INTERFACE
@@ -356,9 +356,9 @@
WORD wReserved1;
WORD wReserved2;
WORD wReserved3;
- union
+ union
{
- /* Empty union arm */
+ /* Empty union arm */
UCHAR bVal;
short iVal;
USHORT uiVal;
diff --git a/include/wine/obj_queryassociations.h b/include/wine/obj_queryassociations.h
index 4b66048..ed964dc 100644
--- a/include/wine/obj_queryassociations.h
+++ b/include/wine/obj_queryassociations.h
@@ -54,16 +54,16 @@
ASSOCSTR_DDEIFEXEC,
ASSOCSTR_DDEAPPLICATION,
ASSOCSTR_DDETOPIC,
- ASSOCSTR_MAX
+ ASSOCSTR_MAX
} ASSOCSTR;
typedef enum
{
ASSOCKEY_SHELLEXECCLASS = 1,
- ASSOCKEY_APP,
+ ASSOCKEY_APP,
ASSOCKEY_CLASS,
ASSOCKEY_BASECLASS,
- ASSOCKEY_MAX
+ ASSOCKEY_MAX
} ASSOCKEY;
typedef enum
diff --git a/include/wine/obj_shellfolder.h b/include/wine/obj_shellfolder.h
index 320857a..def4a9c 100644
--- a/include/wine/obj_shellfolder.h
+++ b/include/wine/obj_shellfolder.h
@@ -35,11 +35,11 @@
#define STRRET_OFFSETA 0x0001
#define STRRET_OFFSETW 0x0004
-#define STRRET_OFFSET WINELIB_NAME_AW(STRRET_OFFSET)
+#define STRRET_OFFSET WINELIB_NAME_AW(STRRET_OFFSET)
#define STRRET_CSTRA 0x0002
#define STRRET_CSTRW 0x0005
-#define STRRET_CSTR WINELIB_NAME_AW(STRRET_CSTR)
+#define STRRET_CSTR WINELIB_NAME_AW(STRRET_CSTR)
typedef struct _STRRET
{ UINT uType; /* STRRET_xxx */
@@ -65,7 +65,7 @@
DEFINE_GUID(IID_IShellFolder2, 0xB82C5AA8, 0xA41B, 0x11D2, 0xBE, 0x32, 0x0, 0xc0, 0x4F, 0xB9, 0x36, 0x61);
typedef struct IShellFolder2 IShellFolder2, *LPSHELLFOLDER2;
-DEFINE_GUID(IID_IEnumExtraSearch, 0xE700BE1, 0x9DB6, 0x11D1, 0xA1, 0xCE, 0x0, 0xc0, 0x4F, 0xD7, 0x5D, 0x13);
+DEFINE_GUID(IID_IEnumExtraSearch, 0xE700BE1, 0x9DB6, 0x11D1, 0xA1, 0xCE, 0x0, 0xc0, 0x4F, 0xD7, 0x5D, 0x13);
typedef struct IEnumExtraSearch IEnumExtraSearch, *LPENUMEXTRASEARCH;
/*****************************************************************************
@@ -107,7 +107,7 @@
#define IEnumIDList_Clone(p,a) ICOM_CALL1(Clone,p,a)
/*****************************************************************************
- * IShellFolder::GetDisplayNameOf/SetNameOf uFlags
+ * IShellFolder::GetDisplayNameOf/SetNameOf uFlags
*/
typedef enum
{ SHGDN_NORMAL = 0, /* default (display purpose) */
@@ -116,7 +116,7 @@
} SHGNO;
/*****************************************************************************
- * IShellFolder::EnumObjects
+ * IShellFolder::EnumObjects
*/
typedef enum tagSHCONTF
{ SHCONTF_FOLDERS = 32, /* for shell browser */
@@ -125,7 +125,7 @@
} SHCONTF;
/*****************************************************************************
- * IShellFolder::GetAttributesOf flags
+ * IShellFolder::GetAttributesOf flags
*/
#define SFGAO_CANCOPY DROPEFFECT_COPY /* Objects can be copied */
#define SFGAO_CANMOVE DROPEFFECT_MOVE /* Objects can be moved */
@@ -242,7 +242,7 @@
/* IShellFolder2 */
/* GetDefaultColumnState */
-typedef enum
+typedef enum
{
SHCOLSTATE_TYPE_STR = 0x00000001,
SHCOLSTATE_TYPE_INT = 0x00000002,
@@ -274,7 +274,7 @@
STRRET str;
} SHELLDETAILS, *LPSHELLDETAILS;
-#define ICOM_INTERFACE IShellFolder2
+#define ICOM_INTERFACE IShellFolder2
#define IShellFolder2_METHODS \
ICOM_METHOD1( HRESULT, GetDefaultSearchGUID, LPGUID, lpguid)\
ICOM_METHOD1( HRESULT, EnumSearches, LPENUMEXTRASEARCH *, ppEnum) \
@@ -318,7 +318,7 @@
*/
/* ClassID's */
-DEFINE_GUID (CLSID_SFMyComp,0x20D04FE0,0x3AEA,0x1069,0xA2,0xD8,0x08,0x00,0x2B,0x30,0x30,0x9D);
+DEFINE_GUID (CLSID_SFMyComp,0x20D04FE0,0x3AEA,0x1069,0xA2,0xD8,0x08,0x00,0x2B,0x30,0x30,0x9D);
DEFINE_GUID (CLSID_SFINet, 0x871C5380,0x42A0,0x1069,0xA2,0xEA,0x08,0x00,0x2B,0x30,0x30,0x9D);
DEFINE_GUID (CLSID_SFFile, 0xF3364BA0,0x65B9,0x11CE,0xA9,0xBA,0x00,0xAA,0x00,0x4A,0xE8,0x37);
@@ -332,7 +332,7 @@
#undef ICOM_INTERFACE
/*** IUnknown methods ***/
-#define IPersistFolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IPersistFolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistFolder_AddRef(p) ICOM_CALL (AddRef,p)
#define IPersistFolder_Release(p) ICOM_CALL (Release,p)
/*** IPersist methods ***/
@@ -355,7 +355,7 @@
#undef ICOM_INTERFACE
/*** IUnknown methods ***/
-#define IPersistFolder2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IPersistFolder2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistFolder2_AddRef(p) ICOM_CALL (AddRef,p)
#define IPersistFolder2_Release(p) ICOM_CALL (Release,p)
/*** IPersist methods ***/
diff --git a/include/wine/obj_shelllink.h b/include/wine/obj_shelllink.h
index 4129e97..63d5184 100644
--- a/include/wine/obj_shelllink.h
+++ b/include/wine/obj_shelllink.h
@@ -34,18 +34,18 @@
typedef struct IShellLinkW IShellLinkW,*LPSHELLLINKW;
/*****************************************************************************
- *
+ *
*/
-typedef enum
+typedef enum
{ SLR_NO_UI = 0x0001,
SLR_ANY_MATCH = 0x0002,
SLR_UPDATE = 0x0004
} SLR_FLAGS;
/*****************************************************************************
- * GetPath fFlags
+ * GetPath fFlags
*/
-typedef enum
+typedef enum
{ SLGP_SHORTPATH = 0x0001,
SLGP_UNCPRIORITY = 0x0002
} SLGP_FLAGS;
diff --git a/include/wine/obj_shellview.h b/include/wine/obj_shellview.h
index f6a9240..4fcb0dd 100644
--- a/include/wine/obj_shellview.h
+++ b/include/wine/obj_shellview.h
@@ -26,7 +26,7 @@
#endif /* defined(__cplusplus) */
/****************************************************************************
- * IShellBrowser is here defined because of a cyclic dependance between
+ * IShellBrowser is here defined because of a cyclic dependance between
* IShellBrowser and IShellView
*/
typedef struct IShellBrowser IShellBrowser, *LPSHELLBROWSER;
@@ -72,10 +72,10 @@
#define FCIDM_SHVIEW_BIGICON 0x7029
#define FCIDM_SHVIEW_SMALLICON 0x702A
-#define FCIDM_SHVIEW_LISTVIEW 0x702B
+#define FCIDM_SHVIEW_LISTVIEW 0x702B
#define FCIDM_SHVIEW_REPORTVIEW 0x702C
/* 0x7030-0x703f are used by the shellbrowser */
-#define FCIDM_SHVIEW_AUTOARRANGE 0x7031
+#define FCIDM_SHVIEW_AUTOARRANGE 0x7031
#define FCIDM_SHVIEW_SNAPTOGRID 0x7032
#define FCIDM_SHVIEW_HELP 0x7041
@@ -120,7 +120,7 @@
#define FCIDM_STATUS (FCIDM_BROWSERFIRST + 1)
/* uState values for IShellView::UIActivate */
-typedef enum
+typedef enum
{ SVUIA_DEACTIVATE = 0,
SVUIA_ACTIVATE_NOFOCUS = 1,
SVUIA_ACTIVATE_FOCUS = 2,
diff --git a/include/wine/unicode.h b/include/wine/unicode.h
index 1d48a98..53cdabf 100644
--- a/include/wine/unicode.h
+++ b/include/wine/unicode.h
@@ -177,7 +177,7 @@
#endif
}
-static inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src )
+static inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src )
{
#if defined(__i386__) && defined(__GNUC__)
int dummy1, dummy2, dummy3;
@@ -196,7 +196,7 @@
return dst;
}
-static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 )
+static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 )
{
while (*str1 && (*str1 == *str2)) { str1++; str2++; }
return *str1 - *str2;
@@ -228,13 +228,13 @@
for ( ; *str; str++) if (*str == ch) return (WCHAR *)str;
return NULL;
}
-
+
static inline WCHAR *strrchrW( const WCHAR *str, WCHAR ch )
{
WCHAR *ret = NULL;
for ( ; *str; str++) if (*str == ch) ret = (WCHAR *)str;
return ret;
-}
+}
static inline WCHAR *strlwrW( WCHAR *str )
{
diff --git a/include/wine/windef16.h b/include/wine/windef16.h
index 4870c9b..ff36f3a 100644
--- a/include/wine/windef16.h
+++ b/include/wine/windef16.h
@@ -47,7 +47,7 @@
typedef HANDLE16 a##16; \
typedef a##16 *P##a##16; \
typedef a##16 *NP##a##16; \
- typedef a##16 *LP##a##16
+ typedef a##16 *LP##a##16
DECLARE_HANDLE16(HACMDRIVERID);
DECLARE_HANDLE16(HACMDRIVER);
diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h
index 2e97696..dc9afd4 100644
--- a/include/wine/wingdi16.h
+++ b/include/wine/wingdi16.h
@@ -47,7 +47,7 @@
} BITMAP16, *LPBITMAP16;
typedef struct
-{
+{
UINT16 lbStyle;
COLORREF lbColor;
INT16 lbHatch;
@@ -86,7 +86,7 @@
BYTE elfScript[LF_FACESIZE];
} ENUMLOGFONTEX16, *LPENUMLOGFONTEX16;
-typedef struct
+typedef struct
{
INT16 txfHeight;
INT16 txfWidth;
@@ -259,7 +259,7 @@
typedef struct
{
- UINT16 lopnStyle;
+ UINT16 lopnStyle;
POINT16 lopnWidth;
COLORREF lopnColor;
} LOGPEN16, *LPLOGPEN16;
@@ -308,7 +308,7 @@
typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
INT16,LPARAM);
-typedef struct
+typedef struct
{
INT16 cbSize;
SEGPTR lpszDocName;
diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h
index f882451..63d08ce 100644
--- a/include/wine/winnet16.h
+++ b/include/wine/winnet16.h
@@ -1,4 +1,4 @@
-/*
+/*
* Definitions for windows network service
*
* Copyright 1997 Andreas Mohr
@@ -31,7 +31,7 @@
* Remote printing
*/
-typedef struct
+typedef struct
{
WORD pqName;
WORD pqComment;
@@ -47,7 +47,7 @@
#define WNPRQ_PENDING 0x3
#define WNPRQ_PROBLEM 0x4
-typedef struct
+typedef struct
{
WORD pjId;
WORD pjUsername;
diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h
index 794a035..9151cdc 100644
--- a/include/wine/winuser16.h
+++ b/include/wine/winuser16.h
@@ -21,7 +21,7 @@
#include "wine/wingdi16.h" /* wingdi.h needed for COLORREF */
#include "winuser.h" /* winuser.h needed for MSGBOXCALLBACK */
-
+
#include "pshpack1.h"
typedef struct tagCOMSTAT16
@@ -299,7 +299,7 @@
BYTE rgbReserved[16];
} PAINTSTRUCT16, *LPPAINTSTRUCT16;
-typedef struct
+typedef struct
{
HMENU16 hWindowMenu;
UINT16 idFirstChild;
diff --git a/include/wine_gl.h b/include/wine_gl.h
index c2b2c40..555272e 100644
--- a/include/wine_gl.h
+++ b/include/wine_gl.h
@@ -22,9 +22,9 @@
#ifndef __WINE_WINE_GL_H
#define __WINE_WINE_GL_H
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#if defined(HAVE_OPENGL)
diff --git a/include/winerror.h b/include/winerror.h
index 0814797..21eb8af 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1494,7 +1494,7 @@
#define E_POINTER 0x80004003L
#define E_ABORT 0x80004004L
#define E_FAIL 0x80004005L
-/* FIXME: E_UNSPEC is not a standard value but it is used by
+/* FIXME: E_UNSPEC is not a standard value but it is used by
* FileMoniker, IOleLink and DoDragDrop as a return value.
*/
#define E_UNSPEC E_FAIL
diff --git a/include/wingdi.h b/include/wingdi.h
index 0918af7..59b0981 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -124,7 +124,7 @@
#define ILLUMINANT_MAX_INDEX ILLUMINANT_F2
#define ILLUMINANT_TUNGSTEN ILLUMINANT_A
-#define ILLUMINANT_DAYLIGHT ILLUMINANT_C
+#define ILLUMINANT_DAYLIGHT ILLUMINANT_C
#define ILLUMINANT_FLUORESCENT ILLUMINANT_F2
#define ILLUMINANT_NTSC ILLUMINANT_C
@@ -405,7 +405,7 @@
#define WHITEONBLACK 2
#define COLORONCOLOR 3
#define HALFTONE 4
-#define MAXSTRETCHBLTMODE 4
+#define MAXSTRETCHBLTMODE 4
#define STRETCH_ANDSCANS BLACKONWHITE
#define STRETCH_ORSCANS WHITEONBLACK
@@ -468,7 +468,7 @@
/* Brushes */
typedef struct
-{
+{
UINT lbStyle;
COLORREF lbColor;
INT lbHatch;
@@ -592,7 +592,7 @@
* for which the font provides glyphs.
*
* fsCsb 64-bit bitmap. The low 32 bits map the Windows codepages for
- * which the font provides glyphs. The high 32 bits are for
+ * which the font provides glyphs. The high 32 bits are for
* non Windows codepages.
*/
typedef struct
@@ -601,7 +601,7 @@
DWORD fsCsb[2];
} FONTSIGNATURE, *PFONTSIGNATURE, *LPFONTSIGNATURE;
-typedef struct
+typedef struct
{
UINT ciCharset; /* character set */
UINT ciACP; /* ANSI code page */
@@ -626,7 +626,7 @@
#define MWT_LEFTMULTIPLY 2
#define MWT_RIGHTMULTIPLY 3
#define MWT_MIN MWT_IDENTITY
-#define MWT_MAX MWT_RIGHTMULTIPLY
+#define MWT_MAX MWT_RIGHTMULTIPLY
/* Object Definitions for EnumObjects() */
#define OBJ_PEN 1
@@ -1239,7 +1239,7 @@
#define GGO_GRAY4_BITMAP 5
#define GGO_GRAY8_BITMAP 6
#define GGO_GLYPH_INDEX 0x80
-
+
typedef struct
{
WORD fract;
@@ -1365,7 +1365,7 @@
#define TT_PRIM_LINE 1
#define TT_PRIM_QSPLINE 2
-#define TT_POLYGON_TYPE 24
+#define TT_POLYGON_TYPE 24
/* Get/SetSystemPaletteUse() values */
#define SYSPAL_ERROR 0
@@ -1383,7 +1383,7 @@
#define PC_NOCOLLAPSE 0x04
typedef struct tagLOGPALETTE
-{
+{
WORD palVersion;
WORD palNumEntries;
PALETTEENTRY palPalEntry[1];
@@ -1393,7 +1393,7 @@
typedef struct
{
- UINT lopnStyle;
+ UINT lopnStyle;
POINT lopnWidth;
COLORREF lopnColor;
} LOGPEN, *LPLOGPEN;
@@ -1769,7 +1769,7 @@
#define DIB_PAL_COLORS 1
#define CBM_INIT 4
-typedef struct
+typedef struct
{
BITMAP dsBm;
BITMAPINFOHEADER dsBmih;
@@ -1931,20 +1931,20 @@
/* note that ENHMETAHEADER is just a particular kind of ENHMETARECORD,
ie. the header is just the first record in the metafile */
typedef struct {
- DWORD iType;
- DWORD nSize;
- RECTL rclBounds;
- RECTL rclFrame;
- DWORD dSignature;
- DWORD nVersion;
- DWORD nBytes;
- DWORD nRecords;
- WORD nHandles;
- WORD sReserved;
- DWORD nDescription;
- DWORD offDescription;
- DWORD nPalEntries;
- SIZEL szlDevice;
+ DWORD iType;
+ DWORD nSize;
+ RECTL rclBounds;
+ RECTL rclFrame;
+ DWORD dSignature;
+ DWORD nVersion;
+ DWORD nBytes;
+ DWORD nRecords;
+ WORD nHandles;
+ WORD sReserved;
+ DWORD nDescription;
+ DWORD offDescription;
+ DWORD nPalEntries;
+ SIZEL szlDevice;
SIZEL szlMillimeters;
/* Fields for winver >= win95 */
@@ -1952,16 +1952,16 @@
DWORD offPixelFormat;
DWORD bOpenGL;
- /* Fields for winver >= win98 */
+ /* Fields for winver >= win98 */
SIZEL szlMicrometers;
-} ENHMETAHEADER, *PENHMETAHEADER, *LPENHMETAHEADER;
+} ENHMETAHEADER, *PENHMETAHEADER, *LPENHMETAHEADER;
typedef struct {
- DWORD iType;
- DWORD nSize;
- DWORD dParm[1];
-} ENHMETARECORD, *LPENHMETARECORD;
+ DWORD iType;
+ DWORD nSize;
+ DWORD dParm[1];
+} ENHMETARECORD, *LPENHMETARECORD;
typedef struct {
DWORD iType;
@@ -2270,7 +2270,7 @@
DWORD iUsageMask;
DWORD offBmiMask;
DWORD cbBmiMask;
- DWORD offBitsMask;
+ DWORD offBitsMask;
DWORD cbBitsMask;
} EMRPLGBLT, *PEMRPLGBLT;
@@ -2291,7 +2291,7 @@
DWORD cptl;
POINTL aptl[1];
BYTE abTypes[1];
-} EMRPOLYDRAW, *PEMRPOLYDRAW;
+} EMRPOLYDRAW, *PEMRPOLYDRAW;
typedef struct {
EMR emr;
@@ -2475,8 +2475,8 @@
} EMRSTRETCHDIBITS, *PEMRSTRETCHDIBITS;
typedef struct {
- EMR emr;
- PIXELFORMATDESCRIPTOR pfd;
+ EMR emr;
+ PIXELFORMATDESCRIPTOR pfd;
} EMRPIXELFORMAT, *PEMRPIXELFORMAT;
typedef struct tagEMRGLSRECORD {
@@ -2490,9 +2490,9 @@
RECTL rclBounds;
DWORD cbData;
BYTE Data[1];
-} EMRGLSBOUNDEDRECORD, *PEMRGLSBOUNDEDRECORD;
+} EMRGLSBOUNDEDRECORD, *PEMRGLSBOUNDEDRECORD;
-typedef INT (CALLBACK *ENHMFENUMPROC)(HDC, LPHANDLETABLE,
+typedef INT (CALLBACK *ENHMFENUMPROC)(HDC, LPHANDLETABLE,
LPENHMETARECORD, INT, LPVOID);
#define EMR_HEADER 1
@@ -2931,7 +2931,7 @@
#define DMDITHER_GRAYSCALE 5
#define DMDITHER_USER 256
-typedef struct
+typedef struct
{
INT cbSize;
LPCSTR lpszDocName;
@@ -2940,7 +2940,7 @@
DWORD fwType;
} DOCINFOA, *LPDOCINFOA;
-typedef struct
+typedef struct
{
INT cbSize;
LPCWSTR lpszDocName;
@@ -2984,7 +2984,7 @@
DWORD StateFlags;
CHAR DeviceID[128];
CHAR DeviceKey[128];
-} DISPLAY_DEVICEA,*PDISPLAY_DEVICEA,*LPDISPLAY_DEVICEA;
+} DISPLAY_DEVICEA,*PDISPLAY_DEVICEA,*LPDISPLAY_DEVICEA;
typedef struct {
DWORD cb;
@@ -2993,7 +2993,7 @@
DWORD StateFlags;
WCHAR DeviceID[128];
WCHAR DeviceKey[128];
-} DISPLAY_DEVICEW,*PDISPLAY_DEVICEW,*LPDISPLAY_DEVICEW;
+} DISPLAY_DEVICEW,*PDISPLAY_DEVICEW,*LPDISPLAY_DEVICEW;
DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE)
DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE)
DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE)
@@ -3055,7 +3055,7 @@
BOOL WINAPI AngleArc(HDC, INT, INT, DWORD, FLOAT, FLOAT);
BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
BOOL WINAPI Arc(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
-BOOL WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT);
+BOOL WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT);
BOOL WINAPI BeginPath(HDC);
BOOL WINAPI BitBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,DWORD);
INT WINAPI ChoosePixelFormat(HDC,const LPPIXELFORMATDESCRIPTOR);
diff --git a/include/wininet.h b/include/wininet.h
index 5cb4992..6775229 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -23,7 +23,7 @@
extern "C" {
#endif
-#define INTERNETAPI
+#define INTERNETAPI
#define BOOLAPI INTERNETAPI BOOL WINAPI
typedef LPVOID HINTERNET;
@@ -33,62 +33,62 @@
typedef INTERNET_PORT * LPINTERNET_PORT;
-#define INTERNET_INVALID_PORT_NUMBER 0
+#define INTERNET_INVALID_PORT_NUMBER 0
-#define INTERNET_DEFAULT_FTP_PORT 21
-#define INTERNET_DEFAULT_GOPHER_PORT 70
-#define INTERNET_DEFAULT_HTTP_PORT 80
-#define INTERNET_DEFAULT_HTTPS_PORT 443
-#define INTERNET_DEFAULT_SOCKS_PORT 1080
+#define INTERNET_DEFAULT_FTP_PORT 21
+#define INTERNET_DEFAULT_GOPHER_PORT 70
+#define INTERNET_DEFAULT_HTTP_PORT 80
+#define INTERNET_DEFAULT_HTTPS_PORT 443
+#define INTERNET_DEFAULT_SOCKS_PORT 1080
#define INTERNET_MAX_HOST_NAME_LENGTH 256
#define INTERNET_MAX_USER_NAME_LENGTH 128
#define INTERNET_MAX_PASSWORD_LENGTH 128
-#define INTERNET_MAX_PORT_NUMBER_LENGTH 5
-#define INTERNET_MAX_PORT_NUMBER_VALUE 65535
+#define INTERNET_MAX_PORT_NUMBER_LENGTH 5
+#define INTERNET_MAX_PORT_NUMBER_VALUE 65535
#define INTERNET_MAX_PATH_LENGTH 2048
-#define INTERNET_MAX_SCHEME_LENGTH 32
+#define INTERNET_MAX_SCHEME_LENGTH 32
#define INTERNET_MAX_URL_LENGTH (INTERNET_MAX_SCHEME_LENGTH + sizeof("://")+ INTERNET_MAX_PATH_LENGTH)
#define INTERNET_KEEP_ALIVE_UNKNOWN ((DWORD)-1)
#define INTERNET_KEEP_ALIVE_ENABLED 1
#define INTERNET_KEEP_ALIVE_DISABLED 0
-#define INTERNET_REQFLAG_FROM_CACHE 0x00000001
-#define INTERNET_REQFLAG_ASYNC 0x00000002
-#define INTERNET_REQFLAG_VIA_PROXY 0x00000004
-#define INTERNET_REQFLAG_NO_HEADERS 0x00000008
-#define INTERNET_REQFLAG_PASSIVE 0x00000010
-#define INTERNET_REQFLAG_CACHE_WRITE_DISABLED 0x00000040
-#define INTERNET_FLAG_RELOAD 0x80000000
-#define INTERNET_FLAG_RAW_DATA 0x40000000
-#define INTERNET_FLAG_EXISTING_CONNECT 0x20000000
-#define INTERNET_FLAG_ASYNC 0x10000000
-#define INTERNET_FLAG_PASSIVE 0x08000000
-#define INTERNET_FLAG_NO_CACHE_WRITE 0x04000000
+#define INTERNET_REQFLAG_FROM_CACHE 0x00000001
+#define INTERNET_REQFLAG_ASYNC 0x00000002
+#define INTERNET_REQFLAG_VIA_PROXY 0x00000004
+#define INTERNET_REQFLAG_NO_HEADERS 0x00000008
+#define INTERNET_REQFLAG_PASSIVE 0x00000010
+#define INTERNET_REQFLAG_CACHE_WRITE_DISABLED 0x00000040
+#define INTERNET_FLAG_RELOAD 0x80000000
+#define INTERNET_FLAG_RAW_DATA 0x40000000
+#define INTERNET_FLAG_EXISTING_CONNECT 0x20000000
+#define INTERNET_FLAG_ASYNC 0x10000000
+#define INTERNET_FLAG_PASSIVE 0x08000000
+#define INTERNET_FLAG_NO_CACHE_WRITE 0x04000000
#define INTERNET_FLAG_DONT_CACHE INTERNET_FLAG_NO_CACHE_WRITE
-#define INTERNET_FLAG_MAKE_PERSISTENT 0x02000000
-#define INTERNET_FLAG_FROM_CACHE 0x01000000
+#define INTERNET_FLAG_MAKE_PERSISTENT 0x02000000
+#define INTERNET_FLAG_FROM_CACHE 0x01000000
#define INTERNET_FLAG_OFFLINE INTERNET_FLAG_FROM_CACHE
-#define INTERNET_FLAG_SECURE 0x00800000
-#define INTERNET_FLAG_KEEP_CONNECTION 0x00400000
-#define INTERNET_FLAG_NO_AUTO_REDIRECT 0x00200000
-#define INTERNET_FLAG_READ_PREFETCH 0x00100000
-#define INTERNET_FLAG_NO_COOKIES 0x00080000
-#define INTERNET_FLAG_NO_AUTH 0x00040000
-#define INTERNET_FLAG_CACHE_IF_NET_FAIL 0x00010000
-#define INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP 0x00008000
-#define INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS 0x00004000
-#define INTERNET_FLAG_IGNORE_CERT_DATE_INVALID 0x00002000
-#define INTERNET_FLAG_IGNORE_CERT_CN_INVALID 0x00001000
-#define INTERNET_FLAG_RESYNCHRONIZE 0x00000800
-#define INTERNET_FLAG_HYPERLINK 0x00000400
-#define INTERNET_FLAG_NO_UI 0x00000200
-#define INTERNET_FLAG_PRAGMA_NOCACHE 0x00000100
-#define INTERNET_FLAG_CACHE_ASYNC 0x00000080
-#define INTERNET_FLAG_FORMS_SUBMIT 0x00000040
-#define INTERNET_FLAG_NEED_FILE 0x00000010
+#define INTERNET_FLAG_SECURE 0x00800000
+#define INTERNET_FLAG_KEEP_CONNECTION 0x00400000
+#define INTERNET_FLAG_NO_AUTO_REDIRECT 0x00200000
+#define INTERNET_FLAG_READ_PREFETCH 0x00100000
+#define INTERNET_FLAG_NO_COOKIES 0x00080000
+#define INTERNET_FLAG_NO_AUTH 0x00040000
+#define INTERNET_FLAG_CACHE_IF_NET_FAIL 0x00010000
+#define INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP 0x00008000
+#define INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS 0x00004000
+#define INTERNET_FLAG_IGNORE_CERT_DATE_INVALID 0x00002000
+#define INTERNET_FLAG_IGNORE_CERT_CN_INVALID 0x00001000
+#define INTERNET_FLAG_RESYNCHRONIZE 0x00000800
+#define INTERNET_FLAG_HYPERLINK 0x00000400
+#define INTERNET_FLAG_NO_UI 0x00000200
+#define INTERNET_FLAG_PRAGMA_NOCACHE 0x00000100
+#define INTERNET_FLAG_CACHE_ASYNC 0x00000080
+#define INTERNET_FLAG_FORMS_SUBMIT 0x00000040
+#define INTERNET_FLAG_NEED_FILE 0x00000010
#define INTERNET_FLAG_MUST_CACHE_REQUEST INTERNET_FLAG_NEED_FILE
-#define INTERNET_FLAG_TRANSFER_ASCII FTP_TRANSFER_TYPE_ASCII
-#define INTERNET_FLAG_TRANSFER_BINARY FTP_TRANSFER_TYPE_BINARY
+#define INTERNET_FLAG_TRANSFER_ASCII FTP_TRANSFER_TYPE_ASCII
+#define INTERNET_FLAG_TRANSFER_BINARY FTP_TRANSFER_TYPE_BINARY
#define SECURITY_INTERNET_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID|\
INTERNET_FLAG_IGNORE_CERT_DATE_INVALID|\
INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS|\
@@ -124,9 +124,9 @@
#define INTERNET_ERROR_MASK_INSERT_CDROM 0x1
#define INTERNET_OPTIONS_MASK (~INTERNET_FLAGS_MASK)
-#define WININET_API_FLAG_ASYNC 0x00000001
-#define WININET_API_FLAG_SYNC 0x00000004
-#define WININET_API_FLAG_USE_CONTEXT 0x00000008
+#define WININET_API_FLAG_ASYNC 0x00000001
+#define WININET_API_FLAG_SYNC 0x00000004
+#define WININET_API_FLAG_USE_CONTEXT 0x00000008
#define INTERNET_NO_CALLBACK 0
typedef enum {
@@ -184,7 +184,7 @@
#define ISO_FORCE_DISCONNECTED 0x00000001
typedef struct {
- DWORD dwStructSize;
+ DWORD dwStructSize;
LPSTR lpszScheme;
DWORD dwSchemeLength;
INTERNET_SCHEME nScheme;
@@ -194,29 +194,29 @@
LPSTR lpszUserName;
DWORD dwUserNameLength;
LPSTR lpszPassword;
- DWORD dwPasswordLength;
- LPSTR lpszUrlPath;
- DWORD dwUrlPathLength;
- LPSTR lpszExtraInfo;
- DWORD dwExtraInfoLength;
+ DWORD dwPasswordLength;
+ LPSTR lpszUrlPath;
+ DWORD dwUrlPathLength;
+ LPSTR lpszExtraInfo;
+ DWORD dwExtraInfoLength;
} URL_COMPONENTSA,* LPURL_COMPONENTSA;
typedef struct {
- DWORD dwStructSize;
- LPWSTR lpszScheme;
- DWORD dwSchemeLength;
- INTERNET_SCHEME nScheme;
- LPWSTR lpszHostName;
- DWORD dwHostNameLength;
- INTERNET_PORT nPort;
- LPWSTR lpszUserName;
- DWORD dwUserNameLength;
- LPWSTR lpszPassword;
- DWORD dwPasswordLength;
- LPWSTR lpszUrlPath;
- DWORD dwUrlPathLength;
- LPWSTR lpszExtraInfo;
- DWORD dwExtraInfoLength;
+ DWORD dwStructSize;
+ LPWSTR lpszScheme;
+ DWORD dwSchemeLength;
+ INTERNET_SCHEME nScheme;
+ LPWSTR lpszHostName;
+ DWORD dwHostNameLength;
+ INTERNET_PORT nPort;
+ LPWSTR lpszUserName;
+ DWORD dwUserNameLength;
+ LPWSTR lpszPassword;
+ DWORD dwPasswordLength;
+ LPWSTR lpszUrlPath;
+ DWORD dwUrlPathLength;
+ LPWSTR lpszExtraInfo;
+ DWORD dwExtraInfoLength;
} URL_COMPONENTSW,* LPURL_COMPONENTSW;
DECL_WINELIB_TYPE_AW(URL_COMPONENTS)
@@ -250,28 +250,28 @@
DECL_WINELIB_TYPE_AW(LPINTERNET_CERTIFICATE_INFO)
typedef struct _INTERNET_BUFFERSA {
- DWORD dwStructSize;
- struct _INTERNET_BUFFERSA * Next;
- LPCSTR lpcszHeader;
- DWORD dwHeadersLength;
- DWORD dwHeadersTotal;
- LPVOID lpvBuffer;
- DWORD dwBufferLength;
- DWORD dwBufferTotal;
- DWORD dwOffsetLow;
+ DWORD dwStructSize;
+ struct _INTERNET_BUFFERSA * Next;
+ LPCSTR lpcszHeader;
+ DWORD dwHeadersLength;
+ DWORD dwHeadersTotal;
+ LPVOID lpvBuffer;
+ DWORD dwBufferLength;
+ DWORD dwBufferTotal;
+ DWORD dwOffsetLow;
DWORD dwOffsetHigh;
} INTERNET_BUFFERSA,* LPINTERNET_BUFFERSA;
typedef struct _INTERNET_BUFFERSW {
- DWORD dwStructSize;
- struct _INTERNET_BUFFERSW * Next;
- LPCWSTR lpcszHeader;
- DWORD dwHeadersLength;
- DWORD dwHeadersTotal;
- LPVOID lpvBuffer;
- DWORD dwBufferLength;
- DWORD dwBufferTotal;
- DWORD dwOffsetLow;
+ DWORD dwStructSize;
+ struct _INTERNET_BUFFERSW * Next;
+ LPCWSTR lpcszHeader;
+ DWORD dwHeadersLength;
+ DWORD dwHeadersTotal;
+ LPVOID lpvBuffer;
+ DWORD dwBufferLength;
+ DWORD dwBufferTotal;
+ DWORD dwOffsetLow;
DWORD dwOffsetHigh;
} INTERNET_BUFFERSW,* LPINTERNET_BUFFERSW;
@@ -304,22 +304,22 @@
BOOLAPI InternetCombineUrlW(LPCWSTR ,LPCWSTR ,LPWSTR ,LPDWORD ,DWORD);
#define InternetCombineUrl WINELIB_NAME_AW(InternetCombineUrl)
-#define ICU_ESCAPE 0x80000000
-#define ICU_USERNAME 0x40000000
-#define ICU_NO_ENCODE 0x20000000
-#define ICU_DECODE 0x10000000
-#define ICU_NO_META 0x08000000
-#define ICU_ENCODE_SPACES_ONLY 0x04000000
-#define ICU_BROWSER_MODE 0x02000000
+#define ICU_ESCAPE 0x80000000
+#define ICU_USERNAME 0x40000000
+#define ICU_NO_ENCODE 0x20000000
+#define ICU_DECODE 0x10000000
+#define ICU_NO_META 0x08000000
+#define ICU_ENCODE_SPACES_ONLY 0x04000000
+#define ICU_BROWSER_MODE 0x02000000
INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR ,DWORD ,LPCSTR lpszProxy ,LPCSTR lpszProxyBypass ,DWORD);
INTERNETAPI HINTERNET WINAPI InternetOpenW(LPCWSTR ,DWORD ,LPCWSTR lpszProxy ,LPCWSTR lpszProxyBypass ,DWORD);
#define InternetOpen WINELIB_NAME_AW(InternetOpen)
-#define INTERNET_OPEN_TYPE_PRECONFIG 0
-#define INTERNET_OPEN_TYPE_DIRECT 1
-#define INTERNET_OPEN_TYPE_PROXY 3
-#define INTERNET_OPEN_TYPE_PRECONFIG_WITH_NO_AUTOPROXY 4
+#define INTERNET_OPEN_TYPE_PRECONFIG 0
+#define INTERNET_OPEN_TYPE_DIRECT 1
+#define INTERNET_OPEN_TYPE_PROXY 3
+#define INTERNET_OPEN_TYPE_PRECONFIG_WITH_NO_AUTOPROXY 4
#define PRE_CONFIG_INTERNET_ACCESS INTERNET_OPEN_TYPE_PRECONFIG
#define LOCAL_INTERNET_ACCESS INTERNET_OPEN_TYPE_DIRECT
#define CERN_PROXY_INTERNET_ACCESS INTERNET_OPEN_TYPE_PROXY
@@ -352,7 +352,7 @@
INTERNETAPI HINTERNET WINAPI InternetOpenUrlW(HINTERNET ,LPCWSTR ,LPCWSTR lpszHeaders ,DWORD ,DWORD ,DWORD);
#define InternetOpenUrl WINELIB_NAME_AW(InternetOpenUrl)
-BOOLAPI InternetReadFile( HINTERNET ,LPVOID ,DWORD ,LPDWORD );
+BOOLAPI InternetReadFile( HINTERNET ,LPVOID ,DWORD ,LPDWORD );
INTERNETAPI BOOL WINAPI InternetReadFileExA( HINTERNET ,LPINTERNET_BUFFERSA ,DWORD ,DWORD );
INTERNETAPI BOOL WINAPI InternetReadFileExW( HINTERNET ,LPINTERNET_BUFFERSW ,DWORD ,DWORD );
#define InternetReadFileEx WINELIB_NAME_AW(InternetReadFileEx)
@@ -363,7 +363,7 @@
#define IRF_NO_WAIT 0x00000008
INTERNETAPI DWORD WINAPI InternetSetFilePointer(HINTERNET ,LONG ,PVOID ,DWORD ,DWORD);
-BOOLAPI InternetWriteFile(HINTERNET ,LPCVOID ,DWORD ,LPDWORD);
+BOOLAPI InternetWriteFile(HINTERNET ,LPCVOID ,DWORD ,LPDWORD);
BOOLAPI InternetQueryDataAvailable(HINTERNET ,LPDWORD lpdwNumberOfBytesAvailable ,DWORD ,DWORD);
BOOLAPI InternetFindNextFileA(HINTERNET ,LPVOID);
BOOLAPI InternetFindNextFileW(HINTERNET ,LPVOID);
@@ -384,8 +384,8 @@
BOOLAPI InternetLockRequestFile(HINTERNET ,HANDLE *);
BOOLAPI InternetUnlockRequestFile(HANDLE);
-#define ISO_GLOBAL 0x00000001
-#define ISO_REGISTRY 0x00000002
+#define ISO_GLOBAL 0x00000001
+#define ISO_REGISTRY 0x00000002
#define ISO_VALID_FLAGS (ISO_GLOBAL | ISO_REGISTRY)
#define INTERNET_OPTION_CALLBACK 1
@@ -460,7 +460,7 @@
#define INTERNET_HANDLE_TYPE_GOPHER_FILE 11
#define INTERNET_HANDLE_TYPE_GOPHER_FILE_HTML 12
#define INTERNET_HANDLE_TYPE_HTTP_REQUEST 13
-#define SECURITY_FLAG_SECURE 0x00000001
+#define SECURITY_FLAG_SECURE 0x00000001
#define SECURITY_FLAG_STRENGTH_WEAK 0x10000000
#define SECURITY_FLAG_STRENGTH_MEDIUM 0x40000000
#define SECURITY_FLAG_STRENGTH_STRONG 0x20000000
@@ -518,11 +518,11 @@
#define INTERNET_STATUS_REDIRECT 110
#define INTERNET_STATUS_INTERMEDIATE_RESPONSE 120
#define INTERNET_STATUS_STATE_CHANGE 200
-#define INTERNET_STATE_CONNECTED 0x00000001
-#define INTERNET_STATE_DISCONNECTED 0x00000002
-#define INTERNET_STATE_DISCONNECTED_BY_USER 0x00000010
-#define INTERNET_STATE_IDLE 0x00000100
-#define INTERNET_STATE_BUSY 0x00000200
+#define INTERNET_STATE_CONNECTED 0x00000001
+#define INTERNET_STATE_DISCONNECTED 0x00000002
+#define INTERNET_STATE_DISCONNECTED_BY_USER 0x00000010
+#define INTERNET_STATE_IDLE 0x00000100
+#define INTERNET_STATE_BUSY 0x00000200
#define INTERNET_INVALID_STATUS_CALLBACK ((INTERNET_STATUS_CALLBACK)(-1L))
@@ -593,7 +593,7 @@
typedef struct {
CHAR DisplayString[MAX_GOPHER_DISPLAY_TEXT + 1];
- DWORD GopherType;
+ DWORD GopherType;
DWORD SizeLow;
DWORD SizeHigh;
FILETIME LastModificationTime;
@@ -602,7 +602,7 @@
typedef struct {
WCHAR DisplayString[MAX_GOPHER_DISPLAY_TEXT + 1];
- DWORD GopherType;
+ DWORD GopherType;
DWORD SizeLow;
DWORD SizeHigh;
FILETIME LastModificationTime;
@@ -820,8 +820,8 @@
DECL_WINELIB_TYPE_AW(LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE)
typedef struct {
- DWORD CategoryId;
- DWORD AttributeId;
+ DWORD CategoryId;
+ DWORD AttributeId;
union {
GOPHER_ADMIN_ATTRIBUTE_TYPEA Admin;
GOPHER_MOD_DATE_ATTRIBUTE_TYPE ModDate;
@@ -844,8 +844,8 @@
} GOPHER_ATTRIBUTE_TYPEA, *LPGOPHER_ATTRIBUTE_TYPEA;
typedef struct {
- DWORD CategoryId;
- DWORD AttributeId;
+ DWORD CategoryId;
+ DWORD AttributeId;
union {
GOPHER_ADMIN_ATTRIBUTE_TYPEW Admin;
GOPHER_MOD_DATE_ATTRIBUTE_TYPE ModDate;
@@ -870,9 +870,9 @@
DECL_WINELIB_TYPE_AW(GOPHER_ATTRIBUTE_TYPE)
DECL_WINELIB_TYPE_AW(LPGOPHER_ATTRIBUTE_TYPE)
-#define MAX_GOPHER_CATEGORY_NAME 128
-#define MAX_GOPHER_ATTRIBUTE_NAME 128
-#define MIN_GOPHER_ATTRIBUTE_LENGTH 256
+#define MAX_GOPHER_CATEGORY_NAME 128
+#define MAX_GOPHER_ATTRIBUTE_NAME 128
+#define MIN_GOPHER_ATTRIBUTE_LENGTH 256
#define GOPHER_INFO_CATEGORY TEXT("+INFO")
#define GOPHER_ADMIN_CATEGORY TEXT("+ADMIN")
@@ -976,11 +976,11 @@
#define HTTP_QUERY_COST 15
#define HTTP_QUERY_LINK 16
#define HTTP_QUERY_PRAGMA 17
-#define HTTP_QUERY_VERSION 18
-#define HTTP_QUERY_STATUS_CODE 19
-#define HTTP_QUERY_STATUS_TEXT 20
-#define HTTP_QUERY_RAW_HEADERS 21
-#define HTTP_QUERY_RAW_HEADERS_CRLF 22
+#define HTTP_QUERY_VERSION 18
+#define HTTP_QUERY_STATUS_CODE 19
+#define HTTP_QUERY_STATUS_TEXT 20
+#define HTTP_QUERY_RAW_HEADERS 21
+#define HTTP_QUERY_RAW_HEADERS_CRLF 22
#define HTTP_QUERY_CONNECTION 23
#define HTTP_QUERY_ACCEPT 24
#define HTTP_QUERY_ACCEPT_CHARSET 25
@@ -1003,7 +1003,7 @@
#define HTTP_QUERY_ACCEPT_RANGES 42
#define HTTP_QUERY_SET_COOKIE 43
#define HTTP_QUERY_COOKIE 44
-#define HTTP_QUERY_REQUEST_METHOD 45
+#define HTTP_QUERY_REQUEST_METHOD 45
#define HTTP_QUERY_REFRESH 46
#define HTTP_QUERY_CONTENT_DISPOSITION 47
#define HTTP_QUERY_AGE 48
@@ -1039,44 +1039,44 @@
)
#define HTTP_QUERY_HEADER_MASK (~HTTP_QUERY_MODIFIER_FLAGS_MASK)
-#define HTTP_STATUS_CONTINUE 100
-#define HTTP_STATUS_SWITCH_PROTOCOLS 101
-#define HTTP_STATUS_OK 200
-#define HTTP_STATUS_CREATED 201
-#define HTTP_STATUS_ACCEPTED 202
-#define HTTP_STATUS_PARTIAL 203
-#define HTTP_STATUS_NO_CONTENT 204
-#define HTTP_STATUS_RESET_CONTENT 205
-#define HTTP_STATUS_PARTIAL_CONTENT 206
-#define HTTP_STATUS_AMBIGUOUS 300
-#define HTTP_STATUS_MOVED 301
-#define HTTP_STATUS_REDIRECT 302
-#define HTTP_STATUS_REDIRECT_METHOD 303
-#define HTTP_STATUS_NOT_MODIFIED 304
-#define HTTP_STATUS_USE_PROXY 305
-#define HTTP_STATUS_REDIRECT_KEEP_VERB 307
-#define HTTP_STATUS_BAD_REQUEST 400
-#define HTTP_STATUS_DENIED 401
-#define HTTP_STATUS_PAYMENT_REQ 402
-#define HTTP_STATUS_FORBIDDEN 403
-#define HTTP_STATUS_NOT_FOUND 404
-#define HTTP_STATUS_BAD_METHOD 405
-#define HTTP_STATUS_NONE_ACCEPTABLE 406
-#define HTTP_STATUS_PROXY_AUTH_REQ 407
-#define HTTP_STATUS_REQUEST_TIMEOUT 408
-#define HTTP_STATUS_CONFLICT 409
-#define HTTP_STATUS_GONE 410
-#define HTTP_STATUS_LENGTH_REQUIRED 411
-#define HTTP_STATUS_PRECOND_FAILED 412
-#define HTTP_STATUS_REQUEST_TOO_LARGE 413
-#define HTTP_STATUS_URI_TOO_LONG 414
-#define HTTP_STATUS_UNSUPPORTED_MEDIA 415
-#define HTTP_STATUS_SERVER_ERROR 500
-#define HTTP_STATUS_NOT_SUPPORTED 501
-#define HTTP_STATUS_BAD_GATEWAY 502
-#define HTTP_STATUS_SERVICE_UNAVAIL 503
-#define HTTP_STATUS_GATEWAY_TIMEOUT 504
-#define HTTP_STATUS_VERSION_NOT_SUP 505
+#define HTTP_STATUS_CONTINUE 100
+#define HTTP_STATUS_SWITCH_PROTOCOLS 101
+#define HTTP_STATUS_OK 200
+#define HTTP_STATUS_CREATED 201
+#define HTTP_STATUS_ACCEPTED 202
+#define HTTP_STATUS_PARTIAL 203
+#define HTTP_STATUS_NO_CONTENT 204
+#define HTTP_STATUS_RESET_CONTENT 205
+#define HTTP_STATUS_PARTIAL_CONTENT 206
+#define HTTP_STATUS_AMBIGUOUS 300
+#define HTTP_STATUS_MOVED 301
+#define HTTP_STATUS_REDIRECT 302
+#define HTTP_STATUS_REDIRECT_METHOD 303
+#define HTTP_STATUS_NOT_MODIFIED 304
+#define HTTP_STATUS_USE_PROXY 305
+#define HTTP_STATUS_REDIRECT_KEEP_VERB 307
+#define HTTP_STATUS_BAD_REQUEST 400
+#define HTTP_STATUS_DENIED 401
+#define HTTP_STATUS_PAYMENT_REQ 402
+#define HTTP_STATUS_FORBIDDEN 403
+#define HTTP_STATUS_NOT_FOUND 404
+#define HTTP_STATUS_BAD_METHOD 405
+#define HTTP_STATUS_NONE_ACCEPTABLE 406
+#define HTTP_STATUS_PROXY_AUTH_REQ 407
+#define HTTP_STATUS_REQUEST_TIMEOUT 408
+#define HTTP_STATUS_CONFLICT 409
+#define HTTP_STATUS_GONE 410
+#define HTTP_STATUS_LENGTH_REQUIRED 411
+#define HTTP_STATUS_PRECOND_FAILED 412
+#define HTTP_STATUS_REQUEST_TOO_LARGE 413
+#define HTTP_STATUS_URI_TOO_LONG 414
+#define HTTP_STATUS_UNSUPPORTED_MEDIA 415
+#define HTTP_STATUS_SERVER_ERROR 500
+#define HTTP_STATUS_NOT_SUPPORTED 501
+#define HTTP_STATUS_BAD_GATEWAY 502
+#define HTTP_STATUS_SERVICE_UNAVAIL 503
+#define HTTP_STATUS_GATEWAY_TIMEOUT 504
+#define HTTP_STATUS_VERSION_NOT_SUP 505
#define HTTP_STATUS_FIRST HTTP_STATUS_CONTINUE
#define HTTP_STATUS_LAST HTTP_STATUS_VERSION_NOT_SUP
@@ -1110,12 +1110,12 @@
LPINTERNET_BUFFERSW lpBuffersOut ,DWORD ,DWORD);
#define HttpSendRequestEx WINELIB_NAME_AW(HttpSendRequestEx)
-#define HSR_ASYNC WININET_API_FLAG_ASYNC
-#define HSR_SYNC WININET_API_FLAG_SYNC
-#define HSR_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT
-#define HSR_INITIATE 0x00000008
-#define HSR_DOWNLOAD 0x00000010
-#define HSR_CHUNKED 0x00000020
+#define HSR_ASYNC WININET_API_FLAG_ASYNC
+#define HSR_SYNC WININET_API_FLAG_SYNC
+#define HSR_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT
+#define HSR_INITIATE 0x00000008
+#define HSR_DOWNLOAD 0x00000010
+#define HSR_CHUNKED 0x00000020
INTERNETAPI BOOL WINAPI HttpEndRequestA(HINTERNET ,LPINTERNET_BUFFERSA lpBuffersOut ,DWORD ,DWORD);
INTERNETAPI BOOL WINAPI HttpEndRequestW(HINTERNET ,LPINTERNET_BUFFERSW lpBuffersOut ,DWORD ,DWORD);
@@ -1151,10 +1151,10 @@
typedef struct
{
- DWORD cbStruct;
- DWORD dwOptions;
- PFN_AUTH_NOTIFY pfnNotify;
- DWORD dwContext;
+ DWORD cbStruct;
+ DWORD dwOptions;
+ PFN_AUTH_NOTIFY pfnNotify;
+ DWORD dwContext;
}
INTERNET_AUTH_NOTIFY_DATA;
@@ -1271,43 +1271,43 @@
typedef struct _INTERNET_CACHE_ENTRY_INFOA {
- DWORD dwStructSize;
- LPSTR lpszSourceUrlName;
- LPSTR lpszLocalFileName;
- DWORD CacheEntryType;
- DWORD dwUseCount;
- DWORD dwHitRate;
- DWORD dwSizeLow;
- DWORD dwSizeHigh;
- FILETIME LastModifiedTime;
- FILETIME ExpireTime;
- FILETIME LastAccessTime;
- FILETIME LastSyncTime;
-
- LPBYTE lpHeaderInfo;
- DWORD dwHeaderInfoSize;
- LPSTR lpszFileExtension;
- union {
+ DWORD dwStructSize;
+ LPSTR lpszSourceUrlName;
+ LPSTR lpszLocalFileName;
+ DWORD CacheEntryType;
+ DWORD dwUseCount;
+ DWORD dwHitRate;
+ DWORD dwSizeLow;
+ DWORD dwSizeHigh;
+ FILETIME LastModifiedTime;
+ FILETIME ExpireTime;
+ FILETIME LastAccessTime;
+ FILETIME LastSyncTime;
+
+ LPBYTE lpHeaderInfo;
+ DWORD dwHeaderInfoSize;
+ LPSTR lpszFileExtension;
+ union {
DWORD dwReserved;
DWORD dwExemptDelta;
} u;
} INTERNET_CACHE_ENTRY_INFOA,* LPINTERNET_CACHE_ENTRY_INFOA;
typedef struct _INTERNET_CACHE_ENTRY_INFOW {
- DWORD dwStructSize;
- LPWSTR lpszSourceUrlName;
- LPWSTR lpszLocalFileName;
- DWORD CacheEntryType;
- DWORD dwUseCount;
- DWORD dwHitRate;
- DWORD dwSizeLow;
- DWORD dwSizeHigh;
- FILETIME LastModifiedTime;
- FILETIME ExpireTime;
- FILETIME LastAccessTime;
- FILETIME LastSyncTime;
-
- LPBYTE lpHeaderInfo;
+ DWORD dwStructSize;
+ LPWSTR lpszSourceUrlName;
+ LPWSTR lpszLocalFileName;
+ DWORD CacheEntryType;
+ DWORD dwUseCount;
+ DWORD dwHitRate;
+ DWORD dwSizeLow;
+ DWORD dwSizeHigh;
+ FILETIME LastModifiedTime;
+ FILETIME ExpireTime;
+ FILETIME LastAccessTime;
+ FILETIME LastSyncTime;
+
+ LPBYTE lpHeaderInfo;
DWORD dwHeaderInfoSize;
LPWSTR lpszFileExtension;
union {
@@ -1441,11 +1441,11 @@
#define INTERNET_DIALSTATE_DISCONNECTED 1
BOOLAPI InternetCheckConnectionA(LPCSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
-BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
+BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
#define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection)
#ifdef __cplusplus
}
#endif
-#endif
+#endif
diff --git a/include/winioctl.h b/include/winioctl.h
index f1064cd..d73cc30 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -105,7 +105,7 @@
#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
/* decommissioned fsctl value 9 */
#define FSCTL_IS_VOLUME_MOUNTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_IS_PATHNAME_VALID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_IS_PATHNAME_VALID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
/* decommissioned fsctl value 13 */
#define FSCTL_QUERY_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14, METHOD_NEITHER, FILE_ANY_ACCESS)
@@ -121,10 +121,10 @@
#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS)
/* Start: _WIN32_WINNT >= 0x0400 */
#define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 25, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_GET_NTFS_FILE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_GET_NTFS_FILE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28, METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_GET_HFS_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 31, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS)
@@ -136,28 +136,28 @@
#define FSCTL_FIND_FILES_BY_SID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS)
/* decommissioned fsctl value 36 */
#define FSCTL_DUMP_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 37, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_WRITE_DATA)
+#define FSCTL_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_DELETE_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_WRITE_DATA)
+#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_WRITE_DATA)
+#define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_READ_DATA)
#define FSCTL_SET_OBJECT_ID_EXTENDED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_WRITE_DATA
-#define FSCTL_CREATE_OR_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_CREATE_OR_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
+#define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA)
#define FSCTL_ENABLE_UPGRADE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_SET_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_SET_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_ENCRYPTION_FSCTL_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_ANY_ACCESS)
+#define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_READ_DATA)
+#define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_READ_DATA)
#define FSCTL_EXTEND_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED, FILE_ANY_ACCESS)
/* End: _WIN32_WINNT >= 0x0500 */
@@ -173,7 +173,7 @@
#define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
+
#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS)
@@ -209,12 +209,12 @@
#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
-/* Start: For _WIN32_WINNT >= 0x0400 */
+/* Start: For _WIN32_WINNT >= 0x0400 */
#define IOCTL_DISK_CONTROLLER_NUMBER CTL_CODE(IOCTL_DISK_BASE, 0x0011, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define SMART_GET_VERSION CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS)
#define SMART_SEND_DRIVE_COMMAND CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
#define SMART_RCV_DRIVE_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-/* End: For _WIN32_WINNT >= 0x0400 */
+/* End: For _WIN32_WINNT >= 0x0400 */
#define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS)
@@ -240,7 +240,7 @@
Unknown, F5_1Pt2_512, F3_1Pt44_512, F3_2Pt88_512, F3_20Pt8_512, F3_720_512, F5_360_512,
F5_320_512, F5_320_1024, F5_180_512, F5_160_512, RemovableMedia, FixedMedia, F3_120M_512,
F3_640_512, F5_640_512, F5_720_512, F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, F3_128Mb_512,
- F3_230Mb_512, F8_256_128
+ F3_230Mb_512, F8_256_128
} MEDIA_TYPE, *PMEDIA_TYPE;
typedef struct _FORMAT_PARAMETERS {
@@ -250,10 +250,10 @@
DWORD StartHeadNumber;
DWORD EndHeadNumber;
} FORMAT_PARAMETERS, *PFORMAT_PARAMETERS;
-
+
typedef WORD BAD_TRACK_NUMBER;
typedef WORD *PBAD_TRACK_NUMBER;
-
+
typedef struct _FORMAT_EX_PARAMETERS {
MEDIA_TYPE MediaType;
DWORD StartCylinderNumber;
@@ -264,7 +264,7 @@
WORD SectorsPerTrack;
WORD SectorNumber[1];
} FORMAT_EX_PARAMETERS, *PFORMAT_EX_PARAMETERS;
-
+
typedef struct _DISK_GEOMETRY {
LARGE_INTEGER Cylinders;
MEDIA_TYPE MediaType;
@@ -272,7 +272,7 @@
DWORD SectorsPerTrack;
DWORD BytesPerSector;
} DISK_GEOMETRY, *PDISK_GEOMETRY;
-
+
typedef struct _PARTITION_INFORMATION {
LARGE_INTEGER StartingOffset;
LARGE_INTEGER PartitionLength;
@@ -283,28 +283,28 @@
BOOLEAN RecognizedPartition;
BOOLEAN RewritePartition;
} PARTITION_INFORMATION, *PPARTITION_INFORMATION;
-
+
typedef struct _SET_PARTITION_INFORMATION {
BYTE PartitionType;
} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION;
-
+
typedef struct _DRIVE_LAYOUT_INFORMATION {
DWORD PartitionCount;
DWORD Signature;
PARTITION_INFORMATION PartitionEntry[1];
} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION;
-
+
typedef struct _VERIFY_INFORMATION {
LARGE_INTEGER StartingOffset;
DWORD Length;
} VERIFY_INFORMATION, *PVERIFY_INFORMATION;
-
+
typedef struct _REASSIGN_BLOCKS {
WORD Reserved;
WORD Count;
DWORD BlockNumber[1];
} REASSIGN_BLOCKS, *PREASSIGN_BLOCKS;
-
+
#if(_WIN32_WINNT >= 0x0400)
typedef struct _DISK_CONTROLLER_NUMBER {
DWORD ControllerNumber;
@@ -317,15 +317,15 @@
*/
typedef struct tagDIOCRegs {
DWORD reg_EBX;
- DWORD reg_EDX;
- DWORD reg_ECX;
+ DWORD reg_EDX;
+ DWORD reg_ECX;
DWORD reg_EAX;
DWORD reg_EDI;
DWORD reg_ESI;
DWORD reg_Flags;
-} DIOC_REGISTERS, *PDIOC_REGISTERS;
+} DIOC_REGISTERS, *PDIOC_REGISTERS;
-/* Start VWIN32 information:
+/* Start VWIN32 information:
* VWIN32 is a VxD which supports the MSDOS Io routines.
*/
#define VWIN32_DIOC_DOS_IOCTL 1 /* This is the specified MS-DOS device I/O ctl - Interrupt 21h Function 4400h - 4411h */
@@ -368,7 +368,7 @@
/* FileFsLabelInformation = 2 */
/*
- unknown
+ unknown
*/
/* FileFsSizeInformation = 3 */
diff --git a/include/winnls.h b/include/winnls.h
index 9d31397..7cec81b 100644
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -27,12 +27,12 @@
#endif
-#define MB_PRECOMPOSED 0x00000001
+#define MB_PRECOMPOSED 0x00000001
#define MB_COMPOSITE 0x00000002
#define MB_USEGLYPHCHARS 0x00000004
#define MB_ERR_INVALID_CHARS 0x00000008
-#define LCID_INSTALLED 0x00000001
+#define LCID_INSTALLED 0x00000001
/* flags to GetLocaleInfo */
#define LOCALE_NOUSEROVERRIDE 0x80000000
@@ -44,106 +44,106 @@
/* When adding new defines, don't forget to add an entry to the
* locale_name2id map in ole/ole2nls.c
*/
-#define LOCALE_ILANGUAGE 0x00000001
-#define LOCALE_SLANGUAGE 0x00000002
-#define LOCALE_SENGLANGUAGE 0x00001001
-#define LOCALE_SABBREVLANGNAME 0x00000003
-#define LOCALE_SNATIVELANGNAME 0x00000004
-#define LOCALE_ICOUNTRY 0x00000005
-#define LOCALE_SCOUNTRY 0x00000006
-#define LOCALE_SENGCOUNTRY 0x00001002
-#define LOCALE_SABBREVCTRYNAME 0x00000007
-#define LOCALE_SNATIVECTRYNAME 0x00000008
-#define LOCALE_IDEFAULTLANGUAGE 0x00000009
-#define LOCALE_IDEFAULTCOUNTRY 0x0000000A
-#define LOCALE_IDEFAULTCODEPAGE 0x0000000B
-#define LOCALE_IDEFAULTANSICODEPAGE 0x00001004
+#define LOCALE_ILANGUAGE 0x00000001
+#define LOCALE_SLANGUAGE 0x00000002
+#define LOCALE_SENGLANGUAGE 0x00001001
+#define LOCALE_SABBREVLANGNAME 0x00000003
+#define LOCALE_SNATIVELANGNAME 0x00000004
+#define LOCALE_ICOUNTRY 0x00000005
+#define LOCALE_SCOUNTRY 0x00000006
+#define LOCALE_SENGCOUNTRY 0x00001002
+#define LOCALE_SABBREVCTRYNAME 0x00000007
+#define LOCALE_SNATIVECTRYNAME 0x00000008
+#define LOCALE_IDEFAULTLANGUAGE 0x00000009
+#define LOCALE_IDEFAULTCOUNTRY 0x0000000A
+#define LOCALE_IDEFAULTCODEPAGE 0x0000000B
+#define LOCALE_IDEFAULTANSICODEPAGE 0x00001004
#define LOCALE_IDEFAULTMACCODEPAGE 0x00001011
-#define LOCALE_SLIST 0x0000000C
-#define LOCALE_IMEASURE 0x0000000D
-#define LOCALE_SDECIMAL 0x0000000E
-#define LOCALE_STHOUSAND 0x0000000F
-#define LOCALE_SGROUPING 0x00000010
-#define LOCALE_IDIGITS 0x00000011
-#define LOCALE_ILZERO 0x00000012
-#define LOCALE_INEGNUMBER 0x00001010
-#define LOCALE_SNATIVEDIGITS 0x00000013
-#define LOCALE_SCURRENCY 0x00000014
-#define LOCALE_SINTLSYMBOL 0x00000015
-#define LOCALE_SMONDECIMALSEP 0x00000016
-#define LOCALE_SMONTHOUSANDSEP 0x00000017
-#define LOCALE_SMONGROUPING 0x00000018
-#define LOCALE_ICURRDIGITS 0x00000019
-#define LOCALE_IINTLCURRDIGITS 0x0000001A
-#define LOCALE_ICURRENCY 0x0000001B
-#define LOCALE_INEGCURR 0x0000001C
-#define LOCALE_SDATE 0x0000001D
-#define LOCALE_STIME 0x0000001E
-#define LOCALE_SSHORTDATE 0x0000001F
-#define LOCALE_SLONGDATE 0x00000020
-#define LOCALE_STIMEFORMAT 0x00001003
-#define LOCALE_IDATE 0x00000021
-#define LOCALE_ILDATE 0x00000022
-#define LOCALE_ITIME 0x00000023
-#define LOCALE_ITIMEMARKPOSN 0x00001005
-#define LOCALE_ICENTURY 0x00000024
-#define LOCALE_ITLZERO 0x00000025
-#define LOCALE_IDAYLZERO 0x00000026
-#define LOCALE_IMONLZERO 0x00000027
-#define LOCALE_S1159 0x00000028
-#define LOCALE_S2359 0x00000029
-#define LOCALE_ICALENDARTYPE 0x00001009
-#define LOCALE_IOPTIONALCALENDAR 0x0000100B
-#define LOCALE_IFIRSTDAYOFWEEK 0x0000100C
-#define LOCALE_IFIRSTWEEKOFYEAR 0x0000100D
-#define LOCALE_SDAYNAME1 0x0000002A
-#define LOCALE_SDAYNAME2 0x0000002B
-#define LOCALE_SDAYNAME3 0x0000002C
-#define LOCALE_SDAYNAME4 0x0000002D
-#define LOCALE_SDAYNAME5 0x0000002E
-#define LOCALE_SDAYNAME6 0x0000002F
-#define LOCALE_SDAYNAME7 0x00000030
-#define LOCALE_SABBREVDAYNAME1 0x00000031
-#define LOCALE_SABBREVDAYNAME2 0x00000032
-#define LOCALE_SABBREVDAYNAME3 0x00000033
-#define LOCALE_SABBREVDAYNAME4 0x00000034
-#define LOCALE_SABBREVDAYNAME5 0x00000035
-#define LOCALE_SABBREVDAYNAME6 0x00000036
-#define LOCALE_SABBREVDAYNAME7 0x00000037
-#define LOCALE_SMONTHNAME1 0x00000038
-#define LOCALE_SMONTHNAME2 0x00000039
-#define LOCALE_SMONTHNAME3 0x0000003A
-#define LOCALE_SMONTHNAME4 0x0000003B
-#define LOCALE_SMONTHNAME5 0x0000003C
-#define LOCALE_SMONTHNAME6 0x0000003D
-#define LOCALE_SMONTHNAME7 0x0000003E
-#define LOCALE_SMONTHNAME8 0x0000003F
-#define LOCALE_SMONTHNAME9 0x00000040
-#define LOCALE_SMONTHNAME10 0x00000041
-#define LOCALE_SMONTHNAME11 0x00000042
-#define LOCALE_SMONTHNAME12 0x00000043
-#define LOCALE_SMONTHNAME13 0x0000100E
-#define LOCALE_SABBREVMONTHNAME1 0x00000044
-#define LOCALE_SABBREVMONTHNAME2 0x00000045
-#define LOCALE_SABBREVMONTHNAME3 0x00000046
-#define LOCALE_SABBREVMONTHNAME4 0x00000047
-#define LOCALE_SABBREVMONTHNAME5 0x00000048
-#define LOCALE_SABBREVMONTHNAME6 0x00000049
-#define LOCALE_SABBREVMONTHNAME7 0x0000004A
-#define LOCALE_SABBREVMONTHNAME8 0x0000004B
-#define LOCALE_SABBREVMONTHNAME9 0x0000004C
-#define LOCALE_SABBREVMONTHNAME10 0x0000004D
-#define LOCALE_SABBREVMONTHNAME11 0x0000004E
-#define LOCALE_SABBREVMONTHNAME12 0x0000004F
-#define LOCALE_SABBREVMONTHNAME13 0x0000100F
-#define LOCALE_SPOSITIVESIGN 0x00000050
-#define LOCALE_SNEGATIVESIGN 0x00000051
-#define LOCALE_IPOSSIGNPOSN 0x00000052
-#define LOCALE_INEGSIGNPOSN 0x00000053
-#define LOCALE_IPOSSYMPRECEDES 0x00000054
-#define LOCALE_IPOSSEPBYSPACE 0x00000055
-#define LOCALE_INEGSYMPRECEDES 0x00000056
-#define LOCALE_INEGSEPBYSPACE 0x00000057
+#define LOCALE_SLIST 0x0000000C
+#define LOCALE_IMEASURE 0x0000000D
+#define LOCALE_SDECIMAL 0x0000000E
+#define LOCALE_STHOUSAND 0x0000000F
+#define LOCALE_SGROUPING 0x00000010
+#define LOCALE_IDIGITS 0x00000011
+#define LOCALE_ILZERO 0x00000012
+#define LOCALE_INEGNUMBER 0x00001010
+#define LOCALE_SNATIVEDIGITS 0x00000013
+#define LOCALE_SCURRENCY 0x00000014
+#define LOCALE_SINTLSYMBOL 0x00000015
+#define LOCALE_SMONDECIMALSEP 0x00000016
+#define LOCALE_SMONTHOUSANDSEP 0x00000017
+#define LOCALE_SMONGROUPING 0x00000018
+#define LOCALE_ICURRDIGITS 0x00000019
+#define LOCALE_IINTLCURRDIGITS 0x0000001A
+#define LOCALE_ICURRENCY 0x0000001B
+#define LOCALE_INEGCURR 0x0000001C
+#define LOCALE_SDATE 0x0000001D
+#define LOCALE_STIME 0x0000001E
+#define LOCALE_SSHORTDATE 0x0000001F
+#define LOCALE_SLONGDATE 0x00000020
+#define LOCALE_STIMEFORMAT 0x00001003
+#define LOCALE_IDATE 0x00000021
+#define LOCALE_ILDATE 0x00000022
+#define LOCALE_ITIME 0x00000023
+#define LOCALE_ITIMEMARKPOSN 0x00001005
+#define LOCALE_ICENTURY 0x00000024
+#define LOCALE_ITLZERO 0x00000025
+#define LOCALE_IDAYLZERO 0x00000026
+#define LOCALE_IMONLZERO 0x00000027
+#define LOCALE_S1159 0x00000028
+#define LOCALE_S2359 0x00000029
+#define LOCALE_ICALENDARTYPE 0x00001009
+#define LOCALE_IOPTIONALCALENDAR 0x0000100B
+#define LOCALE_IFIRSTDAYOFWEEK 0x0000100C
+#define LOCALE_IFIRSTWEEKOFYEAR 0x0000100D
+#define LOCALE_SDAYNAME1 0x0000002A
+#define LOCALE_SDAYNAME2 0x0000002B
+#define LOCALE_SDAYNAME3 0x0000002C
+#define LOCALE_SDAYNAME4 0x0000002D
+#define LOCALE_SDAYNAME5 0x0000002E
+#define LOCALE_SDAYNAME6 0x0000002F
+#define LOCALE_SDAYNAME7 0x00000030
+#define LOCALE_SABBREVDAYNAME1 0x00000031
+#define LOCALE_SABBREVDAYNAME2 0x00000032
+#define LOCALE_SABBREVDAYNAME3 0x00000033
+#define LOCALE_SABBREVDAYNAME4 0x00000034
+#define LOCALE_SABBREVDAYNAME5 0x00000035
+#define LOCALE_SABBREVDAYNAME6 0x00000036
+#define LOCALE_SABBREVDAYNAME7 0x00000037
+#define LOCALE_SMONTHNAME1 0x00000038
+#define LOCALE_SMONTHNAME2 0x00000039
+#define LOCALE_SMONTHNAME3 0x0000003A
+#define LOCALE_SMONTHNAME4 0x0000003B
+#define LOCALE_SMONTHNAME5 0x0000003C
+#define LOCALE_SMONTHNAME6 0x0000003D
+#define LOCALE_SMONTHNAME7 0x0000003E
+#define LOCALE_SMONTHNAME8 0x0000003F
+#define LOCALE_SMONTHNAME9 0x00000040
+#define LOCALE_SMONTHNAME10 0x00000041
+#define LOCALE_SMONTHNAME11 0x00000042
+#define LOCALE_SMONTHNAME12 0x00000043
+#define LOCALE_SMONTHNAME13 0x0000100E
+#define LOCALE_SABBREVMONTHNAME1 0x00000044
+#define LOCALE_SABBREVMONTHNAME2 0x00000045
+#define LOCALE_SABBREVMONTHNAME3 0x00000046
+#define LOCALE_SABBREVMONTHNAME4 0x00000047
+#define LOCALE_SABBREVMONTHNAME5 0x00000048
+#define LOCALE_SABBREVMONTHNAME6 0x00000049
+#define LOCALE_SABBREVMONTHNAME7 0x0000004A
+#define LOCALE_SABBREVMONTHNAME8 0x0000004B
+#define LOCALE_SABBREVMONTHNAME9 0x0000004C
+#define LOCALE_SABBREVMONTHNAME10 0x0000004D
+#define LOCALE_SABBREVMONTHNAME11 0x0000004E
+#define LOCALE_SABBREVMONTHNAME12 0x0000004F
+#define LOCALE_SABBREVMONTHNAME13 0x0000100F
+#define LOCALE_SPOSITIVESIGN 0x00000050
+#define LOCALE_SNEGATIVESIGN 0x00000051
+#define LOCALE_IPOSSIGNPOSN 0x00000052
+#define LOCALE_INEGSIGNPOSN 0x00000053
+#define LOCALE_IPOSSYMPRECEDES 0x00000054
+#define LOCALE_IPOSSEPBYSPACE 0x00000055
+#define LOCALE_INEGSYMPRECEDES 0x00000056
+#define LOCALE_INEGSEPBYSPACE 0x00000057
#define LOCALE_FONTSIGNATURE 0x00000058
#define LOCALE_SISO639LANGNAME 0x00000059
#define LOCALE_SISO3166CTRYNAME 0x0000005A
@@ -214,7 +214,7 @@
IS_TEXT_UNICODE_SIGNATURE| \
IS_TEXT_UNICODE_ODD_LENGTH
-
+
/* Character Type Flags */
#define CT_CTYPE1 0x00000001 /* usual ctype */
#define CT_CTYPE2 0x00000002 /* bidirectional layout info */
diff --git a/include/winnt.h b/include/winnt.h
index 92d4d36..a3fa086 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -30,12 +30,12 @@
#endif
-/* On Windows winnt.h depends on a few windef.h types and macros and thus
- * is not self-contained. Furthermore windef.h includes winnt.h so that it
+/* On Windows winnt.h depends on a few windef.h types and macros and thus
+ * is not self-contained. Furthermore windef.h includes winnt.h so that it
* would be pointless to try to use winnt.h directly.
- * But for Wine and Winelib I decided to make winnt.h self-contained by
- * moving these definitions to winnt.h. It makes no difference to Winelib
- * programs since they are not using winnt.h directly anyway, and it allows
+ * But for Wine and Winelib I decided to make winnt.h self-contained by
+ * moving these definitions to winnt.h. It makes no difference to Winelib
+ * programs since they are not using winnt.h directly anyway, and it allows
* us to use winnt.h and get a minimal set of definitions.
*/
@@ -327,17 +327,17 @@
typedef const WCHAR *PCWSTR, *LPCWSTR;
/* Neutral character and string types */
-/* These are only defined for Winelib, i.e. _not_ defined for
- * the emulator. The reason is they depend on the UNICODE
+/* These are only defined for Winelib, i.e. _not_ defined for
+ * the emulator. The reason is they depend on the UNICODE
* macro which only exists in the user's code.
*/
#ifndef __WINE__
# ifdef WINE_UNICODE_REWRITE
-/* Use this if your compiler does not provide a 16bit wchar_t type.
+/* Use this if your compiler does not provide a 16bit wchar_t type.
* Note that you will need to specify -fwritable-strings or an option
* to this effect.
- * In C++ both WINE_UNICODE_TEXT('c') and WINE_UNICODE_TEXT("str") are
+ * In C++ both WINE_UNICODE_TEXT('c') and WINE_UNICODE_TEXT("str") are
* supported, but only the string form can be supported in C.
*/
EXTERN_C unsigned short* wine_rewrite_s4tos2(const wchar_t* str4);
@@ -358,12 +358,12 @@
# else /* WINE_UNICODE_REWRITE */
/* Define WINE_UNICODE_NATIVE if:
- * - your compiler provides a 16bit wchar_t type, e.g. gcc >= 2.96 with
+ * - your compiler provides a 16bit wchar_t type, e.g. gcc >= 2.96 with
* -fshort-wchar option
- * - or if you decide to use the native 32bit Unix wchar_t type. Be aware
- * though that the Wine APIs only support 16bit WCHAR characters for
+ * - or if you decide to use the native 32bit Unix wchar_t type. Be aware
+ * though that the Wine APIs only support 16bit WCHAR characters for
* binary compatibility reasons.
- * - or define nothing at all if you don't use Unicode, and blissfully
+ * - or define nothing at all if you don't use Unicode, and blissfully
* ignore the issue :-)
*/
# define WINE_UNICODE_TEXT(string) L##string
@@ -403,15 +403,15 @@
* Here is the plan to convert Wine to STRICT:
*
* Types will be converted one at a time by volunteers who will compile
- * Wine with STRICT turned on. Handles that have not been converted yet
- * will be declared with DECLARE_OLD_HANDLE. Converted handles are
+ * Wine with STRICT turned on. Handles that have not been converted yet
+ * will be declared with DECLARE_OLD_HANDLE. Converted handles are
* declared with DECLARE_HANDLE.
* See the bug report 90 for more details:
* http://wine.codeweavers.com/bugzilla/show_bug.cgi?id=90
*/
/*
- * when compiling Wine we always treat HANDLE as an UINT. Then when
- * we're ready we'll remove the '!defined(__WINE__)' (the equivalent
+ * when compiling Wine we always treat HANDLE as an UINT. Then when
+ * we're ready we'll remove the '!defined(__WINE__)' (the equivalent
* of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
*/
#if defined(STRICT) && !defined(__WINE__)
@@ -604,11 +604,11 @@
{
DWORD ControlWord;
DWORD StatusWord;
- DWORD TagWord;
+ DWORD TagWord;
DWORD ErrorOffset;
DWORD ErrorSelector;
DWORD DataOffset;
- DWORD DataSelector;
+ DWORD DataSelector;
BYTE RegisterArea[SIZE_OF_80387_REGISTERS];
DWORD Cr0NpxState;
} FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;
@@ -634,18 +634,18 @@
DWORD SegGs;
DWORD SegFs;
DWORD SegEs;
- DWORD SegDs;
+ DWORD SegDs;
/* These are selected by CONTEXT_INTEGER */
DWORD Edi;
DWORD Esi;
DWORD Ebx;
- DWORD Edx;
+ DWORD Edx;
DWORD Ecx;
DWORD Eax;
/* These are selected by CONTEXT_CONTROL */
- DWORD Ebp;
+ DWORD Ebp;
DWORD Eip;
DWORD SegCs;
DWORD EFlags;
@@ -684,7 +684,7 @@
#ifdef _ALPHA_
#define CONTEXT_ALPHA 0x00020000
-
+
#define CONTEXT_CONTROL (CONTEXT_ALPHA | 0x00000001L)
#define CONTEXT_FLOATING_POINT (CONTEXT_ALPHA | 0x00000002L)
#define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004L)
@@ -999,10 +999,10 @@
#ifdef __sparc__
-/*
- * FIXME:
+/*
+ * FIXME:
*
- * There is no official CONTEXT structure defined for the SPARC
+ * There is no official CONTEXT structure defined for the SPARC
* architecture, so I just made one up.
*
* This structure is valid only for 32-bit SPARC architectures,
@@ -1012,8 +1012,8 @@
* the rest of the register window chain is not visible.
*
* The layout follows the Solaris 'prgregset_t' structure.
- *
- */
+ *
+ */
#define CONTEXT_SPARC 0x10000000
@@ -1234,7 +1234,7 @@
#define LANG_SYSTEM_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT))
#define LANG_USER_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT))
#define LOCALE_SYSTEM_DEFAULT (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
-#define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT))
+#define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT))
#define LOCALE_NEUTRAL (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT))
/* FIXME: are the symbolic names correct for LIDs: 0x17, 0x20, 0x28,
@@ -1544,8 +1544,8 @@
#define STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE 0x40000023
#define STATUS_NO_YIELD_PERFORMED 0x40000024
#define STATUS_TIMER_RESUME_IGNORED 0x40000025
-
-#define STATUS_GUARD_PAGE_VIOLATION 0x80000001
+
+#define STATUS_GUARD_PAGE_VIOLATION 0x80000001
#define STATUS_DATATYPE_MISALIGNMENT 0x80000002
#define STATUS_BREAKPOINT 0x80000003
#define STATUS_SINGLE_STEP 0x80000004
@@ -1707,7 +1707,7 @@
#define STATUS_NO_TOKEN 0xC000007C
#define STATUS_BAD_INHERITANCE_ACL 0xC000007D
#define STATUS_RANGE_NOT_LOCKED 0xC000007E
-#define STATUS_DISK_FULL 0xC000007F
+#define STATUS_DISK_FULL 0xC000007F
#define STATUS_SERVER_DISABLED 0xC0000080
#define STATUS_SERVER_NOT_DISABLED 0xC0000081
#define STATUS_TOO_MANY_GUIDS_REQUESTED 0xC0000082
@@ -2216,9 +2216,9 @@
#define EXCEPTION_CONTINUABLE 0
#define EXCEPTION_NONCONTINUABLE EH_NONCONTINUABLE
-
+
/*
- * The exception record used by Win32 to give additional information
+ * The exception record used by Win32 to give additional information
* about exception to exception handlers.
*/
@@ -2239,8 +2239,8 @@
* The exception pointers structure passed to exception filters
* in except() and the UnhandledExceptionFilter().
*/
-
-typedef struct _EXCEPTION_POINTERS
+
+typedef struct _EXCEPTION_POINTERS
{
PEXCEPTION_RECORD ExceptionRecord;
PCONTEXT ContextRecord;
@@ -2248,8 +2248,8 @@
/*
- * The exception frame, used for registering exception handlers
- * Win32 cares only about this, but compilers generally emit
+ * The exception frame, used for registering exception handlers
+ * Win32 cares only about this, but compilers generally emit
* larger exception frames for their own use.
*/
@@ -2283,7 +2283,7 @@
#define DBG_CONTROL_BREAK 0x40010008
#define DBG_EXCEPTION_NOT_HANDLED 0x80010001
-typedef struct _NT_TIB
+typedef struct _NT_TIB
{
struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;
PVOID StackBase;
@@ -2357,7 +2357,7 @@
* This is the Windows executable (NE) header.
* the name IMAGE_OS2_HEADER is misleading, but in the SDK this way.
*/
-typedef struct
+typedef struct
{
WORD ne_magic; /* 00 NE signature 'NE' */
BYTE ne_ver; /* 02 Linker version number */
@@ -2473,7 +2473,7 @@
#define IMAGE_FILE_MACHINE_R4000 0x166
#define IMAGE_FILE_MACHINE_R10000 0x168
#define IMAGE_FILE_MACHINE_ALPHA 0x184
-#define IMAGE_FILE_MACHINE_POWERPC 0x1F0
+#define IMAGE_FILE_MACHINE_POWERPC 0x1F0
#define IMAGE_SIZEOF_FILE_HEADER 20
@@ -2621,8 +2621,8 @@
#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040
#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080
-#define IMAGE_SCN_LNK_OTHER 0x00000100
-#define IMAGE_SCN_LNK_INFO 0x00000200
+#define IMAGE_SCN_LNK_OTHER 0x00000100
+#define IMAGE_SCN_LNK_INFO 0x00000200
/* #define IMAGE_SCN_TYPE_OVER 0x00000400 - Reserved */
#define IMAGE_SCN_LNK_REMOVE 0x00000800
#define IMAGE_SCN_LNK_COMDAT 0x00001000
@@ -2877,7 +2877,7 @@
DWORD ForwarderChain; /* -1 if no forwarders */
DWORD Name;
/* RVA to IAT (if bound this IAT has actual addresses) */
- PIMAGE_THUNK_DATA FirstThunk;
+ PIMAGE_THUNK_DATA FirstThunk;
} IMAGE_IMPORT_DESCRIPTOR,*PIMAGE_IMPORT_DESCRIPTOR;
#define IMAGE_ORDINAL_FLAG 0x80000000
@@ -3261,7 +3261,7 @@
} IMAGE_FUNCTION_ENTRY, *PIMAGE_FUNCTION_ENTRY;
#define IMAGE_DEBUG_MISC_EXENAME 1
-
+
typedef struct _IMAGE_DEBUG_MISC {
DWORD DataType;
DWORD Length;
@@ -3311,7 +3311,7 @@
/*
* Here follows typedefs for security and tokens.
- */
+ */
/*
* First a constant for the following typdefs.
@@ -3327,17 +3327,17 @@
*/
typedef enum _TOKEN_INFORMATION_CLASS {
- TokenUser = 1,
- TokenGroups,
- TokenPrivileges,
- TokenOwner,
- TokenPrimaryGroup,
- TokenDefaultDacl,
- TokenSource,
- TokenType,
- TokenImpersonationLevel,
- TokenStatistics
-} TOKEN_INFORMATION_CLASS;
+ TokenUser = 1,
+ TokenGroups,
+ TokenPrivileges,
+ TokenOwner,
+ TokenPrimaryGroup,
+ TokenDefaultDacl,
+ TokenSource,
+ TokenType,
+ TokenImpersonationLevel,
+ TokenStatistics
+} TOKEN_INFORMATION_CLASS;
#define TOKEN_TOKEN_ADJUST_DEFAULT 0x0080
#define TOKEN_ADJUST_GROUPS 0x0040
@@ -3401,8 +3401,8 @@
#define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */
-/*
- * ACL
+/*
+ * ACL
*/
#define ACL_REVISION1 1
@@ -3458,19 +3458,19 @@
PACL Dacl;
} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
-#define SECURITY_DESCRIPTOR_MIN_LENGTH (sizeof(SECURITY_DESCRIPTOR))
+#define SECURITY_DESCRIPTOR_MIN_LENGTH (sizeof(SECURITY_DESCRIPTOR))
#endif /* _SECURITY_DEFINED */
-/*
+/*
* SID_AND_ATTRIBUTES
*/
typedef struct _SID_AND_ATTRIBUTES {
- PSID Sid;
- DWORD Attributes;
-} SID_AND_ATTRIBUTES ;
-
+ PSID Sid;
+ DWORD Attributes;
+} SID_AND_ATTRIBUTES ;
+
/* security entities */
#define SECURITY_NULL_RID (0x00000000L)
#define SECURITY_WORLD_RID (0x00000000L)
@@ -3486,7 +3486,7 @@
/* S-1-3 */
#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3}
-#define SECURITY_CREATOR_OWNER_RID (0x00000000L)
+#define SECURITY_CREATOR_OWNER_RID (0x00000000L)
#define SECURITY_CREATOR_GROUP_RID (0x00000001L)
#define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L)
#define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L)
@@ -3495,7 +3495,7 @@
#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4}
/* S-1-5 */
-#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5}
+#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5}
#define SECURITY_DIALUP_RID 0x00000001L
#define SECURITY_NETWORK_RID 0x00000002L
#define SECURITY_BATCH_RID 0x00000003L
@@ -3530,17 +3530,17 @@
*/
typedef struct _TOKEN_USER {
- SID_AND_ATTRIBUTES User;
-} TOKEN_USER;
+ SID_AND_ATTRIBUTES User;
+} TOKEN_USER;
/*
* TOKEN_GROUPS
*/
typedef struct _TOKEN_GROUPS {
- DWORD GroupCount;
- SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY];
-} TOKEN_GROUPS;
+ DWORD GroupCount;
+ SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY];
+} TOKEN_GROUPS;
/*
* LUID_AND_ATTRIBUTES
@@ -3603,63 +3603,63 @@
*/
typedef struct _TOKEN_PRIVILEGES {
- DWORD PrivilegeCount;
- LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
-} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES;
+ DWORD PrivilegeCount;
+ LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
+} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES;
/*
* TOKEN_OWNER
*/
typedef struct _TOKEN_OWNER {
- PSID Owner;
-} TOKEN_OWNER;
+ PSID Owner;
+} TOKEN_OWNER;
/*
* TOKEN_PRIMARY_GROUP
*/
typedef struct _TOKEN_PRIMARY_GROUP {
- PSID PrimaryGroup;
-} TOKEN_PRIMARY_GROUP;
+ PSID PrimaryGroup;
+} TOKEN_PRIMARY_GROUP;
/*
* TOKEN_DEFAULT_DACL
*/
-typedef struct _TOKEN_DEFAULT_DACL {
- PACL DefaultDacl;
-} TOKEN_DEFAULT_DACL;
+typedef struct _TOKEN_DEFAULT_DACL {
+ PACL DefaultDacl;
+} TOKEN_DEFAULT_DACL;
/*
* TOKEN_SOURCEL
*/
typedef struct _TOKEN_SOURCE {
- char Sourcename[8];
- LUID SourceIdentifier;
-} TOKEN_SOURCE;
+ char Sourcename[8];
+ LUID SourceIdentifier;
+} TOKEN_SOURCE;
/*
* TOKEN_TYPE
*/
typedef enum tagTOKEN_TYPE {
- TokenPrimary = 1,
- TokenImpersonation
-} TOKEN_TYPE;
+ TokenPrimary = 1,
+ TokenImpersonation
+} TOKEN_TYPE;
/*
* SECURITY_IMPERSONATION_LEVEL
*/
typedef enum _SECURITY_IMPERSONATION_LEVEL {
- SecurityAnonymous,
- SecurityIdentification,
- SecurityImpersonation,
- SecurityDelegation
-} SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL;
+ SecurityAnonymous,
+ SecurityIdentification,
+ SecurityImpersonation,
+ SecurityDelegation
+} SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL;
typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,
@@ -3680,20 +3680,20 @@
*/
typedef struct _TOKEN_STATISTICS {
- LUID TokenId;
- LUID AuthenticationId;
- LARGE_INTEGER ExpirationTime;
- TOKEN_TYPE TokenType;
- SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;
- DWORD DynamicCharged;
- DWORD DynamicAvailable;
- DWORD GroupCount;
- DWORD PrivilegeCount;
- LUID ModifiedId;
-} TOKEN_STATISTICS;
+ LUID TokenId;
+ LUID AuthenticationId;
+ LARGE_INTEGER ExpirationTime;
+ TOKEN_TYPE TokenType;
+ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;
+ DWORD DynamicCharged;
+ DWORD DynamicAvailable;
+ DWORD GroupCount;
+ DWORD PrivilegeCount;
+ LUID ModifiedId;
+} TOKEN_STATISTICS;
-/*
- * ACLs of NT
+/*
+ * ACLs of NT
*/
#define ACL_REVISION 2
@@ -3725,7 +3725,7 @@
#define SUCCESSFUL_ACCESS_ACE_FLAG 0x40
#define FAILED_ACCESS_ACE_FLAG 0x80
-/* different ACEs depending on AceType
+/* different ACEs depending on AceType
* SidStart marks the begin of a SID
* so the thing finally looks like this:
* 0: ACE_HEADER
@@ -3830,8 +3830,8 @@
#define THREAD_DIRECT_IMPERSONATION 0x0200
#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3ff)
-#define THREAD_BASE_PRIORITY_LOWRT 15
-#define THREAD_BASE_PRIORITY_MAX 2
+#define THREAD_BASE_PRIORITY_LOWRT 15
+#define THREAD_BASE_PRIORITY_MAX 2
#define THREAD_BASE_PRIORITY_MIN -2
#define THREAD_BASE_PRIORITY_IDLE -15
@@ -4027,7 +4027,7 @@
SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS )
-typedef enum _CM_SERVICE_NODE_TYPE
+typedef enum _CM_SERVICE_NODE_TYPE
{
DriverType = SERVICE_KERNEL_DRIVER,
FileSystemType = SERVICE_FILE_SYSTEM_DRIVER,
@@ -4037,7 +4037,7 @@
RecognizerType = SERVICE_RECOGNIZER_DRIVER
} SERVICE_NODE_TYPE;
-typedef enum _CM_SERVICE_LOAD_TYPE
+typedef enum _CM_SERVICE_LOAD_TYPE
{
BootLoad = SERVICE_BOOT_START,
SystemLoad = SERVICE_SYSTEM_START,
@@ -4046,7 +4046,7 @@
DisableLoad = SERVICE_DISABLED
} SERVICE_LOAD_TYPE;
-typedef enum _CM_ERROR_CONTROL_TYPE
+typedef enum _CM_ERROR_CONTROL_TYPE
{
IgnoreError = SERVICE_ERROR_IGNORE,
NormalError = SERVICE_ERROR_NORMAL,
@@ -4064,7 +4064,7 @@
#include "guiddef.h"
-typedef struct _RTL_CRITICAL_SECTION_DEBUG
+typedef struct _RTL_CRITICAL_SECTION_DEBUG
{
WORD Type;
WORD CreatorBackTraceIndex;
diff --git a/include/winreg.h b/include/winreg.h
index 098cb55..c5e7b63 100644
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -39,7 +39,7 @@
/*
* registry provider structs
*/
-typedef struct value_entA
+typedef struct value_entA
{ LPSTR ve_valuename;
DWORD ve_valuelen;
DWORD_PTR ve_valueptr;
diff --git a/include/winsock.h b/include/winsock.h
index bc9f42a..e6452df 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -58,10 +58,10 @@
*/
#ifndef __WINE_USE_MSVCRT
-/* Get the u_xxx types from the Unix headers. They will do and doing it
- * this way will avoid redefinitions. But on FreeBSD we may get macros
- * and prototypes for htonl & co. This means the functions will not be
- * called because of the macros. So this should not harm us too much unless
+/* Get the u_xxx types from the Unix headers. They will do and doing it
+ * this way will avoid redefinitions. But on FreeBSD we may get macros
+ * and prototypes for htonl & co. This means the functions will not be
+ * called because of the macros. So this should not harm us too much unless
* we try to define our own prototypes (different calling convention).
*/
# include <sys/types.h>
@@ -69,7 +69,7 @@
# define WS_DEFINE_HTONL
# endif /* htonl */
#else
-/* Since we are using the MSVCRT headers, we must define the u_xxx
+/* Since we are using the MSVCRT headers, we must define the u_xxx
* types ourselves.
*/
typedef unsigned char u_char;
@@ -350,14 +350,14 @@
*/
#if !defined(USE_WS_PREFIX) && !defined(__WINE_USE_MSVCRT)
-/* We are not using the WS_ prefix and not using the MSVCRT either so we
+/* We are not using the WS_ prefix and not using the MSVCRT either so we
* risk getting conflicts for everything related to select.
*/
# ifdef FD_CLR
-/* Too late, the Unix version of stdlib.h was included before winsock.h.
- * This means select and all the related stuff is already defined and we
+/* Too late, the Unix version of stdlib.h was included before winsock.h.
+ * This means select and all the related stuff is already defined and we
* cannot override types and function prototypes.
- * All we can do is disable all these symbols so that they are not used
+ * All we can do is disable all these symbols so that they are not used
* inadvertantly.
*/
# undef FD_SETSIZE
@@ -374,8 +374,8 @@
# define fd_set Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# define select Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# else
-/* stdlib.h has not been included yet so it's not too late. Include it now
- * making sure that none of the select symbols is affected. Then we can
+/* stdlib.h has not been included yet so it's not too late. Include it now
+ * making sure that none of the select symbols is affected. Then we can
* define them with our own values.
*/
# define fd_set unix_fd_set
@@ -449,7 +449,7 @@
if (((cast*)(set))->fd_count < FD_SETSIZE) \
((cast*)(set))->fd_array[((cast*)(set))->fd_count++]=(fd); \
} while(0)
-/* This version checks if the filedesc is already in the list, and appends it
+/* This version checks if the filedesc is already in the list, and appends it
* only if it's not the case
*/
#define __WS_FD_SET2(fd, set, cast) do { \
@@ -486,8 +486,8 @@
#endif /* WS_DEFINE_SELECT */
-/*
- * Internet address (old style... should be updated)
+/*
+ * Internet address (old style... should be updated)
*/
#ifndef USE_WS_PREFIX
@@ -879,7 +879,7 @@
/*
* Prototypes
*
- * Remember to keep this section in sync with the
+ * Remember to keep this section in sync with the
* "Winsock Function Typedefs" section in winsock2.h.
*/
#if !defined(__WINE_WINSOCK2__) || WS_API_PROTOTYPES
diff --git a/include/winsock2.h b/include/winsock2.h
index 5f5eae6..15eb6af 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -263,7 +263,7 @@
typedef struct _QUALITYOFSERVICE {
FLOWSPEC SendingFlowspec;
FLOWSPEC ReceivingFlowspec;
- WSABUF ProviderSpecific;
+ WSABUF ProviderSpecific;
} QOS, *LPQOS;
typedef int (CALLBACK *LPCONDITIONPROC)
@@ -291,7 +291,7 @@
/*
* Winsock Function Typedefs
*
- * Remember to keep this section in sync with the
+ * Remember to keep this section in sync with the
* "Prototypes" section in winsock.h.
*/
#if WS_API_TYPEDEFS
@@ -351,7 +351,7 @@
/*
* Winsock2 Prototypes
*
- * Remember to keep this section in sync with the
+ * Remember to keep this section in sync with the
* "Winsock2 Function Typedefs" section below.
*/
#if WS_API_PROTOTYPES
@@ -416,7 +416,7 @@
/*
* Winsock2 Function Typedefs
*
- * Remember to keep this section in sync with the
+ * Remember to keep this section in sync with the
* "Winsock2 Prototypes" section above.
*/
#if WS_API_TYPEDEFS
diff --git a/include/winspool.h b/include/winspool.h
index 1fece02..00954df 100644
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -2,7 +2,7 @@
*
* Copyright 1998 Huw Davies, Andreas Mohr
*
- * Portions Copyright (c) 1999 Corel Corporation
+ * Portions Copyright (c) 1999 Corel Corporation
* (Paul Quinn, Albert Den Haan)
*
* This library is free software; you can redistribute it and/or
@@ -285,16 +285,16 @@
LPSTR pName;
LPSTR pEnvironment;
LPSTR pDriverPath;
- LPSTR pDataFile;
+ LPSTR pDataFile;
LPSTR pConfigFile;
} DRIVER_INFO_2A, *PDRIVER_INFO_2A, *LPDRIVER_INFO_2A;
typedef struct _DRIVER_INFO_2W {
DWORD cVersion;
- LPWSTR pName;
+ LPWSTR pName;
LPWSTR pEnvironment;
LPWSTR pDriverPath;
- LPWSTR pDataFile;
+ LPWSTR pDataFile;
LPWSTR pConfigFile;
} DRIVER_INFO_2W, *PDRIVER_INFO_2W, *LPDRIVER_INFO_2W;
@@ -351,7 +351,7 @@
DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_1)
/* FIXME: winspool.h declares some structure members with the name Status.
- * unfortunatly <X11/ICE/ICElib.h> #defines Status to the type 'int'
+ * unfortunatly <X11/ICE/ICElib.h> #defines Status to the type 'int'
* therfore the following hack */
#ifndef Status
@@ -410,7 +410,7 @@
typedef struct _PRINTER_INFO_3 {
PSECURITY_DESCRIPTOR pSecurityDescriptor;
} PRINTER_INFO_3, *PPRINTER_INFO_3, *LPPRINTER_INFO_3;
-
+
typedef struct _PRINTER_INFO_4A {
LPSTR pPrinterName;
LPSTR pServerName;
@@ -512,7 +512,7 @@
DWORD Time;
DWORD PagesPrinted;
} JOB_INFO_2A, *PJOB_INFO_2A, *LPJOB_INFO_2A;
-
+
typedef struct _JOB_INFO_2W {
DWORD JobID;
LPWSTR pPrinterName;
@@ -538,7 +538,7 @@
DWORD Time;
DWORD PagesPrinted;
} JOB_INFO_2W, *PJOB_INFO_2W, *LPJOB_INFO_2W;
-
+
DECL_WINELIB_TYPE_AW(JOB_INFO_2)
DECL_WINELIB_TYPE_AW(PJOB_INFO_2)
DECL_WINELIB_TYPE_AW(LPJOB_INFO_2)
@@ -765,13 +765,13 @@
LPSTR pName;
LPSTR pEnvironment;
LPSTR pDLLName;
-} PROVIDOR_INFO_1A, *PPROVIDOR_INFO_1A, *LPPROVIDOR_INFO_1A;
+} PROVIDOR_INFO_1A, *PPROVIDOR_INFO_1A, *LPPROVIDOR_INFO_1A;
typedef struct _PROVIDOR_INFO_1W {
LPWSTR pName;
LPWSTR pEnvironment;
LPWSTR pDLLName;
-} PROVIDOR_INFO_1W, *PPROVIDOR_INFO_1W, *LPPROVIDOR_INFO_1W;
+} PROVIDOR_INFO_1W, *PPROVIDOR_INFO_1W, *LPPROVIDOR_INFO_1W;
DECL_WINELIB_TYPE_AW(PROVIDOR_INFO_1)
DECL_WINELIB_TYPE_AW(PPROVIDOR_INFO_1)
@@ -879,15 +879,15 @@
BOOL WINAPI DeletePrinter(HANDLE hPrinter);
BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
- DWORD Command);
+ DWORD Command);
BOOL WINAPI SetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
- DWORD Command);
+ DWORD Command);
#define SetPrinter WINELIB_NAME_AW(SetPrinter)
BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
- DWORD cbBuf, LPDWORD pcbNeeded);
+ DWORD cbBuf, LPDWORD pcbNeeded);
BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
- DWORD cbBuf, LPDWORD pcbNeeded);
+ DWORD cbBuf, LPDWORD pcbNeeded);
#define GetPrinter WINELIB_NAME_AW(GetPrinter)
BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo);
@@ -929,7 +929,7 @@
#define EnumPrintProcessors WINELIB_NAME_AW(EnumPrintProcessors)
BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR pName, LPSTR pEnvironment,
- DWORD Level,
+ DWORD Level,
LPBYTE pPrintProcessorInfo,
DWORD cbBuf, LPDWORD pcbNeeded);
@@ -979,11 +979,11 @@
BOOL WINAPI ScheduleJob(HANDLE hPrinter, DWORD JobID);
LONG WINAPI AdvancedDocumentPropertiesA(HWND hWnd, HANDLE hPrinter,
- LPSTR pDeviceName,
+ LPSTR pDeviceName,
PDEVMODEA pDevModeOutput,
PDEVMODEA pDevModeInput);
LONG WINAPI AdvancedDocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
- LPWSTR pDeviceName,
+ LPWSTR pDeviceName,
PDEVMODEW pDevModeOutput,
PDEVMODEW pDevModeInput);
#define AdvancedDocumentProperties WINELIB_NAME_AW(AdvancedDocumentProperties)
diff --git a/include/winuser.h b/include/winuser.h
index 5de2b96..b9bec44 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1046,7 +1046,7 @@
#define WM_IME_COMPOSITION 0x010f
#define WM_IME_KEYLAST 0x010f
-#define WM_INITDIALOG 0x0110
+#define WM_INITDIALOG 0x0110
#define WM_COMMAND 0x0111
#define WM_SYSCOMMAND 0x0112
#define WM_TIMER 0x0113
@@ -1103,7 +1103,7 @@
#define WM_MOUSEFIRST 0x0200
#define WM_MOUSELAST 0x020D
-
+
#define WHEEL_DELTA 120
#define WHEEL_PAGESCROLL (UINT_MAX)
#define WM_PARENTNOTIFY 0x0210
@@ -1230,7 +1230,7 @@
#define IDYES 6
#define IDNO 7
#define IDCLOSE 8
-#define IDHELP 9
+#define IDHELP 9
/****** Window classes ******/
@@ -1279,7 +1279,7 @@
BYTE rgbReserved[32];
} PAINTSTRUCT, *PPAINTSTRUCT, *LPPAINTSTRUCT;
-typedef struct
+typedef struct
{
HMENU hWindowMenu;
UINT idFirstChild;
@@ -1315,7 +1315,7 @@
DECL_WINELIB_TYPE_AW(MDICREATESTRUCT)
DECL_WINELIB_TYPE_AW(LPMDICREATESTRUCT)
-#define MDITILE_VERTICAL 0x0000
+#define MDITILE_VERTICAL 0x0000
#define MDITILE_HORIZONTAL 0x0001
#define MDITILE_SKIPDISABLED 0x0002
@@ -1521,7 +1521,7 @@
#define PRF_ERASEBKGND 0x00000008L
#define PRF_CHILDREN 0x00000010L
#define PRF_OWNED 0x00000020L
-
+
/* Offsets for GetClassLong() and GetClassWord() */
#define GCL_MENUNAME (-8)
#define GCL_HBRBACKGROUND (-10)
@@ -1760,7 +1760,7 @@
#define POINTSTOPOINT(pt, pts) \
{ (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts); \
- (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); }
+ (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); }
#define POINTTOPOINTS(pt) (MAKELONG((short)((pt).x), (short)((pt).y)))
@@ -1800,7 +1800,7 @@
#define TPM_NONOTIFY 0x0080
#define TPM_RETURNCMD 0x0100
-typedef struct
+typedef struct
{
UINT cbSize;
RECT rcExclude;
@@ -1974,7 +1974,7 @@
#define BST_CHECKED 0x0001
#define BST_INDETERMINATE 0x0002
#define BST_PUSHED 0x0004
-#define BST_FOCUS 0x0008
+#define BST_FOCUS 0x0008
/* Static Control Styles */
#define SS_LEFT 0x00000000L
@@ -2043,7 +2043,7 @@
typedef const SCROLLINFO *LPCSCROLLINFO;
-/* GetScrollInfo() flags */
+/* GetScrollInfo() flags */
#define SIF_RANGE 0x0001
#define SIF_PAGE 0x0002
#define SIF_POS 0x0004
@@ -2520,7 +2520,7 @@
#define MNC_IGNORE 0
#define MNC_CLOSE 1
#define MNC_EXECUTE 2
-#define MNC_SELECT 3
+#define MNC_SELECT 3
/* SystemParametersInfo */
/* defines below are for all win versions */
@@ -3340,7 +3340,7 @@
#define VK_NONAME 0xFC
#define VK_PA1 0xFD
#define VK_OEM_CLEAR 0xFE
-
+
/* Key status flags for mouse events */
#define MK_LBUTTON 0x0001
#define MK_RBUTTON 0x0002
diff --git a/include/winver.h b/include/winver.h
index e0cca01..7b8f907 100644
--- a/include/winver.h
+++ b/include/winver.h
@@ -1,5 +1,5 @@
/* Definitions for the VERsion infolibrary (VER.DLL)
- *
+ *
* Copyright 1996 Marcus Meissner
*
* This library is free software; you can redistribute it and/or
diff --git a/include/wnaspi32.h b/include/wnaspi32.h
index 55327a5..9f89873 100644
--- a/include/wnaspi32.h
+++ b/include/wnaspi32.h
@@ -219,7 +219,7 @@
SRB_GetDiskInfo diskinfo;
} SRB, *PSRB, *LPSRB;
-typedef struct tagASPI32BUFF {
+typedef struct tagASPI32BUFF {
LPBYTE AB_BufPointer; /* pointer to buffer */
DWORD AB_BufLen; /* length of buffer */
DWORD AB_ZeroFill; /* set to 1 if zeroing */
diff --git a/include/wownt32.h b/include/wownt32.h
index 305b9ea..4d27fe5 100644
--- a/include/wownt32.h
+++ b/include/wownt32.h
@@ -1,5 +1,5 @@
/*
- * WOW Generic Thunk API
+ * WOW Generic Thunk API
*
* Copyright (C) 1999 Ulrich Weigand
*
diff --git a/include/wtypes.h b/include/wtypes.h
index bc2dc4d..3960a83 100644
--- a/include/wtypes.h
+++ b/include/wtypes.h
@@ -59,10 +59,10 @@
#endif
typedef enum tagDVASPECT
-{
+{
DVASPECT_CONTENT = 1,
DVASPECT_THUMBNAIL = 2,
- DVASPECT_ICON = 4,
+ DVASPECT_ICON = 4,
DVASPECT_DOCPRINT = 8
} DVASPECT;
@@ -76,7 +76,7 @@
} STGC;
typedef enum tagSTGMOVE
-{
+{
STGMOVE_MOVE = 0,
STGMOVE_COPY = 1,
STGMOVE_SHALLOWCOPY = 2
@@ -256,7 +256,7 @@
} SID,*PSID;
/*
- * ACL
+ * ACL
*/
typedef struct _ACL {
diff --git a/include/x11drv.h b/include/x11drv.h
index 3e6cd7b..ebcefb1 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -22,9 +22,9 @@
#ifndef __WINE_X11DRV_H
#define __WINE_X11DRV_H
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -147,9 +147,9 @@
extern BOOL X11DRV_PaintRgn( X11DRV_PDEVICE *physDev, HRGN hrgn );
extern BOOL X11DRV_Polyline( X11DRV_PDEVICE *physDev,const POINT* pt,INT count);
extern BOOL X11DRV_Polygon( X11DRV_PDEVICE *physDev, const POINT* pt, INT count );
-extern BOOL X11DRV_PolyPolygon( X11DRV_PDEVICE *physDev, const POINT* pt,
+extern BOOL X11DRV_PolyPolygon( X11DRV_PDEVICE *physDev, const POINT* pt,
const INT* counts, UINT polygons);
-extern BOOL X11DRV_PolyPolyline( X11DRV_PDEVICE *physDev, const POINT* pt,
+extern BOOL X11DRV_PolyPolyline( X11DRV_PDEVICE *physDev, const POINT* pt,
const DWORD* counts, DWORD polylines);
extern COLORREF X11DRV_SetBkColor( X11DRV_PDEVICE *physDev, COLORREF color );
@@ -172,7 +172,7 @@
/* OpenGL / X11 driver functions */
extern int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev,
const PIXELFORMATDESCRIPTOR *pppfd);
-extern int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
+extern int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
int iPixelFormat, UINT nBytes,
PIXELFORMATDESCRIPTOR *ppfd);
extern int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev);
diff --git a/include/x11font.h b/include/x11font.h
index 17e02a0..eb05db3 100644
--- a/include/x11font.h
+++ b/include/x11font.h
@@ -25,7 +25,7 @@
#include "x11drv.h"
#include "pshpack1.h"
-/* this is a part of the font resource header, should
+/* this is a part of the font resource header, should
* make it easier to implement dynamic softfont loading */
typedef struct
