Changeset 21916 for trunk/src/comdlg32

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/comdlg32/Makefile.kmk (copied) (copied from branches/gcc-kmk/src/comdlg32/Makefile.kmk )
• src/comdlg32/cdlg.h (modified) (2 diffs)
• src/comdlg32/colordlg.c (modified) (2 diffs)
• src/comdlg32/comdlg32.def (modified) (1 diff)
• src/comdlg32/filedlg.c (modified) (46 diffs)
• src/comdlg32/filedlg95.c (modified) (88 diffs)
• src/comdlg32/filedlgbrowser.c (modified) (2 diffs)
• src/comdlg32/fontdlg.c (modified) (4 diffs)
• src/comdlg32/initcomdlg32.cpp (deleted)
• src/comdlg32/initterm.cpp (copied) (copied from branches/gcc-kmk/src/comdlg32/initterm.cpp )
• src/comdlg32/makefile (deleted)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/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);

trunk/src/comdlg32/colordlg.c

@@ -9 +9 @@
    sometimes, especially when 2 instances of the
    dialog are loaded at the same time */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef __WIN32OS2__
@@ -19 +24 @@
 #endif
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "windef.h"
 #include "winbase.h"

trunk/src/comdlg32/comdlg32.def

@@ -9 +9 @@
 
 EXPORTS
-    ChooseColorA               = _ChooseColorA@4             @101
-    ChooseColorW               = _ChooseColorW@4             @102
-    ChooseFontA                = _ChooseFontA@4              @103
-    ChooseFontW                = _ChooseFontW@4              @104
-    CommDlgExtendedError       = _CommDlgExtendedError@0     @105
-    FindTextA                  = _FindTextA@4                @106
-    FindTextW                  = _FindTextW@4                @107
-    GetFileTitleA              = _GetFileTitleA@12           @108
-    GetFileTitleW              = _GetFileTitleW@12           @109
-    GetOpenFileNameA           = _GetOpenFileNameA@4         @110
-    GetOpenFileNameW           = _GetOpenFileNameW@4         @111
-    GetSaveFileNameA           = _GetSaveFileNameA@4         @112
-    GetSaveFileNameW           = _GetSaveFileNameW@4         @113
+    ChooseColorA               = "_ChooseColorA@4"           @101
+    ChooseColorW               = "_ChooseColorW@4"           @102
+    ChooseFontA                = "_ChooseFontA@4"            @103
+    ChooseFontW                = "_ChooseFontW@4"            @104
+    CommDlgExtendedError       = "_CommDlgExtendedError@0"   @105
+    FindTextA                  = "_FindTextA@4"              @106
+    FindTextW                  = "_FindTextW@4"              @107
+    GetFileTitleA              = "_GetFileTitleA@12"         @108
+    GetFileTitleW              = "_GetFileTitleW@12"         @109
+    GetOpenFileNameA           = "_GetOpenFileNameA@4"       @110
+    GetOpenFileNameW           = "_GetOpenFileNameW@4"       @111
+    GetSaveFileNameA           = "_GetSaveFileNameA@4"       @112
+    GetSaveFileNameW           = "_GetSaveFileNameW@4"       @113
 ;   LoadAlterBitmap                      @114
-    PageSetupDlgA              = _PageSetupDlgA@4            @115
-    PageSetupDlgW              = _PageSetupDlgW@4            @116
-    PrintDlgA                  = _PrintDlgA@4                @117
-    PrintDlgW                  = _PrintDlgW@4                @118
-    ReplaceTextA               = _ReplaceTextA@4             @119
-    ReplaceTextW               = _ReplaceTextW@4             @120
+    PageSetupDlgA              = "_PageSetupDlgA@4"          @115
+    PageSetupDlgW              = "_PageSetupDlgW@4"          @116
+    PrintDlgA                  = "_PrintDlgA@4"              @117
+    PrintDlgW                  = "_PrintDlgW@4"              @118
+    ReplaceTextA               = "_ReplaceTextA@4"           @119
+    ReplaceTextW               = "_ReplaceTextW@4"           @120
 ;   WantArrows                           @121
 ;   dwLBSubclass                         @122

trunk/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
     {

trunk/src/comdlg32/filedlg95.c

@@ -34 +34 @@
  *
  */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #ifdef __WIN32OS2__
 #include <windef.h>
@@ -41 +47 @@
 #include <heapstring.h>
 #include <misc.h>
-#include <win\shlwapi.h>
+#include <win/shlwapi.h>
 
 #define MapHModuleSL(a) a
@@ -47 +53 @@
 #define snprintf  wsnprintfA
 #endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "winbase.h"
@@ -86 +87 @@
   HIMAGELIST hImgList;
   int m_iIndent;      /* Indentation index */
-  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */ 
+  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */
 
 } SFOLDER,*LPSFOLDER;
