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

Alexandre Julliard : makefile: Add rules for automatically rebuilding configure in maintainer mode.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 69b032b7ffe2a29fc772eeaa3959db6f1df23049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b032b7ffe2a29fc772eeaa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 13:01:31 2008 +0100 makefile: Add rules for automatically rebuilding configure in maintainer mode. --- Makefile.in | 12 ++++++++++-- include/stamp-h.in | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index dc53337..3406854 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,6 +68,14 @@ INSTALLDIRS = $(DESTDIR)$(datadir)/aclocal @MAKE_RULES@ +$(SRCDIR)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4 + cd $(SRCDIR) && autoconf --warnings=all + +$(SRCDIR)/include/config.h.in: @MAINTAINER_MODE@ include/stamp-h.in +$(SRCDIR)/include/stamp-h.in: configure.ac aclocal.m4 + cd $(SRCDIR) && autoheader --warnings=all + @echo timestamp > $@ + config.status: configure @./config.status --recheck @@ -119,9 +127,9 @@ RECURSE_TARGETS = \ $(TESTSUBDIRS:%=%/__test__) \ $(TESTSUBDIRS:%=%/__testclean__) -depend $(RECURSE_TARGETS): $(MAKEDEP) include/config.h +depend $(RECURSE_TARGETS): $(MAKEDEP) -$(MAKEDEP): +$(MAKEDEP): include/config.h @cd $(TOOLSDIR)/tools && $(MAKE) makedep # Test rules diff --git a/include/stamp-h.in b/include/stamp-h.in new file mode 100644 index 0000000..9788f70 --- /dev/null +++ b/include/stamp-h.in @@ -0,0 +1 @@ +timestamp

1 0

