May 2007 - Wine-commits - list.winehq.org

Andrew Talbot : kernel32: Exclude unused headers.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 59651999b33d49b0cd3397a21f3a42d28ce527fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=59651999b33d49b0cd3397a21… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:17 2007 +0100 kernel32: Exclude unused headers. --- dlls/kernel32/actctx.c | 1 - dlls/kernel32/atom.c | 2 -- dlls/kernel32/atom16.c | 1 - dlls/kernel32/computername.c | 1 - dlls/kernel32/cpu.c | 1 - dlls/kernel32/error16.c | 1 - 6 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index a0bd3c1..bdb6a1a 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(actctx); diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index f444ae0..d6caec2 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -30,11 +30,9 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/exception.h" -#include "excpt.h" #include "wine/unicode.h" #include "kernel_private.h" diff --git a/dlls/kernel32/atom16.c b/dlls/kernel32/atom16.c index c43fb83..0c52f1f 100644 --- a/dlls/kernel32/atom16.c +++ b/dlls/kernel32/atom16.c @@ -41,7 +41,6 @@ #include "wine/unicode.h" #include "wine/winbase16.h" -#include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index d2c0a7c..5e811f8 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -43,7 +43,6 @@ #include "winternl.h" #include "wine/unicode.h" #include "wine/exception.h" -#include "excpt.h" #include "wine/debug.h" #include "kernel_private.h" diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 27a50ae..7567af5 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -51,7 +51,6 @@ #include "winbase.h" #include "winnt.h" #include "winternl.h" -#include "winerror.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/kernel32/error16.c b/dlls/kernel32/error16.c index d7a1e35..ce8935d 100644 --- a/dlls/kernel32/error16.c +++ b/dlls/kernel32/error16.c @@ -24,7 +24,6 @@ #include <string.h> #include "windef.h" -#include "winbase.h" #include "wine/winbase16.h" #include "wine/debug.h"

1 0

