March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : lz32: Make lzexpand. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 96b47ff78a660d2501862845bc8f527e887f1922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b47ff78a660d2501862845b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:18:03 2009 +0100 lz32: Make lzexpand.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 4 ---- dlls/lz32/Makefile.in | 3 --- dlls/lzexpand.dll16/Makefile.in | 15 +++++++++++++++ .../lzexpand16.c => lzexpand.dll16/lzexpand.c} | 0 .../lzexpand.dll16.spec} | 0 8 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 73e3152..87ad420 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ dlls/krnl386.exe16 dlls/libd3dx9.def dlls/libwinspool.def dlls/libxinput.def -dlls/lzexpand.dll16 dlls/mmsystem.dll16 dlls/msacm.dll16 dlls/mshtml.tlb/mshtml_tlb.tlb diff --git a/configure b/configure index 5fe40d4..67bde50 100755 --- a/configure +++ b/configure @@ -3906,6 +3906,7 @@ then enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_keyboard_drv16=${enable_keyboard_drv16:-no} + enable_lzexpand_dll16=${enable_lzexpand_dll16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} @@ -25871,6 +25872,14 @@ 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/lzexpand.dll16/Makefile" +test "x$enable_lzexpand_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + lzexpand.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/lzexpand.dll16/Makefile: dlls/lzexpand.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/lzexpand.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mapi32/Makefile" test "x$enable_mapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mapi32" @@ -29070,6 +29079,7 @@ do "dlls/localui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localui/tests/Makefile" ;; "dlls/lz32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/Makefile" ;; "dlls/lz32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/tests/Makefile" ;; + "dlls/lzexpand.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lzexpand.dll16/Makefile" ;; "dlls/mapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; "dlls/mapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/tests/Makefile" ;; "dlls/mciavi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mciavi32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 1246a11..0989948 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,7 @@ then enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_keyboard_drv16=${enable_keyboard_drv16:-no} + enable_lzexpand_dll16=${enable_lzexpand_dll16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} @@ -2063,6 +2064,7 @@ WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) 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],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/lzexpand.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_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],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 84f9363..58582ce 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -27,7 +27,6 @@ WIN16_FILES = \ gdi.exe16 \ imm.dll16 \ krnl386.exe16 \ - lzexpand.dll16 \ mmsystem.dll16 \ msacm.dll16 \ msvideo.dll16 \ @@ -86,9 +85,6 @@ imm.dll16: krnl386.exe16 system.drv16 toolhelp.dll16: echo "kernel32.dll" >$@ -lzexpand.dll16: - echo "lz32.dll" >$@ - msacm.dll16: echo "msacm32.dll" >$@ diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index bd3d5fb..2991f29 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -8,9 +8,6 @@ IMPORTS = kernel32 RC_SRCS = version.rc -C_SRCS16 = lzexpand16.c -SPEC_SRCS16 = lzexpand.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/lzexpand.dll16/Makefile.in b/dlls/lzexpand.dll16/Makefile.in new file mode 100644 index 0000000..aac9c07 --- /dev/null +++ b/dlls/lzexpand.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = lzexpand.dll16 +IMPORTS = lz32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,lz32.dll + +SPEC_SRCS = lzexpand.dll16.spec + +C_SRCS = lzexpand.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/lz32/lzexpand16.c b/dlls/lzexpand.dll16/lzexpand.c similarity index 100% rename from dlls/lz32/lzexpand16.c rename to dlls/lzexpand.dll16/lzexpand.c diff --git a/dlls/lz32/lzexpand.spec b/dlls/lzexpand.dll16/lzexpand.dll16.spec similarity index 100% rename from dlls/lz32/lzexpand.spec rename to dlls/lzexpand.dll16/lzexpand.dll16.spec

1 0

