June 2006 - Wine-commits - list.winehq.org

Mike McCormack : msi: Add some test cases for "SELECT ... WHERE condition".
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: bbbcc2a1be3ed3e3a498f07cfbd707186114007a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbbcc2a1be3ed3e3a498f07… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 11 09:51:59 2006 +0900 msi: Add some test cases for "SELECT ... WHERE condition". --- dlls/msi/tests/db.c | 76 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2ae69a4..44eecb1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -48,7 +48,29 @@ static void test_msidatabase(void) ok( res == TRUE, "Failed to delete database\n" ); } -static void test_msiinsert(void) +static UINT do_query(MSIHANDLE hdb, const char *query, MSIHANDLE *phrec) +{ + MSIHANDLE hview = 0; + UINT r, ret; + + /* open a select query */ + r = MsiDatabaseOpenView(hdb, query, &hview); + if (r != ERROR_SUCCESS) + return r; + r = MsiViewExecute(hview, 0); + if (r != ERROR_SUCCESS) + return r; + ret = MsiViewFetch(hview, phrec); + r = MsiViewClose(hview); + if (r != ERROR_SUCCESS) + return r; + r = MsiCloseHandle(hview); + if (r != ERROR_SUCCESS) + return r; + return ret; +} + +void test_msiinsert(void) { MSIHANDLE hdb = 0, hview = 0, hrec = 0; UINT r; @@ -87,18 +109,21 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); - query = "SELECT * FROM `phone`"; - r = MsiDatabaseOpenView(hdb, query, &hview); - ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); - r = MsiViewExecute(hview, 0); - ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); - r = MsiViewFetch(hview, &hrec); + query = "SELECT * FROM `phone` WHERE `id` = 1"; + r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); /* check the record contains what we put in it */ r = MsiRecordGetFieldCount(hrec); ok(r == 3, "record count wrong\n"); + todo_wine { + r = MsiRecordIsNull(hrec, 0); + ok(r == FALSE, "field 0 not null\n"); + r = MsiRecordGetInteger(hrec, 0); + ok(r == 0x138080, "field 0 contents wrong\n"); + } + r = MsiRecordGetInteger(hrec, 1); ok(r == 1, "field 1 contents wrong\n"); sz = sizeof buf; @@ -109,14 +134,39 @@ static void test_msiinsert(void) r = MsiRecordGetString(hrec, 3, buf, &sz); ok(r == ERROR_SUCCESS, "field 3 content fetch failed\n"); ok(!strcmp(buf,"8675309"), "field 3 content incorrect\n"); - - r = MsiViewClose(hview); - ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); - r = MsiCloseHandle(hview); + + r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* open a select query */ + hrec = 100; + query = "SELECT * FROM `phone` WHERE `id` >= 10"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch failed\n"); + ok(hrec == 0, "hrec should be null\n"); + r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM `phone` WHERE `id` < 0"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch failed\n"); + + query = "SELECT * FROM `phone` WHERE `id` <= 0"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch failed\n"); + + query = "SELECT * FROM `phone` WHERE `id` <> 1"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch failed\n"); + + query = "SELECT * FROM `phone` WHERE `id` > 10"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch failed\n"); + + r = MsiViewFetch(0, NULL); + ok(r == ERROR_INVALID_PARAMETER, "MsiViewFetch failed\n"); + r = MsiDatabaseCommit(hdb); ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); @@ -141,7 +191,7 @@ static void test_msidecomposedesc(void) hmod = GetModuleHandle("msi.dll"); if (!hmod) return; - pMsiDecomposeDescriptorA = (fnMsiDecomposeDescriptorA) + pMsiDecomposeDescriptorA = (fnMsiDecomposeDescriptorA) GetProcAddress(hmod, "MsiDecomposeDescriptorA"); if (!pMsiDecomposeDescriptorA) return; @@ -623,7 +673,7 @@ static UINT get_columns_table_type(MSIHA if (r == field) type = MsiRecordGetInteger( rec, 4 ); MsiCloseHandle( rec ); - } + } MsiViewClose(hview); }

1 0

Mike McCormack : msi: Freeing the zero handle always succeeds.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: a21f9e5587b2fda8b2e458b5911a32f361e106c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a21f9e5587b2fda8b2e458b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 11 09:51:42 2006 +0900 msi: Freeing the zero handle always succeeds. --- dlls/msi/handle.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index ae951be..1cd82b3 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -188,6 +188,9 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE han TRACE("%lx\n",handle); + if (!handle) + return ERROR_SUCCESS; + EnterCriticalSection( &MSI_handle_cs ); info = msihandle2msiinfo(handle, 0);

1 0

Mike McCormack : msi: Always initialize MsiViewFetch' s returned record to zero.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: 15d302c313b175d068bbd8c7c04c60c2938ef772 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15d302c313b175d068bbd8c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 11 09:51:29 2006 +0900 msi: Always initialize MsiViewFetch's returned record to zero. --- dlls/msi/msiquery.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index da33acc..06c6bf9 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -354,6 +354,10 @@ UINT WINAPI MsiViewFetch(MSIHANDLE hView TRACE("%ld %p\n", hView, record); + if( !record ) + return ERROR_INVALID_PARAMETER; + *record = 0; + query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); if( !query ) return ERROR_INVALID_HANDLE;

1 0

H. Verbeet : d3d9: Make some test functions static.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: 3a91a4a2745dfadec315246a6e2814490bd2726d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a91a4a2745dfadec315246… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jun 10 23:48:45 2006 +0200 d3d9: Make some test functions static. --- dlls/d3d9/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5859d1a..0984aab 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -64,7 +64,7 @@ static void check_mipmap_levels( if (texture) IUnknown_Release( texture ); } -void test_mipmap_levels(void) +static void test_mipmap_levels(void) { HRESULT hr; @@ -103,7 +103,7 @@ void test_mipmap_levels(void) DestroyWindow( hwnd ); } -void test_swapchain(void) +static void test_swapchain(void) { HRESULT hr; HWND hwnd = NULL; @@ -247,7 +247,7 @@ void test_swapchain(void) DestroyWindow( hwnd ); } -void test_refcount(void) +static void test_refcount(void) { HRESULT hr; HWND hwnd = NULL;

1 0

H. Verbeet : d3d8: Make some test functions static.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: 142a62be74b1d0d106d59d93d4b2c4e34d03f3b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=142a62be74b1d0d106d59d9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jun 10 23:48:36 2006 +0200 d3d8: Make some test functions static. --- dlls/d3d8/tests/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5a5ac79..89986f8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -37,7 +37,7 @@ #define CHECK_CALL(r,c,d,rc) \ trace("%s failed: %s\n", c, DXGetErrorString8(r)); \ } -void test_swapchain(void) +static void test_swapchain(void) { HRESULT hr; HWND hwnd = NULL; @@ -153,7 +153,7 @@ void test_swapchain(void) DestroyWindow( hwnd ); } -void test_refcount(void) +static void test_refcount(void) { HRESULT hr; HWND hwnd = NULL;

1 0

Dmitry Timoshkov : msvcrt: Print exception code in hex.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: a87a153587f4bfc3ca43c08823c26ae2e51ad091 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a87a153587f4bfc3ca43c08… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jun 11 00:19:33 2006 +0900 msvcrt: Print exception code in hex. --- dlls/msvcrt/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index a63645f..964ecda 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -539,7 +539,7 @@ MSVCRT___sighandler_t MSVCRT_signal(int */ int _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) { - TRACE("(%ld,%p)\n", ex, ptr); + TRACE("(%08lx,%p)\n", ex, ptr); /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ return msvcrt_exception_filter(ptr); }

1 0

Jason Green : wined3d: Map D3DSIO_DEF to it' s GLSL generating function for vertex shaders.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: d822496dee85eeb14cd7bad49cd8d797ac5b5eb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d822496dee85eeb14cd7bad… Author: Jason Green <jave27(a)gmail.com> Date: Sat Jun 10 11:09:01 2006 -0400 wined3d: Map D3DSIO_DEF to it's GLSL generating function for vertex shaders. --- dlls/wined3d/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e679ae2..e7868dc 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -538,7 +538,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader {D3DSIO_DCL, "dcl", NULL, 2, vshader_dcl, vshader_hw_dcl, NULL, 0, 0}, /* Constant definitions */ - {D3DSIO_DEF, "def", NULL, 5, vshader_def, shader_hw_def, NULL, 0, 0}, + {D3DSIO_DEF, "def", NULL, 5, vshader_def, shader_hw_def, shader_glsl_def, 0, 0}, {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 2, vshader_defb, NULL, NULL, 0, 0}, {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 5, vshader_defi, NULL, NULL, 0, 0},

1 0

Robert Shearman : rpcrt4: Add an exception handler for CStdStubBuffer_Invoke.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: 1c04d9ab20c2627b7af8693f17f3fe3a8ae2881d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c04d9ab20c2627b7af8693… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 10 12:33:40 2006 +0100 rpcrt4: Add an exception handler for CStdStubBuffer_Invoke. This is needed because IRpcStubBuffer::Invoke should not allow RPC exceptions to be passed to the caller. --- dlls/rpcrt4/cstub.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index efb8d06..0b35579 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -25,12 +25,13 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "excpt.h" #include "objbase.h" - #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/exception.h" #include "cpsf.h" @@ -38,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define STUB_HEADER(This) (((CInterfaceStubHeader*)((This)->lpVtbl))[-1]) +static WINE_EXCEPTION_FILTER(stub_filter) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_EXECUTE_HANDLER; +} + HRESULT WINAPI CStdStubBuffer_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, @@ -142,13 +150,29 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPR { CStdStubBuffer *This = (CStdStubBuffer *)iface; DWORD dwPhase = STUB_UNMARSHAL; + HRESULT hr = S_OK; + TRACE("(%p)->Invoke(%p,%p)\n",This,pMsg,pChannel); - if (STUB_HEADER(This).pDispatchTable) - STUB_HEADER(This).pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); - else /* pure interpreted */ - NdrStubCall2(iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); - return S_OK; + __TRY + { + if (STUB_HEADER(This).pDispatchTable) + STUB_HEADER(This).pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); + else /* pure interpreted */ + NdrStubCall2(iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); + } + __EXCEPT(stub_filter) + { + DWORD dwExceptionCode = GetExceptionCode(); + WARN("a stub call failed with exception 0x%08lx (%ld)\n", dwExceptionCode, dwExceptionCode); + if (FAILED(dwExceptionCode)) + hr = dwExceptionCode; + else + hr = HRESULT_FROM_WIN32(dwExceptionCode); + } + __ENDTRY + + return hr; } LPRPCSTUBBUFFER WINAPI CStdStubBuffer_IsIIDSupported(LPRPCSTUBBUFFER iface,

1 0

Robert Shearman : rpcrt4: Pass in a maximum variance value to ReadVariance to allow us
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: 8dea3c2aa866bb3f5e24d12b43712c524e8b8fa8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8dea3c2aa866bb3f5e24d12… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 10 12:32:47 2006 +0100 rpcrt4: Pass in a maximum variance value to ReadVariance to allow us to validate the conformance values being read from the wire. --- dlls/rpcrt4/ndr_marshall.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 58bcd25..50d3871 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -332,7 +332,7 @@ static PFORMAT_STRING ReadConformance(MI return pFormat+4; } -static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, ULONG MaxValue) { if (pFormat && !IsConformanceOrVariancePresent(pFormat)) { @@ -349,6 +349,15 @@ static inline PFORMAT_STRING ReadVarianc pStubMsg->Buffer += 4; TRACE("variance is %ld\n", pStubMsg->ActualCount); + if ((pStubMsg->ActualCount > MaxValue) || + (pStubMsg->ActualCount + pStubMsg->Offset > MaxValue)) + { + ERR("invalid array bound(s): ActualCount = %ld, Offset = %ld, MaxValue = %ld\n", + pStubMsg->ActualCount, pStubMsg->Offset, MaxValue); + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + done: if (pStubMsg->fHasNewCorrDesc) return pFormat+6; @@ -675,7 +684,7 @@ unsigned char *WINAPI NdrConformantStrin assert(pFormat && ppMemory && pStubMsg); ReadConformance(pStubMsg, NULL); - ReadVariance(pStubMsg, NULL); + ReadVariance(pStubMsg, NULL, pStubMsg->MaxCount); if (*pFormat == RPC_FC_C_CSTRING) esize = 1; else if (*pFormat == RPC_FC_C_WSTRING) esize = 2; @@ -2365,11 +2374,12 @@ unsigned char* WINAPI NdrConformantVaryi } pFormat = ReadConformance(pStubMsg, pFormat+4); - pFormat = ReadVariance(pStubMsg, pFormat); + pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); ALIGN_POINTER(pStubMsg->Buffer, alignment); bufsize = safe_multiply(esize, pStubMsg->ActualCount); + TRACE("esize = %ld, pStubMsg->MaxCount = %ld, result = %ld\n", esize, pStubMsg->MaxCount, esize * pStubMsg->MaxCount); memsize = safe_multiply(esize, pStubMsg->MaxCount); if (!*ppMemory || fMustAlloc) @@ -2525,7 +2535,7 @@ unsigned char * WINAPI NdrComplexArrayUn pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); - pFormat = ReadVariance(pStubMsg, pFormat); + pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); Buffer = pStubMsg->Buffer; esize = ComplexStructMemorySize(pStubMsg, pFormat); @@ -2618,7 +2628,7 @@ unsigned long WINAPI NdrComplexArrayMemo pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); - pFormat = ReadVariance(pStubMsg, pFormat); + pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); ALIGN_POINTER(pStubMsg->Buffer, alignment); @@ -3199,7 +3209,7 @@ unsigned char * WINAPI NdrConformantVar memcpy(*ppMemory, pStubMsg->Buffer, pCVStructFormat->memory_size); pStubMsg->Buffer += pCVStructFormat->memory_size; - pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat); + pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat, pStubMsg->MaxCount); bufsize = safe_multiply(esize, pStubMsg->ActualCount); @@ -3366,7 +3376,7 @@ unsigned long WINAPI NdrConformantVaryin TRACE("memory_size = %d\n", pCVStructFormat->memory_size); pStubMsg->Buffer += pCVStructFormat->memory_size; - pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat); + pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat, pStubMsg->MaxCount); pStubMsg->Buffer += pCVStructFormat->memory_size + safe_multiply(esize, pStubMsg->ActualCount); pStubMsg->MemorySize += pCVStructFormat->memory_size + safe_multiply(esize, pStubMsg->MaxCount); @@ -3757,13 +3767,7 @@ unsigned char * WINAPI NdrVaryingArrayU esize = *(const WORD*)pFormat; pFormat += sizeof(WORD); - pFormat = ReadVariance(pStubMsg, pFormat); - if ((pStubMsg->ActualCount > elements) || - (pStubMsg->ActualCount + pStubMsg->Offset > elements)) - { - RpcRaiseException(RPC_S_INVALID_BOUND); - return NULL; - } + pFormat = ReadVariance(pStubMsg, pFormat, elements); ALIGN_POINTER(pStubMsg->Buffer, alignment); @@ -3877,13 +3881,7 @@ unsigned long WINAPI NdrVaryingArrayMemo esize = *(const WORD*)pFormat; pFormat += sizeof(WORD); - pFormat = ReadVariance(pStubMsg, pFormat); - if ((pStubMsg->ActualCount > elements) || - (pStubMsg->ActualCount + pStubMsg->Offset > elements)) - { - RpcRaiseException(RPC_S_INVALID_BOUND); - return 0; - } + pFormat = ReadVariance(pStubMsg, pFormat, elements); ALIGN_POINTER(pStubMsg->Buffer, alignment);

1 0

Robert Shearman : rpcrt4: Use safe_mutiply in conformant array functions.
by Alexandre Julliard 12 Jun '06

12 Jun '06

Module: wine Branch: refs/heads/master Commit: 539b48bff444364cf43154aaf6383a3dce42d11e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=539b48bff444364cf43154a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 10 12:33:01 2006 +0100 rpcrt4: Use safe_mutiply in conformant array functions. --- dlls/rpcrt4/ndr_marshall.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 50d3871..2b6e096 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -26,7 +26,7 @@ * - transmit_as/represent as * - Multi-dimensional arrays * - Conversion functions (NdrConvert) - * - Checks for integer overflow when calculating array sizes + * - Checks for integer addition overflow * - Checks for out-of-memory conditions */ @@ -2196,15 +2196,15 @@ unsigned char * WINAPI NdrConformantArra if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); - size = pStubMsg->MaxCount; WriteConformance(pStubMsg); ALIGN_POINTER(pStubMsg->Buffer, alignment); - memcpy(pStubMsg->Buffer, pMemory, size*esize); + size = safe_multiply(esize, pStubMsg->MaxCount); + memcpy(pStubMsg->Buffer, pMemory, size); pStubMsg->BufferMark = pStubMsg->Buffer; - pStubMsg->Buffer += size*esize; + pStubMsg->Buffer += size; EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); @@ -2221,24 +2221,25 @@ unsigned char * WINAPI NdrConformantArra PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - DWORD size = 0, esize = *(const WORD*)(pFormat+2); + DWORD size, esize = *(const WORD*)(pFormat+2); unsigned char alignment = pFormat[1] + 1; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); pFormat = ReadConformance(pStubMsg, pFormat+4); - size = pStubMsg->MaxCount; + + size = safe_multiply(esize, pStubMsg->MaxCount); if (fMustAlloc || !*ppMemory) - *ppMemory = NdrAllocate(pStubMsg, size*esize); + *ppMemory = NdrAllocate(pStubMsg, size); ALIGN_POINTER(pStubMsg->Buffer, alignment); - memcpy(*ppMemory, pStubMsg->Buffer, size*esize); + memcpy(*ppMemory, pStubMsg->Buffer, size); pStubMsg->BufferMark = pStubMsg->Buffer; - pStubMsg->Buffer += size*esize; + pStubMsg->Buffer += size; EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2252,21 +2253,21 @@ void WINAPI NdrConformantArrayBufferSize unsigned char *pMemory, PFORMAT_STRING pFormat) { - DWORD size = 0, esize = *(const WORD*)(pFormat+2); + DWORD size, esize = *(const WORD*)(pFormat+2); unsigned char alignment = pFormat[1] + 1; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); - size = pStubMsg->MaxCount; SizeConformance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, alignment); + size = safe_multiply(esize, pStubMsg->MaxCount); /* conformance value plus array */ - pStubMsg->BufferLength += size*esize; + pStubMsg->BufferLength += size; EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -2284,12 +2285,12 @@ unsigned long WINAPI NdrConformantArrayM if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); pFormat = ReadConformance(pStubMsg, pFormat+4); - size = pStubMsg->MaxCount; - pStubMsg->MemorySize += size*esize; + size = safe_multiply(esize, pStubMsg->MaxCount); + pStubMsg->MemorySize += size; ALIGN_POINTER(pStubMsg->Buffer, alignment); pStubMsg->BufferMark = pStubMsg->Buffer; - pStubMsg->Buffer += size*esize; + pStubMsg->Buffer += size; EmbeddedPointerMemorySize(pStubMsg, pFormat); @@ -2379,7 +2380,6 @@ unsigned char* WINAPI NdrConformantVaryi ALIGN_POINTER(pStubMsg->Buffer, alignment); bufsize = safe_multiply(esize, pStubMsg->ActualCount); - TRACE("esize = %ld, pStubMsg->MaxCount = %ld, result = %ld\n", esize, pStubMsg->MaxCount, esize * pStubMsg->MaxCount); memsize = safe_multiply(esize, pStubMsg->MaxCount); if (!*ppMemory || fMustAlloc)

1 0