wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Michael Stefaniuc : oledb32/tests: Remove an unused assignment (PVS-Studio ).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: e87857a5219aa8dd0cf600431945594e8df7a16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87857a5219aa8dd0cf600431… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:42:44 2015 +0100 oledb32/tests: Remove an unused assignment (PVS-Studio). --- dlls/oledb32/tests/convert.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index f7558da..f679b5c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2683,7 +2683,6 @@ static void test_converttovar(void) VariantClear(&dst); V_VT(&dst) = VT_EMPTY; - dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; i8.QuadPart = 12345; dst_len = 0x1234;

1 0

Michael Stefaniuc : kernel32/tests: Actually test a return value ( PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: dbe6c5576d6e4b527d493a82c4cae6258e6ed365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe6c5576d6e4b527d493a82c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:39:10 2015 +0100 kernel32/tests: Actually test a return value (PVS-Studio). --- dlls/kernel32/tests/pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf02e15..b115ed8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2111,6 +2111,7 @@ static void test_readfileex_pending(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); + ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes);

1 0

Michael Stefaniuc : ddraw/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: bd9d41080f0f43edbc9a9eddc2c9621a65f46500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9d41080f0f43edbc9a9eddc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:34:39 2015 +0100 ddraw/tests: Actually test some return values (PVS-Studio). --- dlls/ddraw/tests/ddraw2.c | 2 ++ dlls/ddraw/tests/ddraw4.c | 2 ++ dlls/ddraw/tests/ddraw7.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 090f731..f448455 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -972,6 +972,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -3733,6 +3734,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e5c808a..49f6de7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1180,6 +1180,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface4_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -4090,6 +4091,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c558385..084fbd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1090,6 +1090,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface7_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -3854,6 +3855,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);

1 0

Michael Stefaniuc : d3d9/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 148d6e3c10270206ebd12e98abc79460c2de1290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148d6e3c10270206ebd12e98a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:21:17 2015 +0100 d3d9/tests: Actually test some return values (PVS-Studio). --- dlls/d3d9/tests/d3d9ex.c | 2 ++ dlls/d3d9/tests/device.c | 3 +++ dlls/d3d9/tests/visual.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b17ceb5..a3a9226 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -738,6 +738,7 @@ static void test_user_memory(void) ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, @@ -750,6 +751,7 @@ static void test_user_memory(void) ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fde2bb6..f1c75e4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1081,6 +1081,7 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); /* Check if the back buffer count was modified */ hr = IDirect3DSwapChain9_GetPresentParameters(swapchain0, &d3dpp); + ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferCount == 1, "Got unexpected back buffer count %u.\n", d3dpp.BackBufferCount); IDirect3DSwapChain9_Release(swapchain0); @@ -8821,6 +8822,7 @@ static void test_volume_blocks(void) { hr = IDirect3DDevice9_CreateVolumeTexture(device, formats[i].block_width, formats[i].block_height, 2, 2, 0, formats[i].fmt, D3DPOOL_SCRATCH, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); hr = IDirect3DVolumeTexture9_LockBox(texture, 1, &locked_box, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock volume texture mipmap, hr %#x.\n", hr); @@ -9728,6 +9730,7 @@ static void test_resource_type(void) { hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); type = IDirect3DVolumeTexture9_GetType(volume_texture); ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0b1b5..fcafb37 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12095,6 +12095,7 @@ static void loop_index_test(void) ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShaderConstantI returned %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -14793,6 +14794,7 @@ static void multisampled_depth_buffer_test(void) IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_2_SAMPLES, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); @@ -15074,6 +15076,7 @@ static void resz_test(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_2_SAMPLES, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &readback, NULL); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr);

1 0

Michael Stefaniuc : ieframe: Remove unused assignments (PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 51e3750feae9af56526d20ce854362bf0012d379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e3750feae9af56526d20ce8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:38:43 2015 +0100 ieframe: Remove unused assignments (PVS-Studio). --- dlls/ieframe/intshcut.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index d4b71a7..a780fea 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -504,7 +504,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); - r = get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); + get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); if (iconfile != NULL) { PROPSPEC ps; @@ -522,7 +522,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam CoTaskMemFree(iconfile); } - r = get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); + get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); if (iconindexstring != NULL) {

1 0

Michael Stefaniuc : crypt32/tests: Add a missing test case (PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 802c3f2e1f4f452542815ddaa31d79c4df82bb52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802c3f2e1f4f452542815ddaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:08:19 2015 +0100 crypt32/tests: Add a missing test case (PVS-Studio). --- dlls/crypt32/tests/chain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 36fc16a..2a26888 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4508,6 +4508,8 @@ static void check_base_policy(void) ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, + ignoredInvalidUsageBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG;

1 0

Michael Stefaniuc : crypt32/tests: Remove an unused assignment (PVS-Studio ).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 89569b4b340af2c94e1d1fad36c9d335f94284ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=89569b4b340af2c94e1d1fad3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:05:54 2015 +0100 crypt32/tests: Remove an unused assignment (PVS-Studio). --- dlls/crypt32/tests/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 259361c..da32a74 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2874,7 +2874,7 @@ static void testGetValidUsages(void) oids[i]); HeapFree(GetProcessHeap(), 0, oids); } - numOIDs = size = 0xdeadbeef; + numOIDs = 0xdeadbeef; /* Oddly enough, this crashes when the number of contexts is not 1: ret = pCertGetValidUsages(2, contexts, &numOIDs, NULL, &size); * but setting size to 0 allows it to succeed:

1 0

Sebastian Lackner : ntdll: Assert when trying to replace an exiting file descriptor in fd_cache.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: bf65fef8bcd51459090724f65148571fa1da09c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf65fef8bcd51459090724f65… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 02:36:45 2015 +0100 ntdll: Assert when trying to replace an exiting file descriptor in fd_cache. --- dlls/ntdll/server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 2c99cbe..69d01be 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -821,7 +821,6 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, unsigned int access, unsigned int options ) { unsigned int entry, idx = handle_to_index( handle, &entry ); - int prev_fd; if (entry >= FD_CACHE_ENTRIES) { @@ -841,11 +840,11 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, } } /* store fd+1 so that 0 can be used as the unset value */ - prev_fd = interlocked_xchg( &fd_cache[entry][idx].fd, fd + 1 ) - 1; + fd = interlocked_xchg( &fd_cache[entry][idx].fd, fd + 1 ); fd_cache[entry][idx].type = type; fd_cache[entry][idx].access = access; fd_cache[entry][idx].options = options; - if (prev_fd != -1) close( prev_fd ); + assert( !fd ); return TRUE; }

