March 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll/tests: Add tests for TpSimpleTryPost function.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: b282a937e2369016fc0fbc84f55f8ab57143ea9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b282a937e2369016fc0fbc84f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 24 05:42:03 2015 +0100 ntdll/tests: Add tests for TpSimpleTryPost function. --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/threadpool.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 81b4466..fc352dd 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -21,4 +21,5 @@ C_SRCS = \ rtlbitmap.c \ rtlstr.c \ string.c \ + threadpool.c \ time.c diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c new file mode 100644 index 0000000..2e31b34 --- /dev/null +++ b/dlls/ntdll/tests/threadpool.c @@ -0,0 +1,127 @@ +/* + * Unit test suite for thread pool functions + * + * Copyright 2015 Sebastian Lackner + * + * 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 + */ + +#include "ntdll_test.h" + +static HMODULE hntdll = 0; +static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); +static VOID (WINAPI *pTpReleasePool)(TP_POOL *); +static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); + +#define NTDLL_GET_PROC(func) \ + do \ + { \ + p ## func = (void *)GetProcAddress(hntdll, #func); \ + if (!p ## func) trace("Failed to get address for %s\n", #func); \ + } \ + while (0) + +static BOOL init_threadpool(void) +{ + hntdll = GetModuleHandleA("ntdll"); + if (!hntdll) + { + win_skip("Could not load ntdll\n"); + return FALSE; + } + + NTDLL_GET_PROC(TpAllocPool); + NTDLL_GET_PROC(TpReleasePool); + NTDLL_GET_PROC(TpSimpleTryPost); + + if (!pTpAllocPool) + { + skip("Threadpool functions not supported, skipping tests\n"); + return FALSE; + } + + return TRUE; +} + +#undef NTDLL_GET_PROC + + +static void CALLBACK simple_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +{ + HANDLE semaphore = userdata; + trace("Running simple callback\n"); + ReleaseSemaphore(semaphore, 1, NULL); +} + +static void test_tp_simple(void) +{ + TP_CALLBACK_ENVIRON environment; + HANDLE semaphore; + NTSTATUS status; + TP_POOL *pool; + DWORD result; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + /* post the callback using the default threadpool */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = NULL; + status = pTpSimpleTryPost(simple_cb, semaphore, &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + /* post the callback using the new threadpool */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + status = pTpSimpleTryPost(simple_cb, semaphore, &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + /* test with invalid version number */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 9999; + environment.Pool = pool; + status = pTpSimpleTryPost(simple_cb, semaphore, &environment); + ok(status == STATUS_INVALID_PARAMETER || broken(!status) /* Vista/2008 */, + "TpSimpleTryPost unexpectedly returned status %x\n", status); + if (!status) + { + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + + /* cleanup */ + pTpReleasePool(pool); + CloseHandle(semaphore); +} + +START_TEST(threadpool) +{ + if (!init_threadpool()) + return; + + test_tp_simple(); +}

1 0

