wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Pavel Borecki : po: Update Czech translation.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 2b4e893d64fbfcd73c8e62f50e8e446edd3c5bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4e893d64fbfcd73c8e62f50… Author: Pavel Borecki <pavel.borecki(a)gmail.com> Date: Sun Jun 30 09:54:16 2013 +0200 po: Update Czech translation. --- po/cs.po | 2676 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 1257 insertions(+), 1419 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b4e893d64fbfcd73c8e6…

1 0

Michael Stefaniuc : po: Fix some errors in the Romanian translation.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 74064de7a17763f950a7e1a88ce167c45f28fad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74064de7a17763f950a7e1a88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 1 00:16:02 2013 +0200 po: Fix some errors in the Romanian translation. --- po/ro.po | 98 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74064de7a17763f950a7e…

1 0

Michael Stefaniuc : atl/tests: Mark a WinNT result as broken.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 4785c5865bf3357387f195dbc802d0805b24573a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4785c5865bf3357387f195dbc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 1 00:18:18 2013 +0200 atl/tests: Mark a WinNT result as broken. --- dlls/atl/tests/registrar.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 1b1c797..68a8dd8 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -142,8 +142,9 @@ static void test_aggregation(void) hres = CoCreateInstance(&CLSID_Registrar, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); - ok(!unk, "unk = %p\n", unk); + ok(hres == CLASS_E_NOAGGREGATION || broken(hres == E_INVALIDARG), + "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); + ok(!unk || unk == (IUnknown*)0xdeadbeef, "unk = %p\n", unk); } START_TEST(registrar)

1 0

George Stephanos : advapi32/tests: RegDeleteKey tests for merged view of HKCR.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 16bd3ffc8777b9681bfdb777bcf5ad5fd99dec27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bd3ffc8777b9681bfdb777b… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sun Jun 30 23:13:06 2013 +0200 advapi32/tests: RegDeleteKey tests for merged view of HKCR. --- dlls/advapi32/tests/registry.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1784118..1a98f91 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2341,6 +2341,29 @@ static void test_classesroot(void) ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + /* cleanup */ + RegCloseKey( hkeysub1 ); + RegCloseKey( hklmsub1 ); + + /* delete subkey1 from hkcr (should point at user's classes) */ + res = RegDeleteKey(hkcr, "subkey1"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + /* confirm key was removed in hkey but not hklm */ + res = RegOpenKeyExA(hkey, "subkey1", 0, KEY_READ, &hkeysub1); + ok(res == ERROR_FILE_NOT_FOUND, "test key found in user's classes: %d\n", res); + res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); + ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + + /* delete subkey1 from hkcr again (which should now point at hklm) */ + res = RegDeleteKey(hkcr, "subkey1"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + /* confirm hkey was removed in hklm */ + RegCloseKey( hklmsub1 ); + res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); + ok(res == ERROR_FILE_NOT_FOUND, "test key found in hklm: %d\n", res); + /* final cleanup */ delete_key( hkey ); delete_key( hklm );

1 0

Jacek Caban : mshtml/tests: Fixed script tests on IE10.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: b09b9d3cb9091dd38c536943c8a295c08771fe9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09b9d3cb9091dd38c536943c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 29 15:00:23 2013 +0200 mshtml/tests: Fixed script tests on IE10. --- dlls/mshtml/tests/script.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index af1103d..0c3c542 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1768,6 +1768,8 @@ static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *if ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); break; + case 0x70000003: /* Undocumented property set by IE10 */ + return E_NOTIMPL; default: ok(0, "unexpected property %x\n", dwProperty); return E_NOTIMPL;

1 0