Alexandre Julliard : kernel32: Make the load order for a 16-bit stand-alone dll match its 32-bit owner.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 009342a88cc2410732c98d4b4888a59a4ac6d1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=009342a88cc2410732c98d4b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:16:41 2009 +0100 kernel32: Make the load order for a 16-bit stand-alone dll match its 32-bit owner. --- dlls/kernel32/ne_module.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 046f7e3..47c3f4d 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1046,7 +1046,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ const IMAGE_DOS_HEADER *descr = NULL; const char *file_name = NULL; char dllname[32], owner[20], *p; - const char *basename; + const char *basename, *main_module; int owner_exists = FALSE; /* strip path information */ @@ -1075,11 +1075,33 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ { TRACE( "found %s with embedded 16-bit module\n", debugstr_a(dllname) ); file_name = basename; + + /* if module has a 32-bit owner, match the load order of the owner */ + if ((main_module = (void *)GetProcAddress( mod32, "__wine_spec_main_module" ))) + { + LDR_MODULE *ldr; + HMODULE main_owner = LoadLibraryA( main_module ); + + if (!main_owner) + { + WARN( "couldn't load owner %s for 16-bit dll %s\n", main_module, dllname ); + FreeLibrary( mod32 ); + return ERROR_FILE_NOT_FOUND; + } + /* check if module was loaded native */ + if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + { + FreeLibrary( mod32 ); + descr = NULL; + } + FreeLibrary( main_owner ); + } } } *p = 0; - if (!descr && wine_dll_get_owner( dllname, owner, sizeof(owner), &owner_exists ) != -1) + /* old-style 16-bit placeholders support, to be removed at some point */ + if (!mod32 && wine_dll_get_owner( dllname, owner, sizeof(owner), &owner_exists ) != -1) { mod32 = LoadLibraryA( owner ); if (mod32)

1 0

Alexandre Julliard : msacm32: Make msacm. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: d43148222aaca1698c3899649d43278a9652eefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43148222aaca1698c3899649… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:22:47 2009 +0100 msacm32: Make msacm.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 4 ---- dlls/msacm.dll16/Makefile.in | 15 +++++++++++++++ dlls/{msacm32/msacm_main.c => msacm.dll16/msacm.c} | 4 ++-- .../msacm.spec => msacm.dll16/msacm.dll16.spec} | 2 +- dlls/{msacm32 => msacm.dll16}/wineacm16.h | 0 dlls/msacm32/Makefile.in | 5 ----- 9 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 87ad420..6ae5342 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ dlls/libd3dx9.def dlls/libwinspool.def dlls/libxinput.def dlls/mmsystem.dll16 -dlls/msacm.dll16 dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h dlls/msi/cond.tab.c diff --git a/configure b/configure index 67bde50..09152d8 100755 --- a/configure +++ b/configure @@ -3910,6 +3910,7 @@ then enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} + enable_msacm_dll16=${enable_msacm_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -26008,6 +26009,14 @@ dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mprapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/msacm.dll16/Makefile" +test "x$enable_msacm_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msacm.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/msacm.dll16/Makefile: dlls/msacm.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/msacm.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msacm32.drv/Makefile" test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ msacm32.drv" @@ -29096,6 +29105,7 @@ do "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;; "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;; "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;; + "dlls/msacm.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm.dll16/Makefile" ;; "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;; "dlls/msacm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;; "dlls/msacm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0989948..a664ef9 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,7 @@ then enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} + enable_msacm_dll16=${enable_msacm_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -2081,6 +2082,7 @@ WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/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/msacm.dll16/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],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 58582ce..1abd27d 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -28,7 +28,6 @@ WIN16_FILES = \ imm.dll16 \ krnl386.exe16 \ mmsystem.dll16 \ - msacm.dll16 \ msvideo.dll16 \ ole2.dll16 \ ole2conv.dll16 \ @@ -85,9 +84,6 @@ imm.dll16: krnl386.exe16 system.drv16 toolhelp.dll16: echo "kernel32.dll" >$@ -msacm.dll16: - echo "msacm32.dll" >$@ - msvideo.dll16: echo "msvfw32.dll" >$@ diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in new file mode 100644 index 0000000..6bb17e6 --- /dev/null +++ b/dlls/msacm.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = msacm.dll16 +IMPORTS = msacm32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,msacm32.dll + +SPEC_SRCS = msacm.dll16.spec + +C_SRCS = msacm.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msacm32/msacm_main.c b/dlls/msacm.dll16/msacm.c similarity index 98% rename from dlls/msacm32/msacm_main.c rename to dlls/msacm.dll16/msacm.c index 8eb20b1..48729f9 100644 --- a/dlls/msacm32/msacm_main.c +++ b/dlls/msacm.dll16/msacm.c @@ -39,8 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); * MSACM DLL entry point * */ -BOOL WINAPI MSACM_DllEntryPoint(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, - WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) +BOOL WINAPI DllEntryPoint16(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, + WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) { return TRUE; } diff --git a/dlls/msacm32/msacm.spec b/dlls/msacm.dll16/msacm.dll16.spec similarity index 96% rename from dlls/msacm32/msacm.spec rename to dlls/msacm.dll16/msacm.dll16.spec index e49115f..8f37a65 100644 --- a/dlls/msacm32/msacm.spec +++ b/dlls/msacm.dll16/msacm.dll16.spec @@ -1,6 +1,6 @@ # 1 stub WEP 2 stub DRIVERPROC - 3 pascal DllEntryPoint(long word word word long word) MSACM_DllEntryPoint + 3 pascal DllEntryPoint(long word word word long word) DllEntryPoint16 4 stub ___EXPORTEDSTUB 7 pascal acmGetVersion() acmGetVersion16 8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16 diff --git a/dlls/msacm32/wineacm16.h b/dlls/msacm.dll16/wineacm16.h similarity index 100% rename from dlls/msacm32/wineacm16.h rename to dlls/msacm.dll16/wineacm16.h diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index 8724d3b..48a1d2b 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -15,11 +15,6 @@ C_SRCS = \ pcmconverter.c \ stream.c -C_SRCS16 = \ - msacm_main.c - -SPEC_SRCS16 = msacm.spec - RC_SRCS = msacm.rc @MAKE_DLL_RULES@