Sebastian Lackner : ddraw: Remove unused code for ChangeUniquenessValue.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 68528519fc203879132a74205b11cc9a0cfdd784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68528519fc203879132a74205… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 3 05:09:56 2015 +0100 ddraw: Remove unused code for ChangeUniquenessValue. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 31 +------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a2eee1a..4a883b9 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -183,7 +183,6 @@ struct ddraw_surface DDSURFACEDESC2 surface_desc; /* Misc things */ - DWORD uniqueness_value; UINT mipmap_level; /* Clipper objects */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 331d2bb..cbf11da 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3886,35 +3886,10 @@ static HRESULT WINAPI ddraw_surface2_GetDDInterface(IDirectDrawSurface2 *iface, return ddraw_surface7_GetDDInterface(&surface->IDirectDrawSurface7_iface, ddraw); } -/* This seems also windows implementation specific - I don't think WineD3D needs this */ static HRESULT WINAPI ddraw_surface7_ChangeUniquenessValue(IDirectDrawSurface7 *iface) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); - volatile struct ddraw_surface* vThis = This; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - /* A uniqueness value of 0 is apparently special. - * This needs to be checked. - * TODO: Write tests for this code and check if the volatile, interlocked stuff is really needed - */ - while (1) { - DWORD old_uniqueness_value = vThis->uniqueness_value; - DWORD new_uniqueness_value = old_uniqueness_value+1; - - if (old_uniqueness_value == 0) break; - if (new_uniqueness_value == 0) new_uniqueness_value = 1; - - if (InterlockedCompareExchange((LONG*)&vThis->uniqueness_value, - old_uniqueness_value, - new_uniqueness_value) - == old_uniqueness_value) - break; - } - - wined3d_mutex_unlock(); - return DD_OK; } @@ -3929,13 +3904,9 @@ static HRESULT WINAPI ddraw_surface4_ChangeUniquenessValue(IDirectDrawSurface4 * static HRESULT WINAPI ddraw_surface7_GetUniquenessValue(IDirectDrawSurface7 *iface, DWORD *pValue) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, value %p.\n", iface, pValue); - wined3d_mutex_lock(); - *pValue = surface->uniqueness_value; - wined3d_mutex_unlock(); + *pValue = 0; return DD_OK; }

1 0

Sebastian Lackner : ole32: Fix an invalid usage of InterlockedCompareExchange.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: c23db594aacf69675ebd57936449c412c34f6050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23db594aacf69675ebd57936… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 3 05:39:46 2015 +0100 ole32: Fix an invalid usage of InterlockedCompareExchange. --- dlls/ole32/marshal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index b308600..c5c2023 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -805,11 +805,12 @@ static HRESULT proxy_manager_construct( static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data) { - MSHCTX old_dest_context = This->dest_context; + MSHCTX old_dest_context; MSHCTX new_dest_context; do { + old_dest_context = This->dest_context; new_dest_context = old_dest_context; /* "stronger" values overwrite "weaker" values. stronger values are * ones that disable more optimisations */ @@ -853,7 +854,7 @@ static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX if (old_dest_context == new_dest_context) break; - old_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); + new_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); } while (new_dest_context != old_dest_context); if (dest_context_data)

1 0

Nikolay Sivov : include: Fix null pointer dereference while tracing.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: bcd8b6f4ee540f8bd414939984061f4c187c7449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd8b6f4ee540f8bd41493998… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 08:13:29 2015 +0300 include: Fix null pointer dereference while tracing. --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 9028cb5..95d74d3 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -278,7 +278,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) if (V_VT(v) == (VT_VARIANT|VT_BYREF)) return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); if (V_VT(v) == (VT_BSTR|VT_BYREF)) - return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, wine_dbgstr_w(*V_BSTRREF(v)) ); + return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, V_BSTRREF(v) ? wine_dbgstr_w(*V_BSTRREF(v)) : "(none)" ); return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); }

1 0

