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

Troy Rollo : gdi: Fix GetTextExentExPointW to return values consistent with GetTextExtentPointW .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 73c7420c5a48d5810f30ffdca59dc36c806b4bf5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73c7420c5a48d5810f30ffd… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue May 2 13:49:22 2006 +1000 gdi: Fix GetTextExentExPointW to return values consistent with GetTextExtentPointW. --- dlls/gdi/font.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 7d8782a..817f706 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1239,12 +1239,12 @@ BOOL WINAPI GetTextExtentExPointW( HDC h size->cx = size->cy = nFit = extent = 0; for(index = 0; index < count; index++) { - if(!GetTextExtentPoint32W( hdc, str, 1, &tSize )) goto done; + if(!GetTextExtentPoint32W( hdc, str, index + 1, &tSize )) goto done; /* GetTextExtentPoint includes intercharacter spacing. */ /* FIXME - justification needs doing yet. Remember that the base * data will not be in logical coordinates. */ - extent += tSize.cx; + extent = tSize.cx; if( !lpnFit || extent <= maxExt ) /* It is allowed to be equal. */ { @@ -1252,7 +1252,6 @@ BOOL WINAPI GetTextExtentExPointW( HDC h if( alpDx ) alpDx[index] = extent; } if( tSize.cy > size->cy ) size->cy = tSize.cy; - str++; } size->cx = extent; if(lpnFit) *lpnFit = nFit;

1 0

Andrew Ziem : setupapi: Add case sensitivity string table tests.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 3671263108b9a5f230d0eccfc17418d2f9623e79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3671263108b9a5f230d0ecc… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Wed May 3 08:44:04 2006 -0600 setupapi: Add case sensitivity string table tests. --- dlls/setupapi/tests/stringtable.c | 40 +++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index f7a2af0..426c75e 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -19,7 +19,6 @@ */ /* * TODO: - * Add case sensitivity test for StringTableAddString/StringTableLookupString * Add test for StringTableStringFromIdEx */ @@ -48,6 +47,8 @@ #endif HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0}; +static WCHAR String[] = {'S','t','r','i','n','g',0}; +static WCHAR foo[] = {'f','o','o',0}; HANDLE table, table2; /* Handles pointing to our tables */ static void load_it_up(void) @@ -89,10 +90,23 @@ static void test_StringTableInitialize(v static void test_StringTableAddString(void) { - DWORD retval; + DWORD retval, retval2, retval3, retval4; + /* case insensitive */ retval=pStringTableAddString(table,string,0); ok(retval!=-1,"Failed to add string to String Table\n"); + + retval2=pStringTableAddString(table,String,0); + ok(retval2!=-1,"Failed to add String to String Table\n"); + ok(retval=retval2,"string and String have different IDs in String Table\n"); + + retval3=pStringTableAddString(table,foo,0); + ok(retval3!=-1,"Failed to add foo to String Table\n"); + ok(retval3!=retval2,"foo and String share the same ID in String Table\n"); + + /* case sensitive */ + retval4=pStringTableAddString(table,String,ST_CASE_SENSITIVE_COMPARE); + ok(retval!=retval4,"String and string share same ID in Table\n"); } static void test_StringTableDuplicate(void) @@ -105,11 +119,29 @@ static void test_StringTableLookUpString { DWORD retval, retval2; + /* case insensitive */ retval=pStringTableLookUpString(table,string,0); ok(retval!=-1,"Failed find string in String Table 1\n"); - retval2=pStringTableLookUpString(table2,string,0); - ok(retval2!=-1,"Failed find string in String Table 2\n"); + retval=pStringTableLookUpString(table2,string,0); + ok(retval!=-1,"Failed find string in String Table 2\n"); + + retval=pStringTableLookUpString(table,String,0); + ok(retval!=-1,"Failed find String in String Table 1\n"); + + retval=pStringTableLookUpString(table2,String,0); + ok(retval!=-1,"Failed find String in String Table 2\n"); + + retval=pStringTableLookUpString(table,foo,0); + ok(retval!=-1,"Failed find foo in String Table 1\n"); + + retval=pStringTableLookUpString(table2,foo,0); + ok(retval!=-1,"Failed find foo in String Table 2\n"); + + /* case sensitive */ + retval=pStringTableLookUpString(table,string,ST_CASE_SENSITIVE_COMPARE); + retval2=pStringTableLookUpString(table,String,ST_CASE_SENSITIVE_COMPARE); + ok(retval!=retval2,"Lookup of string = String in Table 1\n"); } static void test_StringTableStringFromId(void)

1 0

Huw Davies : oleaut32: Fix BSTR marshaling to be wire compatible with Windows.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 2e8a74d520311e60d70f40fd0af69a57c6d00ab6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e8a74d520311e60d70f40f… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Apr 29 14:40:28 2006 +0100 oleaut32: Fix BSTR marshaling to be wire compatible with Windows. --- dlls/oleaut32/tests/usrmarshal.c | 68 ++++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 81 ++++++++++++++++++++++++-------------- 2 files changed, 120 insertions(+), 29 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index b5ca2fb..5d79315 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -30,6 +30,7 @@ #include "wine/test.h" /* doesn't work on Windows due to needing more of the * MIDL_STUB_MESSAGE structure to be filled out */ #define LPSAFEARRAY_UNMARSHAL_WORKS 0 +#define BSTR_UNMARSHAL_WORKS 0 static void test_marshal_LPSAFEARRAY(void) { @@ -115,11 +116,78 @@ static void test_marshal_LPSAFEARRAY(voi HeapFree(GetProcessHeap(), 0, buffer); } +static void test_marshal_BSTR(void) +{ + unsigned long size; + MIDL_STUB_MESSAGE stubMsg = { 0 }; + USER_MARSHAL_CB umcb = { 0 }; + unsigned char *buffer; + BSTR b, b2; + WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t','1',0}; + DWORD *wireb, len; + + umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + umcb.pReserve = NULL; + umcb.pStubMsg = &stubMsg; + + b = SysAllocString(str); + len = SysStringLen(b); + ok(len == 13, "get %ld\n", len); + + /* BSTRs are DWORD aligned */ + size = BSTR_UserSize(&umcb.Flags, 1, &b); + ok(size == 42, "size %ld\n", size); + + size = BSTR_UserSize(&umcb.Flags, 0, &b); + ok(size == 38, "size %ld\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + BSTR_UserMarshal(&umcb.Flags, buffer, &b); + wireb = (DWORD*)buffer; + + ok(*wireb == len, "wv[0] %08lx\n", *wireb); + wireb++; + ok(*wireb == len * 2, "wv[1] %08lx\n", *wireb); + wireb++; + ok(*wireb == len, "wv[2] %08lx\n", *wireb); + wireb++; + ok(!memcmp(wireb, str, len * 2), "strings differ\n"); + + if (BSTR_UNMARSHAL_WORKS) + { + b2 = NULL; + BSTR_UserUnmarshal(&umcb.Flags, buffer, &b2); + ok(b2 != NULL, "NULL LPSAFEARRAY didn't unmarshal\n"); + ok(!memcmp(b, b2, (len + 1) * 2), "strings differ\n"); + BSTR_UserFree(&umcb.Flags, &b2); + } + + HeapFree(GetProcessHeap(), 0, buffer); + SysFreeString(b); + + b = NULL; + size = BSTR_UserSize(&umcb.Flags, 0, &b); + ok(size == 12, "size %ld\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + BSTR_UserMarshal(&umcb.Flags, buffer, &b); + wireb = (DWORD*)buffer; + ok(*wireb == 0, "wv[0] %08lx\n", *wireb); + wireb++; + ok(*wireb == 0xffffffff, "wv[1] %08lx\n", *wireb); + wireb++; + ok(*wireb == 0, "wv[2] %08lx\n", *wireb); + + HeapFree(GetProcessHeap(), 0, buffer); + +} + START_TEST(usrmarshal) { CoInitialize(NULL); test_marshal_LPSAFEARRAY(); + test_marshal_BSTR(); CoUninitialize(); } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 9140c9e..05aef80 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -140,50 +140,73 @@ void WINAPI CLEANLOCALSTORAGE_UserFree(u /* BSTR */ +typedef struct +{ + DWORD len; /* No. of chars not including trailing '\0' */ + DWORD byte_len; /* len * 2 or 0xffffffff if len == 0 */ + DWORD len2; /* == len */ +} bstr_wire_t; + unsigned long WINAPI BSTR_UserSize(unsigned long *pFlags, unsigned long Start, BSTR *pstr) { - TRACE("(%lx,%ld,%p) => %p\n", *pFlags, Start, pstr, *pstr); - if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); - Start += sizeof(FLAGGED_WORD_BLOB) + sizeof(OLECHAR) * (SysStringLen(*pstr) - 1); - TRACE("returning %ld\n", Start); - return Start; + TRACE("(%lx,%ld,%p) => %p\n", *pFlags, Start, pstr, *pstr); + if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); + ALIGN_LENGTH(Start, 3); + Start += sizeof(bstr_wire_t) + sizeof(OLECHAR) * (SysStringLen(*pstr)); + TRACE("returning %ld\n", Start); + return Start; } unsigned char * WINAPI BSTR_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, BSTR *pstr) { - wireBSTR str = (wireBSTR)Buffer; + bstr_wire_t *header; + TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); - TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); - if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); - str->fFlags = 0; - str->clSize = SysStringLen(*pstr); - if (str->clSize) - memcpy(&str->asData, *pstr, sizeof(OLECHAR) * str->clSize); - return Buffer + sizeof(FLAGGED_WORD_BLOB) + sizeof(OLECHAR) * (str->clSize - 1); + ALIGN_POINTER(Buffer, 3); + header = (bstr_wire_t*)Buffer; + header->len = header->len2 = SysStringLen(*pstr); + if (header->len) + { + header->byte_len = header->len * sizeof(OLECHAR); + memcpy(header + 1, *pstr, header->byte_len); + } + else + header->byte_len = 0xffffffff; /* special case for an empty string */ + + return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len; } unsigned char * WINAPI BSTR_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, BSTR *pstr) { - wireBSTR str = (wireBSTR)Buffer; - TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); - if (str->clSize) { - SysReAllocStringLen(pstr, (OLECHAR*)&str->asData, str->clSize); - } - else if (*pstr) { - SysFreeString(*pstr); - *pstr = NULL; - } - if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); - return Buffer + sizeof(FLAGGED_WORD_BLOB) + sizeof(OLECHAR) * (str->clSize - 1); + bstr_wire_t *header; + TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + + ALIGN_POINTER(Buffer, 3); + header = (bstr_wire_t*)Buffer; + if(header->len != header->len2) + FIXME("len %08lx != len2 %08lx\n", header->len, header->len2); + + if(header->len) + SysReAllocStringLen(pstr, (OLECHAR*)(header + 1), header->len); + else if (*pstr) + { + SysFreeString(*pstr); + *pstr = NULL; + } + + if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); + return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len; } void WINAPI BSTR_UserFree(unsigned long *pFlags, BSTR *pstr) { - TRACE("(%lx,%p) => %p\n", *pFlags, pstr, *pstr); - if (*pstr) { - SysFreeString(*pstr); - *pstr = NULL; - } + TRACE("(%lx,%p) => %p\n", *pFlags, pstr, *pstr); + if (*pstr) + { + SysFreeString(*pstr); + *pstr = NULL; + } } /* VARIANT */

1 0

Huw Davies : oleaut32: Split out the SAFEARRAY and BSTR tests so that they can be used in the upcoming VARIANT tests .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 747f08c8aebf841001bde3de3a69b0e292ed4be1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=747f08c8aebf841001bde3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 12:00:30 2006 +0100 oleaut32: Split out the SAFEARRAY and BSTR tests so that they can be used in the upcoming VARIANT tests. --- dlls/oleaut32/tests/usrmarshal.c | 186 ++++++++++++++++++++++++++++---------- 1 files changed, 138 insertions(+), 48 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 5d79315..9f2db8b 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -32,13 +32,123 @@ #include "wine/test.h" #define LPSAFEARRAY_UNMARSHAL_WORKS 0 #define BSTR_UNMARSHAL_WORKS 0 +static inline SF_TYPE get_union_type(SAFEARRAY *psa) +{ + VARTYPE vt; + HRESULT hr; + + hr = SafeArrayGetVartype(psa, &vt); + if (FAILED(hr)) + return 0; + + if (psa->fFeatures & FADF_HAVEIID) + return SF_HAVEIID; + + switch (vt) + { + case VT_I1: + case VT_UI1: return SF_I1; + case VT_BOOL: + case VT_I2: + case VT_UI2: return SF_I2; + case VT_INT: + case VT_UINT: + case VT_I4: + case VT_UI4: + case VT_R4: return SF_I4; + case VT_DATE: + case VT_CY: + case VT_R8: + case VT_I8: + case VT_UI8: return SF_I8; + case VT_INT_PTR: + case VT_UINT_PTR: return (sizeof(UINT_PTR) == 4 ? SF_I4 : SF_I8); + case VT_BSTR: return SF_BSTR; + case VT_DISPATCH: return SF_DISPATCH; + case VT_VARIANT: return SF_VARIANT; + case VT_UNKNOWN: return SF_UNKNOWN; + /* Note: Return a non-zero size to indicate vt is valid. The actual size + * of a UDT is taken from the result of IRecordInfo_GetSize(). + */ + case VT_RECORD: return SF_RECORD; + default: return SF_ERROR; + } +} + +static ULONG get_cell_count(const SAFEARRAY *psa) +{ + const SAFEARRAYBOUND* psab = psa->rgsabound; + USHORT cCount = psa->cDims; + ULONG ulNumCells = 1; + + while (cCount--) + { + if (!psab->cElements) + return 0; + ulNumCells *= psab->cElements; + psab++; + } + return ulNumCells; +} + +static void check_safearray(void *buffer, LPSAFEARRAY lpsa) +{ + unsigned char *wiresa = buffer; + VARTYPE vt; + SF_TYPE sftype; + ULONG cell_count; + + if(!lpsa) + { + ok(*(DWORD *)wiresa == FALSE, "wiresa + 0x0 should be FALSE instead of 0x%08lx\n", *(DWORD *)wiresa); + return; + } + + SafeArrayGetVartype(lpsa, &vt); + sftype = get_union_type(lpsa); + cell_count = get_cell_count(lpsa); + + ok(*(DWORD *)wiresa == TRUE, "wiresa + 0x0 should be TRUE instead of 0x%08lx\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(DWORD *)wiresa == lpsa->cDims, "wiresa + 0x4 should be lpsa->cDims instead of 0x%08lx\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(WORD *)wiresa == lpsa->cDims, "wiresa + 0x8 should be lpsa->cDims instead of 0x%04x\n", *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(WORD *)wiresa == lpsa->fFeatures, "wiresa + 0xc should be lpsa->fFeatures instead of 0x%08x\n", *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(DWORD *)wiresa == lpsa->cbElements, "wiresa + 0x10 should be lpsa->cbElements instead of 0x%08lx\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(WORD *)wiresa == lpsa->cLocks, "wiresa + 0x16 should be lpsa->cLocks instead of 0x%04x\n", *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(WORD *)wiresa == vt, "wiresa + 0x14 should be %04x instead of 0x%04x\n", vt, *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(DWORD *)wiresa == sftype, "wiresa + 0x18 should be %08lx instead of 0x%08lx\n", (DWORD)sftype, *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(DWORD *)wiresa == cell_count, "wiresa + 0x1c should be %lu instead of %lu\n", cell_count, *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(DWORD_PTR *)wiresa == (DWORD_PTR)lpsa->pvData, "wirestgm + 0x20 should be lpsa->pvData instead of 0x%08lx\n", *(DWORD_PTR *)wiresa); + wiresa += sizeof(DWORD_PTR); + if(sftype == SF_HAVEIID) + { + GUID guid; + SafeArrayGetIID(lpsa, &guid); + ok(IsEqualGUID(&guid, (GUID*)wiresa), "guid mismatch\n"); + wiresa += sizeof(GUID); + } + ok(!memcmp(wiresa, lpsa->rgsabound, sizeof(lpsa->rgsabound[0]) * lpsa->cDims), "bounds mismatch\n"); + wiresa += sizeof(lpsa->rgsabound[0]) * lpsa->cDims; + + ok(*(DWORD *)wiresa == cell_count, "wiresa + 0x2c should be %lu instead of %lu\n", cell_count, *(DWORD*)wiresa); + wiresa += sizeof(DWORD); + /* elements are now pointed to by wiresa */ +} + static void test_marshal_LPSAFEARRAY(void) { unsigned char *buffer; unsigned long size; LPSAFEARRAY lpsa; LPSAFEARRAY lpsa2 = NULL; - unsigned char *wiresa; SAFEARRAYBOUND sab; MIDL_STUB_MESSAGE stubMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; @@ -58,34 +168,8 @@ static void test_marshal_LPSAFEARRAY(voi ok(size == 64, "size should be 64 bytes, not %ld\n", size); buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - wiresa = buffer; - ok(*(DWORD *)wiresa == TRUE, "wiresa + 0x0 should be TRUE instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(DWORD *)wiresa == lpsa->cDims, "wiresa + 0x4 should be lpsa->cDims instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(WORD *)wiresa == lpsa->cDims, "wiresa + 0x8 should be lpsa->cDims instead of 0x%04x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(WORD *)wiresa == lpsa->fFeatures, "wiresa + 0xc should be lpsa->fFeatures instead of 0x%08x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(DWORD *)wiresa == lpsa->cbElements, "wiresa + 0x10 should be lpsa->cbElements instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(WORD *)wiresa == lpsa->cLocks, "wiresa + 0x16 should be lpsa->cLocks instead of 0x%04x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(WORD *)wiresa == VT_I2, "wiresa + 0x14 should be VT_I2 instead of 0x%04x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(DWORD *)wiresa == VT_I2, "wiresa + 0x18 should be VT_I2 instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(DWORD *)wiresa == sab.cElements, "wiresa + 0x1c should be sab.cElements instead of %lu\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(DWORD_PTR *)wiresa == (DWORD_PTR)lpsa->pvData, "wirestgm + 0x20 should be lpsa->pvData instead of 0x%08lx\n", *(DWORD_PTR *)wiresa); - wiresa += sizeof(DWORD_PTR); - ok(*(DWORD *)wiresa == sab.cElements, "wiresa + 0x24 should be sab.cElements instead of %lu\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(LONG *)wiresa == sab.lLbound, "wiresa + 0x28 should be sab.clLbound instead of %ld\n", *(LONG *)wiresa); - wiresa += sizeof(LONG); - ok(*(DWORD *)wiresa == sab.cElements, "wiresa + 0x2c should be sab.cElements instead of %lu\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - /* elements are now pointed to by wiresa */ + + check_safearray(buffer, lpsa); if (LPSAFEARRAY_UNMARSHAL_WORKS) { @@ -103,9 +187,7 @@ static void test_marshal_LPSAFEARRAY(voi ok(size == 4, "size should be 4 bytes, not %ld\n", size); buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - wiresa = buffer; - ok(*(DWORD *)wiresa == FALSE, "wiresa + 0x0 should be FALSE instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); + check_safearray(buffer, lpsa); if (LPSAFEARRAY_UNMARSHAL_WORKS) { @@ -116,6 +198,27 @@ static void test_marshal_LPSAFEARRAY(voi HeapFree(GetProcessHeap(), 0, buffer); } +static void check_bstr(void *buffer, BSTR b) +{ + DWORD *wireb = buffer; + DWORD len = SysStringLen(b); + + ok(*wireb == len, "wv[0] %08lx\n", *wireb); + wireb++; + if(len) + ok(*wireb == len * 2, "wv[1] %08lx\n", *wireb); + else + ok(*wireb == 0xffffffff, "wv[1] %08lx\n", *wireb); + wireb++; + ok(*wireb == len, "wv[2] %08lx\n", *wireb); + if(len) + { + wireb++; + ok(!memcmp(wireb, b, len * 2), "strings differ\n"); + } + return; +} + static void test_marshal_BSTR(void) { unsigned long size; @@ -124,7 +227,7 @@ static void test_marshal_BSTR(void) unsigned char *buffer; BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t','1',0}; - DWORD *wireb, len; + DWORD len; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); umcb.pReserve = NULL; @@ -143,15 +246,7 @@ static void test_marshal_BSTR(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); BSTR_UserMarshal(&umcb.Flags, buffer, &b); - wireb = (DWORD*)buffer; - - ok(*wireb == len, "wv[0] %08lx\n", *wireb); - wireb++; - ok(*wireb == len * 2, "wv[1] %08lx\n", *wireb); - wireb++; - ok(*wireb == len, "wv[2] %08lx\n", *wireb); - wireb++; - ok(!memcmp(wireb, str, len * 2), "strings differ\n"); + check_bstr(buffer, b); if (BSTR_UNMARSHAL_WORKS) { @@ -171,13 +266,8 @@ static void test_marshal_BSTR(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); BSTR_UserMarshal(&umcb.Flags, buffer, &b); - wireb = (DWORD*)buffer; - ok(*wireb == 0, "wv[0] %08lx\n", *wireb); - wireb++; - ok(*wireb == 0xffffffff, "wv[1] %08lx\n", *wireb); - wireb++; - ok(*wireb == 0, "wv[2] %08lx\n", *wireb); + check_bstr(buffer, b); HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Michael Stefaniuc : Don't check pointers for NULL before RtlFreeHeap. It is redundant.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 7a8818e7174529be487e6c0a183c54a905f626d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a8818e7174529be487e6c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 1 22:44:43 2006 +0200 Don't check pointers for NULL before RtlFreeHeap. It is redundant. --- dlls/kernel/sync.c | 7 ++----- dlls/ntdll/debugbuffer.c | 6 +++--- dlls/ntdll/reg.c | 3 +-- dlls/ntdll/thread.c | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index cec44f5..8c43e53 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -386,11 +386,8 @@ void WINAPI MakeCriticalSectionGlobal( C HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - if (crit->DebugInfo) - { - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); - crit->DebugInfo = NULL; - } + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + crit->DebugInfo = NULL; } diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index 600c7fa..424b112 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -107,9 +107,9 @@ NTSTATUS WINAPI RtlDestroyQueryDebugBuff NTSTATUS nts = STATUS_SUCCESS; FIXME("(%p): stub\n", iBuf); if (NULL != iBuf) { - if (NULL != iBuf->ModuleInformation) RtlFreeHeap(GetProcessHeap(), 0, iBuf->ModuleInformation); - if (NULL != iBuf->HeapInformation) RtlFreeHeap(GetProcessHeap(), 0, iBuf->HeapInformation); - if (NULL != iBuf->LockInformation) RtlFreeHeap(GetProcessHeap(), 0, iBuf->LockInformation); + RtlFreeHeap(GetProcessHeap(), 0, iBuf->ModuleInformation); + RtlFreeHeap(GetProcessHeap(), 0, iBuf->HeapInformation); + RtlFreeHeap(GetProcessHeap(), 0, iBuf->LockInformation); RtlFreeHeap(GetProcessHeap(), 0, iBuf); } return nts; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index aa5a6ab..e3266c5 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -345,8 +345,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( H } } - if (info) - RtlFreeHeap( GetProcessHeap(), 0, info ); + RtlFreeHeap( GetProcessHeap(), 0, info ); return ret; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 67e6930..efe2a46 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -470,7 +470,7 @@ error: SIZE_T size = 0; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - if (info) RtlFreeHeap( GetProcessHeap(), 0, info ); + RtlFreeHeap( GetProcessHeap(), 0, info ); if (handle) NtClose( handle ); close( request_pipe[1] ); return status;

1 0

Michael Stefaniuc : secur32: Missing LeaveCriticalSection on error paths.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 968ad51d2a77750cd6b371a57b5b6bd809d89914 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=968ad51d2a77750cd6b371a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 1 15:56:53 2006 +0200 secur32: Missing LeaveCriticalSection on error paths. --- dlls/secur32/secur32.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 4757782..ebe7e2e 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -396,14 +396,20 @@ SecureProvider *SECUR32_addProvider(cons { providerTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SecureProviderTable)); if (!providerTable) + { + LeaveCriticalSection(&cs); return NULL; + } list_init(&providerTable->table); } ret = HeapAlloc(GetProcessHeap(), 0, sizeof(SecureProvider)); if (!ret) + { + LeaveCriticalSection(&cs); return NULL; + } list_add_tail(&providerTable->table, &ret->entry); ret->lib = NULL; @@ -439,7 +445,10 @@ void SECUR32_addPackages(SecureProvider { packageTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SecurePackageTable)); if (!packageTable) + { + LeaveCriticalSection(&cs); return; + } packageTable->numPackages = 0; list_init(&packageTable->table);

1 0

James Hawkins : advpack: Don't fail if the dll to register doesn't exist.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 3e46363bfdcf6df3119f557ddc4bf454498dc7cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e46363bfdcf6df3119f557… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 30 17:43:16 2006 -0500 advpack: Don't fail if the dll to register doesn't exist. --- dlls/advpack/install.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index c65a7e2..efbf185 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -156,10 +156,7 @@ static HRESULT register_ocxs_callback(HI hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!hm) - { - hr = E_FAIL; continue; - } if (do_ocx_reg(hm, TRUE)) hr = E_FAIL;

1 0

Mike McCormack : shlwapi: Add a stub implementation for IUnknown_ProfferService.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 2b32128d42e1a74760a67d0e2db171e05c264552 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b32128d42e1a74760a67d0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Apr 30 14:14:12 2006 +0900 shlwapi: Add a stub implementation for IUnknown_ProfferService. --- dlls/shlwapi/ordinal.c | 6 ++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index c81f31f..8b0f83f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4428,3 +4428,9 @@ HRESULT WINAPI IUnknown_QueryServiceExec debugstr_guid(service), debugstr_guid(clsid), x1, x2, x3, ppvOut); return E_NOTIMPL; } + +HRESULT WINAPI IUnknown_ProfferService(IUnknown *unk, void *x0, void *x1, void *x2) +{ + FIXME("%p %p %p %p\n", unk, x0, x1, x2); + return E_NOTIMPL; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index ae9fe0c..e7a9d9f 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -507,7 +507,7 @@ 511 stub -noname PathFileExistsDefExtAndAttributesW 512 stub -noname IStream_ReadPidl 513 stub -noname IStream_WritePidl -514 stub -noname IUnknown_ProfferService +514 stdcall -noname IUnknown_ProfferService(ptr ptr ptr ptr) 516 stdcall -noname SKGetValueW(long wstr wstr long long long) 517 stub -noname SKSetValueW

1 0

Mike McCormack : shlwapi: Add a stub implementation for IUnknown_QueryServiceExec.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: db8090eec2f5e0dfdaf7b792cb10a5ec5efe6084 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db8090eec2f5e0dfdaf7b79… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Apr 30 14:13:49 2006 +0900 shlwapi: Add a stub implementation for IUnknown_QueryServiceExec. --- dlls/shlwapi/ordinal.c | 8 ++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 1bd74d2..c81f31f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4420,3 +4420,11 @@ BOOL WINAPI ShellMessageBoxWrapW(HMODULE mod, unknown1, uId, debugstr_w(title), unknown2, debugstr_w(filename)); return TRUE; } + +HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *unk, REFIID service, REFIID clsid, + DWORD x1, DWORD x2, DWORD x3, void **ppvOut) +{ + FIXME("%p %s %s %08lx %08lx %08lx %p\n", unk, + debugstr_guid(service), debugstr_guid(clsid), x1, x2, x3, ppvOut); + return E_NOTIMPL; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 0ab4c7b..ae9fe0c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -481,7 +481,7 @@ 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA 483 stub -noname SHMessageBoxHelpW -484 stub -noname IUnknown_QueryServiceExec +484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long long ptr) 485 stub -noname MapWin32ErrorToSTG 486 stub -noname ModeToCreateFileFlags

