January 2014 - Wine-Commits

Henri Verbeet : wined3d: Also destroy the logo and cursor textures in wined3d_device_reset() when resetting state.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 82b38139eb21a6898e4621eb7405e99189c09b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b38139eb21a6898e4621eb7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 30 17:32:04 2014 +0100 wined3d: Also destroy the logo and cursor textures in wined3d_device_reset() when resetting state. --- dlls/wined3d/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ef944c..256052f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4137,7 +4137,19 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (reset_state) + { + if (device->logo_texture) + { + wined3d_texture_decref(device->logo_texture); + device->logo_texture = NULL; + } + if (device->cursor_texture) + { + wined3d_texture_decref(device->cursor_texture); + device->cursor_texture = NULL; + } state_unbind_resources(&device->state); + } if (device->fb.render_targets) {

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: a6a5273959df38718ae39d9429bab0da64e47238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a5273959df38718ae39d942… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 30 14:32:08 2014 +0100 dpnet/tests: Add a trailing '\n' to an ok() call. --- dlls/dpnet/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 70cf16a..ab3e360 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -33,7 +33,7 @@ static void create_server(void) IDirectPlay8Server *server = NULL; hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); - ok(hr == S_OK, "Failed to create IDirectPlay8Server object"); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); if( SUCCEEDED(hr) ) { hr = IDirectPlay8Server_Close(server, 0);

1 0

André Hentschel : oleaut32/tests: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 16111fa63c2aa67488bcc5421b52b86cee32fcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16111fa63c2aa67488bcc5421… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:09:34 2014 +0100 oleaut32/tests: Use boolean return values in boolean functions. --- dlls/oleaut32/tests/tmarshal.c | 5 ++--- dlls/oleaut32/tests/vartest.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 5753871..f9d9db9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -721,9 +721,8 @@ static BOOL mystruct_uint_ordered(MYSTRUCT *mystruct) int i; for (i = 0; i < sizeof(mystruct->uarr)/sizeof(mystruct->uarr[0]); i++) if (mystruct->uarr[i] != i) - return 0; - - return 1; + return FALSE; + return TRUE; } static HRESULT WINAPI Widget_StructArgs( diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bc8c4ba..9ca541f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -290,7 +290,7 @@ static BOOL is_expected_variant( const VARIANT *result, const VARIANT *expected return !memcmp( &V_DECIMAL(result), &V_DECIMAL(expected), sizeof(DECIMAL) ); default: ok(0, "unhandled variant type %s\n",vtstr(V_VT(expected))); - return 0; + return FALSE; } }

1 0

Hans Leidekker : advapi32/tests: Mark a test result on Windows 2000 as broken.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: e0c5dfdf5d7f4337d0b68a9985b82a27caacc7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c5dfdf5d7f4337d0b68a998… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 30 13:06:09 2014 +0100 advapi32/tests: Mark a test result on Windows 2000 as broken. --- dlls/advapi32/tests/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 74cb9a8..9b6c1cf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -108,7 +108,8 @@ static void test_open_scm(void) /* Again a correct one */ SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_IO_PENDING) /* win2k */, + "Expected ERROR_SUCCESS, got %u\n", GetLastError()); ok(scm_handle != NULL, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(scm_handle); }

1 0

Alexandre Julliard : configure: Rename substituted variables to a standard _CFLAGS and _LIBS format.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: cf0e96c6d0edc3a22b8ee5ac423d9b6b652ce0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0e96c6d0edc3a22b8ee5ac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 12:14:47 2014 +0100 configure: Rename substituted variables to a standard _CFLAGS and _LIBS format. --- configure | 190 ++++++++++++++++++++---------------- configure.ac | 108 ++++++++++---------- dlls/advapi32/Makefile.in | 2 +- dlls/cabinet/Makefile.in | 2 +- dlls/crypt32/Makefile.in | 2 +- dlls/dbghelp/Makefile.in | 2 +- dlls/dinput/Makefile.in | 2 +- dlls/dnsapi/Makefile.in | 2 +- dlls/gdi32/Makefile.in | 2 +- dlls/iphlpapi/Makefile.in | 2 +- dlls/kernel32/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 2 +- dlls/openal32/Makefile.in | 2 +- dlls/opencl/Makefile.in | 2 +- dlls/rpcrt4/Makefile.in | 2 +- dlls/secur32/Makefile.in | 2 +- dlls/shell32/Makefile.in | 2 +- dlls/windowscodecs/Makefile.in | 2 +- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winecoreaudio.drv/Makefile.in | 2 +- dlls/winegstreamer/Makefile.in | 2 +- dlls/winemp3.acm/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 2 +- dlls/wineqtdecoder/Makefile.in | 2 +- dlls/winhttp/Makefile.in | 2 +- dlls/wininet/Makefile.in | 2 +- dlls/winspool.drv/Makefile.in | 4 +- dlls/wldap32/Makefile.in | 2 +- dlls/ws2_32/Makefile.in | 2 +- libs/wine/Makefile.in | 2 +- loader/Makefile.in | 2 +- programs/hostname/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- server/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 37 files changed, 198 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf0e96c6d0edc3a22b8ee…

1 0