Sebastian Lackner : winebuild: Conditionally use different code for restoring the context structure.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 4c8b3f63be19e188fd379e9294df4a7eabb9198b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3f63be19e188fd379e929… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 2 00:29:42 2015 +0100 winebuild: Conditionally use different code for restoring the context structure. Fixes a regression introduced by 44fbc018eda12bdee5c2c1e2e40dbdc6a81b27fd. --- tools/winebuild/relay.c | 57 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 63c2ca4..cb4b0ca 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -852,36 +852,35 @@ static void build_call_from_regs_x86(void) /* Restore the context structure */ - output( "2:\n" ); + output( "2:\tpushl 0x94(%%ecx)\n" ); /* SegEs */ + output( "\tpopl %%es\n" ); + output( "\tpushl 0x90(%%ecx)\n" ); /* SegFs */ + output( "\tpopl %%fs\n" ); + output( "\tpushl 0x8c(%%ecx)\n" ); /* SegGs */ + output( "\tpopl %%gs\n" ); + + output( "\tmovw %%ss,%%ax\n" ); + output( "\tcmpw 0xc8(%%ecx),%%ax\n" ); /* SegSs */ + output( "\tjne 3f\n" ); /* As soon as we have switched stacks the context structure could * be invalid (when signal handlers are executed for example). Copy * values on the target stack before changing ESP. */ - output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ - output( "\tpopl %%es\n" ); output( "\tmovl 0xc4(%%ecx),%%eax\n" ); /* Esp */ output( "\tleal -4*4(%%eax),%%eax\n" ); output( "\tmovl 0xc0(%%ecx),%%edx\n" ); /* EFlags */ - output( "\t.byte 0x26\n\tmovl %%edx,3*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,3*4(%%eax)\n" ); output( "\tmovl 0xbc(%%ecx),%%edx\n" ); /* SegCs */ - output( "\t.byte 0x26\n\tmovl %%edx,2*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,2*4(%%eax)\n" ); output( "\tmovl 0xb8(%%ecx),%%edx\n" ); /* Eip */ - output( "\t.byte 0x26\n\tmovl %%edx,1*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,1*4(%%eax)\n" ); output( "\tmovl 0xb0(%%ecx),%%edx\n" ); /* Eax */ - output( "\t.byte 0x26\n\tmovl %%edx,0*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,0*4(%%eax)\n" ); - output( "\tpushl %%es\n" ); output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ - output(" \tpushl 0x94(%%ecx)\n" ); /* SegEs */ - output( "\tpopl %%es\n" ); - output( "\tpushl 0x90(%%ecx)\n"); /* SegFs */ - output( "\tpopl %%fs\n" ); - output( "\tpushl 0x8c(%%ecx)\n"); /* SegGs */ - output( "\tpopl %%gs\n" ); - output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ @@ -890,11 +889,37 @@ static void build_call_from_regs_x86(void) output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ output( "\tpopl %%ds\n" ); - output( "\tpopl %%ss\n" ); output( "\tmovl %%eax,%%esp\n" ); output( "\tpopl %%eax\n" ); output( "\tiret\n" ); + + output("3:\n"); + + /* Restore the context when the stack segment changes. We can't use + * the same code as above because we do not know if the stack segment + * is 16 or 32 bit, and 'movl' will throw an exception when we try to + * access memory above the limit. */ + + output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ + output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ + output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ + output( "\tmovl 0xa8(%%ecx),%%edx\n" ); /* Edx */ + output( "\tmovl 0xb0(%%ecx),%%eax\n" ); /* Eax */ + output( "\tmovl 0xb4(%%ecx),%%ebp\n" ); /* Ebp */ + + output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ + output( "\tpopl %%ss\n" ); + output( "\tmovl 0xc4(%%ecx),%%esp\n" ); /* Esp */ + + output( "\tpushl 0xc0(%%ecx)\n" ); /* EFlags */ + output( "\tpushl 0xbc(%%ecx)\n" ); /* SegCs */ + output( "\tpushl 0xb8(%%ecx)\n" ); /* Eip */ + output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ + output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ + + output( "\tpopl %%ds\n" ); + output( "\tiret\n" ); output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" );

1 0

Damjan Jovanovic : winex11.drv: Support XDnD version 5.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 1a20050826807d51109c684b8272561bcf909318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a20050826807d51109c684b8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 2 06:32:08 2015 +0200 winex11.drv: Support XDnD version 5. --- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xdnd.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0adf7f3..533af2c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -61,7 +61,7 @@ typedef int Status; #define MAX_DASHLEN 16 -#define WINE_XDND_VERSION 4 +#define WINE_XDND_VERSION 5 /* X physical pen */ typedef struct diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 6618edd..f6ce5e9 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -373,6 +373,8 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { XClientMessageEvent e; IDropTarget *dropTarget; + DWORD effect = XDNDDropEffect; + int accept = 0; /* Assume we're not accepting */ TRACE("\n"); @@ -386,7 +388,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { HRESULT hr; POINTL pointl; - DWORD effect = XDNDDropEffect; pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -395,7 +396,10 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) if (SUCCEEDED(hr)) { if (effect != DROPEFFECT_NONE) + { TRACE("drop succeeded\n"); + accept = 1; + } else TRACE("the application refused the drop\n"); } @@ -414,6 +418,11 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) e.message_type = x11drv_atom(XdndFinished); e.format = 32; e.data.l[0] = event->window; + e.data.l[1] = accept; + if (accept) + e.data.l[2] = X11DRV_XDND_DROPEFFECTToXdndAction(effect); + else + e.data.l[2] = None; XSendEvent(event->display, event->data.l[0], False, NoEventMask, (XEvent*)&e); }

1 0

Nikolay Sivov : rpcrt4: Use RPC_* error code names.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 0810db96faf76b04198efcdf14699096f0731b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0810db96faf76b04198efcdf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 10:41:57 2015 +0300 rpcrt4: Use RPC_* error code names. --- dlls/rpcrt4/ndr_contexthandle.c | 26 +++++++++++++------------- dlls/rpcrt4/ndr_es.c | 12 ++++++------ dlls/rpcrt4/ndr_marshall.c | 6 +++--- dlls/rpcrt4/ndr_stubless.c | 2 +- dlls/rpcrt4/rpc_assoc.c | 4 ++-- dlls/rpcrt4/rpc_binding.c | 18 +++++++++--------- 6 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0810db96faf76b04198ef…

