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

Hagop Hagopian : comctl32: Adding getter-setter tests for tab control.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 89c790702503447463c7a3bbd359dec6af4bd981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c790702503447463c7a3bbd… Author: Hagop Hagopian <shaitani(a)gmail.com> Date: Sun Mar 11 13:21:12 2007 -0800 comctl32: Adding getter-setter tests for tab control. --- dlls/comctl32/tests/tab.c | 252 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 252 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 5960964..094faae 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1,6 +1,7 @@ /* Unit test suite for tab control. * * Copyright 2003 Vitaliy Margolen + * Copyright 2007 Hagop Hagopian * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +21,7 @@ #include <assert.h> #include <windows.h> #include <commctrl.h> +#include <stdio.h> #include "wine/test.h" @@ -27,6 +29,11 @@ #define TAB_DEFAULT_WIDTH 96 #define TAB_PADDING_X 6 #define EXTRA_ICON_PADDING 3 +#define MAX_TABLEN 32 + +#define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) +#define expect_str(expected, got)\ + ok ( strcmp(expected, got) == 0, "Expected '%s', got '%s'\n", expected, got) #define TabWidthPadded(padd_x, num) (DEFAULT_MIN_TAB_WIDTH - (TAB_PADDING_X - (padd_x)) * num) @@ -94,6 +101,87 @@ create_tabcontrol (DWORD style, DWORD mask) return handle; } +static HWND createFilledTabControl(DWORD style, DWORD mask, INT nTabs) +{ + HWND tabHandle; + TCITEM tcNewTab; + INT i; + + tabHandle = CreateWindow ( + WC_TABCONTROLA, + "TestTab", + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | style, + 0, 0, 300, 100, + NULL, NULL, NULL, 0); + + assert(tabHandle); + + SetWindowLong(tabHandle, GWL_STYLE, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | style); + SendMessage (tabHandle, WM_SETFONT, 0, (LPARAM) hFont); + + tcNewTab.mask = mask; + + for (i = 0; i < nTabs; i++) + { + char tabName[MAX_TABLEN]; + + sprintf(tabName, "Tab %d", i+1); + tcNewTab.pszText = tabName; + tcNewTab.iImage = i; + SendMessage (tabHandle, TCM_INSERTITEM, i, (LPARAM) &tcNewTab); + } + + if (winetest_interactive) + { + ShowWindow (tabHandle, SW_SHOW); + RedrawWindow (tabHandle, NULL, 0, RDW_UPDATENOW); + Sleep (1000); + } + + return tabHandle; +} + +static HWND create_tooltip (HWND hTab, char toolTipText[]) +{ + HWND hwndTT; + + TOOLINFO ti; + LPTSTR lptstr = toolTipText; + RECT rect; + + /* Creating a tooltip window*/ + hwndTT = CreateWindowEx( + WS_EX_TOPMOST, + TOOLTIPS_CLASS, + NULL, + WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hTab, NULL, 0, NULL); + + SetWindowPos( + hwndTT, + HWND_TOPMOST, + 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + GetClientRect (hTab, &rect); + + /* Initialize members of toolinfo*/ + ti.cbSize = sizeof(TOOLINFO); + ti.uFlags = TTF_SUBCLASS; + ti.hwnd = hTab; + ti.hinst = 0; + ti.uId = 0; + ti.lpszText = lptstr; + + ti.rect = rect; + + /* Add toolinfo structure to the tooltip control */ + SendMessage(hwndTT, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti); + + return hwndTT; +} + static void test_tab(INT nMinTabWidth) { HWND hwTab; @@ -223,6 +311,167 @@ static void test_tab(INT nMinTabWidth) DeleteObject(hFont); } +static void test_getters_setters(INT nTabs) +{ + HWND hTab; + RECT rTab; + INT nTabsRetrieved; + INT rowCount; + + hTab = createFilledTabControl(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); + ok(hTab != NULL, "Failed to create tab control\n"); + + todo_wine{ + expect(DEFAULT_MIN_TAB_WIDTH, (int)SendMessage(hTab, TCM_SETMINTABWIDTH, 0, -1)); + } + /* Testing GetItemCount */ + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); + expect(nTabs, nTabsRetrieved); + + /* Testing GetRowCount */ + rowCount = SendMessage(hTab, TCM_GETROWCOUNT, 0, 0); + expect(1, rowCount); + + /* Testing GetItemRect */ + ok(SendMessage(hTab, TCM_GETITEMRECT, 0, (LPARAM) &rTab), "GetItemRect failed.\n"); + CheckSize(hTab, TAB_DEFAULT_WIDTH, -1 , "Default Width"); + + /* Testing CurFocus */ + { + INT focusIndex; + + /* Testing CurFocus with largest appropriate value */ + SendMessage(hTab, TCM_SETCURFOCUS, nTabs-1, 0); + focusIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + expect(nTabs-1, focusIndex); + + /* Testing CurFocus with negative value */ + SendMessage(hTab, TCM_SETCURFOCUS, -10, 0); + focusIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine{ + expect(-1, focusIndex); + } + + /* Testing CurFocus with value larger than number of tabs */ + focusIndex = SendMessage(hTab, TCM_SETCURSEL, 1, 0); + todo_wine{ + expect(-1, focusIndex); + } + SendMessage(hTab, TCM_SETCURFOCUS, nTabs+1, 0); + focusIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine{ + expect(1, focusIndex); + } + } + + /* Testing CurSel */ + { + INT selectionIndex; + + /* Testing CurSel with largest appropriate value */ + selectionIndex = SendMessage(hTab, TCM_SETCURSEL, nTabs-1, 0); + expect(1, selectionIndex); + selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + expect(nTabs-1, selectionIndex); + + /* Testing CurSel with negative value */ + SendMessage(hTab, TCM_SETCURSEL, -10, 0); + selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + todo_wine{ + expect(-1, selectionIndex); + } + + /* Testing CurSel with value larger than number of tabs */ + selectionIndex = SendMessage(hTab, TCM_SETCURSEL, 1, 0); + todo_wine{ + expect(-1, selectionIndex); + } + selectionIndex = SendMessage(hTab, TCM_SETCURSEL, nTabs+1, 0); + expect(-1, selectionIndex); + selectionIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); + todo_wine{ + expect(1, selectionIndex); + } + } + + /* Testing ExtendedStyle */ + { + DWORD prevExtendedStyle; + DWORD extendedStyle; + + /* Testing Flat Seperators */ + extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); + prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_FLATSEPARATORS); + expect(extendedStyle, prevExtendedStyle); + + extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); + todo_wine{ + expect(TCS_EX_FLATSEPARATORS, extendedStyle); + } + + /* Testing Register Drop */ + prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_REGISTERDROP); + expect(extendedStyle, prevExtendedStyle); + + extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); + todo_wine{ + expect(TCS_EX_REGISTERDROP, extendedStyle); + } + } + + /* Testing UnicodeFormat */ + { + INT unicodeFormat; + + unicodeFormat = SendMessage(hTab, TCM_SETUNICODEFORMAT, TRUE, 0); + todo_wine{ + expect(0, unicodeFormat); + } + unicodeFormat = SendMessage(hTab, TCM_GETUNICODEFORMAT, 0, 0); + expect(1, unicodeFormat); + + unicodeFormat = SendMessage(hTab, TCM_SETUNICODEFORMAT, FALSE, 0); + expect(1, unicodeFormat); + unicodeFormat = SendMessage(hTab, TCM_GETUNICODEFORMAT, 0, 0); + expect(0, unicodeFormat); + + unicodeFormat = SendMessage(hTab, TCM_SETUNICODEFORMAT, TRUE, 0); + expect(0, unicodeFormat); + } + + /* Testing GetSet Item */ + { + TCITEM tcItem; + char szText[32] = "New Label"; + + tcItem.mask = TCIF_TEXT; + tcItem.pszText = &szText[0]; + tcItem.cchTextMax = sizeof(szText); + + ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); + ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); + expect_str("New Label", tcItem.pszText); + + ok ( SendMessage(hTab, TCM_GETITEM, 1, (LPARAM) &tcItem), "Getting item failed.\n"); + expect_str("Tab 2", tcItem.pszText); + } + + /* Testing GetSet ToolTip */ + { + HWND toolTip; + char toolTipText[32] = "ToolTip Text Test"; + + toolTip = create_tooltip(hTab, toolTipText); + SendMessage(hTab, TCM_SETTOOLTIPS, (LPARAM) toolTip, 0); + ok (toolTip == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly."); + + SendMessage(hTab, TCM_SETTOOLTIPS, (LPARAM) NULL, 0); + ok (NULL == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly."); + } + + DestroyWindow(hTab); +} + START_TEST(tab) { LOGFONTA logfont; @@ -246,4 +495,7 @@ START_TEST(tab) test_tab(54); trace ("Testing with MinWidth set to 94\n"); test_tab(94); + + /* Testing getters and setters with 5 tabs */ + test_getters_setters(5); }

