wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

André Hentschel : advapi32: Add stubs for GetTraceEnableFlags and GetTraceEnableLevel.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 77b0e788b8d117aacee482b6d1adda444190affd URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b0e788b8d117aacee482b6d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 24 20:59:48 2014 +0200 advapi32: Add stubs for GetTraceEnableFlags and GetTraceEnableLevel. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 18 ++++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 4 ++-- include/evntrace.h | 10 ++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9e2ab05..0b654c8 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,8 +351,8 @@ @ stub GetSiteSidFromToken # @ stub GetThreadWaitChain @ stdcall GetTokenInformation(long long ptr long ptr) -@ stub GetTraceEnableFlags -@ stub GetTraceEnableLevel +@ stdcall GetTraceEnableFlags(int64) +@ stdcall GetTraceEnableLevel(int64) @ stdcall -ret64 GetTraceLoggerHandle(ptr) @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 828f23b..d730bb9 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -378,6 +378,24 @@ BOOL WINAPI GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) } /****************************************************************************** + * GetTraceEnableFlags [ADVAPI32.@] + */ +ULONG WINAPI GetTraceEnableFlags( TRACEHANDLE handle ) +{ + FIXME("(%s) stub\n", wine_dbgstr_longlong(handle)); + return 0; +} + +/****************************************************************************** + * GetTraceEnableLevel [ADVAPI32.@] + */ +UCHAR WINAPI GetTraceEnableLevel( TRACEHANDLE handle ) +{ + FIXME("(%s) stub\n", wine_dbgstr_longlong(handle)); + return TRACE_LEVEL_VERBOSE; +} + +/****************************************************************************** * GetTraceLoggerHandle [ADVAPI32.@] */ TRACEHANDLE WINAPI GetTraceLoggerHandle( PVOID buf ) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 73f3207..5b0b069 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -66,8 +66,8 @@ @ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation -@ stub GetTraceEnableFlags -@ stub GetTraceEnableLevel +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel @ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl @ stdcall InitializeSecurityDescriptor(ptr long) advapi32.InitializeSecurityDescriptor diff --git a/include/evntrace.h b/include/evntrace.h index 418e437..cc442dc 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -30,6 +30,14 @@ extern "C" { #define EVENT_TRACE_CONTROL_UPDATE 2 #define EVENT_TRACE_CONTROL_FLUSH 3 +#define TRACE_LEVEL_NONE 0 +#define TRACE_LEVEL_CRITICAL 1 +#define TRACE_LEVEL_FATAL 1 +#define TRACE_LEVEL_ERROR 2 +#define TRACE_LEVEL_WARNING 3 +#define TRACE_LEVEL_INFORMATION 4 +#define TRACE_LEVEL_VERBOSE 5 + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; struct _EVENT_TRACE_LOGFILEA; @@ -221,6 +229,8 @@ ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace) +ULONG WINAPI GetTraceEnableFlags(TRACEHANDLE); +UCHAR WINAPI GetTraceEnableLevel(TRACEHANDLE); TRACEHANDLE WINAPI GetTraceLoggerHandle(PVOID); ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG);

1 0

Vincent Povirk : user32/tests: Our popup test window loses capture to itself.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: eb8406b8102ae43d75b2573836de801203898c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8406b8102ae43d75b257383… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 25 15:45:52 2014 -0500 user32/tests: Our popup test window loses capture to itself. --- dlls/user32/tests/win.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2d6e534..aba9359 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3098,6 +3098,9 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, } cap_wnd = GetCapture(); + ok(cap_wnd == (HWND)lParam, "capture window %p does not match lparam %lx\n", cap_wnd, lParam); + todo_wine ok(cap_wnd == hWnd, "capture window %p does not match hwnd %p\n", cap_wnd, hWnd); + /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); ok(!set_cap_wnd || broken(set_cap_wnd == cap_wnd), /* nt4 */

1 0

Vincent Povirk : user32/tests: Add a message test for popup menus on windows that have capture.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e1c5af1e8d96a4e288611ff8c3bac5804536c552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c5af1e8d96a4e288611ff8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 25 15:40:04 2014 -0500 user32/tests: Add a message test for popup menus on windows that have capture. --- dlls/user32/tests/msg.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fdc882d..6406190 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1747,6 +1747,24 @@ static const struct message WmTrackPopupMenu[] = { { 0 } }; +static const struct message WmTrackPopupMenuCapture[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_CAPTURECHANGED, sent }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { 0 } +}; + static const struct message WmTrackPopupMenuEmpty[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -14353,6 +14371,9 @@ static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, case WM_UNINITMENUPOPUP: ok((HMENU)wParam == hpopupmenu, "expected %p, got %lx\n", hpopupmenu, wParam); break; + case WM_CAPTURECHANGED: + todo_wine ok(!lParam || (HWND)lParam == hwnd, "lost capture to %lx\n", lParam); + break; } return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); @@ -14403,6 +14424,16 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); ok(ret == TRUE, "TrackPopupMenu failed\n"); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); + + SetCapture(hwnd); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuCapture, "TrackPopupMenuCapture", TRUE); + ok(ret == 1, "TrackPopupMenuCapture failed with error %i\n", GetLastError()); + DestroyMenu(hpopupmenu); DestroyWindow(hwnd); }

