Changeset 21720

Timestamp:

Oct 19, 2011, 11:26:02 AM (13 years ago)

Author:

dmik

Message:

Replace "\" with "/" in include statements.

Location:

branches/gcc-kmk

Files:

• include/custombuild.h (modified) (1 diff)
• include/heapstring.h (modified) (1 diff)
• include/odinlx.h (modified) (1 diff)
• include/win/wine/debug.h (modified) (1 diff)
• src/advapi32/service.cpp (modified) (30 diffs)
• src/comdlg32/cdlg.h (modified) (2 diffs)
• src/comdlg32/filedlg.c (modified) (46 diffs)
• src/comdlg32/filedlg95.c (modified) (82 diffs)
• src/crtdll/old/crtdll.cpp (modified) (23 diffs)
• src/crypt32/decode.c (modified) (5 diffs)
• src/custombuild/guid.c (modified) (3 diffs)
• src/driverdll/testdrv.cpp (modified) (1 diff)
• src/gdi32/font.cpp (modified) (1 diff)
• src/guidlib/guid.c (modified) (1 diff)
• src/iphlpapi/iphlwrap.h (modified) (12 diffs)
• src/kernel32/HandleManager.cpp (modified) (1 diff)
• src/kernel32/char.cpp (modified) (1 diff)
• src/kernel32/directory.cpp (modified) (20 diffs)
• src/kernel32/heapstring.cpp (modified) (1 diff)
• src/kernel32/hmdevio.cpp (modified) (9 diffs)
• src/kernel32/hmdisk.cpp (modified) (17 diffs)
• src/kernel32/hmthread.cpp (modified) (5 diffs)
• src/kernel32/lang.cpp (modified) (1 diff)
• src/kernel32/mmap.cpp (modified) (1 diff)
• src/kernel32/mmapdup.cpp (modified) (6 diffs)
• src/kernel32/mmapnotify.cpp (modified) (4 diffs)
• src/kernel32/mmapview.cpp (modified) (16 diffs)
• src/kernel32/osliblvm.cpp (modified) (11 diffs)
• src/kernel32/osliblvm.h (modified) (4 diffs)
• src/kernel32/oslibmem.cpp (modified) (1 diff)
• src/kernel32/process.cpp (modified) (8 diffs)
• src/kernel32/virtual.cpp (modified) (1 diff)
• src/kernel32/winimagebase.cpp (modified) (1 diff)
• src/kernel32/winimagebase.h (modified) (1 diff)
• src/kernel32/winimagelx.cpp (modified) (1 diff)
• src/kernel32/winimagepeldr.cpp (modified) (1 diff)
• src/kernel32/wprocess.cpp (modified) (1 diff)
• src/msvcrt/time.c (modified) (1 diff)
• src/oleaut32/libgif/dgif_lib.c (modified) (6 diffs)
• src/oleaut32/libgif/egif_lib.c (modified) (4 diffs)
• src/oleaut32/libgif/gif_hash.c (modified) (1 diff)
• src/opengl/glide/sst1/init/init.c (modified) (1 diff)
• src/opengl/glide/sst1/init/vg96drvr.c (modified) (1 diff)
• src/opengl/glut/glut_init.c (modified) (1 diff)
• src/opengl/glut/glutos2.h (modified) (1 diff)
• src/opengl/mesa/mesadive.c (modified) (1 diff)
• src/opengl/mesa/osmesa.c (modified) (9 diffs)
• src/opengl/mesa/wmesa.c (modified) (20 diffs)
• src/peldr/pe.cpp (modified) (11 diffs)
• src/rpcrt4/uuid.cpp (modified) (1 diff)
• src/shdocvw/shdocvw.h (modified) (1 diff)
• src/shell32/sh.cpp (modified) (1 diff)
• src/shell32/shell32_main.h (modified) (5 diffs)
• src/shlwapi/ordinal_odin.cpp (modified) (1 diff)
• src/shlwapi/reg_odin.cpp (modified) (13 diffs)
• src/shlwapi/shlstub.cpp (modified) (5 diffs)
• src/shlwapi/shlwapi.cpp (modified) (1 diff)
• src/shlwapi/string_odin.cpp (modified) (13 diffs)
• src/shlwapi/url_odin.cpp (modified) (1 diff)
• src/user32/controls/controls.h (modified) (1 diff)
• src/user32/loadres.cpp (modified) (4 diffs)
• src/user32/msgbox.c (modified) (1 diff)
• src/user32/oslibmsg.cpp (modified) (1 diff)
• src/user32/oslibres.h (modified) (1 diff)
• src/user32/pmwindow.cpp (modified) (1 diff)
• src/user32/win32class.cpp (modified) (1 diff)
• src/user32/win32dlg.cpp (modified) (6 diffs)
• src/user32/win32wbase.cpp (modified) (1 diff)
• src/user32/win32wbasepos.cpp (modified) (1 diff)
• src/user32/win32wfake.cpp (modified) (1 diff)
• src/user32/winaccel.cpp (modified) (3 diffs)
• src/user32/windlg.cpp (modified) (2 diffs)
• src/user32/windlgmsg.cpp (modified) (2 diffs)
• src/user32/window.cpp (modified) (19 diffs)
• src/user32/winicon.cpp (modified) (6 diffs)
• src/user32/winmouse.cpp (modified) (1 diff)
• src/user32/winproc.cpp (modified) (2 diffs)
• src/user32/wndmsg.cpp (modified) (1 diff)
• src/win32k/kKrnlLib/src/d16Globl.c (modified) (1 diff)
• src/win32k/libconv.c (modified) (1 diff)
• src/wininet/wininet.cpp (modified) (1 diff)
• src/winmm/initterm.cpp (modified) (1 diff)
• src/winmm/initwinmm.cpp (modified) (6 diffs)
• src/winmm/playsound.cpp (modified) (16 diffs)
• src/winspool/stubs.cpp (modified) (1 diff)
• src/winspool/winspool.cpp (modified) (1 diff)
• src/wintrust/wintrust.cpp (modified) (1 diff)
• src/wsock32/new/wsock32.h (modified) (2 diffs)
• src/wsock32/socketwrap.h (modified) (57 diffs)
• src/wsock32/wsock32.h (modified) (1 diff)
• tools/install/odininst.cpp (modified) (1 diff)

branches/gcc-kmk/include/custombuild.h ¶

@@ -2 +2 @@
 #define __CUSTOMBUILD_H__
 
-#include <win\peexe.h>
+#include <win/peexe.h>
 #include <initdll.h>
 

branches/gcc-kmk/include/heapstring.h ¶

@@ -9 +9 @@
 #include <odin.h>
 
-#include <wine\unicode.h>
+#include <wine/unicode.h>
 //SvL: strcase -> case insensitive!
 #define strncasecmp lstrncmpiA

branches/gcc-kmk/include/odinlx.h ¶

@@ -14 +14 @@
 #define _ODINLX_H
 
-#include <win\peexe.h>
+#include <win/peexe.h>
 #include <versionos2.h>
 

branches/gcc-kmk/include/win/wine/debug.h ¶

@@ -22 +22 @@
 #define __WINE_WINE_DEBUG_H
 
-#include <win\debugtools.h>
+#include <win/debugtools.h>
 #include <stdarg.h>
 

branches/gcc-kmk/src/advapi32/service.cpp ¶

@@ -10 +10 @@
  *
  *
- * TODO: Not done; starting services; control handlers and many other things 
+ * TODO: Not done; starting services; control handlers and many other things
  * TODO: Service status handles are the same as service handles
  *
@@ -26 +26 @@
 #include <misc.h>
 #include <unicode.h>
-#include <win\winreg.h>
-#include <win\winsvc.h>
+#include <win/winreg.h>
+#include <win/winsvc.h>
 #include <heapstring.h>
 #define USE_ODIN_REGISTRY_APIS
@@ -71 +71 @@
 //TODO: Faster way to checking this
 //*****************************************************************************
-BOOL CheckServiceHandle(SC_HANDLE hService) 
+BOOL CheckServiceHandle(SC_HANDLE hService)
 {
  HKEY keyThisService;
@@ -147 +147 @@
            fdwDesiredAccess));
 
-  if(lpszMachineName) 
+  if(lpszMachineName)
         lpszMachineNameA = HEAP_strdupWtoA(GetProcessHeap(), 0, lpszMachineName);
   if(lpszDatabaseName)
@@ -154 +154 @@
   hService = OpenSCManagerA(lpszMachineNameA, lpszDataBaseNameA, fdwDesiredAccess);
 
-  if(lpszMachineNameA) 
+  if(lpszMachineNameA)
         HeapFree(GetProcessHeap(), 0, lpszMachineNameA);
   if(lpszDataBaseNameA)
@@ -190 +190 @@
         return FALSE;
   }
-  
+
   if(lpszServiceName == NULL) {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -442 +442 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -494 +494 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -574 +574 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -621 +621 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -665 +665 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -719 +719 @@
   RegSetValueExA(keyThisService, REG_SERVICE_STARTTYPE, 0, REG_DWORD, (LPBYTE)&dwStartType, sizeof(DWORD));
   RegSetValueExA(keyThisService, REG_SERVICE_ERRORCONTROL, 0, REG_DWORD, (LPBYTE)&dwErrorControl, sizeof(DWORD));
-  if(lpDisplayName) 
+  if(lpDisplayName)
         RegSetValueExA(keyThisService, REG_SERVICE_DISPLAYNAME, 0, REG_SZ, (LPBYTE)lpDisplayName, strlen(lpDisplayName)+1);
-  if(lpLoadOrderGroup) 
+  if(lpLoadOrderGroup)
         RegSetValueExA(keyThisService, REG_SERVICE_LOADORDERGROUP, 0, REG_SZ, (LPBYTE)lpDisplayName, strlen(lpLoadOrderGroup)+1);
   if(lpDependencies) {
@@ -736 +736 @@
 
   //Pointer to a variable that receives a tag value that is unique in the group specified in the
-  //lpLoadOrderGroup parameter. Specify NULL if you are not changing the existing tag. 
+  //lpLoadOrderGroup parameter. Specify NULL if you are not changing the existing tag.
   DWORD tag = 1; //TODO!!
   RegSetValueExA(keyThisService, REG_SERVICE_TAG, 0, REG_DWORD, (LPBYTE)&tag, sizeof(DWORD));
@@ -773 +773 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -855 +855 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -893 +893 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -929 +929 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -962 +962 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1021 +1021 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1359 +1359 @@
         while(*cmd != ' ' && *cmd != 0) cmd++; //skip non-space chars
         while(*cmd == ' ' && *cmd != 0) cmd++; //skip spaces
-        nrargs++;       
+        nrargs++;
   }
   return nrargs;
@@ -1373 +1373 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1413 +1413 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1453 +1453 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1467 +1467 @@
            lpHandlerProc));
 
-  //Doesn't work for services of type 
+  //Doesn't work for services of type
   if(lpszServiceName == NULL) {
         SetLastError(ERROR_INVALID_NAME);
@@ -1494 +1494 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1503 +1503 @@
 {
  SC_HANDLE hSCMgr, hService;
- 
+
   dprintf(("ADVAPI32: RegisterServiceCtrlHandlerW(%s,%08xh) not implemented (FAKED)",
            lpszServiceName,
            lpHandlerProc));
 
-  //Doesn't work for services of type 
+  //Doesn't work for services of type
   if(lpszServiceName == NULL) {
         SetLastError(ERROR_INVALID_NAME);
@@ -1542 +1542 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1597 +1597 @@
  * Result    :
  * Remark    : Called from ServiceMain function (registered with RegisterServiceCtrlHandler)
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1637 +1637 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1685 +1685 @@
   keytype = REG_DWORD;
   RegQueryValueExA((HKEY)schService, REG_SERVICE_WAITHINT, 0, &keytype, (LPBYTE)&lpssServiceStatus->dwWaitHint, &size);
- 
+
   SetLastError(0);
   return TRUE;

branches/gcc-kmk/src/comdlg32/cdlg.h ¶

@@ -64 +64 @@
 #define PD32_PRINTER_STATUS_READY             1536
 #define PD32_PRINTER_STATUS_PAUSED            1537
-#define PD32_PRINTER_STATUS_ERROR             1538 
+#define PD32_PRINTER_STATUS_ERROR             1538
 #define PD32_PRINTER_STATUS_PENDING_DELETION  1539
 #define PD32_PRINTER_STATUS_PAPER_JAM         1540
@@ -102 +102 @@
 /* DPA */
 #ifdef __WIN32OS2__
-#include <win\shell.h>
+#include <win/shell.h>
 
 LPVOID WINAPI SHAlloc(DWORD);

branches/gcc-kmk/src/comdlg32/filedlg.c ¶

@@ -22 +22 @@
 
 #ifdef __WIN32OS2__
-#include <win\cursoricon.h>
+#include <win/cursoricon.h>
 #include <heapstring.h>
 
@@ -42 +42 @@
 
 #define BUFFILE 512
-#define BUFFILEALLOC 512 * sizeof(WCHAR)   
-
-struct FSPRIVATE 
+#define BUFFILEALLOC 512 * sizeof(WCHAR)
+
+struct FSPRIVATE
 {
     HWND hwnd; /* file dialog window handle */
@@ -75 +75 @@
 #define LFS32A 2
 #define LFS32W 3
- 
+
 static const WCHAR FILE_star[] = {'*','.','*', 0};
 static const WCHAR FILE_bslash[] = {'\\', 0};
@@ -125 +125 @@
     static BOOL initialized = 0;
     CURSORICONINFO *fldrInfo;
-    
+
     if (!initialized) {
 #ifdef __WIN32OS2__
@@ -148 +148 @@
         hNet     = LoadImageA( inst, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
 #endif
-        if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 || 
+        if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
             hHDisk == 0 || hCDRom == 0 || hNet == 0)
         {
@@ -160 +160 @@
         fldrInfo = (CURSORICONINFO *) GlobalLock16( hFolder2 );
         if (!fldrInfo)
-        {       
+        {
             ERR("Error measuring icons !\n");
             return FALSE;
@@ -219 +219 @@
     } else { /* get it from internal Wine resource */
         HANDLE hResInfo;
-        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, 
+        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32,
              lfs->open? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA)))
         {
@@ -274 +274 @@
         DWORD size;
 
-        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, 
+        if (!(hResInfo = FindResourceA(COMMDLG_hInstance32,
                lfs->open ? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA)))
         {
@@ -424 +424 @@
   i = 0;
   if (cfptr)
-    for ( ;(n = lstrlenW(cfptr)) != 0; i++) 
+    for ( ;(n = lstrlenW(cfptr)) != 0; i++)
       {
         cfptr += n + 1;
@@ -432 +432 @@
       }
   if (fptr)
-    for ( ;(n = lstrlenW(fptr)) != 0; i++) 
+    for ( ;(n = lstrlenW(fptr)) != 0; i++)
       {
         fptr += n + 1;
@@ -455 +455 @@
     {
         if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) return FALSE;
-        SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, 
+        SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
                       (LPARAM)str);
 
@@ -486 +486 @@
         if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
             return FALSE;
-        SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, 
+        SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
                       (LPARAM)str);
 
@@ -515 +515 @@
         if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
             return FALSE;
-        SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID, 
+        SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID,
                       (LPARAM)str);
         root[0] += str[2] - 'a';
@@ -550 +550 @@
  *                              FILEDLG_WMMeasureItem           [internal]
  */
-static LONG FILEDLG_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam) 
+static LONG FILEDLG_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmeasure;
-    
+
     lpmeasure = (LPMEASUREITEMSTRUCT)lParam;
     lpmeasure->itemHeight = fldrHeight;
@@ -562 +562 @@
  */
 #ifdef __WIN32OS2__
-static LONG FILEDLG_WMMeasureItem16(HWND hWnd, WPARAM wParam, LPARAM lParam) 
+static LONG FILEDLG_WMMeasureItem16(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmeasure;
-    
+
     lpmeasure = (LPMEASUREITEMSTRUCT)lParam;
     lpmeasure->itemHeight = fldrHeight;
@@ -571 +571 @@
 }
 #else
-static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam) 
+static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT16 lpmeasure;
-    
+
     lpmeasure = MapSL(lParam);
     lpmeasure->itemHeight = fldrHeight;
@@ -641 +641 @@
   if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL)
         ofn->nFilterIndex = 1;
-  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);    
+  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
   lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
              (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n", 
+  TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n",
                         ofn->nFilterIndex, debugstr_w(tmpstr));
   SetDlgItemTextW( hWnd, edt1, tmpstr );
@@ -651 +651 @@
   DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE);
   /* read initial directory */
