November 2009 - Wine-commits

Juan Lang : crypt32: Implement CertIsRDNAttrsInCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 440c702ce413861f8a030e728ee6bceee255b513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440c702ce413861f8a030e728… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 17:08:03 2009 -0800 crypt32: Implement CertIsRDNAttrsInCertificateName. --- dlls/crypt32/cert.c | 78 +++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/cert.c | 15 --------- 2 files changed, 75 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 656c547..f91adc1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1832,12 +1832,84 @@ PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName) return ret; } +static BOOL find_matching_rdn_attr(DWORD dwFlags, const CERT_NAME_INFO *name, + const CERT_RDN_ATTR *attr) +{ + DWORD i, j; + BOOL match = FALSE; + + for (i = 0; !match && i < name->cRDN; i++) + { + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + { + if (!strcmp(name->rgRDN[i].rgRDNAttr[j].pszObjId, + attr->pszObjId) && + name->rgRDN[i].rgRDNAttr[j].dwValueType == + attr->dwValueType) + { + if (dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG) + { + LPCWSTR nameStr = + (LPCWSTR)name->rgRDN[i].rgRDNAttr[j].Value.pbData; + LPCWSTR attrStr = (LPCWSTR)attr->Value.pbData; + + if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) + match = !strncmpiW(nameStr, attrStr, + attr->Value.cbData / sizeof(WCHAR)); + else + match = !strncmpW(nameStr, attrStr, + attr->Value.cbData / sizeof(WCHAR)); + TRACE("%s : %s => %d\n", + debugstr_wn(nameStr, attr->Value.cbData / sizeof(WCHAR)), + debugstr_wn(attrStr, attr->Value.cbData / sizeof(WCHAR)), + match); + } + else + { + LPCSTR nameStr = + (LPCSTR)name->rgRDN[i].rgRDNAttr[j].Value.pbData; + LPCSTR attrStr = (LPCSTR)attr->Value.pbData; + + if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) + match = !strncasecmp(nameStr, attrStr, + attr->Value.cbData); + else + match = !strncmp(nameStr, attrStr, attr->Value.cbData); + TRACE("%s : %s => %d\n", + debugstr_an(nameStr, attr->Value.cbData), + debugstr_an(attrStr, attr->Value.cbData), match); + } + } + } + } + return match; +} + BOOL WINAPI CertIsRDNAttrsInCertificateName(DWORD dwCertEncodingType, DWORD dwFlags, PCERT_NAME_BLOB pCertName, PCERT_RDN pRDN) { - FIXME("(%08x, %08x, %p, %p): stub\n", dwCertEncodingType, dwFlags, - pCertName, pRDN); - return FALSE; + CERT_NAME_INFO *name; + LPCSTR type; + DWORD size; + BOOL ret; + + TRACE("(%08x, %08x, %p, %p)\n", dwCertEncodingType, dwFlags, pCertName, + pRDN); + + type = dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG ? X509_UNICODE_NAME : + X509_NAME; + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, type, pCertName->pbData, + pCertName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &name, &size))) + { + DWORD i; + + for (i = 0; ret && i < pRDN->cRDNAttr; i++) + ret = find_matching_rdn_attr(dwFlags, name, &pRDN->rgRDNAttr[i]); + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); + LocalFree(name); + } + return ret; } LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 186691f..4a1c449 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2662,18 +2662,15 @@ static void testIsRDNAttrsInCertificateName(void) } SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(0, 0, &name, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); attr[0].pszObjId = oid_1_2_3; rdn.rgRDNAttr = attr; rdn.cRDNAttr = 1; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); attr[0].pszObjId = oid_common_name; @@ -2681,28 +2678,24 @@ static void testIsRDNAttrsInCertificateName(void) attr[0].Value.cbData = strlen(juan); attr[0].Value.pbData = (BYTE *)juan; ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); /* Again, spaces are not removed for name comparison. */ attr[0].Value.cbData = strlen(juan_with_leading_space); attr[0].Value.pbData = (BYTE *)juan_with_leading_space; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); attr[0].Value.cbData = strlen(juan_with_intermediate_space); attr[0].Value.pbData = (BYTE *)juan_with_intermediate_space; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); attr[0].Value.cbData = strlen(juan_with_trailing_space); attr[0].Value.pbData = (BYTE *)juan_with_trailing_space; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); /* The lower case name isn't matched unless a case insensitive match is @@ -2712,12 +2705,10 @@ static void testIsRDNAttrsInCertificateName(void) attr[0].Value.pbData = (BYTE *)juan_lower_case; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, &name, &rdn); - todo_wine ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); /* The values don't match unless they have the same RDN type */ attr[0].dwValueType = CERT_RDN_UNICODE_STRING; @@ -2725,13 +2716,11 @@ static void testIsRDNAttrsInCertificateName(void) attr[0].Value.pbData = (BYTE *)juanW; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, CERT_UNICODE_IS_RDN_ATTRS_FLAG, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); attr[0].dwValueType = CERT_RDN_IA5_STRING; @@ -2739,7 +2728,6 @@ static void testIsRDNAttrsInCertificateName(void) attr[0].Value.pbData = (BYTE *)juan; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); /* All attributes must be present */ @@ -2753,20 +2741,17 @@ static void testIsRDNAttrsInCertificateName(void) rdn.cRDNAttr = 2; SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); /* Order also matters */ name.pbData = cnThenO; name.cbData = sizeof(cnThenO); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); name.pbData = oThenCN; name.cbData = sizeof(oThenCN); SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); }