Alexandre Julliard : configure: Add a --enable-maintainer-mode option.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 9d037226febd4ffc78877a3f50c1fb0f1f0ffdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d037226febd4ffc78877a3f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 13:00:12 2008 +0100 configure: Add a --enable-maintainer-mode option. --- configure | 16 ++++++++++++++-- configure.ac | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d1e0c01..8836c99 100755 --- a/configure +++ b/configure @@ -652,6 +652,7 @@ LIBS build_alias host_alias target_alias +MAINTAINER_MODE build build_cpu build_vendor @@ -1369,6 +1370,8 @@ Optional Features: --disable-win16 do not include Win16 support --enable-win64 build a Win64 emulator on AMD64 (won't run Win32 binaries) + --enable-maintainer-mode + enable maintainer-specific build rules Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1897,6 +1900,14 @@ if test "${enable_win64+set}" = set; then enableval=$enable_win64; fi +# Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; +else + MAINTAINER_MODE=\# + +fi + # Check whether --with-alsa was given. @@ -23056,6 +23067,7 @@ LIBS!$LIBS$ac_delim build_alias!$build_alias$ac_delim host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim +MAINTAINER_MODE!$MAINTAINER_MODE$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim @@ -23100,7 +23112,6 @@ LN!$LN$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LDCONFIG!$LDCONFIG$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then @@ -23162,6 +23173,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim LINT!$LINT$ac_delim @@ -23237,7 +23249,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 3a438bd..daa7e78 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,8 @@ dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support])) AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) +AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]), + ,[AC_SUBST([MAINTAINER_MODE],[\#])]) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])

1 0

Michael Stefaniuc : wineboot: Add the Romanian translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 6e164de7f302667591414dfcdb6d8ec55a7addf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e164de7f302667591414dfcd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 20 11:53:21 2008 +0100 wineboot: Add the Romanian translation. --- programs/wineboot/wineboot.rc | 3 +- programs/wineboot/wineboot_Ro.rc | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 1e08f7d..7e17ee4 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -36,5 +36,6 @@ #include "wineboot_Nl.rc" #include "wineboot_No.rc" #include "wineboot_Pl.rc" -#include "wineboot_Sv.rc" +#include "wineboot_Ro.rc" #include "wineboot_Ru.rc" +#include "wineboot_Sv.rc" diff --git a/programs/wineboot/wineboot_Ro.rc b/programs/wineboot/wineboot_Ro.rc new file mode 100644 index 0000000..5639882 --- /dev/null +++ b/programs/wineboot/wineboot_Ro.rc @@ -0,0 +1,40 @@ +/* + * WineBoot resources + * + * Copyright (C) 2007 Robert Shearman for CodeWeavers + * Copyright (C) 2008 Michael Stefaniuc + * + * 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_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Așteptare program" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Renunță",IDCANCEL,129,49,50,15 + PUSHBUTTON "Termină procesul",IDOK,51,49,71,15 + LTEXT "O ieșire sau oprire simulată este în curs dar acest proces nu răspunde.", + IDC_STATIC,7,7,172,19 + LTEXT "Prin terminarea acestui proces se pot pierde datele nesalvate.", + IDC_STATIC,7,28,172,15 +END + +#pragma code_page(default)

1 0

Michael Stefaniuc : wineboot: Add the German translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 07ac805b46adb647b4c48377b9f3c536323a4ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ac805b46adb647b4c48377b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 19 23:57:14 2008 +0100 wineboot: Add the German translation. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_De.rc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 21cf724..1e08f7d 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -27,6 +27,7 @@ #include "commctrl.h" #include "resource.h" +#include "wineboot_De.rc" #include "wineboot_En.rc" #include "wineboot_Es.rc" #include "wineboot_Fr.rc" diff --git a/programs/wineboot/wineboot_De.rc b/programs/wineboot/wineboot_De.rc new file mode 100644 index 0000000..8582dbf --- /dev/null +++ b/programs/wineboot/wineboot_De.rc @@ -0,0 +1,36 @@ +/* + * WineBoot resources + * + * Copyright (C) 2007 Robert Shearman for CodeWeavers + * Copyright (C) 2008 Michael Stefaniuc + * + * 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_GERMAN, SUBLANG_NEUTRAL + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Warten auf Programm" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Abbrechen",IDCANCEL,129,49,50,15 + PUSHBUTTON "Programm beenden",IDOK,51,49,71,15 + LTEXT "Ein Abmelden oder Herunterfahren wird simuliert, aber dieses Programm reagiert nicht.", + IDC_STATIC,7,7,172,19 + LTEXT "Wenn Sie das Programm beenden, k�nnen Sie ungespeicherte Daten verlieren.", + IDC_STATIC,7,28,172,19 +END

1 0

Alexandre Julliard : ntdll: Add test cases for the direction flag.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 902aef85c0308b00d608bfce3378541c8c14fafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=902aef85c0308b00d608bfce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 12:24:54 2008 +0100 ntdll: Add test cases for the direction flag. --- dlls/ntdll/tests/exception.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ae3c84b..d6168ee 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -469,6 +469,30 @@ static DWORD align_check_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_ return ExceptionContinueExecution; } +/* Test the direction flag handling. */ +static const BYTE direction_flag_code[] = { + 0x55, /* push %ebp */ + 0x89,0xe5, /* mov %esp,%ebp */ + 0xfd, /* std */ + 0xfa, /* cli - cause exception */ + 0x5d, /* pop %ebp */ + 0xc3, /* ret */ +}; + +static DWORD direction_flag_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ +#ifdef __GNUC__ + unsigned int flags; + __asm__("pushfl; popl %0" : "=r" (flags) ); + ok( !(flags & 0x400), "eflags has DF bit set\n" ); +#endif + ok( context->EFlags & 0x400, "context eflags has DF bit cleared\n" ); + got_exception++; + context->Eip++; /* skip cli */ + return ExceptionContinueExecution; +} + /* test single stepping over hardware breakpoint */ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) @@ -560,6 +584,11 @@ static void test_exceptions(void) run_exception_test(align_check_handler, NULL, align_check_code, sizeof(align_check_code)); ok(got_exception == 0, "got %d alignment faults, expected 0\n", got_exception); + /* test direction flag */ + got_exception = 0; + run_exception_test(direction_flag_handler, NULL, direction_flag_code, sizeof(direction_flag_code)); + ok(got_exception == 1, "got %d exceptions, expected 1\n", got_exception); + /* test single stepping over hardware breakpoint */ memset(&ctx, 0, sizeof(ctx)); ctx.Dr0 = (DWORD) code_mem; /* set hw bp on first nop */

1 0