1 0

Stefan Huehner : Change some functions arguments from () -> (void).
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 51a7ca3440f1dae76bd25e161a82822669694a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a7ca3440f1dae76bd25e161… Author: Stefan Huehner <stefan(a)huehner.org> Date: Sat Mar 10 22:00:47 2007 +0100 Change some functions arguments from () -> (void). --- dlls/advpack/tests/advpack.c | 4 ++-- dlls/advpack/tests/install.c | 8 ++++---- dlls/browseui/tests/autocomplete.c | 2 +- dlls/comctl32/tests/listview.c | 4 ++-- dlls/comctl32/tests/rebar.c | 6 +++--- dlls/comctl32/tests/updown.c | 4 ++-- dlls/ddraw/tests/visual.c | 4 ++-- dlls/devenum/createdevenum.c | 2 +- dlls/devenum/devenum_main.c | 2 +- dlls/devenum/mediacatenum.c | 2 +- dlls/dsound/tests/ds3d.c | 2 +- dlls/gdi32/opengl.c | 2 +- dlls/gdi32/tests/font.c | 2 +- dlls/kernel32/tests/change.c | 2 +- dlls/mscoree/mscoree_main.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/oleaut32/tests/olefont.c | 2 +- dlls/secur32/tests/ntlm.c | 4 ++-- dlls/shell32/pidl.c | 16 ++++++++-------- dlls/shlwapi/tests/string.c | 4 ++-- dlls/wineps.drv/glyphlist.c | 4 ++-- dlls/winex11.drv/clipboard.c | 4 ++-- dlls/wnaspi32/aspi.c | 2 +- include/msiquery.h | 2 +- programs/progman/group.c | 8 ++++---- programs/progman/main.c | 10 +++++----- programs/progman/program.c | 2 +- programs/regedit/hexedit.c | 4 ++-- programs/winecfg/drive.c | 2 +- programs/winecfg/drivedetect.c | 2 +- programs/winecfg/theme.c | 4 ++-- programs/wineconsole/wineconsole.c | 2 +- programs/wordpad/wordpad.c | 6 +++--- 33 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51a7ca3440f1dae76bd25…