1 0

Nikolay Sivov : rpcrt4: Implement MesEncodeDynBufferHandleCreate().
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 36bc8563cffc1b640e9f883e63d44e8a8c423597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bc8563cffc1b640e9f883e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 23:07:26 2015 +0300 rpcrt4: Implement MesEncodeDynBufferHandleCreate(). --- dlls/rpcrt4/ndr_es.c | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index e3cd48a..59ea816 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -167,6 +167,17 @@ RPC_STATUS WINAPI MesHandleFree(handle_t Handle) return RPC_S_OK; } +static RPC_STATUS validate_mes_buffer_pointer(const char *Buffer) +{ + if (!Buffer) + return RPC_S_INVALID_ARG; + + if (((ULONG_PTR)Buffer & 7) != 0) + return RPC_X_INVALID_BUFFER; + + return RPC_S_OK; +} + /*********************************************************************** * MesEncodeFixedBufferHandleCreate [RPCRT4.@] */ @@ -174,14 +185,12 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( char *Buffer, ULONG BufferSize, ULONG *pEncodedSize, handle_t *pHandle) { MIDL_ES_MESSAGE *pEsMsg; + RPC_STATUS status; 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 ((status = validate_mes_buffer_pointer(Buffer))) + return status; if (!pEncodedSize) return RPC_S_INVALID_ARG; @@ -208,10 +217,29 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( /*********************************************************************** * MesEncodeDynBufferHandleCreate [RPCRT4.@] */ -RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **ppBuffer, +RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **Buffer, ULONG *pEncodedSize, handle_t *pHandle) { - FIXME("%p %p %p stub\n", ppBuffer, pEncodedSize, pHandle); + MIDL_ES_MESSAGE *pEsMsg; + + TRACE("(%p, %p, %p)\n", Buffer, pEncodedSize, pHandle); + + if (!pEncodedSize) + return RPC_S_INVALID_ARG; + + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); + if (!pEsMsg) + return RPC_S_OUT_OF_MEMORY; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = MES_ENCODE; + pEsMsg->HandleStyle = MES_DYNAMIC_BUFFER_HANDLE; + pEsMsg->pDynBuffer = (unsigned char **)Buffer; + pEsMsg->pEncodedSize = pEncodedSize; + + *pHandle = (handle_t)pEsMsg; + return RPC_S_OK; } @@ -222,9 +250,13 @@ RPC_STATUS RPC_ENTRY MesDecodeBufferHandleCreate( char *Buffer, ULONG BufferSize, handle_t *pHandle) { MIDL_ES_MESSAGE *pEsMsg; + RPC_STATUS status; TRACE("(%p, %d, %p)\n", Buffer, BufferSize, pHandle); + if ((status = validate_mes_buffer_pointer(Buffer))) + return status; + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); if (!pEsMsg) return RPC_S_OUT_OF_MEMORY;

