comdlg32: Make commdlg.dll into a stand-alone 16-bit module.

.gitignore

@@ -44,7 +44,6 @@ dlls/actxprxy/actxprxy_urlhist_p.c
 dlls/advapi32/svcctl.h
 dlls/advapi32/svcctl_c.c
 dlls/atl/atliface.h
-dlls/commdlg.dll16
 dlls/dxdiagn/fil_data.h
 dlls/gdi.exe16
 dlls/jscript/jsglobal.tlb

configure

@@ -14095,6 +14095,14 @@ dlls/comm.drv16/Makefile: dlls/comm.drv16/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/comm.drv16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/commdlg.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	commdlg.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/commdlg.dll16/Makefile: dlls/commdlg.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/commdlg.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/compobj.dll16/Makefile"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	compobj.dll16"
@@ -18821,6 +18829,7 @@ do
     "dlls/comdlg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/Makefile" ;;
     "dlls/comdlg32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/tests/Makefile" ;;
     "dlls/comm.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comm.drv16/Makefile" ;;
+    "dlls/commdlg.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/commdlg.dll16/Makefile" ;;
     "dlls/compobj.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compobj.dll16/Makefile" ;;
     "dlls/compstui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compstui/Makefile" ;;
     "dlls/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;;

configure.ac

@@ -2148,6 +2148,7 @@ WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls]
 WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/comm.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/commdlg.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/compobj.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

dlls/Makefile.in

@@ -18,7 +18,6 @@ DOCSUBDIRS     = $(DLLSUBDIRS)
 # 16-bit dlls
 
 WIN16_FILES = \
-	commdlg.dll16 \
 	gdi.exe16 \
 	krnl386.exe16 \
 	user.exe16 \
@@ -32,9 +31,6 @@ all: $(BUILDSUBDIRS) @WIN16_FILES@
 
 # Placeholders for 16-bit libraries
 
-commdlg.dll16:
-	echo "comdlg32.dll" >$@
-
 gdi.exe16:
 	echo "gdi32.dll" >$@
 

dlls/comdlg32/Makefile.in

@@ -13,19 +13,10 @@ C_SRCS = \
 	filedlg.c \
 	filedlg31.c \
 	filedlgbrowser.c \
-	finddlg32.c \
+	finddlg.c \
 	fontdlg.c \
 	printdlg.c
 
-C_SRCS16 = \
-	colordlg16.c \
-	filedlg16.c \
-	finddlg16.c \
-	fontdlg16.c \
-	printdlg16.c
-
-SPEC_SRCS16 = commdlg.spec
-
 RC_SRCS = \
 	cdlg_Bg.rc \
 	cdlg_Ca.rc \

dlls/comdlg32/cdlg32.c

@@ -154,7 +154,6 @@ void COMDLG32_SetCommDlgExtendedError(DWORD err)
 
 /***********************************************************************
  *	CommDlgExtendedError			(COMDLG32.@)
- *	CommDlgExtendedError			(COMMDLG.26)
  *
  * Get the thread's local error value if a comdlg32 function fails.
  *	RETURNS

dlls/commdlg.dll16/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = commdlg.dll16
+IMPORTS   = comdlg32 user32 gdi32 kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,comdlg32.dll
+
+C_SRCS = \
+	colordlg.c \
+	filedlg.c \
+	finddlg.c \
+	fontdlg.c \
+	printdlg.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/comdlg32/commdlg.spec → dlls/commdlg.dll16/commdlg.dll16.spec

@@ -18,7 +18,7 @@
 22  pascal   PrintSetupDlgProc(word word word long) PrintSetupDlgProc16
 #23  pascal  EDITINTEGERONLY exported, shared data
 #25  pascal  WANTARROWS exported, shared data
-26  pascal   CommDlgExtendedError() CommDlgExtendedError
+26  pascal   CommDlgExtendedError() CommDlgExtendedError16
 27  pascal -ret16 GetFileTitle(str ptr word) GetFileTitle16
 #28  pascal  WEP exported, shared data
 #29  pascal  DWLBSUBCLASS exported, shared data

dlls/comdlg32/finddlg16.c → dlls/commdlg.dll16/finddlg.c

@@ -315,3 +315,12 @@ BOOL16 CALLBACK ReplaceTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam
 {
     return replace_text_dlgproc( HWND_32(hWnd16), wMsg, wParam, lParam );
 }
+
+
+/***********************************************************************
+ *	CommDlgExtendedError			(COMMDLG.26)
+ */
+DWORD WINAPI CommDlgExtendedError16(void)
+{
+    return CommDlgExtendedError();
+}