[PATCH 0/1] MR3081: comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath.

[Alex Henrie (＠alexhenrie)]

The function is exported by name from shell32 and declared in a public
header.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3081

[PATCH 1/1] comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

The function is exported by name from shell32 and declared in a public
header.
---
 dlls/comdlg32/cdlg.h    |  3 ---
 dlls/comdlg32/cdlg32.c  | 18 ------------------
 dlls/comdlg32/itemdlg.c |  2 +-
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h
index 1ddd157b880..8039d6d6bd0 100644
--- a/dlls/comdlg32/cdlg.h
+++ b/dlls/comdlg32/cdlg.h
@@ -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
diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c
index f9619cc6a49..b9e19b78a34 100644
--- a/dlls/comdlg32/cdlg32.c
+++ b/dlls/comdlg32/cdlg32.c
@@ -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:
diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c
index f3b9a217e79..1feb1deda00 100644
--- a/dlls/comdlg32/itemdlg.c
+++ b/dlls/comdlg32/itemdlg.c
@@ -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);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3081

[PATCH 1/1] comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=133863

Your paranoid android.


=== debian11 (32 bit report) ===

user32:
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 6: the msg 0x002b was expected, but got msg 0x001c instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 7: the msg 0x0111 was expected, but got msg 0x0086 instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 8: the msg 0x8000 was expected, but got msg 0x0006 instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 9: the msg sequence is not complete: expected 0000 - actual 0009

[PATCH 0/1] MR3081: comdlg32: Don't use GetProcAddress for SHSimpleIDListFromPath. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3081