Ben Taylor : winegcc: Allow -R and -z linker options.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 61f8c34f1ea716468a6a921bda7dec8fe0d248c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f8c34f1ea716468a6a921bd… Author: Ben Taylor <sol11x86(a)comcast.net> Date: Sat May 5 18:33:58 2007 +0000 winegcc: Allow -R and -z linker options. --- tools/winegcc/winegcc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f1a7bb0..3955276 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -724,7 +724,9 @@ static int is_linker_arg(const char* arg) switch (arg[1]) { - case 'l': + case 'R': + case 'z': + case 'l': case 'u': return 1; case 'W': @@ -828,7 +830,7 @@ int main(int argc, char **argv) case 'x': case 'o': case 'D': case 'U': case 'I': case 'A': case 'l': case 'u': case 'b': case 'V': case 'G': case 'L': - case 'B': + case 'B': case 'R': case 'z': if (argv[i][2]) option_arg = &argv[i][2]; else next_is_arg = 1; break;

1 0

Andrew Talbot : inseng: Exclude unused header.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: e25d073f5761a98f233486705d903007097dcdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25d073f5761a98f233486705… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:12 2007 +0100 inseng: Exclude unused header. --- dlls/inseng/inseng_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 83b1457..8ceb252 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "ole2.h" #include "initguid.h"

1 0

Andrew Talbot : imagehlp: Exclude unused headers.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 01f3648ef788adf0cb5db9697a7b21cb95e4b005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01f3648ef788adf0cb5db9697… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:07 2007 +0100 imagehlp: Exclude unused headers. --- dlls/imagehlp/access.c | 1 - dlls/imagehlp/imagehlp_main.c | 1 - dlls/imagehlp/integrity.c | 1 - dlls/imagehlp/modify.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 1560d11..2aeedff 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" #include "winnt.h" -#include "winreg.h" #include "winternl.h" #include "winerror.h" #include "wine/debug.h" diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index 42a1a41..91c76bd 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" #include "imagehlp.h" -#include "winerror.h" #include "wine/debug.h" /**********************************************************************/ diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index 99608b7..fb228f4 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "winnt.h" #include "imagehlp.h" diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 47aa44c..668069b 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -22,7 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "winerror.h" #include "wine/debug.h"

1 0

Alexandre Julliard : configure: Only check for the static versions of libicu.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: bb168aaba84fe0584fb0be9a0e0531c36b8fa602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb168aaba84fe0584fb0be9a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 17:06:48 2007 +0200 configure: Only check for the static versions of libicu. Get rid of hardcoded path names to avoid trouble on 64-bit platforms. Based on a patch by Robert Millan. --- configure | 67 ++++++++++++++++++++++++++++++--------------------------- configure.ac | 25 +++++++++++---------- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/configure b/configure index 44d6f0e..c6481f8 100755 --- a/configure +++ b/configure @@ -10364,66 +10364,69 @@ fi if test "$ac_cv_header_unicode_ubidi_h" = "yes" then saved_libs="$LIBS" - for i in ${ICU_LIB_DIR-/usr/lib}/libsicu ${ICU_LIB_DIR-/usr/lib}/libicu - do - TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}" - TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}" - { echo "$as_me:$LINENO: checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB" >&5 -echo $ECHO_N "checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB... $ECHO_C" >&6; } - LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s" - cat >conftest.$ac_ext <<_ACEOF + icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s" + if test -n "$ICU_LIB_DIR" + then + icu_libs="-L$ICU_LIB_DIR $icu_libs" + fi + { echo "$as_me:$LINENO: checking whether can link with ICU libraries" >&5 +echo $ECHO_N "checking whether can link with ICU libraries... $ECHO_C" >&6; } + LIBS="$saved_libs $icu_libs" + if test "$cross_compiling" = yes; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <unicode/ubidi.h> -int -main () -{ -ubidi_open() - ; - return 0; -} +main () { ubidi_open(); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 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 && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF #define HAVE_ICU 1 _ACEOF - ICULIBS="$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s" + ICULIBS="icu_libs" - { echo "$as_me:$LINENO: result: yes" >&5 + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 +( exit $ac_status ) +{ echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - done LIBS="$saved_libs" fi diff --git a/configure.ac b/configure.ac index b62c0a5..683e753 100644 --- a/configure.ac +++ b/configure.ac @@ -593,18 +593,19 @@ dnl **** Check for the ICU library **** if test "$ac_cv_header_unicode_ubidi_h" = "yes" then saved_libs="$LIBS" - for i in ${ICU_LIB_DIR-/usr/lib}/libsicu ${ICU_LIB_DIR-/usr/lib}/libicu - do - TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}" - TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}" - AC_MSG_CHECKING(whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB) - LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s" - AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()], - [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed]) - AC_SUBST(ICULIBS,"$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s") - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - done + icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s" + if test -n "$ICU_LIB_DIR" + then + icu_libs="-L$ICU_LIB_DIR $icu_libs" + fi + AC_MSG_CHECKING(whether can link with ICU libraries) + LIBS="$saved_libs $icu_libs" + AC_TRY_RUN([#include <unicode/ubidi.h> +main () { ubidi_open(); return 0; }], + [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed]) + AC_SUBST(ICULIBS,"icu_libs") + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) LIBS="$saved_libs" fi

1 0

Alexandre Julliard : kernel32: Disable FT_Thunk entry point when Windows version is NT.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 3baf4dbe76c61cbeee0e0880c2e3c56c2572d03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3baf4dbe76c61cbeee0e0880c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 17:10:18 2007 +0200 kernel32: Disable FT_Thunk entry point when Windows version is NT. --- dlls/kernel32/kernel_main.c | 49 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 9f6b311..5e72cee 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -40,6 +40,9 @@ #include "kernel_private.h" #include "kernel16_private.h" #include "console_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(process); extern int __wine_set_signal_handler(unsigned, int (*)(unsigned)); @@ -69,9 +72,44 @@ static void thread_detach(void) /*********************************************************************** + * set_entry_point + */ +static void set_entry_point( HMODULE module, const char *name, DWORD rva ) +{ + IMAGE_EXPORT_DIRECTORY *exports; + DWORD exp_size; + + if ((exports = RtlImageDirectoryEntryToData( module, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) + { + DWORD *functions = (DWORD *)((char *)module + exports->AddressOfFunctions); + const WORD *ordinals = (const WORD *)((const char *)module + exports->AddressOfNameOrdinals); + const DWORD *names = (const DWORD *)((const char *)module + exports->AddressOfNames); + int min = 0, max = exports->NumberOfNames - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + const char *ename = (const char *)module + names[pos]; + if (!(res = strcmp( ename, name ))) + { + WORD ordinal = ordinals[pos]; + assert( ordinal < exports->NumberOfFunctions ); + TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); + functions[ordinal] = rva; + return; + } + if (res > 0) max = pos - 1; + else min = pos + 1; + } + } +} + + +/*********************************************************************** * KERNEL process initialisation routine */ -static BOOL process_attach(void) +static BOOL process_attach( HMODULE module ) { SYSTEM_INFO si; RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; @@ -108,8 +146,13 @@ static BOOL process_attach(void) /* copy process information from ntdll */ ENV_CopyStartupInformation(); + if (!(GetVersion() & 0x80000000)) + { + /* Securom checks for this one when version is NT */ + set_entry_point( module, "FT_Thunk", 0 ); + } #ifdef __i386__ - if (GetVersion() & 0x80000000) + else { /* create the shared heap for broken win95 native dlls */ HeapCreate( HEAP_SHARED, 0, 0 ); @@ -148,7 +191,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - return process_attach(); + return process_attach( hinst ); case DLL_THREAD_ATTACH: thread_attach(); break;

1 0

James Hawkins : msi: Add handling for the ReinstallMode control event.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 770e49cd3c67851c3c6fc0222cd220d6b2e21015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770e49cd3c67851c3c6fc0222… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:54:21 2007 -0500 msi: Add handling for the ReinstallMode control event. --- dlls/msi/events.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 714e060..faaaf2f 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -406,6 +406,13 @@ static UINT ControlEvent_DirectoryListUp(MSIPACKAGE *package, LPCWSTR argument, return msi_dialog_directorylist_up( dialog ); } +static UINT ControlEvent_ReinstallMode(MSIPACKAGE *package, LPCWSTR argument, + msi_dialog *dialog) +{ + static const WCHAR szReinstallMode[] = {'R','E','I','N','S','T','A','L','L','M','O','D','E',0}; + return MSI_SetPropertyW( package, szReinstallMode, argument ); +} + static const struct _events Events[] = { { "EndDialog",ControlEvent_EndDialog }, { "NewDialog",ControlEvent_NewDialog }, @@ -420,6 +427,7 @@ static const struct _events Events[] = { { "SetInstallLevel",ControlEvent_SetInstallLevel }, { "DirectoryListUp",ControlEvent_DirectoryListUp }, { "SelectionBrowse",ControlEvent_SpawnDialog }, + { "ReinstallMode",ControlEvent_ReinstallMode }, { NULL,NULL }, };

1 0

Bernard Ladenthin : browseui: Implement ClassFactory_LockServer in browseui dll.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: db07476c11e79e3ae06f44f6dd3b76bcaa79be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db07476c11e79e3ae06f44f6d… Author: Bernard Ladenthin <bernard(a)ladenthin.net> Date: Sun May 6 19:31:07 2007 +0200 browseui: Implement ClassFactory_LockServer in browseui dll. --- dlls/browseui/browseui.h | 4 ++++ dlls/browseui/browseui_main.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 2f44ac7..f8ec194 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -23,6 +23,10 @@ extern LONG BROWSEUI_refCount; +extern LONG module_ref; +#define LOCK_MODULE() InterlockedIncrement(&module_ref) +#define UNLOCK_MODULE() InterlockedDecrement(&module_ref) + HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); #endif /* __WINE_SHDOCVW_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 2796554..c5f9cbe 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -43,6 +43,8 @@ LONG BROWSEUI_refCount = 0; HINSTANCE browseui_hinstance = 0; +LONG module_ref = 0; + typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); static const struct { @@ -126,8 +128,16 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { - FIXME("(%p, %s) - not implemented\n", iface, (fLock ? "TRUE" : "FALSE")); - return E_NOTIMPL; + ClassFactory *This = (ClassFactory *)iface; + + TRACE("(%p)->(%x)\n", This, fLock); + + if(fLock) + LOCK_MODULE(); + else + UNLOCK_MODULE(); + + return S_OK; } static const IClassFactoryVtbl ClassFactoryVtbl = {

1 0

Maarten Lankhorst : winmm: Use criticalsection for determining wether timer is synchronously killable .
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: e2a1bc9804a503da39353cab7d3a2cf31fa462fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a1bc9804a503da39353cab7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 5 17:32:24 2007 +0200 winmm: Use criticalsection for determining wether timer is synchronously killable. --- dlls/winmm/time.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 891b569..27a4e46 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmtime); static HANDLE TIME_hMMTimer; static LPWINE_TIMERENTRY TIME_TimersList; -static HANDLE TIME_hKillEvent; static HANDLE TIME_hWakeEvent; +static CRITICAL_SECTION TIME_cbcrst; static BOOL TIME_TimeToDie = TRUE; /* @@ -200,11 +200,11 @@ static LPWINE_TIMERENTRY lpTimers; ptimer = next_ptimer; } - if (TIME_hKillEvent) ResetEvent(TIME_hKillEvent); LeaveCriticalSection(&iData->cs); + EnterCriticalSection(&TIME_cbcrst); while (idx > 0) TIME_TriggerCallBack(&lpTimers[--idx]); - if (TIME_hKillEvent) SetEvent(TIME_hKillEvent); + LeaveCriticalSection(&TIME_cbcrst); /* Finally, adjust the recommended wait time downward by the amount of time the processing routines @@ -266,6 +266,8 @@ void TIME_MMTimeStart(void) TIME_TimeToDie = FALSE; TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, &WINMM_IData, 0, NULL); SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); + InitializeCriticalSection(&TIME_cbcrst); + TIME_cbcrst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM.TIME_cbcrst"); } } @@ -285,6 +287,8 @@ void TIME_MMTimeStop(void) CloseHandle(TIME_hMMTimer); CloseHandle(TIME_hWakeEvent); TIME_hMMTimer = 0; + TIME_cbcrst.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&TIME_cbcrst); TIME_TimersList = NULL; } } @@ -337,9 +341,6 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, EnterCriticalSection(&WINMM_IData.cs); - if ((wFlags & TIME_KILL_SYNCHRONOUS) && !TIME_hKillEvent) - TIME_hKillEvent = CreateEventW(NULL, TRUE, TRUE, NULL); - for (lpTimer = TIME_TimersList; lpTimer != NULL; lpTimer = lpTimer->lpNext) { wNewID = max(wNewID, lpTimer->wTimerID); } @@ -397,8 +398,10 @@ MMRESULT WINAPI timeKillEvent(UINT wID) return MMSYSERR_INVALPARAM; } if (lpSelf->wFlags & TIME_KILL_SYNCHRONOUS) - WaitForSingleObject(TIME_hKillEvent, INFINITE); + EnterCriticalSection(&TIME_cbcrst); HeapFree(GetProcessHeap(), 0, lpSelf); + if (lpSelf->wFlags & TIME_KILL_SYNCHRONOUS) + LeaveCriticalSection(&TIME_cbcrst); return TIMERR_NOERROR; }

1 0

James Hawkins : msi: Add stub handlers for the remaing standard actions that reference tables.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 987c2c85e136f077e52390acf04ef09fdb80cade URL: http://source.winehq.org/git/wine.git/?a=commit;h=987c2c85e136f077e52390acf… Author: James Hawkins <truiken(a)gmail.com> Date: Sun May 6 20:52:14 2007 -0500 msi: Add stub handlers for the remaing standard actions that reference tables. --- dlls/msi/action.c | 138 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 111 insertions(+), 27 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8ff889b..689f9c4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4719,29 +4719,113 @@ static UINT ACTION_UnregisterComPlus( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "UnregisterComPlus", table ); } +static UINT ACTION_InstallSFPCatalogFile( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'S','F','P','C','a','t','a','l','o','g',0 }; + return msi_unimplemented_action_stub( package, "InstallSFPCatalogFile", table ); +} + +static UINT ACTION_RemoveDuplicateFiles( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'D','u','p','l','i','c','a','t','e','F','i','l','e',0 }; + return msi_unimplemented_action_stub( package, "RemoveDuplicateFiles", table ); +} + +static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'U','p','g','r','a','d','e',0 }; + return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); +} + +static UINT ACTION_RemoveFolders( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','r','e','a','t','e','F','o','l','d','e','r',0 }; + return msi_unimplemented_action_stub( package, "RemoveFolders", table ); +} + +static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'O','D','B','C','D','r','i','v','e','r',0 }; + return msi_unimplemented_action_stub( package, "RemoveODBC", table ); +} + +static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'R','e','m','o','v','e','R','e','g','i','s','t','r','y',0 }; + return msi_unimplemented_action_stub( package, "RemoveRegistryValues", table ); +} + +static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'S','h','o','r','t','c','u','t',0 }; + return msi_unimplemented_action_stub( package, "RemoveShortcuts", table ); +} + +static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'P','u','b','l','i','s','h','C','o','m','p','o','n','e','n','t',0 }; + return msi_unimplemented_action_stub( package, "UnpublishComponents", table ); +} + +static UINT ACTION_UnpublishFeatures( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'F','e','a','t','u','r','e','C','o','m','p','o','n','e','n','t','s',0 }; + return msi_unimplemented_action_stub( package, "UnpublishFeatures", table ); +} + +static UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'A','p','p','I','d',0 }; + return msi_unimplemented_action_stub( package, "UnregisterClassInfo", table ); +} + +static UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'E','x','t','e','n','s','i','o','n',0 }; + return msi_unimplemented_action_stub( package, "UnregisterExtensionInfo", table ); +} + +static UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'M','I','M','E',0 }; + return msi_unimplemented_action_stub( package, "UnregisterMIMEInfo", table ); +} + +static UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'P','r','o','g','I','d',0 }; + return msi_unimplemented_action_stub( package, "UnregisterProgIdInfo", table ); +} + +static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'T','y','p','e','L','i','b',0 }; + return msi_unimplemented_action_stub( package, "UnregisterTypeLibraries", table ); +} + static const struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, { szBindImage, ACTION_BindImage }, - { szCCPSearch, ACTION_CCPSearch}, + { szCCPSearch, ACTION_CCPSearch }, { szCostFinalize, ACTION_CostFinalize }, { szCostInitialize, ACTION_CostInitialize }, { szCreateFolders, ACTION_CreateFolders }, { szCreateShortcuts, ACTION_CreateShortcuts }, { szDeleteServices, ACTION_DeleteServices }, - { szDisableRollback, NULL}, + { szDisableRollback, NULL }, { szDuplicateFiles, ACTION_DuplicateFiles }, { szExecuteAction, ACTION_ExecuteAction }, { szFileCost, ACTION_FileCost }, { szFindRelatedProducts, ACTION_FindRelatedProducts }, { szForceReboot, ACTION_ForceReboot }, - { szInstallAdminPackage, NULL}, + { szInstallAdminPackage, NULL }, { szInstallExecute, ACTION_InstallExecute }, { szInstallExecuteAgain, ACTION_InstallExecute }, { szInstallFiles, ACTION_InstallFiles}, { szInstallFinalize, ACTION_InstallFinalize }, { szInstallInitialize, ACTION_InstallInitialize }, - { szInstallSFPCatalogFile, NULL}, + { szInstallSFPCatalogFile, ACTION_InstallSFPCatalogFile }, { szInstallValidate, ACTION_InstallValidate }, { szIsolateComponents, ACTION_IsolateComponents }, { szLaunchConditions, ACTION_LaunchConditions }, @@ -4764,36 +4848,36 @@ static const struct _actions StandardActions[] = { { szRegisterProduct, ACTION_RegisterProduct }, { szRegisterProgIdInfo, ACTION_RegisterProgIdInfo }, { szRegisterTypeLibraries, ACTION_RegisterTypeLibraries }, - { szRegisterUser, ACTION_RegisterUser}, - { szRemoveDuplicateFiles, NULL}, + { szRegisterUser, ACTION_RegisterUser }, + { szRemoveDuplicateFiles, ACTION_RemoveDuplicateFiles }, { szRemoveEnvironmentStrings, ACTION_RemoveEnvironmentStrings }, - { szRemoveExistingProducts, NULL}, - { szRemoveFiles, ACTION_RemoveFiles}, - { szRemoveFolders, NULL}, + { szRemoveExistingProducts, ACTION_RemoveExistingProducts }, + { szRemoveFiles, ACTION_RemoveFiles }, + { szRemoveFolders, ACTION_RemoveFolders }, { szRemoveIniValues, ACTION_RemoveIniValues }, - { szRemoveODBC, NULL}, - { szRemoveRegistryValues, NULL}, - { szRemoveShortcuts, NULL}, - { szResolveSource, ACTION_ResolveSource}, - { szRMCCPSearch, ACTION_RMCCPSearch}, - { szScheduleReboot, NULL}, + { szRemoveODBC, ACTION_RemoveODBC }, + { szRemoveRegistryValues, ACTION_RemoveRegistryValues }, + { szRemoveShortcuts, ACTION_RemoveShortcuts }, + { szResolveSource, ACTION_ResolveSource }, + { szRMCCPSearch, ACTION_RMCCPSearch }, + { szScheduleReboot, NULL }, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules }, - { szSetODBCFolders, NULL}, + { szSetODBCFolders, NULL }, { szStartServices, ACTION_StartServices }, { szStopServices, ACTION_StopServices }, - { szUnpublishComponents, NULL}, - { szUnpublishFeatures, NULL}, - { szUnregisterClassInfo, NULL}, - { szUnregisterComPlus, ACTION_UnregisterComPlus}, - { szUnregisterExtensionInfo, NULL}, + { szUnpublishComponents, ACTION_UnpublishComponents }, + { szUnpublishFeatures, ACTION_UnpublishFeatures }, + { szUnregisterClassInfo, ACTION_UnregisterClassInfo }, + { szUnregisterComPlus, ACTION_UnregisterComPlus }, + { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo }, { szUnregisterFonts, ACTION_UnregisterFonts }, - { szUnregisterMIMEInfo, NULL}, - { szUnregisterProgIdInfo, NULL}, - { szUnregisterTypeLibraries, NULL}, - { szValidateProductID, ACTION_ValidateProductID}, + { szUnregisterMIMEInfo, ACTION_UnregisterMIMEInfo }, + { szUnregisterProgIdInfo, ACTION_UnregisterProgIdInfo }, + { szUnregisterTypeLibraries, ACTION_UnregisterTypeLibraries }, + { szValidateProductID, ACTION_ValidateProductID }, { szWriteEnvironmentStrings, ACTION_WriteEnvironmentStrings }, { szWriteIniValues, ACTION_WriteIniValues }, - { szWriteRegistryValues, ACTION_WriteRegistryValues}, - { NULL, NULL}, + { szWriteRegistryValues, ACTION_WriteRegistryValues }, + { NULL, NULL }, };

1 0