1 0

Vincent Povirk : user32/tests: Add test calling EndMenu from WM_ENTERMENULOOP.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 412222609f69ac72690fe5ae122bcf85ec864eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412222609f69ac72690fe5ae1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 16 12:23:01 2014 -0500 user32/tests: Add test calling EndMenu from WM_ENTERMENULOOP. --- dlls/user32/tests/msg.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 684347d..fdc882d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1762,6 +1762,22 @@ static const struct message WmTrackPopupMenuEmpty[] = { { 0 } }; +static const struct message WmTrackPopupMenuAbort[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { 0 } +}; + static BOOL after_end_dialog, test_def_id, paint_loop_done; static int sequence_cnt, sequence_size; static struct recvd_message* sequence; @@ -14342,6 +14358,19 @@ static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); } +static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if (ignore_message( message )) return 0; + + switch (message) { + case WM_ENTERMENULOOP: + ok(EndMenu() == TRUE, "EndMenu() failed\n"); + break; + } + + return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); +} + static void test_TrackPopupMenu(void) { HWND hwnd; @@ -14366,6 +14395,14 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); + ok(ret == TRUE, "TrackPopupMenu failed\n"); + DestroyMenu(hpopupmenu); DestroyWindow(hwnd); }

1 0

Jacek Caban : ieframe: Improved debug traces.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: fba08e34c4478fdce5055c5c3ead7d8958875bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba08e34c4478fdce5055c5c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 13:28:44 2014 +0200 ieframe: Improved debug traces. --- dlls/ieframe/ieframe_main.c | 2 ++ dlls/ieframe/navigate.c | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index ffba1d7..4793ee3 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -49,6 +49,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); case VT_BOOL: return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + case VT_ERROR: + return wine_dbg_sprintf("{VT_ERROR: %08x}", V_ERROR(v)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); } diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 0c8c276..886fa01 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -928,11 +928,9 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, TRACE("navigating to %s\n", debugstr_w(url)); - if((Flags && V_VT(Flags) != VT_EMPTY) - || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) - FIXME("Unsupported args (Flags %p:%d; TargetFrameName %p:%d)\n", - Flags, Flags ? V_VT(Flags) : -1, TargetFrameName, - TargetFrameName ? V_VT(TargetFrameName) : -1); + if((Flags && V_VT(Flags) != VT_EMPTY && V_VT(Flags) != VT_ERROR) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY && V_VT(TargetFrameName) != VT_ERROR)) + FIXME("Unsupported args (Flags %s; TargetFrameName %s)\n", debugstr_variant(Flags), debugstr_variant(TargetFrameName)); if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) { SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data);

1 0