1 0

Nikolay Sivov : rpcrt4: Fix argument check in MesEncodeFixedBufferHandleCreate().
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 37dd44158721d3dc2883418c3cef50ba46f1ae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dd44158721d3dc2883418c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 15:18:58 2015 +0300 rpcrt4: Fix argument check in MesEncodeFixedBufferHandleCreate(). --- dlls/rpcrt4/ndr_es.c | 12 ++++++++++++ dlls/rpcrt4/tests/ndr_marshall.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index fa3fe7b..73bd867 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -42,6 +42,7 @@ static inline void init_MIDL_ES_MESSAGE(MIDL_ES_MESSAGE *pEsMsg) /* even if we are unmarshalling, as we don't want pointers to be pointed * to buffer memory */ pEsMsg->StubMsg.IsClient = TRUE; + pEsMsg->MesVersion = 1; } /*********************************************************************** @@ -142,6 +143,17 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( TRACE("(%p, %d, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); + if (!Buffer) + return RPC_S_INVALID_ARG; + + if (((ULONG_PTR)Buffer % 8) != 0) + return RPC_X_INVALID_BUFFER; + + if (!pEncodedSize) + return RPC_S_INVALID_ARG; + + /* FIXME: check BufferSize too */ + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); if (!pEsMsg) return RPC_S_OUT_OF_MEMORY; diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 1d8a64d..fd1cbbb 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -34,7 +34,7 @@ #include "rpc.h" #include "rpcdce.h" #include "rpcproxy.h" - +#include "midles.h" static int my_alloc_called; static int my_free_called; @@ -2405,6 +2405,42 @@ static void test_NdrGetUserMarshalInfo(void) "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); } +static void test_MesEncodeFixedBufferHandleCreate(void) +{ + ULONG encoded_size; + RPC_STATUS status; + handle_t handle; + char *buffer; + + status = MesEncodeFixedBufferHandleCreate(NULL, 0, NULL, NULL); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(NULL, 0, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate((char*)0xdeadbeef, 0, NULL, &handle); + ok(status == RPC_X_INVALID_BUFFER, "got %d\n", status); + + buffer = (void*)((0xdeadbeef + 7) & ~7); + status = MesEncodeFixedBufferHandleCreate(buffer, 0, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(buffer, 0, &encoded_size, &handle); +todo_wine + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); +if (status == RPC_S_OK) + MesHandleFree(handle); + + status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(buffer, 32, &encoded_size, &handle); + ok(status == RPC_S_OK, "got %d\n", status); + + status = MesHandleFree(handle); + ok(status == RPC_S_OK, "got %d\n", status); +} + START_TEST( ndr_marshall ) { determine_pointer_marshalling_style(); @@ -2425,4 +2461,5 @@ START_TEST( ndr_marshall ) test_ndr_buffer(); test_NdrMapCommAndFaultStatus(); test_NdrGetUserMarshalInfo(); + test_MesEncodeFixedBufferHandleCreate(); }

1 0