-  if (ofn->lpstrInitialDir != NULL) 
+  if (ofn->lpstrInitialDir != NULL)
     {
       int len;
@@ -720 +720 @@
 /***********************************************************************
  *                              FILEDLG_UpdateResult            [internal]
- *      update the displayed file name (with path) 
+ *      update the displayed file name (with path)
  */
 void FILEDLG_UpdateResult(LFSPRIVATE lfs, WCHAR *tmpstr)
@@ -779 +779 @@
 /***********************************************************************
  *                              FILEDLG_UpdateFileTitle         [internal]
- *      update the displayed file name (without path) 
+ *      update the displayed file name (without path)
  */
 void FILEDLG_UpdateFileTitle(LFSPRIVATE lfs)
@@ -785 +785 @@
   LONG lRet;
   LPOPENFILENAMEW ofnW = lfs->ofnW;
-  if (ofnW->lpstrFileTitle != NULL) 
+  if (ofnW->lpstrFileTitle != NULL)
   {
     lRet = SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL, 0, 0);
@@ -997 +997 @@
         lRet = (BOOL)FILEDLG_CallWindowProc(lfs, lfs->fileokstring,
                   0, lfs->lParam );
-        if (lRet)       
+        if (lRet)
         {
             *ofnW = ofnsav; /* restore old state */
@@ -1035 +1035 @@
                          (LPARAM)pstr);
     wsprintfW(diskname, FILE_specc, pstr[2]);
-    HeapFree(GetProcessHeap(), 0, pstr);    
+    HeapFree(GetProcessHeap(), 0, pstr);
 
     return FILEDLG_Validate( lfs, diskname, cmb2, lRet, TRUE );
@@ -1067 +1067 @@
  */
 static LRESULT FILEDLG_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
-       UINT control, LFSPRIVATE lfs ) 
+       UINT control, LFSPRIVATE lfs )
 {
     switch (control)
@@ -1090 +1090 @@
 
         case cmb1: /* file type drop list */
-        if (notification == CBN_SELCHANGE) 
+        if (notification == CBN_SELCHANGE)
             return FILEDLG_FileTypeChange( lfs );
         break;
@@ -1215 +1215 @@
     if (ofnA->lpstrTitle)
         str = ofnA->lpstrTitle;
-    else 
+    else
         /* Allocates default title (FIXME : get it from resource) */
         str = open ? defaultopen:defaultsave;
@@ -1272 +1272 @@
 /************************************************************************
  *                              FILEDLG_DestroyPrivate            [internal]
- *      destroys the private object 
+ *      destroys the private object
  */
 void FILEDLG_DestroyPrivate(LFSPRIVATE lfs)
@@ -1311 +1311 @@
 /************************************************************************
  *                              FILEDLG_AllocPrivate            [internal]
- *      allocate a private object to hold 32 bits Unicode 
+ *      allocate a private object to hold 32 bits Unicode
  *      structure that will be used throughtout the calls, while
  *      keeping available the original structures and a few variables
@@ -1369 +1369 @@
                 FILEDLG_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open);
         }
-        else 
+        else
             ret = NULL;
     }
@@ -1390 +1390 @@
  * Creates a win31 style dialog box for the user to select a file to open/save.
  */
-BOOL WINAPI GetFileName31A( 
+BOOL WINAPI GetFileName31A(
                            LPOPENFILENAMEA lpofn, /* addess of structure with data*/
                            UINT dlgType /* type dialogue : open/save */
@@ -1405 +1405 @@
     {
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
-        bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
              (DLGPROC) FileOpenDlgProc, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
@@ -1420 +1420 @@
  * Creates a win31 style dialog box for the user to select a file to open/save
  */
-BOOL WINAPI GetFileName31W( 
+BOOL WINAPI GetFileName31W(
                            LPOPENFILENAMEW lpofn, /* addess of structure with data*/
                            UINT dlgType /* type dialogue : open/save */
@@ -1435 +1435 @@
     {
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
-        bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
              (DLGPROC) FileOpenDlgProc, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
@@ -1453 +1453 @@
 LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
-{  
+{
     LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP);
     DRAWITEMSTRUCT dis;
- 
+
     TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
     if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
         {
             LRESULT lRet = (BOOL16)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-            if (lRet)   
+            if (lRet)
                 return lRet;         /* else continue message processing */
         }
@@ -1510 +1510 @@
    LRESULT  lRet;
    lRet = (BOOL16)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-   if (lRet)   
+   if (lRet)
     return lRet;         /* else continue message processing */
-  }             
+  }
   switch (wMsg) {
    case WM_INITDIALOG:
       return FILEDLG_WMInitDialog(hWnd, wParam, lParam);
-      
+
    case WM_MEASUREITEM:
       return FILEDLG_WMMeasureItem16(hWnd, wParam, lParam);
-    
+
    case WM_DRAWITEM:
       FILEDLG_MapDrawItemStruct(MapSL(lParam), &dis);
@@ -1527 +1527 @@
       return FILEDLG_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
   }
-  
+
   /*
   case WM_CTLCOLOR:
@@ -1541 +1541 @@
    }
    return FALSE;
-   
+
    */
   return FALSE;
@@ -1549 +1549 @@
 /***********************************************************************
  *           FileOpenDlgProc                                    [internal]
- *      Used for open and save, in fact.   
+ *      Used for open and save, in fact.
  */
 static LRESULT WINAPI FileOpenDlgProc(HWND hWnd, UINT wMsg,
@@ -1561 +1561 @@
             LRESULT lRet;
             lRet  = (BOOL)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-            if (lRet)   
+            if (lRet)
                 return lRet;         /* else continue message processing */
         }
@@ -1595 +1595 @@
 }
 
-/* ------------------ APIs ---------------------- */ 
+/* ------------------ APIs ---------------------- */
 #ifndef __WIN32OS2__
 /***********************************************************************
@@ -1609 +1609 @@
  *    unknown, there are some FIXME's left.
  */
-BOOL16 WINAPI GetOpenFileName16( 
+BOOL16 WINAPI GetOpenFileName16(
                                 SEGPTR ofn /* [in/out] address of structure with data*/
                                 )
@@ -1626 +1626 @@
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
-        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
              (DLGPROC16) ptr, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
@@ -1647 +1647 @@
  *    unknown. There are some FIXME's left.
  */
-BOOL16 WINAPI GetSaveFileName16( 
+BOOL16 WINAPI GetSaveFileName16(
                                 SEGPTR ofn /* [in/out] addess of structure with data*/
                                 )
@@ -1664 +1664 @@
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
-        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner, 
+        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
              (DLGPROC16) ptr, (DWORD) lfs);
         FILEDLG_DestroyPrivate(lfs);
-    } 
+    }
 
     TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile));
@@ -1775 +1775 @@
     {
         return GetFileDialog95A(ofn, SAVE_DIALOG);
-    } 
+    }
     else
     {
@@ -1811 +1811 @@
     {
         return GetFileDialog95W(ofn, SAVE_DIALOG);
-    } 
+    }
     else
     {

branches/gcc-kmk/src/comdlg32/filedlg95.c ¶

@@ -41 +41 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\shlwapi.h>
+#include <win/shlwapi.h>
 
 #define MapHModuleSL(a) a
@@ -86 +86 @@
   HIMAGELIST hImgList;
   int m_iIndent;      /* Indentation index */
-  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */ 
+  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */
 
 } SFOLDER,*LPSFOLDER;
@@ -216 +216 @@
  *      GetFileName95
  *
- * Creates an Open common dialog box that lets the user select 
+ * Creates an Open common dialog box that lets the user select
  * the drive, directory, and the name of a file or set of files to open.
  *
@@ -251 +251 @@
         return FALSE;
     }
-    
+
     /* old style hook messages */
     if (IsHooked(fodInfos))
@@ -260 +260 @@
       fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
     }
-    
+
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
@@ -270 +270 @@
     if( lRes == -1)
         return FALSE;
-    
+
     return lRes;
 }
@@ -291 +291 @@
   LPSTR lpstrSavDir = NULL;
   DWORD dwFlags = 0;
-  
-  /* Initialise FileOpenDlgInfos structure*/  
+
+  /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
   ZeroMemory(fodInfos, sizeof(FileOpenDlgInfos));
-  
+
   /* Pass in the original ofn */
   fodInfos->ofnInfos = ofn;
-  
+
   /* Save original hInstance value */
   hInstance = ofn->hInstance;
@@ -316 +316 @@
   fodInfos->DlgInfos.dwDlgProp = 0;
   fodInfos->DlgInfos.hwndCustomDlg = (HWND)NULL;
-  
+
   switch(iDlgType)
   {
@@ -400 +400 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
-  
+
   /* out arguments */
   LPWSTR lpstrFile = NULL;
@@ -437 +437 @@
     /* filter is a list...  title\0ext\0......\0\0 */
     s = ofn->lpstrFilter;
-    
+
     while (*s) s = s+strlenW(s)+1;
     s++;
@@ -528 +528 @@
   }
 #endif
-      
+
   /* restore saved IN arguments and convert OUT arguments back */
   ofn->Flags = dwFlags;
@@ -613 +613 @@
     SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left),
         (rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
-        
+
     hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
     if(hwndStc32)
@@ -633 +633 @@
           GetWindowRect(hwndChild,&rectCtrl);
           MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
-                                  
+
           /*
             Check the initial position of the controls relative to the initial
@@ -651 +651 @@
             rectCtrl.top  += ptMoveCtl.y;
           }
-                                        
-          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
+
+          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
                                 rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
                                 SWP_NOSIZE | SWP_NOZORDER );
@@ -659 +659 @@
     }
     hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
-        
+
     if(hwndStc32)
     {
@@ -680 +680 @@
             rectCtrl.top += ptMoveCtl.y;
 
-            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
+            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
                 rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
                 SWP_NOSIZE |SWP_NOZORDER );
           }
         } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
-      }         
+      }
     }
 }
@@ -701 +701 @@
     {
       case WM_INITDIALOG:
-      {         
+      {
         fodInfos = (FileOpenDlgInfos *)lParam;
         lParam = (LPARAM) fodInfos->ofnInfos;
@@ -708 +708 @@
         if(fodInfos && IsHooked(fodInfos))
           return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
-        return 0;       
-      } 
+        return 0;
+      }
     }
 
     if(fodInfos && IsHooked(fodInfos))
-      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); 
-
-    return DefWindowProcA(hwnd,uMsg,wParam,lParam); 
+      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
+
+    return DefWindowProcA(hwnd,uMsg,wParam,lParam);
 }
 
@@ -757 +757 @@
       if(hChildDlg)
       {
-        ShowWindow(hChildDlg,SW_SHOW); 
+        ShowWindow(hChildDlg,SW_SHOW);
         return hChildDlg;
       }
@@ -773 +773 @@
       tmplate.cx = rectHwnd.right-rectHwnd.left;
       tmplate.cy = rectHwnd.bottom-rectHwnd.top;
-       
+
       return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
     }
     return (HWND)NULL;
 }
- 
+
 /***********************************************************************
 *          SendCustomDlgNotificationMessage
@@ -830 +830 @@
             GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
             lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
-            if (lpstrFileSpec==lpstrPath) 
+            if (lpstrFileSpec==lpstrPath)
             {
                 char lpstrCurrentDir[MAX_PATH];
@@ -838 +838 @@
                     snprintf((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
                 reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
-            } 
-            else 
+            }
+            else
             {
                 lstrcpynA((LPSTR)lParam,(LPSTR)lpstrPath,(int)wParam);
@@ -872 +872 @@
     return TRUE;
 }
- 
+
 /***********************************************************************
  *          FileOpenDlgProc95
@@ -883 +883 @@
   TRACE("0x%04x 0x%04x\n", hwnd, uMsg);
 #endif
-  
+
   switch(uMsg)
   {
@@ -890 +890 @@
          FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam;
 
-         /* Adds the FileOpenDlgInfos in the property list of the dialog 
+         /* Adds the FileOpenDlgInfos in the property list of the dialog
             so it will be easily accessible through a GetPropA(...) */
          SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
 
-         fodInfos->DlgInfos.hwndCustomDlg = 
+         fodInfos->DlgInfos.hwndCustomDlg =
            CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
 
@@ -917 +917 @@
       }
       return FALSE;
-          
+
     case WM_GETISHELLBROWSER:
       return FILEDLG95_OnWMGetIShellBrowser(hwnd);
@@ -933 +933 @@
         if(TTN_GETDISPINFOA == lpnmh->code )
         {
-            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam; 
+            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
             switch(lpnmh->idFrom )
             {
@@ -959 +959 @@
                     stringId = 0;
             }
-            lpdi->hinst = COMMDLG_hInstance32; 
+            lpdi->hinst = COMMDLG_hInstance32;
             lpdi->lpszText =  (LPSTR) stringId;
         }
@@ -995 +995 @@
    { COMDLG32_hInstance, 800 }                  // desktop icon
   };
-  
+
   RECT rectTB;
-  
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
@@ -1011 +1011 @@
   MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
 
-  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL, 
+  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL,
         WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
-        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL); 
- 
-  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0, 
+        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
+
+  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0,
         rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
         SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
@@ -1027 +1027 @@
 
   SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(LPARAM) &tbb);
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); 
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
@@ -1067 +1067 @@
      are hidden and we are not using a custom template */
   if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
-       (!(fodInfos->ofnInfos->Flags & 
+       (!(fodInfos->ofnInfos->Flags &
          (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
   {
@@ -1076 +1076 @@
     /* subtract the height of the help button plus the space between
        the help button and the cancel button to the height of the dialog */
-    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left, 
-                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom), 
+    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
+                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
                  SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
   }
@@ -1102 +1102 @@
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
 
-  TRACE("dir=%s file=%s\n", 
+  TRACE("dir=%s file=%s\n",
   fodInfos->ofnInfos->lpstrInitialDir, fodInfos->ofnInfos->lpstrFile);
 
 #ifdef __WIN32OS2__
-  /*@PF 
+  /*@PF
   How can Wine miss this?? Very common situation for Windows apps!
   If InitialDir is NULL and we have full blown path in lpstrFile we set
@@ -1112 +1112 @@
 
   Q: What about Unicode?
- 
+
   */
 
-  if (fodInfos->ofnInfos->lpstrInitialDir == NULL && fodInfos->ofnInfos->lpstrFile && 
+  if (fodInfos->ofnInfos->lpstrInitialDir == NULL && fodInfos->ofnInfos->lpstrFile &&
     !PathIsRelativeA(fodInfos->ofnInfos->lpstrFile) &&
     PathGetDriveNumberA(fodInfos->ofnInfos->lpstrFile) != -1)
   {
-   dopstr = HEAP_strdupA(GetProcessHeap(), 0,fodInfos->ofnInfos->lpstrFile);      
+   dopstr = HEAP_strdupA(GetProcessHeap(), 0,fodInfos->ofnInfos->lpstrFile);
    *strrchr(dopstr,'\\') = '\0';
    fodInfos->ofnInfos->lpstrInitialDir = dopstr;
@@ -1174 +1174 @@
    fodInfos->ofnInfos->lpstrInitialDir = NULL;
    HEAP_free(dopstr);
-  }  
+  }
 #endif
   return TRUE;
@@ -1261 +1261 @@
   /* Do not use the listview selection anymore */
   fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
-  return 0; 
+  return 0;
 }
 
@@ -1278 +1278 @@
   SetWindowLongA(hwnd,DWL_MSGRESULT,(LONG)fodInfos->Shell.FOIShellBrowser);
 
-  return TRUE; 
+  return TRUE;
 }
 
@@ -1284 +1284 @@
 /***********************************************************************
  *      FILEDLG95_OnOpenMultipleFiles
- *      
+ *
  * Handles the opening of multiple files.
  *
@@ -1301 +1301 @@
   lpstrFile = fodInfos->ofnInfos->lpstrFile;
   lpstrFile[0] = '\0';
-  
+
   SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
 
@@ -1307 +1307 @@
       ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST))
   {
-    LPSTR lpstrTemp = lpstrFileList; 
+    LPSTR lpstrTemp = lpstrFileList;
 
     for ( nCount = 0; nCount < nFileCount; nCount++ )
@@ -1332 +1332 @@
         return FALSE;
       }
-  
+
       /* move to the next file in the list of files */
       lpstrTemp += strlen(lpstrTemp) + 1;
@@ -1355 +1355 @@
  *
  * Ok button WM_COMMAND message handler
- * 
+ *
  * If the function succeeds, the return value is nonzero.
  */
@@ -1396 +1396 @@
       return FALSE;
   }
- 
+
   if(nFileCount > 1)
   {
@@ -1455 +1455 @@
   to a folder if the path points to a directory or the last
   valid element is a directory.
-  
+
   valid variables:
     lpstrPathAndFile: cleaned up path
@@ -1657 +1657 @@
         {
           LPSTR lpszTemp;
-          
+
           /* fill destination buffer */
           strcpy(fodInfos->ofnInfos->lpstrFile, lpstrPathAndFile);
@@ -1667 +1667 @@
           lpszTemp = PathFindFileNameA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileOffset = lpszTemp - lpstrPathAndFile;
- 
+
           /* set extension offset */
           lpszTemp = PathFindExtensionA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? lpszTemp - lpstrPathAndFile + 1 : 0;
-    
+
           /* set the lpstrFileTitle */
           if(fodInfos->ofnInfos->lpstrFileTitle)
@@ -1695 +1695 @@
             }
           }
-          
+
           TRACE("close\n");
           FILEDLG95_Clean(hwnd);
@@ -1728 +1728 @@
 
   /*
-   * Initialisation of the FileOpenDialogInfos structure 
+   * Initialisation of the FileOpenDialogInfos structure
    */
 
@@ -1739 +1739 @@
   if (!(fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT))
   {
-     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL; 
+     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL;
   }
   fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
@@ -1749 +1749 @@
 
   /* Construct the IShellBrowser interface */
-  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);  
-    
+  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
+
   return NOERROR;
 }
