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

James Hawkins : fusion: Add a stub implementation of fusion.dll.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: c0b3af34b999c7fca2e530b81d356ea9036d228d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b3af34b999c7fca2e530b81… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 20 18:27:46 2008 -0700 fusion: Add a stub implementation of fusion.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/fusion/Makefile.in | 13 ++++++++++++ dlls/fusion/fusion.spec | 17 +++++++++++++++ dlls/fusion/fusion_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3406854..5ac0a0e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -264,6 +264,7 @@ ALL_MAKEFILES = \ dlls/dxerr9/Makefile \ dlls/dxguid/Makefile \ dlls/faultrep/Makefile \ + dlls/fusion/Makefile \ dlls/gdi32/Makefile \ dlls/gdi32/tests/Makefile \ dlls/gdiplus/Makefile \ @@ -683,6 +684,7 @@ dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules +dlls/fusion/Makefile: dlls/fusion/Makefile.in dlls/Makedll.rules dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 37e1061..b628597 100755 --- a/configure +++ b/configure @@ -21479,6 +21479,8 @@ ac_config_files="$ac_config_files dlls/dxguid/Makefile" ac_config_files="$ac_config_files dlls/faultrep/Makefile" +ac_config_files="$ac_config_files dlls/fusion/Makefile" + ac_config_files="$ac_config_files dlls/gdi32/Makefile" ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile" @@ -22755,6 +22757,7 @@ do "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;; + "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;; diff --git a/configure.ac b/configure.ac index abf8374..0f345c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1770,6 +1770,7 @@ AC_CONFIG_FILES([dlls/dxerr8/Makefile]) AC_CONFIG_FILES([dlls/dxerr9/Makefile]) AC_CONFIG_FILES([dlls/dxguid/Makefile]) AC_CONFIG_FILES([dlls/faultrep/Makefile]) +AC_CONFIG_FILES([dlls/fusion/Makefile]) AC_CONFIG_FILES([dlls/gdi32/Makefile]) AC_CONFIG_FILES([dlls/gdi32/tests/Makefile]) AC_CONFIG_FILES([dlls/gdiplus/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 1fe9309..d738654 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -94,6 +94,7 @@ BASEDIRS = \ dwmapi \ dxdiagn \ faultrep \ + fusion \ gdi32 \ gdiplus \ gphoto2.ds \ diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in new file mode 100644 index 0000000..2d1a37f --- /dev/null +++ b/dlls/fusion/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = fusion.dll +IMPORTS = kernel32 + +C_SRCS = \ + fusion_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/fusion/fusion.spec b/dlls/fusion/fusion.spec new file mode 100644 index 0000000..210dd09 --- /dev/null +++ b/dlls/fusion/fusion.spec @@ -0,0 +1,17 @@ +@ stub CopyPDBs +@ stub ClearDownloadCache +@ stub CreateApplicationContext +@ stub CreateAssemblyCache +@ stub CreateAssemblyEnum +@ stub CreateAssemblyNameObject +@ stub CreateHistoryReader +@ stub CreateInstallReferenceEnum +@ stub GetCachePath +@ stub GetHistoryFileDirectory +@ stub InitializeFusion +@ stub InstallCustomAssembly +@ stub InstallCustomModule +@ stub LookupHistoryAssembly +@ stub NukeDownloadedCache +@ stub PreBindAssembly +@ stub PreBindAssemblyEx diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c new file mode 100644 index 0000000..5c9d776 --- /dev/null +++ b/dlls/fusion/fusion_main.c @@ -0,0 +1,49 @@ +/* + * fusion main + * + * Copyright 2008 James Hawkins + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fusion); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +}

1 0

