Changeset 8256 for trunk/src

Timestamp:

Apr 13, 2002, 8:19:31 AM (23 years ago)

Author:

bird

Message:

Corrected call to GetDriveType. (missing ':')

File:

• trunk/src/user32/pmwindow.cpp (modified) (19 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.171 2002-03-28 11:26:00 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.172 2002-04-13 06:19:31 bird Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -193 +193 @@
 
     fOS2Look = PROFILE_GetOdinIniBool(ODINSYSTEM_SECTION, "OS2Look", FALSE);
-    if(fOS2Look) 
+    if(fOS2Look)
     {
         CHAR szDisplay[30];
@@ -224 +224 @@
 void WIN32API SetWindowAppearance(int fLooks)
 {
-    if(fLooks == OS2_APPEARANCE || fLooks == OS2_APPEARANCE_SYSMENU) 
+    if(fLooks == OS2_APPEARANCE || fLooks == OS2_APPEARANCE_SYSMENU)
     {
         CHAR szDisplay[30];
@@ -231 +231 @@
         SYSCOLOR_Init(FALSE); //use OS/2 colors
 
-        if(hbmFrameMenu[0] == 0) 
+        if(hbmFrameMenu[0] == 0)
         {
             CHAR szDisplay[30];
@@ -282 +282 @@
     case WM_CREATE:
     {
-        char drive[2];
+        char drive[4];
 
         //skip floppy drives
         drive[0] = 'C';
-        drive[1] = 0;
+        drive[1] = ':';
+        drive[2] = '\0';
 
         for(int i=2;i<26;i++) {
            drives[i] = GetDriveTypeA(drive);
-           if(drives[i] == DRIVE_CDROM_W) 
+           if(drives[i] == DRIVE_CDROM_W)
            {
                 DWORD parsize = sizeof(ParameterBlock);
@@ -322 +323 @@
     case WM_TIMER:
     {
-        for(int i=0;i<26;i++) 
+        for(int i=0;i<26;i++)
         {
             //for now only cdrom/dvd drives
-            if(drives[i] == DRIVE_CDROM_W) 
+            if(drives[i] == DRIVE_CDROM_W)
             {
                 DWORD parsize = sizeof(ParameterBlock);
@@ -342 +343 @@
                 }
                 //Send WM_DEVICECHANGE message when CD status changes
-                if((status & 4) != drivestatus[i]) 
+                if((status & 4) != drivestatus[i])
                 {
                     PID pidThis, pidTemp;
@@ -358 +359 @@
 
                     WinQueryWindowProcess(hwnd, &pidThis, NULL);
-  
+
                     //Iterate over all child windows of the desktop
                     henum = WinBeginEnumWindows(HWND_DESKTOP);
 
-                    SetWin32TIB();   
+                    SetWin32TIB();
                     while(hwndEnum = WinGetNextWindow(henum))
                     {
@@ -370 +371 @@
                             HWND hwndWin32 = OS2ToWin32Handle(hwndEnum);
                             if(hwndWin32) {
-                                SendMessageA(hwndWin32, 
-                                             WM_DEVICECHANGE_W, 
-                                             (status & 4) ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, 
+                                SendMessageA(hwndWin32,
+                                             WM_DEVICECHANGE_W,
+                                             (status & 4) ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE,
                                              (LPARAM)&volchange);
                             }
@@ -691 +692 @@
         win32wnd->DispatchMsgA(pWinMsg);
         break;
-      
+
     case WM_CHAR_SPECIAL:
       /* NO BREAK! FALLTHRU CASE! */
-      
+
     case WM_CHAR:
         dprintf(("OS2: WM_CHAR %x %x %x, %x %x", win32wnd->getWindowHandle(), mp1, mp2, pWinMsg->wParam, pWinMsg->lParam));
@@ -1054 +1055 @@
         win32wnd->MsgPosChanging((LPARAM)&wp);
 
-        if(win32wnd->getOldStyle() != win32wnd->getStyle()) 
+        if(win32wnd->getOldStyle() != win32wnd->getStyle())
         {
              OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), win32wnd->getStyle(), win32wnd->getExStyle());
@@ -1126 +1127 @@
 adjustend:
         //The next part needs to be done for top-level windows only
-        if(!((win32wnd->getStyle() & (WS_POPUP_W|WS_CHILD_W)) == WS_CHILD_W)) 
+        if(!((win32wnd->getStyle() & (WS_POPUP_W|WS_CHILD_W)) == WS_CHILD_W))
         {
             //Setting these flags is necessary to avoid activation/focus problems
@@ -1132 +1133 @@
                 ret |= AWP_DEACTIVATE;
             }
-            if(ulFlags & SWP_ACTIVATE) 
+            if(ulFlags & SWP_ACTIVATE)
             {
                 if(ulFlags & SWP_ZORDER) {
@@ -1151 +1152 @@
         }
         else {
-            if(ulFlags & (SWP_ACTIVATE|SWP_FOCUSACTIVATE)) 
+            if(ulFlags & (SWP_ACTIVATE|SWP_FOCUSACTIVATE))
             {
                 win32wnd->MsgChildActivate(TRUE);
@@ -1159 +1160 @@
                 }
             }
-            else 
-            if(ulFlags & (SWP_DEACTIVATE|SWP_FOCUSDEACTIVATE)) 
+            else
+            if(ulFlags & (SWP_DEACTIVATE|SWP_FOCUSDEACTIVATE))
             {
                 win32wnd->MsgChildActivate(FALSE);
@@ -1193 +1194 @@
             win32wnd->callVisibleRgnNotifyProc(TRUE);
         }
-        else 
+        else
         if(pswp->fl & SWP_HIDE) {
             win32wnd->callVisibleRgnNotifyProc(FALSE);
@@ -1210 +1211 @@
             if(pswp->fl & SWP_HIDE) {
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
-            } 
+            }
             //MUST call the old frame window proc!
             goto RunDefFrameWndProc;
@@ -1547 +1548 @@
                 if(win32wnd->getOwner()) {
                     Win32BaseWindow *topOwner = Win32BaseWindow::GetWindowFromHandle(win32wnd->getOwner()->GetTopParent());
- 
+
                     if (topOwner) {
                         WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
@@ -1739 +1740 @@
     WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags);
 }
-#ifndef CUSTOM_TRACKFRAME 
+#ifndef CUSTOM_TRACKFRAME
 //******************************************************************************
 //TODO: Quickly moving a window two times doesn't force a repaint (1st time)