October 2010 - Wine-Commits

Tag wine-1.3.4 : Alexandre Julliard : Release 1.3.4
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: refs/tags/wine-1.3.4 Tag: 53cae9a6e042a3f92e8f16cf0a0fac371ce71a50 URL: http://source.winehq.org/git/wine.git/?a=tag;h=53cae9a6e042a3f92e8f16cf0a0f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 20:46:45 2010 +0200 Release 1.3.4

1 0

Andrew Eikum : msi/tests: Fix copy-paste errors in tests.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: f62439c0d4cf402a9153768131c445f1f0211e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62439c0d4cf402a915376813… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 1 09:41:32 2010 -0500 msi/tests: Fix copy-paste errors in tests. --- dlls/msi/tests/package.c | 78 +++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f62439c0d4cf402a91537…

1 0

Austin English : ddraw/tests: Fix a few compiler warnings on clang.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: b2a8b61dd55846221f09ddaf934eb2b1ea5b0320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8b61dd55846221f09ddaf9… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 1 02:09:18 2010 -0500 ddraw/tests: Fix a few compiler warnings on clang. --- dlls/ddraw/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 48e77f1..c756bac 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -672,7 +672,7 @@ static void offscreen_test(IDirect3DDevice7 *device) DWORD color; DDSURFACEDESC2 ddsd; - static const float quad[][5] = { + static float quad[][5] = { {-0.5f, -0.5f, 0.1f, 0.0f, 0.0f}, {-0.5f, 0.5f, 0.1f, 0.0f, 1.0f}, { 0.5f, -0.5f, 0.1f, 1.0f, 0.0f}, @@ -795,7 +795,7 @@ static void alpha_test(IDirect3DDevice7 *device) { 1.0f, 0.0f, 0.1f, 0xc00000ff}, { 1.0f, 1.0f, 0.1f, 0xc00000ff}, }; - static const float composite_quad[][5] = { + static float composite_quad[][5] = { { 0.0f, -1.0f, 0.1f, 0.0f, 1.0f}, { 0.0f, 1.0f, 0.1f, 0.0f, 0.0f}, { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f},

1 0

Jacek Caban : urlmon.idl: Added more error codes.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: a19a8040f57f7bbd62e2817530c520e1fbe381da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19a8040f57f7bbd62e281753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 16:12:30 2010 +0200 urlmon.idl: Added more error codes. --- include/urlmon.idl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index ac856e8..bea1c12 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1898,12 +1898,18 @@ cpp_quote("#define INET_E_CANNOT_LOAD_DATA _HRESULT_TYPEDEF_(0x800C000F cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT _HRESULT_TYPEDEF_(0x800C0010)") cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER _HRESULT_TYPEDEF_(0x800C0011)") cpp_quote("#define INET_E_USE_DEFAULT_SETTING _HRESULT_TYPEDEF_(0x800C0012L)") +cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLHANDLER") cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN _HRESULT_TYPEDEF_(0x800C0013)") cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)") cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST _HRESULT_TYPEDEF_(0x800C0016)") -cpp_quote("#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR") -cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLHANDLER") +cpp_quote("#define INET_E_CODE_DOWNLOAD_DECLINED _HRESULT_TYPEDEF_(0x800C0100)") +cpp_quote("#define INET_E_RESULT_DISPATCHED _HRESULT_TYPEDEF_(0x800C0200)") +cpp_quote("#define INET_E_CANNOT_REPLACE_SFP_FILE _HRESULT_TYPEDEF_(0x800C0300)") +cpp_quote("#define INET_E_CODE_INSTALL_SUPPRESSED _HRESULT_TYPEDEF_(0x800C0400)") +cpp_quote("#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY _HRESULT_TYPEDEF_(0x800C0500)") +cpp_quote("#define INET_E_DOWNLOAD_BLOCKED_BY_INPRIVATE _HRESULT_TYPEDEF_(0x800C0501)") +cpp_quote("#define INET_E_ERROR_LAST INET_E_DOWNLOAD_BLOCKED_BY_INPRIVATE") cpp_quote("HRESULT WINAPI CoGetClassObjectFromURL(REFCLSID, LPCWSTR, DWORD, DWORD, LPCWSTR, LPBINDCTX, DWORD, LPVOID, REFIID, LPVOID*);") cpp_quote("HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);")

1 0

Hans Leidekker : include: Add a prototype for EnumSystemLocalesEx.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 9cb467911dce84390178603f47fd76fd3c66e944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb467911dce84390178603f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:38:52 2010 +0200 include: Add a prototype for EnumSystemLocalesEx. --- include/winnls.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 279c944..adefcee 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -733,6 +733,7 @@ WINBASEAPI BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC); WINBASEAPI BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD); #define EnumSystemLocales WINELIB_NAME_AW(EnumSystemLocales) +WINBASEAPI BOOL WINAPI EnumSystemLocalesEx(LOCALE_ENUMPROCEX,DWORD,LPARAM,LPVOID); WINBASEAPI BOOL WINAPI EnumSystemLanguageGroupsA(LANGUAGEGROUP_ENUMPROCA,DWORD,LONG_PTR); WINBASEAPI BOOL WINAPI EnumSystemLanguageGroupsW(LANGUAGEGROUP_ENUMPROCW,DWORD,LONG_PTR); #define EnumSystemLanguageGroups WINELIB_NAME_AW(EnumSystemLanguageGroups)

1 0

Saulius Krasuckas : winmm/tests: Initialize whole MIDIHDR struct before using it.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 815cd34c535cbd7218a8b184c7e838f135fc3f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815cd34c535cbd7218a8b184c… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Fri Oct 1 16:39:18 2010 +0300 winmm/tests: Initialize whole MIDIHDR struct before using it. --- dlls/winmm/tests/midi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index e1f5104..972899e 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -127,6 +127,7 @@ static void test_midiIn_device(UINT udev, HWND hwnd) test_notification(hwnd, "midiInOpen", MIM_OPEN, 0); + memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwFlags = 0; mhdr.dwUser = 0x56FA552C; mhdr.dwBufferLength = 70000; /* > 64KB! */ @@ -283,6 +284,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) if (!rc) Sleep(400); /* Hear note */ } + memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwFlags = 0; mhdr.dwUser = 0x56FA552C; mhdr.dwOffset = 0xDEADBEEF; @@ -407,6 +409,7 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(!rc, "midiStreamProperty TIMEDIV rc=%s\n", mmsys_error(rc)); todo_wine ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv); + memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwFlags = 0; mhdr.dwUser = 0x56FA552C; mhdr.dwOffset = 1234567890;

