Changeset 894 for trunk/src

Timestamp:

Sep 9, 1999, 5:44:24 PM (26 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shell32/new

Files:

• shell32.def (modified) (4 diffs)
• shell32_main.cpp (modified) (4 diffs)
• shlview.cpp (modified) (1 diff)

trunk/src/shell32/new/shell32.def

@@ -1 @@
-; $Id: shell32.def,v 1.2 1999-09-09 11:33:18 phaller Exp $
+; $Id: shell32.def,v 1.3 1999-09-09 15:44:23 phaller Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -36 +36 @@
 ;   SHILCreateFromPath                = _SHILCreateFromPath@12                @28
     PathIsRoot                        = _PathIsRootAW@4                       @29
-    PathBuildRoot                     = _PathBuildRootAW@8                    @30
+    PathBuildRoot                     = _PathBuildRoot@8                      @30
     PathFindExtension                 = _PathFindExtensionAW@4                @31
     PathAddBackslash                  = _PathAddBackslashAW@4                 @32
@@ -51 +51 @@
     PathIsExe                         = _PathIsExeAW@4                        @43
     DoEnvironmentSubstA               = _DoEnvironmentSubstA@8                @44
-    PathFileExists                    = _PathFileExistsAW@4                   @45
+    PathFileExists                    = _PathFileExists@4                     @45
     PathMatchSpec                     = _PathMatchSpecAW@8                    @46
 ;   PathMakeUniqueName                = _PathMakeUniqueNameAW@20              @47
@@ -125 +125 @@
 ;   FileMenu_DeleteItemByCmd          = _FileMenu_DeleteItemByCmd@8           @117
 ;   FileMenu_Destroy                  = _FileMenu_Destroy@4                   @118
-    IsLFNDrive                        = _IsLFNDrive@4                         @119
+    IsLFNDrive                        = _IsLFNDriveA@4                        @119
 ;   FileMenu_AbortInitMenu            = _FileMenu_AbortInitMenu@0             @120
     SHFlushClipboard                  = _SHFlushClipboard@0                   @121

trunk/src/shell32/new/shell32_main.cpp

@@ -302 +302 @@
 }
 
+
 /*************************************************************************
  * ExtractIconA                         [SHELL32.133]
@@ -307 +308 @@
 HICON WINAPI ExtractIconA( HINSTANCE hInstance, LPCSTR lpszExeFileName,
         UINT nIconIndex )
-{   HGLOBAL16 handle = InternalExtractIcon16(hInstance,lpszExeFileName,nIconIndex, 1);
+{
+#if 0
+//@@@PH
+HGLOBAL handle = InternalExtractIconA(hInstance,lpszExeFileName,nIconIndex, 1);
     TRACE_(shell)("\n");
     if( handle )
     {
-        HICON16* ptr = (HICON16*)GlobalLock16(handle);
-        HICON16  hIcon = *ptr;
-
-        GlobalFree16(handle);
+        HICON* ptr = (HICON*)GlobalLock(handle);
+        HICON  hIcon = *ptr;
+
+        GlobalFree(handle);
         return hIcon;
     }
+#endif
     return 0;
 }
@@ -539 +544 @@
     case WM_LBTRACKPOINT:
         hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
-        if( (INT16)GetKeyState16( VK_CONTROL ) < 0 )
+        if( (INT)GetKeyState( VK_CONTROL ) < 0 )
       { if( DragDetect( hWndCtl, *((LPPOINT)&lParam) ) )
         { INT idx = SendMessageA( hWndCtl, LB_GETCURSEL, 0, 0 );
                 if( idx != -1 )
           { INT length = SendMessageA( hWndCtl, LB_GETTEXTLEN, (WPARAM)idx, 0 );
-                    HGLOBAL16 hMemObj = GlobalAlloc16( GMEM_MOVEABLE, length + 1 );
-                    char* pstr = (char*)GlobalLock16( hMemObj );
+                    HGLOBAL hMemObj = GlobalAlloc( GMEM_MOVEABLE, length + 1 );
+                    char* pstr = (char*)GlobalLock( hMemObj );
 
                     if( pstr )
-            { HCURSOR16 hCursor = LoadCursor16( 0, MAKEINTRESOURCE16(OCR_DRAGOBJECT) );
+            { HCURSOR hCursor = LoadCursorA( 0, (LPCSTR)OCR_DRAGOBJECT );
                         SendMessageA( hWndCtl, LB_GETTEXT, (WPARAM)idx, (LPARAM)pstr );
                         SendMessageA( hWndCtl, LB_DELETESTRING, (WPARAM)idx, 0 );
                         UpdateWindow( hWndCtl );
-                        if( !DragObject16((HWND16)hWnd, (HWND16)hWnd, DRAGOBJ_DATA, 0, (WORD)hMemObj, hCursor) )
+   //@@@PH DragObject16 experimentally replaced by DragObject
+                        if( !DragObject(hWnd, hWnd, DRAGOBJ_DATA, hMemObj, hCursor) )
                             SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)pstr );
                     }
             if( hMemObj )
-              GlobalFree16( hMemObj );
+              GlobalFree( hMemObj );
                 }
             }
@@ -585 +591 @@
       { LPDRAGINFO lpDragInfo = (LPDRAGINFO)PTR_SEG_TO_LIN((SEGPTR)lParam);
             if( lpDragInfo && lpDragInfo->wFlags == DRAGOBJ_DATA && lpDragInfo->hList )
-        { char* pstr = (char*)GlobalLock16( (HGLOBAL16)(lpDragInfo->hList) );
+        { char* pstr = (char*)GlobalLock( (HGLOBAL)(lpDragInfo->hList) );
                 if( pstr )
           { static char __appendix_str[] = " with";

trunk/src/shell32/new/shlview.cpp

@@ -27 +27 @@
 #include "wine/obj_dragdrop.h"
 #include "wine/undocshell.h"
+#include "docobj.h"
 #include "shresdef.h"
 #include "spy.h"