Changeset 891 for trunk/src

Timestamp:

Sep 9, 1999, 12:25:54 PM (26 years ago)

Author:

phaller

Message:

Fix: shell32 improvements

Location:

trunk/src/shell32/new

Files:

• makefile (modified) (3 diffs)
• shell.cpp (modified) (3 diffs)
• unknown.cpp (added)

trunk/src/shell32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.5 1999-09-09 10:12:31 phaller Exp $
+# $Id: makefile,v 1.6 1999-09-09 10:25:27 phaller Exp $
 
 #
@@ -27 +27 @@
         shellguid.obj shelllink.obj shlmenu.obj shellole.obj \
         shellord.obj shellpath.obj shv_bg_cmenu.obj \
-        shlfolder.obj shlview.obj shell.obj
+        shlfolder.obj shlview.obj shell.obj unknown.obj
 
 all: $(TARGET).dll $(TARGET).lib
@@ -70 +70 @@
 shlview.obj:      shlview.cpp
 shv_bg_cmenu.obj: shv_bg_cmenu.cpp
-
+unknown.obj:      unknown.cpp
 
 clean:

trunk/src/shell32/new/shell.cpp

@@ -78 +78 @@
 static int SHELL_Attach = 0;
 
-/***********************************************************************
- * SHELL_DllEntryPoint [SHELL.entry]
- *
- * Initialization code for shell.dll. Automatically loads the
- * 32-bit shell32.dll to allow thunking up to 32-bit code.
- *
- * RETURNS:
- */
-BOOL WINAPI SHELL_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst,
-                                WORD ds, WORD HeapSize, DWORD res1, WORD res2)
-{
-    TRACE_(shell)("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n",
-                  Reason, hInst, ds, HeapSize, res1, res2);
-
-    switch(Reason)
-    {
-    case DLL_PROCESS_ATTACH:
-        SHELL_Attach++;
-        if (SHELL_hInstance)
-        {
-            ERR_(shell)("shell.dll instantiated twice!\n");
-            /*
-             * We should return FALSE here, but that will break
-             * most apps that use CreateProcess because we do
-             * not yet support seperate address-spaces.
-             */
-            return TRUE;
-        }
-
-        SHELL_hInstance = hInst;
-        if(!SHELL_hInstance32)
-        {
-            if(!(SHELL_hInstance32 = LoadLibraryA("shell32.dll")))
-            {
-                ERR_(shell)("Could not load sibling shell32.dll\n");
-                return FALSE;
-            }
-        }
-        break;
-
-    case DLL_PROCESS_DETACH:
-        if(!--SHELL_Attach)
-        {
-            SHELL_hInstance = 0;
-            if(SHELL_hInstance32)
-                FreeLibrary(SHELL_hInstance32);
-        }
-        break;
-    }
-    return TRUE;
-}
 
 /*************************************************************************
@@ -244 +193 @@
 }
 
-/*************************************************************************
- *                              DragFinish16            [SHELL.12]
- */
-void WINAPI DragFinish16(HDROP16 h)
-{ TRACE_(shell)("\n");
-    GlobalFree16((HGLOBAL16)h);
-}
-
 
 /*************************************************************************
@@ -267 +208 @@
 
   GlobalUnlock(hDrop);
-  return bRet;
-}
-
-/*************************************************************************
- *                              DragQueryPoint16                [SHELL.13]
- */
-BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p)
-{
-  LPDROPFILESTRUCT16 lpDropFileStruct;
-  BOOL16           bRet;
-  TRACE_(shell)("\n");
-  lpDropFileStruct = (LPDROPFILESTRUCT16) GlobalLock16(hDrop);
-
-  memcpy(p,&lpDropFileStruct->ptMousePos,sizeof(POINT16));
-  bRet = lpDropFileStruct->fInNonClientArea;
-
-  GlobalUnlock16(hDrop);
   return bRet;
 }