1 0

Hans Leidekker : msi: Set more 64-bit properties.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: dfc9351ba41161c8726e9fde41cdc0466375d7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc9351ba41161c8726e9fde4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:39:11 2010 +0200 msi: Set more 64-bit properties. --- dlls/msi/package.c | 50 ++++++++++--- dlls/msi/tests/install.c | 3 +- dlls/msi/tests/package.c | 187 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 226 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfc9351ba41161c8726e9…

1 0

Hans Leidekker : msi: Remove an unnecessary warning.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: ddbf3c754ea7992144e105d05d4e3e259e92c945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbf3c754ea7992144e105d05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:39:02 2010 +0200 msi: Remove an unnecessary warning. --- dlls/msi/media.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 06cd76d..788528e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -211,9 +211,6 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) UINT r; IStream *stm; - if (oflag) - WARN("ignoring open flags 0x%08x\n", oflag); - r = db_get_raw_stream( cab_stream.db, cab_stream.name, &stm ); if (r != ERROR_SUCCESS) {

1 0

Hans Leidekker : advapi32: Add a stub implementation of EventRegister.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: aba86be1016ef04698f04e6c0142e8f3c618b869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba86be1016ef04698f04e6c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:38:42 2010 +0200 advapi32: Add a stub implementation of EventRegister. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 10 +++++++++ include/Makefile.in | 1 + include/evntprov.h | 45 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 11a335b..7521294 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -217,6 +217,7 @@ # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) +@ stdcall EventRegister(ptr ptr ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index df44cd2..d048eed 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "wmistr.h" #include "evntrace.h" +#include "evntprov.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -807,3 +808,12 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * EventRegister [ADVAPI32.@] + */ +ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) +{ + FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/Makefile.in b/include/Makefile.in index c4bb8db..fc6df0f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -248,6 +248,7 @@ SRCDIR_INCLUDES = \ errorrep.h \ errors.h \ evcode.h \ + evntprov.h \ evntrace.h \ excpt.h \ exdispid.h \ diff --git a/include/evntprov.h b/include/evntprov.h new file mode 100644 index 0000000..4bb3d14 --- /dev/null +++ b/include/evntprov.h @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Hans Leidekker 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 + */ + +#ifndef _EVNTPROV_H_ +#define _EVNTPROV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef ULONGLONG REGHANDLE, *PREGHANDLE; + +typedef struct _EVENT_FILTER_DESCRIPTOR +{ + ULONGLONG Ptr; + ULONG Size; + ULONG Type; + +} EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + +typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); + +ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG WINAPI EventUnregister(REGHANDLE); + +#ifdef __cplusplus +} +#endif + +#endif /* _EVNTPROV_H_ */

1 0

Jacek Caban : urlmon: Replace also bind_info in set_binding_sink.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 39f2c63055ca386fce0cb4cc6dbeda7536960ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2c63055ca386fce0cb4cc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 13:56:56 2010 +0200 urlmon: Replace also bind_info in set_binding_sink. --- dlls/urlmon/binding.c | 7 +++++-- dlls/urlmon/bindprot.c | 17 ++++++++++------- dlls/urlmon/tests/url.c | 8 +++----- dlls/urlmon/urlmon_main.h | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e0f3624..02053b0 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1077,8 +1077,11 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } if(This->to_object) { - if(!(This->state & BINDING_OBJAVAIL)) + if(!(This->state & BINDING_OBJAVAIL)) { + IBinding_AddRef(BINDING(This)); create_object(This); + IBinding_Release(BINDING(This)); + } }else { STGMEDIUM stgmed; HRESULT hres; @@ -1519,7 +1522,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I } if(binding_ctx) { - set_binding_sink(binding->protocol, PROTSINK(binding)); + set_binding_sink(binding->protocol, PROTSINK(binding), BINDINF(binding)); if(binding_ctx->redirect_url) IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_REDIRECTING, binding_ctx->redirect_url); report_data(binding, 0, 0, 0); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 29b8532..01443e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -382,7 +382,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) if(This->filter_proxy) IInternetProtocol_Release(PROTOCOL(This->filter_proxy)); - set_binding_sink(PROTOCOL(This), NULL); + set_binding_sink(PROTOCOL(This), NULL, NULL); if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); @@ -488,7 +488,7 @@ static HRESULT WINAPI BindProtocol_UnlockRequest(IInternetProtocol *iface) return IInternetProtocol_UnlockRequest(This->protocol_handler); } -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink) +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info) { BindProtocol *This = PROTOCOL_THIS(bind_protocol); IInternetProtocolSink *prev_sink; @@ -505,6 +505,12 @@ void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *s service_provider = InterlockedExchangePointer((void**)&This->service_provider, service_provider); if(service_provider) IServiceProvider_Release(service_provider); + + if(bind_info) + IInternetBindInfo_AddRef(bind_info); + bind_info = InterlockedExchangePointer((void**)&This->bind_info, bind_info); + if(bind_info) + IInternetBindInfo_Release(bind_info); } IWinInetInfo *get_wininet_info(IInternetProtocol *bind_protocol) @@ -619,10 +625,7 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz if(urlmon_protocol) IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); - IInternetBindInfo_AddRef(pOIBindInfo); - This->bind_info = pOIBindInfo; - - set_binding_sink(PROTOCOL(This), pOIProtSink); + set_binding_sink(PROTOCOL(This), pOIProtSink, pOIBindInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { @@ -670,7 +673,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->filter_proxy = NULL; } - set_binding_sink(PROTOCOL(This), NULL); + set_binding_sink(PROTOCOL(This), NULL, NULL); if(This->bind_info) { IInternetBindInfo_Release(This->bind_info); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e25db0b..a010d23 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2674,13 +2674,11 @@ static void test_BindToObject(int protocol, DWORD flags) CHECK_CALLED(Obj_OnStopBinding); } - if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) { - ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); - }else { - todo_wine ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + else IBindCtx_Release(bctx); - } if(emulate_protocol) CoRevokeClassObject(regid); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index e6bc594..3aada09 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -78,7 +78,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info); IWinInetInfo *get_wininet_info(IInternetProtocol*); typedef struct ProtocolVtbl ProtocolVtbl;

1 0