May 2011 - Wine-commits - list.winehq.org

Lucas Fialho Zawacki : dinput8/tests: Tests for creation and initialization of DInput8 interface and simple cases of EnumDevicesBySemantics .
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 1fbf857dc19b3e663ecfae6a8601d6f8303fcab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbf857dc19b3e663ecfae6a8… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Apr 29 19:29:19 2011 -0300 dinput8/tests: Tests for creation and initialization of DInput8 interface and simple cases of EnumDevicesBySemantics. --- configure | 1 + configure.ac | 1 + dlls/dinput8/tests/Makefile.in | 7 +++ dlls/dinput8/tests/device.c | 109 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 80f9d38..7b19dd8 100755 --- a/configure +++ b/configure @@ -15106,6 +15106,7 @@ wine_fn_config_dll devenum enable_devenum po wine_fn_config_dll dinput enable_dinput implib,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test wine_fn_config_dll dinput8 enable_dinput8 implib +wine_fn_config_test dlls/dinput8/tests dinput8_test wine_fn_config_dll dispdib.dll16 enable_win16 wine_fn_config_dll dispex enable_dispex wine_fn_config_test dlls/dispex/tests dispex_test diff --git a/configure.ac b/configure.ac index 2069561..7637c33 100644 --- a/configure.ac +++ b/configure.ac @@ -2509,6 +2509,7 @@ WINE_CONFIG_DLL(devenum,,[po]) WINE_CONFIG_DLL(dinput,,[implib,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[implib]) +WINE_CONFIG_TEST(dlls/dinput8/tests) WINE_CONFIG_DLL(dispdib.dll16,enable_win16) WINE_CONFIG_DLL(dispex) WINE_CONFIG_TEST(dlls/dispex/tests) diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in new file mode 100644 index 0000000..604be6a --- /dev/null +++ b/dlls/dinput8/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dinput8.dll +IMPORTS = dinput ole32 user32 + +C_SRCS = \ + device.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c new file mode 100644 index 0000000..c18a83a --- /dev/null +++ b/dlls/dinput8/tests/device.c @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2011 Lucas Fialho Zawacki + * Copyright (c) 2006 Vitaliy Margolen + * + * 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 + */ + +#define DIRECTINPUT_VERSION 0x0800 + +#define COBJMACROS +#include <windows.h> + +#include "wine/test.h" +#include "windef.h" +#include "initguid.h" +#include "dinput.h" + +static BOOL CALLBACK enum_by_semantics( + LPCDIDEVICEINSTANCE lpddi, + LPDIRECTINPUTDEVICE8 lpdid, + DWORD dwFlags, + DWORD dwRemaining, + LPVOID pvRef) +{ + return DIENUM_CONTINUE; +} + + +static void test_action_mapping(void) +{ + HRESULT hr; + HINSTANCE hinst = GetModuleHandle(NULL); + LPDIRECTINPUT8 pDI = NULL; + DIACTIONFORMAT af; + /* Dummy GUID */ + const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + + DIACTION actionMapping[]= + { + /* axis */ + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, + + /* button */ + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } } + }; + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput8_Initialize(pDI,hinst, DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Initialize failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + memset (&af, 0, sizeof(af)); + af.dwSize = sizeof(af); + af.dwActionSize = sizeof(DIACTION); + af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + af.rgoAction = actionMapping; + af.guidActionMap = ACTION_MAPPING_GUID; + af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ + + hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, + enum_by_semantics, 0, 0); + + ok(SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n",hr); + + /* The call fails with a zeroed GUID */ + memset(&af.guidActionMap, 0, sizeof(GUID)); + hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, + enum_by_semantics, 0, 0); + + todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr); + +} + +START_TEST(device) +{ + CoInitialize(NULL); + + test_action_mapping(); + + CoUninitialize(); +}

1 0

John Edmonds : wined3d: If Wine fails to acquire the focus window, allow the wndproc function to continue receiving messages.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 2fb6b509cb2a69fa9a5d64c62257c15694146a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb6b509cb2a69fa9a5d64c62… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Fri Apr 29 19:23:18 2011 -0400 wined3d: If Wine fails to acquire the focus window, allow the wndproc function to continue receiving messages. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f2bc93f..a57ce5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6559,6 +6559,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, { ERR("Failed to acquire focus window, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); + This->filter_messages = filter; return hr; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: ff5dbaede62134e9725bc4b5147569b6ca99dc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5dbaede62134e9725bc4b51… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Apr 30 14:43:53 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index f6bfdcc..5c5c9ec 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-26 18:24+0300\n" +"PO-Revision-Date: 2011-04-30 14:43+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -70,14 +70,12 @@ msgid "All files (*.*)" msgstr "Visi failai (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "Pa&šalinti..." +msgstr "Pa&šalinti" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "Pa&keisti/pašalinti..." +msgstr "Pa&keisti/pašalinti" #: appwiz.rc:48 msgid "Downloading..." @@ -361,9 +359,8 @@ msgstr "" "Prašome įvesti paraštes iš naujo." #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "Skaitinė „kopijų skaičius“ reikšmė negali būti tuščia." +msgstr "Laukas „kopijų skaičius“ negali būti tuščias." #: comdlg32.rc:76 msgid "" @@ -693,9 +690,8 @@ msgid "Unstructured Address" msgstr "Nestruktūrinis adresas" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" -msgstr "SMIME gebėjimai" +msgstr "S/MIME gebėjimai" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -6260,9 +6256,8 @@ msgid "Pr&int..." msgstr "S&pausdinti..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" -msgstr "Spaudinio pe&ržiūra..." +msgstr "Spaudinio pe&ržiūra" #: shdocvw.rc:40 oleview.rc:80 taskmgr.rc:139 msgid "&Close" @@ -6300,9 +6295,8 @@ msgid "&Help" msgstr "&Žinynas" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "&Apie interneto naršyklę..." +msgstr "&Apie interneto naršyklę" #: shdocvw.rc:67 msgctxt "home page"

1 0

Jacek Caban : wininet: Use test.winehq.org for post tests.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: aa4e66395421206616baa9b78552225270fb4c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4e66395421206616baa9b78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 12:23:52 2011 +0000 wininet: Use test.winehq.org for post tests. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c8ac617..39bcab8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -146,10 +146,10 @@ static const test_data_t test_data[] = { TESTF_COMPRESSED|TESTF_ALLOW_COOKIE }, { - "http://crossover.codeweavers.com/posttest.php", - "http://crossover.codeweavers.com/posttest.php", - "crossover.codeweavers.com", - "/posttest.php", + "http://test.winehq.org/tests/post.php", + "http://test.winehq.org/tests/post.php", + "test.winehq.org", + "/tests/post.php", "Content-Type: application/x-www-form-urlencoded", 0, "mode=Test",

1 0

Hans Leidekker : ws2_32: Add a test to show that WSAIoctl is synchronous.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: ee683f7162f991e3e85f555dc37217e0b326a810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee683f7162f991e3e85f555dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:11 2011 +0200 ws2_32: Add a test to show that WSAIoctl is synchronous. --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ca72e68..c032c11 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4630,6 +4630,38 @@ static void test_sioRoutingInterfaceQuery(void) closesocket(sock); } +static void test_synchronous_WSAIoctl(void) +{ + HANDLE previous_port, io_port; + WSAOVERLAPPED overlapped, *olp; + SOCKET socket; + ULONG on; + ULONG_PTR key; + DWORD num_bytes; + BOOL ret; + int res; + + previous_port = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 0 ); + ok( previous_port != NULL, "failed to create completion port %u\n", GetLastError() ); + + socket = WSASocketW( AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED ); + ok( socket != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError() ); + + io_port = CreateIoCompletionPort( (HANDLE)socket, previous_port, 0, 0 ); + ok( io_port != NULL, "failed to create completion port %u\n", GetLastError() ); + + on = 1; + memset( &overlapped, 0, sizeof(overlapped) ); + res = WSAIoctl( socket, FIONBIO, &on, sizeof(on), NULL, 0, &num_bytes, &overlapped, NULL ); + ok( !res, "WSAIoctl failed %d\n", WSAGetLastError() ); + + ret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 10000 ); + ok( ret, "failed to get completion status %u\n", GetLastError() ); + + CloseHandle( io_port ); + closesocket( socket ); + CloseHandle( previous_port ); +} /**************** Main program ***************/ @@ -4693,6 +4725,7 @@ START_TEST( sock ) /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); + test_synchronous_WSAIoctl(); Exit(); }