Mark Harmstone : dsound/tests: Add GetObjectInPath tests.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: b472e5574c59794ea6e15389cbba2b9e33357f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b472e5574c59794ea6e15389c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:46:15 2015 +0000 dsound/tests: Add GetObjectInPath tests. --- dlls/dsound/tests/dsound8.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5106cf0..b093312 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -38,6 +38,8 @@ #include "ksmedia.h" #include "initguid.h" + +#include "mediaobj.h" #include "wingdi.h" #include "mmdeviceapi.h" #include "audioclient.h" @@ -1256,6 +1258,8 @@ static void test_effects(void) if (rc==DS_OK && secondary8) { LPVOID ptr1,ptr2; DWORD bytes1,bytes2; + IUnknown* obj = NULL; + HRESULT rc2; /* Call SetFX with dwEffectsCount > 0 and pDSFXDesc == NULL */ rc=IDirectSoundBuffer8_SetFX(secondary8,1,NULL,NULL); @@ -1307,14 +1311,46 @@ static void test_effects(void) } /* Call SetFX with standard echo */ - rc=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); - ok(rc==DS_OK||rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL, + rc2=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); + ok(rc2==DS_OK||rc2==REGDB_E_CLASSNOTREG||rc2==DSERR_CONTROLUNAVAIL, "IDirectSoundBuffer8_SetFX(GUID_DSFX_STANDARD_ECHO) failed: %08x\n",rc); - if (rc!=DSERR_CONTROLUNAVAIL) { + if (rc2!=DSERR_CONTROLUNAVAIL) { ok(resultcodes[0]==DSFXR_UNKNOWN||resultcodes[0]==DSFXR_LOCHARDWARE||resultcodes[0]==DSFXR_LOCSOFTWARE, "resultcode == %08x, expected DSFXR_UNKNOWN, DSFXR_LOCHARDWARE, or DSFXR_LOCSOFTWARE\n",resultcodes[0]); } + /* Call GetObjectInPath for out-of-bounds DMO */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,2,&IID_IMediaObject,(void**)&obj); + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + + /* Call GetObjectInPath with NULL ppObject */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&IID_IMediaObject,NULL); + ok(rc==E_INVALIDARG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned E_INVALIDARG, returned: %08x\n",rc); + + /* Call GetObjectInPath for unsupported interface */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&GUID_NULL,(void**)&obj); + ok(rc==E_NOINTERFACE||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned E_NOINTERFACE, returned: %08x\n",rc); + + /* Call GetObjectInPath for unloaded DMO */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_NULL,0,&IID_IMediaObject,(void**)&obj); + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + + /* Call GetObjectInPath for first DMO */ + obj=NULL; + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&IID_IMediaObject,(void**)&obj); + if (rc2==DS_OK) { + ok(rc==DS_OK||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DS_OK, returned: %08x\n",rc); + if (obj) IUnknown_Release(obj); + } else { + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + } + /* Call SetFX with one real filter and one fake one */ rc=IDirectSoundBuffer8_SetFX(secondary8,2,effects,resultcodes); ok(rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL,

1 0

