Changeset 19095

Timestamp:

Jun 2, 2002, 12:08:10 PM (23 years ago)

Author:

sandervl

Message:

moved drag 'n drop code to seperate file; minor updates

Location:

tags/trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• dbglocal.cpp (modified) (2 diffs)
• dbglocal.h (modified) (2 diffs)
• dragdrop.cpp (added)
• dragdrop.h (added)
• menu.cpp (modified) (5 diffs)
• pmwindow.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)
• windlg.cpp (modified) (8 diffs)

tags/trunk/src/user32/Makefile ¶

@@ -1 @@
-# $Id: Makefile,v 1.102 2002-03-08 11:09:14 sandervl Exp $
+# $Id: Makefile,v 1.103 2002-06-02 10:07:56 sandervl Exp $
 
 #
@@ -108 +108 @@
 $(OBJDIR)\user32rsrc.obj \
 $(OBJDIR)\oslibprf.obj \
+$(OBJDIR)\dragdrop.obj \
 !ifdef DEBUG
 $(OBJDIR)\dbgwrap.obj \

tags/trunk/src/user32/dbglocal.cpp ¶

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.11 2002-02-12 12:00:02 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.12 2002-06-02 10:07:57 sandervl Exp $ */
 
 /*
@@ -93 +93 @@
 "property",
 "rect",
-"paint"
+"paint",
+"dragdrop"
 };
 //******************************************************************************

tags/trunk/src/user32/dbglocal.h ¶

@@ -1 @@
-/* $Id: dbglocal.h,v 1.9 2002-02-11 16:46:00 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.10 2002-06-02 10:07:57 sandervl Exp $ */
 
 /*
@@ -93 +93 @@
 #define DBG_rect                 71
 #define DBG_paint                72
-#define DBG_MAXFILES             73
+#define DBG_dragdrop             73
+#define DBG_MAXFILES             74
 
 extern USHORT DbgEnabledUSER32[DBG_MAXFILES];

tags/trunk/src/user32/menu.cpp ¶

@@ -1 @@
-/* $Id: menu.cpp,v 1.46 2002-05-23 13:49:41 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.47 2002-06-02 10:07:57 sandervl Exp $*/
 /*
  * Menu functions
@@ -4281 +4281 @@
 
     if (!hrsrc) return 0;
-    return LoadMenuIndirectA( (MENUITEMTEMPLATEHEADER*)LoadResource( instance, hrsrc ));
+    return LoadMenuIndirectA( (LPCVOID)LoadResource( instance, hrsrc ));
 }
 
@@ -4295 +4295 @@
 
     if (!hrsrc) return 0;
-    return LoadMenuIndirectW( (MENUITEMTEMPLATEHEADER*)LoadResource( instance, hrsrc ));
+    return LoadMenuIndirectW( (LPCVOID)LoadResource( instance, hrsrc ));
 }
 
@@ -4302 +4302 @@
  *          LoadMenuIndirect32A    (USER32.371)
  */