1 0

Juan Lang : crypt32/tests: Fix another test failure.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: a299470622dfb04197f35c49082eafe2c32fd844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a299470622dfb04197f35c490… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 14:23:17 2009 -0800 crypt32/tests: Fix another test failure. --- dlls/crypt32/tests/chain.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index bfdf203..b5ceb61 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3512,8 +3512,10 @@ static void testGetCertChain(void) { ok(chain->TrustStatus.dwErrorStatus == chainCheckEmbeddedNull.status.status.dwErrorStatus || - broken(chain->TrustStatus.dwErrorStatus == - chainCheckEmbeddedNullBroken.status.status.dwErrorStatus), + broken((chain->TrustStatus.dwErrorStatus & + ~chainCheckEmbeddedNullBroken.status.statusToIgnore.dwErrorStatus) == + (chainCheckEmbeddedNullBroken.status.status.dwErrorStatus & + ~chainCheckEmbeddedNullBroken.status.statusToIgnore.dwErrorStatus)), "unexpected chain error status %08x\n", chain->TrustStatus.dwErrorStatus); if (chainCheckEmbeddedNull.status.status.dwErrorStatus ==

1 0

Alexandre Julliard : gdi32: Don't crash when we don't have AbortProc thunks .
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 9a145d13f1b297f29cb1c0b107d3e05bf8cecebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a145d13f1b297f29cb1c0b10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:17:37 2009 +0100 gdi32: Don't crash when we don't have AbortProc thunks. --- dlls/gdi32/gdi16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 37a15e9..62c9ac6 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -127,6 +127,7 @@ static struct gdi_thunk* GDI_FindThunk(HDC16 hdc) { struct gdi_thunk* thunk; + if (!GDI_Thunks) return NULL; for (thunk = GDI_Thunks; thunk < &GDI_Thunks[GDI_MAX_THUNKS]; thunk++) { if (thunk->hdc == hdc) return thunk;

1 0

Alexandre Julliard : gdi32: Reimplement LPtoDP16/ DPtoLP16 on top of the 32-bit functions.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 250237e1c1d1e7a16678de7ba8107c0431807971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250237e1c1d1e7a16678de7ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:19:36 2009 +0100 gdi32: Reimplement LPtoDP16/DPtoLP16 on top of the 32-bit functions. --- dlls/gdi32/gdi16.c | 56 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 62c9ac6..c8d0536 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3564,17 +3564,29 @@ VOID WINAPI SetMagicColors16(HDC16 hDC, COLORREF color, UINT16 index) */ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count ) { - DC * dc = get_dc_ptr( HDC_32(hdc) ); - if (!dc) return FALSE; + POINT points32[8], *pt32 = points32; + int i; + BOOL ret; - while (count--) + if (count > 8) { - points->x = MulDiv( points->x - dc->vportOrgX, dc->wndExtX, dc->vportExtX ) + dc->wndOrgX; - points->y = MulDiv( points->y - dc->vportOrgY, dc->wndExtY, dc->vportExtY ) + dc->wndOrgY; - points++; + if (!(pt32 = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt32) ))) return FALSE; } - release_dc_ptr( dc ); - return TRUE; + for (i = 0; i < count; i++) + { + pt32[i].x = points[i].x; + pt32[i].y = points[i].y; + } + if ((ret = DPtoLP( HDC_32(hdc), pt32, count ))) + { + for (i = 0; i < count; i++) + { + points[i].x = pt32[i].x; + points[i].y = pt32[i].y; + } + } + if (pt32 != points32) HeapFree( GetProcessHeap(), 0, pt32 ); + return ret; } @@ -3583,17 +3595,29 @@ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count ) */ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) { - DC * dc = get_dc_ptr( HDC_32(hdc) ); - if (!dc) return FALSE; + POINT points32[8], *pt32 = points32; + int i; + BOOL ret; - while (count--) + if (count > 8) { - points->x = MulDiv( points->x - dc->wndOrgX, dc->vportExtX, dc->wndExtX ) + dc->vportOrgX; - points->y = MulDiv( points->y - dc->wndOrgY, dc->vportExtY, dc->wndExtY ) + dc->vportOrgY; - points++; + if (!(pt32 = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt32) ))) return FALSE; } - release_dc_ptr( dc ); - return TRUE; + for (i = 0; i < count; i++) + { + pt32[i].x = points[i].x; + pt32[i].y = points[i].y; + } + if ((ret = LPtoDP( HDC_32(hdc), pt32, count ))) + { + for (i = 0; i < count; i++) + { + points[i].x = pt32[i].x; + points[i].y = pt32[i].y; + } + } + if (pt32 != points32) HeapFree( GetProcessHeap(), 0, pt32 ); + return ret; }