@@ -216 +217 @@
  *      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 +252 @@
         return FALSE;
     }
-    
+
     /* old style hook messages */
     if (IsHooked(fodInfos))
@@ -260 +261 @@
       fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
     }
-    
+
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
@@ -270 +271 @@
     if( lRes == -1)
         return FALSE;
-    
+
     return lRes;
 }
@@ -291 +292 @@
   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 +317 @@
   fodInfos->DlgInfos.dwDlgProp = 0;
   fodInfos->DlgInfos.hwndCustomDlg = (HWND)NULL;
-  
+
   switch(iDlgType)
   {
@@ -400 +401 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
-  
+
   /* out arguments */
   LPWSTR lpstrFile = NULL;
@@ -437 +438 @@
     /* filter is a list...  title\0ext\0......\0\0 */
     s = ofn->lpstrFilter;
-    
+
     while (*s) s = s+strlenW(s)+1;
     s++;
@@ -528 +529 @@
   }
 #endif
-      
+
   /* restore saved IN arguments and convert OUT arguments back */
   ofn->Flags = dwFlags;
@@ -613 +614 @@
     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 +634 @@
           GetWindowRect(hwndChild,&rectCtrl);
           MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
-                                  
+
           /*
             Check the initial position of the controls relative to the initial
@@ -651 +652 @@
             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 +660 @@
     }
     hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
-        
+
     if(hwndStc32)
     {
@@ -680 +681 @@
             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 +702 @@
     {
       case WM_INITDIALOG:
-      {         
+      {
         fodInfos = (FileOpenDlgInfos *)lParam;
         lParam = (LPARAM) fodInfos->ofnInfos;
@@ -708 +709 @@
         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 +758 @@
       if(hChildDlg)
       {
-        ShowWindow(hChildDlg,SW_SHOW); 
+        ShowWindow(hChildDlg,SW_SHOW);
         return hChildDlg;
       }
@@ -773 +774 @@
       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 +831 @@
             GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
             lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
-            if (lpstrFileSpec==lpstrPath) 
+            if (lpstrFileSpec==lpstrPath)
             {
                 char lpstrCurrentDir[MAX_PATH];
@@ -838 +839 @@
                     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 +873 @@
     return TRUE;
 }
- 
+
 /***********************************************************************
  *          FileOpenDlgProc95
@@ -883 +884 @@
   TRACE("0x%04x 0x%04x\n", hwnd, uMsg);
 #endif
-  
+
   switch(uMsg)
   {
@@ -890 +891 @@
          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 +918 @@
       }
       return FALSE;
-          
+
     case WM_GETISHELLBROWSER:
       return FILEDLG95_OnWMGetIShellBrowser(hwnd);
@@ -933 +934 @@
         if(TTN_GETDISPINFOA == lpnmh->code )
         {
-            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam; 
+            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
             switch(lpnmh->idFrom )
             {
@@ -959 +960 @@
                     stringId = 0;
             }
-            lpdi->hinst = COMMDLG_hInstance32; 
+            lpdi->hinst = COMMDLG_hInstance32;
             lpdi->lpszText =  (LPSTR) stringId;
         }
@@ -995 +996 @@
    { COMDLG32_hInstance, 800 }                  // desktop icon
   };
-  
+
   RECT rectTB;
-  
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
@@ -1011 +1012 @@
   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 +1028 @@
 
   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 +1068 @@
      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 +1077 @@
     /* 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 +1103 @@
   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 +1113 @@
 
   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 +1175 @@
    fodInfos->ofnInfos->lpstrInitialDir = NULL;
    HEAP_free(dopstr);
-  }  
+  }
 #endif
   return TRUE;
@@ -1261 +1262 @@
   /* Do not use the listview selection anymore */
   fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
-  return 0; 
+  return 0;
 }
 
@@ -1278 +1279 @@
   SetWindowLongA(hwnd,DWL_MSGRESULT,(LONG)fodInfos->Shell.FOIShellBrowser);
 
-  return TRUE; 
+  return TRUE;
 }
 