Mark Harmstone : comctl32: Paint themed scrollbars.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: d7c206972175f8b2eee90358e8c3f12c9973285b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c206972175f8b2eee90358e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:44:42 2015 +0000 comctl32: Paint themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 231 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index ed2c051..9be8384 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -32,8 +32,232 @@ #include "comctl32.h" #include "wine/debug.h" +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 6 + +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); +static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) +{ + if (size <= SCROLL_MIN_RECT) + *thumbpos = *thumbsize = 0; + else if (si->nPage > si->nMax - si->nMin) + *thumbpos = *thumbsize = 0; + else { + if (si->nPage > 0) { + *thumbsize = MulDiv(size, si->nPage, si->nMax - si->nMin + 1); + if (*thumbsize < SCROLL_MIN_THUMB) *thumbsize = SCROLL_MIN_THUMB; + } + else *thumbsize = GetSystemMetrics(SM_CXVSCROLL); + + if (size < *thumbsize) + *thumbpos = *thumbsize = 0; + else { + int max = si->nMax - max(si->nPage - 1, 0); + size -= *thumbsize; + if (si->nMin >= max) + *thumbpos = 0; + else + *thumbpos = MulDiv(size, si->nTrackPos - si->nMin, max - si->nMin); + } + } +} + +static void paint_scrollbar(HWND hwnd, HTHEME theme) +{ + HDC dc; + PAINTSTRUCT ps; + RECT r; + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL vertical = style & SBS_VERT; + BOOL disabled = !IsWindowEnabled(hwnd); + + GetWindowRect(hwnd, &r); + OffsetRect(&r, -r.left, -r.top); + + dc = BeginPaint(hwnd, &ps); + + if (style & SBS_SIZEBOX || style & SBS_SIZEGRIP) { + int state; + + if (style & SBS_SIZEBOXTOPLEFTALIGN) + state = SZB_TOPLEFTALIGN; + else + state = SZB_RIGHTALIGN; + + DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); + } else { + SCROLLBARINFO sbi; + SCROLLINFO si; + unsigned int thumbpos, thumbsize; + int uppertrackstate, lowertrackstate, thumbstate; + RECT partrect, trackrect; + SIZE grippersize; + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(hwnd, OBJID_CLIENT, &sbi); + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hwnd, SB_CTL, &si); + + trackrect = r; + + if (disabled) { + uppertrackstate = SCRBS_DISABLED; + lowertrackstate = SCRBS_DISABLED; + thumbstate = SCRBS_DISABLED; + } else { + uppertrackstate = SCRBS_NORMAL; + lowertrackstate = SCRBS_NORMAL; + thumbstate = SCRBS_NORMAL; + } + + if (vertical) { + SIZE upsize, downsize; + int uparrowstate, downarrowstate; + + if (disabled) { + uparrowstate = ABS_UPDISABLED; + downarrowstate = ABS_DOWNDISABLED; + } else { + uparrowstate = ABS_UPNORMAL; + downarrowstate = ABS_DOWNNORMAL; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, uparrowstate, NULL, TS_DRAW, &upsize))) { + WARN("Could not get up arrow size.\n"); + return; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, downarrowstate, NULL, TS_DRAW, &downsize))) { + WARN("Could not get down arrow size.\n"); + return; + } + + if (r.bottom - r.top - upsize.cy - downsize.cy < SCROLL_MIN_RECT) + upsize.cy = downsize.cy = (r.bottom - r.top - SCROLL_MIN_RECT)/2; + + partrect = r; + partrect.bottom = partrect.top + upsize.cy; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); + + trackrect.top = partrect.bottom; + + partrect.bottom = r.bottom; + partrect.top = partrect.bottom - downsize.cy; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); + + trackrect.bottom = partrect.top; + + calc_thumb_dimensions(trackrect.bottom - trackrect.top, &si, &thumbpos, &thumbsize); + + if (thumbpos > 0) { + partrect.top = trackrect.top; + partrect.bottom = partrect.top + thumbpos; + + DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); + } + + if (thumbsize > 0) { + partrect.top = trackrect.top + thumbpos; + partrect.bottom = partrect.top + thumbsize; + + DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); + + if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { + MARGINS margins; + + if (SUCCEEDED(GetThemeMargins(theme, dc, SBP_THUMBBTNVERT, thumbstate, TMT_CONTENTMARGINS, &partrect, &margins))) { + if (grippersize.cy <= (thumbsize - margins.cyTopHeight - margins.cyBottomHeight)) + DrawThemeBackground(theme, dc, SBP_GRIPPERVERT, thumbstate, &partrect, NULL); + } + } + } + + if (thumbpos + thumbsize < trackrect.bottom - trackrect.top) { + partrect.bottom = trackrect.bottom; + partrect.top = trackrect.top + thumbsize + thumbpos; + + DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + } + } else { + SIZE leftsize, rightsize; + int leftarrowstate, rightarrowstate; + + if (disabled) { + leftarrowstate = ABS_LEFTDISABLED; + rightarrowstate = ABS_RIGHTDISABLED; + } else { + leftarrowstate = ABS_LEFTNORMAL; + rightarrowstate = ABS_RIGHTNORMAL; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, leftarrowstate, NULL, TS_DRAW, &leftsize))) { + WARN("Could not get left arrow size.\n"); + return; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, rightarrowstate, NULL, TS_DRAW, &rightsize))) { + WARN("Could not get right arrow size.\n"); + return; + } + + if (r.right - r.left - leftsize.cx - rightsize.cx < SCROLL_MIN_RECT) + leftsize.cx = rightsize.cx = (r.right - r.left - SCROLL_MIN_RECT)/2; + + partrect = r; + partrect.right = partrect.left + leftsize.cx; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); + + trackrect.left = partrect.right; + + partrect.right = r.right; + partrect.left = partrect.right - rightsize.cx; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); + + trackrect.right = partrect.left; + + calc_thumb_dimensions(trackrect.right - trackrect.left, &si, &thumbpos, &thumbsize); + + if (thumbpos > 0) { + partrect.left = trackrect.left; + partrect.right = partrect.left + thumbpos; + + DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); + } + + if (thumbsize > 0) { + partrect.left = trackrect.left + thumbpos; + partrect.right = partrect.left + thumbsize; + + DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); + + if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) { + MARGINS margins; + + if (SUCCEEDED(GetThemeMargins(theme, dc, SBP_THUMBBTNHORZ, thumbstate, TMT_CONTENTMARGINS, &partrect, &margins))) { + if (grippersize.cx <= (thumbsize - margins.cxLeftWidth - margins.cxRightWidth)) + DrawThemeBackground(theme, dc, SBP_GRIPPERHORZ, thumbstate, &partrect, NULL); + } + } + } + + if (thumbpos + thumbsize < trackrect.right - trackrect.left) { + partrect.right = trackrect.right; + partrect.left = trackrect.left + thumbsize + thumbpos; + + DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + } + } + } + + EndPaint(hwnd, &ps); +} + LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ULONG_PTR dwRefData) @@ -68,6 +292,13 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, * which will do the repaint. */ break; + case WM_PAINT: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + paint_scrollbar(hwnd, theme); + break; + default: return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); }

1 0