Alexandre Julliard : ntdll: Clear the direction flag before calling exception handlers.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 4ce9af2ba54169eced3243664ca976e383a65e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce9af2ba54169eced3243664… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 11:50:07 2008 +0100 ntdll: Clear the direction flag before calling exception handlers. --- dlls/ntdll/signal_i386.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 2cb59f5..bb8332a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1083,8 +1083,8 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun /* now modify the sigcontext to return to the raise function */ ESP_sig(sigcontext) = (DWORD)stack; EIP_sig(sigcontext) = (DWORD)func; - /* clear single-step and align check flag */ - EFL_sig(sigcontext) &= ~(0x100|0x40000); + /* clear single-step, direction, and align check flag */ + EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); CS_sig(sigcontext) = wine_get_cs(); DS_sig(sigcontext) = wine_get_ds(); ES_sig(sigcontext) = wine_get_es();

1 0

James Hawkins : msi: Don't trace the tables names on import.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 5bec7d4bbfcce571706503bc2b039c0071470983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bec7d4bbfcce571706503bc2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 00:09:29 2008 -0700 msi: Don't trace the tables names on import. --- dlls/msi/tests/automation.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index bce5a17..f2e5c13 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -272,7 +272,6 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - trace("table->filename: %s\n", table->filename); r = MsiDatabaseImportA(db, CURR_DIR, table->filename); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Marcus Meissner : mshtml: Fix potential 1 byte 0 overwrite.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 4603f4edfa6095294950dc4dd5a76692b32254c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4603f4edfa6095294950dc4dd… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Mar 20 11:08:23 2008 +0100 mshtml: Fix potential 1 byte 0 overwrite. --- dlls/mshtml/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 6419d73..e338369 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -848,7 +848,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC return E_INVALIDARG; len = ptr - (pwzUrl + sizeof(wszRes)/sizeof(WCHAR)); - if(len > sizeof(file_part)/sizeof(WCHAR)) { + if(len >= sizeof(file_part)/sizeof(WCHAR)) { FIXME("Too long URL\n"); return MK_E_SYNTAX; }

1 0

James Hawkins : msi: Fix the registry root indices for Installer:: RegistryValue.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: efc56634fa836547218d4ee5fb702a72c7685cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc56634fa836547218d4ee5f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 00:07:37 2008 -0700 msi: Fix the registry root indices for Installer::RegistryValue. --- dlls/msi/automation.c | 8 ++++++++ dlls/msi/tests/automation.c | 37 +++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 32dfc2a..7f59b4e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -39,6 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +#define REG_INDEX_CLASSES_ROOT 0 +#define REG_INDEX_DYN_DATA 6 + /* * AutomationObject - "base" class for all automation objects. For each interface, we implement Invoke function * called from AutomationObject::Invoke, and pass this function to create_automation_object. @@ -1711,6 +1714,11 @@ static HRESULT WINAPI InstallerImpl_Invoke( VariantClear(&varg1); return hr; } + + if (V_I4(&varg0) >= REG_INDEX_CLASSES_ROOT && + V_I4(&varg0) <= REG_INDEX_DYN_DATA) + V_I4(&varg0) |= (UINT)HKEY_CLASSES_ROOT; + ret = RegOpenKeyW((HKEY)V_I4(&varg0), V_BSTR(&varg1), &hkey); /* Third parameter can be VT_EMPTY, VT_I4, or VT_BSTR */ diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a44a3aa..bce5a17 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1814,6 +1814,7 @@ static void test_Installer_RegistryValue(void) VARIANTARG vararg; WCHAR szString[MAX_PATH]; HKEY hkey, hkey_sub; + HKEY curr_user = (HKEY)1; HRESULT hr; BOOL bRet; @@ -1821,16 +1822,16 @@ static void test_Installer_RegistryValue(void) if (!RegOpenKeyW( HKEY_CURRENT_USER, szKey, &hkey )) delete_key( hkey ); /* Does our key exist? Shouldn't; check with all three possible value parameter types */ - hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet); + hr = Installer_RegistryValueE(curr_user, szKey, &bRet); ok(hr == S_OK, "Installer_RegistryValueE failed, hresult 0x%08x\n", hr); ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n"); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, NULL, szString); + hr = Installer_RegistryValueW(curr_user, szKey, NULL, szString); ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 0, szString, VT_BSTR); + hr = Installer_RegistryValueI(curr_user, szKey, 0, szString, VT_BSTR); ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); /* Create key */ @@ -1859,87 +1860,87 @@ static void test_Installer_RegistryValue(void) /* Does our key exist? It should, and make sure we retrieve the correct default value */ bRet = FALSE; - hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet); + hr = Installer_RegistryValueE(curr_user, szKey, &bRet); ok(hr == S_OK, "Installer_RegistryValueE failed, hresult 0x%08x\n", hr); ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n"); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, NULL, szString); + hr = Installer_RegistryValueW(curr_user, szKey, NULL, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Default registry value \"%s\" does not match expected \"%s\"\n", szString, szOne); /* Ask for the value of a nonexistent key */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szExpand, szString); + hr = Installer_RegistryValueW(curr_user, szKey, szExpand, szString); ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); /* Get values of keys */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szOne, szString); + hr = Installer_RegistryValueW(curr_user, szKey, szOne, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szOne); VariantInit(&vararg); V_VT(&vararg) = VT_BSTR; V_BSTR(&vararg) = SysAllocString(szTwo); - hr = Installer_RegistryValue(HKEY_CURRENT_USER, szKey, vararg, &varresult, VT_I4); + hr = Installer_RegistryValue(curr_user, szKey, vararg, &varresult, VT_I4); ok(hr == S_OK, "Installer_RegistryValue failed, hresult 0x%08x\n", hr); ok(V_I4(&varresult) == 305419896, "Registry value %d does not match expected value\n", V_I4(&varresult)); VariantClear(&varresult); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szThree, szString); + hr = Installer_RegistryValueW(curr_user, szKey, szThree, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szREG_BINARY); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szFour, szString); + hr = Installer_RegistryValueW(curr_user, szKey, szFour, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szFour); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szFive, szString); + hr = Installer_RegistryValueW(curr_user, szKey, szFive, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szFiveHi); memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szSix, szString); + hr = Installer_RegistryValueW(curr_user, szKey, szSix, szString); ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szREG_); VariantInit(&vararg); V_VT(&vararg) = VT_BSTR; V_BSTR(&vararg) = SysAllocString(szSeven); - hr = Installer_RegistryValue(HKEY_CURRENT_USER, szKey, vararg, &varresult, VT_EMPTY); + hr = Installer_RegistryValue(curr_user, szKey, vararg, &varresult, VT_EMPTY); ok(hr == S_OK, "Installer_RegistryValue failed, hresult 0x%08x\n", hr); /* Get string class name for the key */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 0, szString, VT_BSTR); + hr = Installer_RegistryValueI(curr_user, szKey, 0, szString, VT_BSTR); ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, szBlank); /* Get name of a value by positive number (RegEnumValue like), valid index */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 2, szString, VT_BSTR); + hr = Installer_RegistryValueI(curr_user, szKey, 2, szString, VT_BSTR); ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); /* RegEnumValue order seems different on wine */ todo_wine ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, szTwo); /* Get name of a value by positive number (RegEnumValue like), invalid index */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 10, szString, VT_EMPTY); + hr = Installer_RegistryValueI(curr_user, szKey, 10, szString, VT_EMPTY); ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); /* Get name of a subkey by negative number (RegEnumValue like), valid index */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, -1, szString, VT_BSTR); + hr = Installer_RegistryValueI(curr_user, szKey, -1, szString, VT_BSTR); ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, szEight); /* Get name of a subkey by negative number (RegEnumValue like), invalid index */ memset(szString, 0, sizeof(szString)); - hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, -10, szString, VT_EMPTY); + hr = Installer_RegistryValueI(curr_user, szKey, -10, szString, VT_EMPTY); ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); /* clean up */

1 0

James Hawkins : msi: Fix a few failing tests on win9x.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 05af003fc1bad6fff9ebd19bc4bdd34a17751c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05af003fc1bad6fff9ebd19bc… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 00:06:54 2008 -0700 msi: Fix a few failing tests on win9x. --- dlls/msi/tests/package.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 0857d1b..232b75e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5334,7 +5334,8 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\abelisaurus"); - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); + ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), + "Expected %s or empty string, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "BACTROSAURUS", prop, &size); @@ -5357,7 +5358,8 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\"); - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); + ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), + "Expected %s or empty string, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "FALCARIUS", prop, &size); @@ -5400,7 +5402,8 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\"); - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); + ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), + "Expected %s or empty string, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "NEOSODON", prop, &size); @@ -5408,7 +5411,8 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\neosodon\\"); - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); + ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), + "Expected %s or empty string, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "OLOROTITAN", prop, &size);

1 0