Jacek Caban : mshtml: Added IConnectionPoint:: EnumConnections implementation.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: e9ac8e568bc9685cff16a69c2be392255912804d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ac8e568bc9685cff16a69c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 13:27:14 2014 +0200 mshtml: Added IConnectionPoint::EnumConnections implementation. --- dlls/mshtml/conpoint.c | 133 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/htmldoc.c | 21 +++++++ 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index de501b4..8912eab 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -48,6 +48,120 @@ static const char *debugstr_cp_guid(REFIID riid) return debugstr_guid(riid); } +typedef struct { + IEnumConnections IEnumConnections_iface; + + LONG ref; + + unsigned iter; + ConnectionPoint *cp; +} EnumConnections; + +static inline EnumConnections *impl_from_IEnumConnections(IEnumConnections *iface) +{ + return CONTAINING_RECORD(iface, EnumConnections, IEnumConnections_iface); +} + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, void **ppv) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else if(IsEqualGUID(riid, &IID_IEnumConnections)) { + TRACE("(%p)->(IID_IEnumConnections %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *rgcd, ULONG *pcFetched) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG fetched = 0; + + TRACE("(%p)->(%d %p %p)\n", This, cConnections, rgcd, pcFetched); + + while(fetched < cConnections && This->iter < This->cp->sinks_size) { + if(!This->cp->sinks[This->iter].unk) { + This->iter++; + continue; + } + + rgcd[fetched].pUnk = This->cp->sinks[This->iter].unk; + rgcd[fetched].dwCookie = ++This->iter; + IUnknown_AddRef(rgcd[fetched].pUnk); + fetched++; + } + + if(pcFetched) + *pcFetched = fetched; + return fetched == cConnections ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%d)\n", This, cConnections); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -175,8 +289,23 @@ static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, ppEnum); - return E_NOTIMPL; + EnumConnections *ret; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumConnections_iface.lpVtbl = &EnumConnectionsVtbl; + ret->ref = 1; + ret->iter = 0; + + IConnectionPoint_AddRef(&This->IConnectionPoint_iface); + ret->cp = This; + + *ppEnum = &ret->IEnumConnections_iface; + return S_OK; } static const IConnectionPointVtbl ConnectionPointVtbl = diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bad7291..24c6cac 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5453,8 +5453,29 @@ static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID ri hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL); ok(hres == S_OK, "Advise failed: %08x\n", hres); } else if(IsEqualGUID(&IID_IDispatch, riid)) { + IEnumConnections *enum_conn; + CONNECTDATA conn_data; + ULONG fetched; + hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie); ok(hres == S_OK, "Advise failed: %08x\n", hres); + + hres = IConnectionPoint_EnumConnections(cp, &enum_conn); + ok(hres == S_OK, "EnumConnections failed: %08x\n", hres); + + fetched = 0; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(conn_data.pUnk == (IUnknown*)&EventDispatch, "conn_data.pUnk == EventDispatch\n"); + ok(conn_data.dwCookie == cookie, "conn_data.dwCookie != cookie\n"); + IUnknown_Release(conn_data.pUnk); + + fetched = 0xdeadbeef; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + ok(hres == S_FALSE, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + IEnumConnections_Release(enum_conn); } IConnectionPoint_Release(cp);

1 0

Alexandre Julliard : ntdll: Don' t wait for writes to complete in NtFlushVirtualMemory.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: 693d6e48d775ba29a803ee04c344c4ba1e7cb274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693d6e48d775ba29a803ee04c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 14:33:26 2014 +0200 ntdll: Don't wait for writes to complete in NtFlushVirtualMemory. --- dlls/ntdll/virtual.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e93ce2e..8d3539a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -58,10 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(module); -#ifndef MS_SYNC -#define MS_SYNC 0 -#endif - #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif @@ -2734,7 +2730,9 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, { if (!*size_ptr) *size_ptr = view->size; *addr_ptr = addr; - if (msync( addr, *size_ptr, MS_SYNC )) status = STATUS_NOT_MAPPED_DATA; +#ifdef MS_ASYNC + if (msync( addr, *size_ptr, MS_ASYNC )) status = STATUS_NOT_MAPPED_DATA; +#endif } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status;

1 0

Alexandre Julliard : dxguid: Remove some symbols that aren' t exported in native.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: 7d3559bfe938d7fea0fd74e3fc2ffb33a5ebaa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3559bfe938d7fea0fd74e3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 12:18:01 2014 +0200 dxguid: Remove some symbols that aren't exported in native. --- dlls/d3drm/d3drm_main.c | 3 ++- dlls/d3drm/tests/d3drm.c | 3 ++- dlls/dmband/dmutils.c | 1 + dlls/dmcompos/dmcompos_main.c | 14 ++++++++++++++ dlls/dmime/dmime_main.c | 16 +++++++++++++++- dlls/dmloader/dmloader_main.c | 16 +++++++++++++++- dlls/dmscript/dmscript_main.c | 16 +++++++++++++++- dlls/dmstyle/dmstyle_main.c | 16 +++++++++++++++- dlls/dmusic/dmusic_main.c | 15 ++++++++++++++- dlls/dswave/dswave_main.c | 15 ++++++++++++++- dlls/dxguid/dxguid.c | 2 -- 11 files changed, 107 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index e87dcb8..3d5255f 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -21,8 +21,9 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "d3d.h" +#include "initguid.h" #include "d3drm.h" -#include "d3drm_private.h" /*********************************************************************** diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 83fdffa..9990d2c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -18,8 +18,9 @@ */ #define COBJMACROS -#include <d3drm.h> +#include <d3d.h> #include <initguid.h> +#include <d3drm.h> #include <d3drmwin.h> #include "wine/test.h" diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 9ca2809..760afe8 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -37,6 +37,7 @@ #include "wine/unicode.h" #include "objbase.h" +#include "initguid.h" #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 240cc9d..c15c97d 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -20,6 +20,20 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "initguid.h" +#include "dmusici.h" + #include "dmcompos_private.h" #include "rpcproxy.h" diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index d069a01..37302ff 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -18,8 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmime_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmime_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 38faa8e..f02e523 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -17,8 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmloader_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmloader_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmloader); diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 6caf158..6a3c686 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -20,8 +20,22 @@ #include "config.h" #include "wine/port.h" -#include "dmscript_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmscript_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmscript); diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index b76fa73..11e3f62 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -17,8 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmstyle_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmstyle_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 8708787..ad172ab 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -21,9 +21,22 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> -#include "dmusic_private.h" +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a9be90c..b02f372 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -21,9 +21,22 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> -#include "dswave_private.h" +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dswave_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dswave); diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index 4f34a4f..f923d9c 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -36,7 +36,6 @@ #include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "dmusici.h" #include "dmusics.h" #include "dplay.h" #include "dplay8.h" @@ -45,5 +44,4 @@ #include "ddrawi.h" #include "dxdiag.h" #include "dxfile.h" -#include "d3drm.h" #include "rmxfguid.h"