1 0

Paul Vriens : kernel32/tests: Use skip.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 281ebbb5d6c09cb7238288b4250383cd24be3188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281ebbb5d6c09cb7238288b42… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 12 11:41:23 2007 +0100 kernel32/tests: Use skip. --- dlls/kernel32/tests/version.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 4fcef79..84d081b 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -49,7 +49,11 @@ START_TEST(version) BOOL ret; init_function_pointers(); - if(!pVerifyVersionInfoA || !pVerSetConditionMask) return; + if(!pVerifyVersionInfoA || !pVerSetConditionMask) + { + skip("Needed functions not available\n"); + return; + } ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION, pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));

1 0

Paul Vriens : advapi32/tests: Prepare for more tests and use skip.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 65448311840c0f6da470e4c388789f6335cb9fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=65448311840c0f6da470e4c38… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Mar 11 19:42:35 2007 +0100 advapi32/tests: Prepare for more tests and use skip. --- dlls/advapi32/tests/registry.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 283da34..7e689e7 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -33,6 +33,22 @@ static DWORD GLE; static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; static const char * sTestpath2 = "%FOO%\\subdir1"; +static HMODULE hadvapi32; +static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); + +#define ADVAPI32_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hadvapi32, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + +static void InitFunctionPtrs(void) +{ + hadvapi32 = GetModuleHandleA("advapi32.dll"); + + /* This function was introduced with Windows 2003 SP1 */ + ADVAPI32_GET_PROC(RegGetValueA) +} + /* delete key and all its subkeys */ static DWORD delete_key( HKEY hkey ) { @@ -360,9 +376,6 @@ static void test_query_value_ex(void) static void test_get_value(void) { - HMODULE hadvapi32; - DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); - DWORD ret; DWORD size; DWORD type; @@ -370,16 +383,11 @@ static void test_get_value(void) CHAR buf[80]; CHAR expanded[] = "bar\\subdir1"; - /* This function was introduced with Windows 2003 SP1 */ - hadvapi32 = LoadLibraryA("advapi32.dll"); - if(!hadvapi32) + if(!pRegGetValueA) { - ok(0, "error=%d\n", GetLastError()); + skip("RegGetValue not available on this platform\n"); return; } - pRegGetValueA = (PVOID)GetProcAddress(hadvapi32, "RegGetValueA"); - if(!pRegGetValueA) - return; /* Query REG_DWORD using RRF_RT_REG_DWORD (ok) */ size = type = dw = 0xdeadbeef; @@ -860,6 +868,9 @@ static void test_reg_query_value(void) START_TEST(registry) { + /* Load pointers for functions that are not available in all Windows versions */ + InitFunctionPtrs(); + setup_main_key(); test_set_value(); create_test_entries();