@@ -1817 +1817 @@
   LPITEMIDLIST pidl;
   HRESULT hres;
-  
+
   TRACE("\n");
 
@@ -1850 +1850 @@
  *      FILEDLG95_FILETYPE_Init
  *
- * Initialisation of the file type combo box 
+ * Initialisation of the file type combo box
  */
 static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
@@ -1866 +1866 @@
     for(;;)
     {
-      /* filter is a list...  title\0ext\0......\0\0 
+      /* filter is a list...  title\0ext\0......\0\0
        * Set the combo item text to the title and the item data
        *  to the ext
@@ -1883 +1883 @@
       strcpy(lpstrExt,lpstrPos);
       lpstrPos += strlen(lpstrPos) + 1;
-            
+
       /* Add the item at the end of the combo */
       CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
@@ -1894 +1894 @@
      * FIXME: lpstrCustomFilter not handled at all
      */
-  
+
     /* set default filter index */
     if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
@@ -1902 +1902 @@
     if ( fodInfos->ofnInfos->nFilterIndex > nFilters )
       fodInfos->ofnInfos->nFilterIndex = nFilters;
- 
+
     /* Set the current index selection. */
     CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1);
-  
+
     /* Get the corresponding text string from the combo box. */
     lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
@@ -1911 +1911 @@
 
     if ((INT)lpstrFilter == CB_ERR)  /* control is empty */
-      lpstrFilter = NULL;       
+      lpstrFilter = NULL;
 
     if(lpstrFilter)
@@ -2020 +2020 @@
 
 }
-    
+
 /***********************************************************************
  *      FILEDLG95_LOOKIN_Init
  *
- * Initialisation of the look in combo box 
+ * Initialisation of the look in combo box
  */
 static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo)
@@ -2127 +2127 @@
   {
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                               0,    
-                                               &sfi,    
-                                               sizeof (SHFILEINFOA),   
-                                               SHGFI_PIDL | SHGFI_SMALLICON |    
-                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    | 
-                                               SHGFI_DISPLAYNAME );   
+                                               0,
+                                               &sfi,
+                                               sizeof (SHFILEINFOA),
+                                               SHGFI_PIDL | SHGFI_SMALLICON |
+                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    |
+                                               SHGFI_DISPLAYNAME );
   }
   else
   {
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                  0, 
-                                                  &sfi, 
+                                                  0,
+                                                  &sfi,
                                                   sizeof (SHFILEINFOA),
-                                                  SHGFI_PIDL | SHGFI_SMALLICON | 
-                                                  SHGFI_SYSICONINDEX | 
+                                                  SHGFI_PIDL | SHGFI_SMALLICON |
+                                                  SHGFI_SYSICONINDEX |
                                                   SHGFI_DISPLAYNAME);
   }
@@ -2164 +2164 @@
     iIndentation = 0;
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                0, 
-                                                &sfi, 
-                                                sizeof (SHFILEINFOA), 
-                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON 
+                                                0,
+                                                &sfi,
+                                                sizeof (SHFILEINFOA),
+                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON
                                                 | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME  );
 
@@ -2191 +2191 @@
   rectText.bottom =
           (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
- 
+
   /* Draw the icon from the image list */
   ImageList_Draw(ilItemImage,
                  sfi.iIcon,
-                 pDIStruct->hDC,  
-                 rectIcon.left,  
-                 rectIcon.top,  
-                 ILD_TRANSPARENT );  
+                 pDIStruct->hDC,
+                 rectIcon.left,
+                 rectIcon.top,
+                 ILD_TRANSPARENT );
 
   /* Draw the associated text */
@@ -2225 +2225 @@
     {
       LPSFOLDER tmpFolder;
-      int iItem; 
+      int iItem;
 
       iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB);
@@ -2242 +2242 @@
       break;
     }
-      
+
   }
   return FALSE;
@@ -2267 +2267 @@
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
-    
+
   tmpFolder = MemAlloc(sizeof(SFOLDER));
   tmpFolder->m_iIndent = 0;
@@ -2282 +2282 @@
   if(tmpFolder->m_iIndent > liInfos->iMaxIndentation)
     liInfos->iMaxIndentation = tmpFolder->m_iIndent;
-  
+
   sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
   SHGetFileInfoA((LPSTR)pidl,
@@ -2288 +2288 @@
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX 
+                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
@@ -2296 +2296 @@
   {
     int iItemID;
-  
+
     TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
 
@@ -2322 +2322 @@
  *      FILEDLG95_LOOKIN_InsertItemAfterParent
  *
- * Insert an item below its parent 
+ * Insert an item below its parent
  */
 static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl)
 {
-  
+
   LPITEMIDLIST pidlParent = GetParentPidl(pidl);
   int iParentPos;
@@ -2381 +2381 @@
     }
   }
-  
+
   CBSetCurSel(hwnd,iItemPos);
   liInfos->uSelectedItem = iItemPos;
@@ -2503 +2503 @@
       {
         pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 );
-    
+
         if (pidl)
         {
@@ -2621 +2621 @@
 
         TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
-        
+
         /* we might get single filename without any '"',
          * so we need nStrLen + terminating \0 + end-of-list \0 */
@@ -2642 +2642 @@
             (*sizeUsed)++;
             nFileCount++;
-          } 
+          }
           nStrCharCount++;
         }
@@ -2703 +2703 @@
 LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
 {
-     
+
     STGMEDIUM medium;
     FORMATETC formatetc;
     LPITEMIDLIST pidl = NULL;
-    
+
     TRACE("sv=%p index=%u\n", doSelected, nPidlIndex);
-    
+
     /* Set the FORMATETC structure*/
     SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL);
@@ -2763 +2763 @@
  *      GetName
  *
- * Get the pidl's display name (relative to folder) and 
+ * Get the pidl's display name (relative to folder) and
  * put it in lpstrFileName.
- * 
+ *
  * Return NOERROR on success,
  * E_FAIL otherwise
@@ -2797 +2797 @@
  *      GetShellFolderFromPidl
  *
- * pidlRel is the item pidl relative 
+ * pidlRel is the item pidl relative
  * Return the IShellFolder of the absolute pidl
  */
@@ -2833 +2833 @@
 
   TRACE("%p\n", pidl);
-  
+
   pidlParent = COMDLG32_PIDL_ILClone(pidl);
   COMDLG32_PIDL_ILRemoveLastID(pidlParent);
-     
+
   return pidlParent;
 }
@@ -2843 +2843 @@
  *      GetPidlFromName
  *
- * returns the pidl of the file name relative to folder 
+ * returns the pidl of the file name relative to folder
  * NULL if an error occurred
  */
@@ -2857 +2857 @@
   if(!*lpcstrFileName) return NULL;
 
-  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);  
+  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);
 
   if(!lpsf)
@@ -2867 +2867 @@
   else
   {
-    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL); 
+    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL);
   }
   return pidl;
@@ -2878 +2878 @@
         ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
         HRESULT ret;
-        
+
         TRACE("%p, %p\n", psf, pidl);
 
@@ -2919 +2919 @@
 
   return bBrowseSelFolder;
-} 
+}
 
 /*

branches/gcc-kmk/src/crtdll/old/crtdll.cpp ¶

@@ -3 +3 @@
 /*
  * The C RunTime DLL
- * 
+ *
  * Implements C run-time functionality as known from UNIX.
  *
- * TODO: 
+ * TODO:
  *   - Check setjmp(3)
  *   - fix *ALL* functions for the FS: wrapper problem
@@ -39 +39 @@
 
 #include <math.h>
-#include <libc\locale.h>
+#include <libc/locale.h>
 #include <signal.h>
 #include <io.h>
@@ -53 +53 @@
 #include <heap.h>
 #include <errno.h>
-#include <sys\utime.h>
-#include <sys\timeb.h>
-#include <sys\stat.h>
+#include <sys/utime.h>
+#include <sys/timeb.h>
+#include <sys/stat.h>
 #include "signal.h"
 
@@ -80 +80 @@
 {
   FS_OS2
-    
+
     if (fdwReason == DLL_PROCESS_ATTACH) {
       _fdopen(0,"r");
@@ -92 +92 @@
         CRTDLL_hHeap = 0;
       }
-  
+
   FS_WIN32
   return TRUE;
@@ -410 +410 @@
  */
 int * CDECL CRTDLL___doserrno()
