diff --git a/Makefile.in b/Makefile.in index 8840e57fd02..8fd8be935b9 100644 --- a/Makefile.in +++ b/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 diff --git a/configure b/configure index adf498d4522..39250dbe71d 100755 --- a/configure +++ b/configure @@ -23647,9 +23647,9 @@ Makefile: dummy ac_config_commands="$ac_config_commands include/stamp-h" -ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv" +ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv" -ac_config_commands="$ac_config_commands dlls/gdi/mfdrv" +ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv" ac_config_commands="$ac_config_commands dlls/kernel32/nls" @@ -23675,7 +23675,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -24224,8 +24224,8 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; - "dlls/gdi/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;; - "dlls/gdi/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; + "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; + "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; "dlls/user/resources") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;; "dlls/wineps.drv/data") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps.drv/data" ;; @@ -24303,8 +24303,8 @@ do "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;; "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; - "dlls/gdi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi/Makefile" ;; - "dlls/gdi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi/tests/Makefile" ;; + "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; + "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/glu32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;; "dlls/glut32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glut32/Makefile" ;; "dlls/gphoto2.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gphoto2.ds/Makefile" ;; @@ -25237,10 +25237,10 @@ echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "include/stamp-h":C) echo timestamp > include/stamp-h ;; - "dlls/gdi/enhmfdrv":C) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5 -echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;; - "dlls/gdi/mfdrv":C) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5 -echo "$as_me: creating dlls/gdi/mfdrv" >&6;} && mkdir "dlls/gdi/mfdrv") ;; + "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi32/enhmfdrv" >&5 +echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;} && mkdir "dlls/gdi32/enhmfdrv") ;; + "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi32/mfdrv" >&5 +echo "$as_me: creating dlls/gdi32/mfdrv" >&6;} && mkdir "dlls/gdi32/mfdrv") ;; "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ echo "$as_me:$LINENO: creating dlls/kernel32/nls" >&5 echo "$as_me: creating dlls/kernel32/nls" >&6;} && mkdir "dlls/kernel32/nls") ;; "dlls/user/resources":C) test -d "dlls/user/resources" || ({ echo "$as_me:$LINENO: creating dlls/user/resources" >&5 diff --git a/configure.ac b/configure.ac index 5d43d53c272..ae7b7628eac 100644 --- a/configure.ac +++ b/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 diff --git a/dlls/.gitignore b/dlls/.gitignore index 296abbc6c6b..372ddaf6c07 100644 --- a/dlls/.gitignore +++ b/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 diff --git a/dlls/Makefile.in b/dlls/Makefile.in index fe65623ccdc..3c380f2d453 100644 --- a/dlls/Makefile.in +++ b/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 diff --git a/dlls/gdi/Makefile.in b/dlls/gdi32/Makefile.in similarity index 100% rename from dlls/gdi/Makefile.in rename to dlls/gdi32/Makefile.in diff --git a/dlls/gdi/bidi.c b/dlls/gdi32/bidi.c similarity index 100% rename from dlls/gdi/bidi.c rename to dlls/gdi32/bidi.c diff --git a/dlls/gdi/bidi16.c b/dlls/gdi32/bidi16.c similarity index 100% rename from dlls/gdi/bidi16.c rename to dlls/gdi32/bidi16.c diff --git a/dlls/gdi/bitblt.c b/dlls/gdi32/bitblt.c similarity index 100% rename from dlls/gdi/bitblt.c rename to dlls/gdi32/bitblt.c diff --git a/dlls/gdi/bitmap.c b/dlls/gdi32/bitmap.c similarity index 100% rename from dlls/gdi/bitmap.c rename to dlls/gdi32/bitmap.c diff --git a/dlls/gdi/brush.c b/dlls/gdi32/brush.c similarity index 100% rename from dlls/gdi/brush.c rename to dlls/gdi32/brush.c diff --git a/dlls/gdi/clipping.c b/dlls/gdi32/clipping.c similarity index 100% rename from dlls/gdi/clipping.c rename to dlls/gdi32/clipping.c diff --git a/dlls/gdi/dc.c b/dlls/gdi32/dc.c similarity index 100% rename from dlls/gdi/dc.c rename to dlls/gdi32/dc.c diff --git a/dlls/gdi/dib.c b/dlls/gdi32/dib.c similarity index 100% rename from dlls/gdi/dib.c rename to dlls/gdi32/dib.c diff --git a/dlls/gdi/dispdib.c b/dlls/gdi32/dispdib.c similarity index 100% rename from dlls/gdi/dispdib.c rename to dlls/gdi32/dispdib.c diff --git a/dlls/gdi/dispdib.spec b/dlls/gdi32/dispdib.spec similarity index 100% rename from dlls/gdi/dispdib.spec rename to dlls/gdi32/dispdib.spec diff --git a/dlls/gdi/driver.c b/dlls/gdi32/driver.c similarity index 100% rename from dlls/gdi/driver.c rename to dlls/gdi32/driver.c diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi32/enhmetafile.c similarity index 100% rename from dlls/gdi/enhmetafile.c rename to dlls/gdi32/enhmetafile.c diff --git a/dlls/gdi/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c similarity index 100% rename from dlls/gdi/enhmfdrv/bitblt.c rename to dlls/gdi32/enhmfdrv/bitblt.c diff --git a/dlls/gdi/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c similarity index 100% rename from dlls/gdi/enhmfdrv/dc.c rename to dlls/gdi32/enhmfdrv/dc.c diff --git a/dlls/gdi/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h similarity index 100% rename from dlls/gdi/enhmfdrv/enhmetafiledrv.h rename to dlls/gdi32/enhmfdrv/enhmetafiledrv.h diff --git a/dlls/gdi/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c similarity index 100% rename from dlls/gdi/enhmfdrv/graphics.c rename to dlls/gdi32/enhmfdrv/graphics.c diff --git a/dlls/gdi/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c similarity index 100% rename from dlls/gdi/enhmfdrv/init.c rename to dlls/gdi32/enhmfdrv/init.c diff --git a/dlls/gdi/enhmfdrv/mapping.c b/dlls/gdi32/enhmfdrv/mapping.c similarity index 100% rename from dlls/gdi/enhmfdrv/mapping.c rename to dlls/gdi32/enhmfdrv/mapping.c diff --git a/dlls/gdi/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c similarity index 100% rename from dlls/gdi/enhmfdrv/objects.c rename to dlls/gdi32/enhmfdrv/objects.c diff --git a/dlls/gdi/env.c b/dlls/gdi32/env.c similarity index 100% rename from dlls/gdi/env.c rename to dlls/gdi32/env.c diff --git a/dlls/gdi/font.c b/dlls/gdi32/font.c similarity index 100% rename from dlls/gdi/font.c rename to dlls/gdi32/font.c diff --git a/dlls/gdi/freetype.c b/dlls/gdi32/freetype.c similarity index 100% rename from dlls/gdi/freetype.c rename to dlls/gdi32/freetype.c diff --git a/dlls/gdi/gdi.exe.spec b/dlls/gdi32/gdi.exe.spec similarity index 100% rename from dlls/gdi/gdi.exe.spec rename to dlls/gdi32/gdi.exe.spec diff --git a/dlls/gdi/gdi16.c b/dlls/gdi32/gdi16.c similarity index 100% rename from dlls/gdi/gdi16.c rename to dlls/gdi32/gdi16.c diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi32/gdi32.spec similarity index 100% rename from dlls/gdi/gdi32.spec rename to dlls/gdi32/gdi32.spec diff --git a/dlls/gdi/gdi_main.c b/dlls/gdi32/gdi_main.c similarity index 100% rename from dlls/gdi/gdi_main.c rename to dlls/gdi32/gdi_main.c diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi32/gdi_private.h similarity index 100% rename from dlls/gdi/gdi_private.h rename to dlls/gdi32/gdi_private.h diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi32/gdiobj.c similarity index 100% rename from dlls/gdi/gdiobj.c rename to dlls/gdi32/gdiobj.c diff --git a/dlls/gdi/icm.c b/dlls/gdi32/icm.c similarity index 100% rename from dlls/gdi/icm.c rename to dlls/gdi32/icm.c diff --git a/dlls/gdi/mapping.c b/dlls/gdi32/mapping.c similarity index 100% rename from dlls/gdi/mapping.c rename to dlls/gdi32/mapping.c diff --git a/dlls/gdi/metafile.c b/dlls/gdi32/metafile.c similarity index 100% rename from dlls/gdi/metafile.c rename to dlls/gdi32/metafile.c diff --git a/dlls/gdi/metafile16.c b/dlls/gdi32/metafile16.c similarity index 100% rename from dlls/gdi/metafile16.c rename to dlls/gdi32/metafile16.c diff --git a/dlls/gdi/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c similarity index 100% rename from dlls/gdi/mfdrv/bitblt.c rename to dlls/gdi32/mfdrv/bitblt.c diff --git a/dlls/gdi/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c similarity index 100% rename from dlls/gdi/mfdrv/dc.c rename to dlls/gdi32/mfdrv/dc.c diff --git a/dlls/gdi/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c similarity index 100% rename from dlls/gdi/mfdrv/graphics.c rename to dlls/gdi32/mfdrv/graphics.c diff --git a/dlls/gdi/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c similarity index 100% rename from dlls/gdi/mfdrv/init.c rename to dlls/gdi32/mfdrv/init.c diff --git a/dlls/gdi/mfdrv/mapping.c b/dlls/gdi32/mfdrv/mapping.c similarity index 100% rename from dlls/gdi/mfdrv/mapping.c rename to dlls/gdi32/mfdrv/mapping.c diff --git a/dlls/gdi/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h similarity index 100% rename from dlls/gdi/mfdrv/metafiledrv.h rename to dlls/gdi32/mfdrv/metafiledrv.h diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c similarity index 100% rename from dlls/gdi/mfdrv/objects.c rename to dlls/gdi32/mfdrv/objects.c diff --git a/dlls/gdi/mfdrv/text.c b/dlls/gdi32/mfdrv/text.c similarity index 100% rename from dlls/gdi/mfdrv/text.c rename to dlls/gdi32/mfdrv/text.c diff --git a/dlls/gdi/opengl.c b/dlls/gdi32/opengl.c similarity index 100% rename from dlls/gdi/opengl.c rename to dlls/gdi32/opengl.c diff --git a/dlls/gdi/painting.c b/dlls/gdi32/painting.c similarity index 100% rename from dlls/gdi/painting.c rename to dlls/gdi32/painting.c diff --git a/dlls/gdi/palette.c b/dlls/gdi32/palette.c similarity index 100% rename from dlls/gdi/palette.c rename to dlls/gdi32/palette.c diff --git a/dlls/gdi/path.c b/dlls/gdi32/path.c similarity index 100% rename from dlls/gdi/path.c rename to dlls/gdi32/path.c diff --git a/dlls/gdi/pen.c b/dlls/gdi32/pen.c similarity index 100% rename from dlls/gdi/pen.c rename to dlls/gdi32/pen.c diff --git a/dlls/gdi/printdrv.c b/dlls/gdi32/printdrv.c similarity index 100% rename from dlls/gdi/printdrv.c rename to dlls/gdi32/printdrv.c diff --git a/dlls/gdi/region.c b/dlls/gdi32/region.c similarity index 100% rename from dlls/gdi/region.c rename to dlls/gdi32/region.c diff --git a/dlls/gdi/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in similarity index 100% rename from dlls/gdi/tests/Makefile.in rename to dlls/gdi32/tests/Makefile.in diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c similarity index 100% rename from dlls/gdi/tests/bitmap.c rename to dlls/gdi32/tests/bitmap.c diff --git a/dlls/gdi/tests/brush.c b/dlls/gdi32/tests/brush.c similarity index 100% rename from dlls/gdi/tests/brush.c rename to dlls/gdi32/tests/brush.c diff --git a/dlls/gdi/tests/clipping.c b/dlls/gdi32/tests/clipping.c similarity index 100% rename from dlls/gdi/tests/clipping.c rename to dlls/gdi32/tests/clipping.c diff --git a/dlls/gdi/tests/dc.c b/dlls/gdi32/tests/dc.c similarity index 100% rename from dlls/gdi/tests/dc.c rename to dlls/gdi32/tests/dc.c diff --git a/dlls/gdi/tests/font.c b/dlls/gdi32/tests/font.c similarity index 100% rename from dlls/gdi/tests/font.c rename to dlls/gdi32/tests/font.c diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c similarity index 100% rename from dlls/gdi/tests/gdiobj.c rename to dlls/gdi32/tests/gdiobj.c diff --git a/dlls/gdi/tests/generated.c b/dlls/gdi32/tests/generated.c similarity index 100% rename from dlls/gdi/tests/generated.c rename to dlls/gdi32/tests/generated.c diff --git a/dlls/gdi/tests/mapping.c b/dlls/gdi32/tests/mapping.c similarity index 100% rename from dlls/gdi/tests/mapping.c rename to dlls/gdi32/tests/mapping.c diff --git a/dlls/gdi/tests/metafile.c b/dlls/gdi32/tests/metafile.c similarity index 100% rename from dlls/gdi/tests/metafile.c rename to dlls/gdi32/tests/metafile.c diff --git a/dlls/gdi/tests/palette.c b/dlls/gdi32/tests/palette.c similarity index 100% rename from dlls/gdi/tests/palette.c rename to dlls/gdi32/tests/palette.c diff --git a/dlls/gdi/tests/pen.c b/dlls/gdi32/tests/pen.c similarity index 100% rename from dlls/gdi/tests/pen.c rename to dlls/gdi32/tests/pen.c diff --git a/dlls/gdi/version.rc b/dlls/gdi32/version.rc similarity index 100% rename from dlls/gdi/version.rc rename to dlls/gdi32/version.rc diff --git a/dlls/gdi/version16.rc b/dlls/gdi32/version16.rc similarity index 100% rename from dlls/gdi/version16.rc rename to dlls/gdi32/version16.rc diff --git a/dlls/gdi/wing.c b/dlls/gdi32/wing.c similarity index 100% rename from dlls/gdi/wing.c rename to dlls/gdi32/wing.c diff --git a/dlls/gdi/wing.spec b/dlls/gdi32/wing.spec similarity index 100% rename from dlls/gdi/wing.spec rename to dlls/gdi32/wing.spec diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 5122b010a7f..2b5bc185118 100644 --- a/programs/winetest/Makefile.in +++ b/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) diff --git a/tools/make_makefiles b/tools/make_makefiles index 5518808994a..b0bdd236d10 100755 --- a/tools/make_makefiles +++ b/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 =" ); diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 16a01a6d1de..4774f79d633 100755 --- a/tools/winapi/msvcmaker +++ b/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"; diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index a72eca3db07..3776a001eec 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1,4 +1,4 @@ -%%%dlls/gdi/tests +%%%dlls/gdi32/tests %%pack