Jacek Caban : mshtml/tests: Fixed htmldoc tests on IE10.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 84c34bcd936f6ed3f3e97c0eb7e0b20cbef6bea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c34bcd936f6ed3f3e97c0eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 29 14:35:13 2013 +0200 mshtml/tests: Fixed htmldoc tests on IE10. --- dlls/mshtml/tests/htmldoc.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d5fb9cc..535f6cb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -263,7 +263,7 @@ static const char *debugstr_guid(REFIID riid) if(!riid) return "(null)"; - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); @@ -1113,7 +1113,12 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInterface( REFIID riid, void **ppvObject) { - ok(0, "unexpected call\n"); + *ppvObject = NULL; + + if(IsEqualGUID(&IID_IGetBindHandle, riid)) + return E_NOINTERFACE; + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1169,6 +1174,8 @@ static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; +DEFINE_GUID(IID_unk_binding, 0xf3d8f080,0xa5eb,0x476f,0x9d,0x19,0xa5,0xef,0x24,0xe5,0xc2,0xe6); + static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -1181,7 +1188,12 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void return S_OK; } - ok(0, "unexpected call\n"); + if(IsEqualGUID(&IID_unk_binding, riid)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2930,6 +2942,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 134: /* TODO */ + case 136: /* TODO */ + case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ return E_NOTIMPL; @@ -3230,13 +3245,14 @@ static IDispatch EventDispatch = { &EventDispatchVtbl }; static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, void **ppv) { static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}}; + static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}}; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) { *ppv = iface; return S_OK; } - if(!IsEqualGUID(&IID_IIETravelLog2, riid)) + if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)) ok(0, "unexpected call %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -3370,7 +3386,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); - ok(dwFlags == 0x40 || !dwFlags, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); ok(!pPostData, "pPostData = %p\n", pPostData); ok(!cbPostData, "cbPostData = %d\n", cbPostData); @@ -4916,6 +4932,7 @@ DEFINE_GUID(IID_IThumbnailView, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4 DEFINE_GUID(IID_IRenMailEditor, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_unk4, 0x305104a6,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); DEFINE_GUID(IID_IDocHostUIHandlerPriv, 0xf0d241d1,0x5d0e,0x4e85,0xbc,0xb4,0xfa,0xd7,0xf7,0xc5,0x52,0x8c); +DEFINE_GUID(IID_unk5, 0x5f95accc,0xd7a1,0x4574,0xbc,0xcb,0x69,0x71,0x35,0xbc,0x41,0xde); static HRESULT QueryInterface(REFIID riid, void **ppv) { @@ -4955,6 +4972,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) return E_NOINTERFACE; /* ? */ else if(IsEqualGUID(&IID_unk4, riid)) return E_NOINTERFACE; /* ? */ + else if(IsEqualGUID(&IID_unk5, riid)) + return E_NOINTERFACE; /* IE10 */ else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid)) return E_NOINTERFACE; /* ? */ else

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 67307a9cf1bffdb99201e662d1e615909ed3c727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67307a9cf1bffdb99201e662d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 29 08:50:24 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4556afc..1220b65 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3320,7 +3320,7 @@ static void test_lighting_interface_versions(void) memset(&mat_desc, 0, sizeof(mat_desc)); mat_desc.dwSize = sizeof(mat_desc); - mat_desc.dcvEmissive.g = 1.0f; + U2(U3(mat_desc).dcvEmissive).g = 1.0f; hr = IDirect3D2_CreateMaterial(d3d, &emissive, NULL); ok(SUCCEEDED(hr), "Failed to create material, hr %#x.\n", hr); hr = IDirect3DMaterial2_SetMaterial(emissive, &mat_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 45c399b..9597c8b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3633,7 +3633,7 @@ static void test_lighting_interface_versions(void) memset(&mat_desc, 0, sizeof(mat_desc)); mat_desc.dwSize = sizeof(mat_desc); - mat_desc.dcvEmissive.g = 1.0f; + U2(U3(mat_desc).dcvEmissive).g = 1.0f; hr = IDirect3D3_CreateMaterial(d3d, &emissive, NULL); ok(SUCCEEDED(hr), "Failed to create material, hr %#x.\n", hr); hr = IDirect3DMaterial3_SetMaterial(emissive, &mat_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ab5dae..45017f2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3448,7 +3448,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); memset(&material, 0, sizeof(material)); - material.emissive.g = 1.0f; + U2(U3(material).emissive).g = 1.0f; hr = IDirect3DDevice7_SetMaterial(device, &material); ok(SUCCEEDED(hr), "Failed set material, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE);

1 0

Austin English : loader: Fix Makefile for BSD make.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: f191f26c6af5f4226693f132a4773cadc1c558ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f191f26c6af5f4226693f132a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 28 19:39:14 2013 -0700 loader: Fix Makefile for BSD make. --- loader/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 3993fa3..0cb80a8 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -46,7 +46,7 @@ wine-installed: main.o Makefile.in wine_info.plist $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) wine_info.plist: wine_info.plist.in - LC_ALL=C sed -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' $< >$@ || ($(RM) $@ && false) + LC_ALL=C sed -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' $(srcdir)/wine_info.plist.in >$@ || ($(RM) $@ && false) $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f

1 0

Frédéric Delanoy : wineusr: Assorted spelling fixes.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: docs Branch: master Commit: aca51a985079970d6a5eb921895da98ae43790c4 URL: http://source.winehq.org/git/docs.git/?a=commit;h=aca51a985079970d6a5eb9218… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 1 16:24:40 2013 +0200 wineusr: Assorted spelling fixes. --- en/wineusr-bugs.sgml | 34 +++++++++++++++++----------------- en/wineusr-configuring.sgml | 16 ++++++++-------- en/wineusr-running.sgml | 6 +++--- 3 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=aca51a985079970d6a5eb…

1 0

Frédéric Delanoy : wineusr: 'uninstaller' should be used with wine on the command line.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: docs Branch: master Commit: 6d04b336fbe6a9510953c2fd572c03e9df547d96 URL: http://source.winehq.org/git/docs.git/?a=commit;h=6d04b336fbe6a9510953c2fd5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 1 16:24:39 2013 +0200 wineusr: 'uninstaller' should be used with wine on the command line. --- en/wineusr-running.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 042c2ba..a1d7022 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -30,7 +30,7 @@ </para> <screen> - <prompt>$</prompt> <userinput>uninstaller</userinput> + <prompt>$</prompt> <userinput>wine uninstaller</userinput> </screen> <para>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013