-{       
+{
         dprintf2(("CRTDLL: __doserrno\n"));
         return (__doserrno());
@@ -525 +525 @@
  */
 void CDECL CRTDLL__beep(unsigned nFreq, unsigned nDur)
-{       
+{
   dprintf2(("_beep\n"));
   Beep(nFreq,nDur);
@@ -693 +693 @@
 {
   dprintf2(("CRTDLL: _close\n"));
-  
+
   return CloseHandle(handle);
 }
@@ -832 +832 @@
  */
 INT CDECL CRTDLL__except_handler2 ( PEXCEPTION_RECORD rec,
-        PEXCEPTION_FRAME frame, PCONTEXT context, 
+        PEXCEPTION_FRAME frame, PCONTEXT context,
         PEXCEPTION_FRAME  *dispatcher)
 {
@@ -1483 +1483 @@
     DWORD access = 0, creation = 0;
     HFILE ret;
-    
+
     switch(flags & 3)
     {
@@ -1509 +1509 @@
     if (flags & 0x0008) /* O_APPEND */
         dprintf2(("O_APPEND not supported\n" ));
-    if (flags & 0xf0f4) 
+    if (flags & 0xf0f4)
       dprintf2(("CRTDLL_open file unsupported flags 0x%04x\n",flags));
     /* End Fixme */
@@ -1527 +1527 @@
   dprintf2(("CRTDLL: _open_osfhandle\n"));
 HFILE handle;
- 
+
         switch (osfhandle) {
         case STD_INPUT_HANDLE :
@@ -1633 +1633 @@
               return -1;
             }
-          errno = saved_errno;                
-          if (j == 1 && c == '\n')            
+          errno = saved_errno;
+          if (j == 1 && c == '\n')
             {
               dst[0] = '\n';
@@ -1773 +1773 @@
  *                  _sleep           (CRTDLL.265)
  */
-VOID CDECL CRTDLL__sleep(unsigned long timeout) 
+VOID CDECL CRTDLL__sleep(unsigned long timeout)
 {
   dprintf2(("_sleep for %ld milliseconds\n",timeout));
@@ -1927 +1927 @@
   return (_tempnam(dir, prefix));
 }
-        
+
 
 /*********************************************************************
@@ -1992 +1992 @@
       return EOF;
     }
-  
+
     ret=unlink(full_name.long_name);
     dprintf2(("(%s unix %s)\n",
@@ -2216 +2216 @@
   int left, right, median, sign;
   const void *element;
-  
+
   if (width == 0)
     return 0;
@@ -2507 +2507 @@
 }
 
- 
+
 /*********************************************************************
  *                  free          (CRTDLL.375)
@@ -2773 +2773 @@
  *                  ldexp       (CRTDLL.417)
  */
-double CDECL CRTDLL_ldexp( double x, int exp ) 
+double CDECL CRTDLL_ldexp( double x, int exp )
 {
   dprintf2(("CRTDLL: ldexp\n"));
@@ -2783 +2783 @@
  *                  ldiv        (CRTDLL.418)
  */
-ldiv_t CDECL CRTDLL_ldiv( long int numer, long int denom ) 
+ldiv_t CDECL CRTDLL_ldiv( long int numer, long int denom )
 {
   dprintf2(("CRTDLL: ldiv\n"));
@@ -2883 +2883 @@
  *                  pow      (CRTDLL.436)
  */
-double CDECL CRTDLL_pow( double x, double y )   
+double CDECL CRTDLL_pow( double x, double y )
 {
     dprintf2(("CRTDLL: pow(%08xh, %08xh)\n",x, y));
@@ -3015 +3015 @@
  *                  setbuf      (CRTDLL.449)
  */
-void CDECL CRTDLL_setbuf( FILE *fp, char *buf ) 
+void CDECL CRTDLL_setbuf( FILE *fp, char *buf )
 {
   dprintf2(("CRTDLL: setbuf\n"));
@@ -3178 +3178 @@
 }
 
-        
+
 /*********************************************************************
  *                  tmpnam           (CRTDLL.487)

branches/gcc-kmk/src/crypt32/decode.c ¶

@@ -48 +48 @@
 #include "winnls.h"
 #include "snmp.h"
-#include "wine\debug.h"
-#include "wine\exception.h"
+#include "wine/debug.h"
+#include "wine/exception.h"
 #include "crypt32_private.h"
 
@@ -784 +784 @@
         BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]);
         DWORD bytesNeeded = sizeof(CRYPT_DER_BLOB);
-       
+
         if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG))
             bytesNeeded += 1 + lenBytes + dataLen;
@@ -1562 +1562 @@
 
                     value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0,
-                     (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, 
+                     (LPCSTR)pbEncoded + 1 + lenBytes, dataLen,
                      str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2;
                     break;
@@ -2741 +2741 @@
        offsetof(CRYPT_ALGORITHM_IDENTIFIER, pszObjId), 0 },
      { 0, offsetof(CRYPT_ALGORITHM_IDENTIFIER, Parameters),
-       CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_OBJID_BLOB), TRUE, TRUE, 
+       CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_OBJID_BLOB), TRUE, TRUE,
        offsetof(CRYPT_ALGORITHM_IDENTIFIER, Parameters.pbData), 0 },
     };
@@ -3421 +3421 @@
         struct AsnDecodeSequenceItem items[] = {
          { ASN_BITSTRING, offsetof(CERT_BASIC_CONSTRAINTS_INFO, SubjectType),
-           CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE, 
+           CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE,
            offsetof(CERT_BASIC_CONSTRAINTS_INFO, SubjectType.pbData), 0 },
          { ASN_INTEGER, offsetof(CERT_BASIC_CONSTRAINTS_INFO,

branches/gcc-kmk/src/custombuild/guid.c ¶

@@ -10 +10 @@
 #include "shlobj.h"
 #include "docobj.h"
-#include "..\shell32\shellfolder.h"
+#include "../shell32/shellfolder.h"
 
 #include "wine/obj_inplace.h"
@@ -19 +19 @@
 #include "wine/obj_clientserver.h"
 #include "wine/obj_cache.h"
-#include "wine\obj_oleaut.h"
-#include "wine\obj_olefont.h"
+#include "wine/obj_oleaut.h"
+#include "wine/obj_olefont.h"
 
 #include "wine/obj_oleview.h"
@@ -138 +138 @@
         (*pSid)->SubAuthority[7] = nSubAuthority7;
 
-  if(pIdentifierAuthority) 
+  if(pIdentifierAuthority)
         memcpy((PVOID)&(*pSid)->IdentifierAuthority, (PVOID)pIdentifierAuthority, sizeof(SID_IDENTIFIER_AUTHORITY));
   return TRUE;

branches/gcc-kmk/src/driverdll/testdrv.cpp ¶

@@ -23 +23 @@
 #include <win32api.h>
 #include <misc.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 
 #define TESTDRV_CATEGORY    0x40

branches/gcc-kmk/src/gdi32/font.cpp ¶

@@ -36 +36 @@
 #include "unicode.h"
 #include <heapstring.h>
-#include <win\options.h>
+#include <win/options.h>
 #include <wprocess.h>
 #include <odininst.h>

branches/gcc-kmk/src/guidlib/guid.c ¶

@@ -12 +12 @@
 #include "olectl.h"
 #include "dinput.h"
-//#include "..\shell32\shellfolder.h"
+//#include "../shell32/shellfolder.h"
 
 #include "wine/obj_inplace.h"

branches/gcc-kmk/src/iphlpapi/iphlwrap.h ¶

@@ -2 +2 @@
 #define __IPHLWRAP_H__
 
-#include <sys\socket.h>
-#include <sys\ioctl.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <netdb.h>
-#include <netinet\in.h>
-#include <netinet\tcp.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <nerrno.h>
 
@@ -34 +34 @@
 
     return yyrc;
-} 
+}
 
 #undef  ioctl
@@ -48 +48 @@
 
     return yyrc;
-} 
+}
 #undef  res_init
 #define res_init _res_init
@@ -61 +61 @@
 
     return yyrc;
-} 
+}
 
 #undef  sock_init
@@ -75 +75 @@
 
     return yyrc;
-} 
+}
 
 #undef  sock_errno
@@ -86 +86 @@
     psock_errno(a);
     SetFS(sel);
-} 
+}
 
 #undef  psock_errno
@@ -100 +100 @@
 
     return yyrc;
-} 
+}
 
 #undef  socket
@@ -114 +114 @@
 
     return yyrc;
-} 
+}
 
 #undef  soclose
@@ -128 +128 @@
 
     return yyrc;
-} 
+}
 
 #undef  so_cancel
@@ -142 +142 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostname
@@ -156 +156 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostbyname
@@ -170 +170 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostbyaddr
 #define gethostbyaddr _gethostbyaddr
 
-#endif  
+#endif
 
 

branches/gcc-kmk/src/kernel32/HandleManager.cpp ¶

@@ -70 +70 @@
 
 #include <vmutex.h>
-#include <win\thread.h>
+#include <win/thread.h>
 
 #include <odinapi.h>

branches/gcc-kmk/src/kernel32/char.cpp ¶

@@ -26 +26 @@
 
 #include <misc.h>
-#include <wine\unicode.h>
+#include <wine/unicode.h>
 
 

branches/gcc-kmk/src/kernel32/directory.cpp ¶

@@ -6 +6 @@
  * Copyright 1998 Sander van Leeuwen
  *
- * NOTE: Directory creation has to be done in install program (odin\win) 
+ * NOTE: Directory creation has to be done in install program (odin\win)
  *
  * Parts based on Wine code (991031) (files\directory.c)
@@ -14 +14 @@
  * Copyright 1995 Alexandre Julliard
  *
- * TODO: 
+ * TODO:
  *  - System/window directories should be created by install program!
  *
@@ -34 +34 @@
 #include <options.h>
 #include "initterm.h"
-#include <win\file.h>
+#include <win/file.h>
 #include <string.h>
 #include "oslibdos.h"
@@ -80 +80 @@
    len = strlen(DIR_System);
    if(DIR_System[len-1] == '\\') {
-        DIR_System[len-1] = 0; 
+        DIR_System[len-1] = 0;
    }
    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",DIR_Windows,sizeof(DIR_Windows));
    if (len > 2) {
         if(DIR_Windows[len-1] == '\\') {
-                DIR_Windows[len-1] = 0; 
+                DIR_Windows[len-1] = 0;
         }
    }
@@ -116 +116 @@
    len = strlen(DIR_System);
    if(DIR_System[len-1] == '\\') {
-        DIR_System[len-1] = 0; 
+        DIR_System[len-1] = 0;
    }
    strcpy(DIR_Windows, szWindowsDir);
    len = strlen(DIR_Windows);
    if(DIR_Windows[len-1] == '\\') {
-        DIR_Windows[len-1] = 0; 
+        DIR_Windows[len-1] = 0;
    }
 
@@ -146 +146 @@
   rc = OSLibDosQueryDir(nBufferLength, lpBuffer);
   if(rc && rc < nBufferLength) {
-       dprintf(("CurrentDirectory = %s (%d)", lpBuffer, rc)); 
-  }
-  else dprintf(("CurrentDirectory returned %d", rc)); 
+       dprintf(("CurrentDirectory = %s (%d)", lpBuffer, rc));
+  }
+  else dprintf(("CurrentDirectory returned %d", rc));
   return rc;
 }
@@ -196 +196 @@
     return FALSE;
   }
-  
+
   // cut off trailing backslashes
   // not if a process wants to change to the root directory
@@ -264 +264 @@
 
   int len = strlen(lpstrDirectory);
-  
+
   // cut off trailing backslashes
   if ( (lpstrDirectory[len - 1] == '\\') ||
@@ -275 +275 @@
     lpstrDirectory = lpTemp;
   }
-  
+
   dprintf(("CreateDirectoryA %s", lpstrDirectory));
-  
+
   // Creation of an existing directory will fail (verified in NT4 & XP)
   DWORD dwAttr = GetFileAttributesA(lpstrDirectory);
-  if(dwAttr != -1) 
+  if(dwAttr != -1)
   {
       if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
@@ -287 +287 @@
           return FALSE;
       }
-  }  
+  }
   return(OSLibDosCreateDirectory(lpstrDirectory));
 }
@@ -437 +437 @@
     asciibuffer = (char *)alloca(uSize+1);
 
-  if(lpBuffer && asciibuffer == NULL) 
+  if(lpBuffer && asciibuffer == NULL)
   {
     DebugInt3();
@@ -445 +445 @@
   if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer, lpBuffer);
-  
+
   return(rc);
 }
@@ -495 +495 @@
     asciibuffer = (char *)alloca(uSize+1);
 
-  if(lpBuffer && asciibuffer == NULL) 
+  if(lpBuffer && asciibuffer == NULL)
   {
     DebugInt3();
@@ -503 +503 @@
   if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer, lpBuffer);
-  
+
   return(rc);
 }
@@ -524 +524 @@
 {
   int len = strlen(lpstrDirectory);
-  
+
   if(lpstrDirectory == NULL) {
      SetLastError(ERROR_INVALID_PARAMETER);
@@ -539 +539 @@
     lpstrDirectory = lpTemp;
   }
-  
+
   dprintf(("RemoveDirectory %s", lpstrDirectory));
 
@@ -619 +619 @@
        those (according to SDK docs) */
     if ((path != NULL) && strchr(path, ';')) {
-        ret = OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)path, (LPSTR)name, 
+        ret = OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)path, (LPSTR)name,
                                  full_name, MAX_PATHNAME_LEN);
         goto done;
@@ -647 +647 @@
         name = tmp;
     }
-    
+
     /* If we have an explicit path, everything's easy */
 
@@ -704 +704 @@
  *             filename is returned.
  *    Failure: Zero
- * 
+ *
  * NOTES
  *    Should call SetLastError(but currently doesn't).
@@ -732 +732 @@
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
     LPSTR extA  = HEAP_strdupWtoA( GetProcessHeap(), 0, ext );
-  
+
     dprintf(("SearchPathA %s %s %s", pathA, nameA, extA));
     DWORD ret = DIR_SearchPath( pathA, nameA, extA, (LPSTR)full_name );
-  
+
     if (NULL != extA)
       HeapFree( GetProcessHeap(), 0, extA );
-  
+
     if (NULL != nameA)
       HeapFree( GetProcessHeap(), 0, nameA );
-  
+
     if (NULL != pathA)
       HeapFree( GetProcessHeap(), 0, pathA );
-  
+
     if (!ret) return 0;
 

branches/gcc-kmk/src/kernel32/heapstring.cpp ¶

@@ -27 +27 @@
 #include <wcstr.h>
 #include "heap.h"
-#include <wine\unicode.h>
+#include <wine/unicode.h>
 #include "misc.h"
 #include "codepage.h"

branches/gcc-kmk/src/kernel32/hmdevio.cpp ¶

@@ -25 +25 @@
 #include <win32api.h>
 #include <misc.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 #include "hmdevio.h"
 #include "exceptutil.h"
@@ -47 +47 @@
  DWORD rc;
 
-    for(int i=0;i<nrKnownDrivers;i++) 
+    for(int i=0;i<nrKnownDrivers;i++)
     {
             driver = new HMDeviceDriver(knownDriver[i].szWin32Name,
@@ -101 +101 @@
                         if (rc != NO_ERROR)                                  /* check for errors */
                           dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n", szDrvName, rc));
-                      
+
                         // @@@PH
                         // there should be an symbolic link:
@@ -109 +109 @@
                 rc = 0;
             }
-        }   
+        }
         RegCloseKey(hkDrivers);
     }
@@ -117 +117 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API RegisterCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose, 
+BOOL WIN32API RegisterCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose,
                                    PFNDRVIOCTL pfnDriverIOCtl, PFNDRVREAD pfnDriverRead,
                                    PFNDRVWRITE pfnDriverWrite, PFNDRVCANCELIO pfnDriverCancelIo,
@@ -141 +141 @@
 //******************************************************************************
 //******************************************************************************
-HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate, 
+HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate,
                                WINIOCTL pDevIOCtl)
                 : HMDeviceHandler(lpDeviceName)
@@ -215 +215 @@
   dprintf(("DosOpen %s returned %d\n", szOS2Name, rc));
 
-  if(rc == NO_ERROR) 
+  if(rc == NO_ERROR)
   {
     pHMHandleData->hHMHandle = hfFileHandle;
     return (NO_ERROR);
   }
-  else  
+  else
     return(error2WinError(rc));
 }
@@ -259 +259 @@
 //******************************************************************************
 //******************************************************************************
-HMCustomDriver::HMCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose, 
+HMCustomDriver::HMCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose,
                                PFNDRVIOCTL pfnDriverIOCtl, PFNDRVREAD pfnDriverRead,
                                PFNDRVWRITE pfnDriverWrite, PFNDRVCANCELIO pfnDriverCancelIo,
@@ -461 +461 @@
         return FALSE;
     }
-    return pfnDriverGetOverlappedResult(lpDriverData, pHMHandleData->hHMHandle, pHMHandleData->dwFlags, 
+    return pfnDriverGetOverlappedResult(lpDriverData, pHMHandleData->hHMHandle, pHMHandleData->dwFlags,
                                         lpOverlapped, lpcbTransfer, fWait, (LPVOID)pHMHandleData->dwUserData);
 }

branches/gcc-kmk/src/kernel32/hmdisk.cpp ¶

@@ -18 +18 @@
 #include "hmdisk.h"
 #include "mmap.h"
-#include <win\winioctl.h>
-#include <win\ntddscsi.h>
-#include <win\wnaspi32.h>
+#include <win/winioctl.h>
+#include <win/ntddscsi.h>
+#include <win/wnaspi32.h>
 #include "oslibdos.h"
 #include "osliblvm.h"
@@ -43 +43 @@
 typedef struct
 {
-    BOOL      fCDIoSupported;    
+    BOOL      fCDIoSupported;
     ULONG     driveLetter;
     ULONG     driveType;
@@ -163 +163 @@
     szDrive[2] = '\0';
 
-    //if volume name, query 
-    if(!strncmp(lpFileName, VOLUME_NAME_PREFIX, sizeof(VOLUME_NAME_PREFIX)-1)) 
+    //if volume name, query
+    if(!strncmp(lpFileName, VOLUME_NAME_PREFIX, sizeof(VOLUME_NAME_PREFIX)-1))
     {
         int length;
@@ -171 +171 @@
             return ERROR_FILE_NOT_FOUND;    //not allowed
         }
-        if(OSLibLVMStripVolumeName(lpFileName, szVolumeName, sizeof(szVolumeName))) 
+        if(OSLibLVMStripVolumeName(lpFileName, szVolumeName, sizeof(szVolumeName)))
         {
             BOOL fLVMVolume;
@@ -184 +184 @@
                 return ERROR_FILE_NOT_FOUND;    //not found
             }
-            if(szDrive[0] == 0) 
+            if(szDrive[0] == 0)
             {
                 //volume isn't mounted
-                
+
                 //Note: this only works on Warp 4.5 and up
-                sprintf(szDiskName, "\\\\.\\Physical_Disk%d", volext.Extents[0].DiskNumber+1); 
+                sprintf(szDiskName, "\\\\.\\Physical_Disk%d", volext.Extents[0].DiskNumber+1);
                 fPhysicalDisk    = TRUE;
                 dwPhysicalDiskNr = volext.Extents[0].DiskNumber + 1;
@@ -211 +211 @@
         else return ERROR_FILE_NOT_FOUND;
     }
-    else 
-    if(strncmp(lpFileName, "\\\\.\\PHYSICALDRIVE", 17) == 0) 
+    else
+    if(strncmp(lpFileName, "\\\\.\\PHYSICALDRIVE", 17) == 0)
     {
         if(!fPhysicalDiskAccess) {
@@ -304 +304 @@
         drvInfo->fLocked   = FALSE;
 
-        //save volume start & length if volume must be accessed through the physical disk 
+        //save volume start & length if volume must be accessed through the physical disk
         //(no other choice for unmounted volumes)
         drvInfo->fPhysicalDisk    = fPhysicalDisk;
@@ -348 +348 @@
         if(pHMHandleData->hHMHandle && drvInfo->dwShare == 0) {
             dprintf(("Locking drive"));
-            if(OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0)) 
+            if(OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0))
             {
                 dprintf(("Sharing violation while attempting to lock the drive"));
@@ -411 +411 @@
         if(hFile && drvInfo->dwShare == 0) {
             dprintf(("Locking drive"));
-            if(OSLibDosDevIOCtl(hFile,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0)) 
+            if(OSLibDosDevIOCtl(hFile,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0))
             {
                 dprintf(("Sharing violation while attempting to lock the drive"));
@@ -890 +890 @@
         //label has changed
         //TODO: Find better way to determine if floppy was removed or switched
-        if(drvInfo->driveType != DRIVE_FIXED) 
+        if(drvInfo->driveType != DRIVE_FIXED)
         {
             rc = OSLibDosQueryVolumeSerialAndName(1 + drvInfo->driveLetter - 'A', &volumelabel, NULL, 0);
@@ -1439 +1439 @@
         return (ret == ERROR_SUCCESS);
     }
-   
+
     case IOCTL_CDROM_RAW_READ:
     {
 #pragma pack(1)
-       struct 
+       struct
        {
         ULONG       ID_code;
@@ -1497 +1497 @@
 
         if(lpBytesReturned) {
-            *lpBytesReturned = dwDataSize; 
+            *lpBytesReturned = dwDataSize;
         }
 
@@ -1633 +1633 @@
     case IOCTL_SCSI_GET_CAPABILITIES:
     {
-        PIO_SCSI_CAPABILITIES pPacket = (PIO_SCSI_CAPABILITIES)lpOutBuffer; 
+        PIO_SCSI_CAPABILITIES pPacket = (PIO_SCSI_CAPABILITIES)lpOutBuffer;
 
         if(nOutBufferSize < sizeof(IO_SCSI_CAPABILITIES) ||
@@ -1677 +1677 @@
             return FALSE;
         }
-        
+
         if(!drvInfo || drvInfo->fCDIoSupported == FALSE) {
             dprintf(("os2cdrom.dmd CD interface not supported!!"));
@@ -1842 +1842 @@
         if((nNumberOfBytesToRead+offset) & 0xfff)
             nrpages++;
-    
+
         map->commitRange((ULONG)lpBuffer, offset & ~0xfff, TRUE, nrpages);
         map->Release();
@@ -2106 +2106 @@
         if((nNumberOfBytesToWrite+offset) & 0xfff)
             nrpages++;
-    
+
         map->commitRange((ULONG)lpBuffer, offset & ~0xfff, TRUE, nrpages);
         map->Release();
@@ -2202 +2202 @@
 
     dprintf2(("KERNEL32: HMDeviceDiskClass::GetFileSize %s(%08xh,%08xh)\n",
-              lpHMDeviceName, pHMHandleData, lpdwFileSizeHigh)); 
+              lpHMDeviceName, pHMHandleData, lpdwFileSizeHigh));
 
     //If we didn't get an OS/2 handle for the disk before, get one now

branches/gcc-kmk/src/kernel32/hmthread.cpp ¶

@@ -34 +34 @@
 #include "oslibmem.h"
 
-#include <win\thread.h>
+#include <win/thread.h>
 #include "thread.h"
 #include "asmutil.h"
@@ -65 +65 @@
     HANDLE       hThread = pHMHandleData->hHMHandle;
 
-    if(lpIDThread == NULL) { 
+    if(lpIDThread == NULL) {
         lpIDThread = &threadid;
     }
@@ -124 +124 @@
 
     *lpIDThread = MAKE_THREADID(O32_GetCurrentProcessId(), *lpIDThread);
-    
+
     TEB *teb = GetTEBFromThreadHandle(hThread);
     if(teb) {
@@ -134 +134 @@
 
     dprintf(("CreateThread created %08x, id %x", pHMHandleData->hHMHandle, *lpIDThread));
-  
+
     return pHMHandleData->hHMHandle;
 }
@@ -603 +603 @@
            pHMHandleData->hHMHandle,
            dwTimeout));
-  
+
   //This doesn't work very well in Open32 (object's state never signaled)
   if(threadobj && threadobj->dwState == THREAD_TERMINATED) {

branches/gcc-kmk/src/kernel32/lang.cpp ¶

@@ -19 +19 @@
 #include <odinwrap.h>
 #include <heapstring.h>
-#include <win\winreg.h>
+#include <win/winreg.h>
 #include <winos2def.h>
 #include "unicode.h"

branches/gcc-kmk/src/kernel32/mmap.cpp ¶

@@ -28 +28 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include <odincrt.h>
 #include <handlemanager.h>

branches/gcc-kmk/src/kernel32/mmapdup.cpp ¶

@@ -28 +28 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include <odincrt.h>
 #include <handlemanager.h>
@@ -35 +35 @@
 #include "oslibmem.h"
 #include "winimagepeldr.h"
-#include <custombuild.h> 
+#include <custombuild.h>
 
 #define DBG_LOCALLOG    DBG_mmapdup
@@ -48 +48 @@
 //
 //******************************************************************************
-Win32MemMapDup::Win32MemMapDup(Win32MemMap *parent, HANDLE hFile, ULONG size, 
+Win32MemMapDup::Win32MemMapDup(Win32MemMap *parent, HANDLE hFile, ULONG size,
                                ULONG fdwProtect, LPSTR lpszName) :
           Win32MemMap(hFile, size, fdwProtect, lpszName)
@@ -123 +123 @@
     if((fdwAccess & FILE_MAP_READ) && !(mProtFlags & (PAGE_READWRITE|PAGE_READONLY)))
         goto parmfail;
-    
+
     if (fdwAccess != FILE_MAP_ALL_ACCESS)
         if((fdwAccess & FILE_MAP_COPY) && !(mProtFlags & PAGE_WRITECOPY))
@@ -222 +222 @@
 BOOL Win32MemMapDup::commitPage(ULONG ulFaultAddr, ULONG offset, BOOL fWriteAccess, int nrpages)
 {
-    if(mProtFlags & PAGE_WRITECOPY) 
+    if(mProtFlags & PAGE_WRITECOPY)
     {//this is a COW map, call commitGuardPage
         return commitGuardPage(ulFaultAddr, offset, fWriteAccess);
@@ -245 +245 @@
 //
 //******************************************************************************
-BOOL Win32MemMapDup::commitGuardPage(ULONG ulFaultAddr, ULONG ulOffset, 
+BOOL Win32MemMapDup::commitGuardPage(ULONG ulFaultAddr, ULONG ulOffset,
                                      BOOL fWriteAccess)
 {

branches/gcc-kmk/src/kernel32/mmapnotify.cpp ¶

@@ -6 +6 @@
  * Calls notification handler when an exception occurs in the memory range of
  * the map.
- * 
+ *
  * Copyright 2003 Sander van Leeuwen (sandervl@innotek.de)
  *
@@ -16 +16 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include <odincrt.h>
 #include <handlemanager.h>
@@ -23 +23 @@
 #include "oslibmem.h"
 #include "winimagepeldr.h"
-#include <custombuild.h> 
+#include <custombuild.h>
 #include <memmap.h>
 
@@ -128 +128 @@
 // Win32MemMapNotify::findMapByView
 //
-// Find the map of the view that contains the specified starting address 
+// Find the map of the view that contains the specified starting address
 // and has the specified access type
 //

branches/gcc-kmk/src/kernel32/mmapview.cpp ¶

@@ -28 +28 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include <odincrt.h>
 #include <handlemanager.h>
@@ -35 +35 @@
 #include "oslibmem.h"
 #include "winimagepeldr.h"
-#include <custombuild.h> 
+#include <custombuild.h>
 
 #define DBG_LOCALLOG    DBG_mmapview
@@ -51 +51 @@
 //
 //******************************************************************************
-Win32MemMapView::Win32MemMapView(Win32MemMap *map, ULONG offset, ULONG size, 
+Win32MemMapView::Win32MemMapView(Win32MemMap *map, ULONG offset, ULONG size,
                                  ULONG fdwAccess, Win32MemMap *owner)
 {
@@ -87 +87 @@
     {
         //shared memory map, so map it into our address space
-        if(OSLibDosGetNamedSharedMem((LPVOID *)&viewaddr, map->getMemName()) != OSLIB_NOERROR) 
+        if(OSLibDosGetNamedSharedMem((LPVOID *)&viewaddr, map->getMemName()) != OSLIB_NOERROR)
         {
             dprintf(("new OSLibDosGetNamedSharedMem FAILED"));
@@ -104 +104 @@
     }
     else {
-        if(mfAccess & MEMMAP_ACCESS_COPYONWRITE) 
+        if(mfAccess & MEMMAP_ACCESS_COPYONWRITE)
         {
             //A copy on write view is a private copy of the memory map
@@ -118 +118 @@
         }
         }
-        else 
+        else
         if(OSLibDosAliasMem(viewaddr, size, &pMapView, accessAttr) != OSLIB_NOERROR) {
             dprintf(("new OSLibDosAliasMem FAILED"));
@@ -126 +126 @@
         }
     }
-    //Allocate bitmap for all pages of a COW view to track which pages are 
+    //Allocate bitmap for all pages of a COW view to track which pages are
     //shared and which are private (copy on write -> private page)
-    if(fdwAccess == FILE_MAP_COPY) 
+    if(fdwAccess == FILE_MAP_COPY)
     {
         DWORD nrPages = mSize >> PAGE_SHIFT;
@@ -242 +242 @@
     viewpagestart = mOffset >> PAGE_SHIFT;
     nrviewpages = mSize >> PAGE_SHIFT;
-    if(mSize & 0xFFF) 
+    if(mSize & 0xFFF)
         nrviewpages++;
 
@@ -248 +248 @@
         return; //outside this view
     }
-    if(startpage + nrpages > viewpagestart + nrviewpages) {  
+    if(startpage + nrpages > viewpagestart + nrviewpages) {
         nrpages -= ((startpage + nrpages) - (viewpagestart + nrviewpages));
     }
@@ -286 +286 @@
     }
 
-    if( ( (mfAccess & MEMMAP_ACCESS_COPYONWRITE) && (flags != PAGEVIEW_GUARD)  ) || 
-        ( (flags == PAGEVIEW_GUARD) && !(mfAccess & MEMMAP_ACCESS_COPYONWRITE) ) ) 
+    if( ( (mfAccess & MEMMAP_ACCESS_COPYONWRITE) && (flags != PAGEVIEW_GUARD)  ) ||
+        ( (flags == PAGEVIEW_GUARD) && !(mfAccess & MEMMAP_ACCESS_COPYONWRITE) ) )
     {
         //PAGEVIEW_GUARD only applies to COW views
         //PAGEVIEW_VIEW/READONLY does not apply to COW views
-        return TRUE; 
+        return TRUE;
     }
     if(mOffset + mSize <= offset || mOffset >= offset + size) {
@@ -320 +320 @@
     }
 
-    if(flags == PAGEVIEW_GUARD || (mfAccess & MEMMAP_ACCESS_COPYONWRITE)) 
+    if(flags == PAGEVIEW_GUARD || (mfAccess & MEMMAP_ACCESS_COPYONWRITE))
     {
         DWORD startpage = (offset - mOffset) >> PAGE_SHIFT;
@@ -330 +330 @@
         //of the COW pages, then only the shared pages must be changed.
         //So check each page if it is still shared.
-        for(int i=startpage;i<startpage+nrPages;i++) 
+        for(int i=startpage;i<startpage+nrPages;i++)
     {
-            if(!isCOWPage(i)) 
+            if(!isCOWPage(i))
             {//page is still shared, so set the guard flag
                 rc = OSLibDosSetMem((char *)pMapView+(offset - mOffset), PAGE_SIZE, accessAttr);
@@ -354 +354 @@
 //******************************************************************************
 //******************************************************************************
-int Win32MemMapView::findViews(Win32MemMap *map, int nrViews, 
+int Win32MemMapView::findViews(Win32MemMap *map, int nrViews,
                                Win32MemMapView *viewarray[])
 {
@@ -362 +362 @@
   Win32MemMapView *view = mapviews, *nextview;
 
-  if(view != NULL) 
+  if(view != NULL)
   {
-      while(view && i < nrViews) 
+      while(view && i < nrViews)
       {
           if(view->getParentMap() == map)
@@ -384 +384 @@
   Win32MemMapView *view = mapviews, *nextview;
 
-  if(view != NULL) 
+  if(view != NULL)
   {
-      while(view) 
+      while(view)
       {
           nextview = view->next;
@@ -404 +404 @@
 // Win32MemMap::findMapByView
 //
-// Find the map of the view that contains the specified starting address 
+// Find the map of the view that contains the specified starting address
 // and has the specified access type
 //

branches/gcc-kmk/src/kernel32/osliblvm.cpp ¶

@@ -21 +21 @@
 #include <win32type.h>
 #include <winconst.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 #include "osliblvm.h"
 
@@ -89 +89 @@
     rc = DosQueryProcAddr(hModLVM, 0, "Write_Sectors", (PFN *)&pfnWrite_Sectors);
     if(rc) goto fail;
-    
+
     return TRUE;
 
@@ -267 +267 @@
     Volume_Control_Array *volctrl;
     CARDINAL32            lasterror;
-    
+
     if(!hModLVM) {
         dprintf(("LVM dll not loaded -> fail"));
@@ -310 +310 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 
+BOOL OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex,
                              LPSTR lpszVolumeName, DWORD cchBufferLength)
 {
@@ -346 +346 @@
 static Volume_Information_Record OSLibLVMFindVolumeByDriveLetter(ULONG driveLetter,
                                                                  Volume_Control_Record *pVolRec,
-                                                                 CARDINAL32 *lasterror) 
+                                                                 CARDINAL32 *lasterror)
 {
     Volume_Control_Array      *volctrl;
@@ -384 +384 @@
 static Volume_Information_Record OSLibLVMFindVolumeByName(LPSTR pszVolName,
                                                           Volume_Control_Record *pVolRec,
-                                                          CARDINAL32 *lasterror) 
+                                                          CARDINAL32 *lasterror)
 {
     Volume_Control_Array      *volctrl;
@@ -564 +564 @@
 //            - -1 if volume wasn't found
 //            - 0 if volume is present, but not mounted
-//   
+//
 //******************************************************************************
 CHAR OSLibLVMQueryDriveFromVolumeName(LPCSTR lpszVolume)
@@ -596 +596 @@
 //******************************************************************************
 //******************************************************************************
-DWORD OSLibLVMQueryVolumeSerialAndName(LPSTR lpszVolume, LPDWORD lpVolumeSerialNumber, 
+DWORD OSLibLVMQueryVolumeSerialAndName(LPSTR lpszVolume, LPDWORD lpVolumeSerialNumber,
                                        LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize)
 {
@@ -621 +621 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, 
-                                              LPSTR lpszVolumeName, 
+BOOL OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint,
+                                              LPSTR lpszVolumeName,
                                               DWORD cchBufferLength)
 {
@@ -665 +665 @@
     strncpy(lpszOS2VolumeName, &lpszWin32VolumeName[sizeof(VOLUME_NAME_PREFIX)-1+1], cchBufferLength-1);  //-zero term + starting '{'
     length -= sizeof(VOLUME_NAME_PREFIX)-1+1;
-    if(lpszOS2VolumeName[length-2] == '}') 
+    if(lpszOS2VolumeName[length-2] == '}')
     {
         lpszOS2VolumeName[length-2] = 0;
@@ -671 +671 @@
     }
     else
-    if(lpszOS2VolumeName[length-1] == '}') 
+    if(lpszOS2VolumeName[length-1] == '}')
     {
         lpszOS2VolumeName[length-1] = 0;

branches/gcc-kmk/src/kernel32/osliblvm.h ¶

@@ -15 +15 @@
 #endif
 
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 
 #ifdef OS2_INCLUDED
@@ -30 +30 @@
 typedef unsigned long      LBA;
 
-/* Define a Partition Sector Number.  A Partition Sector Number is 
-   relative to the start of a partition. The first sector in a partition 
+/* Define a Partition Sector Number.  A Partition Sector Number is
+   relative to the start of a partition. The first sector in a partition
    is PSN 0. */
 typedef unsigned long      PSN;
@@ -330 +330 @@
 HANDLE OSLibLVMQueryVolumeControlData();
 void   OSLibLVMFreeVolumeControlData(HANDLE hVolumeControlData);
-BOOL   OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 
+BOOL   OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex,
                                LPSTR lpszVolumeName, DWORD cchBufferLength);
 
@@ -338 +338 @@
 ULONG  OSLibLVMGetDriveType(LPCSTR lpszVolume);
 CHAR   OSLibLVMQueryDriveFromVolumeName(LPCSTR lpszVolume);
-BOOL   OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, 
+BOOL   OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName,
                                                 DWORD cchBufferLength);
 

branches/gcc-kmk/src/kernel32/oslibmem.cpp ¶

@@ -31 +31 @@
 #include <win32api.h>
 #include <winconst.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 #include <dbglog.h>
 #include <vmutex.h>

branches/gcc-kmk/src/kernel32/process.cpp ¶

@@ -27 +27 @@
 #include <misc.h>
 #include <wprocess.h>
-#include <win\task.h>
+#include <win/task.h>
 #include "winimagebase.h"
 #include "oslibdos.h"
@@ -151 +151 @@
  * GetProcessHeaps [KERNEL32.376]
  */
-DWORD WINAPI GetProcessHeaps(DWORD nrofheaps,HANDLE *heaps) 
+DWORD WINAPI GetProcessHeaps(DWORD nrofheaps,HANDLE *heaps)
 {
     dprintf(("GetProcessHeaps: (%ld,%p), incomplete implementation.\n",nrofheaps,heaps));
@@ -310 +310 @@
     if ( !process ) return 0;
 
-    switch ( offset ) 
+    switch ( offset )
     {
     case GPD_APP_COMPAT_FLAGS:
@@ -379 +379 @@
 
 /***********************************************************************
- *           ODIN_SetProcessDword    
+ *           ODIN_SetProcessDword
  *
  * SvL: Special version that allows the caller to change some values
@@ -391 +391 @@
     if ( !process ) return;
 
-    switch ( offset ) 
+    switch ( offset )
     {
     case GPD_STARTF_SHOWWINDOW:
@@ -424 +424 @@
     if ( !process ) return;
 
-    switch ( offset ) 
+    switch ( offset )
     {
     case GPD_APP_COMPAT_FLAGS:
@@ -444 +444 @@
 
     case GPD_USERDATA:
-        process->process_dword = value; 
+        process->process_dword = value;
         break;
 
@@ -488 +488 @@
   if(!NtdllRtlExtendedIntegerMultiply) {
         HINSTANCE hInstance = LoadLibraryA("NTDLL.DLL");
-        if(hInstance) 
+        if(hInstance)
                 *(VOID **)&NtdllRtlExtendedIntegerMultiply=(void*)GetProcAddress(hInstance, (LPCSTR)"RtlExtendedIntegerMultiply");
   }

branches/gcc-kmk/src/kernel32/virtual.cpp ¶

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
-#include <win\thread.h>
+#include <win/virtual.h>
+#include <win/thread.h>
 #include <heapstring.h>
 #include <handlemanager.h>

branches/gcc-kmk/src/kernel32/winimagebase.cpp ¶

@@ -38 +38 @@
 #include "initterm.h"
 #include "directory.h"
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include <winconst.h>
 

branches/gcc-kmk/src/kernel32/winimagebase.h ¶

@@ -20 +20 @@
 #include <winconst.h>
 #else
-#include <win\winnls.h>
+#include <win/winnls.h>
 #endif
 

branches/gcc-kmk/src/kernel32/winimagelx.cpp ¶

@@ -42 +42 @@
 #include "oslibmisc.h"
 #include "initterm.h"
-#include <win\virtual.h>
+#include <win/virtual.h>
 
 #define DBG_LOCALLOG    DBG_winimagelx

branches/gcc-kmk/src/kernel32/winimagepeldr.cpp ¶

@@ -56 +56 @@
 #include "oslibmisc.h"
 #include "initterm.h"
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include "oslibdos.h"
 #include "oslibmem.h"

branches/gcc-kmk/src/kernel32/wprocess.cpp ¶

@@ -52 +52 @@
 #include "shellapi.h"
 
-#include <win\ntddk.h>
-#include <win\psapi.h>
+#include <win/ntddk.h>
+#include <win/psapi.h>
 
 #include <custombuild.h>

branches/gcc-kmk/src/msvcrt/time.c ¶

@@ -25 +25 @@
 #include <unistd.h>
 #include <time.h>
-#include <sys\times.h>
+#include <sys/times.h>
 #else
 #include "config.h"

branches/gcc-kmk/src/oleaut32/libgif/dgif_lib.c ¶

@@ -16 +16 @@
 #include <alloc.h>
 #include <stdlib.h>
-#include <sys\stat.h>
+#include <sys/stat.h>
 #else
 #include <sys/types.h>
@@ -332 +332 @@
 
         GifFile->Image.ColorMap = MakeMapObject(1 << BitsPerPixel, NULL);
-    
+
         /* Get the image local color map: */
         for (i = 0; i < GifFile->Image.ColorMap->ColorCount; i++) {
@@ -918 +918 @@
 * the GifFileType pointer.  Call DGifOpenFileName() or DGifOpenFileHandle()   *
 * first to initialize I/O.  Its inverse is EGifSpew().                        *
-* 
+*
  ******************************************************************************/
 int DGifSlurp(GifFileType *GifFile)
@@ -930 +930 @@
     temp_save.ExtensionBlocks=NULL;
     temp_save.ExtensionBlockCount=0;
-  
+
     do {
         if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR)
@@ -971 +971 @@
                     return(GIF_ERROR);
                 while (ExtData != NULL) {
-            
+
             /* Create an extension block with our data */
             if (AddExtensionBlock(&temp_save, ExtData[0], &ExtData[1])
                == GIF_ERROR)
-                return (GIF_ERROR); 
-            
+                return (GIF_ERROR);
+
                     if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR)
                             return(GIF_ERROR);
@@ -998 +998 @@
     if (temp_save.ExtensionBlocks)
         FreeExtension(&temp_save);
-    
+
     return(GIF_OK);
 }

branches/gcc-kmk/src/oleaut32/libgif/egif_lib.c ¶

@@ -15 +15 @@
 #include <io.h>
 #include <alloc.h>
-#include <sys\stat.h>
+#include <sys/stat.h>
 #else
 #include <sys/types.h>
@@ -137 +137 @@
     Private->File = f;
     Private->FileState = FILE_STATE_WRITE;
-    
+
     Private->Write = (OutputFunc)0; /* No user write routine (MRB) */
     GifFile->UserData = (VoidPtr)0; /* No user write handle (MRB) */
-    
+
     _GifError = 0;
 
@@ -173 +173 @@
     Private->File = (FILE *)0;
     Private->FileState = FILE_STATE_WRITE;
-    
+
     Private->Write = writeFunc; /* User write routine (MRB) */
     GifFile->UserData = userData; /* User write handle (MRB) */
-    
+
     _GifError = 0;
 
@@ -825 +825 @@
         if (sp->RasterBits == NULL)
             continue;
-        
+
     if (sp->ExtensionBlocks)
         {

branches/gcc-kmk/src/oleaut32/libgif/gif_hash.c ¶

@@ -20 +20 @@
 #include <io.h>
 #include <alloc.h>
-#include <sys\stat.h>
+#include <sys/stat.h>
 #else
 #include <sys/types.h>

branches/gcc-kmk/src/opengl/glide/sst1/init/init.c ¶

@@ -45 +45 @@
 #endif
 
-#include "init96\init96.h"
+#include "init96/init96.h"
 #include <sst1init.h>
 

branches/gcc-kmk/src/opengl/glide/sst1/init/vg96drvr.c ¶

@@ -28 +28 @@
 #include <sst1vid.h>
 #include "init.h"
-#include "init96\init96.h"
+#include "init96/init96.h"
 #include "fxinit.h"
 

branches/gcc-kmk/src/opengl/glut/glut_init.c ¶

@@ -17 +17 @@
 #if defined(__WIN32OS2__)
 #include <windows.h>
-#include "GL\gl.h"
+#include "GL/gl.h"
 #undef WH_NB_HOOKS /* Get rid of copiler warning... */
 #endif

branches/gcc-kmk/src/opengl/glut/glutos2.h ¶

@@ -15 +15 @@
  */
 #define gettimeofday gettimeofday_os2
-#include <sys\time.h>
+#include <sys/time.h>
 #undef gettimeofday
 

branches/gcc-kmk/src/opengl/mesa/mesadive.c ¶

@@ -13 +13 @@
 
 #include <os2wrap.h>
-#include "..\..\ddraw\divewrap.h"
+#include "../../ddraw/divewrap.h"
 #include <memory.h>
 #include <malloc.h>

branches/gcc-kmk/src/opengl/mesa/osmesa.c ¶

@@ -1201 +1201 @@
 
 #ifdef WIN32
-#include "..\linetemp.h"
+#include "../linetemp.h"
 #else
 #include "linetemp.h"
@@ -1231 +1231 @@
 
 #ifdef WIN32
-#include "..\linetemp.h"
+#include "../linetemp.h"
 #else
 #include "linetemp.h"
@@ -1268 +1268 @@
 
 #ifdef WIN32
-#include "..\linetemp.h"
+#include "../linetemp.h"
 #else
 #include "linetemp.h"
@@ -1308 +1308 @@
 
 #ifdef WIN32
-#include "..\linetemp.h"
+#include "../linetemp.h"
 #else
 #include "linetemp.h"
@@ -1349 +1349 @@
 
 #ifdef WIN32
-#include "..\linetemp.h"
+#include "../linetemp.h"
 #else
 #include "linetemp.h"
@@ -1493 +1493 @@
 }
 #ifdef WIN32
-#include "..\tritemp.h"
+#include "../tritemp.h"
 #else
 #include "tritemp.h"
@@ -1532 +1532 @@
 }
 #ifdef WIN32
-#include "..\tritemp.h"
+#include "../tritemp.h"
 #else
 #include "tritemp.h"
@@ -1703 +1703 @@
 
 #ifdef WIN32
-#include "..\linetemp.h"
+#include "../linetemp.h"
 #else
 #include "linetemp.h"
@@ -1741 +1741 @@
 }
 #ifdef WIN32
-#include "..\tritemp.h"
+#include "../tritemp.h"
 #else
 #include "tritemp.h"

branches/gcc-kmk/src/opengl/mesa/wmesa.c ¶

@@ -2344 +2344 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2386 +2386 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2429 +2429 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2469 +2469 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2510 +2510 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2551 +2551 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2586 +2586 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2621 +2621 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2656 +2656 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2693 +2693 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2728 +2728 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2763 +2763 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2803 +2803 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2844 +2844 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2881 +2881 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2917 +2917 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2959 +2959 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -2999 +2999 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -3033 +3033 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"
@@ -3068 +3068 @@
 
         #ifdef WIN32
-                #include "..\tritemp.h"
+                #include "../tritemp.h"
         #else
                 #include "tritemp.h"

branches/gcc-kmk/src/peldr/pe.cpp ¶

@@ -7 +7 @@
  *
  * Command line options:
- *   /OPT:[x1=y,x2=z,..]         
+ *   /OPT:[x1=y,x2=z,..]
  *   x = CURDIR    -> set current directory to y
  *   (not other options available at this time)
@@ -31 +31 @@
 #include <misc.h>
 #include <wprocess.h>
-#include <win\peexe.h>
+#include <win/peexe.h>
 #include <odinpe.h>
 #include "pe.h"
@@ -100 +100 @@
  int    nrTries = 1;
 
-  if(DosGetInfoBlocks(&ptib, &ppib) == 0) 
+  if(DosGetInfoBlocks(&ptib, &ppib) == 0)
   {
       char *pszTemp;
@@ -137 +137 @@
                         else    _interrupt(3);  //should not happen!
 #endif
-                }               
+                }
                 while(*cmdline == ' ')  cmdline++; //skip leading space
                 if(*cmdline == '"') {
@@ -196 +196 @@
                 strcat(exeShortName, ext);
 
-                if ( strlen(fullpath) == 0 ) 
+                if ( strlen(fullpath) == 0 )
                 {
                     char newExeName[CCHMAXPATH];
@@ -205 +205 @@
                                      , newExeName              /* Result of the search     */
                                      , sizeof(newExeName)      /* Length of search buffer  */
-                                     ) == NO_ERROR) 
+                                     ) == NO_ERROR)
                         {
                             strcpy(exeName, newExeName);
@@ -212 +212 @@
 
                 FILESTATUS3 fstat3;
-                if(DosQueryPathInfo(exeName, FIL_STANDARD, (PVOID)&fstat3, sizeof(fstat3))) 
+                if(DosQueryPathInfo(exeName, FIL_STANDARD, (PVOID)&fstat3, sizeof(fstat3)))
                 {
                         nrTries++;
@@ -257 +257 @@
         //switch process type to PM so the command line app can create PM
         //windows
-        ppib->pib_ultype = 3; 
+        ppib->pib_ultype = 3;
   }
 #endif
@@ -272 +272 @@
 
   hmq = MyWinCreateMsgQueue(hab, 0);
-  
+
   if(argc < 2) {
         MyWinMessageBox(HWND_DESKTOP, NULL, INFO_BANNER, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
@@ -292 +292 @@
   fVioConsole = FALSE;
 #endif
-  rc = CreateWin32Exe(exeName, win32cmdline, peoptions, reservedMemory, 0, 
+  rc = CreateWin32Exe(exeName, win32cmdline, peoptions, reservedMemory, 0,
                       fConsoleApp, fVioConsole, errorMod, sizeof(errorMod));
   if(rc != LDRERROR_SUCCESS)
@@ -305 +305 @@
             sprintf(pszErrorMsg, szCPUErrorMsg, exeName);
             break;
-        case LDRERROR_FILE_SYSTEM:            
+        case LDRERROR_FILE_SYSTEM:
             sprintf(szErrorMsg, szExeErrorMsg, exeName);
             break;

branches/gcc-kmk/src/rpcrt4/uuid.cpp ¶

@@ -40 +40 @@
 
 #include "io.h"
-#include "sys\timeb.h"
-
-#include <sys\socket.h>
-#include <sys\ioctl.h>
+#include "sys/timeb.h"
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <netdb.h>
-#include <netinet\in.h>
-#include <netinet\tcp.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #undef interface
-#include <net\if.h>
-#include <netinet\if_ether.h>
+#include <net/if.h>
+#include <netinet/if_ether.h>
 #include <nerrno.h>
-#include <sys\time.h>
+#include <sys/time.h>
 
 ULONG WINAPI RtlExtendedIntegerMultiply(LARGE_INTEGER factor1, INT factor2);

branches/gcc-kmk/src/shdocvw/shdocvw.h ¶

@@ -31 +31 @@
 
 #ifdef __WIN32OS2__
-#include <win\winerror.h>
+#include <win/winerror.h>
 #endif
 

branches/gcc-kmk/src/shell32/sh.cpp ¶

@@ -27 +27 @@
 #define CINTERFACE
 #include "shell32_main.h"
-#include <win\shlobj.h>
+#include <win/shlobj.h>
 #include <misc.h>
 //#include <nameid.h>

branches/gcc-kmk/src/shell32/shell32_main.h ¶

@@ -35 +35 @@
 * pointer to functions dynamically loaded
 */
-extern LPVOID   (* WINAPI pCOMCTL32_Alloc) (INT);  
-extern BOOL     (* WINAPI pCOMCTL32_Free) (LPVOID);  
+extern LPVOID   (* WINAPI pCOMCTL32_Alloc) (INT);
+extern BOOL     (* WINAPI pCOMCTL32_Free) (LPVOID);
 
 #define pDPA_Create     DPA_Create
@@ -46 +46 @@
 #define pDPA_DeletePtr  DPA_DeletePtr
 
-#define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))   
+#define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))
 
 #define pLookupIconIdFromDirectoryEx LookupIconIdFromDirectoryEx
 #define pCreateIconFromResourceEx    CreateIconFromResourceEx
 
-#include <wine\undoccomctl32.h>
+#include <wine/undoccomctl32.h>
 
 #define pAddMRUData     AddMRUData
@@ -106 +106 @@
 
 LPEXTRACTICONA  IExtractIconA_Constructor(LPITEMIDLIST);
-HRESULT         CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm);      
+HRESULT         CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm);
 
 /* fixme: rename the functions when the shell32.dll has it's own exports namespace */
@@ -148 +148 @@
 extern HRESULT (* WINAPI pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
 extern HRESULT (* WINAPI pRevokeDragDrop)(HWND hwnd);
-extern HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*); 
+extern HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
 extern void     (* WINAPI pReleaseStgMedium)(STGMEDIUM* pmedium);
 extern HRESULT (* WINAPI pOleSetClipboard)(IDataObject* pDataObj);
@@ -157 +157 @@
 HRESULT (* WINAPI pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
 HRESULT (* WINAPI pRevokeDragDrop)(HWND hwnd);
-HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*); 
+HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
 void    (* WINAPI pReleaseStgMedium)(STGMEDIUM* pmedium);
 HRESULT (* WINAPI pOleSetClipboard)(IDataObject* pDataObj);

branches/gcc-kmk/src/shlwapi/ordinal_odin.cpp ¶

@@ -38 +38 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\shell.h>
-#include <win\winerror.h>
+#include <win/shell.h>
+#include <win/winerror.h>
 #include <winversion.h>
 #include <winuser.h>

branches/gcc-kmk/src/shlwapi/reg_odin.cpp ¶

@@ -33 +33 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\winerror.h>
+#include <win/winerror.h>
 #include "shlwapi_odin.h"
 #define NO_SHLWAPI_STREAM
@@ -140 +140 @@
 {
   dprintf(("not yet implemented"));
-  
+
   LONG rc = 0;
   return rc;
@@ -169 +169 @@
 {
   dprintf(("not yet implemented"));
-  
+
   LONG rc = 0;
   return rc;
@@ -182 +182 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -194 +194 @@
 {
   dprintf(("not implemented\n"));
-  
+
   LONG rc = RegDeleteValueA(hUSKey,
                             (LPSTR)lpValue);
@@ -207 +207 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -219 +219 @@
 {
   dprintf(("not implemented\n"));
-  
+
   LONG rc = RegDeleteValueW(hKey,
                             (LPWSTR)lpValue);
@@ -233 +233 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -255 +255 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -277 +277 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -299 +299 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -323 +323 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *
@@ -350 +350 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : STUB UNTESTED
  *

branches/gcc-kmk/src/shlwapi/shlstub.cpp ¶

@@ -29 +29 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\shell.h>
-#include <win\winerror.h>
+#include <win/shell.h>
+#include <win/winerror.h>
 
 
@@ -38 +38 @@
 /*****************************************************************************
  * Name      : StrFromTimeIntervalA
- * Purpose   : 
+ * Purpose   :
  * Parameters:
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : UNTESTED
  *
@@ -51 +51 @@
 {
   dprintf(("not yet implemented"));
-  
+
   return NULL;
 }
@@ -58 +58 @@
 /*****************************************************************************
  * Name      : StrFromTimeIntervalW
- * Purpose   : 
+ * Purpose   :
  * Parameters:
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : UNTESTED
  *
@@ -71 +71 @@
 {
   dprintf(("not yet implemented"));
-  
+
   return NULL;
 }

branches/gcc-kmk/src/shlwapi/shlwapi.cpp ¶

@@ -41 +41 @@
 #include <misc.h>
 #include <unicode.h>
-#include <win\shell.h>
-#include <win\winerror.h>
+#include <win/shell.h>
+#include <win/winerror.h>
 
 // import OLE support

branches/gcc-kmk/src/shlwapi/string_odin.cpp ¶

@@ -42 +42 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\shell.h>
-#include <win\winerror.h>
+#include <win/shell.h>
+#include <win/winerror.h>
 #include <winversion.h>
 #include <winuser.h>
@@ -179 +179 @@
        (lpString2 == NULL) )
     return 0;
-  
+
   LPSTR lpLoop = (LPSTR)lpString1;
-  
+
   for (; (*lpLoop != 0); lpLoop++ )
     if ( StrChrA( lpString2, *lpLoop ) )
       return (INT) (lpLoop - lpString1);
-  
+
   return (INT) (lpLoop - lpString1);
 }
@@ -213 +213 @@
        (lpString2 == NULL) )
     return 0;
-  
+
   LPWSTR lpLoop = (LPWSTR)lpString1;
-  
+
   for (; (*lpLoop != 0); lpLoop++ )
     if ( StrChrW( lpString2, *lpLoop ) )
       return (INT) (lpLoop - lpString1);
-  
+
   return (INT) (lpLoop - lpString1);
 }
@@ -230 +230 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : UNTESTED
  *
@@ -241 +241 @@
 {
   register LPSTR s1;
-  
+
   while (*lpString1)
   {
@@ -255 +255 @@
     lpString1++;
   }
-  
+
   return (LPSTR)NULL;
 }
@@ -266 +266 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : UNTESTED
  *
@@ -277 +277 @@
 {
   register LPWSTR s1;
-  
+
   while (*lpString1)
   {
@@ -291 +291 @@
     lpString1++;
   }
-  
+
   return (LPWSTR)NULL;
 }
@@ -304 +304 @@
 
   dprintf(("StrRStrIA %x %x %x NOT IMPLEMENTED correctly", lpFirst, lpSrch, unknown));
-  
+
   // lpSrch cannot fit into lpFirst
   if (iLen < 0)
     return (LPSTR)NULL;
-  
+
   LPSTR lpThis = (LPSTR)lpFirst + iLen;
-  
+
   while (lpThis >= lpFirst)
   {
@@ -318 +318 @@
     lpThis--;
   }
-  
+
   return NULL;
 }
@@ -331 +331 @@
 
   dprintf(("StrRStrIA %x %x %x NOT IMPLEMENTED correctly", lpFirst, lpSrch, unknown));
-  
+
   // lpSrch cannot fit into lpFirst
   if (iLen < 0)
     return (LPWSTR)NULL;
-  
+
   LPWSTR lpThis = (LPWSTR)lpFirst + iLen;
-  
+
   while (lpThis >= lpFirst)
   {
@@ -345 +345 @@
     lpThis--;
   }
-  
+
   return NULL;
 }

branches/gcc-kmk/src/shlwapi/url_odin.cpp ¶

@@ -35 +35 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\shell.h>
-#include <win\winerror.h>
+#include <win/shell.h>
+#include <win/winerror.h>
 
 #include "shlwapi_odin.h"

branches/gcc-kmk/src/user32/controls/controls.h ¶

@@ -10 +10 @@
 #define __CONTROLS_H
 
-#include <win\win.h>
+#include <win/win.h>
 #include <heapstring.h>
 

branches/gcc-kmk/src/user32/loadres.cpp ¶

@@ -22 +22 @@
 #include <heapstring.h>
 #include <oslibres.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include "dib.h"
 #include "initterm.h"
@@ -70 +70 @@
     hRes = FindResourceW(hinst, (LPWSTR)(((wID>>4)&0xffff)+1), RT_STRINGW);
     if(hRes == NULL) {
-        dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer)); 
+        dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
         *lpBuffer = 0;  //NT4, SP6 clears first character
         return 0;
@@ -342 +342 @@
     headersize = sizeof(BITMAPINFO)+colortablesize+3*sizeof(DWORD); //+ extra space for > 8bpp images
 
-    pInfo = (BITMAPINFO *)malloc(headersize+bmpsize); 
+    pInfo = (BITMAPINFO *)malloc(headersize+bmpsize);
     if(pInfo == NULL) {
         DebugInt3();
@@ -360 +360 @@
     GetDIBits(hdc, hBitmap, 0, bm.bmHeight, pBitmapData, pInfo, DIB_RGB_COLORS);
 
-    res = CreateDIBitmap(hdc, &pInfo->bmiHeader, CBM_INIT, pBitmapData, 
+    res = CreateDIBitmap(hdc, &pInfo->bmiHeader, CBM_INIT, pBitmapData,
                          pInfo, DIB_RGB_COLORS );
 

branches/gcc-kmk/src/user32/msgbox.c ¶

@@ -8 +8 @@
  *
  */
-#include <win\winbase.h>
-#include <win\winuser.h>
+#include <win/winbase.h>
+#include <win/winuser.h>
 #include <string.h>
 #include <dlgs.h>

branches/gcc-kmk/src/user32/oslibmsg.cpp ¶

@@ -49 +49 @@
 #include "pmwindow.h"
 #include "oslibwin.h"
-#include <win\hook.h>
+#include <win/hook.h>
 #include <winscan.h>
 #include <winkeyboard.h>

branches/gcc-kmk/src/user32/oslibres.h ¶

@@ -17 +17 @@
 #endif
 
-#include <win\cursoricon.h>
+#include <win/cursoricon.h>
 
 #ifdef OS2_INCLUDED

branches/gcc-kmk/src/user32/pmwindow.cpp ¶

@@ -57 +57 @@
 #include <oslibdnd.h>
 #include <custombuild.h>
-#include <win\dbt.h>
+#include <win/dbt.h>
 #include "dragdrop.h"
 #include "menu.h"

branches/gcc-kmk/src/user32/win32class.cpp ¶

@@ -34 +34 @@
 #include <win32class.h>
 #include <win32wnd.h>
-#include <win\winproc.h>
+#include <win/winproc.h>
 #include <unicode.h>
 

branches/gcc-kmk/src/user32/win32dlg.cpp ¶

@@ -18 +18 @@
 #include <misc.h>
 #include <win32dlg.h>
-#include <win\winproc.h>
+#include <win/winproc.h>
 #include "oslibmsg.h"
 #include "oslibwin.h"
@@ -202 +202 @@
 
     //Mask away WS_CAPTION style for dialogs with DS_CONTROL style
-    //(necessary for OFN_ENABLETEMPLATE file open dialogs) 
+    //(necessary for OFN_ENABLETEMPLATE file open dialogs)
     //(verified this behaviour in NT4, SP6)
     if (dlgInfo.style & DS_CONTROL)     cs.style &= ~(WS_CAPTION);
@@ -265 +265 @@
 
         HWND hwndPreInitFocus = GetFocus();
-        if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param)) 
+        if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param))
         {
             //SvL: Experiments in NT4 show that dialogs that are children don't
             //     receive focus. Not sure if this is always true. (couldn't
             //     find any remarks about this in the SDK docs)
-            if(!(getStyle() & WS_CHILD)) 
+            if(!(getStyle() & WS_CHILD))
             {
                 /* check where the focus is again,
@@ -285 +285 @@
             //     receive focus. Not sure if this is always true. (couldn't
             //     find any remarks about this in the SDK docs)
-            if(!(getStyle() & WS_CHILD)) 
+            if(!(getStyle() & WS_CHILD))
             {
                 /* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
@@ -379 +379 @@
                        HOOK_CallHooksA( WH_MSGFILTER, MSGF_DIALOGBOX, 0,
                                           (LPARAM) pmsg ));
-                       
+
                 HeapFree( GetProcessHeap(), 0, pmsg );
                 if (ret)
@@ -1163 +1163 @@
 
     /* unblock dialog loop */
-    PostMessageA(hwnd, WM_NULL, 0, 0); 
+    PostMessageA(hwnd, WM_NULL, 0, 0);
     return TRUE;
 }

branches/gcc-kmk/src/user32/win32wbase.cpp ¶

@@ -63 +63 @@
 #include "controls.h"
 #include <wprocess.h>
-#include <win\hook.h>
+#include <win/hook.h>
 #include <menu.h>
 #define INCL_TIMERWIN32

branches/gcc-kmk/src/user32/win32wbasepos.cpp ¶

@@ -36 +36 @@
 #include "dc.h"
 #include "win32wdesktop.h"
-#include <win\hook.h>
+#include <win/hook.h>
 
 #define DBG_LOCALLOG    DBG_win32wbasepos

branches/gcc-kmk/src/user32/win32wfake.cpp ¶

@@ -14 +14 @@
 #include <string.h>
 #include <dbglog.h>
-#include <win\winproc.h>
+#include <win/winproc.h>
 #include <win32wbase.h>
 #include <win32wfake.h>

branches/gcc-kmk/src/user32/winaccel.cpp ¶

@@ -18 +18 @@
 #include <misc.h>
 #include <heapstring.h>
-#include <win\winnls.h>
+#include <win/winnls.h>
 
 #define DBG_LOCALLOG    DBG_winaccel
@@ -29 +29 @@
  * 01:  BYTE    pad             (to WORD boundary)
  * 02:  WORD    event
- * 04:  WORD    IDval           
+ * 04:  WORD    IDval
  * 06:  WORD    pad             (to DWORD boundary)
  */
@@ -54 +54 @@
                 hRetval = GlobalAlloc(0,sizeof(ACCEL)*nrofaccells);
                 accel   = (LPACCEL)GlobalLock(hRetval);
-        
+
                 for (i=0;i<nrofaccells;i++) {
                         accel[i].fVirt = accel_table[i].fVirt;

branches/gcc-kmk/src/user32/windlg.cpp ¶

@@ -24 +24 @@
 #include "win32dlg.h"
 #include <heapstring.h>
-#include <win\drive.h>
+#include <win/drive.h>
 #include <custombuild.h>
 
@@ -330 +330 @@
                 }
             }
-        }       
+        }
     }
 #endif

branches/gcc-kmk/src/user32/windlgmsg.cpp ¶

@@ -22 +22 @@
 #include "win32dlg.h"
 #include <winnls.h>
-#include <wine\unicode.h>
+#include <wine/unicode.h>
 
 #define DBG_LOCALLOG    DBG_windlgmsg
@@ -276 +276 @@
                 if (HIWORD(dw) == DC_HASDEFID)
                 {
-                  if (IsWindowEnabled(GetDlgItem(hwndDlg, LOWORD(dw)))) 
+                  if (IsWindowEnabled(GetDlgItem(hwndDlg, LOWORD(dw))))
                   {
                        SendMessageA( hwndDlg, WM_COMMAND,

branches/gcc-kmk/src/user32/window.cpp ¶

@@ -39 +39 @@
 #include "pmwindow.h"
 #include "oslibmsg.h"
-#include <win\winpos.h>
-#include <win\win.h>
+#include <win/winpos.h>
+#include <win/win.h>
 #include <heapstring.h>
 #include <winuser32.h>
@@ -155 +155 @@
     }
     HWND hwnd = window->getWindowHandle();
-  
+
     // set myself as last active popup / window
     window->setLastActive( hwnd );
-  
+
     RELEASE_WNDOBJ(window);
     return hwnd;
@@ -262 +262 @@
     }
     HWND hwnd = window->getWindowHandle();
-  
+
     // set myself as last active popup / window
     window->setLastActive( hwnd );
-  
+
     RELEASE_WNDOBJ(window);
     return hwnd;
@@ -300 +300 @@
     }
     hwndActive = window->SetActiveWindow();
-  
+
     // check last active popup window
     if (hwndActive)
@@ -308 +308 @@
       dprintf(("support for last active popup incorrectly implemented"));
     }
-  
+
     RELEASE_WNDOBJ(window);
     return hwndActive;
@@ -561 +561 @@
     if ((nCmdShow == SW_RESTORE) && (window->getStyle() & WS_MINIMIZE) && fOS2Look )
     {
-        dprintf(("ShowWindow: Initiating OS/2 PM restore"));          
+        dprintf(("ShowWindow: Initiating OS/2 PM restore"));
         ret = OSLibWinRestoreWindow(window->getOS2FrameWindowHandle());
     }
-    else   
+    else
         ret = window->ShowWindow(nCmdShow);
     RELEASE_WNDOBJ(window);
@@ -720 +720 @@
     ret = TRUE;
 
-    if(dwStyle & WS_CHILD) 
+    if(dwStyle & WS_CHILD)
     {
         //check visibility of parents
@@ -762 +762 @@
         //else no child -> no parent (GetParent returns owner otherwise!)
     }
-    else 
-    if (type == GA_ROOT) 
+    else
+    if (type == GA_ROOT)
     {
          hwndAncestor = window->GetTopParent();
     }
     else
-    if (type == GA_ROOTOWNER) 
-    {
-         if(hwnd != GetDesktopWindow()) 
+    if (type == GA_ROOTOWNER)
+    {
+         if(hwnd != GetDesktopWindow())
          {
              hwndAncestor = hwnd;
@@ -804 +804 @@
  TEB *teb;
 
-    dprintf(("SetFocus %x", hwnd));    
+    dprintf(("SetFocus %x", hwnd));
     teb = GetThreadTEB();
     if(teb == NULL) {
@@ -929 +929 @@
     lpThreadInfo->hwndActive  = GetActiveWindow();
     if(lpThreadInfo->hwndActive) {
-        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 
+        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL))
         {//this thread doesn't own the active window (TODO: correct??)
             lpThreadInfo->hwndActive = 0;
@@ -980 +980 @@
          windowDesktop->addRef();
          window = windowDesktop;
-    }     
+    }
     else window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-      
+
     if(!window) {
         dprintf(("GetWindowRect, window %x not found", hwnd));
@@ -1104 +1104 @@
  *      InternalGetWindowText    (USER32.326)
  */
-int WIN32API InternalGetWindowText(HWND hwnd, 
+int WIN32API InternalGetWindowText(HWND hwnd,
                                    LPWSTR lpString,
                                    INT    nMaxCount )
@@ -1274 +1274 @@
         windowDesktop->addRef();
         wndfrom = windowDesktop;
-    } 
+    }
     else {
         wndfrom = Win32BaseWindow::GetWindowFromHandle(hwndFrom);
@@ -1288 +1288 @@
         windowDesktop->addRef();
         wndto = windowDesktop;
-    } 
+    }
     else {
         wndto = Win32BaseWindow::GetWindowFromHandle(hwndTo);
@@ -1887 +1887 @@
         {
 //            WND *wndPtr = WIN_FindWndPtr(hwndChild);
-            
+
 //            WINPOS_ShowIconTitle( wndPtr, FALSE );
-               
+
             SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
                             y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0,
@@ -2003 +2003 @@
 
   owner = Win32BaseWindow::GetWindowFromHandle(hWnd);
-  if(!owner) 
+  if(!owner)
   {
     dprintf(("GetLastActivePopup, window %x not found", hWnd));
@@ -2013 +2013 @@
   if (!IsWindow( hwndRetVal ))
     hwndRetVal = owner->getWindowHandle();
-  
+
   RELEASE_WNDOBJ(owner);
-  
+
   return hwndRetVal;
 }
@@ -2036 +2036 @@
     }
     RELEASE_WNDOBJ(window);
-    
+
     return dwThreadId;
 }
@@ -2220 +2220 @@
 }
 //******************************************************************************
-//The GetWindowModuleFileName function retrieves the full path and file name of 
+//The GetWindowModuleFileName function retrieves the full path and file name of
 //the module associated with the specified window handle.
 //******************************************************************************

branches/gcc-kmk/src/user32/winicon.cpp ¶

@@ -47 +47 @@
 #include <string.h>
 #include <winicon.h>
-#include <win\cursoricon.h>
+#include <win/cursoricon.h>
 #include <objhandle.h>
 #include "dib.h"
 #include <heapstring.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include "initterm.h"
 #include "oslibres.h"
@@ -200 +200 @@
 
         /* Transfer the bitmap bits to the CURSORICONINFO structure */
-        if(bmpAnd.bmBitsPixel > 1) 
+        if(bmpAnd.bmBitsPixel > 1)
         {//Our code expects b&w masks, so convert it first
          //We could also use GetDIBits to do the conversion for us, but it returns
@@ -216 +216 @@
 
             //blit to the destination HDC & convert to 1bpp
-            BitBlt(hdcDest, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, 
+            BitBlt(hdcDest, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight,
                    hdcSrc, 0, 0, SRCCOPY);
 
@@ -442 +442 @@
     if(hActiveCursorPM && hActiveCursorPM != OSLibWinQueryPointer()) {
        dprintf(("Another app changed mouse cursor"));
-       hActiveCursorPM = hActiveCursor = 0; 
+       hActiveCursorPM = hActiveCursor = 0;
     }
     return hActiveCursor;
@@ -593 +593 @@
     bmpXor.bmBitsPixel  = info->bBitsPerPixel;
     bmpXor.bmBits       = NULL;
-    ((CURSORICONINFO *)ptr)->hColorBmp = 
+    ((CURSORICONINFO *)ptr)->hColorBmp =
           OSLibWinCreatePointer(info, (char *)lpANDbits, (LPBITMAP_W)&bmpAnd, (char *)lpXORbits, (LPBITMAP_W)&bmpXor, fIcon == FALSE);
 #endif
@@ -1085 +1085 @@
 //SvL: Must use CreateBitmap here as CreateDIBitmap converts data to 8bpp (GetObjectA info -> 8 bpp)
 #if 1
-                    int linewidth; 
+                    int linewidth;
                     int orglinewidth;
 

branches/gcc-kmk/src/user32/winmouse.cpp ¶

@@ -32 +32 @@
 #include <commctrl.h>
 #include <debugtools.h>
-#include <win\mouse.h>
+#include <win/mouse.h>
 #include "winmouse.h"
 #include "oslibmsg.h"

branches/gcc-kmk/src/user32/winproc.cpp ¶

@@ -18 +18 @@
 #include <string.h>
 #include "callwrap.h"
-#include <win\winproc.h>
-#include <win\debugtools.h>
+#include <win/winproc.h>
+#include <win/debugtools.h>
 #include <heapcode.h>
 #include "win32wbase.h"
@@ -307 +307 @@
     }
     else  dprintf2(("CallWindowProcA %x %x %x %x %x (unknown proc)", func, hwnd, msg, wParam, lParam));
-   
+
     if(!IsWindow(hwnd)) {
         dprintf2(("CallWindowProcA, window %x not found", hwnd));

branches/gcc-kmk/src/user32/wndmsg.cpp ¶

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include <win\winmfcmsg.h>
+#include <win/winmfcmsg.h>
 #include <spy.h>
 #include "wndmsg.h"

branches/gcc-kmk/src/win32k/kKrnlLib/src/d16Globl.c ¶

@@ -28 +28 @@
 #define INCL_NOPMAPI
 #include <os2.h>
-#include "..\..\..\..\include\odinbuild.h" /* FIXME */
+#include "../../../../include/odinbuild.h" /* FIXME */
 #include "options.h"
 

branches/gcc-kmk/src/win32k/libconv.c ¶

@@ -18 +18 @@
 
 
-#include "include\omf.h"
+#include "include/omf.h"
 
 int fCodeToCode16 = 0;

branches/gcc-kmk/src/wininet/wininet.cpp ¶

@@ -9 +9 @@
 
 #include <os2win.h>
-#include <win\wininet.h>
+#include <win/wininet.h>
 
 //******************************************************************************

branches/gcc-kmk/src/winmm/initterm.cpp ¶

@@ -42 +42 @@
 #include "winmmtype.h"
 #include "waveoutbase.h"
-#include <win\options.h>
+#include <win/options.h>
 
 #define DBG_LOCALLOG    DBG_initterm

branches/gcc-kmk/src/winmm/initwinmm.cpp ¶

@@ -46 +46 @@
 #include "winmmtype.h"
 #include "waveoutbase.h"
-#include <win\options.h>
+#include <win/options.h>
 #include "initwinmm.h"
 #include <custombuild.h>
@@ -122 +122 @@
         WaveOut::setDefaultVolume(dwVolume);
 
-        if(fMMPMAvailable == TRUE) 
+        if(fMMPMAvailable == TRUE)
         {//if audio access wasn't disabled already, check if mmpm2 is installed
             // try to load the MDM library, not MMPM directly!!!
@@ -130 +130 @@
                 // this system has no MMPM :-(
                 fMMPMAvailable = FALSE;
-            } 
+            }
             else
             {
@@ -140 +140 @@
                 {
                     fMMPMAvailable = FALSE;
-                } 
+                }
                 else
                 {
@@ -161 +161 @@
         }
 
-        if(fMMPMAvailable && RegOpenKeyA(HKEY_LOCAL_MACHINE, CUSTOM_BUILD_OPTIONS_KEY, &hKey) == 0) 
+        if(fMMPMAvailable && RegOpenKeyA(HKEY_LOCAL_MACHINE, CUSTOM_BUILD_OPTIONS_KEY, &hKey) == 0)
         {
             DWORD dwSize, dwType;
@@ -184 +184 @@
             fMMPMAvailable = FALSE;
         }
-        else 
+        else
         {
             // Test for buggy audio drivers to turn off audio automagically
-            for(int i=0;i<sizeof(szBuggyAudio)/sizeof(szBuggyAudio[0]);i++) 
+            for(int i=0;i<sizeof(szBuggyAudio)/sizeof(szBuggyAudio[0]);i++)
             {
                 if(!strncmp(szPDDName, szBuggyAudio[i], strlen(szBuggyAudio[i]))) {

branches/gcc-kmk/src/winmm/playsound.cpp ¶

@@ -24 +24 @@
 #include <misc.h>
 #include <string.h>
-#include <win\debugtools.h>
+#include <win/debugtools.h>
 
 #define DBG_LOCALLOG    DBG_playsound
@@ -51 +51 @@
 }
 
-static HMMIO    get_mmioFromProfile(UINT uFlags, LPCSTR lpszName) 
+static HMMIO    get_mmioFromProfile(UINT uFlags, LPCSTR lpszName)
 {
     char        str[128];
     LPSTR       ptr;
     HMMIO       hmmio;
-    
+
     TRACE("searching in SystemSound List !\n");
     GetProfileStringA("Sounds", (LPSTR)lpszName, "", str, sizeof(str));
@@ -78 +78 @@
 };
 
-static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, 
-                                        DWORD dwInstance,  
+static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg,
+                                        DWORD dwInstance,
                                         DWORD dwParam1, DWORD dwParam2)
 {
@@ -98 +98 @@
 }
 
-static void PlaySound_WaitDone(struct playsound_data* s) 
+static void PlaySound_WaitDone(struct playsound_data* s)
 {
     for (;;) {
@@ -106 +106 @@
         }
         InterlockedIncrement((LPLONG)&s->dwEventCount);
-        
+
         WaitForSingleObject(s->hEvent, INFINITE);
     }
@@ -141 +141 @@
         hmmio = 0;
         if (uFlags & SND_ALIAS)
-            if ((hmmio = get_mmioFromProfile(uFlags, lpszSoundName)) == 0) 
+            if ((hmmio = get_mmioFromProfile(uFlags, lpszSoundName)) == 0)
                 return FALSE;
-        
+
         if (uFlags & SND_FILENAME)
             if ((hmmio=get_mmioFromFile(lpszSoundName)) == 0) return FALSE;
-        
+
         if (PlaySound_SearchMode == 1) {
             PlaySound_SearchMode = 0;
-            if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0) 
+            if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0)
                 hmmio = get_mmioFromProfile(uFlags, lpszSoundName);
         }
-        
+
         if (PlaySound_SearchMode == 2) {
             PlaySound_SearchMode = 0;
-            if ((hmmio = get_mmioFromProfile(uFlags | SND_NODEFAULT, lpszSoundName)) == 0) 
-                if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0)     
+            if ((hmmio = get_mmioFromProfile(uFlags | SND_NODEFAULT, lpszSoundName)) == 0)
+                if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0)
                     hmmio = get_mmioFromProfile(uFlags, lpszSoundName);
         }
@@ -197 +197 @@
         goto errCleanUp;
 
-    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", 
+    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n",
           (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);
 
@@ -216 +216 @@
     waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L;
     waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize;
-    if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || 
+    if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) ||
         waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) {
         goto errCleanUp;
@@ -260 +260 @@
 }
 
-static DWORD WINAPI PlaySound_Thread(LPVOID arg) 
+static DWORD WINAPI PlaySound_Thread(LPVOID arg)
 {
     DWORD     res;
-    
+
     for (;;) {
         PlaySound_Playing = FALSE;
@@ -273 +273 @@
         if (res != WAIT_OBJECT_0) continue;
         PlaySound_Playing = TRUE;
-        
+
         if ((PlaySound_fdwSound & SND_RESOURCE) == SND_RESOURCE) {
             HRSRC       hRES;
@@ -292 +292 @@
                 continue;
             }
-            PlaySound_Result = proc_PlaySound((LPCSTR)ptr, 
+            PlaySound_Result = proc_PlaySound((LPCSTR)ptr,
                                               ((UINT16)PlaySound_fdwSound ^ SND_RESOURCE) | SND_MEMORY);
             FreeResource(hGLOB);
@@ -319 +319 @@
 {
     static LPSTR StrDup = NULL;
-    
+
     TRACE("pszSound='%p' hmod=%04X fdwSound=%08lX\n",
           pszSound, hmod, fdwSound);
-    
+
     if (PlaySound_hThread == 0) { /* This is the first time they called us */
         DWORD   id;
@@ -331 +331 @@
         if ((PlaySound_hPlayEvent = CreateEventA(NULL, FALSE, FALSE, NULL)) == 0)
             return FALSE;
-        if ((PlaySound_hThread = CreateThread(NULL, 0, PlaySound_Thread, 0, 0, &id)) == 0) 
-            return FALSE;
-    }
-    
-    /* FIXME? I see no difference between SND_WAIT and SND_NOSTOP ! */ 
-    if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySound_Playing) 
+        if ((PlaySound_hThread = CreateThread(NULL, 0, PlaySound_Thread, 0, 0, &id)) == 0)
+            return FALSE;
+    }
+
+    /* FIXME? I see no difference between SND_WAIT and SND_NOSTOP ! */
+    if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySound_Playing)
         return FALSE;
-    
+
     /* Trying to stop if playing */
     if (PlaySound_Playing) PlaySound_Stop = TRUE;
-    
+
     /* Waiting playing thread to get ready. I think 10 secs is ok & if not then leave*/
     if (WaitForSingleObject(PlaySound_hReadyEvent, 1000*10) != WAIT_OBJECT_0)
         return FALSE;
-    
-    if (!pszSound || (fdwSound & SND_PURGE)) 
+
+    if (!pszSound || (fdwSound & SND_PURGE))
         return FALSE; /* We stoped playing so leaving */
-    
+
     if (PlaySound_SearchMode != 1) PlaySound_SearchMode = 2;
     if (!(fdwSound & SND_ASYNC)) {
-        if (fdwSound & SND_LOOP) 
+        if (fdwSound & SND_LOOP)
             return FALSE;
         PlaySound_pszSound = pszSound;
@@ -358 +358 @@
         PlaySound_Result = FALSE;
         SetEvent(PlaySound_hPlayEvent);
-        if (WaitForSingleObject(PlaySound_hMiddleEvent, INFINITE) != WAIT_OBJECT_0) 
-            return FALSE;
-        if (WaitForSingleObject(PlaySound_hReadyEvent, INFINITE) != WAIT_OBJECT_0) 
+        if (WaitForSingleObject(PlaySound_hMiddleEvent, INFINITE) != WAIT_OBJECT_0)
+            return FALSE;
+        if (WaitForSingleObject(PlaySound_hReadyEvent, INFINITE) != WAIT_OBJECT_0)
             return FALSE;
         return PlaySound_Result;
@@ -371 +371 @@
             StrDup = NULL;
         }
-        if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && 
+        if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) &&
                                           !((DWORD)pszSound >> 16)) || !pszSound)) {
             StrDup = HEAP_strdupA(GetProcessHeap(), 0,pszSound);
@@ -403 +403 @@
     LPSTR       pszSoundA;
     BOOL        bSound;
-    
-    if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && 
+
+    if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) &&
                                       !((DWORD)pszSound >> 16)) || !pszSound)) {
         pszSoundA = HEAP_strdupWtoA(GetProcessHeap(), 0,pszSound);
         bSound = PlaySoundA(pszSoundA, hmod, fdwSound);
         HeapFree(GetProcessHeap(), 0, pszSoundA);
-    } else  
+    } else
         bSound = PlaySoundA((LPCSTR)pszSound, hmod, fdwSound);
-    
+
     return bSound;
 }

branches/gcc-kmk/src/winspool/stubs.cpp ¶

@@ -21 +21 @@
 #include <odinwrap.h>
 #include <heapstring.h>
-#include <win\winnls.h>
-#include <win\debugstr.h>
-#include <win\debugtools.h>
+#include <win/winnls.h>
+#include <win/debugstr.h>
+#include <win/debugtools.h>
 
 #include <stdio.h>

branches/gcc-kmk/src/winspool/winspool.cpp ¶

@@ -29 +29 @@
 #include <odinwrap.h>
 #include <heapstring.h>
-#include <win\winnls.h>
-#include <win\debugstr.h>
-#include <win\debugtools.h>
+#include <win/winnls.h>
+#include <win/debugstr.h>
+#include <win/debugtools.h>
 
 #include <stdio.h>

branches/gcc-kmk/src/wintrust/wintrust.cpp ¶

@@ -7 +7 @@
 #define CINTERFACE
 
-#include <win\windef.h>
-#include <win\winerror.h>
-#include <win\ole2.h>
+#include <win/windef.h>
+#include <win/winerror.h>
+#include <win/ole2.h>
 #include <misc.h>
 

branches/gcc-kmk/src/wsock32/new/wsock32.h ¶

@@ -17 +17 @@
 
 #define TCPV40HDRS
-#include <sys\socket.h>
-#include <sys\ioctl.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <netdb.h>
-#include <netinet\in.h>
-#include <netinet\tcp.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <nerrno.h>
-#include <sys\time.h>
+#include <sys/time.h>
 
 #include <odinwrap.h>
@@ -173 +173 @@
 } _ws_protoent;
 
-typedef struct ws_servent 
+typedef struct ws_servent
 {
         char *  s_name;         /* official service name */

branches/gcc-kmk/src/wsock32/socketwrap.h ¶

@@ -2 +2 @@
 #define __SOCKETWRAP_H__
 
-#include <sys\socket.h>
-#include <sys\ioctl.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <netdb.h>
-#include <netinet\in.h>
-#include <netinet\tcp.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <nerrno.h>
 
@@ -18 +18 @@
 
     return yyrc;
-} 
+}
 
 #undef  accept
@@ -29 +29 @@
     addsockettolist(a);
     SetFS(sel);
-} 
+}
 
 #undef  addsockettolist
@@ -43 +43 @@
 
     return yyrc;
-} 
+}
 
 #undef  bind
@@ -57 +57 @@
 
     return yyrc;
-} 
+}
 
 #undef  connect
@@ -71 +71 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostid
@@ -85 +85 @@
 
     return yyrc;
-} 
+}
 
 #undef  getpeername
@@ -99 +99 @@
 
     return yyrc;
-} 
+}
 
 #undef  getsockname