1 0

Alexandre Julliard : configure: Check for IOHIDManagerCreate function that' s missing on Tiger.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 81f8c03712b6215e006577b5bb0e5749400cdd32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f8c03712b6215e006577b5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:49:55 2009 +0100 configure: Check for IOHIDManagerCreate function that's missing on Tiger. --- configure | 107 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 7 +++ dlls/dinput/joystick_osx.c | 6 +- include/config.h.in | 3 + 4 files changed, 120 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8bf88e1..5fe40d4 100755 --- a/configure +++ b/configure @@ -7557,6 +7557,113 @@ fi COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" fi + if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="$LIBS $IOKITLIB" + +for ac_func in IOHIDManagerCreate +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" + fi case $host_cpu in *powerpc*) LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" ;; diff --git a/configure.ac b/configure.ac index 0930f5c..1246a11 100644 --- a/configure.ac +++ b/configure.ac @@ -578,6 +578,13 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="$LIBS $IOKITLIB" + AC_CHECK_FUNCS(IOHIDManagerCreate) + LIBS="$ac_save_LIBS" + fi case $host_cpu in *powerpc*) LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" dnl FIXME diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index ea5ad63..c8a333f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -116,7 +116,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -#ifdef HAVE_IOKIT_HID_IOHIDLIB_H +#ifdef HAVE_IOHIDMANAGERCREATE static IOHIDManagerRef gIOHIDManagerRef = NULL; static CFArrayRef gDevices = NULL; @@ -893,7 +893,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = }; #undef XCAST -#else /* HAVE_IOKIT_HID_IOHIDLIB_H */ +#else /* HAVE_IOHIDMANAGERCREATE */ const struct dinput_device joystick_osx_device = { "Wine OS X joystick driver", @@ -903,4 +903,4 @@ const struct dinput_device joystick_osx_device = { NULL }; -#endif /* HAVE_IOKIT_HID_IOHIDLIB_H */ +#endif /* HAVE_IOHIDMANAGERCREATE */ diff --git a/include/config.h.in b/include/config.h.in index 3dec61e..9f3da47 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -255,6 +255,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `IOHIDManagerCreate' function. */ +#undef HAVE_IOHIDMANAGERCREATE + /* Define to 1 if you have the <IOKit/hid/IOHIDLib.h> header file. */ #undef HAVE_IOKIT_HID_IOHIDLIB_H

1 0

Paul Vriens : ddraw/tests: Fix some test failures on W2K/VMware.
by Alexandre Julliard March 11, 2009

March 11, 2009