1 0

Paul Vriens : d3d9/tests: Use skip as is done in the other tests.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: e3436523380998b393863aa3b8927cfe1baa24b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3436523380998b393863aa3b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 12 11:41:16 2007 +0100 d3d9/tests: Use skip as is done in the other tests. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d7e721..d1d39b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -422,7 +422,7 @@ START_TEST(visual) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; }

1 0

Paul Vriens : dnsapi/tests: Load dnsapi dynamically and use skip.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 034765e1000602f0b14dc12a267eb194ee974517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=034765e1000602f0b14dc12a2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 12 09:16:06 2007 +0100 dnsapi/tests: Load dnsapi dynamically and use skip. --- dlls/dnsapi/tests/Makefile.in | 2 +- dlls/dnsapi/tests/name.c | 8 +++++++- dlls/dnsapi/tests/record.c | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 25edc4a..5c86a66 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = dnsapi.dll -IMPORTS = dnsapi kernel32 +IMPORTS = kernel32 CTESTS = \ name.c \ diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index d59e19e..5d74bdd 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -219,10 +219,16 @@ static void test_DnsNameCompare_A( void ) START_TEST(name) { dnsapi = LoadLibraryA( "dnsapi.dll" ); - if (!dnsapi) return; + if (!dnsapi) + { + /* Doesn't exist before W2K */ + skip("dnsapi.dll cannot be loaded\n"); + return; + } if (!init_function_ptrs()) { + skip("Needed functions are not available\n"); FreeLibrary( dnsapi ); return; } diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 7da1c29..ee7df92 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -150,10 +150,16 @@ static void test_DnsRecordSetDetach( void ) START_TEST(record) { dnsapi = LoadLibraryA( "dnsapi.dll" ); - if (!dnsapi) return; + if (!dnsapi) + { + /* Doesn't exist before W2K */ + skip("dnsapi.dll cannot be loaded\n"); + return; + } if (!init_function_ptrs()) { + skip("Needed functions are not available\n"); FreeLibrary( dnsapi ); return; }

1 0

Paul Vriens : d3d8/tests: Use skip as is done in the other tests.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: c912f791eee7e3bb73e14dc50e1578feb8c71a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c912f791eee7e3bb73e14dc50… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 12 11:41:08 2007 +0100 d3d8/tests: Use skip as is done in the other tests. --- dlls/d3d8/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 9915fa9..961cab0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -316,7 +316,7 @@ START_TEST(visual) d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) { - trace("Could not load d3d8.dll, skipping tests\n"); + skip("Could not load d3d8.dll\n"); return; }

1 0

Dmitry Timoshkov : ntdll: Make the error test pass under XP.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 4b2ba3e1131af915bb807777c4c01c0756eb4fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2ba3e1131af915bb807777c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 12 17:43:40 2007 +0800 ntdll: Make the error test pass under XP. --- dlls/ntdll/tests/error.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 6d21e02..77d30ee 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -46,7 +46,7 @@ * (of course older Windows platforms will fail to pass the strict mode) */ -static ULONG (WINAPI *statustodoserror)(NTSTATUS Status); +static ULONG (WINAPI *pRtlNtStatusToDosError)(NTSTATUS Status); static int strict; static int prepare_test(void) @@ -56,8 +56,8 @@ static int prepare_test(void) char** argv; ntdll = LoadLibraryA("ntdll.dll"); - statustodoserror = (void*)GetProcAddress(ntdll, "RtlNtStatusToDosError"); - if (!statustodoserror) + pRtlNtStatusToDosError = (void*)GetProcAddress(ntdll, "RtlNtStatusToDosError"); + if (!pRtlNtStatusToDosError) return 0; argc = winetest_get_mainargs(&argv); @@ -69,9 +69,9 @@ static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) { ULONG err; - err = statustodoserror(win_nt); + err = pRtlNtStatusToDosError(win_nt); ok(err == win32, - "%s (%x): got %d, expected %d\n", + "%s (%x): got %u, expected %u\n", message, win_nt, err, win32); } @@ -79,10 +79,10 @@ static void cmp_call2(NTSTATUS win_nt, ULONG win32, const char* message) { ULONG err; - err = statustodoserror(win_nt); + err = pRtlNtStatusToDosError(win_nt); ok(err == win32 || (!strict && err == ERROR_MR_MID_NOT_FOUND), - "%s (%x): got %d, expected %d (or MID_NOT_FOUND)\n", + "%s (%x): got %u, expected %u (or MID_NOT_FOUND)\n", message, win_nt, err, win32); } @@ -90,9 +90,9 @@ static void cmp_call3(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* { ULONG err; - err = statustodoserror(win_nt); + err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && err == win32_2), - "%s (%x): got %d, expected %d or %d\n", + "%s (%x): got %u, expected %u or %u\n", message, win_nt, err, win32_1, win32_2); } @@ -100,10 +100,10 @@ static void cmp_call4(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* { ULONG err; - err = statustodoserror(win_nt); + err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && (err == win32_2 || err == ERROR_MR_MID_NOT_FOUND)), - "%s (%x): got %d, expected %d or %d\n", + "%s (%x): got %u, expected %u or %u\n", message, win_nt, err, win32_1, win32_2); } @@ -245,11 +245,11 @@ static void run_error_tests(void) cmp2(STATUS_PKINIT_FAILURE, ERROR_PKINIT_FAILURE); cmp2(STATUS_SMARTCARD_SUBSYSTEM_FAILURE, ERROR_SMARTCARD_SUBSYSTEM_FAILURE); cmp2(STATUS_DOWNGRADE_DETECTED, ERROR_DOWNGRADE_DETECTED); - cmp2(STATUS_SMARTCARD_CERT_REVOKED, SEC_E_SMARTCARD_CERT_REVOKED); - cmp2(STATUS_ISSUING_CA_UNTRUSTED, SEC_E_ISSUING_CA_UNTRUSTED); - cmp2(STATUS_REVOCATION_OFFLINE_C, SEC_E_REVOCATION_OFFLINE_C); - cmp2(STATUS_PKINIT_CLIENT_FAILURE, SEC_E_PKINIT_CLIENT_FAILURE); - cmp2(STATUS_SMARTCARD_CERT_EXPIRED, SEC_E_SMARTCARD_CERT_EXPIRED); + cmp3(STATUS_SMARTCARD_CERT_REVOKED, SEC_E_SMARTCARD_CERT_REVOKED, 1266); /* FIXME: real name? */ + cmp3(STATUS_ISSUING_CA_UNTRUSTED, SEC_E_ISSUING_CA_UNTRUSTED, 1267); /* FIXME: real name? */ + cmp3(STATUS_REVOCATION_OFFLINE_C, SEC_E_REVOCATION_OFFLINE_C, 1268); /* FIXME: real name? */ + cmp3(STATUS_PKINIT_CLIENT_FAILURE, SEC_E_PKINIT_CLIENT_FAILURE, 1269); /* FIXME: real name? */ + cmp3(STATUS_SMARTCARD_CERT_EXPIRED, SEC_E_SMARTCARD_CERT_EXPIRED, 1270); /* FIXME: real name? */ cmp2(STATUS_NO_KERB_KEY, SEC_E_NO_KERB_KEY); cmp2(STATUS_CURRENT_DOMAIN_NOT_ALLOWED, ERROR_CURRENT_DOMAIN_NOT_ALLOWED); cmp2(STATUS_SMARTCARD_WRONG_PIN, SCARD_W_WRONG_CHV);