@@ -113 +113 @@
 
     return yyrc;
-} 
+}
 
 #undef  getsockopt
@@ -127 +127 @@
 
     return yyrc;
-} 
+}
 
 #undef  ioctl
@@ -141 +141 @@
 
     return yyrc;
-} 
+}
 
 #undef  listen
@@ -155 +155 @@
 
     return yyrc;
-} 
+}
 
 #undef  recvmsg
@@ -169 +169 @@
 
     return yyrc;
-} 
+}
 
 #undef  recv
@@ -183 +183 @@
 
     return yyrc;
-} 
+}
 
 #undef  recvfrom
@@ -197 +197 @@
 
     return yyrc;
-} 
+}
 
 #undef  removesocketfromlist
@@ -211 +211 @@
 
     return yyrc;
-} 
+}
 
 #undef  select
@@ -225 +225 @@
 
     return yyrc;
-} 
+}
 
 #undef  send
@@ -239 +239 @@
 
     return yyrc;
-} 
+}
 
 #undef  sendmsg
@@ -253 +253 @@
 
     return yyrc;
-} 
+}
 
 #undef  sendto
@@ -267 +267 @@
 
     return yyrc;
-} 
+}
 
 #undef  setsockopt
@@ -281 +281 @@
 
     return yyrc;
