system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 21:04:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath.

Browse source 
The function is exported by name from shell32 and declared in a public
header.
This commit is contained in:
Alex Henrie 2023-06-16 19:30:38 -06:00 committed by Alexandre Julliard
parent 2c235b6fe4
commit 15c00627ee
3 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/comdlg32/cdlg.h
View file

@ -182,9 +182,6 @@ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) DECLSPEC_HIDD
extern BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType ) DECLSPEC_HIDDEN;
extern BOOL GetFileName31W( OPENFILENAMEW *lpofn, UINT dlgType ) DECLSPEC_HIDDEN;
/* SHELL */
extern LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID);
#define ONOPEN_BROWSE 1
#define ONOPEN_OPEN 2
#define ONOPEN_SEARCH 3

18
dlls/comdlg32/cdlg32.c
View file

@ -43,11 +43,6 @@ DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0;
static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;
static HINSTANCE SHELL32_hInstance;
/* SHELL */
LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID) DECLSPEC_HIDDEN;
/***********************************************************************
* DllMain (COMDLG32.init)
*
@ -57,14 +52,6 @@ LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID) DECLSPEC_HIDDE
* FALSE if sibling could not be loaded or instantiated twice, TRUE
* otherwise.
*/
static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n";
#define GPA(dest, hinst, name) \
if(!(dest = (void*)GetProcAddress(hinst,name)))\
{ \
ERR(GPA_string, debugstr_a(name), hinst); \
return FALSE; \
}
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
{
TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved);
@ -74,11 +61,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
case DLL_PROCESS_ATTACH:
COMDLG32_hInstance = hInstance;
DisableThreadLibraryCalls(hInstance);
SHELL32_hInstance = GetModuleHandleA("SHELL32.DLL");
/* SHELL */
GPA(COMDLG32_SHSimpleIDListFromPathAW, SHELL32_hInstance, (LPCSTR)162);
break;
case DLL_PROCESS_DETACH:

2
dlls/comdlg32/itemdlg.c
View file

@ -599,7 +599,7 @@ static HRESULT on_default_action(FileDialogImpl *This)
}
}
pidla[i] = COMDLG32_SHSimpleIDListFromPathAW(canon_filename);
pidla[i] = SHSimpleIDListFromPath(canon_filename);
if(psf_parent && !(open_action == ONOPEN_BROWSE))
IShellFolder_Release(psf_parent);