@@ -1284 +1285 @@
 /***********************************************************************
  *      FILEDLG95_OnOpenMultipleFiles
- *      
+ *
  * Handles the opening of multiple files.
  *
@@ -1301 +1302 @@
   lpstrFile = fodInfos->ofnInfos->lpstrFile;
   lpstrFile[0] = '\0';
-  
+
   SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
 
@@ -1307 +1308 @@
       ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST))
   {
-    LPSTR lpstrTemp = lpstrFileList; 
+    LPSTR lpstrTemp = lpstrFileList;
 
     for ( nCount = 0; nCount < nFileCount; nCount++ )
@@ -1332 +1333 @@
         return FALSE;
       }
-  
+
       /* move to the next file in the list of files */
       lpstrTemp += strlen(lpstrTemp) + 1;
@@ -1355 +1356 @@
  *
  * Ok button WM_COMMAND message handler
- * 
+ *
  * If the function succeeds, the return value is nonzero.
  */
@@ -1396 +1397 @@
       return FALSE;
   }
- 
+
   if(nFileCount > 1)
   {
@@ -1455 +1456 @@
   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 +1658 @@
         {
           LPSTR lpszTemp;
-          
+
           /* fill destination buffer */
           strcpy(fodInfos->ofnInfos->lpstrFile, lpstrPathAndFile);
@@ -1667 +1668 @@
           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 +1696 @@
             }
           }
-          
+
           TRACE("close\n");
           FILEDLG95_Clean(hwnd);
@@ -1728 +1729 @@
 
   /*
-   * Initialisation of the FileOpenDialogInfos structure 
+   * Initialisation of the FileOpenDialogInfos structure
    */
 
@@ -1739 +1740 @@
   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 +1750 @@
 
   /* Construct the IShellBrowser interface */
-  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);  
-    
+  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
+
   return NOERROR;
 }
@@ -1817 +1818 @@
   LPITEMIDLIST pidl;
   HRESULT hres;
-  
+
   TRACE("\n");
 
@@ -1850 +1851 @@
  *      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 +1867 @@
     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 +1884 @@
       strcpy(lpstrExt,lpstrPos);
       lpstrPos += strlen(lpstrPos) + 1;
-            
+
       /* Add the item at the end of the combo */
       CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
@@ -1894 +1895 @@
      * FIXME: lpstrCustomFilter not handled at all
      */
-  
+
     /* set default filter index */
     if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
@@ -1902 +1903 @@
     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 +1912 @@
 
     if ((INT)lpstrFilter == CB_ERR)  /* control is empty */
-      lpstrFilter = NULL;       
+      lpstrFilter = NULL;
 
     if(lpstrFilter)
@@ -2020 +2021 @@
 
 }
-    
+
 /***********************************************************************
  *      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 +2128 @@
   {
     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 +2165 @@
     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 +2192 @@
   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 +2226 @@
     {
       LPSFOLDER tmpFolder;
-      int iItem; 
+      int iItem;
 
       iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB);
@@ -2242 +2243 @@
       break;
     }
-      
+
   }
   return FALSE;
@@ -2267 +2268 @@
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
-    
+
   tmpFolder = MemAlloc(sizeof(SFOLDER));
   tmpFolder->m_iIndent = 0;
@@ -2282 +2283 @@
   if(tmpFolder->m_iIndent > liInfos->iMaxIndentation)
     liInfos->iMaxIndentation = tmpFolder->m_iIndent;
-  
+
   sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
   SHGetFileInfoA((LPSTR)pidl,
@@ -2288 +2289 @@
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX 
+                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
@@ -2296 +2297 @@
   {
     int iItemID;
-  
+
     TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
 
@@ -2322 +2323 @@
  *      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 +2382 @@
     }
   }
-  
+
   CBSetCurSel(hwnd,iItemPos);
   liInfos->uSelectedItem = iItemPos;
@@ -2503 +2504 @@
       {
         pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 );
-    
+
         if (pidl)
         {
@@ -2576 +2577 @@
         {
           case STRRET_WSTR:
-            WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
-            COMDLG32_SHFree(src->u.pOleStr);
+            WideCharToMultiByte(CP_ACP, 0, src->DUMMYUNIONNAME_DOT pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
+            COMDLG32_SHFree(src->DUMMYUNIONNAME_DOT pOleStr);
             break;
 
           case STRRET_CSTR:
-            lstrcpynA((LPSTR)dest, src->u.cStr, len);
+            lstrcpynA((LPSTR)dest, src->DUMMYUNIONNAME_DOT cStr, len);
             break;
 
           case STRRET_OFFSET:
-            lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+            lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->DUMMYUNIONNAME_DOT uOffset, len);
             break;
 
@@ -2621 +2622 @@
 
         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 +2643 @@
             (*sizeUsed)++;
             nFileCount++;
-          } 
+          }
           nStrCharCount++;
         }
@@ -2689 +2690 @@
       else
       {
-        GlobalUnlock(medium.u.hGlobal);
-        GlobalFree(medium.u.hGlobal);
+        GlobalUnlock(medium.DUMMYUNIONNAME_DOT hGlobal);
+        GlobalFree(medium.DUMMYUNIONNAME_DOT hGlobal);
       }
 }
@@ -2703 +2704 @@
 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);
@@ -2716 +2717 @@
     if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium)))
     {
-      LPIDA cida = GlobalLock(medium.u.hGlobal);
+      LPIDA cida = GlobalLock(medium.DUMMYUNIONNAME_DOT hGlobal);
       if(nPidlIndex <= cida->cidl)
       {
@@ -2748 +2749 @@
     if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium)))
     {
-      LPIDA cida = GlobalLock(medium.u.hGlobal);
+      LPIDA cida = GlobalLock(medium.DUMMYUNIONNAME_DOT hGlobal);
       retVal = cida->cidl;
       COMCTL32_ReleaseStgMedium(medium);
@@ -2763 +2764 @@
  *      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 +2798 @@
  *      GetShellFolderFromPidl
  *
- * pidlRel is the item pidl relative 
+ * pidlRel is the item pidl relative
  * Return the IShellFolder of the absolute pidl
  */