-} 
+}
 
 #undef  sock_init
@@ -295 +295 @@
 
     return yyrc;
-} 
+}
 
 #undef  sock_errno
@@ -306 +306 @@
     psock_errno(a);
     SetFS(sel);
-} 
+}
 
 #undef  psock_errno
@@ -320 +320 @@
 
     return yyrc;
-} 
+}
 
 #undef  socket
@@ -334 +334 @@
 
     return yyrc;
-} 
+}
 
 #undef  soclose
@@ -348 +348 @@
 
     return yyrc;
-} 
+}
 
 #undef  so_cancel
@@ -362 +362 @@
 
     return yyrc;
-} 
+}
 
 #undef  readv
@@ -376 +376 @@
 
     return yyrc;
-} 
+}
 
 #undef  writev
@@ -390 +390 @@
 
     return yyrc;
-} 
+}
 
 #undef  shutdown
@@ -404 +404 @@
 
     return yyrc;
-} 
+}
 
 #undef  Raccept
@@ -418 +418 @@
 
     return yyrc;
-} 
+}
 
 #undef  Rbind
@@ -432 +432 @@
 
     return yyrc;
-} 
+}
 
 #undef  Rconnect
@@ -446 +446 @@
 
     return yyrc;
-} 
+}
 
 #undef  Rgetsockname