Jacek Caban : wmp: Added IProvideClassInfo2::GetGUID implementation.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: fe7c32081f344c3f19e7accbdb7a1424d83d92c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7c32081f344c3f19e7accbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 14:38:15 2014 +0100 wmp: Added IProvideClassInfo2::GetGUID implementation. --- dlls/wmp/oleobj.c | 12 ++++++++++-- include/wmp.idl | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index bab6c62..79a21ca 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -291,8 +291,16 @@ static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + + if(dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) { + FIXME("Unexpected dwGuidKind %d\n", dwGuidKind); + return E_INVALIDARG; + } + + *pGUID = IID__WMPOCXEvents; + return S_OK; } static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { diff --git a/include/wmp.idl b/include/wmp.idl index 86e507d..429fc8d 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -31,6 +31,15 @@ import "ocidl.idl"; uuid(6bf52a50-394a-11d3-b153-00c04f79Faa6) ] library WMPLib { + importlib("stdole2.tlb"); + + [ + hidden, + uuid(6bf52a51-394a-11d3-b153-00c04f79faa6) + ] + interface _WMPOCXEvents : IDispatch + {} + [ helpstring("Windows Media Player"), threading(apartment),

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: bff3d35e206cd2a957fc3a970b7c121d912d214f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff3d35e206cd2a957fc3a970… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 30 14:31:52 2014 +0100 Assorted spelling fixes. --- dlls/kernel32/tests/sync.c | 2 +- dlls/ws2_32/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 74f1a84..47984cc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2277,7 +2277,7 @@ static void test_srwlock_example(void) WaitForSingleObject(h3, 1000); ok(!srwlock_inside, "threads didn't terminate properly, srwlock_inside is %d.\n", srwlock_inside); - ok(!srwlock_example_errors, "errors occured while running SRWLock example test (number of errors: %d)\n", + ok(!srwlock_example_errors, "errors occurred while running SRWLock example test (number of errors: %d)\n", srwlock_example_errors); trace("number of shared accesses per thread are c1 %d, c2 %d, c3 %d\n", cnt1, cnt2, cnt3); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0ae0c4f..ff5a533 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6070,7 +6070,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } /* - Windows has an extension to the IPX protocol that allows to create sockets + Windows has an extension to the IPX protocol that allows one to create sockets and set the IPX packet type at the same time, to do that a caller will use a protocol like NSPROTO_IPX + <PACKET TYPE> */

1 0

Jacek Caban : wmp/tests: Added tests.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: d041a46caa18308748557c58dae27b25f94b440c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d041a46caa18308748557c58d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 14:38:30 2014 +0100 wmp/tests: Added tests. --- configure | 1 + configure.ac | 1 + dlls/wmp/tests/Makefile.in | 4 +++ dlls/wmp/tests/oleobj.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/configure b/configure index 0411c35..6f5652a 100755 --- a/configure +++ b/configure @@ -17173,6 +17173,7 @@ wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean +wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib diff --git a/configure.ac b/configure.ac index d3b9a91..9a8393c 100644 --- a/configure.ac +++ b/configure.ac @@ -3216,6 +3216,7 @@ WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) +WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in new file mode 100644 index 0000000..ac30f90 --- /dev/null +++ b/dlls/wmp/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wmp.dll +IMPORTS = ole32 + +C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c new file mode 100644 index 0000000..45dea43 --- /dev/null +++ b/dlls/wmp/tests/oleobj.c @@ -0,0 +1,62 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * 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 WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <initguid.h> +#include <windows.h> +#include <wmp.h> + +#include "wine/test.h" + +static void test_wmp(void) +{ + IProvideClassInfo2 *class_info; + IOleObject *oleobj; + GUID guid; + LONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_WindowsMediaPlayer not registered\n"); + return; + } + ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); + ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres); + + hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &guid); + ok(hres == S_OK, "GetGUID failed: %08x\n", hres); + ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + + IProvideClassInfo2_Release(class_info); + + ref = IOleObject_Release(oleobj); + ok(!ref, "ref = %d\n", ref); +} + +START_TEST(oleobj) +{ + CoInitialize(NULL); + + test_wmp(); + + CoUninitialize(); +}

1 0

Francois Gouget : gdiplus: Make METAFILE_GetEmfType() static.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: d371225ec22b27705e582a475d70302c03e07f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d371225ec22b27705e582a475… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 30 14:31:11 2014 +0100 gdiplus: Make METAFILE_GetEmfType() static. --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 15929a0..ed00a3e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -914,7 +914,7 @@ static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const return FALSE; } -MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) +static MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) { MetafileType result = MetafileTypeInvalid; EnumEnhMetaFile(NULL, hemf, get_metafile_type_proc, &result, NULL);

1 0

André Hentschel : winex11: Use boolean return values in boolean function.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: a35b41acaa3466a7a698e8ca8a5e7c362c72738c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35b41acaa3466a7a698e8ca8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:09:00 2014 +0100 winex11: Use boolean return values in boolean function. --- dlls/winex11.drv/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index d19d112..cd90885 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1058,8 +1058,8 @@ static BOOL X11DRV_PALETTE_CheckSysColor( const PALETTEENTRY *sys_pal_template, int i; for( i = 0; i < NB_RESERVED_COLORS; i++ ) if( c == (*(const COLORREF*)(sys_pal_template + i) & 0x00ffffff) ) - return 0; - return 1; + return FALSE; + return TRUE; }

1 0