Changeset 3544 for trunk/src


Ignore:
Timestamp:
May 16, 2000, 10:00:13 PM (25 years ago)
Author:
sandervl
Message:

import directly from dlls; not dynamically -> fixes crash due to recent shlwapi changes

Location:
trunk/src/comdlg32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/comdlg32/cdlg.h

    r2607 r3544  
    1 /* $Id: cdlg.h,v 1.4 2000-02-03 13:27:36 sandervl Exp $ */
     1/* $Id: cdlg.h,v 1.5 2000-05-16 20:00:13 sandervl Exp $ */
    22/*
    33 *  Common Dialog Boxes interface (32 bit)
    … …  
    9393
    9494/* DPA */
     95#ifdef __WIN32OS2__
     96#include <win\shell.h>
     97
     98#define COMDLG32_DPA_Create             DPA_Create
     99#define COMDLG32_DPA_GetPtr             DPA_GetPtr
     100#define COMDLG32_DPA_DeleteAllPtrs      DPA_DeleteAllPtrs
     101#define COMDLG32_DPA_DeletePtr          DPA_DeletePtr
     102#define COMDLG32_DPA_InsertPtr          DPA_InsertPtr
     103#define COMDLG32_DPA_Destroy            DPA_Destroy
     104
     105#define COMDLG32_ImageList_GetIcon      ImageList_GetIcon
     106#define COMDLG32_ImageList_LoadImageA   ImageList_LoadImageA
     107#define COMDLG32_ImageList_Draw         ImageList_Draw
     108#define COMDLG32_ImageList_Destroy      ImageList_Destroy
     109
     110/* ITEMIDLIST */
     111
     112LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST pidl);
     113LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
     114LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl);
     115BOOL         WINAPI ILRemoveLastID(LPCITEMIDLIST pidl);
     116BOOL         WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
     117
     118#define COMDLG32_PIDL_ILClone           ILClone
     119#define COMDLG32_PIDL_ILCombine         ILCombine
     120#define COMDLG32_PIDL_ILGetNext         ILGetNext
     121#define COMDLG32_PIDL_ILRemoveLastID    ILRemoveLastID
     122#define COMDLG32_PIDL_ILIsEqual         ILIsEqual
     123
     124/* SHELL */
     125#define COMDLG32_SHGetPathFromIDListA   SHGetPathFromIDListA
     126#define COMDLG32_SHGetSpecialFolderLocation     SHGetSpecialFolderLocation
     127#define COMDLG32_SHGetDesktopFolder     SHGetDesktopFolder
     128#define COMDLG32_SHGetFileInfoA         SHGetFileInfoA
     129#define COMDLG32_SHFree                 SHFree
     130
     131DWORD WINAPI PathRemoveFileSpecA(LPSTR fn);
     132BOOL  WINAPI PathMatchSpecW(LPCWSTR name, LPCWSTR mask);
     133
     134/* PATH */
     135#define COMDLG32_PathIsRootA            PathIsRootA
     136#define COMDLG32_PathFindFilenameA      PathFindFilenameA
     137#define COMDLG32_PathRemoveFileSpecA    PathRemoveFileSpecA
     138#define COMDLG32_PathMatchSpecW         PathMatchSpecW
     139#define COMDLG32_PathAddBackslashA      PathAddBackslashA
     140
     141#else
    95142extern HDPA     (* WINAPI COMDLG32_DPA_Create) (INT); 
    96143extern LPVOID   (* WINAPI COMDLG32_DPA_GetPtr) (const HDPA, INT);   
    … …  
    129176#endif
    130177
     178#endif
     179

  • trunk/src/comdlg32/cdlg32.cpp

    r1785 r3544  
    1 /* $Id: cdlg32.cpp,v 1.4 1999-11-20 16:00:14 achimha Exp $ */
     1/* $Id: cdlg32.cpp,v 1.5 2000-05-16 20:00:13 sandervl Exp $ */
    22/*
    33 *  Common Dialog Boxes interface (32 bit)
    … …  
    2929
    3030HINSTANCE       COMCTL32_hInstance = 0;
     31
     32#ifndef __WIN32OS2__
    3133HINSTANCE       SHELL32_hInstance = 0;
    3234HINSTANCE       SHLWAPI_hInstance = 0;
    … …  
    6668BOOL (WINAPI *COMDLG32_PathMatchSpecW)(LPCWSTR x, LPCWSTR y);
    6769LPSTR (WINAPI *COMDLG32_PathAddBackslashA)(LPSTR path);
     70#endif
    6871
    6972/***********************************************************************
    … …  
    104107                }
    105108
     109#ifndef __WIN32OS2__
    106110                COMCTL32_hInstance = LoadLibraryA("COMCTL32.DLL");     
    107111                SHELL32_hInstance = LoadLibraryA("SHELL32.DLL");
    … …  
    156160                *(VOID **)&COMDLG32_PathFindFilenameA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathFindFileNameA");
    157161                *(VOID **)&COMDLG32_PathAddBackslashA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathAddBackslashA");
     162#endif
    158163                break;
    159164
    … …  
    165170
    166171                }
     172#ifndef __WIN32OS2__
    167173                FreeLibrary(COMCTL32_hInstance);
    168174                FreeLibrary(SHELL32_hInstance);
    169175                FreeLibrary(SHLWAPI_hInstance);
     176#endif
    170177                break;
    171178        }

  • trunk/src/comdlg32/makefile

    r3031 r3544  
    1 # $Id: makefile,v 1.16 2000-03-06 23:38:30 bird Exp $
     1# $Id: makefile,v 1.17 2000-05-16 20:00:13 sandervl Exp $
    22
    33#
    … …  
    6767$(PDWIN32_LIB)/shlwapi.lib
    6868$(PDWIN32_LIB)/shell32.lib
     69$(PDWIN32_LIB)/comctl32.lib
    6970$(PDWIN32_LIB)/gdi32.lib
    7071OS2386.LIB
Note: See TracChangeset for help on using the changeset viewer.