1 0

Alexandre Julliard : gdi32: Disable the 16-bit visible region manipulation functions.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 569f56e87a50faa258a265a63719217dac67c792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569f56e87a50faa258a265a63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:21:15 2009 +0100 gdi32: Disable the 16-bit visible region manipulation functions. --- dlls/gdi32/gdi16.c | 69 ++++----------------------------------------------- 1 files changed, 6 insertions(+), 63 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index c8d0536..8c4f79b 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3675,17 +3675,8 @@ HRGN16 WINAPI InquireVisRgn16( HDC16 hdc ) */ INT16 WINAPI OffsetVisRgn16( HDC16 hdc16, INT16 x, INT16 y ) { - INT16 retval; - HDC hdc = HDC_32( hdc16 ); - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return ERROR; - TRACE("%p %d,%d\n", hdc, x, y ); - update_dc( dc ); - retval = OffsetRgn( dc->hVisRgn, x, y ); - CLIPPING_UpdateGCRegion( dc ); - release_dc_ptr( dc ); - return retval; + FIXME( "%04x %d,%d no longer supported\n", hdc16, x, y ); + return ERROR; } @@ -3694,32 +3685,8 @@ INT16 WINAPI OffsetVisRgn16( HDC16 hdc16, INT16 x, INT16 y ) */ INT16 WINAPI ExcludeVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right, INT16 bottom ) { - HRGN tempRgn; - INT16 ret; - POINT pt[2]; - HDC hdc = HDC_32( hdc16 ); - DC * dc = get_dc_ptr( hdc ); - if (!dc) return ERROR; - - pt[0].x = left; - pt[0].y = top; - pt[1].x = right; - pt[1].y = bottom; - - LPtoDP( hdc, pt, 2 ); - - TRACE("%p %d,%d - %d,%d\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); - - if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR; - else - { - update_dc( dc ); - ret = CombineRgn( dc->hVisRgn, dc->hVisRgn, tempRgn, RGN_DIFF ); - DeleteObject( tempRgn ); - } - if (ret != ERROR) CLIPPING_UpdateGCRegion( dc ); - release_dc_ptr( dc ); - return ret; + FIXME( "%04x %d,%d-%d,%d no longer supported\n", hdc16, left, top, right, bottom ); + return ERROR; } @@ -3728,32 +3695,8 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right, */ INT16 WINAPI IntersectVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right, INT16 bottom ) { - HRGN tempRgn; - INT16 ret; - POINT pt[2]; - HDC hdc = HDC_32( hdc16 ); - DC * dc = get_dc_ptr( hdc ); - if (!dc) return ERROR; - - pt[0].x = left; - pt[0].y = top; - pt[1].x = right; - pt[1].y = bottom; - - LPtoDP( hdc, pt, 2 ); - - TRACE("%p %d,%d - %d,%d\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); - - if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR; - else - { - update_dc( dc ); - ret = CombineRgn( dc->hVisRgn, dc->hVisRgn, tempRgn, RGN_AND ); - DeleteObject( tempRgn ); - } - if (ret != ERROR) CLIPPING_UpdateGCRegion( dc ); - release_dc_ptr( dc ); - return ret; + FIXME( "%04x %d,%d-%d,%d no longer supported\n", hdc16, left, top, right, bottom ); + return ERROR; }

1 0

