gdi32: Renamed the gdi directory to gdi32.

Makefile.in

@@ -223,8 +223,8 @@ ALL_MAKEFILES = \
 	dlls/dxerr8/Makefile \
 	dlls/dxerr9/Makefile \
 	dlls/dxguid/Makefile \
-	dlls/gdi/Makefile \
-	dlls/gdi/tests/Makefile \
+	dlls/gdi32/Makefile \
+	dlls/gdi32/tests/Makefile \
 	dlls/glu32/Makefile \
 	dlls/glut32/Makefile \
 	dlls/gphoto2.ds/Makefile \
@@ -545,8 +545,8 @@ dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules
 dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules
 dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules
 dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules
-dlls/gdi/Makefile: dlls/gdi/Makefile.in dlls/Makedll.rules
-dlls/gdi/tests/Makefile: dlls/gdi/tests/Makefile.in dlls/Maketest.rules
+dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules
+dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules
 dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules
 dlls/glut32/Makefile: dlls/glut32/Makefile.in dlls/Makedll.rules
 dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules

configure.ac

@@ -1472,8 +1472,8 @@ AH_TOP([#define __WINE_CONFIG_H])
 
 AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
 
-WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
-WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
+WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
+WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls)
 WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data)
@@ -1568,8 +1568,8 @@ dlls/dxdiagn/Makefile
 dlls/dxerr8/Makefile
 dlls/dxerr9/Makefile
 dlls/dxguid/Makefile
-dlls/gdi/Makefile
-dlls/gdi/tests/Makefile
+dlls/gdi32/Makefile
+dlls/gdi32/tests/Makefile
 dlls/glu32/Makefile
 dlls/glut32/Makefile
 dlls/gphoto2.ds/Makefile

dlls/.gitignore

@@ -17,7 +17,6 @@
 /imm.dll16
 /keyboard.drv16
 /krnl386.exe16
-/libgdi32.def
 /libuser32.def
 /libwinspool.def
 /lzexpand.dll16
@@ -91,7 +90,7 @@ dplay/libdplay.def
 dplayx/libdplayx.def
 dpnet/libdpnet.def
 dsound/libdsound.def
-gdi/libgdi32.def
+gdi32/libgdi32.def
 glu32/libglu32.def
 glut32/libglut32.def
 hid/libhid.def

dlls/Makefile.in

@@ -66,7 +66,7 @@ BASEDIRS = \
 	dsound \
 	dswave \
 	dxdiagn \
-	gdi \
+	gdi32 \
 	gphoto2.ds \
 	hhctrl.ocx \
 	hid \
@@ -227,7 +227,7 @@ TESTSUBDIRS = \
 	dinput/tests \
 	dnsapi/tests \
 	dsound/tests \
-	gdi/tests \
+	gdi32/tests \
 	hlink/tests \
 	infosoft/tests \
 	iphlpapi/tests \
@@ -340,7 +340,6 @@ WIN16_FILES = \
 
 SYMLINKS_SO = \
 	@WIN16_FILES@ \
-	gdi32.dll.so \
 	joystick.drv.so \
 	user32.dll.so \
 	winealsa.drv.so \
@@ -364,9 +363,6 @@ symlinks: $(BUILDSUBDIRS)
 
 # Map symlink name to the corresponding library
 
-gdi32.dll.so: gdi/gdi32.dll.so
-	$(RM) $@ && $(LN_S) gdi/gdi32.dll.so $@
-
 joystick.drv.so: winmm/joystick/joystick.drv.so
 	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv.so $@
 
@@ -485,7 +481,6 @@ winsock.dll16:
 STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)
 
 IMPORT_SYMLINKS = \
-	libgdi32.$(IMPLIBEXT) \
 	libuser32.$(IMPLIBEXT) \
 	libwinspool.$(IMPLIBEXT)
 
@@ -533,7 +528,7 @@ IMPORT_LIBS = \
 	dplayx/libdplayx.$(IMPLIBEXT) \
 	dpnet/libdpnet.$(IMPLIBEXT) \
 	dsound/libdsound.$(IMPLIBEXT) \
