December 2008 - Wine-commits

Andrew Talbot : wined3d: Remove superfluous semicolons.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: f9762d6082e48816e8a9b3f0b9c511b559d9e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9762d6082e48816e8a9b3f0b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 24 18:13:21 2008 +0000 wined3d: Remove superfluous semicolons. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95ee0ec..d62ef07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -754,7 +754,7 @@ const char* debug_d3ddeclusage(BYTE usage) { const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { switch (res) { -#define RES_TO_STR(res) case res: return #res; +#define RES_TO_STR(res) case res: return #res RES_TO_STR(WINED3DRTYPE_SURFACE); RES_TO_STR(WINED3DRTYPE_VOLUME); RES_TO_STR(WINED3DRTYPE_TEXTURE); @@ -771,7 +771,7 @@ const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) { switch (PrimitiveType) { -#define PRIM_TO_STR(prim) case prim: return #prim; +#define PRIM_TO_STR(prim) case prim: return #prim PRIM_TO_STR(WINED3DPT_POINTLIST); PRIM_TO_STR(WINED3DPT_LINELIST); PRIM_TO_STR(WINED3DPT_LINESTRIP); @@ -1098,7 +1098,7 @@ const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) { const char* debug_d3dpool(WINED3DPOOL Pool) { switch (Pool) { -#define POOL_TO_STR(p) case p: return #p; +#define POOL_TO_STR(p) case p: return #p POOL_TO_STR(WINED3DPOOL_DEFAULT); POOL_TO_STR(WINED3DPOOL_MANAGED); POOL_TO_STR(WINED3DPOOL_SYSTEMMEM);

1 0

Andrew Talbot : ddraw: Remove a superfluous semicolon.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: dcbb91fc928865b656821319e6bd4a57df2d71e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbb91fc928865b656821319e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 24 18:13:10 2008 +0000 ddraw: Remove a superfluous semicolon. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0589648..919d995 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -590,7 +590,7 @@ IDirectDrawImpl_SetDisplayModeNoOverride(IDirectDraw7 *iface, { case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; default: return hr; - }; + } } /*****************************************************************************

1 0

Andrew Talbot : wineoss: Remove a superfluous semicolon.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 897a235e709ed7fbf2d8820775916e7863e59674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897a235e709ed7fbf2d882077… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 24 18:13:24 2008 +0000 wineoss: Remove a superfluous semicolon. --- dlls/wineoss.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 241aa0c..58433e6 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -179,7 +179,7 @@ static const char * getIoctlCommand(int command) static const char * getControlType(DWORD dwControlType) { static char str[64]; -#define TYPE_TO_STR(x) case x: return #x; +#define TYPE_TO_STR(x) case x: return #x switch (dwControlType) { TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_BOOLEANMETER);

1 0

Juan Lang : cryptui: Add a header bitmap to CryptUIWizImport' s interior pages.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 214a01ac6c2d303e0dd6a0d6fdf59016d5735544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214a01ac6c2d303e0dd6a0d6f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 24 08:43:14 2008 -0800 cryptui: Add a header bitmap to CryptUIWizImport's interior pages. --- dlls/cryptui/certheader.bmp | Bin 0 -> 1490 bytes dlls/cryptui/cryptui.rc | 3 +++ dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 3 ++- 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/certheader.bmp b/dlls/cryptui/certheader.bmp new file mode 100644 index 0000000..de67d4e Binary files /dev/null and b/dlls/cryptui/certheader.bmp differ diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index 720705d..c0bc823 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -43,4 +43,7 @@ IDB_CHECKS BITMAP LOADONCALL DISCARDABLE checks.bmp /* @makedep: certwatermark.bmp */ IDB_CERT_WATERMARK BITMAP LOADONCALL DISCARDABLE certwatermark.bmp +/* @makedep: certheader.bmp */ +IDB_CERT_HEADER BITMAP LOADONCALL DISCARDABLE certheader.bmp + #include "cryptui_En.rc" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 947da71..14f576e 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -137,6 +137,7 @@ #define IDB_CERT_WARNING 203 #define IDB_CHECKS 204 #define IDB_CERT_WATERMARK 205 +#define IDB_CERT_HEADER 206 #define IDC_STATIC 2000 #define IDC_CERTIFICATE_ICON 2001 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 35b3815..987599d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4350,7 +4350,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); hdr.hwndParent = hwndParent; - hdr.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97_OLD | PSH_HEADER | + hdr.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97_NEW | PSH_HEADER | PSH_WATERMARK; hdr.hInstance = hInstance; if (pwszWizardTitle) @@ -4360,6 +4360,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, hdr.u3.ppsp = pages; hdr.nPages = nPages; hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK); + hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); PropertySheetW(&hdr); HeapFree(GetProcessHeap(), 0, data.fileName); if (data.freeSource &&

1 0

Juan Lang : cryptui: Add watermark image to welcome and finish pages of CryptUIWizImport.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 56c7b55dfa30e2137815cc2d75cdda3e25fb3f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c7b55dfa30e2137815cc2d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 24 08:03:10 2008 -0800 cryptui: Add watermark image to welcome and finish pages of CryptUIWizImport. --- dlls/cryptui/certwatermark.bmp | Bin 0 -> 52870 bytes dlls/cryptui/cryptui.rc | 3 +++ dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 4 +++- 4 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/certwatermark.bmp b/dlls/cryptui/certwatermark.bmp new file mode 100644 index 0000000..213ff3b Binary files /dev/null and b/dlls/cryptui/certwatermark.bmp differ diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index 71dc3a0..720705d 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -40,4 +40,7 @@ IDB_CERT_WARNING BITMAP LOADONCALL DISCARDABLE certwarning.bmp /* @makedep: checks.bmp */ IDB_CHECKS BITMAP LOADONCALL DISCARDABLE checks.bmp +/* @makedep: certwatermark.bmp */ +IDB_CERT_WATERMARK BITMAP LOADONCALL DISCARDABLE certwatermark.bmp + #include "cryptui_En.rc" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index a6adb20..947da71 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -136,6 +136,7 @@ #define IDB_CERT_ERROR 202 #define IDB_CERT_WARNING 203 #define IDB_CHECKS 204 +#define IDB_CERT_WATERMARK 205 #define IDC_STATIC 2000 #define IDC_CERTIFICATE_ICON 2001 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a642ac4..35b3815 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4350,7 +4350,8 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); hdr.hwndParent = hwndParent; - hdr.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97_OLD | PSH_HEADER; + hdr.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97_OLD | PSH_HEADER | + PSH_WATERMARK; hdr.hInstance = hInstance; if (pwszWizardTitle) hdr.pszCaption = pwszWizardTitle; @@ -4358,6 +4359,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, hdr.pszCaption = MAKEINTRESOURCEW(IDS_IMPORT_WIZARD); hdr.u3.ppsp = pages; hdr.nPages = nPages; + hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK); PropertySheetW(&hdr); HeapFree(GetProcessHeap(), 0, data.fileName); if (data.freeSource &&

1 0

Juan Lang : cryptui: Hide the column header on the finish page of CryptUIWizImport.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 27d9903ec90df2fcb4abf47c5891978b3657b6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d9903ec90df2fcb4abf47c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 23 15:25:01 2008 -0800 cryptui: Hide the column header on the finish page of CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 7ec0792..0609229 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -284,6 +284,6 @@ BEGIN LTEXT "You have specified the following settings:", stc2, 115,57,195,12 CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", - LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 END

1 0

Juan Lang : cryptui: Use an appropriate title font for the welcome and finish wizard pages.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 0cfa64d5c91e1e859a4d3c87b3e7020b27820f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cfa64d5c91e1e859a4d3c87b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 23 15:22:47 2008 -0800 cryptui: Use an appropriate title font for the welcome and finish wizard pages. --- dlls/cryptui/cryptui_En.rc | 5 ++- dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 53 ++++++++++++++++++++++++++++++++----------- 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 0bd3478..7ec0792 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -93,6 +93,7 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_CONTENT_STORE "Certificate Store" IDS_IMPORT_SUCCEEDED "The import was successful." IDS_IMPORT_FAILED "The import failed." + IDS_WIZARD_TITLE_FONT "Arial" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" @@ -234,7 +235,7 @@ CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, - 115,1,195,24 + 115,1,195,40 LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", stc1, 115,33,195,16 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", @@ -277,7 +278,7 @@ CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the Certificate Import Wizard", IDC_IMPORT_TITLE, - 115,1,195,24 + 115,1,195,40 LTEXT "You have successfully completed the Certificate Import Wizard.", stc1, 115,33,195,24 LTEXT "You have specified the following settings:", diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index fbbf441..a6adb20 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -90,6 +90,7 @@ #define IDS_IMPORT_CONTENT_STORE 1070 #define IDS_IMPORT_SUCCEEDED 1071 #define IDS_IMPORT_FAILED 1072 +#define IDS_WIZARD_TITLE_FONT 1073 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 286899d..a642ac4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3690,6 +3690,21 @@ static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, return ret; } +struct ImportWizData +{ + HFONT titleFont; + DWORD dwFlags; + LPCWSTR pwszWizardTitle; + CRYPTUI_WIZ_IMPORT_SRC_INFO importSrc; + LPWSTR fileName; + DWORD contentType; + BOOL freeSource; + HCERTSTORE hDestCertStore; + BOOL freeDest; + BOOL autoDest; + BOOL success; +}; + static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -3697,6 +3712,26 @@ static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (msg) { + case WM_INITDIALOG: + { + struct ImportWizData *data; + PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + WCHAR fontFace[MAX_STRING_LEN]; + HDC hDC = GetDC(hwnd); + int height; + + data = (struct ImportWizData *)page->lParam; + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, + sizeof(fontFace) / sizeof(fontFace[0])); + height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); + data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, + DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, fontFace); + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_TITLE), WM_SETFONT, + (WPARAM)data->titleFont, TRUE); + ReleaseDC(hwnd, hDC); + break; + } case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -3780,20 +3815,6 @@ static WCHAR *make_import_file_filter(DWORD dwFlags) return filter; } -struct ImportWizData -{ - DWORD dwFlags; - LPCWSTR pwszWizardTitle; - CRYPTUI_WIZ_IMPORT_SRC_INFO importSrc; - LPWSTR fileName; - DWORD contentType; - BOOL freeSource; - HCERTSTORE hDestCertStore; - BOOL freeDest; - BOOL autoDest; - BOOL success; -}; - static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, LPCWSTR fileName) { @@ -4181,6 +4202,8 @@ static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ImportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_TITLE), WM_SETFONT, + (WPARAM)data->titleFont, TRUE); GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH; column.cx = (rc.right - rc.left) / 2 - 2; @@ -4269,6 +4292,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_WELCOME); pages[nPages].pfnDlgProc = import_welcome_dlg_proc; pages[nPages].dwFlags = PSP_HIDEHEADER; + pages[nPages].lParam = (LPARAM)&data; nPages++; if (!pImportSrc || @@ -4339,6 +4363,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) CertCloseStore(data.importSrc.u.hCertStore, 0); + DeleteObject(data.titleFont); return data.success; }

1 0

Paul Vriens : shell32/tests: Fix a few test failures on Vista and W2K8.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 44c9f6a15db3bb9ca099185e5fae04bdec807ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c9f6a15db3bb9ca099185e5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 24 12:32:58 2008 +0100 shell32/tests: Fix a few test failures on Vista and W2K8. --- dlls/shell32/tests/shlfileop.c | 68 +++++++++++++++++++++++++++++++--------- 1 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e81defb..3eb45d6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1209,7 +1209,11 @@ static void test_copy(void) retval == ERROR_ACCESS_DENIED, /* win2k */ "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); - ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); + if (file_exists("two.txt")) + /* Vista and W2K8 (broken or new behavior ?) */ + ok(RemoveDirectory("two.txt"), "Expected two.txt to exist\n"); + else + ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); createTestFile("one.txt"); @@ -1253,7 +1257,11 @@ static void test_copy(void) retval == ERROR_ACCESS_DENIED, /* win2k */ "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); - ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); + if (file_exists("two.txt")) + /* Vista and W2K8 (broken or new behavior ?) */ + ok(RemoveDirectory("two.txt"), "Expected two.txt to exist\n"); + else + ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); createTestFile("one.txt"); @@ -1284,13 +1292,23 @@ static void test_copy(void) shfo.pTo = to; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); - ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); - ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); + if (retval == ERROR_SUCCESS) + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(DeleteFileA("threedir\\one.txt"), "Expected file to exist\n"); + ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n"); + ok(RemoveDirectoryA("threedir"), "Expected dir to exist\n"); + } + else + { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); + ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); + ok(!DeleteFileA("threedir"), "Expected file to not exist\n"); + ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n"); + } ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(DeleteFileA("two.txt"), "Expected file to exist\n"); - ok(!DeleteFileA("threedir"), "Expected file to not exist\n"); - ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n"); createTestFile("one.txt"); createTestFile("two.txt"); @@ -1365,13 +1383,23 @@ static void test_copy(void) FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); - ok(DeleteFileA("threedir\\one.txt"), "Expected file to exist\n"); - ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n"); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + ok(DeleteFileA("threedir\\one.txt"), "Expected file to exist\n"); + if (file_exists("fourdir")) + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); + ok(DeleteFileA("fourdir\\two.txt"), "Expected file to exist\n"); + RemoveDirectoryA("fourdir"); + } + else + { + ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n"); + ok(!DeleteFileA("fourdir"), "Expected file to not exist\n"); + ok(!RemoveDirectoryA("fourdir"), "Expected dir to not exist\n"); + } ok(RemoveDirectoryA("threedir"), "Expected dir to exist\n"); - ok(!DeleteFileA("fourdir"), "Expected file to not exist\n"); - ok(!RemoveDirectoryA("fourdir"), "Expected dir to not exist\n"); createTestFile("one.txt"); createTestFile("two.txt"); @@ -1409,13 +1437,23 @@ static void test_copy(void) FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); - ok(DeleteFileA("threedir\\one.txt"), "Expected file to exist\n"); - ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n"); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + ok(DeleteFileA("threedir\\one.txt"), "Expected file to exist\n"); + if (file_exists("fourdir")) + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); + ok(DeleteFileA("fourdir\\two.txt"), "Expected file to exist\n"); + RemoveDirectoryA("fourdir"); + } + else + { + ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n"); + ok(!DeleteFileA("fourdir"), "Expected file to not exist\n"); + ok(!RemoveDirectoryA("fourdir"), "Expected dit to not exist\n"); + } ok(RemoveDirectoryA("threedir"), "Expected dir to exist\n"); - ok(!DeleteFileA("fourdir"), "Expected file to not exist\n"); - ok(!RemoveDirectoryA("fourdir"), "Expected dit to not exist\n"); ok(!DeleteFileA("five"), "Expected file to not exist\n"); ok(!RemoveDirectoryA("five"), "Expected dit to not exist\n");

1 0

Alexandre Julliard : server: Store data for hardware messages in the message extra data.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: d1d7b9f3f764090530e8e099ab4f97255d822449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d7b9f3f764090530e8e099a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 24 11:59:09 2008 +0100 server: Store data for hardware messages in the message extra data. --- dlls/user32/message.c | 35 +++++++++++------ include/wine/server_protocol.h | 16 +++++--- server/protocol.def | 14 ++++-- server/queue.c | 82 ++++++++++++++++----------------------- server/trace.c | 6 +-- 5 files changed, 77 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d7b9f3f764090530e8e…

1 0

Alexandre Julliard : server: Make lparam_t always 64-bit.
by Alexandre Julliard 24 Dec '08

24 Dec '08

Module: wine Branch: master Commit: 3cd817b53eb99c135dde7dc0f240b71e8219a12b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd817b53eb99c135dde7dc0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 24 12:06:18 2008 +0100 server: Make lparam_t always 64-bit. --- dlls/user32/message.c | 4 +- include/wine/server_protocol.h | 12 +++--- server/protocol.def | 10 ++-- server/trace.c | 91 ++++++++++++++++++++++++++++------------ tools/make_requests | 2 +- 5 files changed, 78 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd817b53eb99c135dde7…

1 0