From 086ba9ea12f2adde009274c603283ff1a0b3a2f4 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Tue, 1 Feb 2022 19:32:52 -0600
Subject: [PATCH] shell32: Move dialog definitions to dialog.c.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/shell32/dialogs.c    | 21 ++++++++++++++++
 dlls/shell32/undocshell.h | 52 ---------------------------------------
 2 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index aa6ef7fe6a9..70548389e15 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -36,6 +36,27 @@
 #include "shresdef.h"
 #include "undocshell.h"
 
+/* RunFileDlg flags */
+#define RFF_NOBROWSE        0x01
+#define RFF_NODEFAULT       0x02
+#define RFF_CALCDIRECTORY   0x04
+#define RFF_NOLABEL         0x08
+#define RFF_NOSEPARATEMEM   0x20  /* NT only */
+
+/* RunFileFlg notification structure */
+typedef struct
+{
+    NMHDR hdr;
+    const char *lpFile;
+    const char *lpDirectory;
+    int nShow;
+} NM_RUNFILEDLG;
+
+/* RunFileDlg notification return values */
+#define RF_OK      0x00
+#define RF_CANCEL  0x01
+#define RF_RETRY   0x02
+
 typedef struct
     {
 	HWND hwndOwner ;
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index afa87f40f5b..b0975559c6f 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -37,58 +37,6 @@ extern "C" {
 BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
 BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
 
-/****************************************************************************
- * Shell Common Dialogs
- */
-
-/* RunFileDlg flags */
-#define RFF_NOBROWSE       0x01
-#define RFF_NODEFAULT      0x02
-#define RFF_CALCDIRECTORY  0x04
-#define RFF_NOLABEL        0x08
-#define RFF_NOSEPARATEMEM  0x20  /* NT only */
-
-/* RunFileFlg notification structure */
-typedef struct
-{
-  NMHDR   hdr;
-  LPCSTR  lpFile;
-  LPCSTR  lpDirectory;
-  int     nShow;
-} NM_RUNFILEDLG, * LPNM_RUNFILEDLG;
-
-/* RunFileDlg notification return values */
-#define RF_OK      0x00
-#define RF_CANCEL  0x01
-#define RF_RETRY   0x02
-
-void WINAPI RunFileDlg(
-	HWND hwndOwner,
-	HICON hIcon,
-	LPCSTR lpstrDirectory,
-	LPCSTR lpstrTitle,
-	LPCSTR lpstrDescription,
-	UINT uFlags);
-
-void WINAPI ExitWindowsDialog(HWND hwndOwner);
-
-BOOL WINAPI SHFindComputer(
-	LPCITEMIDLIST pidlRoot,
-	LPCITEMIDLIST pidlSavedSearch);
-
-void WINAPI SHHandleDiskFull(HWND hwndOwner,
-	UINT uDrive);
-
-int  WINAPI SHOutOfMemoryMessageBox(
-	HWND hwndOwner,
-	LPCSTR lpCaption,
-	UINT uType);
-
-DWORD WINAPI SHNetConnectionDialog(
-	HWND hwndOwner,
-	LPCSTR lpstrRemoteName,
-	DWORD dwType);
-
 /****************************************************************************
  * Memory Routines
  */