Module: wine Branch: master Commit: ae1802d01ba2ec12a51ffb450dc7810d03809fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1802d01ba2ec12a51ffb450… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 11 13:52:07 2009 +0100 ddraw/tests: Fix some test failures on W2K/VMware. --- dlls/ddraw/tests/visual.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7c5e651..9234e59 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -566,7 +566,12 @@ static void offscreen_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned hr = %08x\n", hr); - if(IDirect3DDevice7_BeginScene(device) == D3D_OK && !refdevice) { + if (refdevice) { + win_skip("Tests would crash on W2K with a refdevice\n"); + goto out; + } + + if(IDirect3DDevice7_BeginScene(device) == D3D_OK) { hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); @@ -687,6 +692,12 @@ static void alpha_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr = %08x\n", hr); + + if (refdevice) { + win_skip("Tests would crash on W2K with a refdevice\n"); + goto out; + } + if(IDirect3DDevice7_BeginScene(device) == D3D_OK) { /* Draw two quads, one with src alpha blending, one with dest alpha blending. The

1 0

Aurimas Fischer : comdlg32: Improve Lithuanian translation.
by Alexandre Julliard March 11, 2009

March 11, 2009

Module: wine Branch: master Commit: ffeb09d062591e6e2ce815869973732e1ac13245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffeb09d062591e6e2ce815869… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Wed Mar 11 16:07:54 2009 +0200 comdlg32: Improve Lithuanian translation. --- dlls/comdlg32/cdlg_Lt.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/cdlg_Lt.rc b/dlls/comdlg32/cdlg_Lt.rc index f551925..1610413 100644 --- a/dlls/comdlg32/cdlg_Lt.rc +++ b/dlls/comdlg32/cdlg_Lt.rc @@ -186,10 +186,10 @@ FONT 8, "MS Shell Dlg" FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rasti" +CAPTION "Ieškoti" FONT 8, "MS Shell Dlg" { - LTEXT "&Ieškoti ko:", -1, 4, 8, 42, 8 + LTEXT "Ko &ieškoti:", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Tenkina tik &visas žodis", chx1, 4, 26, 82, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Skirti raidžių &dydį", chx2, 4, 42, 70, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -197,7 +197,7 @@ FONT 8, "MS Shell Dlg" CONTROL "&Aukštyn", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 93, 38, 40, 12 CONTROL "&Žemyn", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 134, 38, 36, 12 - DEFPUSHBUTTON "&Rasti kitą", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "Ieškoti &kito", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Atsisakyti", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Žinynas", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -208,14 +208,14 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Pakeisti" FONT 8, "MS Shell Dlg" { - LTEXT "&Ieškoti ko:", -1, 4, 9, 48, 8 + LTEXT "Ko &ieškoti:", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Pa&keisti kuo:", -1, 4, 26, 48, 8 + LTEXT "Kuo pa&keisti:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Tenkina tik &visas žodis", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Skirti raidžių &dydį", chx2, 5, 62, 70, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Rasti kitą", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "Ieškoti &kito", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Pakeisti", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "P&akeisti visus", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP

1 0

Aurimas Fischer : notepad: Improve Lithuanian translation.
by Alexandre Julliard March 11, 2009

March 11, 2009

Module: wine Branch: master Commit: f723ceda676c6aaa87c3cf93dd7adbca0622af70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f723ceda676c6aaa87c3cf93d… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Wed Mar 11 15:21:09 2009 +0200 notepad: Improve Lithuanian translation. --- programs/notepad/Lt.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index 2ddf0e0..741c22a 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -37,13 +37,13 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "Iš&eiti", CMD_EXIT } -POPUP "&Keisti" { +POPUP "&Taisa" { MENUITEM "&Atšaukti\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "&Iškirpti\tCtrl+X", CMD_CUT MENUITEM "&Kopijuoti\tCtrl+C", CMD_COPY MENUITEM "Į&dėti\tCtrl+V", CMD_PASTE - MENUITEM "Iš&valyti\tDel", CMD_DELETE + MENUITEM "&Šalinti\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "&Pažymėti viską\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Laikas/Data\tF5", CMD_TIME_DATE @@ -52,8 +52,8 @@ POPUP "&Keisti" { MENUITEM "Š&riftas...", CMD_FONT } POPUP "&Paieška" { - MENUITEM "&Rasti...\tCtrl+F", CMD_SEARCH - MENUITEM "Rasti k&itą\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ieškoti...\tCtrl+F", CMD_SEARCH + MENUITEM "Ieškoti k&ito\tF3", CMD_SEARCH_NEXT } POPUP "&Žinynas" { MENUITEM "&Turinys", CMD_HELP_CONTENTS

1 0

Denis Baranov : wine.inf: Add registry branch HKEY_CLASSES_ROOT\MIME\Database\Charset.
by Alexandre Julliard March 11, 2009

March 11, 2009

Module: wine Branch: master Commit: 6021a73c02e3e6cd8c7d98f61ba5031e728c6a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6021a73c02e3e6cd8c7d98f61… Author: Denis Baranov <baraka(a)etersoft.ru> Date: Tue Feb 24 21:16:26 2009 +0300 wine.inf: Add registry branch HKEY_CLASSES_ROOT\MIME\Database\Charset. --- tools/wine.inf.in | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6021a73c02e3e6cd8c7d9…

1 0

Alexandre Julliard : wineps.drv: Make all exported entry points CDECL.
by Alexandre Julliard March 11, 2009

March 11, 2009

Module: wine Branch: master Commit: 41ea3205766683203eb18de4fe083a223f6d6344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ea3205766683203eb18de4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 14:10:13 2009 +0100 wineps.drv: Make all exported entry points CDECL. --- dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 8 +++--- dlls/wineps.drv/brush.c | 2 +- dlls/wineps.drv/builtin.c | 12 ++++---- dlls/wineps.drv/clipping.c | 2 +- dlls/wineps.drv/color.c | 4 +- dlls/wineps.drv/driver.c | 11 ++++---- dlls/wineps.drv/escape.c | 12 ++++---- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 38 +++++++++++++++--------------- dlls/wineps.drv/init.c | 10 ++++---- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/psdrv.h | 56 +------------------------------------------ dlls/wineps.drv/text.c | 6 ++-- 14 files changed, 57 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41ea3205766683203eb18…

1 0

Aric Stewart : dinput: Add OS/X sliders.
by Alexandre Julliard March 11, 2009

March 11, 2009

Module: wine Branch: master Commit: ae16df651f304fd56fa24a6697d01ab4a0ddf3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae16df651f304fd56fa24a669… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 15:00:03 2009 -0500 dinput: Add OS/X sliders. --- dlls/dinput/joystick_osx.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 4faf621..ea5ad63 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -289,6 +289,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef; DWORD axes = 0; + DWORD sliders = 0; DWORD buttons = 0; DWORD povs = 0; @@ -343,6 +344,11 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) povs++; break; } + case kHIDUsage_GD_Slider: + sliders ++; + if (sliders > 2) + break; + /* fallthrough, sliders are axis */ case kHIDUsage_GD_X: case kHIDUsage_GD_Y: case kHIDUsage_GD_Z: @@ -413,6 +419,7 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) { int button_idx = 0; int pov_idx = 0; + int slider_idx = 0; CFIndex idx, cnt = CFArrayGetCount( gElementCFArrayRef ); for ( idx = 0; idx < cnt; idx++ ) @@ -455,6 +462,7 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) case kHIDUsage_GD_Rx: case kHIDUsage_GD_Ry: case kHIDUsage_GD_Rz: + case kHIDUsage_GD_Slider: { IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); val = IOHIDValueGetIntegerValue(valueRef); @@ -478,6 +486,10 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) case kHIDUsage_GD_Rz: device->generic.js.lRz = joystick_map_axis(&device->generic.props[idx], val); break; + case kHIDUsage_GD_Slider: + device->generic.js.rglSlider[slider_idx] = joystick_map_axis(&device->generic.props[idx], val); + slider_idx ++; + break; } break; } @@ -585,6 +597,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di LPDIDATAFORMAT df = NULL; int idx = 0; int axis_map[8]; /* max axes */ + int slider_count = 0; TRACE("%s %p %p %p %hu\n", debugstr_guid(rguid), jvt, dinput, pdev, index); @@ -644,6 +657,10 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di case kHIDUsage_GD_Rx: wine_obj = 3; break; case kHIDUsage_GD_Ry: wine_obj = 4; break; case kHIDUsage_GD_Rz: wine_obj = 5; break; + case kHIDUsage_GD_Slider: + wine_obj = 6 + slider_count; + slider_count++; + break; } if (wine_obj < 0 ) continue;

1 0