Eric Pouech : dbghelp: Beef up SymRefreshModuleList.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 68cc7d58757e0a2003350a1759c4970da712a8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68cc7d58757e0a2003350a175… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 16 21:27:08 2009 +0100 dbghelp: Beef up SymRefreshModuleList. --- dlls/dbghelp/module.c | 22 +++++++++++++++++----- include/dbghelp.h | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 7d2ad7f..a6778e7 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -455,6 +455,15 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_PE; } +/****************************************************************** + * refresh_module_list + */ +static BOOL refresh_module_list(struct process* pcs) +{ + /* force transparent ELF and Mach-O loading / unloading */ + return elf_synchronize_module_list(pcs) || macho_synchronize_module_list(pcs); +} + /*********************************************************************** * SymLoadModule (DBGHELP.@) */ @@ -536,9 +545,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); - /* force transparent ELF and Mach-O loading / unloading */ - elf_synchronize_module_list(pcs); - macho_synchronize_module_list(pcs); + refresh_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ if (!wImageName && !hFile) return 0; @@ -1058,6 +1065,11 @@ void module_reset_debug_info(struct module* module) */ BOOL WINAPI SymRefreshModuleList(HANDLE hProcess) { - FIXME("(%p) stub\n", hProcess); - return FALSE; + struct process* pcs; + + TRACE("(%p)\n", hProcess); + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + + return refresh_module_list(pcs); } diff --git a/include/dbghelp.h b/include/dbghelp.h index 98695b2..34805f4 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1461,6 +1461,7 @@ BOOL WINAPI SymGetSymPrevW(HANDLE, PIMAGEHLP_SYMBOLW); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); BOOL WINAPI SymRegisterFunctionEntryCallback(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK, PVOID); +BOOL WINAPI SymRefreshModuleList(HANDLE); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD);

1 0

Jacek Caban : mshtml: Improved IHTMLStyle3::put_zoom stub.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 6be475d0fe1d1eba6b39b6c23b5a69b186e49695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be475d0fe1d1eba6b39b6c23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 16 23:55:10 2009 +0100 mshtml: Improved IHTMLStyle3::put_zoom stub. --- dlls/mshtml/htmlstyle3.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 505e91e..56fd3df 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -103,7 +103,15 @@ static HRESULT WINAPI HTMLStyle3_get_layoutFlow(IHTMLStyle3 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle3_put_zoom(IHTMLStyle3 *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE3_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. + * The value is set to 1 then. We can safely ignore setting zoom to 1. */ + if(V_VT(&v) == VT_I4 && V_I4(&v) == 1) + return S_OK; + + FIXME("stub for %s\n", debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : urlmon: Don't post notif message if we' re in task processing loop.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: a70e5b556ca2faade25df32b4cac3b5d4b826d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70e5b556ca2faade25df32b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 16 23:58:05 2009 +0100 urlmon: Don't post notif message if we're in task processing loop. --- dlls/urlmon/bindprot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index e4f203d..20472ba 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -205,7 +205,7 @@ static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) This->task_queue_tail = task; }else { This->task_queue_tail = This->task_queue_head = task; - do_post = TRUE; + do_post = !This->continue_call; } LeaveCriticalSection(&This->section);

1 0

Jacek Caban : jscript: Use CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER to create ActiveX object.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: d168f71912ed9f024dba6ffc51c6f19c89781a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d168f71912ed9f024dba6ffc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 00:03:06 2009 +0100 jscript: Use CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER to create ActiveX object. --- dlls/jscript/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 60e33e0..947e4cf 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -86,7 +86,7 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) if(FAILED(hres) || policy != URLPOLICY_ALLOW) return NULL; - hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf); + hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); if(FAILED(hres)) return NULL;

1 0

Rob Shearman : ole32: OleInitialize should return S_OK if it is called for the first time on a thread independently of CoInitializeEx .
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 932544d34c24ee3e69dbd9c80a343b29ef96ebbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=932544d34c24ee3e69dbd9c80… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 23:41:48 2009 +0000 ole32: OleInitialize should return S_OK if it is called for the first time on a thread independently of CoInitializeEx. --- dlls/ole32/ole2.c | 3 +++ dlls/ole32/tests/compobj.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c612f33..6bf79fd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -190,6 +190,9 @@ HRESULT WINAPI OleInitialize(LPVOID reserved) if (FAILED(hr)) return hr; + if (!COM_CurrentInfo()->ole_inits) + hr = S_OK; + /* * Then, it has to initialize the OLE specific modules. * This includes: diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 442e7b0..5ddfc11 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1415,7 +1415,7 @@ static void test_CoInitializeEx(void) /* Calling OleInitialize for the first time should yield S_OK even with * apartment already initialized by previous CoInitialize(Ex) calls. */ hr = OleInitialize(NULL); - todo_wine ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); /* Subsequent calls to OleInitialize should return S_FALSE */ hr = OleInitialize(NULL);

1 0