-HMENU WINAPI LoadMenuIndirectA(CONST MENUITEMTEMPLATEHEADER *lpMenuTemplate)
+HMENU WINAPI LoadMenuIndirectA(LPCVOID lpMenuTemplate)
 {
     HMENU hMenu;
@@ -4345 +4345 @@
  *          LoadMenuIndirect32W    (USER32.372)
  */
-HMENU WINAPI LoadMenuIndirectW(CONST MENUITEMTEMPLATEHEADER *lpMenuTemplate )
+HMENU WINAPI LoadMenuIndirectW(LPCVOID lpMenuTemplate )
 {
     dprintf(("USER32: LoadMenuIndirectW"));

tags/trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.174 2002-06-01 17:26:30 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.175 2002-06-02 10:07:57 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -51 +51 @@
 #include <winscan.h>
 #include <win\dbt.h>
+#include "dragdrop.h"
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -796 +797 @@
 
         //does this window accept dropped files?
-        if(!win32wnd->AcceptsDropFiles()) {
+        if(!DragDropAccept(win32wnd->getWindowHandle())) {
                 rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
             break;
@@ -889 +890 @@
 
         //does this window accept dropped files?
-        if(!win32wnd->AcceptsDropFiles()) {
+        if(!DragDropAccept(win32wnd->getWindowHandle())) {
             rc = 0;
             break;
@@ -943 +944 @@
         }
         POINT point = {sxDrop, syDrop};
-        win32wnd->MsgDropFiles(cItems, point, pszFiles, bufsize);
+        DragDropFiles(win32wnd->getWindowHandle(), cItems, point, pszFiles, bufsize);
         free(pszFiles);
 

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.325 2002-06-01 17:26:31 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.326 2002-06-02 10:07:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1268 +1268 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32BaseWindow::MsgDropFiles(UINT cFiles, POINT point, LPSTR pszFiles, UINT cbszFiles, BOOL fNonClient)
-{
-    DROPFILES *pDropFile;
-    HGLOBAL    hDropFile;
-    HWND       hwnd;
-
-    hwnd = (getExStyle() & WS_EX_ACCEPTFILES) ? getWindowHandle() : ::GetParent(getWindowHandle());
-    cbszFiles++;    //extra terminating 0
-
-    if(::IsWindowUnicode(hwnd)) {
-        dprintf(("unicode dropfiles"));
-        cbszFiles *= 2;
-    }
-
-    hDropFile = GlobalAlloc(0, sizeof(DROPFILES)+cbszFiles);
-    pDropFile = (DROPFILES *)GlobalLock(hDropFile);
-    if(pDropFile == NULL) {
-        DebugInt3();
-        return 0;
-    }
-    pDropFile->pFiles = sizeof(DROPFILES);
-    pDropFile->fNC    = fNonClient;
-    pDropFile->fWide  = ::IsWindowUnicode(hwnd);
-    pDropFile->pt     = point;
-    if(::IsWindowUnicode(hwnd)) {
-        LPWSTR lpszFilesW = (LPWSTR)(pDropFile+1);
-        while(*pszFiles) {
-            int len = strlen(pszFiles);
-            MultiByteToWideChar(CP_ACP, 0, pszFiles, -1, lpszFilesW, len);
-            pszFiles   += len + 1;
-            lpszFilesW += len + 1;
-        }
-        *lpszFilesW = 0;
-    }
-    else {
-        //copy strings (excluding terminating 0)
-        memcpy((pDropFile+1), pszFiles, cbszFiles-1);
-    }
-    GlobalUnlock(hDropFile);
-    ::SendMessageA(hwnd, WM_DROPFILES, hDropFile, 0);
-    return 0;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32BaseWindow::AcceptsDropFiles()
-{
-    //Is it correct if the window or parent accepts files or must we check the topparent parent?
-    if(getExStyle() & WS_EX_ACCEPTFILES) {
-        return TRUE;
-    }
-    DWORD dwStyle = GetWindowLongA(::GetParent(getWindowHandle()), GWL_EXSTYLE);
-    if(!(dwStyle & WS_EX_ACCEPTFILES)) {
-        return FALSE;
-    }
-    return TRUE;
-}
-//******************************************************************************
-//******************************************************************************
 ULONG Win32BaseWindow::MsgChar(MSG *msg)
 {

tags/trunk/src/user32/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.141 2002-06-01 17:26:32 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.142 2002-06-02 10:07:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -159 +159 @@
          ULONG  DispatchMsgA(MSG *msg);
          ULONG  DispatchMsgW(MSG *msg);
-
-         ULONG  MsgDropFiles(UINT cFiles, POINT point, LPSTR pszFiles, UINT cbszFiles, BOOL fNonClient = FALSE);
-         BOOL   AcceptsDropFiles();
 
          ULONG  MsgSetText(LPSTR lpsz, LONG cch);

tags/trunk/src/user32/windlg.cpp ¶

@@ -1 @@
-/* $Id: windlg.cpp,v 1.32 2002-03-28 16:20:07 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.33 2002-06-02 10:07:59 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -68 +68 @@
 //******************************************************************************
 HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hInst,
-                         LPCDLGTEMPLATEA dlgtemplate,
+                         LPCVOID dlgtemplate,
                          HWND hwndOwner, DLGPROC dlgproc,
                          LPARAM lParamInit)
@@ -101 +101 @@
 //******************************************************************************
 HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hInst,
-                         LPCDLGTEMPLATEW dlgtemplate,
+                         LPCVOID dlgtemplate,
                          HWND hwndOwner, DLGPROC dlgproc,
                          LPARAM lParamInit)
@@ -135 +135 @@
 //******************************************************************************
 INT  WIN32API DialogBoxIndirectParamA(HINSTANCE hInst,
-                      LPCDLGTEMPLATEA dlgtemplate,
+                      LPCVOID dlgtemplate,
                       HWND hwndOwner, DLGPROC dlgproc,
                       LPARAM lParamInit)
@@ -161 +161 @@
 //******************************************************************************
 //******************************************************************************
-INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hInst, LPCDLGTEMPLATEW dlgtemplate,
+INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hInst, LPCVOID dlgtemplate,
                                       HWND hwndOwner, DLGPROC dlgproc,
                                       LPARAM lParamInit)
@@ -260 +260 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API IsDlgButtonChecked( HWND hwnd, UINT id)
+UINT WIN32API IsDlgButtonChecked( HWND hwnd, UINT id)
 {
     dprintf(("USER32:  IsDlgButtonChecked\n"));
@@ -477 +477 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetDlgItemTextA(HWND hwnd, int id, LPSTR lpszName, UINT cch)
+INT WIN32API GetDlgItemTextA(HWND hwnd, int id, LPSTR lpszName, UINT cch)
 {
     return SendDlgItemMessageA( hwnd, id, WM_GETTEXT, cch, (LPARAM)lpszName);
@@ -483 +483 @@
 //*****************************************************************************
 //*****************************************************************************
-UINT WIN32API GetDlgItemTextW(HWND   hwnd, int id, LPWSTR lpszName, UINT cch)
+INT WIN32API GetDlgItemTextW(HWND   hwnd, int id, LPWSTR lpszName, UINT cch)
 {
     return SendDlgItemMessageW( hwnd, id, WM_GETTEXT, cch, (LPARAM)lpszName);