From 4a20880aab6b3c4786247300de1055bcc998e4a4 Mon Sep 17 00:00:00 2001 From: Jan Zerebecki Date: Mon, 25 Aug 2008 18:45:50 +0200 Subject: [PATCH] push a4aeee26091b4888c4962ca8601c7905b237df2d --- aclocal.m4 | 8 +- configure | 933 ++++++++++++++++++++++++++++++++++++- configure.ac | 837 +++++++++++++++++---------------- dlls/Makefile.in | 387 +-------------- dlls/advapi32/tests/service.c | 14 +- dlls/comdlg32/cdlg_Ja.rc | 114 ++--- dlls/d3dx8/math.c | 48 +- dlls/d3dx9_36/shader.c | 4 +- dlls/d3dxof/d3dxof.c | 319 +++++++++---- dlls/d3dxof/d3dxof_private.h | 29 +- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 203 +++++++- dlls/gdiplus/tests/graphics.c | 278 +++++++++++ dlls/gdiplus/tests/graphicspath.c | 4 + dlls/mshtml/htmldoc.c | 8 +- dlls/mshtml/htmlelem.c | 17 +- dlls/mshtml/tests/dom.c | 34 +- dlls/msi/action.c | 66 +-- dlls/msi/database.c | 1 - dlls/msi/dialog.c | 2 +- dlls/msi/events.c | 6 +- dlls/msi/helpers.c | 12 +- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 10 + dlls/msi/msipriv.h | 79 +++- dlls/msi/table.c | 111 ++--- dlls/msi/tests/format.c | 5 +- dlls/msi/tests/msi.c | 29 ++ dlls/msi/tests/package.c | 172 ++----- dlls/mstask/task.c | 4 +- dlls/msxml3/queryresult.c | 41 +- dlls/oleaut32/tests/varformat.c | 4 +- dlls/oleaut32/varformat.c | 26 +- dlls/shell32/shell32_Ja.rc | 251 +++++++--- dlls/user32/cursoricon.c | 4 +- dlls/user32/resources/user32_Ja.rc | 21 +- dlls/wined3d/arb_program_shader.c | 71 ++- dlls/wined3d/context.c | 17 +- dlls/wined3d/directx.c | 25 +- dlls/wined3d/surface.c | 20 +- dlls/wined3d/texture.c | 12 +- dlls/wined3d/utils.c | 9 +- dlls/wined3d/wined3d_private.h | 5 +- include/gdiplusflat.h | 6 + programs/Makefile.in | 113 +---- programs/clock/Ja.rc | 73 +++ programs/clock/rsrc.rc | 1 + programs/regedit/framewnd.c | 63 +-- programs/regedit/main.h | 2 +- programs/regedit/treeview.c | 82 ++-- programs/winecfg/Ja.rc | 110 ++--- programs/winefile/Ja.rc | 260 +++++++++++ programs/winefile/rsrc.rc | 1 + programs/winhlp32/Ja.rc | 125 +++++ programs/winhlp32/rsrc.rc | 1 + tools/make_makefiles | 116 +---- 57 files changed, 3448 insertions(+), 1752 deletions(-) create mode 100644 programs/clock/Ja.rc create mode 100644 programs/winefile/Ja.rc create mode 100644 programs/winhlp32/Ja.rc diff --git a/aclocal.m4 b/aclocal.m4 index 04ed90cde2e..be9192ea54c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -168,12 +168,16 @@ AC_CONFIG_FILES([$1])]) dnl **** Create a makefile from config.status **** dnl -dnl Usage: WINE_CONFIG_MAKEFILE(file,deps) +dnl Usage: WINE_CONFIG_MAKEFILE(file,deps,prefix,var,enable) dnl AC_DEFUN([WINE_CONFIG_MAKEFILE], -[m4_pushdef([ac_dir],m4_bpatsubst([$1],[/?Makefile$],[]))dnl +[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\($3/?\(.*\)/\)?Makefile$],[\2]))dnl m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\ $1"]) +AS_VAR_PUSHDEF([ac_enable],m4_default([$5],[enable_]ac_dir))dnl +m4_ifval([$4],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$4],[ && ac_var="$ac_var \\ + ac_dir"])) +AS_VAR_POPDEF([ac_enable])dnl ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS [$1: ]m4_ifval([$2],[$1.in $2],[$1.in])" AC_CONFIG_FILES([$1])dnl diff --git a/configure b/configure index 8296c5d60f8..d70b4c22962 100755 --- a/configure +++ b/configure @@ -715,11 +715,7 @@ ICOTOOL PRELINK LIBPTHREAD XLIB -XFILES -OPENGLFILES -GLU32FILES OPENGL_LIBS -QUARTZFILES DLLEXT DLLFLAGS LDSHARED @@ -781,6 +777,12 @@ DEPENDENCIES ALL_MAKERULES ALL_MAKEFILES ALL_MAKEFILE_DEPENDS +ALL_DLL_DIRS +ALL_IMPLIB_DIRS +ALL_TEST_DIRS +ALL_PROGRAM_DIRS +ALL_PROGRAM_INSTALL_DIRS +ALL_PROGRAM_BIN_INSTALL_DIRS LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES @@ -6869,16 +6871,8 @@ fi XLIB="" -XFILES="" - -OPENGLFILES="" - -GLU32FILES="" - OPENGL_LIBS="" -QUARTZFILES="" - { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 @@ -8643,7 +8637,7 @@ fi then CARBONLIB="-framework Carbon" - QUARTZFILES='$(QUARTZFILES)' + enable_winequartz_drv=${enable_winequartz_drv:-yes} fi ;; *) @@ -9580,6 +9574,8 @@ test -n "$MINGWAR" || MINGWAR="false" ;; esac +enable_winequartz_drv=${enable_winequartz_drv:-no} + if test "$LIBEXT" = "a"; then { { echo "$as_me:$LINENO: error: could not find a way to build shared libraries. It is currently not possible to build Wine without shared library @@ -11274,7 +11270,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL" - OPENGLFILES='$(OPENGLFILES)' cat >>confdefs.h <<\_ACEOF #define HAVE_OPENGL 1 @@ -11291,7 +11286,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF OPENGL_LIBS="-lGL" - OPENGLFILES='$(OPENGLFILES)' cat >>confdefs.h <<\_ACEOF #define HAVE_OPENGL 1 @@ -11376,7 +11370,7 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBGLU "$ac_cv_lib_soname_GLU" _ACEOF - GLU32FILES='$(GLU32FILES)' + fi fi @@ -11415,6 +11409,9 @@ esac fi + test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} + test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} + NASLIBS="" @@ -11758,11 +11755,13 @@ done CPPFLAGS="$ac_save_CPPFLAGS" - XFILES='$(XFILES)' else XLIB="" X_CFLAGS="" X_LIBS="" + enable_winex11_drv=${enable_winex11_drv:-no} + enable_opengl32=${enable_opengl32:-no} + enable_glu32=${enable_glu32:-no} fi if test "x$XLIB" = "x"; then case "x$with_x" in @@ -22195,6 +22194,19 @@ ALL_MAKEFILES="" ALL_MAKEFILE_DEPENDS="# Makefile dependencies" +ALL_DLL_DIRS="" + +ALL_IMPLIB_DIRS="" + +ALL_TEST_DIRS="" + +ALL_PROGRAM_DIRS="" + +ALL_PROGRAM_INSTALL_DIRS="" + +ALL_PROGRAM_BIN_INSTALL_DIRS="" + + @@ -22251,2520 +22263,3397 @@ ac_config_files="$ac_config_files programs/Makeprog.rules" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS Makefile: Makefile.in Make.rules" ac_config_files="$ac_config_files Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/Makefile: dlls/Makefile.in Make.rules" ac_config_files="$ac_config_files dlls/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/acledit/Makefile" +test "x$enable_acledit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + acledit" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/acledit/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/activeds/Makefile" +test "x$enable_activeds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + activeds" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/activeds/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/actxprxy/Makefile" +test "x$enable_actxprxy" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + actxprxy" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/actxprxy/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/adsiid/Makefile" +test "x$enable_adsiid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + adsiid" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/adsiid/Makefile: dlls/adsiid/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/adsiid/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/advapi32/Makefile" +test "x$enable_advapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + advapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/advapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/advapi32/tests/Makefile" +test "x$enable_advapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + advapi32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/advpack/Makefile" +test "x$enable_advpack" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + advpack" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/advpack/Makefile: dlls/advpack/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/advpack/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/advpack/tests/Makefile" +test "x$enable_advpack_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + advpack/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/advpack/tests/Makefile: dlls/advpack/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/advpack/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/amstream/Makefile" +test "x$enable_amstream" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + amstream" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/amstream/Makefile: dlls/amstream/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/amstream/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/appwiz.cpl/Makefile" +test "x$enable_appwiz_cpl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + appwiz.cpl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/appwiz.cpl/Makefile: dlls/appwiz.cpl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/appwiz.cpl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/atl/Makefile" +test "x$enable_atl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + atl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/atl/Makefile: dlls/atl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/atl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/avicap32/Makefile" +test "x$enable_avicap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + avicap32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/avicap32/Makefile: dlls/avicap32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/avicap32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/avifil32/Makefile" +test "x$enable_avifil32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + avifil32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/avifil32/Makefile: dlls/avifil32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/avifil32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/browseui/Makefile" +test "x$enable_browseui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + browseui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/browseui/Makefile: dlls/browseui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/browseui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/browseui/tests/Makefile" +test "x$enable_browseui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + browseui/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/browseui/tests/Makefile: dlls/browseui/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/browseui/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cabinet/Makefile" +test "x$enable_cabinet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cabinet" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cabinet/Makefile: dlls/cabinet/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cabinet/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cabinet/tests/Makefile" +test "x$enable_cabinet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + cabinet/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cabinet/tests/Makefile: dlls/cabinet/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/cabinet/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/capi2032/Makefile" +test "x$enable_capi2032" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + capi2032" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/capi2032/Makefile: dlls/capi2032/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/capi2032/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cards/Makefile" +test "x$enable_cards" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cards" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cards/Makefile: dlls/cards/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cards/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cfgmgr32/Makefile" +test "x$enable_cfgmgr32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cfgmgr32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cfgmgr32/Makefile: dlls/cfgmgr32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cfgmgr32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/clusapi/Makefile" +test "x$enable_clusapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + clusapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/clusapi/Makefile: dlls/clusapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/clusapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/comcat/Makefile" +test "x$enable_comcat" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + comcat" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/comcat/Makefile: dlls/comcat/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/comcat/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/comcat/tests/Makefile" +test "x$enable_comcat_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + comcat/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/comcat/tests/Makefile: dlls/comcat/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/comcat/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/comctl32/Makefile" +test "x$enable_comctl32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + comctl32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/comctl32/Makefile: dlls/comctl32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/comctl32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/comctl32/tests/Makefile" +test "x$enable_comctl32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + comctl32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/comctl32/tests/Makefile: dlls/comctl32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/comctl32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/comdlg32/Makefile" +test "x$enable_comdlg32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + comdlg32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/comdlg32/Makefile: dlls/comdlg32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/comdlg32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/comdlg32/tests/Makefile" +test "x$enable_comdlg32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + comdlg32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/compstui/Makefile" +test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + compstui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/compstui/Makefile: dlls/compstui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/compstui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/credui/Makefile" +test "x$enable_credui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + credui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/credui/Makefile: dlls/credui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/credui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/credui/tests/Makefile" +test "x$enable_credui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + credui/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/credui/tests/Makefile: dlls/credui/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/credui/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/crtdll/Makefile" +test "x$enable_crtdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + crtdll" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/crtdll/Makefile: dlls/crtdll/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/crtdll/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/crypt32/Makefile" +test "x$enable_crypt32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + crypt32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/crypt32/Makefile: dlls/crypt32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/crypt32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/crypt32/tests/Makefile" +test "x$enable_crypt32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + crypt32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/crypt32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cryptdlg/Makefile" +test "x$enable_cryptdlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cryptdlg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cryptdlg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cryptdll/Makefile" +test "x$enable_cryptdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cryptdll" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cryptdll/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cryptnet/Makefile" +test "x$enable_cryptnet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cryptnet" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cryptnet/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cryptnet/tests/Makefile" +test "x$enable_cryptnet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + cryptnet/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/cryptui/Makefile" +test "x$enable_cryptui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + cryptui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/cryptui/Makefile: dlls/cryptui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/cryptui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ctapi32/Makefile" +test "x$enable_ctapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ctapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ctapi32/Makefile: dlls/ctapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ctapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ctl3d32/Makefile" +test "x$enable_ctl3d32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ctl3d32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ctl3d32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d10/Makefile" +test "x$enable_d3d10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3d10" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3d10/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d8/Makefile" +test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3d8" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3d8/Makefile: dlls/d3d8/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3d8/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d8/tests/Makefile" +test "x$enable_d3d8_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3d8/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3d8/tests/Makefile: dlls/d3d8/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3d8/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d9/Makefile" +test "x$enable_d3d9" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3d9" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3d9/Makefile: dlls/d3d9/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3d9/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d9/tests/Makefile" +test "x$enable_d3d9_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3d9/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3d9/tests/Makefile: dlls/d3d9/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3d9/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dim/Makefile" +test "x$enable_d3dim" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dim" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dim/Makefile: dlls/d3dim/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dim/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3drm/Makefile" +test "x$enable_d3drm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3drm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3drm/Makefile: dlls/d3drm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3drm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3drm/tests/Makefile" +test "x$enable_d3drm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3drm/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3drm/tests/Makefile: dlls/d3drm/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3drm/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx8/Makefile" +test "x$enable_d3dx8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx8" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx8/Makefile: dlls/d3dx8/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx8/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx8/tests/Makefile" +test "x$enable_d3dx8_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3dx8/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx8/tests/Makefile: dlls/d3dx8/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3dx8/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_24/Makefile" +test "x$enable_d3dx9_24" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_24" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_24/Makefile: dlls/d3dx9_24/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_24/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_25/Makefile" +test "x$enable_d3dx9_25" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_25" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_25/Makefile: dlls/d3dx9_25/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_25/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_26/Makefile" +test "x$enable_d3dx9_26" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_26" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_26/Makefile: dlls/d3dx9_26/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_26/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_27/Makefile" +test "x$enable_d3dx9_27" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_27" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_27/Makefile: dlls/d3dx9_27/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_27/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_28/Makefile" +test "x$enable_d3dx9_28" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_28" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_28/Makefile: dlls/d3dx9_28/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_28/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_29/Makefile" +test "x$enable_d3dx9_29" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_29" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_29/Makefile: dlls/d3dx9_29/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_29/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_30/Makefile" +test "x$enable_d3dx9_30" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_30" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_30/Makefile: dlls/d3dx9_30/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_30/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_31/Makefile" +test "x$enable_d3dx9_31" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_31" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_31/Makefile: dlls/d3dx9_31/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_31/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_32/Makefile" +test "x$enable_d3dx9_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_32/Makefile: dlls/d3dx9_32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_33/Makefile" +test "x$enable_d3dx9_33" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_33" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_33/Makefile: dlls/d3dx9_33/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_33/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_34/Makefile" +test "x$enable_d3dx9_34" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_34" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_34/Makefile: dlls/d3dx9_34/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_34/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_35/Makefile" +test "x$enable_d3dx9_35" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_35" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_35/Makefile: dlls/d3dx9_35/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_35/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_36/Makefile" +test "x$enable_d3dx9_36" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_36" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_36/Makefile: dlls/d3dx9_36/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_36/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_36/tests/Makefile" +test "x$enable_d3dx9_36_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3dx9_36/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_36/tests/Makefile: dlls/d3dx9_36/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3dx9_36/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dx9_37/Makefile" +test "x$enable_d3dx9_37" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dx9_37" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_37/Makefile: dlls/d3dx9_37/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dx9_37/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dxof/Makefile" +test "x$enable_d3dxof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + d3dxof" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dxof/Makefile: dlls/d3dxof/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3dxof/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3dxof/tests/Makefile" +test "x$enable_d3dxof_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3dxof/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dxof/tests/Makefile: dlls/d3dxof/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3dxof/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dbghelp/Makefile" +test "x$enable_dbghelp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dbghelp" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dbghelp/Makefile: dlls/dbghelp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dbghelp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dciman32/Makefile" +test "x$enable_dciman32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dciman32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dciman32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ddraw/Makefile" +test "x$enable_ddraw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ddraw" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ddraw/Makefile: dlls/ddraw/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ddraw/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ddraw/tests/Makefile" +test "x$enable_ddraw_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + ddraw/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ddraw/tests/Makefile: dlls/ddraw/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/ddraw/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ddrawex/Makefile" +test "x$enable_ddrawex" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ddrawex" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ddrawex/Makefile: dlls/ddrawex/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ddrawex/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/devenum/Makefile" +test "x$enable_devenum" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + devenum" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/devenum/Makefile: dlls/devenum/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/devenum/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dinput/Makefile" +test "x$enable_dinput" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dinput" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dinput/Makefile: dlls/dinput/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dinput/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dinput/tests/Makefile" +test "x$enable_dinput_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dinput/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dinput/tests/Makefile: dlls/dinput/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dinput/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dinput8/Makefile" +test "x$enable_dinput8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dinput8" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dinput8/Makefile: dlls/dinput8/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dinput8/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmband/Makefile" +test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmband" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmband/Makefile: dlls/dmband/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmband/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmcompos/Makefile" +test "x$enable_dmcompos" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmcompos" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmcompos/Makefile: dlls/dmcompos/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmcompos/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmime/Makefile" +test "x$enable_dmime" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmime" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmime/Makefile: dlls/dmime/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmime/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmloader/Makefile" +test "x$enable_dmloader" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmloader" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmloader/Makefile: dlls/dmloader/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmloader/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmscript/Makefile" +test "x$enable_dmscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmscript" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmscript/Makefile: dlls/dmscript/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmscript/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmstyle/Makefile" +test "x$enable_dmstyle" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmstyle" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmstyle/Makefile: dlls/dmstyle/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmstyle/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmsynth/Makefile" +test "x$enable_dmsynth" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmsynth" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmsynth/Makefile: dlls/dmsynth/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmsynth/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmusic/Makefile" +test "x$enable_dmusic" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmusic" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmusic/Makefile: dlls/dmusic/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmusic/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmusic32/Makefile" +test "x$enable_dmusic32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dmusic32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dmusic32/Makefile: dlls/dmusic32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmusic32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dnsapi/Makefile" +test "x$enable_dnsapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dnsapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dnsapi/Makefile: dlls/dnsapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dnsapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dnsapi/tests/Makefile" +test "x$enable_dnsapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dnsapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dnsapi/tests/Makefile: dlls/dnsapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dnsapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dplay/Makefile" +test "x$enable_dplay" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dplay" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dplay/Makefile: dlls/dplay/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dplay/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dplayx/Makefile" +test "x$enable_dplayx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dplayx" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dplayx/Makefile: dlls/dplayx/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dplayx/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dplayx/tests/Makefile" +test "x$enable_dplayx_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dplayx/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dplayx/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dpnaddr/Makefile" +test "x$enable_dpnaddr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dpnaddr" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dpnaddr/Makefile: dlls/dpnaddr/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dpnaddr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dpnet/Makefile" +test "x$enable_dpnet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dpnet" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dpnet/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dpnhpast/Makefile" +test "x$enable_dpnhpast" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dpnhpast" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dpnhpast/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dpnlobby/Makefile" +test "x$enable_dpnlobby" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dpnlobby" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dpnlobby/Makefile: dlls/dpnlobby/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dpnlobby/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dpwsockx/Makefile" +test "x$enable_dpwsockx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dpwsockx" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dpwsockx/Makefile: dlls/dpwsockx/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dpwsockx/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dsound/Makefile" +test "x$enable_dsound" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dsound" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dsound/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dsound/tests/Makefile" +test "x$enable_dsound_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dsound/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/dsound/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dssenh/Makefile" +test "x$enable_dssenh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dssenh" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dssenh/Makefile: dlls/dssenh/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dssenh/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dswave/Makefile" +test "x$enable_dswave" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dswave" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dswave/Makefile: dlls/dswave/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dswave/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dwmapi/Makefile" +test "x$enable_dwmapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dwmapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dwmapi/Makefile: dlls/dwmapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dwmapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxdiagn/Makefile" +test "x$enable_dxdiagn" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dxdiagn" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dxdiagn/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr8/Makefile" +test "x$enable_dxerr8" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + dxerr8" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxerr8/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr9/Makefile" +test "x$enable_dxerr9" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + dxerr9" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxerr9/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxguid/Makefile" +test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + dxguid" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxguid/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/faultrep/Makefile" +test "x$enable_faultrep" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + faultrep" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/faultrep/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/fusion/Makefile" +test "x$enable_fusion" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + fusion" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/fusion/Makefile: dlls/fusion/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/fusion/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/fusion/tests/Makefile" +test "x$enable_fusion_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + fusion/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/fusion/tests/Makefile: dlls/fusion/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/fusion/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gdi32/Makefile" +test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + gdi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/gdi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gdi32/tests/Makefile" +test "x$enable_gdi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + gdi32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gdiplus/Makefile" +test "x$enable_gdiplus" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + gdiplus" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/gdiplus/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gdiplus/tests/Makefile" +test "x$enable_gdiplus_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + gdiplus/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/gdiplus/tests/Makefile: dlls/gdiplus/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/gdiplus/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/glu32/Makefile" +test "x$enable_glu32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + glu32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/glu32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gphoto2.ds/Makefile" +test "x$enable_gphoto2_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + gphoto2.ds" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gpkcsp/Makefile" +test "x$enable_gpkcsp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + gpkcsp" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/gpkcsp/Makefile: dlls/gpkcsp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/gpkcsp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/hal/Makefile" +test "x$enable_hal" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + hal" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/hal/Makefile: dlls/hal/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/hal/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/hhctrl.ocx/Makefile" +test "x$enable_hhctrl_ocx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + hhctrl.ocx" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/hhctrl.ocx/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/hid/Makefile" +test "x$enable_hid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + hid" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/hid/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/hlink/Makefile" +test "x$enable_hlink" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + hlink" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/hlink/Makefile: dlls/hlink/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/hlink/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/hlink/tests/Makefile" +test "x$enable_hlink_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + hlink/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/hlink/tests/Makefile: dlls/hlink/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/hlink/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/hnetcfg/Makefile" +test "x$enable_hnetcfg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + hnetcfg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/hnetcfg/Makefile: dlls/hnetcfg/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/hnetcfg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/iccvid/Makefile" +test "x$enable_iccvid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + iccvid" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/iccvid/Makefile: dlls/iccvid/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/iccvid/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/icmp/Makefile" +test "x$enable_icmp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + icmp" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/icmp/Makefile: dlls/icmp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/icmp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ifsmgr.vxd/Makefile" +test "x$enable_ifsmgr_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ifsmgr.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ifsmgr.vxd/Makefile: dlls/ifsmgr.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ifsmgr.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/imaadp32.acm/Makefile" +test "x$enable_imaadp32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + imaadp32.acm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/imaadp32.acm/Makefile: dlls/imaadp32.acm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/imaadp32.acm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/imagehlp/Makefile" +test "x$enable_imagehlp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + imagehlp" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/imagehlp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/imm32/Makefile" +test "x$enable_imm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + imm32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/imm32/Makefile: dlls/imm32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/imm32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/imm32/tests/Makefile" +test "x$enable_imm32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + imm32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/imm32/tests/Makefile: dlls/imm32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/imm32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/inetcomm/Makefile" +test "x$enable_inetcomm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + inetcomm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/inetcomm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/inetcomm/tests/Makefile" +test "x$enable_inetcomm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + inetcomm/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/inetmib1/Makefile" +test "x$enable_inetmib1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + inetmib1" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/inetmib1/Makefile: dlls/inetmib1/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/inetmib1/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/inetmib1/tests/Makefile" +test "x$enable_inetmib1_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + inetmib1/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/inetmib1/tests/Makefile: dlls/inetmib1/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/inetmib1/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/infosoft/Makefile" +test "x$enable_infosoft" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + infosoft" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/infosoft/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/infosoft/tests/Makefile" +test "x$enable_infosoft_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + infosoft/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/initpki/Makefile" +test "x$enable_initpki" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + initpki" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/initpki/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/inkobj/Makefile" +test "x$enable_inkobj" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + inkobj" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/inkobj/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/inseng/Makefile" +test "x$enable_inseng" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + inseng" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/inseng/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/iphlpapi/Makefile" +test "x$enable_iphlpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + iphlpapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/iphlpapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/iphlpapi/tests/Makefile" +test "x$enable_iphlpapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + iphlpapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/iphlpapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/itircl/Makefile" +test "x$enable_itircl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + itircl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/itircl/Makefile: dlls/itircl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/itircl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/itss/Makefile" +test "x$enable_itss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + itss" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/itss/Makefile: dlls/itss/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/itss/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/itss/tests/Makefile" +test "x$enable_itss_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + itss/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/itss/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/jscript/Makefile" +test "x$enable_jscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + jscript" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/jscript/Makefile: dlls/jscript/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/jscript/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/jscript/tests/Makefile" +test "x$enable_jscript_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + jscript/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/jscript/tests/Makefile: dlls/jscript/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/jscript/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/kernel32/Makefile" +test "x$enable_kernel32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + kernel32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/kernel32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/kernel32/tests/Makefile" +test "x$enable_kernel32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + kernel32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/localspl/Makefile" +test "x$enable_localspl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + localspl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/localspl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/localspl/tests/Makefile" +test "x$enable_localspl_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + localspl/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/localspl/tests/Makefile: dlls/localspl/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/localspl/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/localui/Makefile" +test "x$enable_localui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + localui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/localui/Makefile: dlls/localui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/localui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/localui/tests/Makefile" +test "x$enable_localui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + localui/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/localui/tests/Makefile: dlls/localui/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/localui/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/lz32/Makefile" +test "x$enable_lz32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + lz32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/lz32/Makefile: dlls/lz32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/lz32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/lz32/tests/Makefile" +test "x$enable_lz32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + lz32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/lz32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mapi32/Makefile" +test "x$enable_mapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mapi32/Makefile: dlls/mapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mapi32/tests/Makefile" +test "x$enable_mapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mapi32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mapi32/tests/Makefile: dlls/mapi32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/mapi32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mciavi32/Makefile" +test "x$enable_mciavi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mciavi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mciavi32/Makefile: dlls/mciavi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mciavi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mcicda/Makefile" +test "x$enable_mcicda" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mcicda" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mcicda/Makefile: dlls/mcicda/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mcicda/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mciseq/Makefile" +test "x$enable_mciseq" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mciseq" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mciseq/Makefile: dlls/mciseq/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mciseq/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mciwave/Makefile" +test "x$enable_mciwave" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mciwave" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mciwave/Makefile: dlls/mciwave/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mciwave/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/midimap/Makefile" +test "x$enable_midimap" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + midimap" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/midimap/Makefile: dlls/midimap/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/midimap/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mlang/Makefile" +test "x$enable_mlang" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mlang" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mlang/Makefile: dlls/mlang/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mlang/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mlang/tests/Makefile" +test "x$enable_mlang_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mlang/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mlang/tests/Makefile: dlls/mlang/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/mlang/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mmdevldr.vxd/Makefile" +test "x$enable_mmdevldr_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mmdevldr.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/monodebg.vxd/Makefile" +test "x$enable_monodebg_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + monodebg.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/monodebg.vxd/Makefile: dlls/monodebg.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mountmgr.sys/Makefile" +test "x$enable_mountmgr_sys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mountmgr.sys" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mpr/Makefile" +test "x$enable_mpr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mpr" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mpr/Makefile: dlls/mpr/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mpr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mprapi/Makefile" +test "x$enable_mprapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mprapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mprapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msacm32.drv/Makefile" +test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msacm32.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msacm32.drv/Makefile: dlls/msacm32.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msacm32.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msacm32/Makefile" +test "x$enable_msacm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msacm32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msacm32/Makefile: dlls/msacm32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msacm32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msacm32/tests/Makefile" +test "x$enable_msacm32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + msacm32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msacm32/tests/Makefile: dlls/msacm32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/msacm32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msadp32.acm/Makefile" +test "x$enable_msadp32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msadp32.acm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msadp32.acm/Makefile: dlls/msadp32.acm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msadp32.acm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mscat32/Makefile" +test "x$enable_mscat32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mscat32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mscat32/Makefile: dlls/mscat32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mscat32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mscms/Makefile" +test "x$enable_mscms" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mscms" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mscms/Makefile: dlls/mscms/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mscms/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mscms/tests/Makefile" +test "x$enable_mscms_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mscms/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mscms/tests/Makefile: dlls/mscms/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/mscms/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mscoree/Makefile" +test "x$enable_mscoree" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mscoree" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mscoree/Makefile: dlls/mscoree/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mscoree/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msdmo/Makefile" +test "x$enable_msdmo" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msdmo" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msdmo/Makefile: dlls/msdmo/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msdmo/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msftedit/Makefile" +test "x$enable_msftedit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msftedit" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msftedit/Makefile: dlls/msftedit/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msftedit/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msg711.acm/Makefile" +test "x$enable_msg711_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msg711.acm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msg711.acm/Makefile: dlls/msg711.acm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msg711.acm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mshtml.tlb/Makefile" +test "x$enable_mshtml_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mshtml.tlb" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mshtml.tlb/Makefile: dlls/mshtml.tlb/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mshtml.tlb/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mshtml/Makefile" +test "x$enable_mshtml" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mshtml" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mshtml/Makefile: dlls/mshtml/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mshtml/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mshtml/tests/Makefile" +test "x$enable_mshtml_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mshtml/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mshtml/tests/Makefile: dlls/mshtml/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/mshtml/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msi/Makefile" +test "x$enable_msi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msi/Makefile: dlls/msi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msi/tests/Makefile" +test "x$enable_msi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + msi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msi/tests/Makefile: dlls/msi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/msi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msimg32/Makefile" +test "x$enable_msimg32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msimg32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msimg32/Makefile: dlls/msimg32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msimg32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msimtf/Makefile" +test "x$enable_msimtf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msimtf" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msimtf/Makefile: dlls/msimtf/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msimtf/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msisip/Makefile" +test "x$enable_msisip" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msisip" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msisip/Makefile: dlls/msisip/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msisip/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msisys.ocx/Makefile" +test "x$enable_msisys_ocx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msisys.ocx" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msisys.ocx/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msnet32/Makefile" +test "x$enable_msnet32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msnet32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msnet32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msrle32/Makefile" +test "x$enable_msrle32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msrle32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msrle32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mssip32/Makefile" +test "x$enable_mssip32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mssip32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mssip32/Makefile: dlls/mssip32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mssip32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mstask/Makefile" +test "x$enable_mstask" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mstask" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mstask/Makefile: dlls/mstask/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mstask/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mstask/tests/Makefile" +test "x$enable_mstask_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mstask/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mstask/tests/Makefile: dlls/mstask/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/mstask/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcirt/Makefile" +test "x$enable_msvcirt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvcirt" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcirt/Makefile: dlls/msvcirt/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvcirt/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcr71/Makefile" +test "x$enable_msvcr71" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvcr71" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcr71/Makefile: dlls/msvcr71/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvcr71/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcrt/Makefile" +test "x$enable_msvcrt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvcrt" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcrt/Makefile: dlls/msvcrt/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvcrt/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcrt/tests/Makefile" +test "x$enable_msvcrt_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + msvcrt/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcrt/tests/Makefile: dlls/msvcrt/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/msvcrt/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcrt20/Makefile" +test "x$enable_msvcrt20" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvcrt20" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcrt20/Makefile: dlls/msvcrt20/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvcrt20/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcrt40/Makefile" +test "x$enable_msvcrt40" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvcrt40" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcrt40/Makefile: dlls/msvcrt40/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvcrt40/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcrtd/Makefile" +test "x$enable_msvcrtd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvcrtd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcrtd/Makefile: dlls/msvcrtd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvcrtd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvcrtd/tests/Makefile" +test "x$enable_msvcrtd_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + msvcrtd/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvcrtd/tests/Makefile: dlls/msvcrtd/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/msvcrtd/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvfw32/Makefile" +test "x$enable_msvfw32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvfw32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvfw32/Makefile: dlls/msvfw32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvfw32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvidc32/Makefile" +test "x$enable_msvidc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msvidc32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msvidc32/Makefile: dlls/msvidc32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvidc32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mswsock/Makefile" +test "x$enable_mswsock" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mswsock" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/mswsock/Makefile: dlls/mswsock/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mswsock/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msxml3/Makefile" +test "x$enable_msxml3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msxml3" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msxml3/Makefile: dlls/msxml3/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msxml3/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msxml3/tests/Makefile" +test "x$enable_msxml3_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + msxml3/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msxml3/tests/Makefile: dlls/msxml3/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/msxml3/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/nddeapi/Makefile" +test "x$enable_nddeapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + nddeapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/nddeapi/Makefile: dlls/nddeapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/nddeapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/netapi32/Makefile" +test "x$enable_netapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + netapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/netapi32/Makefile: dlls/netapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/netapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/netapi32/tests/Makefile" +test "x$enable_netapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + netapi32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/netapi32/tests/Makefile: dlls/netapi32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/netapi32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/newdev/Makefile" +test "x$enable_newdev" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + newdev" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/newdev/Makefile: dlls/newdev/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/newdev/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntdll/Makefile" +test "x$enable_ntdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ntdll" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntdll/Makefile: dlls/ntdll/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ntdll/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntdll/tests/Makefile" +test "x$enable_ntdll_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + ntdll/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntdll/tests/Makefile: dlls/ntdll/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/ntdll/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntdsapi/Makefile" +test "x$enable_ntdsapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ntdsapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntdsapi/Makefile: dlls/ntdsapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ntdsapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntdsapi/tests/Makefile" +test "x$enable_ntdsapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + ntdsapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntdsapi/tests/Makefile: dlls/ntdsapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/ntdsapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntoskrnl.exe/Makefile" +test "x$enable_ntoskrnl_exe" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ntoskrnl.exe" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntoskrnl.exe/Makefile: dlls/ntoskrnl.exe/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntprint/Makefile" +test "x$enable_ntprint" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ntprint" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntprint/Makefile: dlls/ntprint/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ntprint/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ntprint/tests/Makefile" +test "x$enable_ntprint_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + ntprint/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ntprint/tests/Makefile: dlls/ntprint/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/ntprint/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/objsel/Makefile" +test "x$enable_objsel" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + objsel" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/objsel/Makefile: dlls/objsel/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/objsel/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/odbc32/Makefile" +test "x$enable_odbc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + odbc32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/odbc32/Makefile: dlls/odbc32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/odbc32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/odbccp32/Makefile" +test "x$enable_odbccp32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + odbccp32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/odbccp32/Makefile: dlls/odbccp32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/odbccp32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/odbccp32/tests/Makefile" +test "x$enable_odbccp32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + odbccp32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/odbccp32/tests/Makefile: dlls/odbccp32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/odbccp32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole32/Makefile" +test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ole32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ole32/Makefile: dlls/ole32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ole32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole32/tests/Makefile" +test "x$enable_ole32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + ole32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ole32/tests/Makefile: dlls/ole32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/ole32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/oleacc/Makefile" +test "x$enable_oleacc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + oleacc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/oleacc/Makefile: dlls/oleacc/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/oleacc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/oleaut32/Makefile" +test "x$enable_oleaut32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + oleaut32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/oleaut32/Makefile: dlls/oleaut32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/oleaut32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/oleaut32/tests/Makefile" +test "x$enable_oleaut32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + oleaut32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/oleaut32/tests/Makefile: dlls/oleaut32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/oleaut32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/olecli32/Makefile" +test "x$enable_olecli32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + olecli32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/olecli32/Makefile: dlls/olecli32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/olecli32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/oledlg/Makefile" +test "x$enable_oledlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + oledlg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/oledlg/Makefile: dlls/oledlg/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/oledlg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/olepro32/Makefile" +test "x$enable_olepro32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + olepro32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/olepro32/Makefile: dlls/olepro32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/olepro32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/olesvr32/Makefile" +test "x$enable_olesvr32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + olesvr32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/olesvr32/Makefile: dlls/olesvr32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/olesvr32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/olethk32/Makefile" +test "x$enable_olethk32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + olethk32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/olethk32/Makefile: dlls/olethk32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/olethk32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/opengl32/Makefile" +test "x$enable_opengl32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + opengl32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/opengl32/Makefile: dlls/opengl32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/opengl32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/opengl32/tests/Makefile" +test "x$enable_opengl32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + opengl32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/opengl32/tests/Makefile: dlls/opengl32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/opengl32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/pdh/Makefile" +test "x$enable_pdh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + pdh" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/pdh/Makefile: dlls/pdh/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/pdh/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/pdh/tests/Makefile" +test "x$enable_pdh_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + pdh/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/pdh/tests/Makefile: dlls/pdh/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/pdh/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/powrprof/Makefile" +test "x$enable_powrprof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + powrprof" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/powrprof/Makefile: dlls/powrprof/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/powrprof/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/printui/Makefile" +test "x$enable_printui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + printui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/printui/Makefile: dlls/printui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/printui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/propsys/Makefile" +test "x$enable_propsys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + propsys" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/propsys/Makefile: dlls/propsys/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/propsys/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/psapi/Makefile" +test "x$enable_psapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + psapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/psapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/psapi/tests/Makefile" +test "x$enable_psapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + psapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/psapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/pstorec/Makefile" +test "x$enable_pstorec" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + pstorec" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/pstorec/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/qcap/Makefile" +test "x$enable_qcap" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + qcap" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/qcap/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/qedit/Makefile" +test "x$enable_qedit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + qedit" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/qedit/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/qedit/tests/Makefile" +test "x$enable_qedit_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + qedit/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/qedit/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/qmgr/Makefile" +test "x$enable_qmgr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + qmgr" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/qmgr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/qmgr/tests/Makefile" +test "x$enable_qmgr_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + qmgr/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/qmgr/tests/Makefile: dlls/qmgr/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/qmgr/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/qmgrprxy/Makefile" +test "x$enable_qmgrprxy" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + qmgrprxy" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/quartz/Makefile" +test "x$enable_quartz" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + quartz" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/quartz/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/quartz/tests/Makefile" +test "x$enable_quartz_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + quartz/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/quartz/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/query/Makefile" +test "x$enable_query" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + query" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/query/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rasapi32/Makefile" +test "x$enable_rasapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rasapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rasapi32/Makefile: dlls/rasapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/rasapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rasapi32/tests/Makefile" +test "x$enable_rasapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + rasapi32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rasapi32/tests/Makefile: dlls/rasapi32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/rasapi32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/resutils/Makefile" +test "x$enable_resutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + resutils" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/resutils/Makefile: dlls/resutils/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/resutils/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/riched20/Makefile" +test "x$enable_riched20" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + riched20" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/riched20/Makefile: dlls/riched20/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/riched20/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/riched20/tests/Makefile" +test "x$enable_riched20_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + riched20/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/riched20/tests/Makefile: dlls/riched20/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/riched20/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/riched32/Makefile" +test "x$enable_riched32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + riched32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/riched32/Makefile: dlls/riched32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/riched32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/riched32/tests/Makefile" +test "x$enable_riched32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + riched32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/riched32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rpcrt4/Makefile" +test "x$enable_rpcrt4" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rpcrt4" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/rpcrt4/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rpcrt4/tests/Makefile" +test "x$enable_rpcrt4_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + rpcrt4/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rsabase/Makefile" +test "x$enable_rsabase" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rsabase" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/rsabase/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rsaenh/Makefile" +test "x$enable_rsaenh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rsaenh" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/rsaenh/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rsaenh/tests/Makefile" +test "x$enable_rsaenh_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + rsaenh/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sane.ds/Makefile" +test "x$enable_sane_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sane.ds" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sane.ds/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sccbase/Makefile" +test "x$enable_sccbase" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sccbase" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sccbase/Makefile: dlls/sccbase/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sccbase/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/schannel/Makefile" +test "x$enable_schannel" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + schannel" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/schannel/Makefile: dlls/schannel/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/schannel/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/schannel/tests/Makefile" +test "x$enable_schannel_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + schannel/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/schannel/tests/Makefile: dlls/schannel/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/schannel/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/secur32/Makefile" +test "x$enable_secur32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + secur32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/secur32/Makefile: dlls/secur32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/secur32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/secur32/tests/Makefile" +test "x$enable_secur32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + secur32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/secur32/tests/Makefile: dlls/secur32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/secur32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/security/Makefile" +test "x$enable_security" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + security" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/security/Makefile: dlls/security/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/security/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sensapi/Makefile" +test "x$enable_sensapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sensapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sensapi/Makefile: dlls/sensapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sensapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/serialui/Makefile" +test "x$enable_serialui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + serialui" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/serialui/Makefile: dlls/serialui/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/serialui/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/serialui/tests/Makefile" +test "x$enable_serialui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + serialui/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/serialui/tests/Makefile: dlls/serialui/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/serialui/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/setupapi/Makefile" +test "x$enable_setupapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + setupapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/setupapi/Makefile: dlls/setupapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/setupapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/setupapi/tests/Makefile" +test "x$enable_setupapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + setupapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/setupapi/tests/Makefile: dlls/setupapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/setupapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sfc/Makefile" +test "x$enable_sfc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sfc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sfc/Makefile: dlls/sfc/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sfc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sfc_os/Makefile" +test "x$enable_sfc_os" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sfc_os" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sfc_os/Makefile: dlls/sfc_os/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sfc_os/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shdoclc/Makefile" +test "x$enable_shdoclc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shdoclc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shdoclc/Makefile: dlls/shdoclc/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/shdoclc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shdocvw/Makefile" +test "x$enable_shdocvw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shdocvw" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shdocvw/Makefile: dlls/shdocvw/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/shdocvw/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shdocvw/tests/Makefile" +test "x$enable_shdocvw_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + shdocvw/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shdocvw/tests/Makefile: dlls/shdocvw/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/shdocvw/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shell32/Makefile" +test "x$enable_shell32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shell32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shell32/Makefile: dlls/shell32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/shell32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shell32/tests/Makefile" +test "x$enable_shell32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + shell32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shell32/tests/Makefile: dlls/shell32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/shell32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shfolder/Makefile" +test "x$enable_shfolder" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shfolder" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shfolder/Makefile: dlls/shfolder/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/shfolder/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shlwapi/Makefile" +test "x$enable_shlwapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shlwapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shlwapi/Makefile: dlls/shlwapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/shlwapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shlwapi/tests/Makefile" +test "x$enable_shlwapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + shlwapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/shlwapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/slbcsp/Makefile" +test "x$enable_slbcsp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + slbcsp" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/slbcsp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/slc/Makefile" +test "x$enable_slc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + slc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/slc/Makefile: dlls/slc/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/slc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/snmpapi/Makefile" +test "x$enable_snmpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + snmpapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/snmpapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/snmpapi/tests/Makefile" +test "x$enable_snmpapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + snmpapi/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/softpub/Makefile" +test "x$enable_softpub" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + softpub" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/softpub/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/spoolss/Makefile" +test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + spoolss" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/spoolss/Makefile: dlls/spoolss/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/spoolss/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/spoolss/tests/Makefile" +test "x$enable_spoolss_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + spoolss/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/spoolss/tests/Makefile: dlls/spoolss/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/spoolss/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/stdole2.tlb/Makefile" +test "x$enable_stdole2_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + stdole2.tlb" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/stdole2.tlb/Makefile: dlls/stdole2.tlb/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/stdole2.tlb/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/stdole32.tlb/Makefile" +test "x$enable_stdole32_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + stdole32.tlb" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/stdole32.tlb/Makefile: dlls/stdole32.tlb/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/stdole32.tlb/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sti/Makefile" +test "x$enable_sti" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sti" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sti/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/strmiids/Makefile" +test "x$enable_strmiids" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + strmiids" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/strmiids/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/svrapi/Makefile" +test "x$enable_svrapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + svrapi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/svrapi/Makefile: dlls/svrapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/svrapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sxs/Makefile" +test "x$enable_sxs" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sxs" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sxs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/tapi32/Makefile" +test "x$enable_tapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + tapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/tapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/twain_32/Makefile" +test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + twain_32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/twain_32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/unicows/Makefile" +test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + unicows" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/unicows/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/url/Makefile" +test "x$enable_url" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + url" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/url/Makefile: dlls/url/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/url/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/urlmon/Makefile" +test "x$enable_urlmon" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + urlmon" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/urlmon/Makefile: dlls/urlmon/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/urlmon/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/urlmon/tests/Makefile" +test "x$enable_urlmon_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + urlmon/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/urlmon/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/user32/Makefile" +test "x$enable_user32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + user32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/user32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/user32/tests/Makefile" +test "x$enable_user32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + user32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/user32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/userenv/Makefile" +test "x$enable_userenv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + userenv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/userenv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/userenv/tests/Makefile" +test "x$enable_userenv_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + userenv/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/userenv/tests/Makefile: dlls/userenv/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/userenv/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/usp10/Makefile" +test "x$enable_usp10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + usp10" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/usp10/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/usp10/tests/Makefile" +test "x$enable_usp10_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + usp10/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/usp10/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/uuid/Makefile" +test "x$enable_uuid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + uuid" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/uuid/Makefile: dlls/uuid/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/uuid/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/uxtheme/Makefile" +test "x$enable_uxtheme" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + uxtheme" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/uxtheme/Makefile: dlls/uxtheme/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/uxtheme/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/uxtheme/tests/Makefile" +test "x$enable_uxtheme_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + uxtheme/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/uxtheme/tests/Makefile: dlls/uxtheme/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/uxtheme/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vdhcp.vxd/Makefile" +test "x$enable_vdhcp_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vdhcp.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vdhcp.vxd/Makefile: dlls/vdhcp.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vdhcp.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vdmdbg/Makefile" +test "x$enable_vdmdbg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vdmdbg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vdmdbg/Makefile: dlls/vdmdbg/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vdmdbg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/version/Makefile" +test "x$enable_version" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + version" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/version/Makefile: dlls/version/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/version/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/version/tests/Makefile" +test "x$enable_version_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + version/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/version/tests/Makefile: dlls/version/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/version/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vmm.vxd/Makefile" +test "x$enable_vmm_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vmm.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vmm.vxd/Makefile: dlls/vmm.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vmm.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vnbt.vxd/Makefile" +test "x$enable_vnbt_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vnbt.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vnbt.vxd/Makefile: dlls/vnbt.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vnbt.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vnetbios.vxd/Makefile" +test "x$enable_vnetbios_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vnetbios.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vnetbios.vxd/Makefile: dlls/vnetbios.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vnetbios.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vtdapi.vxd/Makefile" +test "x$enable_vtdapi_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vtdapi.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vtdapi.vxd/Makefile: dlls/vtdapi.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vtdapi.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/vwin32.vxd/Makefile" +test "x$enable_vwin32_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + vwin32.vxd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/vwin32.vxd/Makefile: dlls/vwin32.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/vwin32.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/w32skrnl/Makefile" +test "x$enable_w32skrnl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + w32skrnl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/w32skrnl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winealsa.drv/Makefile" +test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winealsa.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winealsa.drv/Makefile: dlls/winealsa.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winealsa.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wineaudioio.drv/Makefile" +test "x$enable_wineaudioio_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wineaudioio.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wineaudioio.drv/Makefile: dlls/wineaudioio.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wineaudioio.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winecoreaudio.drv/Makefile" +test "x$enable_winecoreaudio_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winecoreaudio.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winecoreaudio.drv/Makefile: dlls/winecoreaudio.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winecoreaudio.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winecrt0/Makefile" +test "x$enable_winecrt0" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ + winecrt0" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/winecrt0/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wined3d/Makefile" +test "x$enable_wined3d" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wined3d" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wined3d/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winedos/Makefile" +test "x$enable_winedos" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winedos" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winedos/Makefile: dlls/winedos/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winedos/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wineesd.drv/Makefile" +test "x$enable_wineesd_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wineesd.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wineesd.drv/Makefile: dlls/wineesd.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wineesd.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winejack.drv/Makefile" +test "x$enable_winejack_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winejack.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winejack.drv/Makefile: dlls/winejack.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winejack.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winejoystick.drv/Makefile" +test "x$enable_winejoystick_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winejoystick.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winejoystick.drv/Makefile: dlls/winejoystick.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winejoystick.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winemp3.acm/Makefile" +test "x$enable_winemp3_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winemp3.acm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winemp3.acm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winenas.drv/Makefile" +test "x$enable_winenas_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winenas.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winenas.drv/Makefile: dlls/winenas.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winenas.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wineoss.drv/Makefile" +test "x$enable_wineoss_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wineoss.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wineoss.drv/Makefile: dlls/wineoss.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wineoss.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wineps.drv/Makefile" +test "x$enable_wineps_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wineps.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wineps.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winequartz.drv/Makefile" +test "x$enable_winequartz_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winequartz.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winequartz.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winex11.drv/Makefile" +test "x$enable_winex11_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winex11.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winex11.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wing32/Makefile" +test "x$enable_wing32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wing32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wing32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winhttp/Makefile" +test "x$enable_winhttp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winhttp" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winhttp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winhttp/tests/Makefile" +test "x$enable_winhttp_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + winhttp/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/winhttp/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wininet/Makefile" +test "x$enable_wininet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wininet" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wininet/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wininet/tests/Makefile" +test "x$enable_wininet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + wininet/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/wininet/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winmm/Makefile" +test "x$enable_winmm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winmm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winmm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winmm/tests/Makefile" +test "x$enable_winmm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + winmm/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/winmm/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winnls32/Makefile" +test "x$enable_winnls32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winnls32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winnls32/Makefile: dlls/winnls32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winnls32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winscard/Makefile" +test "x$enable_winscard" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winscard" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winscard/Makefile: dlls/winscard/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winscard/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winspool.drv/Makefile" +test "x$enable_winspool_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winspool.drv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winspool.drv/Makefile: dlls/winspool.drv/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/winspool.drv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winspool.drv/tests/Makefile" +test "x$enable_winspool_drv_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + winspool.drv/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wintab32/Makefile" +test "x$enable_wintab32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wintab32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wintab32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wintrust/Makefile" +test "x$enable_wintrust" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wintrust" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wintrust/Makefile: dlls/wintrust/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wintrust/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wintrust/tests/Makefile" +test "x$enable_wintrust_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + wintrust/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wintrust/tests/Makefile: dlls/wintrust/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/wintrust/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wldap32/Makefile" +test "x$enable_wldap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wldap32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wldap32/Makefile: dlls/wldap32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wldap32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wmi/Makefile" +test "x$enable_wmi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wmi" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wmi/Makefile: dlls/wmi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wmi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wnaspi32/Makefile" +test "x$enable_wnaspi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wnaspi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wnaspi32/Makefile: dlls/wnaspi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wnaspi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wow32/Makefile" +test "x$enable_wow32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wow32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wow32/Makefile: dlls/wow32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wow32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ws2_32/Makefile" +test "x$enable_ws2_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ws2_32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ws2_32/Makefile: dlls/ws2_32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/ws2_32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ws2_32/tests/Makefile" +test "x$enable_ws2_32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + ws2_32/tests" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/ws2_32/tests/Makefile: dlls/ws2_32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/ws2_32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wsock32/Makefile" +test "x$enable_wsock32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wsock32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wsock32/Makefile: dlls/wsock32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wsock32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wtsapi32/Makefile" +test "x$enable_wtsapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wtsapi32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wtsapi32/Makefile: dlls/wtsapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wtsapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS documentation/Makefile: documentation/Makefile.in Make.rules" ac_config_files="$ac_config_files documentation/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ fonts/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS fonts/Makefile: fonts/Makefile.in Make.rules" ac_config_files="$ac_config_files fonts/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ include/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS include/Makefile: include/Makefile.in Make.rules" ac_config_files="$ac_config_files include/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS libs/Makefile: libs/Makefile.in Make.rules" ac_config_files="$ac_config_files libs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/port/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS libs/port/Makefile: libs/port/Makefile.in Make.rules" ac_config_files="$ac_config_files libs/port/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/wine/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS libs/wine/Makefile: libs/wine/Makefile.in Make.rules" ac_config_files="$ac_config_files libs/wine/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/wpp/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS libs/wpp/Makefile: libs/wpp/Makefile.in Make.rules" ac_config_files="$ac_config_files libs/wpp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ loader/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS loader/Makefile: loader/Makefile.in Make.rules" ac_config_files="$ac_config_files loader/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/Makefile: programs/Makefile.in Make.rules" ac_config_files="$ac_config_files programs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/clock/Makefile" +test "x$enable_clock" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + clock" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + clock" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/clock/Makefile: programs/clock/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/clock/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/cmd/Makefile" +test "x$enable_cmd" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + cmd" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + cmd" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/cmd/Makefile: programs/cmd/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/cmd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/cmdlgtst/Makefile" +test "x$enable_cmdlgtst" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + cmdlgtst" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/cmdlgtst/Makefile: programs/cmdlgtst/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/cmdlgtst/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/control/Makefile" +test "x$enable_control" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + control" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + control" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/control/Makefile: programs/control/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/control/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/eject/Makefile" +test "x$enable_eject" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + eject" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + eject" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/eject/Makefile: programs/eject/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/eject/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/expand/Makefile" +test "x$enable_expand" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + expand" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + expand" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/expand/Makefile: programs/expand/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/expand/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/explorer/Makefile" +test "x$enable_explorer" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + explorer" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + explorer" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/explorer/Makefile: programs/explorer/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/explorer/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/hh/Makefile" +test "x$enable_hh" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + hh" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + hh" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/hh/Makefile: programs/hh/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/hh/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/icinfo/Makefile" +test "x$enable_icinfo" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + icinfo" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + icinfo" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/icinfo/Makefile: programs/icinfo/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/icinfo/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/iexplore/Makefile" +test "x$enable_iexplore" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + iexplore" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + iexplore" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/iexplore/Makefile: programs/iexplore/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/iexplore/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/msiexec/Makefile" +test "x$enable_msiexec" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + msiexec" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + msiexec" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + msiexec" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/msiexec/Makefile: programs/msiexec/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/msiexec/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/net/Makefile" +test "x$enable_net" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + net" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + net" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/net/Makefile: programs/net/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/net/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/notepad/Makefile" +test "x$enable_notepad" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + notepad" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + notepad" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + notepad" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/notepad/Makefile: programs/notepad/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/notepad/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/oleview/Makefile" +test "x$enable_oleview" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + oleview" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + oleview" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/oleview/Makefile: programs/oleview/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/oleview/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/progman/Makefile" +test "x$enable_progman" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + progman" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + progman" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + progman" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/progman/Makefile: programs/progman/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/progman/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/reg/Makefile" +test "x$enable_reg" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + reg" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + reg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/reg/Makefile: programs/reg/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/reg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/regedit/Makefile" +test "x$enable_regedit" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + regedit" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + regedit" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + regedit" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/regedit/Makefile: programs/regedit/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/regedit/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/regsvr32/Makefile" +test "x$enable_regsvr32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + regsvr32" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + regsvr32" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + regsvr32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/regsvr32/Makefile: programs/regsvr32/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/regsvr32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/rpcss/Makefile" +test "x$enable_rpcss" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + rpcss" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + rpcss" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/rpcss/Makefile: programs/rpcss/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/rpcss/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/rundll32/Makefile" +test "x$enable_rundll32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + rundll32" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + rundll32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/rundll32/Makefile: programs/rundll32/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/rundll32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/secedit/Makefile" +test "x$enable_secedit" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + secedit" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + secedit" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/secedit/Makefile: programs/secedit/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/secedit/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/services/Makefile" +test "x$enable_services" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + services" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + services" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/services/Makefile: programs/services/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/services/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/spoolsv/Makefile" +test "x$enable_spoolsv" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + spoolsv" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + spoolsv" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/spoolsv/Makefile: programs/spoolsv/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/spoolsv/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/start/Makefile" +test "x$enable_start" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + start" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + start" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/start/Makefile: programs/start/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/start/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/svchost/Makefile" +test "x$enable_svchost" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + svchost" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + svchost" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/svchost/Makefile: programs/svchost/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/svchost/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/taskmgr/Makefile" +test "x$enable_taskmgr" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + taskmgr" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + taskmgr" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/taskmgr/Makefile: programs/taskmgr/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/taskmgr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/uninstaller/Makefile" +test "x$enable_uninstaller" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + uninstaller" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + uninstaller" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + uninstaller" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/uninstaller/Makefile: programs/uninstaller/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/uninstaller/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/view/Makefile" +test "x$enable_view" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + view" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/view/Makefile: programs/view/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/view/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/wineboot/Makefile" +test "x$enable_wineboot" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + wineboot" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + wineboot" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + wineboot" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/wineboot/Makefile: programs/wineboot/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/wineboot/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winebrowser/Makefile" +test "x$enable_winebrowser" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winebrowser" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winebrowser" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + winebrowser" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winebrowser/Makefile: programs/winebrowser/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winebrowser/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winecfg/Makefile" +test "x$enable_winecfg" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winecfg" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winecfg" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + winecfg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winecfg/Makefile: programs/winecfg/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winecfg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/wineconsole/Makefile" +test "x$enable_wineconsole" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + wineconsole" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + wineconsole" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + wineconsole" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/wineconsole/Makefile: programs/wineconsole/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/wineconsole/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winedbg/Makefile" +test "x$enable_winedbg" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winedbg" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winedbg" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + winedbg" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winedbg/Makefile: programs/winedbg/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winedbg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winedevice/Makefile" +test "x$enable_winedevice" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winedevice" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winedevice" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winedevice/Makefile: programs/winedevice/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winedevice/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winefile/Makefile" +test "x$enable_winefile" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winefile" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winefile" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + winefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winefile/Makefile: programs/winefile/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winefile/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winemenubuilder/Makefile" +test "x$enable_winemenubuilder" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winemenubuilder" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winemenubuilder" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winemenubuilder/Makefile: programs/winemenubuilder/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winemenubuilder/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winemine/Makefile" +test "x$enable_winemine" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winemine" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winemine" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + winemine" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winemine/Makefile: programs/winemine/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winemine/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winepath/Makefile" +test "x$enable_winepath" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winepath" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winepath" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ + winepath" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winepath/Makefile: programs/winepath/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winepath/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winetest/Makefile" +test "x$enable_winetest" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winetest" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winetest/Makefile: programs/winetest/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winetest/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winevdm/Makefile" +test "x$enable_winevdm" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winevdm" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winevdm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winevdm/Makefile: programs/winevdm/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winevdm/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winhlp32/Makefile" +test "x$enable_winhlp32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winhlp32" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winhlp32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winhlp32/Makefile: programs/winhlp32/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winhlp32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winver/Makefile" +test "x$enable_winver" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + winver" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + winver" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winver/Makefile: programs/winver/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/winver/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/wordpad/Makefile" +test "x$enable_wordpad" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + wordpad" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + wordpad" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/wordpad/Makefile: programs/wordpad/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/wordpad/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/write/Makefile" +test "x$enable_write" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + write" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + write" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/write/Makefile: programs/write/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/write/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/xcopy/Makefile" +test "x$enable_xcopy" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + xcopy" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + xcopy" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/xcopy/Makefile: programs/xcopy/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/xcopy/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ server/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS server/Makefile: server/Makefile.in Make.rules" ac_config_files="$ac_config_files server/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/Makefile: tools/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/widl/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/widl/Makefile: tools/widl/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/widl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winebuild/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/winebuild/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winedump/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/winedump/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winegcc/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/winegcc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/wmc/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/wmc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/wrc/Makefile" + ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/wrc/Makefile" @@ -25988,11 +26877,7 @@ ICOTOOL!$ICOTOOL$ac_delim PRELINK!$PRELINK$ac_delim LIBPTHREAD!$LIBPTHREAD$ac_delim XLIB!$XLIB$ac_delim -XFILES!$XFILES$ac_delim -OPENGLFILES!$OPENGLFILES$ac_delim -GLU32FILES!$GLU32FILES$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim -QUARTZFILES!$QUARTZFILES$ac_delim DLLEXT!$DLLEXT$ac_delim DLLFLAGS!$DLLFLAGS$ac_delim LDSHARED!$LDSHARED$ac_delim @@ -26054,6 +26939,12 @@ DEPENDENCIES!$DEPENDENCIES$ac_delim ALL_MAKERULES!$ALL_MAKERULES$ac_delim ALL_MAKEFILES!$ALL_MAKEFILES$ac_delim ALL_MAKEFILE_DEPENDS!$ALL_MAKEFILE_DEPENDS$ac_delim +ALL_DLL_DIRS!$ALL_DLL_DIRS$ac_delim +ALL_IMPLIB_DIRS!$ALL_IMPLIB_DIRS$ac_delim +ALL_TEST_DIRS!$ALL_TEST_DIRS$ac_delim +ALL_PROGRAM_DIRS!$ALL_PROGRAM_DIRS$ac_delim +ALL_PROGRAM_INSTALL_DIRS!$ALL_PROGRAM_INSTALL_DIRS$ac_delim +ALL_PROGRAM_BIN_INSTALL_DIRS!$ALL_PROGRAM_BIN_INSTALL_DIRS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF diff --git a/configure.ac b/configure.ac index 126de5c2dad..f11f3bf05fd 100644 --- a/configure.ac +++ b/configure.ac @@ -114,10 +114,8 @@ fi dnl enable_tests is yes by default, but in some cases it's better to disable the testsuite if test "x$enable_tests" == "xno" then - AC_SUBST(TESTSUBDIRS,"") AC_SUBST(WINETEST,"") else - AC_SUBST(TESTSUBDIRS,"\$(TESTSUBDIRS)") AC_SUBST(WINETEST,"winetest") fi @@ -229,11 +227,7 @@ dnl Check for -lpthread AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread")) AC_SUBST(XLIB,"") -AC_SUBST(XFILES,"") -AC_SUBST(OPENGLFILES,"") -AC_SUBST(GLU32FILES,"") AC_SUBST(OPENGL_LIBS,"") -AC_SUBST(QUARTZFILES,"") dnl **** Check for header files **** @@ -524,7 +518,7 @@ case $host_os in if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - QUARTZFILES='$(QUARTZFILES)' + enable_winequartz_drv=${enable_winequartz_drv:-yes} fi ;; *) @@ -607,6 +601,8 @@ case $host_os in ;; esac +enable_winequartz_drv=${enable_winequartz_drv:-no} + if test "$LIBEXT" = "a"; then AC_MSG_ERROR( [could not find a way to build shared libraries. @@ -769,11 +765,9 @@ then dnl Check for the presence of the library WINE_CHECK_SONAME(GL,glXCreateContext, [OPENGL_LIBS="-lGL" - OPENGLFILES='$(OPENGLFILES)' AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])], [WINE_CHECK_SONAME(GL,glXCreateContext, [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL" - OPENGLFILES='$(OPENGLFILES)' AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])], [if test -f /usr/X11R6/lib/libGL.a then @@ -786,8 +780,7 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) if test "$ac_cv_header_GL_glu_h" = "yes" then - WINE_CHECK_SONAME(GLU,gluLookAt,[GLU32FILES='$(GLU32FILES)'],, - [$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"], [libGLU development files not found, GLU won't be supported.]) @@ -801,6 +794,9 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg OpenGL and Direct3D won't be supported.]) + test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} + test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} + dnl **** Check for NAS **** AC_SUBST(NASLIBS,"") AC_CHECK_HEADERS(audio/audiolib.h, @@ -815,11 +811,13 @@ OpenGL and Direct3D won't be supported.]) [-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])]) CPPFLAGS="$ac_save_CPPFLAGS" - XFILES='$(XFILES)' else XLIB="" X_CFLAGS="" X_LIBS="" + enable_winex11_drv=${enable_winex11_drv:-no} + enable_opengl32=${enable_opengl32:-no} + enable_glu32=${enable_glu32:-no} fi WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install @@ -1686,6 +1684,13 @@ AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKEFILES,"") AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) +AC_SUBST(ALL_DLL_DIRS,"") +AC_SUBST(ALL_IMPLIB_DIRS,"") +AC_SUBST(ALL_TEST_DIRS,"") +AC_SUBST(ALL_PROGRAM_DIRS,"") +AC_SUBST(ALL_PROGRAM_INSTALL_DIRS,"") +AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") + AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) @@ -1705,362 +1710,362 @@ WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules]) WINE_CONFIG_MAKEFILE([Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([dlls/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([dlls/acledit/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/activeds/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/actxprxy/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/adsiid/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/advapi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/advpack/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/cabinet/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/capi2032/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/cards/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/cfgmgr32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/clusapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/comcat/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/comcat/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/crtdll/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/crypt32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/crypt32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/cryptdlg/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/cryptdll/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/cryptnet/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/cryptui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3d9/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dim/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3drm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3drm/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx8/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx8/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_24/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_25/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_26/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_27/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_28/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_29/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_30/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_31/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_33/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_34/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_35/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dx9_37/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmloader/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmscript/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmstyle/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmsynth/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmusic/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dmusic32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dnsapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dnsapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/dplay/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dplayx/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dplayx/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/dpnaddr/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dpnet/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dpnhpast/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dpnlobby/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dpwsockx/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dsound/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dswave/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/gdiplus/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/glu32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/gphoto2.ds/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/gpkcsp/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/hal/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/hhctrl.ocx/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/hid/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/hlink/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/inetcomm/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/inetmib1/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/inetmib1/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/infosoft/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/infosoft/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/initpki/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/inkobj/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/inseng/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/iphlpapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/iphlpapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/itircl/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/itss/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/itss/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mcicda/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mciseq/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/msadp32.acm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mscat32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mscms/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/mscoree/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msdmo/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msftedit/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msg711.acm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mshtml.tlb/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mshtml/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mshtml/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/msi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/msimg32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msimtf/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msisip/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msisys.ocx/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msnet32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msrle32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mssip32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mstask/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcirt/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcr71/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcrt/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcrt/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcrt20/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/msxml3/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/nddeapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/netapi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/netapi32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/newdev/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntdll/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntdll/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntdsapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntdsapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntoskrnl.exe/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntprint/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ntprint/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/olesvr32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/olethk32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/pdh/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/powrprof/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/printui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/propsys/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/psapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/psapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/pstorec/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/qcap/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/qedit/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/qedit/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/qmgr/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/qmgr/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/resutils/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/riched20/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/riched32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/riched32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/rpcrt4/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/schannel/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/secur32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/secur32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/security/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/sensapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/serialui/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/setupapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/sfc/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/shlwapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/shlwapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/slbcsp/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/user32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/userenv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/userenv/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/usp10/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/uuid/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winecrt0/Makefile],[dlls/Makeimplib.rules]) -WINE_CONFIG_MAKEFILE([dlls/wined3d/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winedos/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wineesd.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winejack.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winejoystick.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winhttp/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winhttp/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules]) -WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules]) -WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules]) +WINE_CONFIG_MAKEFILE([dlls/acledit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/activeds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/actxprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/adsiid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/advapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/advpack/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cabinet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/capi2032/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cards/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cfgmgr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/clusapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/comcat/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/comcat/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +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]) +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]) +WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/crtdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/crypt32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/crypt32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cryptdlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cryptdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cryptnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/cryptui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d9/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dim/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3drm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3drm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_24/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_25/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_26/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_27/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_28/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_29/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_30/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_31/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_33/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_34/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_35/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dx9_37/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmloader/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmstyle/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmsynth/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmusic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmusic32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dnsapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dnsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dplay/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dplayx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dplayx/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dpnaddr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dpnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dpnhpast/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dpnlobby/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dpwsockx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dsound/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dswave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gdiplus/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/glu32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gphoto2.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gpkcsp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/hal/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/hhctrl.ocx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/hid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/hlink/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/inetcomm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/inetmib1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/inetmib1/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/infosoft/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/infosoft/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/initpki/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/inkobj/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/inseng/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/iphlpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/iphlpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/itircl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/itss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/itss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mcicda/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mciseq/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mscat32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mscms/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mscoree/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msdmo/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msftedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msg711.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mshtml.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mshtml/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mshtml/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msimg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msimtf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msisip/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msisys.ocx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msnet32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msrle32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mssip32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mstask/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcirt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcr71/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcrt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcrt/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcrt20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msxml3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/nddeapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/netapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/netapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/newdev/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntdll/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntdsapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntdsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntoskrnl.exe/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntprint/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ntprint/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/olesvr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/olethk32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/pdh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/powrprof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/printui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/propsys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/psapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/psapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/pstorec/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/qcap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/qedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/qedit/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/qmgr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/qmgr/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/resutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/riched20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/riched32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/riched32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rpcrt4/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/schannel/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/secur32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/secur32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/security/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sensapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/serialui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/setupapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sfc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shlwapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/shlwapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/slbcsp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/user32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/userenv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/userenv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/usp10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/uuid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winecrt0/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wined3d/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winedos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wineesd.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winejack.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winejoystick.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winhttp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winhttp/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules]) @@ -2070,51 +2075,51 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/control/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/eject/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/expand/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/oleview/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/progman/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/reg/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/regedit/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/regsvr32/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/rpcss/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/rundll32/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/secedit/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/services/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/wineboot/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winecfg/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/wineconsole/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winedbg/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winedevice/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winefile/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winemenubuilder/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winemine/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winepath/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winetest/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winevdm/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winhlp32/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/wordpad/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/write/Makefile],[programs/Makeprog.rules]) -WINE_CONFIG_MAKEFILE([programs/xcopy/Makefile],[programs/Makeprog.rules]) +WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) +WINE_CONFIG_MAKEFILE([programs/control/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/eject/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/expand/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/oleview/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/progman/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/reg/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/regedit/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/regsvr32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/rpcss/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/rundll32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/secedit/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/services/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) +WINE_CONFIG_MAKEFILE([programs/wineboot/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winecfg/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/wineconsole/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winedbg/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winedevice/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winefile/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winemenubuilder/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winemine/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winepath/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winetest/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winevdm/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winhlp32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/wordpad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/write/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/xcopy/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules]) @@ -2124,6 +2129,12 @@ WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules]) +dnl enable_tests is yes by default, but in some cases it's better to disable the testsuite +if test "x$enable_tests" == "xno" +then + AC_SUBST(ALL_TEST_DIRS,"") +fi + AC_OUTPUT if test "$no_create" = "yes" diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8c482587b18..c9bb2393909 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -7,386 +7,13 @@ VPATH = @srcdir@ INSTALLDIRS = $(DESTDIR)$(dlldir) -# special configure-dependent targets - -GLU32FILES = glu32 -OPENGLFILES = opengl32 -QUARTZFILES = winequartz.drv -XFILES = winex11.drv -EXTRADIRS = @GLU32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@ - -# Subdir list - -BASEDIRS = \ - acledit \ - activeds \ - actxprxy \ - advapi32 \ - advpack \ - amstream \ - appwiz.cpl \ - atl \ - avicap32 \ - avifil32 \ - browseui \ - cabinet \ - capi2032 \ - cards \ - cfgmgr32 \ - clusapi \ - comcat \ - comctl32 \ - comdlg32 \ - compstui \ - credui \ - crtdll \ - crypt32 \ - cryptdlg \ - cryptdll \ - cryptnet \ - cryptui \ - ctapi32 \ - ctl3d32 \ - d3d10 \ - d3d8 \ - d3d9 \ - d3dim \ - d3drm \ - d3dx8 \ - d3dx9_24 \ - d3dx9_25 \ - d3dx9_26 \ - d3dx9_27 \ - d3dx9_28 \ - d3dx9_29 \ - d3dx9_30 \ - d3dx9_31 \ - d3dx9_32 \ - d3dx9_33 \ - d3dx9_34 \ - d3dx9_35 \ - d3dx9_36 \ - d3dx9_37 \ - d3dxof \ - dbghelp \ - dciman32 \ - ddraw \ - ddrawex \ - devenum \ - dinput \ - dinput8 \ - dmband \ - dmcompos \ - dmime \ - dmloader \ - dmscript \ - dmstyle \ - dmsynth \ - dmusic \ - dmusic32 \ - dnsapi \ - dplay \ - dplayx \ - dpnaddr \ - dpnet \ - dpnhpast \ - dpnlobby \ - dpwsockx \ - dsound \ - dssenh \ - dswave \ - dwmapi \ - dxdiagn \ - faultrep \ - fusion \ - gdi32 \ - gdiplus \ - gphoto2.ds \ - gpkcsp \ - hal \ - hhctrl.ocx \ - hid \ - hlink \ - hnetcfg \ - iccvid \ - icmp \ - ifsmgr.vxd \ - imaadp32.acm \ - imagehlp \ - imm32 \ - inetcomm \ - inetmib1 \ - infosoft \ - initpki \ - inkobj \ - inseng \ - iphlpapi \ - itircl \ - itss \ - jscript \ - kernel32 \ - localspl \ - localui \ - lz32 \ - mapi32 \ - mciavi32 \ - mcicda \ - mciseq \ - mciwave \ - midimap \ - mlang \ - mmdevldr.vxd \ - monodebg.vxd \ - mountmgr.sys \ - mpr \ - mprapi \ - msacm32 \ - msacm32.drv \ - msadp32.acm \ - mscat32 \ - mscms \ - mscoree \ - msdmo \ - msftedit \ - msg711.acm \ - mshtml \ - mshtml.tlb \ - msi \ - msimg32 \ - msimtf \ - msisip \ - msisys.ocx \ - msnet32 \ - msrle32 \ - mssip32 \ - mstask \ - msvcirt \ - msvcr71 \ - msvcrt \ - msvcrt20 \ - msvcrt40 \ - msvcrtd \ - msvfw32 \ - msvidc32 \ - mswsock \ - msxml3 \ - nddeapi \ - netapi32 \ - newdev \ - ntdll \ - ntdsapi \ - ntoskrnl.exe \ - ntprint \ - objsel \ - odbc32 \ - odbccp32 \ - ole32 \ - oleacc \ - oleaut32 \ - olecli32 \ - oledlg \ - olepro32 \ - olesvr32 \ - olethk32 \ - pdh \ - powrprof \ - printui \ - propsys \ - psapi \ - pstorec \ - qcap \ - qedit \ - qmgr \ - qmgrprxy \ - quartz \ - query \ - rasapi32 \ - resutils \ - riched20 \ - riched32 \ - rpcrt4 \ - rsabase \ - rsaenh \ - sane.ds \ - sccbase \ - schannel \ - secur32 \ - security \ - sensapi \ - serialui \ - setupapi \ - sfc \ - sfc_os \ - shdoclc \ - shdocvw \ - shell32 \ - shfolder \ - shlwapi \ - slbcsp \ - slc \ - snmpapi \ - softpub \ - spoolss \ - stdole2.tlb \ - stdole32.tlb \ - sti \ - svrapi \ - sxs \ - tapi32 \ - twain_32 \ - unicows \ - url \ - urlmon \ - user32 \ - userenv \ - usp10 \ - uxtheme \ - vdhcp.vxd \ - vdmdbg \ - version \ - vmm.vxd \ - vnbt.vxd \ - vnetbios.vxd \ - vtdapi.vxd \ - vwin32.vxd \ - w32skrnl \ - winealsa.drv \ - wineaudioio.drv \ - winecoreaudio.drv \ - wined3d \ - winedos \ - wineesd.drv \ - winejack.drv \ - winejoystick.drv \ - winemp3.acm \ - winenas.drv \ - wineoss.drv \ - wineps.drv \ - wing32 \ - winhttp \ - wininet \ - winmm \ - winnls32 \ - winscard \ - winspool.drv \ - wintab32 \ - wintrust \ - wldap32 \ - wmi \ - wnaspi32 \ - wow32 \ - ws2_32 \ - wsock32 \ - wtsapi32 - -IMPLIBSUBDIRS = \ - adsiid \ - dxerr8 \ - dxerr9 \ - dxguid \ - strmiids \ - uuid \ - winecrt0 - -TESTSUBDIRS = \ - advapi32/tests \ - advpack/tests \ - browseui/tests \ - cabinet/tests \ - comcat/tests \ - comctl32/tests \ - comdlg32/tests \ - credui/tests \ - crypt32/tests \ - cryptnet/tests \ - d3d8/tests \ - d3d9/tests \ - d3drm/tests \ - d3dx8/tests \ - d3dx9_36/tests \ - d3dxof/tests \ - ddraw/tests \ - dinput/tests \ - dnsapi/tests \ - dplayx/tests \ - dsound/tests \ - fusion/tests \ - gdi32/tests \ - gdiplus/tests \ - hlink/tests \ - imm32/tests \ - inetcomm/tests \ - inetmib1/tests \ - infosoft/tests \ - iphlpapi/tests \ - itss/tests \ - jscript/tests \ - kernel32/tests \ - localspl/tests \ - localui/tests \ - lz32/tests \ - mapi32/tests \ - mlang/tests \ - msacm32/tests \ - mscms/tests \ - mshtml/tests \ - msi/tests \ - mstask/tests \ - msvcrt/tests \ - msvcrtd/tests \ - msxml3/tests \ - netapi32/tests \ - ntdll/tests \ - ntdsapi/tests \ - ntprint/tests \ - odbccp32/tests \ - ole32/tests \ - oleaut32/tests \ - opengl32/tests \ - pdh/tests \ - psapi/tests \ - qedit/tests \ - qmgr/tests \ - quartz/tests \ - rasapi32/tests \ - riched20/tests \ - riched32/tests \ - rpcrt4/tests \ - rsaenh/tests \ - schannel/tests \ - secur32/tests \ - serialui/tests \ - setupapi/tests \ - shdocvw/tests \ - shell32/tests \ - shlwapi/tests \ - snmpapi/tests \ - spoolss/tests \ - urlmon/tests \ - user32/tests \ - userenv/tests \ - usp10/tests \ - uxtheme/tests \ - version/tests \ - winhttp/tests \ - wininet/tests \ - winmm/tests \ - winspool.drv/tests \ - wintrust/tests \ - ws2_32/tests - -SUBDIRS = \ - $(BASEDIRS) \ - $(IMPLIBSUBDIRS) \ - $(TESTSUBDIRS) \ - glu32 \ - opengl32 \ - winequartz.drv \ - winex11.drv - -BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS) @TESTSUBDIRS@ -INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS) -DOCSUBDIRS = $(BASEDIRS) $(EXTRADIRS) +DLLSUBDIRS = @ALL_DLL_DIRS@ +IMPLIBSUBDIRS = @ALL_IMPLIB_DIRS@ +TESTSUBDIRS = @ALL_TEST_DIRS@ +SUBDIRS = $(DLLSUBDIRS) $(IMPLIBSUBDIRS) $(TESTSUBDIRS) +BUILDSUBDIRS = $(DLLSUBDIRS) $(TESTSUBDIRS) +INSTALLSUBDIRS = $(DLLSUBDIRS) $(IMPLIBSUBDIRS) +DOCSUBDIRS = $(DLLSUBDIRS) # 16-bit dlls diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4225e350e31..55f30407bbf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1239,18 +1239,6 @@ static void test_enum_svc(void) ok(returned == (servicecountactive + servicecountinactive), "Something wrong in the calculation\n"); - /* Get the number of all services */ - EnumServicesStatusA(scm_handle, SERVICE_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, - NULL, 0, &needed, &returned, NULL); - services = HeapAlloc(GetProcessHeap(), 0, needed); - EnumServicesStatusA(scm_handle, SERVICE_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, - services, needed, &needed, &returned, NULL); - - /* Check if total is the same as active and inactive win32 services */ - todo_wine - ok(returned == (servicecountactive + servicecountinactive), - "Something wrong in the calculation\n"); - /* Get the number of all services. * Fetch the status of the last call as failing could make the following tests crash * on Wine (we don't return anything yet). @@ -1578,7 +1566,7 @@ static void test_enum_svc(void) NULL, 0, &needed, &returned, NULL, NULL); exservices = HeapAlloc(GetProcessHeap(), 0, needed); pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_ACTIVE, - (BYTE*)exservices, bufsize, &needed, &returned, NULL, NULL); + (BYTE*)exservices, needed, &needed, &returned, NULL, NULL); HeapFree(GetProcessHeap(), 0, exservices); /* Store the number of active driver services */ diff --git a/dlls/comdlg32/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc index f849cfc6345..a5e8a0c461b 100644 --- a/dlls/comdlg32/cdlg_Ja.rc +++ b/dlls/comdlg32/cdlg_Ja.rc @@ -38,8 +38,8 @@ FONT 9, "MS UI Gothic" LTEXT "ƒhƒ‰ƒCƒu(&V):", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÍÙÌß(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒwƒ‹ƒv(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "�ã�‘‚«‹ÖŽ~(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -60,8 +60,8 @@ FONT 9, "MS UI Gothic" LTEXT "ƒhƒ‰ƒCƒu(&V):", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÍÙÌß(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒwƒ‹ƒv(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "�ã�‘‚«‹ÖŽ~(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -71,17 +71,17 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ˆó�ü" FONT 9, "MS UI Gothic" { - LTEXT "Žg—p‚·‚éÌßØÝÀ:", 1088, 6, 6, 40, 9 - LTEXT "’Ê�íŽg‚¤ÌßØÝÀ", 1089, 60, 6, 150, 9 + LTEXT "Žg—p‚·‚éƒvƒŠƒ“ƒ^:", 1088, 6, 6, 40, 9 + LTEXT "’Ê�íŽg‚¤ƒvƒŠƒ“ƒ^", 1089, 60, 6, 150, 9 GROUPBOX "ˆó�ü”͈͂̑I‘ð", 1072, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "‘Sƒy�[ƒW(&A)", 1056, 16, 45, 60, 12 RADIOBUTTON "‘I‘ð‚µ‚½•”•ª(&E)", 1057, 16, 60, 60, 12 RADIOBUTTON "ƒy�[ƒWŽw’è(&P)", 1058, 16, 75, 60, 12 DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÌßØÝÀ‚Ì�Ý’è(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "Íß°¼Þ‚©‚ç(&F):", 1090, 60, 80, 30, 9 - LTEXT "Íß°¼Þ‚Ü‚Å(&T):", 1091, 120, 80, 30, 9 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒvƒŠƒ“ƒ^‚Ì�Ý’è(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "ƒy�[ƒW‚©‚ç(&F):", 1090, 60, 80, 30, 9 + LTEXT "ƒy�[ƒW‚Ü‚Å(&T):", 1091, 120, 80, 30, 9 LTEXT "ˆóŽš•iŽ¿(&Q):", 1092, 6, 100, 76, 9 COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "ƒtƒ@ƒCƒ‹‚Ö�o—Í(&L)", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP @@ -100,7 +100,7 @@ FONT 9, "MS UI Gothic" RADIOBUTTON "‚»‚Ì‘¼‚̃vƒŠƒ“ƒ^(&P)", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "ˆó�ü‚ÌŒü‚«", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "�c(&R)", 1058, 50, 100, 40, 12 @@ -108,7 +108,7 @@ FONT 9, "MS UI Gothic" ICON "LANDSCAP", 1097, 10, 95, 32, 32 ICON "PORTRAIT", 1098, 10, 95, 32, 32 GROUPBOX "—pŽ†‚Ì‘I‘ð", 1074, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "—pŽ†»²½Þ(&Z)", 1089, 130, 95, 30, 9 + LTEXT "—pŽ†ƒTƒCƒY(&Z)", 1089, 130, 95, 30, 9 LTEXT "‹‹Ž†•û–@(&S)", 1090, 130, 110, 30, 9 COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -120,19 +120,19 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ƒtƒHƒ“ƒg‚ÌŽw’è" FONT 9, "MS UI Gothic" { - LTEXT "Ì«ÝÄ–¼(&F):",1088 ,6,3,40,9 + LTEXT "ƒtƒHƒ“ƒg–¼(&F):",1088 ,6,3,40,9 COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "½À²Ù(&Y):",1089 ,108,3,44,9 + LTEXT "ƒXƒ^ƒCƒ‹(&Y):",1089 ,108,3,44,9 COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "»²½Þ(&S):",1090,179,3,30,9 + LTEXT "ƒTƒCƒY(&S):",1090,179,3,30,9 COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "·¬Ý¾Ù",IDCANCEL,218,23,40,14,WS_GROUP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,218,23,40,14,WS_GROUP PUSHBUTTON "•¶Žš�ü‚è(&A)", 1026,218,40,40,14,WS_GROUP - PUSHBUTTON "ÍÙÌß(&H)" , 1038,218,57,40,14,WS_GROUP + PUSHBUTTON "ƒwƒ‹ƒv(&H)" , 1038,218,57,40,14,WS_GROUP GROUPBOX "•¶Žš�ü‚è",1072,6,72,84,34,WS_GROUP CHECKBOX "Žæ‚è�Á‚µ�ü(&K)", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "‰º�ü(&U)", 1041, 10,94,50,10, BS_AUTOCHECKBOX @@ -173,8 +173,8 @@ FONT 9, "MS UI Gothic" CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÍÙÌß(&H)", 1038,100,166, 44, 14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒwƒ‹ƒv(&H)", 1038,100,166, 44, 14 PUSHBUTTON "’ljÁ(&A)", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "�F‚Ì�ì�¬(&D)...", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ @@ -195,8 +195,8 @@ FONT 9, "MS UI Gothic" CONTROL "‰º‚ÖŒü‚©‚Á‚Ä(&D)", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 DEFPUSHBUTTON "ŽŸ‚ðŒŸ�õ(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, IDCANCEL, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÍÙÌß(&H)", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, IDCANCEL, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒwƒ‹ƒv(&H)", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -215,8 +215,8 @@ FONT 9, "MS UI Gothic" DEFPUSHBUTTON "ŽŸ‚ðŒŸ�õ(&F)", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "’uŠ·‚µ‚ÄŽŸ‚É(&R)", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "‚·‚ׂĂð’uŠ·(&A)", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÍÙÌß(&H)", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒwƒ‹ƒv(&H)", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } @@ -227,13 +227,13 @@ CAPTION " FONT 9, "MS UI Gothic" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "·¬Ý¾Ù", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "ÍÙÌß(&H)", pshHelp, 50, 161, 48,14, WS_GROUP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "ƒwƒ‹ƒv(&H)", pshHelp, 50, 161, 48,14, WS_GROUP - GROUPBOX "ÌßØÝÀ", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "̧²Ù‚Ö�o—Í(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 - PUSHBUTTON "ÌßÛÊßè(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "ÌßØÝÀ–¼(&N):", stc6, 16, 20, 36,8 + GROUPBOX "ƒvƒŠƒ“ƒ^", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "ƒtƒ@ƒCƒ‹‚Ö�o—Í(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + PUSHBUTTON "ƒvƒ�ƒpƒeƒB(&P)", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "ƒvƒŠƒ“ƒ^–¼(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "�ó‘Ô:", stc8, 16, 36, 36,10, SS_NOPREFIX LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -241,7 +241,7 @@ FONT 9, "MS UI Gothic" LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "�ê�Š:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ºÒÝÄ:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "ƒRƒ�ƒ“ƒg:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "ˆó�ü•”�”", grp2, 160, 92, 120,64, WS_GROUP @@ -252,12 +252,12 @@ FONT 9, "MS UI Gothic" GROUPBOX "ˆó�ü”͈Í", grp1, 8,92, 144,64, WS_GROUP CONTROL "‚·‚ׂÄ(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Íß°¼ÞŽw’è(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "ƒy�[ƒWŽw’è(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "‘I‘ð‚µ‚½•”•ª(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "Íß°¼Þ‚©‚ç(&F)", stc2, 52,124, 20,8 - RTEXT "Íß°¼Þ‚Ü‚Å(&T)", stc3, 100,124, 16,8 + RTEXT "ƒy�[ƒW‚©‚ç(&F)", stc2, 52,124, 20,8 + RTEXT "ƒy�[ƒW‚Ü‚Å(&T)", stc3, 100,124, 16,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 @@ -267,12 +267,12 @@ CAPTION " FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,232,156,48,14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,232,156,48,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "ÌßØÝÀ", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "ÌßÛÊßè(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "ÌßØÝÀ–¼(&N):", stc6, 16, 20, 36,8 + GROUPBOX "ƒvƒŠƒ“ƒ^", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "ƒvƒ�ƒpƒeƒB(&P)", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "ƒvƒŠƒ“ƒ^–¼(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "�ó‘Ô:", stc8, 16, 36, 36,10, SS_NOPREFIX LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -280,11 +280,11 @@ BEGIN LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "�ê�Š:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ºÒÝÄ:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "ƒRƒ�ƒ“ƒg:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "—pŽ†", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "—pŽ†»²½Þ(&Z):", stc2, 16,108, 36, 8 + LTEXT "—pŽ†ƒTƒCƒY(&Z):", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Source:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -297,47 +297,47 @@ END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "̧²Ù‚ðŠJ‚­" +CAPTION "ƒtƒ@ƒCƒ‹‚ðŠJ‚­" FONT 9, "MS UI Gothic" { - LTEXT "̧²Ù‚Ì�ê�Š(&I):",IDC_LOOKINSTATIC,5,6,52,8, SS_NOTIFY + LTEXT "ƒtƒ@ƒCƒ‹‚Ì�ê�Š(&I):",IDC_LOOKINSTATIC,5,6,52,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,56,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 188, 2, 82, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "̧²Ù–¼(&N):",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY + LTEXT "ƒtƒ@ƒCƒ‹–¼(&N):",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY EDITTEXT IDC_FILENAME,56,110,153,12,ES_AUTOHSCROLL - LTEXT "̧²Ù‚ÌŽí—Þ(&T):",IDC_FILETYPESTATIC,5,128,52,8, SS_NOTIFY + LTEXT "ƒtƒ@ƒCƒ‹‚ÌŽí—Þ(&T):",IDC_FILETYPESTATIC,5,128,52,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,56,126,153,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "“Ç‚ÝŽæ‚è�ê—p̧²Ù‚Æ‚µ‚ÄŠJ‚­(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + CONTROL "“Ç‚ÝŽæ‚è�ê—pƒtƒ@ƒCƒ‹‚Æ‚µ‚ÄŠJ‚­(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 DEFPUSHBUTTON "ŠJ‚­(&O)", IDOK,222,110,50,14 - PUSHBUTTON "·¬Ý¾Ù", IDCANCEL,222,128,50,14 - PUSHBUTTON "ÍÙÌß(&H)", pshHelp,222,145,50,14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL,222,128,50,14 + PUSHBUTTON "ƒwƒ‹ƒv(&H)", pshHelp,222,145,50,14 } STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&About FolderPicker Test" - IDS_DOCUMENTFOLDERS "Document Folders" - IDS_PERSONAL "My Documents" + IDS_DOCUMENTFOLDERS "ƒhƒLƒ…ƒ�ƒ“ƒg ƒtƒHƒ‹ƒ_" + IDS_PERSONAL "ƒ}ƒC ƒhƒLƒ…ƒ�ƒ“ƒg" IDS_FAVORITES "‚¨‹C‚É“ü‚è" - IDS_PATH "System Path" - IDS_DESKTOP "ÃÞ½¸Ä¯Ìß" - IDS_FONTS "Fonts" - IDS_MYCOMPUTER "ϲ ºÝËß­°À" + IDS_PATH "ƒVƒXƒeƒ€ ƒpƒX" + IDS_DESKTOP "ƒfƒXƒNƒgƒbƒv" + IDS_FONTS "ƒtƒHƒ“ƒg" + IDS_MYCOMPUTER "ƒ}ƒC ƒRƒ“ƒsƒ…�[ƒ^" } STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "System Folders" - IDS_LOCALHARDRIVES "Local Hard Drives" - IDS_FILENOTFOUND "̧²Ù‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�B" - IDS_VERIFYFILE "̧²Ù–¼‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢�B" - IDS_CREATEFILE "‚±‚Ì̧²Ù‚Í‘¶�Ý‚µ‚Ü‚¹‚ñ�B\n�ì�¬‚µ‚Ü‚·‚©?" + IDS_SYSTEMFOLDERS "ƒVƒXƒeƒ€ ƒtƒHƒ‹ƒ_" + IDS_LOCALHARDRIVES "ƒ��[ƒJƒ‹ ƒn�[ƒh ƒhƒ‰ƒCƒu" + IDS_FILENOTFOUND "ƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�B" + IDS_VERIFYFILE "ƒtƒ@ƒCƒ‹–¼‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢�B" + IDS_CREATEFILE "‚±‚̃tƒ@ƒCƒ‹‚Í‘¶�Ý‚µ‚Ü‚¹‚ñ�B\n�ì�¬‚µ‚Ü‚·‚©?" IDS_OVERWRITEFILE "File already exists.\nDo you want to replace it?" IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" IDS_INVALID_FILENAME "A filename cannot contain any of the following characters:\n / : < > |" diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 93a0b49131e..958cb962b3e 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -61,7 +61,7 @@ D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5, p1, p2, p3; + D3DXMATRIX m1, m2, m3, m4, m5; D3DXMatrixScaling(&m1, scaling, scaling, scaling); if ( !rotationcenter ) @@ -90,10 +90,10 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scalin { D3DXMatrixTranslation(&m5, translation->x, translation->y, translation->z); } - D3DXMatrixMultiply(&p1, &m1, &m2); - D3DXMatrixMultiply(&p2, &p1, &m3); - D3DXMatrixMultiply(&p3, &p2, &m4); - D3DXMatrixMultiply(pout, &p3, &m5); + D3DXMatrixMultiply(&m1, &m1, &m2); + D3DXMatrixMultiply(&m1, &m1, &m3); + D3DXMatrixMultiply(&m1, &m1, &m4); + D3DXMatrixMultiply(pout, &m1, &m5); return pout; } @@ -105,7 +105,7 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm) v1.x = pm->u.m[0][0]; v1.y = pm->u.m[1][0]; v1.z = pm->u.m[2][0]; v1.w = pm->u.m[3][0]; v2.x = pm->u.m[0][1]; v2.y = pm->u.m[1][1]; v2.z = pm->u.m[2][1]; v2.w = pm->u.m[3][1]; v3.x = pm->u.m[0][2]; v3.y = pm->u.m[1][2]; v3.z = pm->u.m[2][2]; v3.w = pm->u.m[3][2]; - D3DXVec4Cross(&minor,&v1,&v2,&v3); + D3DXVec4Cross(&minor, &v1, &v2, &v3); det = - (pm->u.m[0][3] * minor.x + pm->u.m[1][3] * minor.y + pm->u.m[2][3] * minor.z + pm->u.m[3][3] * minor.w); return det; } @@ -218,10 +218,8 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2) { - D3DXMATRIX temp; - - D3DXMatrixMultiply(&temp, pm1, pm2); - D3DXMatrixTranspose(pout, &temp); + D3DXMatrixMultiply(pout, pm1, pm2); + D3DXMatrixTranspose(pout, pout); return pout; } @@ -421,15 +419,15 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) { - D3DXMATRIX m, pout1, pout2, pout3; + D3DXMATRIX m; - D3DXMatrixIdentity(&pout3); - D3DXMatrixRotationZ(&m,roll); - D3DXMatrixMultiply(&pout2,&pout3,&m); - D3DXMatrixRotationX(&m,pitch); - D3DXMatrixMultiply(&pout1,&pout2,&m); - D3DXMatrixRotationY(&m,yaw); - D3DXMatrixMultiply(pout,&pout1,&m); + D3DXMatrixIdentity(pout); + D3DXMatrixRotationZ(&m, roll); + D3DXMatrixMultiply(pout, pout, &m); + D3DXMatrixRotationX(&m, pitch); + D3DXMatrixMultiply(pout, pout, &m); + D3DXMatrixRotationY(&m, yaw); + D3DXMatrixMultiply(pout, pout, &m); return pout; } D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle) @@ -479,7 +477,7 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation) { - D3DXMATRIX m1, m2, m3, m4, m5, m6, m7, p1, p2, p3, p4, p5; + D3DXMATRIX m1, m2, m3, m4, m5, m6, m7; D3DXQUATERNION prc; D3DXVECTOR3 psc, pt; @@ -548,12 +546,12 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 } D3DXMatrixTranslation(&m5, psc.x - prc.x, psc.y - prc.y, psc.z - prc.z); D3DXMatrixTranslation(&m7, prc.x + pt.x, prc.y + pt.y, prc.z + pt.z); - D3DXMatrixMultiply(&p1, &m1, &m2); - D3DXMatrixMultiply(&p2, &p1, &m3); - D3DXMatrixMultiply(&p3, &p2, &m4); - D3DXMatrixMultiply(&p4, &p3, &m5); - D3DXMatrixMultiply(&p5, &p4, &m6); - D3DXMatrixMultiply(pout, &p5, &m7); + D3DXMatrixMultiply(&m1, &m1, &m2); + D3DXMatrixMultiply(&m1, &m1, &m3); + D3DXMatrixMultiply(&m1, &m1, &m4); + D3DXMatrixMultiply(&m1, &m1, &m5); + D3DXMatrixMultiply(&m1, &m1, &m6); + D3DXMatrixMultiply(pout, &m1, &m7); return pout; } diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 97109a2b010..48499ac6df1 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -29,7 +29,7 @@ LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device) { D3DCAPS9 caps; - TRACE("(void): relay\n"); + TRACE("device %p\n", device); if (!device) return NULL; @@ -107,7 +107,7 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) { D3DCAPS9 caps; - TRACE("(void): relay\n"); + TRACE("device %p\n", device); if (!device) return NULL; diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 54d78a147dd..128134668a2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -77,18 +77,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define TOKEN_CSTRING 51 #define TOKEN_ARRAY 52 +#define CLSIDFMT "<%08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X>" + typedef struct { /* Buffer to parse */ LPBYTE buffer; DWORD rem_bytes; - /* Dump template content */ - char* dump; - DWORD pos; - DWORD size; + /* Misc info */ BOOL txt; + BYTE value[100]; + IDirectXFileImpl* pdxf; } parse_buffer; - static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; @@ -209,18 +209,6 @@ static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) return TRUE; } -static void add_string(parse_buffer * buf, const char * str) -{ - DWORD len = strlen(str); - if ((buf->pos + len + 1) > buf->size) - { - FIXME("Dump buffer to small\n"); - return; - } - sprintf(buf->dump + buf->pos, str); - buf->pos += len; -} - static void dump_TOKEN(WORD token) { #define DUMP_TOKEN(t) case t: TRACE(#t "\n"); break @@ -379,8 +367,11 @@ static WORD get_keyword_token(parse_buffer* buf) static BOOL is_guid(parse_buffer* buf) { - static char tmp[50]; + char tmp[50]; DWORD pos = 1; + GUID class_id; + DWORD tab[10]; + int ret; if (*buf->buffer != '<') return FALSE; @@ -397,16 +388,36 @@ static BOOL is_guid(parse_buffer* buf) TRACE("Wrong guid %s (%d) \n", tmp, pos); return FALSE; } - TRACE("Found guid %s (%d) \n", tmp, pos); buf->buffer += pos; buf->rem_bytes -= pos; + ret = sscanf(tmp, CLSIDFMT, &class_id.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); + if (ret != 11) + { + TRACE("Wrong guid %s (%d) \n", tmp, pos); + return FALSE; + } + TRACE("Found guid %s (%d) \n", tmp, pos); + + class_id.Data2 = tab[0]; + class_id.Data3 = tab[1]; + class_id.Data4[0] = tab[2]; + class_id.Data4[1] = tab[3]; + class_id.Data4[2] = tab[4]; + class_id.Data4[3] = tab[5]; + class_id.Data4[4] = tab[6]; + class_id.Data4[5] = tab[7]; + class_id.Data4[6] = tab[8]; + class_id.Data4[7] = tab[9]; + + *(GUID*)buf->value = class_id; + return TRUE; } static BOOL is_name(parse_buffer* buf) { - static char tmp[50]; + char tmp[50]; DWORD pos = 0; char c; BOOL error = 0; @@ -428,6 +439,34 @@ static BOOL is_name(parse_buffer* buf) buf->rem_bytes -= pos; TRACE("Found name %s\n", tmp); + strcpy((char*)buf->value, tmp); + + return TRUE; +} + +static BOOL is_integer(parse_buffer* buf) +{ + char tmp[50]; + DWORD pos = 0; + char c; + DWORD integer; + + while (!is_separator(c = *(buf->buffer+pos))) + { + if (!((c >= '0') && (c <= '9'))) + return FALSE; + tmp[pos++] = c; + } + tmp[pos] = 0; + + buf->buffer += pos; + buf->rem_bytes -= pos; + + sscanf(tmp, "%d", &integer); + + TRACE("Found integer %s - %d\n", tmp, integer); + + *(WORD*)buf->value = integer; return TRUE; } @@ -469,7 +508,11 @@ static WORD parse_TOKEN_dbg_opt(parse_buffer * buf, BOOL show_token) token = TOKEN_GUID; break; } - + if (is_integer(buf)) + { + token = TOKEN_INTEGER; + break; + } if (is_name(buf)) { token = TOKEN_NAME; @@ -495,81 +538,31 @@ static WORD parse_TOKEN_dbg_opt(parse_buffer * buf, BOOL show_token) case TOKEN_GUID: case TOKEN_INTEGER_LIST: case TOKEN_FLOAT_LIST: - break; case TOKEN_OBRACE: - add_string(buf, "{ "); - break; case TOKEN_CBRACE: - add_string(buf, "} "); - break; case TOKEN_OPAREN: - add_string(buf, "( "); - break; case TOKEN_CPAREN: - add_string(buf, ") "); - break; case TOKEN_OBRACKET: - add_string(buf, "[ "); - break; case TOKEN_CBRACKET: - add_string(buf, "] "); - break; case TOKEN_OANGLE: - add_string(buf, "< "); - break; case TOKEN_CANGLE: - add_string(buf, "> "); - break; case TOKEN_DOT: - add_string(buf, "."); - break; case TOKEN_COMMA: - add_string(buf, ", "); - break; case TOKEN_SEMICOLON: - add_string(buf, "; "); - break; case TOKEN_TEMPLATE: - add_string(buf, "template "); - break; case TOKEN_WORD: - add_string(buf, "WORD "); - break; case TOKEN_DWORD: - add_string(buf, "DWORD "); - break; case TOKEN_FLOAT: - add_string(buf, "FLOAT "); - break; case TOKEN_DOUBLE: - add_string(buf, "DOUBLE "); - break; case TOKEN_CHAR: - add_string(buf, "CHAR "); - break; case TOKEN_UCHAR: - add_string(buf, "UCHAR "); - break; case TOKEN_SWORD: - add_string(buf, "SWORD "); - break; case TOKEN_SDWORD: - add_string(buf, "SDWORD "); - break; case TOKEN_VOID: - add_string(buf, "VOID "); - break; case TOKEN_LPSTR: - add_string(buf, "LPSTR "); - break; case TOKEN_UNICODE: - add_string(buf, "UNICODE "); - break; case TOKEN_CSTRING: - add_string(buf, "CSTRING "); - break; case TOKEN_ARRAY: - add_string(buf, "array "); break; default: return 0; @@ -581,6 +574,40 @@ static WORD parse_TOKEN_dbg_opt(parse_buffer * buf, BOOL show_token) return token; } +static const char* get_primitive_string(WORD token) +{ + switch(token) + { + case TOKEN_WORD: + return "WORD"; + case TOKEN_DWORD: + return "DWORD"; + case TOKEN_FLOAT: + return "FLOAT"; + case TOKEN_DOUBLE: + return "DOUBLE"; + case TOKEN_CHAR: + return "CHAR"; + case TOKEN_UCHAR: + return "UCHAR"; + case TOKEN_SWORD: + return "SWORD"; + case TOKEN_SDWORD: + return "SDWORD"; + case TOKEN_VOID: + return "VOID"; + case TOKEN_LPSTR: + return "LPSTR"; + case TOKEN_UNICODE: + return "UNICODE"; + case TOKEN_CSTRING: + return "CSTRING "; + default: + break; + } + return NULL; +} + static inline WORD parse_TOKEN(parse_buffer * buf) { return parse_TOKEN_dbg_opt(buf, TRUE); @@ -639,7 +666,7 @@ static inline BOOL is_primitive_type(WORD token) static BOOL parse_name(parse_buffer * buf) { DWORD count; - static char strname[100]; + char strname[100]; if (parse_TOKEN(buf) != TOKEN_NAME) return FALSE; @@ -651,8 +678,8 @@ static BOOL parse_name(parse_buffer * buf) return FALSE; strname[count] = 0; /*TRACE("name = %s\n", strname);*/ - add_string(buf, strname); - add_string(buf, " "); + + strcpy((char*)buf->value, strname); return TRUE; } @@ -668,10 +695,11 @@ static BOOL parse_class_id(parse_buffer * buf) return TRUE; if (!read_bytes(buf, &class_id, 16)) return FALSE; - sprintf(strguid, "<%08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X>", class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0], + sprintf(strguid, CLSIDFMT, class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0], class_id.Data4[1], class_id.Data4[2], class_id.Data4[3], class_id.Data4[4], class_id.Data4[5], class_id.Data4[6], class_id.Data4[7]); /*TRACE("guid = {%s}\n", strguid);*/ - add_string(buf, strguid); + + *(GUID*)buf->value = class_id; return TRUE; } @@ -682,17 +710,21 @@ static BOOL parse_integer(parse_buffer * buf) if (parse_TOKEN(buf) != TOKEN_INTEGER) return FALSE; + if (buf->txt) + return TRUE; if (!read_bytes(buf, &integer, 4)) return FALSE; /*TRACE("integer = %ld\n", integer);*/ - sprintf(buf->dump+buf->pos, "%d ", integer); - buf->pos = strlen(buf->dump); + + *(DWORD*)buf->value = integer; return TRUE; } static BOOL parse_template_option_info(parse_buffer * buf) { + xtemplate* cur_template = &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates]; + if (check_TOKEN(buf) == TOKEN_DOT) { parse_TOKEN(buf); @@ -700,8 +732,7 @@ static BOOL parse_template_option_info(parse_buffer * buf) return FALSE; if (parse_TOKEN(buf) != TOKEN_DOT) return FALSE; - sprintf(buf->dump+buf->pos, " "); - buf->pos = strlen(buf->dump); + cur_template->open = TRUE; } else { @@ -709,86 +740,144 @@ static BOOL parse_template_option_info(parse_buffer * buf) { if (!parse_name(buf)) return FALSE; + strcpy(cur_template->childs[cur_template->nb_childs], (char*)buf->value); if (check_TOKEN(buf) == TOKEN_GUID) if (!parse_class_id(buf)) return FALSE; + cur_template->nb_childs++; if (check_TOKEN(buf) != TOKEN_COMMA) break; parse_TOKEN(buf); } + cur_template->open = FALSE; } + return TRUE; } static BOOL parse_template_members_list(parse_buffer * buf) { parse_buffer save1; + int idx_member = 0; + member* cur_member; + while (1) { + cur_member = &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[idx_member]; save1 = *buf; + if (check_TOKEN(buf) == TOKEN_NAME) { if (!parse_name(buf)) break; + while (cur_member->idx_template < buf->pdxf->nb_xtemplates) + { + if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + break; + cur_member->idx_template++; + } + if (cur_member->idx_template == buf->pdxf->nb_xtemplates) + { + TRACE("Reference to non existing template '%s'\n", (char*)buf->value); + return FALSE; + } if (check_TOKEN(buf) == TOKEN_NAME) if (!parse_name(buf)) break; if (parse_TOKEN(buf) != TOKEN_SEMICOLON) break; + cur_member->type = TOKEN_NAME; + strcpy(cur_member->name, (char*)buf->value); + idx_member++; } else if (check_TOKEN(buf) == TOKEN_ARRAY) { parse_buffer save2; WORD token; + int nb_dims = 0; + parse_TOKEN(buf); token = check_TOKEN(buf); if (is_primitive_type(token)) { parse_TOKEN(buf); + cur_member->type = token; } else { if (!parse_name(buf)) break; + cur_member->type = TOKEN_NAME; + cur_member->idx_template = 0; + while (cur_member->idx_template < buf->pdxf->nb_xtemplates) + { + if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + break; + cur_member->idx_template++; + } + if (cur_member->idx_template == buf->pdxf->nb_xtemplates) + { + TRACE("Reference to non existing template '%s'\n", (char*)buf->value); + return FALSE; + } } if (!parse_name(buf)) break; + strcpy(cur_member->name, (char*)buf->value); save2 = *buf; while (check_TOKEN(buf) == TOKEN_OBRACKET) { + if (nb_dims) + { + FIXME("No support for multi-dimensional array yet\n"); + return FALSE; + } parse_TOKEN(buf); if (check_TOKEN(buf) == TOKEN_INTEGER) { if (!parse_integer(buf)) break; + cur_member->dim_fixed[nb_dims] = TRUE; + cur_member->dim_value[nb_dims] = *(DWORD*)buf->value; } else { if (!parse_name(buf)) break; + cur_member->dim_fixed[nb_dims] = FALSE; + /* Hack: Assume array size is specified in previous member */ + cur_member->dim_value[nb_dims] = idx_member - 1; } if (parse_TOKEN(buf) != TOKEN_CBRACKET) break; save2 = *buf; + nb_dims++; } *buf = save2; if (parse_TOKEN(buf) != TOKEN_SEMICOLON) break; + cur_member->nb_dims = nb_dims; + idx_member++; } else if (is_primitive_type(check_TOKEN(buf))) { + cur_member->type = check_TOKEN(buf); parse_TOKEN(buf); if (check_TOKEN(buf) == TOKEN_NAME) if (!parse_name(buf)) break; + strcpy(cur_member->name, (char*)buf->value); if (parse_TOKEN(buf) != TOKEN_SEMICOLON) break; + idx_member++; } else break; - add_string(buf, "\n"); } + *buf = save1; + buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].nb_members = idx_member; + return TRUE; } @@ -801,7 +890,6 @@ static BOOL parse_template_parts(parse_buffer * buf) return FALSE; if (parse_TOKEN(buf) != TOKEN_CBRACKET) return FALSE; - add_string(buf, "\n"); } else { @@ -814,7 +902,6 @@ static BOOL parse_template_parts(parse_buffer * buf) return FALSE; if (parse_TOKEN(buf) != TOKEN_CBRACKET) return FALSE; - add_string(buf, "\n"); } } @@ -827,18 +914,16 @@ static BOOL parse_template(parse_buffer * buf) return FALSE; if (!parse_name(buf)) return FALSE; - add_string(buf, "\n"); + strcpy(buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, (char*)buf->value); if (parse_TOKEN(buf) != TOKEN_OBRACE) return FALSE; - add_string(buf, "\n"); if (!parse_class_id(buf)) return FALSE; - add_string(buf, "\n"); + buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id = *(GUID*)buf->value; if (!parse_template_parts(buf)) return FALSE; if (parse_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - add_string(buf, "\n\n"); if (buf->txt) { /* Go to the next template */ @@ -851,6 +936,10 @@ static BOOL parse_template(parse_buffer * buf) } } } + + TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); + buf->pdxf->nb_xtemplates++; + return TRUE; } @@ -862,9 +951,8 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP buf.buffer = (LPBYTE)pvData; buf.rem_bytes = cbSize; - buf.dump = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 500); - buf.size = 500; buf.txt = FALSE; + buf.pdxf = This; FIXME("(%p/%p)->(%p,%d) partial stub!\n", This, iface, pvData, cbSize); @@ -917,21 +1005,64 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP while (buf.rem_bytes) { - buf.pos = 0; if (!parse_template(&buf)) { TRACE("Template is not correct\n"); return DXFILEERR_BADVALUE; } else + { TRACE("Template successfully parsed:\n"); if (TRACE_ON(d3dxof)) - /* Only dump in binary format */ - if (!buf.txt) - DPRINTF(buf.dump); + { + int i,j,k; + GUID* clsid; + + i = This->nb_xtemplates - 1; + clsid = &This->xtemplates[i].class_id; + + DPRINTF("template %s {\n", This->xtemplates[i].name); + DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); + for (j = 0; j < This->xtemplates[i].nb_members; j++) + { + if (This->xtemplates[i].members[j].nb_dims) + DPRINTF("array "); + if (This->xtemplates[i].members[j].type == TOKEN_NAME) + DPRINTF("%s ", This->xtemplates[This->xtemplates[i].members[j].idx_template].name); + else + DPRINTF("%s ", get_primitive_string(This->xtemplates[i].members[j].type)); + DPRINTF("%s", This->xtemplates[i].members[j].name); + for (k = 0; k < This->xtemplates[i].members[j].nb_dims; k++) + { + if (This->xtemplates[i].members[j].dim_fixed[k]) + DPRINTF("[%d]", This->xtemplates[i].members[j].dim_value[k]); + else + DPRINTF("[%s]", This->xtemplates[i].members[This->xtemplates[i].members[j].dim_value[k]].name); + } + DPRINTF(";\n"); + } + if (This->xtemplates[i].open) + DPRINTF("[...]\n"); + else if (This->xtemplates[i].nb_childs) + { + DPRINTF("[%s", This->xtemplates[i].childs[0]); + for (j = 1; j < This->xtemplates[i].nb_childs; j++) + DPRINTF(",%s", This->xtemplates[i].childs[j]); + DPRINTF("]\n"); + } + DPRINTF("}\n"); + } + } } - HeapFree(GetProcessHeap(), 0, buf.dump); + if (TRACE_ON(d3dxof)) + { + int i; + TRACE("Registered templates (%d):\n", This->nb_xtemplates); + for (i = 0; i < This->nb_xtemplates; i++) + DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + } return DXFILE_OK; } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index f49bdc49cf4..9bbf62927f6 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -1,7 +1,7 @@ /* * DirectX File private interfaces (D3DXOF.DLL) * - * Copyright 2004 Christian Costa + * Copyright 2004, 2008 Christian Costa * * This file contains the (internal) driver registration functions, * driver enumeration APIs and DirectDraw creation functions. @@ -33,9 +33,36 @@ #include "winuser.h" #include "dxfile.h" +#define MAX_NAME_LEN 32 +#define MAX_ARRAY_DIM 1 +#define MAX_MEMBERS 50 +#define MAX_CHILDS 10 +#define MAX_TEMPLATES 200 + +typedef struct { + DWORD type; + LONG idx_template; + char name[MAX_NAME_LEN]; + ULONG nb_dims; + BOOL dim_fixed[MAX_ARRAY_DIM]; /* fixed or variable */ + ULONG dim_value[MAX_ARRAY_DIM]; /* fixed value or member index */ +} member; + +typedef struct { + char name[MAX_NAME_LEN]; + GUID class_id; + BOOL open; + ULONG nb_childs; + char childs[MAX_CHILDS][MAX_NAME_LEN]; + ULONG nb_members; + member members[MAX_MEMBERS]; +} xtemplate; + typedef struct { IDirectXFile lpVtbl; LONG ref; + ULONG nb_xtemplates; + xtemplate xtemplates[MAX_TEMPLATES]; } IDirectXFileImpl; typedef struct { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9e94d572747..c5b7c2f87d0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -213,8 +213,8 @@ @ stub GdipEnumerateMetafileSrcRectDestPointsI @ stub GdipEnumerateMetafileSrcRectDestRect @ stub GdipEnumerateMetafileSrcRectDestRectI -@ stdcall GdipFillClosedCurve2(ptr ptr ptr long long) -@ stdcall GdipFillClosedCurve2I(ptr ptr ptr long long) +@ stdcall GdipFillClosedCurve2(ptr ptr ptr long long long) +@ stdcall GdipFillClosedCurve2I(ptr ptr ptr long long long) @ stub GdipFillClosedCurve @ stub GdipFillClosedCurveI @ stdcall GdipFillEllipse(ptr ptr long long long long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5a186602f2e..8df1c74b5b0 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -95,6 +95,7 @@ struct GpGraphics{ GpUnit unit; /* page unit */ REAL scale; /* page scale */ GpMatrix * worldtrans; /* world transform */ + BOOL busy; /* hdc handle obtained by GdipGetDC */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7bbcc747ce6..bff1c862f52 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -752,6 +752,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; (*graphics)->scale = 1.0; + (*graphics)->busy = FALSE; return Ok; } @@ -892,7 +893,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) ReleaseDC(graphics->hwnd, graphics->hdc); GdipDeleteMatrix(graphics->worldtrans); - HeapFree(GetProcessHeap(), 0, graphics); + GdipFree(graphics); return Ok; } @@ -907,6 +908,9 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, if(!graphics || !pen || width <= 0 || height <= 0) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); save_state = prepare_dc(graphics, pen); @@ -934,6 +938,9 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, if(!graphics || !pen) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -962,6 +969,9 @@ GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, if(!graphics || !pen) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -989,6 +999,9 @@ GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, if(!graphics || !pen || !points || (count <= 0)) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + for(i = 0; i < floor(count / 4); i++){ ret = GdipDrawBezier(graphics, pen, points[4*i].X, points[4*i].Y, @@ -1012,6 +1025,9 @@ GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen, if(!graphics || !pen || !points || (count <= 0)) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pts = GdipAlloc(sizeof(GpPointF) * count); if(!pts) return OutOfMemory; @@ -1049,6 +1065,9 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, if(!graphics || !pen || !points || count <= 0) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + /* make a full points copy.. */ ptf = GdipAlloc(sizeof(GpPointF)*(count+1)); if(!ptf) @@ -1135,6 +1154,9 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, if(!graphics || !pen) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pt = GdipAlloc(len_pt * sizeof(GpPointF)); tension = tension * TENSION_CONST; @@ -1210,6 +1232,9 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, if(!graphics || !pen) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -1414,6 +1439,9 @@ GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, if(!pen || !graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -1438,6 +1466,9 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, if(!pen || !graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pt[0].X = (REAL)x1; pt[0].Y = (REAL)y1; pt[1].X = (REAL)x2; @@ -1461,6 +1492,9 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST if(!pen || !graphics || (count < 2)) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + save_state = prepare_dc(graphics, pen); retval = draw_polyline(graphics, pen, points, count, TRUE); @@ -1481,6 +1515,9 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST if(!pen || !graphics || (count < 2)) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf = GdipAlloc(count * sizeof(GpPointF)); if(!ptf) return OutOfMemory; @@ -1507,6 +1544,9 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if(!pen || !graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + save_state = prepare_dc(graphics, pen); retval = draw_poly(graphics, pen, path->pathdata.Points, @@ -1525,6 +1565,9 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, if(!graphics || !pen) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + save_state = prepare_dc(graphics, pen); SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); @@ -1551,6 +1594,9 @@ GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, if(!pen || !graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -1587,6 +1633,9 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, if(!graphics || !pen || !rects || count < 1) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf = GdipAlloc(4 * count * sizeof(GpPointF)); pti = GdipAlloc(4 * count * sizeof(POINT)); @@ -1810,6 +1859,9 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics *graphics, GpBrush *brush, if(!graphics || !brush || !points) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + stat = GdipCreatePath(fill, &path); if(stat != Ok) return stat; @@ -1867,6 +1919,9 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x if(!graphics || !brush) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -1900,6 +1955,9 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(!brush || !graphics || !path) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); SelectObject(graphics->hdc, brush->gdibrush); @@ -1932,6 +1990,9 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, if(!graphics || !brush) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); SelectObject(graphics->hdc, brush->gdibrush); @@ -1961,6 +2022,9 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, if(!graphics || !brush || !points || !count) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf = GdipAlloc(count * sizeof(GpPointF)); pti = GdipAlloc(count * sizeof(POINT)); if(!ptf || !pti){ @@ -2000,6 +2064,9 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, if(!graphics || !brush || !points || !count) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf = GdipAlloc(count * sizeof(GpPointF)); pti = GdipAlloc(count * sizeof(POINT)); if(!ptf || !pti){ @@ -2053,6 +2120,9 @@ GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, if(!graphics || !brush) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -2086,6 +2156,9 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, if(!graphics || !brush) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -2159,6 +2232,9 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if (!(graphics && brush && region)) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + FIXME("(%p, %p, %p): stub\n", graphics, brush, region); return NotImplemented; @@ -2171,6 +2247,9 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + if(!(calls++)) FIXME("not implemented\n"); @@ -2184,6 +2263,9 @@ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, if(!graphics || !mode) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *mode = graphics->compmode; return Ok; @@ -2196,6 +2278,9 @@ GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics *graphics, if(!graphics || !quality) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *quality = graphics->compqual; return Ok; @@ -2208,6 +2293,9 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, if(!graphics || !mode) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *mode = graphics->interpolation; return Ok; @@ -2218,6 +2306,9 @@ GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale) if(!graphics || !scale) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *scale = graphics->scale; return Ok; @@ -2228,6 +2319,9 @@ GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics *graphics, GpUnit *unit) if(!graphics || !unit) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *unit = graphics->unit; return Ok; @@ -2240,6 +2334,9 @@ GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode if(!graphics || !mode) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *mode = graphics->pixeloffset; return Ok; @@ -2251,6 +2348,9 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mo if(!graphics || !mode) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *mode = graphics->smoothing; return Ok; @@ -2263,6 +2363,9 @@ GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics *graphics, if(!graphics || !hint) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *hint = graphics->texthint; return Ok; @@ -2273,6 +2376,9 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix if(!graphics || !matrix) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *matrix = *graphics->worldtrans; return Ok; } @@ -2404,6 +2510,9 @@ GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->worldtrans->matrix[0] = 1.0; graphics->worldtrans->matrix[1] = 0.0; graphics->worldtrans->matrix[2] = 0.0; @@ -2433,6 +2542,9 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + return GdipRotateMatrix(graphics->worldtrans, angle, order); } @@ -2455,6 +2567,9 @@ GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + return GdipScaleMatrix(graphics->worldtrans, sx, sy, order); } @@ -2464,6 +2579,9 @@ GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics *graphics, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->compmode = mode; return Ok; @@ -2475,6 +2593,9 @@ GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->compqual = quality; return Ok; @@ -2486,6 +2607,9 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->interpolation = mode; return Ok; @@ -2496,6 +2620,9 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) if(!graphics || (scale <= 0.0)) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->scale = scale; return Ok; @@ -2503,7 +2630,13 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) { - if(!graphics || (unit == UnitWorld)) + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if(unit == UnitWorld) return InvalidParameter; graphics->unit = unit; @@ -2517,6 +2650,9 @@ GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->pixeloffset = mode; return Ok; @@ -2527,6 +2663,9 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->smoothing = mode; return Ok; @@ -2538,6 +2677,9 @@ GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + graphics->texthint = hint; return Ok; @@ -2548,6 +2690,9 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix if(!graphics || !matrix) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + GdipDeleteMatrix(graphics->worldtrans); return GdipCloneMatrix(matrix, &graphics->worldtrans); } @@ -2558,6 +2703,9 @@ GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, if(!graphics) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } @@ -2567,6 +2715,12 @@ GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y, { static int calls; + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + if(!(calls++)) FIXME("not implemented\n"); @@ -2584,7 +2738,7 @@ GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, return NotImplemented; } -GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpGraphics *graphics, +GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile, UINT limitDpi) { static int calls; @@ -2604,6 +2758,9 @@ GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST Gp if(!graphics || !pen || count<=0) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + pti = GdipAlloc(sizeof(POINT) * count); save_state = prepare_dc(graphics, pen); @@ -2644,6 +2801,9 @@ GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics *graphics, REAL* dpi) if(!graphics || !dpi) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); return Ok; @@ -2654,6 +2814,9 @@ GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics *graphics, REAL* dpi) if(!graphics || !dpi) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSY); return Ok; @@ -2668,6 +2831,9 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G if(!graphics || !matrix) return InvalidParameter; + if(graphics->busy) + return ObjectBusy; + m = *(graphics->worldtrans); ret = GdipMultiplyMatrix(&m, (GpMatrix*)matrix, order); @@ -2679,24 +2845,41 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { - FIXME("(%p, %p): stub\n", graphics, hdc); + if(!graphics || !hdc) + return InvalidParameter; - *hdc = NULL; - return NotImplemented; + if(graphics->busy) + return ObjectBusy; + + *hdc = graphics->hdc; + graphics->busy = TRUE; + + return Ok; } GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) { - FIXME("(%p, %p): stub\n", graphics, hdc); + if(!graphics) + return InvalidParameter; - return NotImplemented; + if(graphics->hdc != hdc || !(graphics->busy)) + return InvalidParameter; + + graphics->busy = FALSE; + + return Ok; } GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) { - FIXME("(%p, %p): stub\n", graphics, region); + if(!graphics || !region) + return InvalidParameter; - return NotImplemented; + if(graphics->busy) + return ObjectBusy; + + FIXME("(%p, %p): stub\n", graphics, region); + return NotImplemented; } GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 168eae35523..90a416c5ffb 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -277,6 +277,8 @@ static void test_GdipDrawArc(void) expect(Ok, status); GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); } @@ -321,6 +323,8 @@ static void test_GdipDrawArcI(void) expect(Ok, status); GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); } @@ -359,6 +363,8 @@ static void test_GdipDrawBezierI(void) expect(Ok, status); GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); } @@ -397,6 +403,8 @@ static void test_GdipDrawLineI(void) expect(Ok, status); GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); } @@ -449,6 +457,275 @@ static void test_GdipDrawLinesI(void) GdipFree(ptf); GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + +static void test_Get_Release_DC(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen; + GpSolidFill *brush; + GpPath *path; + HDC hdc = GetDC(0); + HDC retdc; + REAL r; + CompositingQuality quality; + CompositingMode compmode; + InterpolationMode intmode; + GpMatrix *m; + GpRegion *region; + GpUnit unit; + PixelOffsetMode offsetmode; + SmoothingMode smoothmode; + TextRenderingHint texthint; + GpPointF ptf[5]; + GpPoint pt[5]; + GpRectF rectf[2]; + GpRect rect[2]; + INT i; + + pt[0].X = 10; + pt[0].Y = 10; + pt[1].X = 20; + pt[1].Y = 15; + pt[2].X = 40; + pt[2].Y = 80; + pt[3].X = -20; + pt[3].Y = 20; + pt[4].X = 50; + pt[4].Y = 110; + + for(i = 0; i < 5;i++){ + ptf[i].X = (REAL)pt[i].X; + ptf[i].Y = (REAL)pt[i].Y; + } + + rect[0].X = 0; + rect[0].Y = 0; + rect[0].Width = 50; + rect[0].Height = 70; + rect[1].X = 0; + rect[1].Y = 0; + rect[1].Width = 10; + rect[1].Height = 20; + + for(i = 0; i < 2;i++){ + rectf[i].X = (REAL)rect[i].X; + rectf[i].Y = (REAL)rect[i].Y; + rectf[i].Height = (REAL)rect[i].Height; + rectf[i].Width = (REAL)rect[i].Width; + } + + GdipCreateMatrix(&m); + GdipCreateRegion(®ion); + GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + GdipCreatePath(FillModeAlternate, &path); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + + /* NULL arguments */ + status = GdipGetDC(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetDC(graphics, NULL); + expect(InvalidParameter, status); + status = GdipGetDC(NULL, &retdc); + expect(InvalidParameter, status); + + status = GdipReleaseDC(NULL, (HDC)0); + expect(InvalidParameter, status); + status = GdipReleaseDC(graphics, (HDC)0); + expect(InvalidParameter, status); + status = GdipReleaseDC(NULL, (HDC)0xdeadbeef); + expect(InvalidParameter, status); + + /* Release without Get */ + status = GdipReleaseDC(graphics, hdc); + expect(InvalidParameter, status); + + retdc = NULL; + status = GdipGetDC(graphics, &retdc); + expect(Ok, status); + ok(retdc == hdc, "Invalid HDC returned\n"); + /* call it once more */ + status = GdipGetDC(graphics, &retdc); + expect(ObjectBusy, status); + + /* try all Graphics calls here */ + status = Ok; + status = GdipDrawArc(graphics, pen, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawArcI(graphics, pen, 0, 0, 1, 1, 0.0, 0.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawBezier(graphics, pen, 0.0, 10.0, 20.0, 15.0, 35.0, -10.0, 10.0, 10.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawBezierI(graphics, pen, 0, 0, 0, 0, 0, 0, 0, 0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawBeziers(graphics, pen, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawBeziersI(graphics, pen, pt, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawClosedCurve(graphics, pen, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawClosedCurveI(graphics, pen, pt, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawClosedCurve2(graphics, pen, ptf, 5, 1.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawClosedCurve2I(graphics, pen, pt, 5, 1.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawCurve(graphics, pen, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawCurveI(graphics, pen, pt, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawCurve2(graphics, pen, ptf, 5, 1.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawCurve2I(graphics, pen, pt, 5, 1.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawEllipse(graphics, pen, 0.0, 0.0, 100.0, 50.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawEllipseI(graphics, pen, 0, 0, 100, 50); + expect(ObjectBusy, status); status = Ok; + /* GdipDrawImage/GdipDrawImageI */ + /* GdipDrawImagePointsRect/GdipDrawImagePointsRectI */ + /* GdipDrawImageRectRect/GdipDrawImageRectRectI */ + /* GdipDrawImageRect/GdipDrawImageRectI */ + status = GdipDrawLine(graphics, pen, 0.0, 0.0, 100.0, 200.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawLineI(graphics, pen, 0, 0, 100, 200); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawLines(graphics, pen, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawLinesI(graphics, pen, pt, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawPath(graphics, pen, path); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawPie(graphics, pen, 0.0, 0.0, 100.0, 100.0, 0.0, 90.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawPieI(graphics, pen, 0, 0, 100, 100, 0.0, 90.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawRectangle(graphics, pen, 0.0, 0.0, 100.0, 300.0); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawRectangleI(graphics, pen, 0, 0, 100, 300); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawRectangles(graphics, pen, rectf, 2); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawRectanglesI(graphics, pen, rect, 2); + expect(ObjectBusy, status); status = Ok; + /* GdipDrawString */ + status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, ptf, 5, 1.0, FillModeAlternate); + expect(ObjectBusy, status); status = Ok; + status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, pt, 5, 1.0, FillModeAlternate); + expect(ObjectBusy, status); status = Ok; + status = GdipFillEllipse(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0); + expect(ObjectBusy, status); status = Ok; + status = GdipFillEllipseI(graphics, (GpBrush*)brush, 0, 0, 100, 100); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPath(graphics, (GpBrush*)brush, path); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPie(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0, 0.0, 15.0); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPieI(graphics, (GpBrush*)brush, 0, 0, 100, 100, 0.0, 15.0); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPolygon(graphics, (GpBrush*)brush, ptf, 5, FillModeAlternate); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPolygonI(graphics, (GpBrush*)brush, pt, 5, FillModeAlternate); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPolygon2(graphics, (GpBrush*)brush, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipFillPolygon2I(graphics, (GpBrush*)brush, pt, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipFillRectangle(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0); + expect(ObjectBusy, status); status = Ok; + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, 100, 100); + expect(ObjectBusy, status); status = Ok; + status = GdipFillRectangles(graphics, (GpBrush*)brush, rectf, 2); + expect(ObjectBusy, status); status = Ok; + status = GdipFillRectanglesI(graphics, (GpBrush*)brush, rect, 2); + expect(ObjectBusy, status); status = Ok; + status = GdipFillRegion(graphics, (GpBrush*)brush, region); + expect(ObjectBusy, status); status = Ok; + status = GdipFlush(graphics, FlushIntentionFlush); + expect(ObjectBusy, status); status = Ok; + status = GdipGetCompositingMode(graphics, &compmode); + expect(ObjectBusy, status); status = Ok; + status = GdipGetCompositingQuality(graphics, &quality); + expect(ObjectBusy, status); status = Ok; + status = GdipGetInterpolationMode(graphics, &intmode); + expect(ObjectBusy, status); status = Ok; + status = GdipGetPageScale(graphics, &r); + expect(ObjectBusy, status); status = Ok; + status = GdipGetPageUnit(graphics, &unit); + expect(ObjectBusy, status); status = Ok; + status = GdipGetPixelOffsetMode(graphics, &offsetmode); + expect(ObjectBusy, status); status = Ok; + status = GdipGetSmoothingMode(graphics, &smoothmode); + expect(ObjectBusy, status); status = Ok; + status = GdipGetTextRenderingHint(graphics, &texthint); + expect(ObjectBusy, status); status = Ok; + status = GdipGetWorldTransform(graphics, m); + expect(ObjectBusy, status); status = Ok; + /* GdipMeasureCharacterRanges */ + /* GdipMeasureString */ + status = GdipResetWorldTransform(graphics); + expect(ObjectBusy, status); status = Ok; + /* GdipRestoreGraphics */ + status = GdipRotateWorldTransform(graphics, 15.0, MatrixOrderPrepend); + expect(ObjectBusy, status); status = Ok; + /* GdipSaveGraphics */ + status = GdipScaleWorldTransform(graphics, 1.0, 1.0, MatrixOrderPrepend); + expect(ObjectBusy, status); status = Ok; + status = GdipSetCompositingMode(graphics, CompositingModeSourceOver); + expect(ObjectBusy, status); status = Ok; + status = GdipSetCompositingQuality(graphics, CompositingQualityDefault); + expect(ObjectBusy, status); status = Ok; + status = GdipSetInterpolationMode(graphics, InterpolationModeDefault); + expect(ObjectBusy, status); status = Ok; + status = GdipSetPageScale(graphics, 1.0); + expect(ObjectBusy, status); status = Ok; + status = GdipSetPageUnit(graphics, UnitWorld); + expect(ObjectBusy, status); status = Ok; + status = GdipSetPixelOffsetMode(graphics, PixelOffsetModeDefault); + expect(ObjectBusy, status); status = Ok; + status = GdipSetSmoothingMode(graphics, SmoothingModeDefault); + expect(ObjectBusy, status); status = Ok; + status = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(ObjectBusy, status); status = Ok; + status = GdipSetWorldTransform(graphics, m); + expect(ObjectBusy, status); status = Ok; + status = GdipTranslateWorldTransform(graphics, 0.0, 0.0, MatrixOrderPrepend); + expect(ObjectBusy, status); status = Ok; + status = GdipSetClipRectI(graphics, 0, 0, 10, 10, CombineModeReplace); + expect(ObjectBusy, status); status = Ok; + /* GdipSetClipRegion */ + status = GdipDrawPolygon(graphics, pen, ptf, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipDrawPolygonI(graphics, pen, pt, 5); + expect(ObjectBusy, status); status = Ok; + status = GdipGetDpiX(graphics, &r); + expect(ObjectBusy, status); status = Ok; + status = GdipGetDpiY(graphics, &r); + expect(ObjectBusy, status); status = Ok; + status = GdipMultiplyWorldTransform(graphics, m, MatrixOrderPrepend); + status = GdipGetClip(graphics, region); + expect(ObjectBusy, status); status = Ok; + + status = GdipReleaseDC(graphics, retdc); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + GdipDeletePath(path); + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteRegion(region); + GdipDeleteMatrix(m); + ReleaseDC(0, hdc); } @@ -471,6 +748,7 @@ START_TEST(graphics) test_GdipDrawArcI(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_Get_Release_DC(); GdiplusShutdown(gdiplusToken); } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index d08b20b8411..5fad0b1e8a6 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -214,6 +214,8 @@ static void test_line2(void) expect(Ok, status); ok_path(path, line2_path, sizeof(line2_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); } static path_test_t arc_path[] = { @@ -283,6 +285,8 @@ static void test_arc(void) expect(Ok, status); ok_path(path, arc_path, sizeof(arc_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); } static void test_worldbounds(void) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b1f063f0360..e5870d882c4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -252,8 +252,12 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe static HRESULT WINAPI HTMLDocument_get_Script(IHTMLDocument2 *iface, IDispatch **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = (IDispatch*)HTMLWINDOW2(This->window); + IDispatch_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3aa5f29bc2a..a2e34397b06 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -382,8 +382,21 @@ static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_get_parentElement(IHTMLElement *iface, IHTMLElement **p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLDOMNode *node; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = IHTMLDOMNode_get_parentNode(HTMLDOMNODE(&This->node), &node); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)p); + IHTMLDOMNode_Release(node); + if(FAILED(hres)) + *p = NULL; + + return S_OK; } static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e7a2907b12f..d4428002c94 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -971,6 +971,20 @@ static long _get_node_type(unsigned line, IUnknown *unk) return type; } +#define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) +static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + IHTMLElement *parent; + HRESULT hres; + + hres = IHTMLElement_get_parentElement(elem, &parent); + IHTMLElement_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08x\n", hres); + + return parent; +} + #define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u) static long _elem_get_scroll_height(unsigned line, IUnknown *unk) { @@ -2026,6 +2040,7 @@ static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self; IHTMLDocument2 *doc2 = NULL; + IDispatch *disp; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -2052,6 +2067,12 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow2_Release(window2); IHTMLWindow2_Release(self); + disp = NULL; + hres = IHTMLDocument2_get_Script(doc, &disp); + ok(hres == S_OK, "get_Script failed: %08x\n", hres); + ok(disp == (void*)window, "disp != window\n"); + IDispatch_Release(disp); + IHTMLWindow2_Release(window); } @@ -2202,7 +2223,7 @@ static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; IHTMLDOMChildrenCollection *child_col; - IHTMLElement *elem; + IHTMLElement *elem, *elem2, *elem3; IHTMLDOMNode *node, *node2; IDispatch *disp; long type; @@ -2292,6 +2313,17 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); ok(node2 == NULL, "node != NULL\n"); + elem2 = test_elem_get_parent((IUnknown*)elem); + ok(elem2 != NULL, "elem2 == NULL\n"); + test_node_name((IUnknown*)elem2, "BODY"); + elem3 = test_elem_get_parent((IUnknown*)elem2); + IHTMLElement_Release(elem2); + ok(elem3 != NULL, "elem3 == NULL\n"); + test_node_name((IUnknown*)elem3, "HTML"); + elem2 = test_elem_get_parent((IUnknown*)elem3); + IHTMLElement_Release(elem3); + ok(elem2 == NULL, "elem2 != NULL\n"); + test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2); test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0); test_elem_getelembytag((IUnknown*)elem, ET_HTML, 0); diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8599520d820..8cd5923bdbe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1193,7 +1193,7 @@ static UINT load_component( MSIRECORD *row, LPVOID param ) comp->KeyPath = msi_dup_record_field( row, 6 ); comp->Installed = INSTALLSTATE_UNKNOWN; - msi_component_set_state( comp, INSTALLSTATE_UNKNOWN ); + msi_component_set_state(package, comp, INSTALLSTATE_UNKNOWN); return ERROR_SUCCESS; } @@ -1327,7 +1327,7 @@ static UINT load_feature(MSIRECORD * row, LPVOID param) feature->Attributes = MSI_RecordGetInteger(row,8); feature->Installed = INSTALLSTATE_UNKNOWN; - msi_feature_set_state( feature, INSTALLSTATE_UNKNOWN ); + msi_feature_set_state(package, feature, INSTALLSTATE_UNKNOWN); list_add_tail( &package->features, &feature->entry ); @@ -1735,10 +1735,11 @@ static void ACTION_GetFeatureInstallStates(MSIPACKAGE *package) } } -static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, - INSTALLSTATE state) +static BOOL process_state_property(MSIPACKAGE* package, int level, + LPCWSTR property, INSTALLSTATE state) { static const WCHAR all[]={'A','L','L',0}; + static const WCHAR remove[] = {'R','E','M','O','V','E',0}; LPWSTR override; MSIFEATURE *feature; @@ -1748,8 +1749,12 @@ static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { + if (lstrcmpW(property, remove) && + (feature->Level <= 0 || feature->Level > level)) + continue; + if (strcmpiW(override,all)==0) - msi_feature_set_state( feature, state ); + msi_feature_set_state(package, feature, state); else { LPWSTR ptr = override; @@ -1760,7 +1765,7 @@ static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, if ((ptr2 && strncmpW(ptr,feature->Feature, ptr2-ptr)==0) || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) { - msi_feature_set_state( feature, state ); + msi_feature_set_state(package, feature, state); break; } if (ptr2) @@ -1780,7 +1785,7 @@ static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, UINT MSI_SetFeatureStates(MSIPACKAGE *package) { - int install_level; + int level; static const WCHAR szlevel[] = {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szAddLocal[] = @@ -1800,7 +1805,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) TRACE("Checking Install Level\n"); - install_level = msi_get_property_int( package, szlevel, 1 ); + level = msi_get_property_int(package, szlevel, 1); /* ok here is the _real_ rub * all these activation/deactivation things happen in order and things @@ -1821,26 +1826,26 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) * REMOVE are the big ones, since we don't handle administrative installs * yet anyway. */ - override |= process_state_property(package,szAddLocal,INSTALLSTATE_LOCAL); - override |= process_state_property(package,szRemove,INSTALLSTATE_ABSENT); - override |= process_state_property(package,szAddSource,INSTALLSTATE_SOURCE); - override |= process_state_property(package,szReinstall,INSTALLSTATE_LOCAL); + override |= process_state_property(package, level, szAddLocal, INSTALLSTATE_LOCAL); + override |= process_state_property(package, level, szRemove, INSTALLSTATE_ABSENT); + override |= process_state_property(package, level, szAddSource, INSTALLSTATE_SOURCE); + override |= process_state_property(package, level, szReinstall, INSTALLSTATE_LOCAL); if (!override) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { BOOL feature_state = ((feature->Level > 0) && - (feature->Level <= install_level)); + (feature->Level <= level)); if ((feature_state) && (feature->Action == INSTALLSTATE_UNKNOWN)) { if (feature->Attributes & msidbFeatureAttributesFavorSource) - msi_feature_set_state( feature, INSTALLSTATE_SOURCE ); + msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); else if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) - msi_feature_set_state( feature, INSTALLSTATE_ADVERTISED ); + msi_feature_set_state(package, feature, INSTALLSTATE_ADVERTISED); else - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); } } @@ -1849,11 +1854,11 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; - if (feature->Level > 0 && feature->Level <= install_level) + if (feature->Level > 0 && feature->Level <= level) continue; LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - msi_feature_set_state( fl->feature, INSTALLSTATE_UNKNOWN ); + msi_feature_set_state(package, fl->feature, INSTALLSTATE_UNKNOWN); } } else @@ -1886,7 +1891,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) cl->component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) { - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); break; } } @@ -1938,34 +1943,34 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { if ((component->Attributes & msidbComponentAttributesSourceOnly) && !component->ForceLocalState) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); continue; } /* if any feature is local, the component must be local too */ if (component->hasLocalFeature) { - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); continue; } if (component->hasSourceFeature) { - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); continue; } if (component->hasAdvertiseFeature) { - msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); + msi_component_set_state(package, component, INSTALLSTATE_ADVERTISED); continue; } TRACE("nobody wants component %s\n", debugstr_w(component->Component)); if (component->anyAbsent) - msi_component_set_state(component, INSTALLSTATE_ABSENT); + msi_component_set_state(package, component, INSTALLSTATE_ABSENT); } LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) @@ -1973,7 +1978,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) if (component->Action == INSTALLSTATE_DEFAULT) { TRACE("%s was default, setting to local\n", debugstr_w(component->Component)); - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); } TRACE("Result: Component %s (Installed %i, Action %i)\n", @@ -5731,7 +5736,8 @@ static BOOL init_functionpointers(void) return TRUE; } -static UINT install_assembly(MSIASSEMBLY *assembly, LPWSTR path) +static UINT install_assembly(MSIPACKAGE *package, MSIASSEMBLY *assembly, + LPWSTR path) { IAssemblyCache *cache; HRESULT hr; @@ -5740,7 +5746,7 @@ static UINT install_assembly(MSIASSEMBLY *assembly, LPWSTR path) TRACE("installing assembly: %s\n", debugstr_w(path)); if (assembly->feature) - msi_feature_set_state(assembly->feature, INSTALLSTATE_LOCAL); + msi_feature_set_state(package, assembly->feature, INSTALLSTATE_LOCAL); if (assembly->manifest) FIXME("Manifest unhandled\n"); @@ -5900,7 +5906,7 @@ static BOOL installassembly_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, { assembly->installed = TRUE; - r = install_assembly(assembly, temppath); + r = install_assembly(package, assembly, temppath); if (r != ERROR_SUCCESS) ERR("Failed to install assembly\n"); } @@ -5965,7 +5971,7 @@ static UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) { lstrcpyW(path, assembly->file->SourcePath); - r = install_assembly(assembly, path); + r = install_assembly(package, assembly, path); if (r != ERROR_SUCCESS) ERR("Failed to install assembly\n"); } diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 29008601ad9..33343cc1e69 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -204,7 +204,6 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( !db->strings ) goto end; - msi_table_set_strref( db->bytes_per_strref ); ret = ERROR_SUCCESS; msiobj_addref( &db->hdr ); diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8c7c59a5e74..add78769660 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1909,7 +1909,7 @@ msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) case INSTALLSTATE_LOCAL: case INSTALLSTATE_ADVERTISED: case INSTALLSTATE_ABSENT: - msi_feature_set_state( feature, r ); + msi_feature_set_state(package, feature, r); break; default: FIXME("select feature and all children\n"); diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 6b6ead9d1d1..79e1f663462 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -180,7 +180,7 @@ static UINT ControlEvent_AddLocal(MSIPACKAGE* package, LPCWSTR argument, else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); ACTION_UpdateComponentStates(package,argument); } @@ -200,7 +200,7 @@ static UINT ControlEvent_Remove(MSIPACKAGE* package, LPCWSTR argument, else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state( feature, INSTALLSTATE_ABSENT ); + msi_feature_set_state(package, feature, INSTALLSTATE_ABSENT); ACTION_UpdateComponentStates(package,argument); } @@ -220,7 +220,7 @@ static UINT ControlEvent_AddSource(MSIPACKAGE* package, LPCWSTR argument, else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state( feature, INSTALLSTATE_SOURCE ); + msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); ACTION_UpdateComponentStates(package,argument); } return ERROR_SUCCESS; diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 4e20a27d932..23645361c3c 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -891,7 +891,7 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) continue; if (newstate == INSTALLSTATE_LOCAL) - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); else { ComponentList *clist; @@ -899,7 +899,7 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) component->hasLocalFeature = FALSE; - msi_component_set_state( component, newstate ); + msi_component_set_state(package, component, newstate); /*if any other feature wants is local we need to set it local*/ LIST_FOR_EACH_ENTRY( f, &package->features, MSIFEATURE, entry ) @@ -922,14 +922,14 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) if (component->Attributes & msidbComponentAttributesOptional) { if (f->Attributes & msidbFeatureAttributesFavorSource) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); } else if (component->Attributes & msidbComponentAttributesSourceOnly) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); } } } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 64154592ef1..95fe51a194f 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -774,7 +774,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature, feature->Attributes & msidbFeatureAttributesDisallowAdvertise) return ERROR_FUNCTION_FAILED; - msi_feature_set_state( feature, iState ); + msi_feature_set_state(package, feature, iState); ACTION_UpdateComponentStates(package,szFeature); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f86f1942ce3..72f696616e1 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1905,6 +1905,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) INSTALLSTATE r; BOOL missing = FALSE; BOOL machine = FALSE; + BOOL source = FALSE; TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szFeature)); @@ -1978,6 +1979,12 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) path = msi_reg_get_val_str(hkey, squishProduct); if (!path) missing = TRUE; + else if (lstrlenW(path) > 2 && + path[0] >= '0' && path[0] <= '9' && + path[1] >= '0' && path[1] <= '9') + { + source = TRUE; + } msi_free(path); } @@ -1988,6 +1995,9 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) if (missing) return INSTALLSTATE_ADVERTISED; + if (source) + return INSTALLSTATE_SOURCE; + return INSTALLSTATE_LOCAL; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dac4d9b641e..2f54ccaf2eb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -33,6 +33,7 @@ #include "objidl.h" #include "winnls.h" #include "wine/list.h" +#include "wine/debug.h" #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 @@ -655,8 +656,6 @@ extern HRESULT msi_init_string_table( IStorage *stg ); extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); extern UINT msi_save_string_table( const string_table *st, IStorage *storage ); - -extern void msi_table_set_strref(UINT bytes_per_strref); extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); @@ -853,15 +852,63 @@ extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UIN extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute); -static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) +static inline void msi_feature_set_state(MSIPACKAGE *package, + MSIFEATURE *feature, + INSTALLSTATE state) { - feature->ActionRequest = state; - feature->Action = state; + if (!package->ProductCode) + { + feature->ActionRequest = state; + feature->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + break; + default: + feature->ActionRequest = state; + feature->Action = state; + } + } + else if (state == INSTALLSTATE_SOURCE) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + case INSTALLSTATE_SOURCE: + feature->ActionRequest = state; + feature->Action = state; + break; + case INSTALLSTATE_LOCAL: + feature->ActionRequest = INSTALLSTATE_LOCAL; + feature->Action = INSTALLSTATE_LOCAL; + break; + default: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + } + } + else + { + feature->ActionRequest = state; + feature->Action = state; + } } -static inline void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE state ) +static inline void msi_component_set_state(MSIPACKAGE *package, + MSICOMPONENT *comp, + INSTALLSTATE state) { - if (state == INSTALLSTATE_ABSENT) + if (!package->ProductCode) + { + comp->ActionRequest = state; + comp->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) { switch (comp->Installed) { @@ -878,16 +925,16 @@ static inline void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE sta } else if (state == INSTALLSTATE_SOURCE) { - switch (comp->Installed) + if (comp->Installed == INSTALLSTATE_ABSENT || + (comp->Installed == INSTALLSTATE_SOURCE && comp->hasLocalFeature)) { - case INSTALLSTATE_ABSENT: - case INSTALLSTATE_SOURCE: - comp->ActionRequest = state; - comp->Action = state; - break; - default: - comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; + comp->ActionRequest = state; + comp->Action = state; + } + else + { + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_UNKNOWN; } } else diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 13c61d4b806..49b5cb6154f 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -101,16 +101,14 @@ static WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; static WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; static WCHAR szType[] = { 'T','y','p','e',0 }; -/* These tables are written into (the .hash_table part). - * Do not mark them const. - */ -static MSICOLUMNINFO _Columns_cols[4] = { +static const MSICOLUMNINFO _Columns_cols[4] = { { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, }; -static MSICOLUMNINFO _Tables_cols[1] = { + +static const MSICOLUMNINFO _Tables_cols[1] = { { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0, 0, NULL }, }; @@ -118,26 +116,18 @@ static MSICOLUMNINFO _Tables_cols[1] = { static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO **pcols, UINT *pcount ); -static void table_calc_column_offsets( MSICOLUMNINFO *colinfo, DWORD count ); +static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, + DWORD count ); static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); - -void msi_table_set_strref(UINT bytes_per_strref) -{ - _Columns_cols[0].offset = 0; - _Columns_cols[1].offset = bytes_per_strref; - _Columns_cols[2].offset = _Columns_cols[1].offset + sizeof(USHORT); - _Columns_cols[3].offset = _Columns_cols[2].offset + bytes_per_strref; -} - -static inline UINT bytes_per_column( const MSICOLUMNINFO *col ) +static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col ) { if( MSITYPE_IS_BINARY(col->type) ) return 2; if( col->type & MSITYPE_STRING ) - return _Columns_cols[1].offset; + return db->bytes_per_strref; if( (col->type & 0xff) > 4 ) ERR("Invalid column size!\n"); return col->type & 0xff; @@ -488,32 +478,29 @@ static void free_table( MSITABLE *table ) for( i=0; inonpersistent_row_count; i++ ) msi_free( table->nonpersistent_data[i] ); msi_free( table->nonpersistent_data ); - if( (table->colinfo != _Tables_cols) && - (table->colinfo != _Columns_cols) ) - { - msi_free_colinfo( table->colinfo, table->col_count ); - msi_free( table->colinfo ); - } + msi_free_colinfo( table->colinfo, table->col_count ); + msi_free( table->colinfo ); msi_free( table ); } -static UINT msi_table_get_row_size( const MSICOLUMNINFO *cols, UINT count ) +static UINT msi_table_get_row_size( MSIDATABASE *db,const MSICOLUMNINFO *cols, + UINT count ) { const MSICOLUMNINFO *last_col = &cols[count-1]; if (!count) return 0; - return last_col->offset + bytes_per_column( last_col ); + return last_col->offset + bytes_per_column( db, last_col ); } /* add this table to the list of cached tables in the database */ -static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) +static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg ) { BYTE *rawdata = NULL; UINT rawsize = 0, i, j, row_size = 0; TRACE("%s\n",debugstr_w(t->name)); - row_size = msi_table_get_row_size( t->colinfo, t->col_count ); + row_size = msi_table_get_row_size( db, t->colinfo, t->col_count ); /* if we can't read the table, just assume that it's empty */ read_stream_data( stg, t->name, TRUE, &rawdata, &rawsize ); @@ -544,7 +531,7 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) for( j=0; jcol_count; j++ ) { UINT ofs = t->colinfo[j].offset; - UINT n = bytes_per_column( &t->colinfo[j] ); + UINT n = bytes_per_column( db, &t->colinfo[j] ); UINT k; if ( n != 2 && n != 3 && n != 4 ) @@ -672,7 +659,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].ref_count = 0; table->colinfo[ i ].hash_table = NULL; } - table_calc_column_offsets( table->colinfo, table->col_count); + table_calc_column_offsets( db, table->colinfo, table->col_count); r = TABLE_CreateView( db, szTables, &tv ); TRACE("CreateView returned %x\n", r); @@ -800,28 +787,14 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) table->persistent = TRUE; lstrcpyW( table->name, name ); - /* these two tables are special - we know the column types already */ - if( !lstrcmpW( name, szColumns ) ) - { - table->colinfo = _Columns_cols; - table->col_count = sizeof(_Columns_cols)/sizeof(_Columns_cols[0]); - } - else if( !lstrcmpW( name, szTables ) ) - { - table->colinfo = _Tables_cols; - table->col_count = sizeof(_Tables_cols)/sizeof(_Tables_cols[0]); - } - else + r = table_get_column_info( db, name, &table->colinfo, &table->col_count); + if (r != ERROR_SUCCESS) { - r = table_get_column_info( db, name, &table->colinfo, &table->col_count); - if (r != ERROR_SUCCESS) - { - free_table ( table ); - return r; - } + free_table ( table ); + return r; } - r = read_table_from_storage( table, db->storage ); + r = read_table_from_storage( db, table, db->storage ); if( r != ERROR_SUCCESS ) { free_table( table ); @@ -844,7 +817,7 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t ) TRACE("Saving %s\n", debugstr_w( t->name ) ); - row_size = msi_table_get_row_size( t->colinfo, t->col_count ); + row_size = msi_table_get_row_size( db, t->colinfo, t->col_count ); rawsize = t->row_count * row_size; rawdata = msi_alloc_zero( rawsize ); @@ -863,7 +836,7 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t ) *p++ = t->data[j][offset]; *p++ = t->data[j][offset + 1]; - if( 4 == bytes_per_column( &t->colinfo[i] ) ) + if( 4 == bytes_per_column( db, &t->colinfo[i] ) ) { *p++ = t->data[j][offset + 2]; *p++ = t->data[j][offset + 3]; @@ -880,7 +853,8 @@ err: return r; } -static void table_calc_column_offsets( MSICOLUMNINFO *colinfo, DWORD count ) +static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, + DWORD count ) { DWORD i; @@ -889,7 +863,7 @@ static void table_calc_column_offsets( MSICOLUMNINFO *colinfo, DWORD count ) assert( (i+1) == colinfo[ i ].number ); if (i) colinfo[i].offset = colinfo[ i - 1 ].offset - + bytes_per_column( &colinfo[ i - 1 ] ); + + bytes_per_column( db, &colinfo[ i - 1 ] ); else colinfo[i].offset = 0; TRACE("column %d is [%s] with type %08x ofs %d\n", @@ -898,7 +872,8 @@ static void table_calc_column_offsets( MSICOLUMNINFO *colinfo, DWORD count ) } } -static UINT get_defaulttablecolumns( LPCWSTR name, MSICOLUMNINFO *colinfo, UINT *sz) +static UINT get_defaulttablecolumns( MSIDATABASE *db, LPCWSTR name, + MSICOLUMNINFO *colinfo, UINT *sz) { const MSICOLUMNINFO *p; DWORD i, n; @@ -930,7 +905,7 @@ static UINT get_defaulttablecolumns( LPCWSTR name, MSICOLUMNINFO *colinfo, UINT if( colinfo && (i >= *sz) ) break; } - table_calc_column_offsets( colinfo, n ); + table_calc_column_offsets( db, colinfo, n ); *sz = n; return ERROR_SUCCESS; } @@ -971,7 +946,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, TRACE("%s\n", debugstr_w(szTableName)); /* first check if there is a default table with that name */ - r = get_defaulttablecolumns( szTableName, colinfo, sz ); + r = get_defaulttablecolumns( db, szTableName, colinfo, sz ); if( ( r == ERROR_SUCCESS ) && *sz ) return r; @@ -1003,8 +978,8 @@ static UINT get_tablecolumns( MSIDATABASE *db, continue; if( colinfo ) { - UINT id = read_table_int(table->data, i, _Columns_cols[2].offset, db->bytes_per_strref); - UINT col = read_table_int(table->data, i, _Columns_cols[1].offset, sizeof(USHORT)) - (1<<15); + UINT id = read_table_int(table->data, i, table->colinfo[2].offset, db->bytes_per_strref); + UINT col = read_table_int(table->data, i, table->colinfo[1].offset, sizeof(USHORT)) - (1<<15); /* check the column number is in range */ if (col<1 || col>maxcount) @@ -1023,7 +998,9 @@ static UINT get_tablecolumns( MSIDATABASE *db, colinfo[ col - 1 ].tablename = msi_makestring( db, table_id ); colinfo[ col - 1 ].number = col; colinfo[ col - 1 ].colname = msi_makestring( db, id ); - colinfo[ col - 1 ].type = read_table_int(table->data, i, _Columns_cols[3].offset, sizeof(USHORT)) - (1<<15); + colinfo[ col - 1 ].type = read_table_int(table->data, i, + table->colinfo[3].offset, + sizeof(USHORT)) - (1<<15); colinfo[ col - 1 ].offset = 0; colinfo[ col - 1 ].ref_count = 0; colinfo[ col - 1 ].hash_table = NULL; @@ -1040,7 +1017,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, return ERROR_FUNCTION_FAILED; } - table_calc_column_offsets( colinfo, n ); + table_calc_column_offsets( db, colinfo, n ); *sz = n; return ERROR_SUCCESS; @@ -1057,7 +1034,7 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) msi_free( table->colinfo ); table_get_column_info( db, name, &table->colinfo, &table->col_count ); - size = msi_table_get_row_size( table->colinfo, table->col_count ); + size = msi_table_get_row_size( db, table->colinfo, table->col_count ); offset = table->colinfo[table->col_count - 1].offset; for ( n = 0; n < table->row_count; n++ ) @@ -1162,7 +1139,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * else data = tv->table->data; - n = bytes_per_column( &tv->columns[col-1] ); + n = bytes_per_column( tv->db, &tv->columns[col-1] ); if (n != 2 && n != 3 && n != 4) { ERR("oops! what is %d bytes per column?\n", n ); @@ -1277,7 +1254,7 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) else data = tv->table->data; - n = bytes_per_column( &tv->columns[col-1] ); + n = bytes_per_column( tv->db, &tv->columns[col-1] ); if ( n != 2 && n != 3 && n != 4 ) { ERR("oops! what is %d bytes per column?\n", n ); @@ -1351,7 +1328,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, persistent ? StringPersistent : StringNonPersistent ); } - else if ( 2 == bytes_per_column( &tv->columns[ i ] ) ) + else if ( 2 == bytes_per_column( tv->db, &tv->columns[ i ] ) ) { val = 0x8000 + MSI_RecordGetInteger( rec, i + 1 ); if ( val & 0xffff0000 ) @@ -2138,7 +2115,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) tv->db = db; tv->columns = tv->table->colinfo; tv->num_cols = tv->table->col_count; - tv->row_size = msi_table_get_row_size( tv->table->colinfo, tv->table->col_count ); + tv->row_size = msi_table_get_row_size( db, tv->table->colinfo, tv->table->col_count ); TRACE("%s one row is %d bytes\n", debugstr_w(name), tv->row_size ); @@ -2246,7 +2223,7 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string } else { - UINT n = bytes_per_column( &columns[i] ); + UINT n = bytes_per_column( tv->db, &columns[i] ); switch( n ) { case 2: @@ -2457,7 +2434,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, ! MSITYPE_IS_BINARY(tv->columns[i].type) ) sz += bytes_per_strref; else - sz += bytes_per_column( &tv->columns[i] ); + sz += bytes_per_column( tv->db, &tv->columns[i] ); } } else @@ -2479,7 +2456,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, ! MSITYPE_IS_BINARY(tv->columns[i].type) ) sz += bytes_per_strref; else - sz += bytes_per_column( &tv->columns[i] ); + sz += bytes_per_column( tv->db, &tv->columns[i] ); } } } diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 5272e0dd55f..00d3856c820 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2417,10 +2417,7 @@ static void test_formatrecord_tables(void) MsiRecordSetString( hrec, 1, "[$parietal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); - } + ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); sprintf( buf, "%sI am a really long directory\\temporal.txt", root ); DeleteFile( buf ); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index bafcddcf701..2b00314d725 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -920,6 +920,35 @@ static void test_MsiQueryFeatureState(void) res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + /* INSTALLSTATE_LOCAL */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLSTATE_SOURCE */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* bad INSTALLSTATE_SOURCE */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLSTATE_SOURCE */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* bad INSTALLSTATE_SOURCE */ state = MsiQueryFeatureStateA(prodcode, "feature"); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c68d429bf27..ec299ead904 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3027,20 +3027,14 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -3730,20 +3724,14 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; @@ -3772,20 +3760,14 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -3827,20 +3809,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "epsilon", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "zeta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -4477,20 +4453,14 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; @@ -4511,30 +4481,21 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; @@ -5221,21 +5182,15 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; @@ -5255,31 +5210,22 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; @@ -5293,20 +5239,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "beta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "gamma", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5327,20 +5267,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "epsilon", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "zeta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5375,20 +5309,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "mu", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "nu", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5409,20 +5337,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "pi", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "rho", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5908,10 +5830,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "virgo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected virgo INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5932,10 +5851,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "cepheus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected cepheus INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5956,10 +5872,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "monoceros", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected monoceros INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected monoceros INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected monoceros INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -6018,10 +5931,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "virgo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected virgo INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -6042,20 +5952,14 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "cepheus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected cepheus INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "andromeda", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected andromeda INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected andromeda INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected andromeda INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 2c70ef5f8ad..47a9b9af83b 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -652,7 +652,9 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save( BOOL fRemember) { FIXME("(%p, %p, %d): stub\n", iface, pszFileName, fRemember); - return E_NOTIMPL; + WARN("Returning S_OK but not writing to disk: %s %d\n", + debugstr_w(pszFileName), fRemember); + return S_OK; } static HRESULT WINAPI MSTASK_IPersistFile_SaveCompleted( diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 8b7836279a3..f30172da3d2 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -302,12 +302,51 @@ static const struct IXMLDOMNodeListVtbl queryresult_vtbl = queryresult__newEnum, }; +static HRESULT queryresult_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) +{ + queryresult *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); + WCHAR *ptr; + DWORD idx=0; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + if(idx >= xmlXPathNodeSetGetLength(This->result->nodesetval)) + return DISP_E_UNKNOWNNAME; + + *dispid = MSXML_DISPID_CUSTOM_MIN + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT queryresult_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei) +{ + queryresult *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); + + if(flags != DISPATCH_PROPERTYGET) { + FIXME("flags %x\n", flags); + return E_NOTIMPL; + } + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)create_node(This->result->nodesetval->nodeTab[This->resultPos]); + return S_OK; +} + +static const dispex_static_data_vtbl_t queryresult_dispex_vtbl = { + queryresult_get_dispid, + queryresult_invoke +}; + static const tid_t queryresult_iface_tids[] = { IXMLDOMNodeList_tid, 0 }; static dispex_static_data_t queryresult_dispex = { - NULL, + &queryresult_dispex_vtbl, IXMLDOMNodeList_tid, NULL, queryresult_iface_tids diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 2895408842a..4098927afbf 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -369,9 +369,9 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,47.11,".0000E+0",S_OK,".4711E+2"); VARFMT(VT_R8,V_R8,3.0401e-13,"#####.####e-0%",S_OK,"30401.e-15%"); VARFMT(VT_R8,V_R8,1.57,"0.00",S_OK,"1.57"); - todo_wine { VARFMT(VT_R8,V_R8,-1.57,"0.00",S_OK,"-1.57"); - } + VARFMT(VT_R8,V_R8,-1.57,"#.##",S_OK,"-1.57"); + VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 83f075f0724..887525c48a5 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1,6 +1,7 @@ /* * Variant formatting functions * + * Copyright 2008 Damjan Jovanovic * Copyright 2003 Jon Griffiths * * This library is free software; you can redistribute it and/or @@ -1181,6 +1182,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, /* Number formatting state flags */ #define NUM_WROTE_DEC 0x01 /* Written the decimal separator */ #define NUM_WRITE_ON 0x02 /* Started to write the number */ +#define NUM_WROTE_SIGN 0x04 /* Written the negative sign */ /* Format a variant using a number format */ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, @@ -1320,6 +1322,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, { WCHAR defaultChar = '?'; DWORD boolFlag, localeValue = 0; + BOOL shouldAdvance = TRUE; if (pToken - rgbTok > header->size) { @@ -1377,6 +1380,16 @@ VARIANT_FormatNumber_Bool: break; case FMT_NUM_DECIMAL: + if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) + { + /* last chance for a negative sign in the .# case */ + TRACE("write negative sign\n"); + localeValue = LOCALE_SNEGATIVESIGN; + defaultChar = '-'; + dwState |= NUM_WROTE_SIGN; + shouldAdvance = FALSE; + break; + } TRACE("write decimal separator\n"); localeValue = LOCALE_SDECIMAL; defaultChar = '.'; @@ -1452,6 +1465,16 @@ VARIANT_FormatNumber_Bool: { int count, count_max; + if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) + { + TRACE("write negative sign\n"); + localeValue = LOCALE_SNEGATIVESIGN; + defaultChar = '-'; + dwState |= NUM_WROTE_SIGN; + shouldAdvance = FALSE; + break; + } + need_int -= pToken[1]; count_max = have_int + pad - need_int; if (count_max < 0) @@ -1504,7 +1527,8 @@ VARIANT_FormatNumber_Bool: *pBuff++ = defaultChar; } } - pToken++; + if (shouldAdvance) + pToken++; } VARIANT_FormatNumber_Exit: diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc index 281f30f93d8..11e6e84b506 100644 --- a/dlls/shell32/shell32_Ja.rc +++ b/dlls/shell32/shell32_Ja.rc @@ -20,12 +20,15 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "‘å‚«‚ȱ²ºÝ(&G)", FCIDM_SHVIEW_BIGICON - MENUITEM "�¬‚³‚ȱ²ºÝ(&M)", FCIDM_SHVIEW_SMALLICON + MENUITEM "‘å‚«‚ȃAƒCƒRƒ“(&G)", FCIDM_SHVIEW_BIGICON + MENUITEM "�¬‚³‚ȃAƒCƒRƒ“(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "ˆê——(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "�Ú�×(&D)", FCIDM_SHVIEW_REPORTVIEW END +/* + shellview background menu +*/ MENU_002 MENU DISCARDABLE BEGIN POPUP "" @@ -49,36 +52,39 @@ BEGIN END MENUITEM "“™ŠÔŠu‚É�®—ñ", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH + MENUITEM "�X�V", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "“\\‚è•t‚¯", FCIDM_SHVIEW_INSERT MENUITEM "ƒVƒ‡�[ƒgƒJƒbƒg‚Ì“\\‚è•t‚¯", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "�V‹K�ì�¬" BEGIN - MENUITEM "�V‹KƒtƒHƒ‹ƒ_(&F)", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "�V‹KƒVƒ‡�[ƒgƒJƒbƒg(&L)", FCIDM_SHVIEW_NEWLINK + MENUITEM "�V‹KƒtƒHƒ‹ƒ_(&F)", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "�V‹KƒVƒ‡�[ƒgƒJƒbƒg(&L)", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR - MENUITEM "ƒvƒ�ƒpƒeƒB", FCIDM_SHVIEW_PROPERTIES + MENUITEM "ƒvƒ�ƒpƒeƒB", FCIDM_SHVIEW_PROPERTIES END END +/* + shellview item menu +*/ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "‘I‘ð(&S)" FCIDM_SHVIEW_OPEN MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "ŠJ‚­(&O)", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "�Ø‚èŽæ‚è(&U)", FCIDM_SHVIEW_CUT - MENUITEM "ƒRƒs�[(&C)", FCIDM_SHVIEW_COPY + MENUITEM "ƒRƒs�[(&C)", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "ƒVƒ‡�[ƒgƒJƒbƒg‚Ì�ì�¬(&L)", 0x7051 - MENUITEM "�í�œ(&D)", FCIDM_SHVIEW_DELETE - MENUITEM "–¼‘O‚Ì•Ï�X(&R)", 0x7050 + MENUITEM "ƒVƒ‡�[ƒgƒJƒbƒg‚Ì�ì�¬(&L)", FCIDM_SHVIEW_CREATELINK + MENUITEM "�í�œ(&D)", FCIDM_SHVIEW_DELETE + MENUITEM "–¼‘O‚Ì•Ï�X(&R)", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "ƒvƒ�ƒpƒeƒB(&P)", FCIDM_SHVIEW_PROPERTIES END @@ -86,59 +92,70 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "ƒtƒ@ƒCƒ‹(&F)" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "�I—¹(&X)", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "•\Ž¦(&V)" BEGIN - MENUITEM "‘å‚«‚ȱ²ºÝ(&G)", FCIDM_SHVIEW_BIGICON - MENUITEM "�¬‚³‚ȱ²ºÝ(&M)", FCIDM_SHVIEW_SMALLICON - MENUITEM "ˆê——(&L)", FCIDM_SHVIEW_LISTVIEW - MENUITEM "�Ú�×(&D)", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "‘å‚«‚ȃAƒCƒRƒ“(&G)", FCIDM_SHVIEW_BIGICON + MENUITEM "�¬‚³‚ȃAƒCƒRƒ“(&M)", FCIDM_SHVIEW_SMALLICON + MENUITEM "ˆê——(&L)", FCIDM_SHVIEW_LISTVIEW + MENUITEM "�Ú�×(&D)", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "ƒwƒ‹ƒv(&H)" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "ƒRƒ“ƒgƒ��[ƒ‹ ƒpƒlƒ‹‚ɂ‚¢‚Ä(&A)...", IDM_CPANEL_ABOUT END END -STRINGTABLE +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "ƒtƒHƒ‹ƒ_‚ÌŽQ�Æ" +FONT 8, "MS Shell Dlg" { - /* columns in the shellview */ - IDS_SHV_COLUMN1 "–¼‘O" - IDS_SHV_COLUMN2 "ƒTƒCƒY" - IDS_SHV_COLUMN3 "ƒtƒ@ƒCƒ‹‚ÌŽí—Þ" - IDS_SHV_COLUMN4 "�X�V“úŽž" - IDS_SHV_COLUMN5 "‘®�«" - IDS_SHV_COLUMN6 "�‡ŒvƒTƒCƒY" - IDS_SHV_COLUMN7 "‹ó‚«—e—Ê" - IDS_SHV_COLUMN8 "Name" /*FIXME*/ - IDS_SHV_COLUMN9 "Comments" /*FIXME*/ - IDS_SHV_COLUMN10 "Owner" - IDS_SHV_COLUMN11 "Group" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" - - /* special folders */ - IDS_DESKTOP "ÃÞ½¸Ä¯Ìß" - IDS_MYCOMPUTER "ϲºÝËß­°À" - IDS_CONTROLPANEL "Control Panel" + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} - /* context menus */ - IDS_VIEW_LARGE "‘å‚«‚¢ƒAƒCƒRƒ“(&G)" - IDS_VIEW_SMALL "�¬‚³‚¢ƒAƒCƒRƒ“(&M)" - IDS_VIEW_LIST "ˆê——(&L)" - IDS_VIEW_DETAILS "�Ú�×(&D)" - IDS_SELECT "‘I‘ð" - IDS_OPEN "ŠJ‚­" +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "ƒtƒHƒ‹ƒ_‚ÌŽQ�Æ" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "ƒtƒHƒ‹ƒ_:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "�V‚µ‚¢ƒtƒHƒ‹ƒ_‚Ì�ì�¬(&M)", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ƒ�ƒbƒZ�[ƒW" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "‚Í‚¢(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "‚·‚ׂĂ͂¢(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "‚¢‚¢‚¦(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 @@ -147,11 +164,11 @@ CAPTION "%s FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine ƒ‰ƒCƒZƒ“ƒX(&L)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -161,11 +178,125 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" { - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "ŽQ�Æ(&B)...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP +} + +STRINGTABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "ƒtƒ@ƒCƒ‹" + IDS_SHV_COLUMN2 "ƒTƒCƒY" + IDS_SHV_COLUMN3 "ƒtƒ@ƒCƒ‹‚ÌŽí—Þ" + IDS_SHV_COLUMN4 "�X�V“úŽž" + IDS_SHV_COLUMN5 "‘®�«" + IDS_SHV_COLUMN6 "�‡ŒvƒTƒCƒY" + IDS_SHV_COLUMN7 "‹ó‚«—e—Ê" + IDS_SHV_COLUMN8 "–¼‘O" + IDS_SHV_COLUMN9 "Comments" + IDS_SHV_COLUMN10 "�Š—LŽÒ" + IDS_SHV_COLUMN11 "ƒOƒ‹�[ƒv" + IDS_SHV_COLUMN_DELFROM "Original location" + IDS_SHV_COLUMN_DELDATE "Date deleted" + + /* special folders */ + IDS_DESKTOP "ƒfƒXƒNƒgƒbƒv" + IDS_MYCOMPUTER "ƒ}ƒC ƒRƒ“ƒsƒ…�[ƒ^" + IDS_RECYCLEBIN_FOLDER_NAME "‚²‚Ý” " + IDS_CONTROLPANEL "ƒRƒ“ƒgƒ��[ƒ‹ ƒpƒlƒ‹" + + /* context menus */ + IDS_VIEW_LARGE "‘å‚«‚¢ƒAƒCƒRƒ“(&G)" + IDS_VIEW_SMALL "�¬‚³‚¢ƒAƒCƒRƒ“(&M)" + IDS_VIEW_LIST "ˆê——(&L)" + IDS_VIEW_DETAILS "�Ú�×(&D)" + IDS_SELECT "‘I‘ð" + IDS_OPEN "ŠJ‚­" + + IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." + IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_DELETEITEM_CAPTION "Confirm file deletion" + IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" + IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" + IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" + IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" + IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" + IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ + "If the files in the destination folder have the same names as files in the\n"\ + "selected folder they will be replaced. Do you still want to move or copy\n"\ + "the folder?" + + /* message box strings */ + IDS_RESTART_TITLE "�Ä‹N“®" + IDS_RESTART_PROMPT "Windows ‚Ì�Ä‹N“®‚ðƒVƒ~ƒ…ƒŒ�[ƒg‚µ‚Ü‚·‚©?" + IDS_SHUTDOWN_TITLE "ƒVƒƒƒbƒgƒ_ƒEƒ“" + IDS_SHUTDOWN_PROMPT "Wine ƒZƒbƒVƒ‡ƒ“‚ðƒVƒƒƒbƒgƒ_ƒEƒ“‚µ‚Ü‚·‚©?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "ŽQ�Æ" + IDS_RUNDLG_BROWSE_FILTER "ŽÀ�s‰Â”\ƒtƒ@ƒCƒ‹\0*.exe\0‚·‚ׂẴtƒ@ƒCƒ‹\0*.*\0\0" + + /* shell folder path default values */ + IDS_PROGRAMS "Start Menu\\Programs" + IDS_PERSONAL "My Documents" + IDS_FAVORITES "Favorites" + IDS_STARTUP "Start Menu\\Programs\\StartUp" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start Menu" + IDS_MYMUSIC "My Music" + IDS_MYVIDEO "My Videos" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "My Pictures" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documents" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_COMMON_MUSIC "Documents\\My Music" + IDS_COMMON_PICTURES "Documents\\My Pictures" + IDS_COMMON_VIDEO "Documents\\My Videos" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" + + IDS_CPANEL_TITLE "Wine Control Panel" + IDS_CPANEL_NAME "Name" + IDS_CPANEL_DESCRIPTION "Description" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Wine ƒ‰ƒCƒZƒ“ƒX" +IDS_LICENSE, +"Wine is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\n\ +Wine is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with Wine; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a1ba570dc78..066203b24fe 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1978,8 +1978,8 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, hMemDC = CreateCompatibleDC (hdc); if (istep) FIXME_(icon)("Ignoring istep=%d\n", istep); - if (flags & DI_COMPAT) - FIXME_(icon)("Ignoring flag DI_COMPAT\n"); + if (flags & DI_NOMIRROR) + FIXME_(icon)("Ignoring flag DI_NOMIRROR\n"); if (!flags) { FIXME_(icon)("no flags set? setting to DI_NORMAL\n"); diff --git a/dlls/user32/resources/user32_Ja.rc b/dlls/user32/resources/user32_Ja.rc index c13fd2d70c2..5136391ee9f 100644 --- a/dlls/user32/resources/user32_Ja.rc +++ b/dlls/user32/resources/user32_Ja.rc @@ -55,7 +55,7 @@ BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX PUSHBUTTON "OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "·¬Ý¾Ù", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "’†Ž~(&A)", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "�ÄŽŽ�s(&R)", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "–³Ž‹(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -63,5 +63,22 @@ BEGIN PUSHBUTTON "‚¢‚¢‚¦(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ƒwƒ‹ƒv", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Select Window" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 120, 100, 35, 14 +END + + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "ƒGƒ‰�[" + IDS_MDI_MOREWINDOWS "&More Windows..." +} diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e553828aa48..a701f36bfb2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1958,6 +1958,28 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { return TRUE; } +static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcolor, const char *tmp1, + const char *tmp2, const char *tmp3, const char *tmp4) { + /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ + + /* Calculate the > 0.0031308 case */ + shader_addline(buffer, "POW %s.x, %s.x, srgb_pow.x;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_pow.y;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_pow.z;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_mul_hi;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_sub_hi;\n", tmp1, tmp1); + /* Calculate the < case */ + shader_addline(buffer, "MUL %s, srgb_mul_low, %s;\n", tmp2, fragcolor); + /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ + shader_addline(buffer, "SLT %s, srgb_comparison, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_comparison, %s;\n", tmp4, fragcolor); + /* Store the components > 0.0031308 in the destination */ + shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); + /* Add the components that are < 0.0031308 */ + shader_addline(buffer, "MAD result.color.xyz, %s, %s, %s;\n", tmp2, tmp4, fragcolor); + /* [0.0;1.0] clamping. Not needed, this is done implicitly */ +} + static void shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; shader_reg_maps* reg_maps = &This->baseShader.reg_maps; @@ -2002,24 +2024,7 @@ static void shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFE fragcolor = "TMP_COLOR"; } if(This->srgb_enabled) { - /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ - - /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW TMP.x, %s.x, srgb_pow.x;\n", fragcolor); - shader_addline(buffer, "POW TMP.y, %s.y, srgb_pow.y;\n", fragcolor); - shader_addline(buffer, "POW TMP.z, %s.z, srgb_pow.z;\n", fragcolor); - shader_addline(buffer, "MUL TMP, TMP, srgb_mul_hi;\n"); - shader_addline(buffer, "SUB TMP, TMP, srgb_sub_hi;\n"); - /* Calculate the < case */ - shader_addline(buffer, "MUL TMP2, srgb_mul_low, %s;\n", fragcolor); - /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT TA, srgb_comparison, %s;\n", fragcolor); - shader_addline(buffer, "SGE TB, srgb_comparison, %s;\n", fragcolor); - /* Store the components > 0.0031308 in the destination */ - shader_addline(buffer, "MUL %s, TMP, TA;\n", fragcolor); - /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD result.color.xyz, TMP2, TB, %s;\n", fragcolor); - /* [0.0;1.0] clamping. Not needed, this is done implicitly */ + arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB"); } if (This->baseShader.hex_version < WINED3DPS_VERSION(3,0)) { shader_addline(buffer, "LRP result.color.rgb, TMP_FOG.x, %s, state.fog.color;\n", fragcolor); @@ -2644,7 +2649,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "PARAM const = {1, 2, 4, 0.5};\n"); shader_addline(&buffer, "TEMP ret;\n"); - if(tempreg_used) shader_addline(&buffer, "TEMP tempreg;\n"); + if(tempreg_used || settings->sRGB_write) shader_addline(&buffer, "TEMP tempreg;\n"); shader_addline(&buffer, "TEMP arg0;\n"); shader_addline(&buffer, "TEMP arg1;\n"); shader_addline(&buffer, "TEMP arg2;\n"); @@ -2658,6 +2663,19 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); } + if(settings->sRGB_write) { + shader_addline(&buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", + srgb_mul_low, srgb_mul_low, srgb_mul_low); + shader_addline(&buffer, "PARAM srgb_comparison = {%f, %f, %f, %f};\n", + srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); + shader_addline(&buffer, "PARAM srgb_pow = {%f, %f, %f, 1.0};\n", + srgb_pow, srgb_pow, srgb_pow); + shader_addline(&buffer, "PARAM srgb_mul_hi = {%f, %f, %f, 1.0};\n", + srgb_mul_high, srgb_mul_high, srgb_mul_high); + shader_addline(&buffer, "PARAM srgb_sub_hi = {%f, %f, %f, 0.0};\n", + srgb_sub_high, srgb_sub_high, srgb_sub_high); + } + /* Generate texture sampling instructions) */ for(stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3DTOP_DISABLE; stage++) { if(!tex_read[stage]) continue; @@ -2714,6 +2732,8 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "MOV result.color, fragment.color.primary;\n"); } break; + } else if(settings->sRGB_write) { + last = FALSE; } else if(stage == (MAX_TEXTURES - 1)) { last = TRUE; } else if(settings->op[stage + 1].cop == WINED3DTOP_DISABLE) { @@ -2748,7 +2768,10 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB } } - /* TODO: Generate sRGB write color correction */ + if(settings->sRGB_write) { + arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); + shader_addline(&buffer, "MOV result.color.a, ret.a;\n"); + } /* Footer */ shader_addline(&buffer, "END\n"); @@ -2776,7 +2799,12 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct arbfp_ffp_desc *desc; unsigned int i; - if(isStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE))) return; + if(isStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE))) { + if(use_pshader) { + IWineD3DPixelShader_CompileShader(stateblock->pixelShader); + } + return; + } if(use_pshader) { IWineD3DPixelShader_CompileShader(stateblock->pixelShader); @@ -2971,6 +2999,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, }; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a05434ffb0..fb3fcc48c10 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -176,7 +176,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); } - for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])); matchtry++) { + for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])) && !iPixelFormat; matchtry++) { for(i=0; iadapter->cfgs[i]; @@ -644,15 +644,16 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con *****************************************************************************/ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { - /* check that we are the current context first */ TRACE("Destroying ctx %p\n", context); - if(pwglGetCurrentContext() == context->glCtx){ - pwglMakeCurrent(NULL, NULL); - } else { + + /* The correct GL context needs to be active to cleanup the GL resources below */ + if(pwglGetCurrentContext() != context->glCtx){ + pwglMakeCurrent(context->hdc, context->glCtx); last_device = NULL; } - /* FIXME: We probably need an active context to do this... */ + ENTER_GL(); + if (context->fbo) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->fbo)); } @@ -663,9 +664,13 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->dst_fbo)); } + LEAVE_GL(); + HeapFree(GetProcessHeap(), 0, context->fbo_color_attachments); context->fbo_color_attachments = NULL; + /* Cleanup the GL context */ + pwglMakeCurrent(NULL, NULL); if(context->isPBuffer) { GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c55d66c39e0..2cf89e7ea96 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1446,11 +1446,12 @@ static HRESULT WINAPI IWineD3DImpl_RegisterSoftwareDevice(IWineD3D *iface, void static HMONITOR WINAPI IWineD3DImpl_GetAdapterMonitor(IWineD3D *iface, UINT Adapter) { IWineD3DImpl *This = (IWineD3DImpl *)iface; + TRACE_(d3d_caps)("(%p)->(%d)\n", This, Adapter); + if (Adapter >= IWineD3DImpl_GetAdapterCount(iface)) { return NULL; } - TRACE_(d3d_caps)("(%p)->(%d)\n", This, Adapter); return MonitorFromPoint(Adapters[Adapter].monitorPoint, MONITOR_DEFAULTTOPRIMARY); } @@ -2227,11 +2228,15 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE */ case WINED3DFMT_L8: case WINED3DFMT_A8L8: - case WINED3DFMT_A4L4: case WINED3DFMT_L16: TRACE_(d3d_caps)("[OK]\n"); return TRUE; + /* Not supported on Windows, thus disabled */ + case WINED3DFMT_A4L4: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + /***** * Supported: Depth/Stencil formats */ @@ -2256,7 +2261,6 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE case WINED3DFMT_Q8W8V8U8: case WINED3DFMT_V16U16: case WINED3DFMT_W11V11U10: - case WINED3DFMT_A2W10V10U10: getFormatDescEntry(CheckFormat, &GLINFO_LOCATION, &glDesc); if(glDesc->conversion_group == WINED3DFMT_UNKNOWN) { /* We have a GL extension giving native support */ @@ -2296,6 +2300,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE case WINED3DFMT_INDEX16: case WINED3DFMT_INDEX32: case WINED3DFMT_Q16W16V16U16: + case WINED3DFMT_A2W10V10U10: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE; @@ -3707,7 +3712,7 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { while(glGetError()); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); checkGLcall("Specifying the PBO test texture\n"); GL_EXTCALL(glGenBuffersARB(1, &pbo)); @@ -3888,7 +3893,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { } } -void invalid_func(void *data) { +static void WINE_GLAPI invalid_func(void *data) { ERR("Invalid vertex attribute function called\n"); DebugBreak(); } @@ -3898,7 +3903,7 @@ void invalid_func(void *data) { /* Helper functions for providing vertex data to opengl. The arrays are initialized based on * the extension detection and are used in drawStridedSlow */ -static void position_d3dcolor(void *data) { +static void WINE_GLAPI position_d3dcolor(void *data) { DWORD pos = *((DWORD *) data); FIXME("Add a test for fixed function position from d3dcolor type\n"); @@ -3907,7 +3912,7 @@ static void position_d3dcolor(void *data) { D3DCOLOR_B_B(pos), D3DCOLOR_B_A(pos)); } -static void position_float4(void *data) { +static void WINE_GLAPI position_float4(void *data) { GLfloat *pos = (float *) data; if (pos[3] < eps && pos[3] > -eps) @@ -3919,7 +3924,7 @@ static void position_float4(void *data) { } } -static void diffuse_d3dcolor(void *data) { +static void WINE_GLAPI diffuse_d3dcolor(void *data) { DWORD diffuseColor = *((DWORD *) data); glColor4ub(D3DCOLOR_B_R(diffuseColor), @@ -3928,14 +3933,14 @@ static void diffuse_d3dcolor(void *data) { D3DCOLOR_B_A(diffuseColor)); } -static void specular_d3dcolor(void *data) { +static void WINE_GLAPI specular_d3dcolor(void *data) { DWORD specularColor = *((DWORD *) data); GL_EXTCALL(glSecondaryColor3ubEXT)(D3DCOLOR_B_R(specularColor), D3DCOLOR_B_G(specularColor), D3DCOLOR_B_B(specularColor)); } -static void warn_no_specular_func(void *data) { +static void WINE_GLAPI warn_no_specular_func(void *data) { WARN("GL_EXT_secondary_color not supported\n"); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0628e5a528d..a988121d6ad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -955,6 +955,9 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { */ if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) { GLenum error; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); GL_EXTCALL(glGenBuffersARB(1, &This->pbo)); @@ -1312,14 +1315,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { case RTL_READTEX: case RTL_TEXTEX: ActivateContext(myDevice, iface, CTXUSAGE_BLIT); - ENTER_GL(); - if (This->glDescription.textureName == 0) { - glGenTextures(1, &This->glDescription.textureName); - checkGLcall("glGenTextures"); - } - glBindTexture(This->glDescription.target, This->glDescription.textureName); - checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); - LEAVE_GL(); IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */ @@ -3804,15 +3799,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) { - ENTER_GL(); - if (This->glDescription.textureName == 0) { - glGenTextures(1, &This->glDescription.textureName); - checkGLcall("glGenTextures"); - } - glBindTexture(This->glDescription.target, This->glDescription.textureName); - checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); - LEAVE_GL(); - /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 35dfcae86d3..bd83541a523 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -229,17 +229,25 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { } /* Conditinal non power of two textures use a different clamping default. If we're using the GL_WINE_normalized_texrect * partial driver emulation, we're dealing with a GL_TEXTURE_2D texture which has the address mode set to repeat - something - * that prevents us from hitting the accelerated codepath. Thus manually set the GL state + * that prevents us from hitting the accelerated codepath. Thus manually set the GL state. The same applies to filtering. + * Even if the texture has only one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW fallback on macos. */ if(IWineD3DBaseTexture_IsCondNP2(iface)) { ENTER_GL(); glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)"); + glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MIN_FILTER, GL_NEAREST)"); + glTexParameteri(IWineD3DTexture_GetTextureDimensions(iface), GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MAG_FILTER, GL_NEAREST)"); LEAVE_GL(); This->baseTexture.states[WINED3DTEXSTA_ADDRESSU] = WINED3DTADDRESS_CLAMP; This->baseTexture.states[WINED3DTEXSTA_ADDRESSV] = WINED3DTADDRESS_CLAMP; + This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + This->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + This->baseTexture.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8b3be3fc931..85015443806 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -205,7 +205,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,0 }, {WINED3DFMT_X4R4G4B4 ,GL_RGB4 ,GL_RGB4 , 0, GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, - {WINED3DFMT_A2B10G10R10 ,GL_RGBA ,GL_RGBA , 0, GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV + {WINED3DFMT_A2B10G10R10 ,GL_RGB10_A2 ,GL_RGB10_A2 , 0, GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_A8B8G8R8 ,GL_RGBA8 ,GL_RGBA8 , 0, GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, @@ -213,7 +213,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_G16R16 ,GL_RGB16_EXT ,GL_RGB16_EXT , 0, GL_RGB ,GL_UNSIGNED_SHORT ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, - {WINED3DFMT_A2R10G10B10 ,GL_RGBA ,GL_RGBA , 0, GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV + {WINED3DFMT_A2R10G10B10 ,GL_RGB10_A2 ,GL_RGB10_A2 , 0, GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, {WINED3DFMT_A16B16G16R16 ,GL_RGBA16_EXT ,GL_RGBA16_EXT , 0, GL_RGBA ,GL_UNSIGNED_SHORT ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, @@ -1976,6 +1976,11 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting break; } } + if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + settings->sRGB_write = 1; + } else { + settings->sRGB_write = 0; + } } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e67ec382711..c00300dd1b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -463,8 +463,8 @@ void primitiveDeclarationConvertToStridedData( DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); -typedef void (*glAttribFunc)(void *data); -typedef void (*glTexAttribFunc)(GLuint unit, void *data); +typedef void (WINE_GLAPI *glAttribFunc)(void *data); +typedef void (WINE_GLAPI *glTexAttribFunc)(GLuint unit, void *data); extern glAttribFunc position_funcs[WINED3DDECLTYPE_UNUSED]; extern glAttribFunc diffuse_funcs[WINED3DDECLTYPE_UNUSED]; extern glAttribFunc specular_funcs[WINED3DDECLTYPE_UNUSED]; @@ -785,6 +785,7 @@ struct ffp_settings { FOG_EXP, FOG_EXP2 } fog; + unsigned char sRGB_write; }; struct ffp_desc diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c5eac719b1e..251d81d8f3d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -100,6 +100,8 @@ GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); +GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, @@ -511,6 +513,10 @@ GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *, REAL, REAL); GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *, INT, INT); GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); +GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); +GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); +GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*); + #ifdef __cplusplus } diff --git a/programs/Makefile.in b/programs/Makefile.in index 99d87d2e20e..3ba3660b6dc 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -1,118 +1,11 @@ -# Automatically generated by make_progs; DO NOT EDIT!! - TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ -SUBDIRS = \ - clock \ - cmd \ - cmdlgtst \ - control \ - eject \ - expand \ - explorer \ - hh \ - icinfo \ - iexplore \ - msiexec \ - net \ - notepad \ - oleview \ - progman \ - reg \ - regedit \ - regsvr32 \ - rpcss \ - rundll32 \ - secedit \ - services \ - spoolsv \ - start \ - svchost \ - taskmgr \ - uninstaller \ - view \ - wineboot \ - winebrowser \ - winecfg \ - wineconsole \ - winedbg \ - winedevice \ - winefile \ - winemenubuilder \ - winemine \ - winepath \ - @WINETEST@ \ - winevdm \ - winhlp32 \ - winver \ - wordpad \ - write \ - xcopy - -# Sub-directories to run make install into -INSTALLSUBDIRS = \ - clock \ - cmd \ - control \ - eject \ - expand \ - explorer \ - hh \ - icinfo \ - iexplore \ - msiexec \ - net \ - notepad \ - oleview \ - progman \ - reg \ - regedit \ - regsvr32 \ - rpcss \ - rundll32 \ - secedit \ - services \ - spoolsv \ - start \ - svchost \ - taskmgr \ - uninstaller \ - wineboot \ - winebrowser \ - winecfg \ - wineconsole \ - winedbg \ - winedevice \ - winefile \ - winemenubuilder \ - winemine \ - winepath \ - winevdm \ - winhlp32 \ - winver \ - wordpad \ - write \ - xcopy - -# Programs to install in bin directory -INSTALLPROGS = \ - msiexec \ - notepad \ - progman \ - regedit \ - regsvr32 \ - uninstaller \ - wineboot \ - winebrowser \ - winecfg \ - wineconsole \ - winedbg \ - winefile \ - winemine \ - winepath +SUBDIRS = @ALL_PROGRAM_DIRS@ +INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@ +INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ INSTALLDIRS = $(DESTDIR)$(bindir) diff --git a/programs/clock/Ja.rc b/programs/clock/Ja.rc new file mode 100644 index 00000000000..9591f3a7f01 --- /dev/null +++ b/programs/clock/Ja.rc @@ -0,0 +1,73 @@ +/* + * Clock (Japanese resources) + * + * Copyright 1998 Marcel Baur + * Copyright 2002 Sylvain Petreolle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "ƒvƒ�ƒpƒeƒB(&P)" { + MENUITEM "ƒAƒiƒ�ƒO(&L)", IDM_ANALOG + MENUITEM "ƒfƒWƒ^ƒ‹(&T)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ƒtƒHƒ“ƒg(&F)...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "ƒ^ƒCƒgƒ‹ƒo�[‚È‚µ(&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "•b(&S)", IDM_SECONDS + MENUITEM "“ú•t(&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "�í‚ÉŽè‘O‚É•\Ž¦(&A)", IDM_ONTOP + } + POPUP "�î•ñ(&O)" { + MENUITEM "ƒ‰ƒCƒZƒ“ƒX(&L)...", IDM_LICENSE + MENUITEM "–³•Û�Ø(&N)...", IDM_NOWARRANTY + MENUITEM "ŽžŒv‚ɂ‚¢‚Ä(&A)...", IDM_ABOUT + } +} + +STRINGTABLE DISCARDABLE +{ +IDS_CLOCK, "ŽžŒv" +} + +STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "ƒ‰ƒCƒZƒ“ƒX" +IDS_LICENSE, +"This program is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This program is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this program; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "–³•Û�Ø" +IDS_WARRANTY, +"This program is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +} diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc index 53c5b95ce04..bf2eb6780da 100644 --- a/programs/clock/rsrc.rc +++ b/programs/clock/rsrc.rc @@ -33,6 +33,7 @@ #include "Fr.rc" #include "Hu.rc" #include "It.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc" diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index e8a6bf5edfe..958b2c7f636 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -36,9 +36,9 @@ * Global and Local Variables: */ -static TCHAR favoritesKey[] = _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\RegEdit\\Favorites"); +static WCHAR favoritesKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p','l','e','t','s','\\','R','e','g','E','d','i','t','\\','F','a','v','o','r','i','t','e','s',0}; static BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ -static TCHAR favoriteName[128]; +static WCHAR favoriteName[128]; static TCHAR searchString[128]; static int searchMask = SEARCH_KEYS | SEARCH_VALUES | SEARCH_CONTENT; @@ -123,9 +123,9 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) HKEY hKey; while(GetMenuItemCount(hMenu)>2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - if (RegOpenKeyEx(HKEY_CURRENT_USER, favoritesKey, + if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - TCHAR namebuf[KEY_MAX_LEN]; + WCHAR namebuf[KEY_MAX_LEN]; BYTE valuebuf[4096]; int i = 0; BOOL sep = FALSE; @@ -134,15 +134,15 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) do { ksize = KEY_MAX_LEN; vsize = sizeof(valuebuf); - error = RegEnumValue(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); + error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); if (error != ERROR_SUCCESS) break; if (type == REG_SZ) { if (!sep) { - AppendMenu(hMenu, MF_SEPARATOR, -1, NULL); + AppendMenuW(hMenu, MF_SEPARATOR, -1, NULL); sep = TRUE; } - AppendMenu(hMenu, MF_STRING, ID_FAVORITE_FIRST+i, namebuf); + AppendMenuW(hMenu, MF_STRING, ID_FAVORITE_FIRST+i, namebuf); } i++; } while(error == ERROR_SUCCESS); @@ -524,13 +524,14 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w case WM_INITDIALOG: { HKEY hKeyRoot = NULL; - LPSTR ItemPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); + LPWSTR ItemPath = GetItemPathW(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); if(!ItemPath || !*ItemPath) - ItemPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); + ItemPath = GetItemFullPathW(g_pChildWnd->hTreeWnd, NULL, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - SetWindowText(hwndValue, ItemPath); - SendMessage(hwndValue, EM_SETLIMITTEXT, 127, 0); + SetWindowTextW(hwndValue, ItemPath); + SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); + HeapFree(GetProcessHeap(), 0, ItemPath); return TRUE; } case WM_COMMAND: @@ -542,8 +543,8 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w } break; case IDOK: - if (GetWindowTextLength(hwndValue)>0) { - GetWindowText(hwndValue, favoriteName, 128); + if (GetWindowTextLengthW(hwndValue)>0) { + GetWindowTextW(hwndValue, favoriteName, 128); EndDialog(hwndDlg, IDOK); } return TRUE; @@ -565,20 +566,20 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w HKEY hKey; int i = 0; EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - if (RegOpenKeyEx(HKEY_CURRENT_USER, favoritesKey, + if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - TCHAR namebuf[KEY_MAX_LEN]; + WCHAR namebuf[KEY_MAX_LEN]; BYTE valuebuf[4096]; DWORD ksize, vsize, type; LONG error; do { ksize = KEY_MAX_LEN; vsize = sizeof(valuebuf); - error = RegEnumValue(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); + error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); if (error != ERROR_SUCCESS) break; if (type == REG_SZ) { - SendMessage(hwndList, LB_ADDSTRING, 0, (LPARAM)namebuf); + SendMessageW(hwndList, LB_ADDSTRING, 0, (LPARAM)namebuf); } i++; } while(error == ERROR_SUCCESS); @@ -587,7 +588,7 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w else return FALSE; EnableWindow(GetDlgItem(hwndDlg, IDOK), i != 0); - SendMessage(hwndList, LB_SETCURSEL, 0, 0); + SendMessageW(hwndList, LB_SETCURSEL, 0, 0); return TRUE; } case WM_COMMAND: @@ -602,11 +603,11 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w int pos = SendMessage(hwndList, LB_GETCURSEL, 0, 0); int len = SendMessage(hwndList, LB_GETTEXTLEN, pos, 0); if (len>0) { - LPTSTR lpName = HeapAlloc(GetProcessHeap(), 0, sizeof(TCHAR)*(len+1)); - SendMessage(hwndList, LB_GETTEXT, pos, (LPARAM)lpName); + LPWSTR lpName = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); + SendMessageW(hwndList, LB_GETTEXT, pos, (LPARAM)lpName); if (len>127) lpName[127] = '\0'; - _tcscpy(favoriteName, lpName); + lstrcpyW(favoriteName, lpName); EndDialog(hwndDlg, IDOK); HeapFree(GetProcessHeap(), 0, lpName); } @@ -642,15 +643,15 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) >= ID_FAVORITE_FIRST && LOWORD(wParam) <= ID_FAVORITE_LAST) { HKEY hKey; - if (RegOpenKeyEx(HKEY_CURRENT_USER, favoritesKey, + if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - TCHAR namebuf[KEY_MAX_LEN]; + WCHAR namebuf[KEY_MAX_LEN]; BYTE valuebuf[4096]; DWORD ksize = KEY_MAX_LEN, vsize = sizeof(valuebuf), type = 0; - if (RegEnumValue(hKey, LOWORD(wParam) - ID_FAVORITE_FIRST, namebuf, &ksize, NULL, + if (RegEnumValueW(hKey, LOWORD(wParam) - ID_FAVORITE_FIRST, namebuf, &ksize, NULL, &type, valuebuf, &vsize) == ERROR_SUCCESS) { - SendMessage( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, - (LPARAM) FindPathInTree(g_pChildWnd->hTreeWnd, (TCHAR *)valuebuf) ); + SendMessageW( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, + (LPARAM) FindPathInTree(g_pChildWnd->hTreeWnd, (WCHAR *)valuebuf) ); } RegCloseKey(hKey); } @@ -813,13 +814,13 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_FAVORITES_ADDTOFAVORITES: { HKEY hKey; - LPTSTR lpKeyPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); + LPWSTR lpKeyPath = GetItemFullPathW(g_pChildWnd->hTreeWnd, NULL, FALSE); if (lpKeyPath) { if (DialogBox(0, MAKEINTRESOURCE(IDD_ADDFAVORITE), hWnd, addtofavorites_dlgproc) == IDOK) { - if (RegCreateKeyEx(HKEY_CURRENT_USER, favoritesKey, + if (RegCreateKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - RegSetValueEx(hKey, favoriteName, 0, REG_SZ, (BYTE *)lpKeyPath, (_tcslen(lpKeyPath)+1)*sizeof(TCHAR)); + RegSetValueExW(hKey, favoriteName, 0, REG_SZ, (BYTE *)lpKeyPath, (lstrlenW(lpKeyPath)+1)*sizeof(WCHAR)); RegCloseKey(hKey); } } @@ -831,9 +832,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { if (DialogBox(0, MAKEINTRESOURCE(IDD_DELFAVORITE), hWnd, removefavorite_dlgproc) == IDOK) { HKEY hKey; - if (RegOpenKeyEx(HKEY_CURRENT_USER, favoritesKey, + if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ|KEY_WRITE, &hKey) == ERROR_SUCCESS) { - RegDeleteValue(hKey, favoriteName); + RegDeleteValueW(hKey, favoriteName); RegCloseKey(hKey); } } diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 885ab0d14f3..abd2d5936ea 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -136,7 +136,7 @@ extern LPWSTR GetItemPathW(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); extern HWND StartKeyRename(HWND hwndTV); -extern HTREEITEM FindPathInTree(HWND hwndTV, LPCTSTR lpKeyName); +extern HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, int *row); /* edit.c */ diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index dcfb7fa09c6..98f6de42c12 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -166,9 +166,9 @@ LPWSTR GetItemPathW(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) return pathBuffer; } -static LPTSTR get_path_component(LPCTSTR *lplpKeyName) { - LPCTSTR lpPos = *lplpKeyName; - LPTSTR lpResult = NULL; +static LPWSTR get_path_component(LPCWSTR *lplpKeyName) { + LPCWSTR lpPos = *lplpKeyName; + LPWSTR lpResult = NULL; int len; if (!lpPos) return NULL; @@ -176,39 +176,42 @@ static LPTSTR get_path_component(LPCTSTR *lplpKeyName) { lpPos++; if (*lpPos && lpPos == *lplpKeyName) return NULL; - len = (lpPos+1-(*lplpKeyName)) * sizeof(TCHAR); - lpResult = HeapAlloc(GetProcessHeap(), 0, len); + len = lpPos+1-(*lplpKeyName); + lpResult = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!lpResult) /* that would be very odd */ return NULL; - memcpy(lpResult, *lplpKeyName, len-1); - lpResult[len-1] = '\0'; + lstrcpynW(lpResult, *lplpKeyName, len); *lplpKeyName = *lpPos ? lpPos+1 : NULL; return lpResult; } -HTREEITEM FindPathInTree(HWND hwndTV, LPCTSTR lpKeyName) { - TVITEMEX tvi; - TCHAR buf[261]; /* tree view has 260 character limitation on item name */ +HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { + TVITEMEXW tvi; + WCHAR buf[261]; /* tree view has 260 character limitation on item name */ HTREEITEM hItem, hOldItem; buf[260] = '\0'; hItem = TreeView_GetRoot(hwndTV); - SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); hItem = TreeView_GetChild(hwndTV, hItem); hOldItem = hItem; while(1) { - LPTSTR lpItemName = get_path_component(&lpKeyName); + LPWSTR lpItemName = get_path_component(&lpKeyName); + if (lpItemName) { while(hItem) { tvi.mask = TVIF_TEXT | TVIF_HANDLE; tvi.hItem = hItem; tvi.pszText = buf; tvi.cchTextMax = 260; - SendMessage(hwndTV, TVM_GETITEM, 0, (LPARAM) &tvi); - if (!_tcsicmp(tvi.pszText, lpItemName)) { - SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); + SendMessageW(hwndTV, TVM_GETITEMW, 0, (LPARAM) &tvi); + if (!lstrcmpiW(tvi.pszText, lpItemName)) { + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) + { + HeapFree(GetProcessHeap(), 0, lpItemName); return hItem; + } hOldItem = hItem; hItem = TreeView_GetChild(hwndTV, hItem); break; @@ -234,9 +237,7 @@ BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem) /* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HKEY hKey, DWORD dwChildren) { - TVINSERTSTRUCT tvins; - CHAR* labelA = GetMultiByteString(label); - HTREEITEM ret; + TVINSERTSTRUCTW tvins; if (hKey) { if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { @@ -245,17 +246,16 @@ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HK } tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; - tvins.u.item.pszText = labelA; - tvins.u.item.cchTextMax = lstrlen(labelA); + tvins.u.item.pszText = label; + tvins.u.item.cchTextMax = lstrlenW(label); tvins.u.item.iImage = Image_Closed; tvins.u.item.iSelectedImage = Image_Open; tvins.u.item.cChildren = dwChildren; tvins.u.item.lParam = (LPARAM)hKey; tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); tvins.hParent = hParent; - ret = TreeView_InsertItem(hwndTV, &tvins); - HeapFree(GetProcessHeap(), 0, labelA); - return ret; + + return TreeView_InsertItemW(hwndTV, &tvins); } static BOOL match_string(LPCTSTR sstring1, LPCTSTR sstring2, int mode) @@ -395,7 +395,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) LPWSTR KeyPath; DWORD dwCount, dwIndex, dwMaxSubKeyLen; LPWSTR Name; - TVITEM tvItem; + TVITEMW tvItem; hRoot = NULL; KeyPath = GetItemPathW(hwndTV, hItem, &hRoot); @@ -421,7 +421,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) tvItem.mask = TVIF_CHILDREN; tvItem.hItem = hItem; tvItem.cChildren = dwCount; - if (!TreeView_SetItem(hwndTV, &tvItem)) { + if (!TreeView_SetItemW(hwndTV, &tvItem)) { return FALSE; } @@ -436,7 +436,8 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) return FALSE; } tvItem.cchTextMax = dwMaxSubKeyLen; - if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { + HeapFree(GetProcessHeap(), 0, Name); return FALSE; } @@ -444,7 +445,6 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; BOOL found; - CHAR* NameA; found = FALSE; if (RegEnumKeyExW(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { @@ -460,27 +460,25 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) RegCloseKey(hSubKey); } - NameA = GetMultiByteString(Name); - /* Check if the node is already in there. */ for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; childItem = TreeView_GetNextSibling(hwndTV, childItem)) { tvItem.mask = TVIF_TEXT; tvItem.hItem = childItem; - if (!TreeView_GetItem(hwndTV, &tvItem)) { - HeapFree(GetProcessHeap(), 0, NameA); + if (!TreeView_GetItemW(hwndTV, &tvItem)) { + HeapFree(GetProcessHeap(), 0, Name); + HeapFree(GetProcessHeap(), 0, tvItem.pszText); return FALSE; } - if (!stricmp(tvItem.pszText, NameA)) { + if (!lstrcmpiW(tvItem.pszText, Name)) { found = TRUE; - HeapFree(GetProcessHeap(), 0, NameA); break; } } if (found == FALSE) { - WINE_TRACE("New subkey %s\n", NameA); + WINE_TRACE("New subkey %s\n", wine_dbgstr_w(Name)); AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } } @@ -493,7 +491,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) while (childItem) { HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - SendMessage(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem); + SendMessageW(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem); } childItem = nextItem; } @@ -529,9 +527,9 @@ BOOL RefreshTreeView(HWND hwndTV) HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) { - TCHAR buf[MAX_NEW_KEY_LEN]; + WCHAR buf[MAX_NEW_KEY_LEN]; HTREEITEM hNewItem = 0; - TVITEMEX item; + TVITEMEXW item; if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return FALSE; @@ -540,22 +538,20 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE; item.hItem = hItem; - if (!TreeView_GetItem(hwndTV, &item)) return FALSE; + if (!TreeView_GetItemW(hwndTV, &item)) return FALSE; item.cChildren = 1; - if (!TreeView_SetItem(hwndTV, &item)) return FALSE; + if (!TreeView_SetItemW(hwndTV, &item)) return FALSE; } SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!hNewItem) { - char* nameA = GetMultiByteString(name); for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = hNewItem; item.pszText = buf; item.cchTextMax = COUNT_OF(buf); - if (!TreeView_GetItem(hwndTV, &item)) continue; - if (lstrcmp(nameA, item.pszText) == 0) break; + if (!TreeView_GetItemW(hwndTV, &item)) continue; + if (lstrcmpW(name, item.pszText) == 0) break; } - HeapFree(GetProcessHeap(), 0, nameA); } if (hNewItem) SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hNewItem); diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 8fbe6a4a849..77ecf4f3fd9 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -41,9 +41,9 @@ BEGIN LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows Registration Information ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "Owner:", IDC_STATIC, 22, 126, 40, 20 - LTEXT "Organization:", IDC_STATIC, 22, 140, 50, 20 + GROUPBOX " Windows “o˜^�î•ñ ", IDC_STATIC, 15, 110, 230, 55 + LTEXT "�Š—LŽÒ:", IDC_STATIC, 22, 126, 40, 20 + LTEXT "‘g�D:", IDC_STATIC, 22, 140, 50, 20 EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END @@ -68,22 +68,22 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS UI Gothic" BEGIN GROUPBOX " ƒEƒBƒ“ƒhƒE�Ý’è ",IDC_STATIC,8,4,244,84 - CONTROL "DirectX ƒAƒvƒŠƒP�[ƒVƒ‡ƒ“‚ªƒ}ƒEƒX‚ðŠm•Û‚·‚é‚Ì‚ð‹–‰Â‚·‚é",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Allow the &window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "ƒfƒXƒNƒgƒbƒv‚ðƒGƒ~ƒ…ƒŒ�[ƒg‚·‚é",IDC_ENABLE_DESKTOP,"Button", + CONTROL "DirectX ƒAƒvƒŠƒP�[ƒVƒ‡ƒ“‚ªƒ}ƒEƒX‚ðŠm•Û‚·‚é‚Ì‚ð‹–‰Â‚·‚é(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "ƒEƒBƒ“ƒhƒEƒ}ƒl�[ƒWƒƒ‚ªƒEƒBƒ“ƒhƒE‚ð‘•�ü‚·‚é‚Ì‚ð‹–‰Â‚·‚é(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 + CONTROL "ƒEƒBƒ“ƒhƒEƒ}ƒl�[ƒWƒƒ‚ªƒEƒBƒ“ƒhƒE‚ð�§Œä‚·‚é‚Ì‚ð‹–‰Â‚·‚é(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "‰¼‘zƒfƒXƒNƒgƒbƒv‚ðƒGƒ~ƒ…ƒŒ�[ƒg‚·‚é(&D)",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "ƒfƒXƒNƒgƒbƒv‚Ì‘å‚«‚³:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED + LTEXT "ƒfƒXƒNƒgƒbƒv‚Ì‘å‚«‚³(&Z):",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Vertex Shader ƒTƒ|�[ƒg: ",IDC_STATIC,15,110,80,32 + LTEXT "&Vertex Shader ƒTƒ|�[ƒg: ",IDC_STATIC,15,110,80,32 COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Pixel Shader ‚ð—LŒø‚É‚·‚é(ƒn�[ƒhƒEƒFƒA‚ŃTƒ|�[ƒg‚³‚ê‚Ä‚¢‚é�ê�‡‚Ì‚Ý)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 + CONTROL "&Pixel Shader ‚ð—LŒø‚É‚·‚é(ƒn�[ƒhƒEƒFƒA‚ŃTƒ|�[ƒg‚³‚ê‚Ä‚¢‚é�ê�‡‚Ì‚Ý)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 - GROUPBOX " Screen &Resolution ",IDC_STATIC,8,151,244,93 + GROUPBOX " ƒXƒNƒŠ�[ƒ“‰ð‘œ“x(&R) ",IDC_STATIC,8,151,244,93 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 @@ -97,10 +97,10 @@ BEGIN GROUPBOX " DLL ƒI�[ƒo�[ƒ‰ƒCƒh ",IDC_STATIC,8,4,244,240 LTEXT "ƒ_ƒCƒiƒ~ƒbƒN�EƒŠƒ“ƒN�Eƒ‰ƒCƒuƒ‰ƒŠ(DLL)‚ÍŒÂ•Ê‚É builtin (Wine”Å) ‚Ü‚½‚Í native (Windows ‚à‚µ‚­‚̓AƒvƒŠƒP�[ƒVƒ‡ƒ“’ñ‹Ÿ‚Ì•¨)‚ð‘I‚Ô‚±‚Æ‚ª‚Å‚«‚Ü‚·�B" ,IDC_STATIC,16,16,220,32 - LTEXT "�V‹Kƒ‰ƒCƒuƒ‰ƒŠ‚̃I�[ƒo�[ƒ‰ƒCƒh:",IDC_STATIC,16,58,100,8 + LTEXT "ƒ‰ƒCƒuƒ‰ƒŠ‚Ì�V‹KƒI�[ƒo�[ƒ‰ƒCƒh(&N):",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "’ljÁ(&A)",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON - LTEXT "Šù‘¶‚̃I�[ƒo�[ƒ‰ƒCƒh:",IDC_STATIC,16,86,100,8 + LTEXT "Šù‘¶‚̃I�[ƒo�[ƒ‰ƒCƒh(&O):",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,140,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "•Ò�W(&E)",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "�í�œ(&R)",IDC_DLLS_REMOVEDLL,164,114,82,14 @@ -162,47 +162,47 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS UI Gothic" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 + GROUPBOX " ƒhƒ‰ƒCƒo‚Ì‘I‘ð ",IDC_STATIC,8,4,244,195 LTEXT "ƒI�[ƒfƒBƒIƒhƒ‰ƒCƒo: ",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "ƒRƒ“ƒgƒ��[ƒ‹ƒpƒlƒ‹",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 + PUSHBUTTON "‰¹‚ðƒeƒXƒg(&T)",IDC_AUDIO_TEST,170,50,59,14 + PUSHBUTTON "ƒRƒ“ƒgƒ��[ƒ‹ƒpƒlƒ‹(&C)",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - LTEXT "ƒn�[ƒhƒEƒFƒA�EƒAƒNƒZƒ‰ƒŒ�[ƒVƒ‡ƒ“: ",IDC_STATIC,15,215,90,10 + LTEXT "ƒn�[ƒhƒEƒFƒA�EƒAƒNƒZƒ‰ƒŒ�[ƒVƒ‡ƒ“(&H): ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Sample Rate:",IDC_STATIC,15,232,70,8 + LTEXT "Šù’è‚̃Tƒ“ƒvƒ‹ƒŒ�[ƒg(&S):",IDC_STATIC,15,232,70,8 COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,232,80,8 COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "ƒhƒ‰ƒCƒo�EƒGƒ~ƒ…ƒŒ�[ƒVƒ‡ƒ“",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 + CONTROL "ƒhƒ‰ƒCƒo�EƒGƒ~ƒ…ƒŒ�[ƒVƒ‡ƒ“(&E)",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS UI Gothic" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 - LTEXT "ƒe�[ƒ}:",IDC_STATIC,15,16,130,8 + GROUPBOX " ŠOŠÏ ",IDC_STATIC,8,4,244,106 + LTEXT "ƒe�[ƒ}(&T):",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ƒe�[ƒ}‚̃Cƒ“ƒXƒg�[ƒ‹...",IDC_THEME_INSTALL,152,23,93,14 - LTEXT "”z�F:",IDC_THEME_COLORTEXT,15,40,112,8 + PUSHBUTTON "ƒe�[ƒ}‚ðƒCƒ“ƒXƒg�[ƒ‹(&I)...",IDC_THEME_INSTALL,152,23,93,14 + LTEXT "”z�F(&C):",IDC_THEME_COLORTEXT,15,40,112,8 COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ƒTƒCƒY:",IDC_THEME_SIZETEXT,135,40,110,8 + LTEXT "ƒTƒCƒY(&S):",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "�€–Ú:",IDC_STATIC,15,64,112,8 + LTEXT "�€–Ú(&E):",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "�F:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "�F(&O):",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "ƒTƒCƒY:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "ƒTƒCƒY(&Z):",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "ƒtƒHƒ“ƒg",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + PUSHBUTTON "ƒtƒHƒ“ƒg(&F)",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + GROUPBOX " ƒVƒFƒ‹ƒtƒHƒ‹ƒ_(&H) ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "ŽQ�Æ(&R)",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -222,52 +222,52 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "ƒe�[ƒ}ƒtƒ@ƒCƒ‹" IDS_THEMEFILE_SELECT "ƒe�[ƒ}ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢" - IDS_SHELL_FOLDER "Shell Folder" + IDS_SHELL_FOLDER "ƒVƒFƒ‹ƒtƒHƒ‹ƒ_" IDS_LINKS_TO "Links to" END STRINGTABLE DISCARDABLE BEGIN IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" - IDS_DLL_WARNING_CAPTION "Warning: system library" + IDS_DLL_WARNING_CAPTION "Œx��: ƒVƒXƒeƒ€ƒ‰ƒCƒuƒ‰ƒŠ" IDS_DLL_NATIVE "native" IDS_DLL_BUILTIN "builtin" IDS_DLL_NATIVE_BUILTIN "native, builtin" IDS_DLL_BUILTIN_NATIVE "builtin, native" - IDS_DLL_DISABLED "disabled" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DLL_DISABLED "–³Œø" + IDS_DEFAULT_SETTINGS "Šù’è‚Ì�Ý’è" + IDS_EXECUTABLE_FILTER "Wine ƒvƒ�ƒOƒ‰ƒ€ (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "‘S‘Ì�Ý’è‚ðŽg‚¤" + IDS_SELECT_EXECUTABLE "ŽÀ�s‰Â”\\ƒtƒ@ƒCƒ‹‚ð‘I‘ð" END STRINGTABLE DISCARDABLE BEGIN - IDS_SHADER_MODE_HARDWARE "Hardware" - IDS_SHADER_MODE_NONE "None" + IDS_SHADER_MODE_HARDWARE "ƒn�[ƒhƒEƒFƒA" + IDS_SHADER_MODE_NONE "‚È‚µ" END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" - IDS_DRIVE_FIXED "Local hard disk" - IDS_DRIVE_REMOTE "Network share" - IDS_DRIVE_REMOVABLE "Floppy disk" + IDS_DRIVE_UNKNOWN "Ž©“®ŒŸ�o" + IDS_DRIVE_FIXED "ƒ��[ƒJƒ‹ƒn�[ƒhƒfƒBƒXƒN" + IDS_DRIVE_REMOTE "ƒlƒbƒgƒ��[ƒN‹¤—L" + IDS_DRIVE_REMOVABLE "ƒtƒ�ƒbƒs�[ƒfƒBƒXƒN" IDS_DRIVE_CDROM "CD-ROM" IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" - IDS_SYSTEM_DRIVE_LABEL "System drive" + IDS_SYSTEM_DRIVE_LABEL "ƒVƒXƒeƒ€ƒhƒ‰ƒCƒu" IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" - IDS_COL_DRIVELETTER "Letter" - IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" + IDS_COL_DRIVELETTER "ƒŒƒ^�[" + IDS_COL_DRIVEMAPPING "ƒhƒ‰ƒCƒu‚ÌŠ„‚è“–‚Ä" + IDS_NO_DRIVE_C "ƒhƒ‰ƒCƒu C ‚ª‚ ‚è‚Ü‚¹‚ñ�B‚±‚ê‚Í‚ ‚Ü‚è—Ç‚­‚ ‚è‚Ü‚¹‚ñ�B\n\nƒhƒ‰ƒCƒu C ‚ð�ì�¬‚·‚邽‚߂Ƀhƒ‰ƒCƒuƒ^ƒu“à‚Ì�u’ljÁ�v‚ð–Y‚ꂸ‚ɃNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢!\n" END STRINGTABLE DISCARDABLE BEGIN - IDS_ACCEL_FULL "Full" - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" + IDS_ACCEL_FULL "Š®‘S" + IDS_ACCEL_STANDARD "•W�€" + IDS_ACCEL_BASIC "Šî–{" + IDS_ACCEL_EMULATION "ƒGƒ~ƒ…ƒŒ�[ƒVƒ‡ƒ“" IDS_DRIVER_ALSA "ALSA Driver" IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" @@ -276,13 +276,13 @@ BEGIN IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" IDS_DRIVER_COREAUDIO "CoreAudio Driver" IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" + IDS_SOUNDDRIVERS "ƒTƒEƒ“ƒhƒhƒ‰ƒCƒo" IDS_DEVICES_WAVEOUT "Wave Out Devices" IDS_DEVICES_WAVEIN "Wave In Devices" IDS_DEVICES_MIDIOUT "MIDI Out Devices" IDS_DEVICES_MIDIIN "MIDI In Devices" IDS_DEVICES_AUX "Aux Devices" IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove \"%s\" from registry?" - IDS_WARNING "Warning" + IDS_UNAVAILABLE_DRIVER "—˜—p‚Å‚«‚È‚¢ƒhƒ‰ƒCƒo‚ðƒŒƒWƒXƒgƒŠ“à‚ÉŒ©‚‚¯‚Ü‚µ‚½!\n\nƒŒƒWƒXƒgƒŠ‚©‚ç \"%s\" ‚ð�í�œ‚µ‚Ü‚·‚©?" + IDS_WARNING "Œx��" END diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc new file mode 100644 index 00000000000..7bd1fae12a8 --- /dev/null +++ b/programs/winefile/Ja.rc @@ -0,0 +1,260 @@ +/* + * WineFile + * Japanese Language Support + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "ƒtƒ@ƒCƒ‹(&F)" { + MENUITEM "ŠJ‚­(&O)\tEnter", ID_ACTIVATE + MENUITEM "ˆÚ“®(&M)...\tF7", ID_FILE_MOVE + MENUITEM "ƒRƒs�[(&C)...\tF8", ID_FILE_COPY + MENUITEM "&In Clipboard...\tF9", 118 + MENUITEM "�í�œ(&D)\tDel", ID_FILE_DELETE + MENUITEM "–¼‘O‚Ì•Ï�X(&N)...", 109 + MENUITEM "ƒvƒ�ƒpƒeƒB(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "ˆ³�k(&O)...", 119 + MENUITEM "‰ð“€(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "ŽÀ�s(&R)...", ID_EXECUTE + MENUITEM "ˆó�ü(&P)...", 102 + MENUITEM "ŠÖ˜A•t‚¯...", 103 + MENUITEM SEPARATOR + MENUITEM "ƒfƒBƒŒƒNƒgƒŠ‚ð�ì�¬(&E)...", 111 + MENUITEM "ŒŸ�õ(&H)...", 104 + MENUITEM "ƒtƒ@ƒCƒ‹‚ð‘I‘ð(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "�I—¹(&X)\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "�I—¹(&X)", ID_FILE_EXIT +#endif + } + + POPUP "ƒfƒBƒXƒN(&D)" { + MENUITEM "ƒfƒBƒXƒN‚ðƒRƒs�[(&C)...", 201 + MENUITEM "&Label Disk...", 202 + MENUITEM SEPARATOR + MENUITEM "ƒfƒBƒXƒN‚ðƒtƒH�[ƒ}ƒbƒg(&F)...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Make System Disk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "ƒlƒbƒgƒ��[ƒNƒhƒ‰ƒCƒu‚É�Ú‘±(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "ƒlƒbƒgƒ��[ƒNƒhƒ‰ƒCƒu‚ð�Ø’f(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Share as...", 254 + MENUITEM "&Remove Share...", 255 + MENUITEM SEPARATOR + MENUITEM "ƒhƒ‰ƒCƒu‚ð‘I‘ð(&S)...", 251 + } + + POPUP "ƒfƒBƒŒƒNƒgƒŠ(&R)" { + MENUITEM "&Next Level\t+", 301 + MENUITEM "ƒcƒŠ�[‚ð“WŠJ(&T)\t*", 302 + MENUITEM "‚·‚ׂĂð“WŠJ(&A)\tStrg+*", 303 + MENUITEM "ƒcƒŠ�[‚ð�Ü‚è�ô‚Þ(&T)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Mark Children", 505 + } + + POPUP "•\\Ž¦(&V)" { + MENUITEM "ƒcƒŠ�[‚ƃfƒBƒŒƒNƒgƒŠ(&R)", 413 + MENUITEM "ƒcƒŠ�[‚Ì‚Ý(&E)", 411 + MENUITEM "ƒfƒBƒŒƒNƒgƒŠ‚Ì‚Ý(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "•ªŠ„(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "–¼‘O(&N)", ID_VIEW_NAME + MENUITEM "‚·‚ׂẴtƒ@ƒCƒ‹�Ú�×(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "•”•ª�Ú�×(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "–¼‘O‚Å•À‚בւ¦(&S)", ID_VIEW_SORT_NAME + MENUITEM "Ží—Þ‚Å•À‚בւ¦(&B)", ID_VIEW_SORT_TYPE + MENUITEM "ƒTƒCƒY‚Å•À‚בւ¦(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "“ú•t‚Å•À‚בւ¦(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Filter by &...", ID_VIEW_FILTER + } + + POPUP "ƒIƒvƒVƒ‡ƒ“(&O)" { + MENUITEM "Šm”F(&C)...", 501 + MENUITEM "ƒtƒHƒ“ƒg(&F)...", ID_SELECT_FONT + MENUITEM "ƒc�[ƒ‹ƒo�[‚ðƒJƒXƒ^ƒ}ƒCƒY(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "ƒc�[ƒ‹ƒo�[(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "ƒhƒ‰ƒCƒuƒo�[(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "ƒXƒe�[ƒ^ƒXƒo�[(&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "‘S‰æ–Ê•\\Ž¦(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimize on run", 504 + MENUITEM "�I—¹Žž‚É�Ý’è‚ð•Û‘¶(&S)", ID_VIEW_SAVESETTINGS + } + + + POPUP "ƒZƒLƒ…ƒŠƒeƒB(&S)" { + MENUITEM "&Access...", 605 + MENUITEM "&Logging...", 606 + MENUITEM "&Owner...", 607 + } + + POPUP "ƒEƒBƒ“ƒhƒE(&W)" { + MENUITEM "�V‹KƒEƒBƒ“ƒhƒE(&W)", ID_WINDOW_NEW + MENUITEM "�d‚Ë‚Ä•\\Ž¦\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "�㉺‚É•À‚ׂĕ\\Ž¦(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "�¶‰E‚É•À‚ׂĕ\\Ž¦(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + MENUITEM "�X�V(&R)\tF5", ID_REFRESH + } + + POPUP "ƒwƒ‹ƒv(&H)" { + MENUITEM "ƒwƒ‹ƒv ƒgƒsƒbƒN(&H)\tF1", ID_HELP + MENUITEM "ƒwƒ‹ƒv‚ÌŒŸ�õ(&S)...\tF1", ID_HELP + MENUITEM "ƒwƒ‹ƒv‚ðŽg‚¤(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Winefile ‚ɂ‚¢‚Ä(&A)...", ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ŽÀ�s" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "ƒRƒ}ƒ“ƒh(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 158, 23, 47, 14 + PUSHBUTTON "ƒwƒ‹ƒv(&H)", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ˆÚ“®�æ‚ð‘I‘ð" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "ƒpƒX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 2, 158, 23, 47, 14 + PUSHBUTTON "ŽQ�Æ(&B)", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "By File Type" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Name:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "File Type",-1,7,23,87,56 + CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties for %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 + LTEXT "&File Name:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Full &Path:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Last Change:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Size:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributes",-1,7,79,158,46 + CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Version Information",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Applying font settings" + IDS_FONT_SEL_ERROR "Error while selecting new font." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine ƒtƒ@ƒCƒ‹ƒ}ƒl�[ƒWƒƒ" + IDS_ERROR "Error" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Desktop" + IDS_SHELL "ƒVƒFƒ‹" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "–¢ŽÀ‘•" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "–¼‘O" + IDS_COL_SIZE "ƒTƒCƒY" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "ƒŠƒ“ƒN" + IDS_COL_ATTR "‘®�«" + IDS_COL_SEC "ƒZƒLƒ…ƒŠƒeƒB" + + IDS_FREE_SPACE_FMT "%s of %s free" +} diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc index 5508ac9fade..d331ad6e8c0 100644 --- a/programs/winefile/rsrc.rc +++ b/programs/winefile/rsrc.rc @@ -63,6 +63,7 @@ IDB_IMAGES BITMAP DISCARDABLE images.bmp #include "Fr.rc" #include "Hu.rc" #include "It.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc" diff --git a/programs/winhlp32/Ja.rc b/programs/winhlp32/Ja.rc new file mode 100644 index 00000000000..a6acc2c2c05 --- /dev/null +++ b/programs/winhlp32/Ja.rc @@ -0,0 +1,125 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ + POPUP "ƒtƒ@ƒCƒ‹(&F)" { + MENUITEM "ŠJ‚­(&O)", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "ˆó�ü(&P)", MNID_FILE_PRINT + MENUITEM "ƒvƒŠƒ“ƒ^‚Ì�Ý’è(&S)...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "�I—¹(&X)", MNID_FILE_EXIT + } + POPUP "•Ò�W(&E)" { + MENUITEM "ƒRƒs�[(&C)...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "ƒRƒ�ƒ“ƒg(&A)...", MNID_EDIT_ANNOTATE + } + POPUP "‚µ‚¨‚è(&B)" { + MENUITEM "’è‹`(&D)...", MNID_BKMK_DEFINE + } + POPUP "ƒIƒvƒVƒ‡ƒ“(&O)" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "—š—ð", MNID_OPTS_HISTORY + POPUP "ƒtƒHƒ“ƒg" + BEGIN + MENUITEM "�¬", MNID_OPTS_FONTS_SMALL + MENUITEM "•W�€", MNID_OPTS_FONTS_NORMAL + MENUITEM "‘å", MNID_OPTS_FONTS_LARGE + END + MENUITEM "ƒVƒXƒeƒ€ ƒJƒ‰�[‚ðŽg‚¤", MNID_OPTS_SYSTEM_COLORS + } + POPUP "ƒwƒ‹ƒv(&H)" { + MENUITEM "ƒwƒ‹ƒv‚ɂ‚¢‚Ẵwƒ‹ƒv(&O)", MNID_HELP_HELPON + MENUITEM "�í‚ÉŽè‘O‚É•\\Ž¦(&T)", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "�î•ñ(&I)...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "WINE ‚ɂ‚¢‚Ä(&A)", MNID_HELP_WINE +#endif + } +} + +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "�õˆø" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ŒŸ�õ" +{ + LTEXT "–¢ŽÀ‘•", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE ƒwƒ‹ƒv" +STID_WHERROR, "ƒGƒ‰�[" +STID_WARNING, "Œx��" +STID_INFO, "�î•ñ" +STID_NOT_IMPLEMENTED, "”ñŽÀ‘•" +STID_HLPFILE_ERROR_s, "ƒwƒ‹ƒvƒtƒ@ƒCƒ‹ `%s' ‚ð“Ç‚Ý�ž‚ñ‚Å‚¢‚é‚Æ‚«‚ɃGƒ‰�[" +STID_INDEX, "�õˆø(&I)" +STID_CONTENTS, "ŠT—v" +STID_BACK, "–ß‚é(&B)" +STID_ALL_FILES, "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)" +STID_HELP_FILES_HLP, "ƒwƒ‹ƒv ƒtƒ@ƒCƒ‹ (*.hlp)" +STID_FILE_NOT_FOUND_s "'%s' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BŽ©•ª‚Å‚±‚̃tƒ@ƒCƒ‹‚ð’T‚µ‚Ü‚·‚©?" +STID_NO_RICHEDIT "ƒŠƒbƒ`ƒGƒfƒBƒbƒgŽÀ‘•‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ... �I—¹‚µ‚Ü‚·" +STID_PSH_INDEX, "ƒwƒ‹ƒv ƒgƒsƒbƒN: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "ƒRƒ�ƒ“ƒg...", MNID_CTXT_ANNOTATE + MENUITEM "ƒRƒs�[", MNID_CTXT_COPY + MENUITEM "ˆó�ü...", MNID_CTXT_PRINT + POPUP "ƒtƒHƒ“ƒg" + BEGIN + MENUITEM "�¬", MNID_CTXT_FONTS_SMALL + MENUITEM "•W�€", MNID_CTXT_FONTS_NORMAL + MENUITEM "‘å", MNID_CTXT_FONTS_LARGE + END + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE + MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "ƒVƒXƒeƒ€ ƒJƒ‰�[‚ðŽg‚¤", MNID_CTXT_SYSTEM_COLORS + END +END diff --git a/programs/winhlp32/rsrc.rc b/programs/winhlp32/rsrc.rc index 4dc7d232e66..2d258148fd4 100644 --- a/programs/winhlp32/rsrc.rc +++ b/programs/winhlp32/rsrc.rc @@ -39,6 +39,7 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico #include "Fr.rc" #include "Hu.rc" #include "It.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc" diff --git a/tools/make_makefiles b/tools/make_makefiles index c44bafe4888..63581032d8f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -56,15 +56,6 @@ my %dont_install = "winetest" => 1, ); -# Special dlls that can be switched on or off by configure -my %special_dlls = -( - "glu32" => "GLU32FILES", - "opengl32" => "OPENGLFILES", - "winex11.drv" => "XFILES", - "winequartz.drv" => "QUARTZFILES" -); - # Default patterns for top-level .gitignore my @ignores = ( "*.[oa]", @@ -278,7 +269,19 @@ sub update_makefiles(@) { my %make = %{$makefiles{$file}}; my $rules = $make{"=rules"}; - push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules])\n"; + my $args = ""; + if ($rules eq $makerules{"MAKE_DLL_RULES"}) { $args = ",[dlls],[ALL_DLL_DIRS]"; } + elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) { $args = ",[dlls],[ALL_IMPLIB_DIRS]"; } + elsif ($rules eq $makerules{"MAKE_TEST_RULES"}) { $args = ",[dlls],[ALL_TEST_DIRS]"; } + elsif ($rules eq $makerules{"MAKE_PROG_RULES"}) + { + (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; + $args = ",[programs],[ALL_PROGRAM_DIRS"; + $args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name}; + $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name}; + $args .= "]"; + } + push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n"; } push @lines, "\nAC_OUTPUT\n"; @@ -318,7 +321,7 @@ sub update_ignores(@) sub update_dlls(@) { - my (%directories, %testdirs, %importlibs, %static_implibs, %staticlib_dirs, %altnames); + my (%directories, %importlibs, %static_implibs, %staticlib_dirs, %altnames); my $text = ""; my @ignores = (); @@ -326,13 +329,7 @@ sub update_dlls(@) { my %makefile = %{$makefiles{$make}}; next if defined $makefile{"=skip"}; - - if ($make =~ /dlls\/(.*)\/tests\/Makefile/) - { - $testdirs{$1} = "$1/tests"; - (my $crosstest = $makefile{"TESTDLL"}) =~ s/\.dll$//; - next; - } + next if ($makefile{"=rules"} eq $makerules{"MAKE_TEST_RULES"}); next unless defined $makefile{"MODULE"}; my $module = $makefile{"MODULE"}; @@ -379,45 +376,6 @@ sub update_dlls(@) } } - # output special dlls configure definitions - - $text .= "# special configure-dependent targets\n\n"; - my %specials = (); - foreach my $mod (sort keys %special_dlls) - { - $specials{$special_dlls{$mod}} .= " " . $mod; - } - foreach my $i (sort keys %specials) - { - $text .= $i . " =" . $specials{$i} . "\n"; - } - $text .= "EXTRADIRS ="; - foreach my $i (sort keys %specials) { $text .= sprintf " \@%s\@", $i; } - $text .= "\n\n"; - - # output the subdirs list - - $text .= "# Subdir list\n\n"; - $text .= "BASEDIRS ="; - foreach my $dir (sort values %directories) - { - next if defined($special_dlls{$dir}); # skip special dlls - $text .= " \\\n\t" . $dir; - } - - $text .= "\n\nIMPLIBSUBDIRS = \\\n\t"; - $text .= join " \\\n\t", sort values %staticlib_dirs; - - $text .= "\n\nTESTSUBDIRS = \\\n\t"; - $text .= join " \\\n\t", sort values %testdirs; - - $text .= "\n\nSUBDIRS = \\\n\t"; - $text .= join " \\\n\t", "\$(BASEDIRS)", "\$(IMPLIBSUBDIRS)", "\$(TESTSUBDIRS)", sort keys %special_dlls; - - $text .= "\n\nBUILDSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(TESTSUBDIRS)\n"; - $text .= "INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)\n"; - $text .= "DOCSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)\n"; - # output the list of 16-bit files my @targets16 = (); @@ -429,7 +387,7 @@ sub update_dlls(@) push @targets16, $i . "16"; } } - $text .= "\n# 16-bit dlls\n\n"; + $text .= "# 16-bit dlls\n\n"; $text .= "WIN16_FILES = \\\n"; $text .= "\t" . join( " \\\n\t", sort @targets16 ) . "\n\n"; $text .= "\@MAKE_RULES\@\n\n"; @@ -537,7 +495,7 @@ sub update_dlls(@) $text .= "\n# Misc rules\n"; replace_in_file( "dlls/Makefile.in", - '^# special configure-dependent targets', + '^# 16-bit dlls', '^# Misc rules', $text ); @@ -558,41 +516,6 @@ sub update_dlls(@) ################################################################ -# update programs/Makefile.in - -sub update_progs(@) -{ - my (@subdirs, @install_subdirs, @install_progs); - - my @ignores = (); - - foreach my $make (@_) - { - my %makefile = %{$makefiles{$make}}; - my $module = $makefile{"MODULE"}; - (my $dir = $make) =~ s/^programs\/(.*)\/Makefile$/$1/; - die "Invalid module $module in $make" unless "$dir.exe" eq $module; - next if defined $makefile{"=skip"}; - push @subdirs, $dir; - push @ignores, "programs/$dir/$dir"; - push @install_subdirs, $dir unless $dont_install{$dir}; - push @install_progs, $dir if $bin_install{$dir}; - } - - replace_in_file( "programs/Makefile.in", '^SUBDIRS\s*=', '^INSTALLDIRS', - "SUBDIRS = \\\n\t", - join( " \\\n\t", @subdirs ), - "\n\n# Sub-directories to run make install into\nINSTALLSUBDIRS = \\\n\t", - join( " \\\n\t", @install_subdirs ), - "\n\n# Programs to install in bin directory\nINSTALLPROGS = \\\n\t", - join( " \\\n\t", @install_progs ), - "\n\nINSTALLDIRS = \$(DESTDIR)\$(bindir)\n" ); - - return @ignores; -} - - -################################################################ # update include/Makefile.in sub update_includes() @@ -642,6 +565,10 @@ sub update_gitignore(@) { push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}}; } + if ($dir =~ /^programs\/(.*)\/$/) + { + push @ignores, "$dir$1"; + } } # prepend a slash to paths that don't have one @@ -678,5 +605,4 @@ update_makefiles( @makefiles ); push @ignores, update_ignores( @makefiles ); push @ignores, update_winetest( @makefiles ); push @ignores, update_dlls( sort grep /^dlls\//, @makefiles ); -push @ignores, update_progs( sort grep /^programs\/.*\/Makefile$/, @makefiles ); update_gitignore( @ignores ); -- 2.11.4.GIT