April 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Use appropriate type for lresult.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 766824101574eb600e789facca9dd5d95a9848e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766824101574eb600e789facc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 11 21:20:51 2008 +0900 user32: Use appropriate type for lresult. --- dlls/user32/message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ce102de..33c12c1 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3359,7 +3359,7 @@ static BOOL CALLBACK bcast_childwindow( HWND hw, LPARAM lp ) { BroadcastParm *parm = (BroadcastParm*)lp; DWORD_PTR retval = 0; - LONG lresult; + LRESULT lresult; if (parm->flags & BSF_IGNORECURRENTTASK && WIN_IsCurrentProcess(hw)) {

1 0

Aric Stewart : imm32: Remember to unset the hwnd for a context when that hwnd is associated with a different context .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 63d2d041d9bd93f0206b984ad49024b6d6eb0cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d2d041d9bd93f0206b984ad… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 07:42:24 2008 -0500 imm32: Remember to unset the hwnd for a context when that hwnd is associated with a different context. --- dlls/imm32/imm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 000052c..3ff2228 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -383,6 +383,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) else SetPropW(hWnd,szwWineIMCProperty,(HANDLE)hIMC); } + + if (old) + { + InputContextData *old_data = (InputContextData*)old; + if (old_data->IMC.hWnd == hWnd) + old_data->IMC.hWnd = NULL; + } } if (!hIMC)

1 0