1 0

Nikolay Sivov : rpcrt4: Implement MesBufferHandleReset().
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: d240fdff18704298fd76f37d09a2ec704ab0addf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d240fdff18704298fd76f37d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 22:49:07 2015 +0300 rpcrt4: Implement MesBufferHandleReset(). --- dlls/rpcrt4/ndr_es.c | 34 ++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 22 ++++++++++++++++++++++ include/midles.h | 3 ++- 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 73bd867..e3cd48a 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -124,6 +124,40 @@ RPC_STATUS WINAPI MesIncrementalHandleReset( } /*********************************************************************** + * MesBufferHandleReset [RPCRT4.@] + */ +RPC_STATUS WINAPI MesBufferHandleReset(handle_t Handle, ULONG HandleStyle, + MIDL_ES_CODE Operation, char **Buffer, ULONG BufferSize, ULONG *EncodedSize) +{ + MIDL_ES_MESSAGE *pEsMsg = (MIDL_ES_MESSAGE *)Handle; + + TRACE("(%p, %u, %d, %p, %u, %p)\n", Handle, HandleStyle, Operation, Buffer, + BufferSize, EncodedSize); + + if (!Handle || !Buffer || !EncodedSize) + return RPC_S_INVALID_ARG; + + if (Operation != MES_ENCODE && Operation != MES_DECODE && Operation != MES_ENCODE_NDR64) + return RPC_S_INVALID_ARG; + + if (HandleStyle != MES_FIXED_BUFFER_HANDLE && HandleStyle != MES_DYNAMIC_BUFFER_HANDLE) + return RPC_S_INVALID_ARG; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = Operation; + pEsMsg->HandleStyle = HandleStyle; + if (HandleStyle == MES_FIXED_BUFFER_HANDLE) + pEsMsg->Buffer = (unsigned char*)*Buffer; + else + pEsMsg->pDynBuffer = (unsigned char**)Buffer; + pEsMsg->BufferSize = BufferSize; + pEsMsg->pEncodedSize = EncodedSize; + + return RPC_S_OK; +} + +/*********************************************************************** * MesHandleFree [RPCRT4.@] */ RPC_STATUS WINAPI MesHandleFree(handle_t Handle) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 378b277..c42fd8b 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -96,7 +96,7 @@ @ stub I_UuidCreate @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen -@ stub MesBufferHandleReset +@ stdcall MesBufferHandleReset(ptr long long ptr long ptr) @ stdcall MesDecodeBufferHandleCreate(ptr long ptr) @ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) @ stdcall MesEncodeDynBufferHandleCreate(ptr ptr ptr) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index fd1cbbb..315a452 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2437,6 +2437,28 @@ if (status == RPC_S_OK) status = MesEncodeFixedBufferHandleCreate(buffer, 32, &encoded_size, &handle); ok(status == RPC_S_OK, "got %d\n", status); + status = MesBufferHandleReset(NULL, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + &buffer, 32, &encoded_size); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + /* convert to dynamic buffer handle */ + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + &buffer, 32, &encoded_size); + ok(status == RPC_S_OK, "got %d\n", status); + + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + NULL, 32, &encoded_size); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + &buffer, 32, NULL); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + /* invalid handle type */ + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE+1, MES_ENCODE, + &buffer, 32, &encoded_size); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + status = MesHandleFree(handle); ok(status == RPC_S_OK, "got %d\n", status); } diff --git a/include/midles.h b/include/midles.h index 99b2eff..4cf3ddc 100644 --- a/include/midles.h +++ b/include/midles.h @@ -30,7 +30,8 @@ extern "C" { typedef enum { MES_ENCODE, - MES_DECODE + MES_DECODE, + MES_ENCODE_NDR64 } MIDL_ES_CODE; typedef enum

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
78
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 March 2015