1 0

Mike McCormack : ole32: Return STG_E_REVERTED when a stream' s parent storage has been closed.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 3c1e67d084aff5c040f504ae3a583246dd21248a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c1e67d084aff5c040f504a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Apr 30 14:13:22 2006 +0900 ole32: Return STG_E_REVERTED when a stream's parent storage has been closed. --- dlls/ole32/stg_stream.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index fd75ee2..e208fb6 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -267,6 +267,9 @@ static HRESULT WINAPI StgStreamImpl_Read TRACE("(%p, %p, %ld, %p)\n", iface, pv, cb, pcbRead); + if (!This->parentStorage) + return STG_E_REVERTED; + /* * If the caller is not interested in the number of bytes read, * we use another buffer to avoid "if" statements in the code. @@ -375,6 +378,9 @@ static HRESULT WINAPI StgStreamImpl_Writ if (!pv) return STG_E_INVALIDPOINTER; + if (!This->parentStorage) + return STG_E_REVERTED; + /* * If the caller is not interested in the number of bytes written, * we use another buffer to avoid "if" statements in the code. @@ -463,9 +469,8 @@ static HRESULT WINAPI StgStreamImpl_Seek * fail if the stream has no parent (as does windows) */ - if(!(This->parentStorage)) { + if (!This->parentStorage) return STG_E_REVERTED; - } /* * The caller is allowed to pass in NULL as the new position return value. @@ -527,9 +532,8 @@ static HRESULT WINAPI StgStreamImpl_SetS TRACE("(%p, %ld)\n", iface, libNewSize.u.LowPart); - if(!This->parentStorage) { + if(!This->parentStorage) return STG_E_REVERTED; - } /* * As documented. @@ -648,9 +652,8 @@ static HRESULT WINAPI StgStreamImpl_Copy * Sanity check */ - if(!This->parentStorage) { + if (!This->parentStorage) return STG_E_REVERTED; - } if ( pstm == 0 ) return STG_E_INVALIDPOINTER; @@ -724,9 +727,9 @@ static HRESULT WINAPI StgStreamImpl_Comm { StgStreamImpl* const This=(StgStreamImpl*)iface; - if(!This->parentStorage) { + if (!This->parentStorage) return STG_E_REVERTED; - } + return S_OK; } @@ -752,9 +755,8 @@ static HRESULT WINAPI StgStreamImpl_Lock { StgStreamImpl* const This=(StgStreamImpl*)iface; - if(!This->parentStorage) { + if (!This->parentStorage) return STG_E_REVERTED; - } FIXME("not implemented!\n"); return E_NOTIMPL; @@ -768,9 +770,8 @@ static HRESULT WINAPI StgStreamImpl_Unlo { StgStreamImpl* const This=(StgStreamImpl*)iface; - if(!This->parentStorage) { + if (!This->parentStorage) return STG_E_REVERTED; - } FIXME("not implemented!\n"); return E_NOTIMPL; @@ -798,9 +799,8 @@ static HRESULT WINAPI StgStreamImpl_Stat * if stream has no parent, return STG_E_REVERTED */ - if(!This->parentStorage) { - return STG_E_REVERTED; - } + if (!This->parentStorage) + return STG_E_REVERTED; /* * Read the information from the property. @@ -848,9 +848,8 @@ static HRESULT WINAPI StgStreamImpl_Clon * Sanity check */ - if(!This->parentStorage) { + if (!This->parentStorage) return STG_E_REVERTED; - } if ( ppstm == 0 ) return STG_E_INVALIDPOINTER;

1 0