Alexandre Julliard : wine.inf: Add a version number to make sure the file changes between versions.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f0c9e9845ac2d7d40fbedca3d0cf8cd5686a6e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c9e9845ac2d7d40fbedca3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 11 20:18:10 2008 +0200 wine.inf: Add a version number to make sure the file changes between versions. --- .gitignore | 1 + tools/Makefile.in | 8 ++++++-- tools/{wine.inf => wine.inf.in} | 1 + tools/wineprefixcreate.in | 16 +--------------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index e3feaa1..7aeef02 100644 --- a/.gitignore +++ b/.gitignore @@ -712,6 +712,7 @@ tools/widl/parser.tab.h tools/widl/parser.yy.c tools/widl/widl tools/widl/widl.man +tools/wine.inf tools/winebuild/winebuild tools/winebuild/winebuild.man tools/winedump/winedump diff --git a/tools/Makefile.in b/tools/Makefile.in index d771c51..c7a3ebf 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -14,6 +14,7 @@ PROGRAMS = \ makedep$(EXEEXT) \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ + wine.inf \ wineprefixcreate MANPAGES = \ @@ -70,13 +71,16 @@ relpath$(EXEEXT): relpath.o sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT) $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) $(LDRPATH_LOCAL) +wine.inf: wine.inf.in + LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.inf.in >$@ || ($(RM) $@ && false) + wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate -install install-lib:: wineprefixcreate $(INSTALLDIRS) +install install-lib:: wine.inf wineprefixcreate $(INSTALLDIRS) $(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate - $(INSTALL_DATA) $(SRCDIR)/wine.inf $(DESTDIR)$(datadir)/wine/wine.inf + $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop $(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) diff --git a/tools/wine.inf b/tools/wine.inf.in similarity index 99% rename from tools/wine.inf rename to tools/wine.inf.in index f3cda7b..9f120b9 100644 --- a/tools/wine.inf +++ b/tools/wine.inf.in @@ -1,4 +1,5 @@ ;; .INF script for the basic Wine configuration +;; Version: @PACKAGE_STRING@ ;; ;; This should be run through setupapi: ;; rundll32 setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index d91a3f6..af8a5f9 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -79,21 +79,7 @@ then LD_LIBRARY_PATH="$topdir/libs/wine" fi export LD_LIBRARY_PATH - - # find the source directory - link=`readlink "$WINELOADER"` - if [ -z "$link" ] - then - topsrcdir="$topdir" - else - link=`dirname "$link"` - case "$link" in - /*) topsrcdir=`cd "$link/.." && pwd` ;; - *) topsrcdir=`cd "$topdir/$link/.." && pwd` ;; - esac - fi - dlldir="$topdir/programs" - datadir="$topsrcdir/tools" + datadir="$topdir/tools" fi while [ $# -gt 0 ]

1 0

Alexander Nicolaysen Sørnes : Standardize objectGetEntries parameters
by Chris Morgan 13 Apr '08

13 Apr '08

Module: appdb Branch: master Commit: ed64f049d7b52c2533cbab2ca4bf1b19dc0ea218 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ed64f049d7b52c2533cbab2c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Apr 12 21:50:02 2008 +0200 Standardize objectGetEntries parameters --- include/appData.php | 2 +- include/application.php | 5 +++++ include/application_queue.php | 5 +++++ include/bugs.php | 2 +- include/distribution.php | 5 +++++ include/downloadurl.php | 4 ++-- include/maintainer.php | 2 +- include/monitor.php | 2 +- include/note.php | 2 +- include/objectManager.php | 37 ++++++++----------------------------- include/screenshot.php | 4 ++-- include/testData.php | 7 ++++++- include/testData_queue.php | 9 +++++++-- include/vendor.php | 5 +++++ include/version.php | 7 ++++++- include/version_queue.php | 9 +++++++-- 16 files changed, 63 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=ed64f049d7b52c2533cb…

1 0

Alexander Nicolaysen Sørnes : testData: Fix moving of test results
by Chris Morgan 11 Apr '08

11 Apr '08

Module: appdb Branch: master Commit: 498a2bd4b03e7d1327570660110dea2f676a36a3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=498a2bd4b03e7d1327570660… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Mar 2 23:19:28 2008 +0100 testData: Fix moving of test results --- include/testData.php | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index 6556896..ed24ead 100644 --- a/include/testData.php +++ b/include/testData.php @@ -190,12 +190,7 @@ class testData{ if($oNewVersion->objectGetState() == 'accepted' && $this->sState == 'pending') $this->sState = 'queued'; - if($this->sState == 'accepted') - { - $oOldVersion = new version($oOldTest->iVersionId); - $oOldVersion->updateRatingInfo(); - $oNewVersion->updateRatingInfo(); - } + $bUpdateRatingInfo = true; } if(query_parameters("UPDATE testResults SET @@ -227,7 +222,14 @@ class testData{ $this->iTestingId)) { if($bUpdateRatingInfo && $this->sState == 'accepted') + { + if($this->iVersionId != $oOldTest->iVersionId) + { + $oNewVersion = new version($this->iVersionId); + $oNewVersion->updateRatingInfo(); + } $oVersion->updateRatingInfo(); + } if(!$bSilent) $this->SendNotificationMail("edit", $sWhatChanged);

1 0

Alexander Nicolaysen Sørnes : testData: Allow 'what didn't work' to be empty for Platinum ratings
by Chris Morgan 11 Apr '08

11 Apr '08

Module: appdb Branch: master Commit: 5afa1598df01487ce37b022bbdbb30eb73b2dcfb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5afa1598df01487ce37b022b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Apr 11 20:00:42 2008 +0200 testData: Allow 'what didn't work' to be empty for Platinum ratings --- include/testData.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index ed24ead..0892d5a 100644 --- a/include/testData.php +++ b/include/testData.php @@ -967,7 +967,10 @@ class testData{ if (empty($aValues['shWhatWorks'])) $errors .= "<li>Please enter what worked.</li>\n"; - if (empty($aValues['shWhatDoesnt'])) + /* The 'what doesn't work' field can be empty if the rating is Platinum, + because then an app should run flawlessly */ + if (!getInput('shWhatDoesnt', $aValues) && + getInput('sTestedRating', $aValues) != PLATINUM_RATING) $errors .= "<li>Please enter what did not work.</li>\n"; if (empty($aValues['shWhatNotTested']))

1 0

Matthew D'Asaro : winecfg: Add option to let wine decorate windows.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 4a30466ec4d09b9228ff62a6ff45d2f5cd2dfe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a30466ec4d09b9228ff62a6f… Author: Matthew D'Asaro <matthew(a)thinkpad.home> Date: Thu Apr 10 13:05:13 2008 -0700 winecfg: Add option to let wine decorate windows. --- programs/winecfg/En.rc | 4 +++- programs/winecfg/resource.h | 1 + programs/winecfg/x11drvdlg.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 46d6c78..f31a0a9 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -64,7 +64,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Window Settings ",IDC_STATIC,8,4,244,184 - CONTROL "Allow DirectX apps to stop the &mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Allow DirectX apps to stop the &mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + + CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 CONTROL "Allow the &window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index e92fe56..d90c7ae 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -143,6 +143,7 @@ /* graphics */ #define IDC_ENABLE_MANAGED 1100 +#define IDC_ENABLE_DECORATED 1101 #define IDC_DX_MOUSE_GRAB 1102 #define IDC_USE_TAKE_FOCUS 1103 #define IDC_DOUBLE_BUFFER 1104 diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index a631493..bfa6ec5 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -147,6 +147,14 @@ static void init_dialog(HWND dialog) CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_UNCHECKED); HeapFree(GetProcessHeap(), 0, buf); + buf = get_reg_key(config_key, keypath("X11 Driver"), "Decorated", "Y"); + if (IS_OPTION_TRUE(*buf)) + CheckDlgButton(dialog, IDC_ENABLE_DECORATED, BST_CHECKED); + else + CheckDlgButton(dialog, IDC_ENABLE_DECORATED, BST_UNCHECKED); + HeapFree(GetProcessHeap(), 0, buf); + + SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_RESETCONTENT, 0, 0); for (it = 0; 0 != D3D_VS_Modes[it].displayStrID; ++it) { SendDlgItemMessageW (dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0, @@ -225,6 +233,16 @@ static void on_enable_managed_clicked(HWND dialog) { } } +static void on_enable_decorated_clicked(HWND dialog) { + WINE_TRACE("\n"); + + if (IsDlgButtonChecked(dialog, IDC_ENABLE_DECORATED) == BST_CHECKED) { + set_reg_key(config_key, keypath("X11 Driver"), "Decorated", "Y"); + } else { + set_reg_key(config_key, keypath("X11 Driver"), "Decorated", "N"); + } +} + static void on_dx_mouse_grab_clicked(HWND dialog) { if (IsDlgButtonChecked(dialog, IDC_DX_MOUSE_GRAB) == BST_CHECKED) set_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "Y"); @@ -359,6 +377,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch(LOWORD(wParam)) { case IDC_ENABLE_DESKTOP: on_enable_desktop_clicked(hDlg); break; case IDC_ENABLE_MANAGED: on_enable_managed_clicked(hDlg); break; + case IDC_ENABLE_DECORATED: on_enable_decorated_clicked(hDlg); break; case IDC_DX_MOUSE_GRAB: on_dx_mouse_grab_clicked(hDlg); break; case IDC_D3D_PSHADER_MODE: on_d3d_pshader_mode_clicked(hDlg); break; }

1 0

Matthew D'Asaro : winex11: Add registry option to let wine decorate windows .
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 4217fcb187efe67612942784d56f331ebbf71236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4217fcb187efe67612942784d… Author: Matthew D'Asaro <matthew(a)thinkpad.home> Date: Thu Apr 10 12:53:45 2008 -0700 winex11: Add registry option to let wine decorate windows. --- dlls/winex11.drv/window.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ac70c85..7cbd102 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -148,6 +148,8 @@ static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) { unsigned long ret = 0; + if (!decorated_mode) return ret; + if (ex_style & WS_EX_TOOLWINDOW) return 0; if ((style & WS_CAPTION) == WS_CAPTION) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 939872f..e682f07 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,6 +548,7 @@ extern int use_xkb; extern int use_take_focus; extern int use_primary_selection; extern int managed_mode; +extern int decorated_mode; extern int private_color_map; extern int primary_monitor; extern int copy_default_colors; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b9378c8..9d64a85 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -82,6 +82,7 @@ int use_xkb = 1; int use_take_focus = 1; int use_primary_selection = 0; int managed_mode = 1; +int decorated_mode = 1; int private_color_map = 0; int primary_monitor = 0; int client_side_with_core = 1; @@ -360,6 +361,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "Managed", buffer, sizeof(buffer) )) managed_mode = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "Decorated", buffer, sizeof(buffer) )) + decorated_mode = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "DXGrab", buffer, sizeof(buffer) )) dxgrab = IS_OPTION_TRUE( buffer[0] );

1 0

Alexander Dorofeyev : ddraw/tests: Add colorkeyed blit to p8_primary_test.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: df422cf0fb6a77ef7500532f0e5dd117b45d9e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df422cf0fb6a77ef7500532f0… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 10 23:12:58 2008 +0300 ddraw/tests: Add colorkeyed blit to p8_primary_test. --- dlls/ddraw/tests/visual.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 11c4ad3..02d9c59 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Stefan D�singer(for CodeWeavers) + * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2165,6 +2166,7 @@ static void p8_primary_test() DDBLTFX ddbltfx; COLORREF color; RECT rect; + DDCOLORKEY clrKey; unsigned differences; /* An IDirect3DDevice cannot be queryInterfaced from an IDirect3DDevice7 on windows */ @@ -2275,12 +2277,13 @@ static void p8_primary_test() ok(colortables_check_equality(entries, coltable), "unexpected colortable on offscreen surface\n"); - p8_surface_fill_rect(offscreen, 0, 0, 16, 16, 1); + p8_surface_fill_rect(offscreen, 0, 0, 16, 16, 2); memset(entries, 0, sizeof(entries)); entries[0].peRed = 0xff; entries[1].peGreen = 0xff; entries[2].peBlue = 0xff; + entries[3].peRed = 0x80; hr = IDirectDrawPalette_SetEntries(ddprimpal, 0, 0, 256, entries); ok(hr == DD_OK, "IDirectDrawPalette_SetEntries failed with %08x\n", hr); @@ -2288,10 +2291,30 @@ static void p8_primary_test() ok(hr==DD_OK, "IDirectDrawSurface_BltFast returned: %x\n", hr); color = getPixelColor_GDI(Surface1, 1, 1); + ok(GetRValue(color) == 0 && GetGValue(color) == 0x00 && GetBValue(color) == 0xFF, + "got R %02X G %02X B %02X, expected R 00 G 00 B FF\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + /* Color keyed blit. */ + p8_surface_fill_rect(offscreen, 0, 0, 8, 8, 3); + clrKey.dwColorSpaceLowValue = 3; + clrKey.dwColorSpaceHighValue = 3; + hr = IDirectDrawSurface_SetColorKey(offscreen, DDCKEY_SRCBLT, &clrKey); + ok(hr==D3D_OK, "IDirectDrawSurfac_SetColorKey returned: %x\n", hr); + + hr = IDirectDrawSurface_BltFast(Surface1, 100, 100, offscreen, NULL, DDBLTFAST_SRCCOLORKEY); + ok(hr==DD_OK, "IDirectDrawSurface_BltFast returned: %x\n", hr); + + color = getPixelColor_GDI(Surface1, 105, 105); ok(GetRValue(color) == 0 && GetGValue(color) == 0xFF && GetBValue(color) == 0, "got R %02X G %02X B %02X, expected R 00 G FF B 00\n", GetRValue(color), GetGValue(color), GetBValue(color)); + color = getPixelColor_GDI(Surface1, 112, 112); + ok(GetRValue(color) == 0 && GetGValue(color) == 0x00 && GetBValue(color) == 0xFF, + "got R %02X G %02X B %02X, expected R 00 G 00 B FF\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + /* Test blitting and locking patterns that are likely to trigger bugs in opengl renderer (p8 surface conversion and uploading/downloading to/from opengl texture). Similar patterns ( blitting front buffer areas to/from an offscreen surface mixed with locking) are used by C&C

1 0

James Hawkins : shell32: Fix a few tests that fail in win2k.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 81f2d3cc0b40205ea87a64b41551535899a4180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f2d3cc0b40205ea87a64b41… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 10 18:09:34 2008 -0500 shell32: Fix a few tests that fail in win2k. --- dlls/shell32/tests/shlfileop.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 7650b64..223828e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -850,10 +850,7 @@ static void test_copy(void) shfo.pTo = "two.txt\0"; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - todo_wine - { - ok(retval == 1148, "Expected 1148, got %d\n", retval); - } + ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); @@ -892,10 +889,7 @@ static void test_copy(void) shfo.pTo = to; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - todo_wine - { - ok(retval == 1148, "Expected 1148, got %d\n", retval); - } + ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); @@ -975,10 +969,9 @@ static void test_copy(void) ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(DeleteFileA("two.txt"), "Expected file to exist\n"); ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n"); - todo_wine - { - ok(!DeleteFileA("threedir"), "Expected file to not exist\n"); - } + + /* file exists in win2k */ + DeleteFileA("threedir"); createTestFile("one.txt"); createTestFile("two.txt");

1 0