@@ -460 +460 @@
 
     return yyrc;
-} 
+}
 
 #undef  Rlisten
@@ -474 +474 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostname
@@ -488 +488 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostbyname
@@ -502 +502 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostbyaddr
@@ -516 +516 @@
 
     return yyrc;
-} 
+}
 
 #undef  getnetbyname
@@ -530 +530 @@
 
     return yyrc;
-} 
+}
 
 #undef  getnetbyaddr
@@ -544 +544 @@
 
     return yyrc;
-} 
+}
 
 #undef  getservbyname
@@ -558 +558 @@
 
     return yyrc;
-} 
+}
 
 #undef  getservbyport
@@ -572 +572 @@
 
     return yyrc;
-} 
+}
 
 #undef  getprotobyname
@@ -586 +586 @@
 
     return yyrc;
-} 
+}
 
 #undef  getprotobynumber
@@ -597 +597 @@
     sethostent(a);
     SetFS(sel);
-} 
+}
 
 #undef  sethostent
@@ -611 +611 @@
 
     return yyrc;
-} 
+}
 
 #undef  gethostent
@@ -622 +622 @@
     endhostent();
     SetFS(sel);
-} 
+}
 
 #undef  endhostent
@@ -633 +633 @@
     setnetent(a);
     SetFS(sel);