1 0

Hans Leidekker : msi: Fix handling of components without a key path in MsiEnumComponentCostsW.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: b4a7a30b1853d22c2d91b91e847728bea6c5988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a7a30b1853d22c2d91b91e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:25 2011 +0200 msi: Fix handling of components without a key path in MsiEnumComponentCostsW. --- dlls/msi/msi.c | 15 ++++++++++++--- dlls/msi/tests/package.c | 15 +++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4a79daf..b5e4b13 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1864,12 +1864,22 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i drive[0] = 0; *cost = *temp = 0; + GetWindowsDirectoryW( path, MAX_PATH ); if (component && component[0]) { - *cost = max( 8, comp->Cost / 512 ); if (comp->assembly && !comp->assembly->application) *temp = comp->Cost; - if ((file = get_loaded_file( package, comp->KeyPath ))) + if (!comp->Enabled || !comp->KeyPath) { + *cost = 0; + drive[0] = path[0]; + drive[1] = ':'; + drive[2] = 0; + *buflen = 2; + r = ERROR_SUCCESS; + } + else if ((file = get_loaded_file( package, comp->KeyPath ))) + { + *cost = max( 8, comp->Cost / 512 ); drive[0] = file->TargetPath[0]; drive[1] = ':'; drive[2] = 0; @@ -1880,7 +1890,6 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i else if (IStorage_Stat( package->db->storage, &stat, STATFLAG_NONAME ) == S_OK) { *temp = max( 8, stat.cbSize.QuadPart / 512 ); - GetWindowsDirectoryW( path, MAX_PATH ); drive[0] = path[0]; drive[1] = ':'; drive[2] = 0; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d7161d1..8d70d1c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -12942,16 +12942,13 @@ static void test_MsiEnumComponentCosts(void) r = add_file_entry( hdb, "'one.txt', 'one', 'one.txt', 4096, '', '', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file %u\n", r ); - r = add_file_entry( hdb, "'two.txt', 'two', 'two.txt', 8192, '', '', 8192, 2" ); - ok( r == ERROR_SUCCESS, "cannot add file %u\n", r ); - r = create_component_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create Component table %u\n", r ); r = add_component_entry( hdb, "'one', '{B2F86B9D-8447-4BC5-8883-750C45AA31CA}', 'TARGETDIR', 0, '', 'one.txt'" ); ok( r == ERROR_SUCCESS, "cannot add component %u\n", r ); - r = add_component_entry( hdb, "'two', '{62A09F6E-0B74-4829-BDB7-CAB66F42CCE8}', 'TARGETDIR', 0, '', 'two.txt'" ); + r = add_component_entry( hdb, "'two', '{62A09F6E-0B74-4829-BDB7-CAB66F42CCE8}', 'TARGETDIR', 0, '', ''" ); ok( r == ERROR_SUCCESS, "cannot add component %u\n", r ); r = create_feature_table( hdb ); @@ -13103,6 +13100,16 @@ static void test_MsiEnumComponentCosts(void) len = sizeof(drive); drive[0] = 0; cost = temp = 0xdead; + r = MsiEnumComponentCostsA( hpkg, "two", 0, INSTALLSTATE_LOCAL, drive, &len, &cost, &temp ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); + ok( len == 2, "expected len == 2, got %u\n", len ); + ok( drive[0], "expected a drive\n" ); + ok( !cost, "expected cost == 0, got %d\n", cost ); + ok( !temp, "expected temp == 0, got %d\n", temp ); + + len = sizeof(drive); + drive[0] = 0; + cost = temp = 0xdead; r = MsiEnumComponentCostsA( hpkg, "", 0, INSTALLSTATE_UNKNOWN, drive, &len, &cost, &temp ); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); ok( len == 2, "expected len == 2, got %u\n", len );

1 0

Marcus Meissner : browseui: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cc43dba68ecb293143fc57dd06815b8e294cfe67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc43dba68ecb293143fc57dd0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:41:45 2011 +0200 browseui: Mark internal symbols as hidden. --- dlls/browseui/browseui.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 923aadb..e03f47f 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -21,13 +21,13 @@ #ifndef __WINE_BROWSEUI_H #define __WINE_BROWSEUI_H -extern LONG BROWSEUI_refCount; -extern HINSTANCE BROWSEUI_hinstance; +extern LONG BROWSEUI_refCount DECLSPEC_HIDDEN; +extern HINSTANCE BROWSEUI_hinstance DECLSPEC_HIDDEN; -extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; extern const GUID CLSID_CompCatCacheDaemon;

1 0

Marcus Meissner : amstream: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 5c29f78e6c49434af7f117ae658e876942bcbf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c29f78e6c49434af7f117ae6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:44:46 2011 +0200 amstream: Mark internal symbols as hidden. --- dlls/amstream/amstream_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index b10b632..3466f9e 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -34,9 +34,9 @@ #include "dshow.h" #include "mmstream.h" -HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream); -HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream); +HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) DECLSPEC_HIDDEN; +HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */

1 0

Nicolas Le Cam : comctl32/tests: Remove a set but unused variable.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 401961f8fb69859f03a38ed40aa47c3d0fe93cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=401961f8fb69859f03a38ed40… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 00:46:30 2011 +0200 comctl32/tests: Remove a set but unused variable. --- dlls/comctl32/tests/listview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c2bf70b..35c7734 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3023,7 +3023,7 @@ static void test_hittest(void) static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; POINT pos; INT x, y, i; - WORD horiz, vert; + WORD vert; HIMAGELIST himl, himl2; HBITMAP hbmp; @@ -3053,7 +3053,6 @@ static void test_hittest(void) ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0); - horiz = LOWORD(r); vert = HIWORD(r); ok(bounds.bottom - bounds.top == vert, "Vertical spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert);

1 0

Nicolas Le Cam : msvcrt/tests: Avoid size_t in traces.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: acbb7b817a8193b24c2c7cca61dd002974f38382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbb7b817a8193b24c2c7cca6… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 02:45:06 2011 +0200 msvcrt/tests: Avoid size_t in traces. --- dlls/msvcrt/tests/string.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b72e001..06a4178 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1332,31 +1332,31 @@ static void test_mbstowcs(void) err = pmbstowcs_s(&ret, wOut, 6, mSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "mbstowcs_s did not return 5\n"); ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, wOut, 6, mHiragana, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 3, "ret = %d\n", (int)ret); + ok(ret == 3, "mbstowcs_s did not return 3\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); ok(err == 0, "err = %d\n", err); - ok(ret == 3, "ret = %d\n", (int)ret); + ok(ret == 3, "mbstowcs_s did not return 3\n"); err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); err = pwcstombs_s(&ret, mOut, 6, wHiragana, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "wcstombs_s did not return 5\n"); if(!pwcsrtombs) { win_skip("wcsrtombs not available\n"); @@ -1366,14 +1366,14 @@ static void test_mbstowcs(void) pwstr = wSimple; err = -3; ret = pwcsrtombs(mOut, &pwstr, 4, &err); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcsrtombs did not return 4\n"); ok(err == 0, "err = %d\n", err); ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); pwstr = wSimple; ret = pwcsrtombs(mOut, &pwstr, 5, NULL); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcsrtombs did not return 4\n"); ok(pwstr == NULL, "pwstr != NULL\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); }

1 0