1 0

Chris Robinson : quartz: Stop DSound buffer playback when the filter is paused or stopped, not the next time it's processed.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 868dd534e850a11241818d8ad53ff6b318a45bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=868dd534e850a11241818d8ad… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 10 04:09:43 2007 -0800 quartz: Stop DSound buffer playback when the filter is paused or stopped, not the next time it's processed. --- dlls/quartz/dsoundrender.c | 46 +++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 67ab550..7db6765 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -166,17 +166,6 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD size2; DWORD play_pos,buf_free; - if (This->state != State_Running) { - DWORD state; - if (SUCCEEDED(IDirectSoundBuffer_GetStatus(This->dsbuffer, &state))) { - if (state & DSBSTATUS_PLAYING) { - IDirectSoundBuffer_Stop(This->dsbuffer); - This->started = FALSE; - } - } - return S_OK; - } - while (1) { hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL); @@ -241,6 +230,9 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) HRESULT hr; TRACE("%p %p\n", iface, pSample); + + if (This->state != State_Running) + return VFW_E_WRONG_STATE; hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) @@ -452,7 +444,21 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csFilter); { - This->state = State_Stopped; + DWORD state = 0; + if (This->dsbuffer) + { + hr = IDirectSoundBuffer_GetStatus(This->dsbuffer, &state); + if (SUCCEEDED(hr)) + { + if (state & DSBSTATUS_PLAYING) + hr = IDirectSoundBuffer_Stop(This->dsbuffer); + } + } + if (SUCCEEDED(hr)) + { + This->started = FALSE; + This->state = State_Stopped; + } } LeaveCriticalSection(&This->csFilter); @@ -468,7 +474,21 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) EnterCriticalSection(&This->csFilter); { - This->state = State_Paused; + DWORD state = 0; + if (This->dsbuffer) + { + hr = IDirectSoundBuffer_GetStatus(This->dsbuffer, &state); + if (SUCCEEDED(hr)) + { + if (state & DSBSTATUS_PLAYING) + hr = IDirectSoundBuffer_Stop(This->dsbuffer); + } + } + if (SUCCEEDED(hr)) + { + This->started = FALSE; + This->state = State_Paused; + } } LeaveCriticalSection(&This->csFilter);

