January 2006 - Wine-Commits

James Hawkins : cabinet: Store the cab file handle before extracting files so we can
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: d57c20ac95534839a247577e470f5bb291f3da95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d57c20ac95534839a247577… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 9 20:23:15 2006 +0100 cabinet: Store the cab file handle before extracting files so we can close the cab file even if no files are extracted. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 1491712..20d00fd 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2370,6 +2370,7 @@ BOOL __cdecl FDICopy( CAB(setID) = fdici.setID; CAB(iCabinet) = fdici.iCabinet; + CAB(cabhf) = cabhf; /* read folders */ for (i = 0; i < fdici.cFolders; i++) { @@ -2554,7 +2555,6 @@ BOOL __cdecl FDICopy( /* set up decomp_state */ CAB(hfdi) = hfdi; CAB(filehf) = filehf; - CAB(cabhf) = cabhf; /* Was there a change of folder? Compression type? Did we somehow go backwards? */ if ((ct1 != ct2) || (CAB(current) != fol) || (file->offset < CAB(offset))) {

1 0

Saulius Krasuckas : include: Add missing color space constants.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 82dc96e5797a8406efe17fc69a6b14273095e978 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82dc96e5797a8406efe17fc… Author: Saulius Krasuckas <saulius.krasuckas(a)gmail.org> Date: Mon Jan 9 18:42:00 2006 +0100 include: Add missing color space constants. --- include/icm.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/icm.h b/include/icm.h index b3dd620..9704f45 100644 --- a/include/icm.h +++ b/include/icm.h @@ -398,6 +398,13 @@ BOOL WINAPI UnregisterCMMW(PCWSTR, #define SPACE_HLS 0x484C5320 /* 'HLS ' */ #define SPACE_CMYK 0x434D594B /* 'CMYK' */ #define SPACE_CMY 0x434D5920 /* 'CMY ' */ +#define SPACE_2_CHANNEL 0x32434c52 /* '2CLR' */ +#define SPACE_3_CHANNEL 0x33434c52 /* '3CLR' */ +#define SPACE_4_CHANNEL 0x34434c52 /* '4CLR' */ +#define SPACE_5_CHANNEL 0x35434c52 /* '5CLR' */ +#define SPACE_6_CHANNEL 0x36434c52 /* '6CLR' */ +#define SPACE_7_CHANNEL 0x37434c52 /* '7CLR' */ +#define SPACE_8_CHANNEL 0x38434c52 /* '8CLR' */ #ifdef __cplusplus }

1 0

Phil Krylov : comctl32: Fix rebar autosize behaviour.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: a05bfbfb86cb9d5d81fdbbfef02f5dd11e1f1a53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a05bfbfb86cb9d5d81fdbbf… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Mon Jan 9 18:41:45 2006 +0100 comctl32: Fix rebar autosize behaviour. Allow autoresizing rebar by PostMessage(hwndRebar, WM_SIZE, 0, 0) like native does, taking as few rows as possible and using the parent window client area size for the other dimension (width for horizontal rebars or height for vertical ones). --- dlls/comctl32/rebar.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 468fe24..81633d6 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1492,10 +1492,11 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPREC cxsep = (cntonrow == 0) ? 0 : SEP_WIDTH; cx = lpBand->lcx; + /* In native, 0 as one of the coordinates means no limit */ if (infoPtr->dwStyle & CCS_VERT) - dobreak = (y + cx + cxsep > adjcy); + dobreak = (adjcy && (y + cx + cxsep > adjcy)); else - dobreak = (x + cx + cxsep > adjcx); + dobreak = (adjcx && (x + cx + cxsep > adjcx)); /* This is the check for whether we need to start a new row */ if ( ( (lpBand->fStyle & RBBS_BREAK) && (i != 0) ) || @@ -1537,14 +1538,14 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPREC /* if boundary rect specified then limit mcy */ if (lpRect) { if (infoPtr->dwStyle & CCS_VERT) { - if (x+mcy > adjcx) { + if (adjcx && (x+mcy > adjcx)) { mcy = adjcx - x; TRACE("P1 row %u limiting mcy=%d, adjcx=%d, x=%d\n", i, mcy, adjcx, x); } } else { - if (y+mcy > adjcy) { + if (adjcy && (y+mcy > adjcy)) { mcy = adjcy - y; TRACE("P1 row %u limiting mcy=%d, adjcy=%d, y=%d\n", i, mcy, adjcy, y); @@ -1656,8 +1657,9 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPREC /* ******* Start Phase 2 - split rows till adjustment height full ******* */ /* assumes that the following variables contain: */ - /* y/x current height/width of all rows */ - if (lpRect) { + /* y/x current height/width of all rows */ + /* adjcy/adjcx adjustment height/width or 0 (as small as possible) */ + if (lpRect && ((infoPtr->dwStyle & CCS_VERT) ? adjcx : adjcy)) { INT i, prev_rh, new_rh, adj_rh, prev_idx, current_idx; REBAR_BAND *prev, *current, *walk; UINT j; @@ -4501,9 +4503,14 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM if ((lParam == 0) && (rcClient.right + rcClient.bottom != 0) && (infoPtr->dwStyle & RBS_AUTOSIZE)) { /* on a WM_SIZE to zero and current client not zero and AUTOSIZE */ - /* native seems to use the current client rect for the size */ + /* native seems to use the current parent width for the size */ infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n", + GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient); + if (infoPtr->dwStyle & CCS_VERT) + rcClient.right = 0; + else + rcClient.bottom = 0; + TRACE("sizing rebar to parent (%ld,%ld) size is zero but AUTOSIZE set\n", rcClient.right, rcClient.bottom); } else {

1 0

Phil Krylov : user: Fix dropdown combo creation when there is no space for an edit control.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: a2f883484f11f291d965ba543ec03a9626db943a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2f883484f11f291d965ba5… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Mon Jan 9 18:41:33 2006 +0100 user: Fix dropdown combo creation when there is no space for an edit control. --- dlls/user/combo.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user/combo.c b/dlls/user/combo.c index 4fab7f3..12d3121 100644 --- a/dlls/user/combo.c +++ b/dlls/user/combo.c @@ -435,6 +435,10 @@ static void CBCalcPlacement( lprLB->right = lprLB->left + lphc->droppedWidth; } + /* don't allow negative window width */ + if (lprEdit->right < lprEdit->left) + lprEdit->right = lprEdit->left; + TRACE("\ttext\t= (%ld,%ld-%ld,%ld)\n", lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom);

1 0

Robert Shearman : ole: Join the MTA if necessary when executing an RPC call.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: b75db2d9dee8bace87ef69ce0d38cf8714d4af7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b75db2d9dee8bace87ef69c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 18:41:19 2006 +0100 ole: Join the MTA if necessary when executing an RPC call. Join the MTA if necessary when executing an RPC call to ensure that it is executing with a valid apartment and won't fail for certain COM calls. --- dlls/ole32/compobj.c | 6 ++++++ dlls/ole32/compobj_private.h | 1 + dlls/ole32/rpc.c | 13 +++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d28728e..6f33091 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -422,6 +422,12 @@ static LRESULT CALLBACK apartment_wndpro } } +void apartment_joinmta(void) +{ + apartment_addref(MTA); + COM_CurrentInfo()->apt = MTA; +} + /***************************************************************************** * This section contains OpenDllList implemantation */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 14a33b7..c7a1069 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -228,6 +228,7 @@ static inline HRESULT apartment_getoxid( *oxid = apt->oxid; return S_OK; } +void apartment_joinmta(void); /* DCOM messages used by the apartment window (not compatible with native) */ diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 09fb902..ba8ad10 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -503,7 +503,20 @@ static void __RPC_STUB dispatch_rpc(RPC_ CloseHandle(params->handle); } else + { + BOOL joined = FALSE; + if (!COM_CurrentInfo()->apt) + { + apartment_joinmta(); + joined = TRUE; + } RPC_ExecuteCall(params); + if (joined) + { + apartment_release(COM_CurrentInfo()->apt); + COM_CurrentInfo()->apt = NULL; + } + } HeapFree(GetProcessHeap(), 0, params);

1 0

Robert Shearman : ole: Prefer services over servers.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 1eda42ccaca043af29c5e474bc31e99b7c1d4f1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1eda42ccaca043af29c5e47… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 18:40:42 2006 +0100 ole: Prefer services over servers. Attempt to start as a local service before attempting to start as a local server for the CLSCTX_LOCAL_SERVER case. --- dlls/ole32/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c57bab5..09fb902 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -797,8 +797,8 @@ HRESULT RPC_GetLocalClassObject(REFCLSID hPipe = CreateFileW(pipefn, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (hPipe == INVALID_HANDLE_VALUE) { if (tries == 1) { - if ( (hres = create_server(rclsid)) && - (hres = create_local_service(rclsid)) ) + if ( (hres = create_local_service(rclsid)) && + (hres = create_server(rclsid)) ) return hres; Sleep(1000); } else {

1 0

Robert Shearman : ole: Add some tests for CLSIDFromString.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: e0605afdf6c47e605a966931976036f7693259ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0605afdf6c47e605a96693… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 18:40:27 2006 +0100 ole: Add some tests for CLSIDFromString. --- dlls/ole32/tests/compobj.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index a775952..b4a5cb4 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -32,6 +32,16 @@ static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } }; static const WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0}; +static const WCHAR wszCLSID_CDeviceMoniker[] = +{ + '{', + '4','3','1','5','d','4','3','7','-', + '5','b','8','c','-', + '1','1','d','0','-', + 'b','d','3','b','-', + '0','0','a','0','c','9','1','1','c','e','8','6', + '}',0 +}; static void test_ProgIDFromCLSID(void) { @@ -51,10 +61,23 @@ static void test_CLSIDFromProgID(void) HRESULT hr = CLSIDFromProgID(devicedotone, &clsid); ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08lx\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + + hr = CLSIDFromString((LPOLESTR)devicedotone, &clsid); + ok_ole_success(hr, "CLSIDFromString"); + ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); +} + +static void test_CLSIDFromString(void) +{ + CLSID clsid; + HRESULT hr = CLSIDFromString((LPOLESTR)wszCLSID_CDeviceMoniker, &clsid); + ok_ole_success(hr, "CLSIDFromString"); + ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); } START_TEST(compobj) { test_ProgIDFromCLSID(); test_CLSIDFromProgID(); + test_CLSIDFromString(); }

1 0

Robert Shearman : ole: Remove __CLSIDFromStringA.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: cc4669cc5f5413b4e7ffd079f9d0c6d0463029ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc4669cc5f5413b4e7ffd07… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 18:40:17 2006 +0100 ole: Remove __CLSIDFromStringA. Move the ANSI implementation of CLSIDFromString to ole16.c and change CLSIDFromString to only deal with Unicode strings. --- dlls/ole32/compobj.c | 23 ++++------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/ole16.c | 58 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b2cf72b..d28728e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -795,31 +795,23 @@ HRESULT WINAPI CoCreateGuid(GUID *pguid) * S_OK on success * CO_E_CLASSSTRING if idstr is not a valid CLSID * - * BUGS - * - * In Windows, if idstr is not a valid CLSID string then it gets - * treated as a ProgID. Wine currently doesn't do this. If idstr is - * NULL it's treated as an all-zero GUID. - * * SEE ALSO * StringFromCLSID */ -HRESULT WINAPI __CLSIDFromStringA(LPCSTR idstr, CLSID *id) +static HRESULT WINAPI __CLSIDFromString(LPCWSTR s, CLSID *id) { - const BYTE *s; int i; BYTE table[256]; - if (!idstr) { + if (!s) { memset( id, 0, sizeof (CLSID) ); return S_OK; } /* validate the CLSID string */ - if (strlen(idstr) != 38) + if (strlenW(s) != 38) return CO_E_CLASSSTRING; - s = (const BYTE *) idstr; if ((s[0]!='{') || (s[9]!='-') || (s[14]!='-') || (s[19]!='-') || (s[24]!='-') || (s[37]!='}')) return CO_E_CLASSSTRING; @@ -831,7 +823,7 @@ HRESULT WINAPI __CLSIDFromStringA(LPCSTR return CO_E_CLASSSTRING; } - TRACE("%s -> %p\n", s, id); + TRACE("%s -> %p\n", debugstr_w(s), id); /* quick lookup table */ memset(table, 0, 256); @@ -868,14 +860,9 @@ HRESULT WINAPI __CLSIDFromStringA(LPCSTR HRESULT WINAPI CLSIDFromString(LPOLESTR idstr, CLSID *id ) { - char xid[40]; HRESULT ret; - if (!WideCharToMultiByte( CP_ACP, 0, idstr, -1, xid, sizeof(xid), NULL, NULL )) - return CO_E_CLASSSTRING; - - - ret = __CLSIDFromStringA(xid,id); + ret = __CLSIDFromString(idstr, id); if(ret != S_OK) { /* It appears a ProgID is also valid */ ret = CLSIDFromProgID(idstr, id); } diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 790042e..14a33b7 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -169,7 +169,6 @@ extern void* StdGlobalInterfaceTableInst /* FIXME: these shouldn't be needed, except for 16-bit functions */ extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr); -HRESULT WINAPI __CLSIDFromStringA(LPCSTR idstr, CLSID *id); HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key); HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 117d484..dd90cfd 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -284,8 +284,62 @@ HRESULT WINAPI CLSIDFromString16( LPCOLESTR16 idstr, /* [in] string representation of guid */ CLSID *id) /* [out] GUID converted from string */ { + const BYTE *s; + int i; + BYTE table[256]; - return __CLSIDFromStringA(idstr,id); + if (!idstr) { + memset( id, 0, sizeof (CLSID) ); + return S_OK; + } + + /* validate the CLSID string */ + if (strlen(idstr) != 38) + return CO_E_CLASSSTRING; + + s = (const BYTE *) idstr; + if ((s[0]!='{') || (s[9]!='-') || (s[14]!='-') || (s[19]!='-') || (s[24]!='-') || (s[37]!='}')) + return CO_E_CLASSSTRING; + + for (i=1; i<37; i++) { + if ((i == 9)||(i == 14)||(i == 19)||(i == 24)) continue; + if (!(((s[i] >= '0') && (s[i] <= '9')) || + ((s[i] >= 'a') && (s[i] <= 'f')) || + ((s[i] >= 'A') && (s[i] <= 'F')))) + return CO_E_CLASSSTRING; + } + + TRACE("%s -> %p\n", s, id); + + /* quick lookup table */ + memset(table, 0, 256); + + for (i = 0; i < 10; i++) { + table['0' + i] = i; + } + for (i = 0; i < 6; i++) { + table['A' + i] = i+10; + table['a' + i] = i+10; + } + + /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ + + id->Data1 = (table[s[1]] << 28 | table[s[2]] << 24 | table[s[3]] << 20 | table[s[4]] << 16 | + table[s[5]] << 12 | table[s[6]] << 8 | table[s[7]] << 4 | table[s[8]]); + id->Data2 = table[s[10]] << 12 | table[s[11]] << 8 | table[s[12]] << 4 | table[s[13]]; + id->Data3 = table[s[15]] << 12 | table[s[16]] << 8 | table[s[17]] << 4 | table[s[18]]; + + /* these are just sequential bytes */ + id->Data4[0] = table[s[20]] << 4 | table[s[21]]; + id->Data4[1] = table[s[22]] << 4 | table[s[23]]; + id->Data4[2] = table[s[25]] << 4 | table[s[26]]; + id->Data4[3] = table[s[27]] << 4 | table[s[28]]; + id->Data4[4] = table[s[29]] << 4 | table[s[30]]; + id->Data4[5] = table[s[31]] << 4 | table[s[32]]; + id->Data4[6] = table[s[33]] << 4 | table[s[34]]; + id->Data4[7] = table[s[35]] << 4 | table[s[36]]; + + return S_OK; } /****************************************************************************** @@ -556,7 +610,7 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLES return CO_E_CLASSSTRING; } RegCloseKey(xhkey); - return __CLSIDFromStringA(buf2,riid); + return CLSIDFromString16(buf2,riid); } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Improve ReadVariance.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 1926b6da63e939fb0e21fa2183e1dc5f4e755245 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1926b6da63e939fb0e21fa2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 17:21:01 2006 +0100 rpcrt4: Improve ReadVariance. Extend ReadVariance to read the offset as well as the actual count, since these always come in pairs. Handle the variance not being present in ReadVariance and always call it from the unmarshalling functions to simplify the code there and also to fix a bug where the format pointer wasn't advanced properly for complex arrays (introduced in the previous patch when implementing variance). --- dlls/rpcrt4/ndr_marshall.c | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index def590d..026f517 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -315,9 +315,21 @@ PFORMAT_STRING ReadConformance(MIDL_STUB static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { + if (!IsConformanceOrVariancePresent(pFormat)) + { + pStubMsg->Offset = 0; + pStubMsg->ActualCount = pStubMsg->MaxCount; + goto done; + } + + pStubMsg->Offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + TRACE("offset is %ld\n", pStubMsg->Offset); pStubMsg->ActualCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; - TRACE("unmarshalled variance is %ld\n", pStubMsg->ActualCount); + TRACE("variance is %ld\n", pStubMsg->ActualCount); + +done: return pFormat+4; } @@ -2008,7 +2020,6 @@ unsigned char* WINAPI NdrConformantVaryi PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { - DWORD offset; DWORD esize = *(const WORD*)(pFormat+2); TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2020,13 +2031,11 @@ unsigned char* WINAPI NdrConformantVaryi return NULL; } pFormat = ReadConformance(pStubMsg, pFormat); - offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; pFormat = ReadVariance(pStubMsg, pFormat); if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); - memcpy(*ppMemory + offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); + memcpy(*ppMemory + pStubMsg->Offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); pStubMsg->Buffer += pStubMsg->ActualCount * esize; EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2141,7 +2150,7 @@ unsigned char * WINAPI NdrComplexArrayUn PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - ULONG offset, count, esize; + ULONG count, esize; unsigned char *pMemory; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2156,19 +2165,7 @@ unsigned char * WINAPI NdrComplexArrayUn pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - if (IsConformanceOrVariancePresent(pFormat)) - { - offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; - pFormat = ReadVariance(pStubMsg, pFormat); - TRACE("variance = %ld\n", pStubMsg->ActualCount); - } - else - { - offset = 0; - pStubMsg->ActualCount = pStubMsg->MaxCount; - } + pFormat = ReadVariance(pStubMsg, pFormat); esize = ComplexStructSize(pStubMsg, pFormat);

1 0

Robert Shearman : rpcrt4: Validate complex array format string.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 2e875d5d351b992ab3cab42420f2c4db69cfca00 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e875d5d351b992ab3cab42… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 17:20:19 2006 +0100 rpcrt4: Validate complex array format string. Verify that the format string being passed into the complex array functions is a complex array one. --- dlls/rpcrt4/ndr_marshall.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0df9bed..def590d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2098,6 +2098,13 @@ unsigned char * WINAPI NdrComplexArrayMa TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + if (pFormat[0] != RPC_FC_BOGUS_ARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + def = *(const WORD*)&pFormat[2]; pFormat += 4; @@ -2139,6 +2146,13 @@ unsigned char * WINAPI NdrComplexArrayUn TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + if (pFormat[0] != RPC_FC_BOGUS_ARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); @@ -2180,6 +2194,13 @@ void WINAPI NdrComplexArrayBufferSize(PM TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + if (pFormat[0] != RPC_FC_BOGUS_ARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + def = *(const WORD*)&pFormat[2]; pFormat += 4; @@ -2207,6 +2228,13 @@ unsigned long WINAPI NdrComplexArrayMemo DWORD size = 0; FIXME("(%p,%p): stub\n", pStubMsg, pFormat); + if (pFormat[0] != RPC_FC_BOGUS_ARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return 0; + } + pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); @@ -2229,6 +2257,13 @@ void WINAPI NdrComplexArrayFree(PMIDL_ST TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + if (pFormat[0] != RPC_FC_BOGUS_ARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + def = *(const WORD*)&pFormat[2]; pFormat += 4;

1 0