-} 
+}
 
 #undef  setnetent
@@ -647 +647 @@
 
     return yyrc;
-} 
+}
 
 #undef  getnetent
@@ -658 +658 @@
     endnetent();
     SetFS(sel);
-} 
+}
 
 #undef  endnetent
@@ -669 +669 @@
     setprotoent(a);
     SetFS(sel);
-} 
+}
 
 #undef  setprotoent
@@ -683 +683 @@
 
     return yyrc;
-} 
+}
 
 #undef  getprotoent
@@ -694 +694 @@
     endprotoent();
     SetFS(sel);
-} 
+}
 
 #undef  endprotoent
@@ -705 +705 @@
     setservent(a);
     SetFS(sel);
-} 
+}
 
 #undef  setservent
@@ -719 +719 @@
 
     return yyrc;
-} 
+}
 
 #undef  getservent
@@ -730 +730 @@
     endservent();
     SetFS(sel);
-} 
+}
 
 #undef  endservent
@@ -744 +744 @@
 
     return yyrc;
-} 
+}
 
 #undef  tcp_h_errno
@@ -758 +758 @@
 
     return yyrc;
-} 
+}
 
 #undef  Rgethostbyname

branches/gcc-kmk/src/wsock32/wsock32.h ¶

@@ -17 +17 @@
 
 #include "socketwrap.h"
-#include <sys\time.h>
+#include <sys/time.h>
 
 #include <odinwrap.h>

branches/gcc-kmk/tools/install/odininst.cpp ¶

@@ -47 +47 @@
 #include "debugtools.h"
 #include <odininst.h>
-#include <win\options.h>
+#include <win/options.h>
 #include <versionos2.h>
 #include <time.h>