-	gdi/libgdi32.$(IMPLIBEXT) \
+	gdi32/libgdi32.$(IMPLIBEXT) \
 	glu32/libglu32.$(IMPLIBEXT) \
 	glut32/libglut32.$(IMPLIBEXT) \
 	hid/libhid.$(IMPLIBEXT) \
@@ -728,8 +723,8 @@ dpnet/libdpnet.$(IMPLIBEXT): dpnet/dpnet.spec $(WINEBUILD)
 dsound/libdsound.$(IMPLIBEXT): dsound/dsound.spec $(WINEBUILD)
 	@cd dsound && $(MAKE) libdsound.$(IMPLIBEXT)
 
-gdi/libgdi32.$(IMPLIBEXT): gdi/gdi32.spec $(WINEBUILD)
-	@cd gdi && $(MAKE) libgdi32.$(IMPLIBEXT)
+gdi32/libgdi32.$(IMPLIBEXT): gdi32/gdi32.spec $(WINEBUILD)
+	@cd gdi32 && $(MAKE) libgdi32.$(IMPLIBEXT)
 
 glu32/libglu32.$(IMPLIBEXT): glu32/glu32.spec $(WINEBUILD)
 	@cd glu32 && $(MAKE) libglu32.$(IMPLIBEXT)
@@ -980,9 +975,6 @@ wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD)
 wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD)
 	@cd wtsapi32 && $(MAKE) libwtsapi32.$(IMPLIBEXT)
 
-libgdi32.$(IMPLIBEXT): gdi/libgdi32.$(IMPLIBEXT)
-	$(RM) $@ && $(LN_S) gdi/libgdi32.$(IMPLIBEXT) $@
-
 libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@
 
@@ -994,7 +986,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 
 # Map library name to the corresponding directory
 
-gdi/gdi32.dll.so: gdi
 winmm/joystick/joystick.drv.so: winmm/joystick
 user/user32.dll.so: user
 winmm/winealsa/winealsa.drv.so: winmm/winealsa

programs/winetest/Makefile.in

@@ -104,8 +104,8 @@ dnsapi_test.exe: $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT)
 	cp $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) $@ && $(STRIP) $@
 dsound_test.exe: $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT)
 	cp $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) $@ && $(STRIP) $@
-gdi32_test.exe: $(DLLDIR)/gdi/tests/gdi32_test.exe$(DLLEXT)
-	cp $(DLLDIR)/gdi/tests/gdi32_test.exe$(DLLEXT) $@ && $(STRIP) $@
+gdi32_test.exe: $(DLLDIR)/gdi32/tests/gdi32_test.exe$(DLLEXT)
+	cp $(DLLDIR)/gdi32/tests/gdi32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 hlink_test.exe: $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT)
 	cp $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) $@ && $(STRIP) $@
 infosoft_test.exe: $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT)

tools/make_makefiles

@@ -181,7 +181,7 @@ replace_in_file( "configure.ac", '^MAKE_RULES', '\]\)$',
 ################################################################
 # update the tests list in programs/winetest/Makefile.in and programs/winetest/winetest.rc
 
-my %modules = ( "gdi" => "gdi32", "user" => "user32" );
+my %modules = ( "user" => "user32" );
 my %tests;
 @lines = ( "TESTBINS =" );
 

tools/winapi/msvcmaker

@@ -89,7 +89,7 @@ if ($options->wine || $options->winetest) {
     }
 }
 
-my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv);
+my @gdi32_dirs = qw(dlls/gdi32/enhmfdrv dlls/gdi32/mfdrv);
 
 push @makefile_in_files, "libs/wine/Makefile.in";
 push @makefile_in_files, "tools/winebuild/Makefile.in";

tools/winapi/tests.dat

@@ -1,4 +1,4 @@
-%%%dlls/gdi/tests
+%%%dlls/gdi32/tests
 
 %%pack