1 0

Francois Gouget : cmd: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 12, 2007

March 12, 2007

Module: wine Branch: master Commit: 540d8186dfb628a8ccc5decd0c7b8d7fc5eb03f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540d8186dfb628a8ccc5decd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 12 10:35:13 2007 +0100 cmd: Fix compilation on systems that don't support nameless unions. --- programs/cmd/builtins.c | 10 +++++----- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d8c3967..cae82b3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -632,9 +632,9 @@ void WCMD_pushd (char *command) { curdir -> next = pushd_directories; curdir -> strings = thisdir; if (pushd_directories == NULL) { - curdir -> stackdepth = 1; + curdir -> u.stackdepth = 1; } else { - curdir -> stackdepth = pushd_directories -> stackdepth + 1; + curdir -> u.stackdepth = pushd_directories -> u.stackdepth + 1; } pushd_directories = curdir; } @@ -916,7 +916,7 @@ void WCMD_setlocal (const char *s) { /* Save the current drive letter */ GetCurrentDirectory (MAX_PATH, cwd); - env_copy->cwd = cwd[0]; + env_copy->u.cwd = cwd[0]; } else LocalFree (env_copy); @@ -990,10 +990,10 @@ void WCMD_endlocal (void) { } /* Restore current drive letter */ - if (IsCharAlpha(temp->cwd)) { + if (IsCharAlpha(temp->u.cwd)) { char envvar[4]; char cwd[MAX_PATH]; - sprintf(envvar, "=%c:", temp->cwd); + sprintf(envvar, "=%c:", temp->u.cwd); if (GetEnvironmentVariable(envvar, cwd, MAX_PATH)) { WINE_TRACE("Resetting cwd to %s\n", cwd); SetCurrentDirectory(cwd); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d43e1cd..2915644 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -104,7 +104,7 @@ struct env_stack union { int stackdepth; /* Only used for pushd and popd */ char cwd; /* Only used for set/endlocal */ - }; + } u; WCHAR *strings; }; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1dcf1e5..544e02e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1028,8 +1028,8 @@ void WCMD_show_prompt (void) { break; case '+': if (pushd_directories) { - memset(q, '+', pushd_directories->stackdepth); - q = q + pushd_directories->stackdepth; + memset(q, '+', pushd_directories->u.stackdepth); + q = q + pushd_directories->u.stackdepth; } break; }

1 0