@@ -2833 +2834 @@
 
   TRACE("%p\n", pidl);
-  
+
   pidlParent = COMDLG32_PIDL_ILClone(pidl);
   COMDLG32_PIDL_ILRemoveLastID(pidlParent);
-     
+
   return pidlParent;
 }
@@ -2843 +2844 @@
  *      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 +2858 @@
   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 +2868 @@
   else
   {
-    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL); 
+    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL);
   }
   return pidl;
@@ -2878 +2879 @@
         ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
         HRESULT ret;
-        
+
         TRACE("%p, %p\n", psf, pidl);
 
@@ -2919 +2920 @@
 
   return bBrowseSelFolder;
-} 
+}
 
 /*

trunk/src/comdlg32/filedlgbrowser.c

@@ -103 +103 @@
         {
           case STRRET_WSTR:
-            lstrcpynW((LPWSTR)dest, src->u.pOleStr, len);
-            COMDLG32_SHFree(src->u.pOleStr);
+            lstrcpynW((LPWSTR)dest, src->DUMMYUNIONNAME_DOT pOleStr, len);
+            COMDLG32_SHFree(src->DUMMYUNIONNAME_DOT pOleStr);
             break;
 
           case STRRET_CSTR:
-            if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, (LPWSTR)dest, len ))
+            if (len && !MultiByteToWideChar( CP_ACP, 0, src->DUMMYUNIONNAME_DOT cStr, -1, (LPWSTR)dest, len ))
                 ((LPWSTR)dest)[len-1] = 0;
             break;
@@ -115 +115 @@
             if (pidl)
             {
-                if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset,
+                if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->DUMMYUNIONNAME_DOT uOffset,
                                                  -1, (LPWSTR)dest, len ))
                     ((LPWSTR)dest)[len-1] = 0;

trunk/src/comdlg32/fontdlg.c

@@ -5 +5 @@
  * Copyright 1996 Albrecht Kleine
  */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef __WIN32OS2__
@@ -15 +20 @@
 #endif
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "windef.h"
 #include "winbase.h"
@@ -573 +574 @@
     s.hWnd1=GetDlgItem(hDlg,cmb1);
     s.lpcf32a=lpcf;
-    if (!EnumFontFamiliesA(hdc, NULL, FontFamilyEnumProc, (LPARAM)&s))
+    if (!EnumFontFamiliesA(hdc, NULL, (FONTENUMPROCA)FontFamilyEnumProc, (LPARAM)&s))
       TRACE("EnumFontFamilies returns 0\n");
     if (lpcf->Flags & CF_INITTOLOGFONTSTRUCT)
@@ -806 +807 @@
                         s.hWnd2=GetDlgItem(hDlg, cmb3);
                         s.lpcf32a=lpcf;
-                        EnumFontFamiliesA(hdc, str, FontStyleEnumProc, (LPARAM)&s);
+                        EnumFontFamiliesA(hdc, str, (FONTENUMPROCW)FontStyleEnumProc, (LPARAM)&s);
                         SetCursor(hcursor);
                       }

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk