winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
854 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Robert Shearman : rpcrt4: Initialise pStubMsg-> MemorySize to zero before calling
by Alexandre Julliard
12 Jun '06
12 Jun '06
Module: wine Branch: refs/heads/master Commit: 35982d72f526a7af90d85889980939de4bc7e239 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=35982d72f526a7af90d8588…
Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 10 12:33:26 2006 +0100 rpcrt4: Initialise pStubMsg->MemorySize to zero before calling ComplexStructMemorySize from NdrComplexArrayUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2b6e096..92c2f7a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2538,6 +2538,7 @@ unsigned char * WINAPI NdrComplexArrayUn pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); Buffer = pStubMsg->Buffer; + pStubMsg->MemorySize = 0; esize = ComplexStructMemorySize(pStubMsg, pFormat); pStubMsg->Buffer = Buffer;
1
0
0
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
0
0
← Newer
1
...
54
55
56
57
58
59
60
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200