1 0

Alistair Leslie-Hughes : dpnet: Improve error checking in Get/Set SP.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: c41d275079cfa247e93c7e53e7e3b03a6e2a1152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41d275079cfa247e93c7e53e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:52:20 2014 +1000 dpnet: Improve error checking in Get/Set SP. --- dlls/dpnet/address.c | 26 +++++++++----- dlls/dpnet/dpnet_private.h | 2 +- dlls/dpnet/tests/Makefile.in | 3 +- dlls/dpnet/tests/address.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 78c8350..796e8a4 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -166,12 +166,18 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p, %p)\n", iface, pguidSP); + TRACE("(%p, %p)\n", iface, pguidSP); - *pguidSP = This->SP_guid; - return DPN_OK; + if(!pguidSP) + return DPNERR_INVALIDPOINTER; + + if(!This->init) + return DPNERR_DOESNOTEXIST; + + *pguidSP = This->SP_guid; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(IDirectPlay8Address *iface, @@ -185,12 +191,16 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(IDirectPlay8Address *i static HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(IDirectPlay8Address *iface, const GUID *const pguidSP) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); + TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); - This->SP_guid = *pguidSP; - return DPN_OK; + if(!pguidSP) + return DPNERR_INVALIDPOINTER; + + This->init = TRUE; + This->SP_guid = *pguidSP; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8AddressImpl_SetUserData(IDirectPlay8Address *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 4a42eae..00ea94b 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -64,7 +64,7 @@ struct IDirectPlay8AddressImpl LONG ref; /* IDirectPlay8Address fields */ GUID SP_guid; - const WCHAR *url; + BOOL init; }; /***************************************************************************** diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 890ef3b..69339dc 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = dpnet.dll -IMPORTS = dpnet ole32 dxguid +IMPORTS = dxguid uuid dpnet ole32 C_SRCS = \ + address.c \ peer.c \ server.c diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c new file mode 100644 index 0000000..dad5a8e --- /dev/null +++ b/dlls/dpnet/tests/address.c @@ -0,0 +1,82 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + +/* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ +static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; + +static void create_directplay_address(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object"); + if(SUCCEEDED(hr)) + { + GUID guidsp; + + hr = IDirectPlay8Address_GetSP(localaddr, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "GetSP failed 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(localaddr, &GUID_NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guidsp, &GUID_NULL), "wrong guid: %s\n", wine_dbgstr_guid(&guidsp)); + + hr = IDirectPlay8Address_SetSP(localaddr, &IID_Random); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guidsp, &IID_Random), "wrong guid: %s\n", wine_dbgstr_guid(&guidsp)); + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guidsp, &CLSID_DP8SP_TCPIP), "wrong guid: %s\n", wine_dbgstr_guid(&guidsp)); + + IDirectPlay8Address_Release(localaddr); + } +} + +START_TEST(address) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "failed to init com\n"); + if(hr != S_OK) + return; + + create_directplay_address(); + + CoUninitialize(); +}

1 0

Alistair Leslie-Hughes : dpnet/tests: Use dxguid for tests.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: daac5b1f41f8874ffcfd6892fec0efbae4a7b6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=daac5b1f41f8874ffcfd6892f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:00:46 2014 +1000 dpnet/tests: Use dxguid for tests. --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/peer.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 9220121..890ef3b 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dpnet ole32 +IMPORTS = dpnet ole32 dxguid C_SRCS = \ peer.c \ diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index aea67c9..d1f3504 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define INITGUID #define WIN32_LEAN_AND_MEAN #include <stdio.h>

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
50
Older →

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 April 2014