Huw Davies : gdi32: Ignore fonts with names that begin with a '.'.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 4b6d284de60a64b8c90da1056f72a68cd168419a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6d284de60a64b8c90da1056… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 21 10:32:45 2008 +0000 gdi32: Ignore fonts with names that begin with a '.'. --- dlls/gdi32/freetype.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 40ada6d..820da77 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1227,6 +1227,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } + if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + { + TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(file)); + pFT_Done_Face(ft_face); + return 0; + } + if (target_family) { localised_family = get_familyname(ft_face);

1 0

Alexandre Julliard : user32/tests: Flush events during the mouse button tests.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: fad9b692cb48e2845ca22fdd299e3993b999d9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad9b692cb48e2845ca22fdd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 11:29:18 2008 +0100 user32/tests: Flush events during the mouse button tests. --- dlls/user32/tests/win.c | 54 +++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2c4d113..f7df8b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -59,7 +59,7 @@ static DWORD our_pid; #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) /* try to make sure pending X events have been processed before continuing */ -static void flush_events(void) +static void flush_events( BOOL remove_messages ) { MSG msg; int diff = 200; @@ -69,7 +69,8 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + if (remove_messages) + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); min_timeout = 10; } @@ -631,7 +632,10 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR } case WM_COMMAND: if (test_lbuttondown_flag) + { ShowWindow((HWND)wparam, SW_SHOW); + flush_events( FALSE ); + } break; } @@ -2546,14 +2550,14 @@ static void test_keyboard_input(HWND hwnd) ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); - flush_events(); + flush_events( TRUE ); ok(GetActiveWindow() == hwnd, "wrong active window %p\n", GetActiveWindow()); SetFocus(hwnd); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); - flush_events(); + flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); @@ -2580,7 +2584,7 @@ static void test_keyboard_input(HWND hwnd) SetFocus(0); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); - flush_events(); + flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); @@ -2639,7 +2643,7 @@ static void test_mouse_input(HWND hwnd) GetCursorPos(&pt); ok(x == pt.x && y == pt.y, "wrong cursor pos (%d,%d), expected (%d,%d)\n", pt.x, pt.y, x, y); - flush_events(); + flush_events( TRUE ); /* Check that setting the same position will generate WM_MOUSEMOVE */ SetCursorPos(x, y); @@ -2652,7 +2656,7 @@ static void test_mouse_input(HWND hwnd) * otherwise it won't generate relative mouse movements below. */ mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0); - flush_events(); + flush_events( TRUE ); msg.message = 0; mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); @@ -2668,20 +2672,20 @@ static void test_mouse_input(HWND hwnd) ShowWindow(popup, SW_HIDE); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); - flush_events(); + flush_events( TRUE ); mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); ShowWindow(hwnd, SW_HIDE); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); ok( !ret, "message %04x available\n", msg.message); - flush_events(); + flush_events( TRUE ); /* test mouse clicks */ ShowWindow(hwnd, SW_SHOW); - flush_events(); + flush_events( TRUE ); ShowWindow(popup, SW_SHOW); - flush_events(); + flush_events( TRUE ); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); @@ -2720,7 +2724,7 @@ static void test_mouse_input(HWND hwnd) ok(!ret, "message %04x available\n", msg.message); ShowWindow(popup, SW_HIDE); - flush_events(); + flush_events( TRUE ); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); @@ -2777,7 +2781,7 @@ static void test_mouse_input(HWND hwnd) TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); /* Clear any messages left behind by WM_MOUSEACTIVATE tests */ - flush_events(); + flush_events( TRUE ); DestroyWindow(popup); } @@ -3031,7 +3035,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ss); assert(hwnd); - flush_events(); + flush_events( TRUE ); dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); @@ -3256,7 +3260,7 @@ static void test_scrolldc( HWND parent) 25, 50, 100, 100, parent, 0, 0, NULL); ShowWindow( parent, SW_SHOW); UpdateWindow( parent); - flush_events(); + flush_events( TRUE ); GetClientRect( hwnd1, &rc); hdc = GetDC( hwnd1); /* paint the upper half of the window black */ @@ -3691,47 +3695,47 @@ static void test_csparentdc(void) ShowWindow(hwndMain, SW_SHOW); ShowWindow(hwnd1, SW_SHOW); ShowWindow(hwnd2, SW_SHOW); - flush_events(); + flush_events( TRUE ); zero_parentdc_test(&test_answer); InvalidateRect(hwndMain, NULL, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test1, test_answer); zero_parentdc_test(&test_answer); SetRect(&rc, 0, 0, 50, 50); InvalidateRect(hwndMain, &rc, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test2, test_answer); zero_parentdc_test(&test_answer); SetRect(&rc, 0, 0, 10, 10); InvalidateRect(hwndMain, &rc, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test3, test_answer); zero_parentdc_test(&test_answer); SetRect(&rc, 40, 40, 50, 50); InvalidateRect(hwndMain, &rc, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test4, test_answer); zero_parentdc_test(&test_answer); SetRect(&rc, 20, 20, 60, 60); InvalidateRect(hwndMain, &rc, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test5, test_answer); zero_parentdc_test(&test_answer); SetRect(&rc, 0, 0, 10, 10); InvalidateRect(hwnd1, &rc, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test6, test_answer); zero_parentdc_test(&test_answer); SetRect(&rc, -5, -5, 65, 65); InvalidateRect(hwnd1, &rc, TRUE); - flush_events(); + flush_events( TRUE ); parentdc_ok(test7, test_answer); DestroyWindow(hwndMain); @@ -4465,7 +4469,7 @@ static void test_GetUpdateRect(void) ShowWindow(hgrandparent, SW_SHOW); UpdateWindow(hgrandparent); - flush_events(); + flush_events( TRUE ); ShowWindow(hchild, SW_HIDE); SetRect(&rc2, 0, 0, 0, 0); @@ -4525,7 +4529,7 @@ static void test_GetUpdateRect(void) ShowWindow(hgrandparent, SW_SHOW); UpdateWindow(hgrandparent); - flush_events(); + flush_events( TRUE ); ret = GetUpdateRect(hgrandparent, &rc1, FALSE); ok(!ret, "GetUpdateRect returned not empty region\n");

1 0

Alexandre Julliard : ntdll: Refuse to create the . wine directory if the parent belongs to a different user.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 3e8532779f1f93619f3686be0571c661619b1f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8532779f1f93619f3686be0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 11:28:31 2008 +0100 ntdll: Refuse to create the .wine directory if the parent belongs to a different user. --- dlls/ntdll/server.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 0211394..ddabb67 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -886,13 +886,24 @@ done: */ static void create_config_dir(void) { - const char *config_dir = wine_get_config_dir(); + const char *p, *config_dir = wine_get_config_dir(); char *tmp_dir; int fd; pid_t pid, wret; if (!(tmp_dir = malloc( strlen(config_dir) + sizeof("-XXXXXX") ))) fatal_error( "out of memory\n" ); + + if ((p = strrchr( config_dir, '/' )) && p != config_dir) + { + struct stat st; + + memcpy( tmp_dir, config_dir, p - config_dir ); + tmp_dir[p - config_dir] = 0; + if (!stat( tmp_dir, &st ) && st.st_uid != getuid()) + fatal_error( "'%s' is not owned by you, refusing to create a configuration directory there\n", + tmp_dir ); + } strcpy( tmp_dir, config_dir ); strcat( tmp_dir, "-XXXXXX" ); if ((fd = mkstemps( tmp_dir, 0 )) == -1)

1 0

Michael Stefaniuc : winecfg: Remove the unused IDS_WINE_VERSION resource.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 4754eb0b20d71aaadc043334ff7676d10321ca7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4754eb0b20d71aaadc043334f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 21 01:22:01 2008 +0100 winecfg: Remove the unused IDS_WINE_VERSION resource. --- programs/winecfg/Bg.rc | 1 - programs/winecfg/Cs.rc | 1 - programs/winecfg/De.rc | 1 - programs/winecfg/En.rc | 1 - programs/winecfg/Es.rc | 1 - programs/winecfg/Fi.rc | 1 - programs/winecfg/Fr.rc | 1 - programs/winecfg/Hu.rc | 1 - programs/winecfg/It.rc | 1 - programs/winecfg/Ja.rc | 1 - programs/winecfg/Ko.rc | 1 - programs/winecfg/Nl.rc | 1 - programs/winecfg/No.rc | 1 - programs/winecfg/Pl.rc | 1 - programs/winecfg/Pt.rc | 1 - programs/winecfg/Ro.rc | 1 - programs/winecfg/Ru.rc | 1 - programs/winecfg/Si.rc | 1 - programs/winecfg/Sv.rc | 1 - programs/winecfg/Tr.rc | 1 - programs/winecfg/Zh.rc | 1 - programs/winecfg/resource.h | 1 - 22 files changed, 0 insertions(+), 22 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index d9a01a2..64e32d2 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -209,7 +209,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "��" IDS_TAB_DLLS "��" IDS_TAB_DRIVES "��" diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index c882157..18a9f15 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -211,7 +211,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Programy" IDS_TAB_DLLS "Knihovny" IDS_TAB_DRIVES "Disky" diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 85c4c8d..21d1d44 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -207,7 +207,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Anwendungen" IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Laufwerke" diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 0351ef2..8fc30d6 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -208,7 +208,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Applications" IDS_TAB_DLLS "Libraries" IDS_TAB_DRIVES "Drives" diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index a8b773a..1a729af 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Aplicaciones" IDS_TAB_DLLS "Librer�as" IDS_TAB_DRIVES "Unidades" diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 44c3fdb..0087fae 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -207,7 +207,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Sovellukset" IDS_TAB_DLLS "Kirjastot" IDS_TAB_DRIVES "Asemat" diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 581802c..3514a42 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Applications" IDS_TAB_DLLS "Biblioth�ques" IDS_TAB_DRIVES "Lecteurs" diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index 913fc20..181b27f 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -203,7 +203,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Alkalmaz�sok" IDS_TAB_DLLS "F�ggv�nyk�nyvt�rak" IDS_TAB_DRIVES "Meghajt�k" diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 9ad934b..e7e9bd3 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -170,7 +170,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_GENERAL "Generale" IDS_TAB_DLLS "Librerie" IDS_TAB_DRIVES "Drive" diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index e861b01..5fb8921 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "�A�v��P�[�V��" IDS_TAB_DLLS "��C�u��" IDS_TAB_DRIVES "�h��C�u" diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 4bf888c..9f2b5c9 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -209,7 +209,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "��α׷�" IDS_TAB_DLLS "��̺귯��" IDS_TAB_DRIVES "��̺�" diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index abb6842..cfa9153 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -209,7 +209,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Toepassingen" IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Stations" diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 2f3bd09..e9550d5 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Programmer" IDS_TAB_DLLS "Biblioteker" IDS_TAB_DRIVES "Stasjoner" diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index c73e7a3..97b3e9f 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -211,7 +211,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Aplikacje" IDS_TAB_DLLS "Biblioteki" IDS_TAB_DRIVES "Dyski" diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index 3c2d77e..48b85e6 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -298,7 +298,6 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_GENERAL "Geral" IDS_TAB_DLLS "Bibliotecas" IDS_TAB_DRIVES "Unidades" diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index b888d2c..eb79421 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -208,7 +208,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Aplicaţii" IDS_TAB_DLLS "Librării" IDS_TAB_DRIVES "Dizpozitive" diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 6163efa..910c04f 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -208,7 +208,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "��" IDS_TAB_DLLS "��" IDS_TAB_DRIVES "��" diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index d9c4161..879f2f1 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -136,7 +136,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_GENERAL "General" IDS_TAB_DLLS "Libraries" IDS_TAB_DRIVES "Drives" diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 78cf4b2..b95b21d 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Program" IDS_TAB_DLLS "Bibliotek" IDS_TAB_DRIVES "Enheter" diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index f9f86b7..17c1e09 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "Uygulamalar" IDS_TAB_DLLS "Kitapl�klar" IDS_TAB_DRIVES "S�r�c�ler" diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 4246add..fc11f7b 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -206,7 +206,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_WINE_VERSION "CVS" IDS_TAB_APPLICATIONS "��ε{��" IDS_TAB_DLLS "�禡�w" IDS_TAB_DRIVES "�x�s��" diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 3eadd19..a9d54d0 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -24,7 +24,6 @@ */ #define IDC_STATIC -1 -#define IDS_WINE_VERSION 1 #define IDS_TAB_APPLICATIONS 2 #define IDS_TAB_DLLS 3 #define IDS_TAB_DRIVES 4

1 0

Aric Stewart : imm32: Add IME dll prototypes to the ddk/imm.h header.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 5b3d4b473ca275e8d88e8f13872862448be4d79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3d4b473ca275e8d88e8f138… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 21 17:09:12 2008 +0900 imm32: Add IME dll prototypes to the ddk/imm.h header. --- include/ddk/imm.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 57b6c7d..c492092 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -95,6 +95,9 @@ DWORD WINAPI ImmGetIMCCLockCount(HIMCC); HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); DWORD WINAPI ImmGetIMCCSize(HIMCC); +#define IMMGWL_IMC 0 +#define IMMGWL_PRIVATE (sizeof(LONG)) + /* IME Property bits */ #define IME_PROP_END_UNLOAD 0x0001 #define IME_PROP_KBD_CHAR_FIRST 0x0002 @@ -121,6 +124,23 @@ DWORD WINAPI ImmGetIMCCSize(HIMCC); BOOL WINAPI ImmGenerateMessage(HIMC); +BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); +BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); +DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); +BOOL WINAPI ImeDestroy(UINT); +LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID); +BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, CONST LPBYTE); +BOOL WINAPI ImeSelect(HIMC, BOOL); +BOOL WINAPI ImeSetActiveContext(HIMC, BOOL); +UINT WINAPI ImeToAsciiEx(UINT, UINT, CONST LPBYTE, LPDWORD, UINT, HIMC); +BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD); +BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR); +BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR); +UINT WINAPI ImeGetRegisterWordStyle(UINT, LPSTYLEBUFW); +UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); +BOOL WINAPI ImeSetCompositionString(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); +DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Aric Stewart : imm32: IMEs do not expect the hMsgBuf to be NULL, so initialize it.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 62f80d3326b207b2a8d0f863db7dce924e1ac305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f80d3326b207b2a8d0f863d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 21 17:16:50 2008 +0900 imm32: IMEs do not expect the hMsgBuf to be NULL, so initialize it. --- dlls/imm32/imm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4ce857d..de217d1 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -611,6 +611,7 @@ HIMC WINAPI ImmCreateContext(void) /* hCompStr is never NULL */ new_context->IMC.hCompStr = ImmCreateBlankCompStr(); + new_context->IMC.hMsgBuf = ImmCreateIMCC(1); return (HIMC)new_context; } @@ -2035,10 +2036,8 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) ImmInternalPostIMEMessage(lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); ImmUnlockIMCC(data->IMC.hMsgBuf); - ImmDestroyIMCC(data->IMC.hMsgBuf); data->IMC.dwNumMsgBuf = 0; - data->IMC.hMsgBuf = NULL; } return TRUE;

1 0

Dan Hipschman : widl: Make structures with FC_ENUM16 fields complex.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 2fa83d94c877233f4eaf1e8d8c17c7b74c3f9ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa83d94c877233f4eaf1e8d8… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Mar 20 16:06:14 2008 -0700 widl: Make structures with FC_ENUM16 fields complex. Structures containing enum fields without the v1_enum attribute must be treated as complex because of the range check and memory/wire size differences. This includes a test which didn't pass before and now passes on Wine and Windows. --- dlls/rpcrt4/tests/server.c | 10 ++++++++++ dlls/rpcrt4/tests/server.idl | 6 ++++++ tools/widl/parser.y | 2 +- 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 20176a4..41f3bb2 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -333,6 +333,12 @@ s_square_encu(encu_t *eu) } } +void +s_check_se2(se_t *s) +{ + ok(s->f == E2, "check_se2\n"); +} + int s_sum_parr(int *a[3]) { @@ -705,6 +711,7 @@ basic_tests(void) str_struct_t ss = {string}; wstr_struct_t ws = {wstring}; str_t str; + se_t se; ok(int_return() == INT_CODE, "RPC int_return\n"); @@ -774,6 +781,9 @@ basic_tests(void) ok(enum_ord(E3) == 3, "RPC enum_ord\n"); ok(enum_ord(E4) == 4, "RPC enum_ord\n"); + se.f = E2; + check_se2(&se); + memset(&aligns, 0, sizeof(aligns)); aligns.c = 3; aligns.i = 4; diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 7736e14..33e3a48 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -209,11 +209,17 @@ cpp_quote("#endif") case E2: float f2; } encue_t; + typedef struct + { + e_t f; + } se_t; + double square_encu(encu_t *eu); int sum_parr(int *a[3]); int sum_pcarr([size_is(n)] int *a[], int n); int enum_ord(e_t e); double square_encue(encue_t *eue); + void check_se2(se_t *s); int sum_toplev_conf_2n([size_is(n * 2)] int *x, int n); int sum_toplev_conf_cond([size_is(c ? a : b)] int *x, int a, int b, int c); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index aff7c4c..3a89723 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1856,7 +1856,6 @@ static int get_struct_type(var_list_t *fields) case RPC_FC_FLOAT: case RPC_FC_DOUBLE: case RPC_FC_STRUCT: - case RPC_FC_ENUM16: case RPC_FC_ENUM32: break; @@ -1907,6 +1906,7 @@ static int get_struct_type(var_list_t *fields) case RPC_FC_ENCAPSULATED_UNION: case RPC_FC_NON_ENCAPSULATED_UNION: case RPC_FC_BOGUS_STRUCT: + case RPC_FC_ENUM16: return RPC_FC_BOGUS_STRUCT; } }

1 0

Dan Hipschman : rpcrt4: Handle FC_ENUM16.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 629a29d81e3611056bcf1a987e59b14399e5923f URL: http://source.winehq.org/git/wine.git/?a=commit;h=629a29d81e3611056bcf1a987… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Mar 20 16:05:46 2008 -0700 rpcrt4: Handle FC_ENUM16. --- dlls/rpcrt4/ndr_marshall.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 888b150..42aebf0 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2190,6 +2190,13 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_copy_to_buffer(pStubMsg, pMemory, 2); pMemory += 2; break; + case RPC_FC_ENUM16: + TRACE("enum16=%d <= %p\n", *(DWORD*)pMemory, pMemory); + if (32767 < *(DWORD*)pMemory) + RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); + safe_copy_to_buffer(pStubMsg, pMemory, 2); + pMemory += 4; + break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: @@ -2308,6 +2315,14 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("short=%d => %p\n", *(WORD*)pMemory, pMemory); pMemory += 2; break; + case RPC_FC_ENUM16: + safe_copy_from_buffer(pStubMsg, pMemory, 2); + *(DWORD*)pMemory &= 0xffff; + TRACE("enum16=%d => %p\n", *(DWORD*)pMemory, pMemory); + if (32767 < *(DWORD*)pMemory) + RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); + pMemory += 4; + break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: @@ -2427,6 +2442,10 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_length_increment(pStubMsg, 2); pMemory += 2; break; + case RPC_FC_ENUM16: + safe_buffer_length_increment(pStubMsg, 2); + pMemory += 4; + break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: @@ -2524,6 +2543,7 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM16: case RPC_FC_ENUM32: pMemory += 4; break; @@ -2602,6 +2622,10 @@ static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, size += 2; safe_buffer_increment(pStubMsg, 2); break; + case RPC_FC_ENUM16: + size += 4; + safe_buffer_increment(pStubMsg, 2); + break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: @@ -2674,6 +2698,7 @@ unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM16: case RPC_FC_ENUM32: size += 4; break;

1 0

James Hawkins : msi: Remove the dependence on compressed cabinets in the install tests.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 01316db0ceee275366ed07b6ef63adaa36d5abd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01316db0ceee275366ed07b6e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 14:53:31 2008 -0700 msi: Remove the dependence on compressed cabinets in the install tests. --- dlls/msi/tests/install.c | 86 ++++++--------------------------------------- 1 files changed, 12 insertions(+), 74 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a0c5af2..5ac3852 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1577,44 +1577,6 @@ static void create_cc_test_files(void) create_file("maximus", 500); create_file("augustus", 50000); - create_file("caesar", 500); - - set_cab_parameters(&cabParams, "test1.cab", 200); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, cab_context); - ok(hfci != NULL, "Failed to create an FCI context\n"); - - res = add_file(hfci, "maximus", tcompTYPE_MSZIP); - ok(res, "Failed to add file maximus\n"); - - res = add_file(hfci, "augustus", tcompTYPE_MSZIP); - ok(res, "Failed to add file augustus\n"); - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); - - create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); - - DeleteFile("maximus"); - DeleteFile("augustus"); - DeleteFile("caesar"); -} - -static void create_cc2_test_files(void) -{ - CCAB cabParams; - HFCI hfci; - ERF erf; - static CHAR cab_context[] = "test%d.cab"; - BOOL res; - - create_file("maximus", 500); - create_file("augustus", 50000); create_file("tiberius", 500); create_file("caesar", 500); @@ -1678,28 +1640,17 @@ static void test_continuouscabs(void) r = MsiInstallProductA(msifile, NULL); if (r == ERROR_SUCCESS) /* win9x has a problem with this */ { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - } ok(delete_pf("msitest", FALSE), "File not installed\n"); } - else - { - /* FIXME: remove when we pass with ERROR_SUCCESS */ - delete_pf("msitest\\maximus", TRUE); - delete_pf("msitest\\augustus", TRUE); - delete_pf("msitest\\caesar", TRUE); - delete_pf("msitest", FALSE); - } delete_cab_files(); DeleteFile(msifile); - create_cc2_test_files(); + create_cc_test_files(); create_database(msifile, cc2_tables, sizeof(cc2_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -1766,13 +1717,13 @@ static void test_caborder(void) create_database(msifile, co_tables, sizeof(co_tables) / sizeof(msi_table)); r = MsiInstallProductA(msifile, NULL); - ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); ok(!delete_pf("msitest", FALSE), "File is installed\n"); todo_wine { + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); } delete_cab_files(); @@ -1782,11 +1733,11 @@ static void test_caborder(void) create_database(msifile, co2_tables, sizeof(co2_tables) / sizeof(msi_table)); r = MsiInstallProductA(msifile, NULL); - ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); todo_wine { ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest", FALSE), "File is installed\n"); } @@ -1842,12 +1793,9 @@ static void test_samesequence(void) r = MsiInstallProductA(msifile, NULL); if (r == ERROR_SUCCESS) /* win9x has a problem with this */ { - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); } @@ -1868,22 +1816,12 @@ static void test_uiLevelFlags(void) r = MsiInstallProductA(msifile, NULL); if (r == ERROR_SUCCESS) /* win9x has a problem with this */ { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - } + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); } - else - { - /* FIXME: remove when we pass with ERROR_SUCCESS */ - delete_pf("msitest\\caesar", TRUE); - delete_pf("msitest\\augustus", TRUE); - delete_pf("msitest", FALSE); - } delete_cab_files(); DeleteFile(msifile);

1 0