October 2008 - Wine-commits

Jacek Caban : mshtml: Added IDispatchEx support to HTMLCurrentStyle.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 9b657fa0e7271c2ee222ede182631b30ca651a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b657fa0e7271c2ee222ede18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 09:47:25 2008 -0500 mshtml: Added IDispatchEx support to HTMLCurrentStyle. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlcurstyle.c | 19 ++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5bc8ea7..891d42c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -68,6 +68,7 @@ static REFIID tid_ids[] = { &DIID_DispDOMChildrenCollection, &DIID_DispHTMLBody, &DIID_DispHTMLCommentElement, + &DIID_DispHTMLCurrentStyle, &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLElementCollection, @@ -84,6 +85,7 @@ static REFIID tid_ids[] = { &IID_IHTMLBodyElement, &IID_IHTMLBodyElement2, &IID_IHTMLCommentElement, + &IID_IHTMLCurrentStyle, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 55ff842..4568087 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; const IHTMLCurrentStyleVtbl *lpIHTMLCurrentStyleVtbl; LONG ref; @@ -51,12 +52,11 @@ static HRESULT WINAPI HTMLCurrentStyle_QueryInterface(IHTMLCurrentStyle *iface, if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLCURSTYLE(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLCURSTYLE(This); }else if(IsEqualGUID(&IID_IHTMLCurrentStyle, riid)) { TRACE("(%p)->(IID_IHTMLCurrentStyle %p)\n", This, ppv); *ppv = HTMLCURSTYLE(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -864,6 +864,17 @@ static const IHTMLCurrentStyleVtbl HTMLCurrentStyleVtbl = { HTMLCurrentStyle_get_textTransform }; +static const tid_t HTMLCurrentStyle_iface_tids[] = { + IHTMLCurrentStyle_tid, + 0 +}; +static dispex_static_data_t HTMLCurrentStyle_dispex = { + NULL, + DispHTMLCurrentStyle_tid, + NULL, + HTMLCurrentStyle_iface_tids +}; + HRESULT HTMLCurrentStyle_Create(IHTMLCurrentStyle **p) { HTMLCurrentStyle *ret; @@ -875,6 +886,8 @@ HRESULT HTMLCurrentStyle_Create(IHTMLCurrentStyle **p) ret->lpIHTMLCurrentStyleVtbl = &HTMLCurrentStyleVtbl; ret->ref = 1; + init_dispex(&ret->dispex, (IUnknown*)HTMLCURSTYLE(ret), &HTMLCurrentStyle_dispex); + *p = HTMLCURSTYLE(ret); return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c306505..5a1dfc3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -64,6 +64,7 @@ typedef enum { DispDOMChildrenCollection_tid, DispHTMLBody_tid, DispHTMLCommentElement_tid, + DispHTMLCurrentStyle_tid, DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, DispHTMLElementCollection_tid, @@ -80,6 +81,7 @@ typedef enum { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, IHTMLCommentElement_tid, + IHTMLCurrentStyle_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fa11893..0753d15 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -281,6 +281,7 @@ static const IID * const style_iids[] = { static const IID * const cstyle_iids[] = { &IID_IUnknown, &IID_IDispatch, + &IID_IDispatchEx, &IID_IHTMLCurrentStyle, NULL }; @@ -1985,6 +1986,7 @@ static void test_navigator(IHTMLDocument2 *doc) static void test_current_style(IHTMLCurrentStyle *current_style) { + test_disp((IUnknown*)current_style, &DIID_DispHTMLCurrentStyle); test_ifaces((IUnknown*)current_style, cstyle_iids); }

1 0

Jacek Caban : mshtml.idl: Added DispHTMLCurrentStyle dispinterface declaration.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 4a67a50e6f072f537d97aae713b32f617ff642c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a67a50e6f072f537d97aae71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 09:47:02 2008 -0500 mshtml.idl: Added DispHTMLCurrentStyle dispinterface declaration. --- include/mshtmdid.h | 26 ++++ include/mshtml.idl | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 380 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a67a50e6f072f537d97a…

1 0

Hans Leidekker : wininet: Avoid a crash on certain buffer size queries in HTTP_HttpQueryInfoW.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 128b8a5e0c1e29a27a171573818d8947ec26129f URL: http://source.winehq.org/git/wine.git/?a=commit;h=128b8a5e0c1e29a27a1715738… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 6 15:48:28 2008 +0200 wininet: Avoid a crash on certain buffer size queries in HTTP_HttpQueryInfoW. --- dlls/wininet/http.c | 97 +++++++++++++++++++++++++-------------------------- 1 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c41aca6..3675c9d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -115,9 +115,7 @@ static BOOL HTTP_InsertCustomHeader(LPWININETHTTPREQW lpwhr, LPHTTPHEADERW lpHdr static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField, INT index, BOOL Request); static BOOL HTTP_DeleteCustomHeader(LPWININETHTTPREQW lpwhr, DWORD index); static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); -static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD - dwInfoLevel, LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD - lpdwIndex); +static BOOL HTTP_HttpQueryInfoW(LPWININETHTTPREQW, DWORD, LPVOID, LPDWORD, LPDWORD); static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field); @@ -2167,7 +2165,7 @@ static const LPCWSTR header_lookup[] = { /*********************************************************************** * HTTP_HttpQueryInfoW (internal) */ -static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, +static BOOL HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex) { LPHTTPHEADERW lphttpHdr = NULL; @@ -2181,6 +2179,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev switch (level) { case HTTP_QUERY_CUSTOM: + if (!lpBuffer) return FALSE; index = HTTP_GetCustomHeaderIndex(lpwhr, lpBuffer, requested_index, request_only); break; @@ -2226,7 +2225,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev { LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(lpwhr->lpszRawHeaders, szCrLf); DWORD i, size = 0; - LPWSTR pszString = (WCHAR*)lpBuffer; + LPWSTR pszString = lpBuffer; for (i = 0; ppszRawHeaderLines[i]; i++) size += strlenW(ppszRawHeaderLines[i]) + 1; @@ -2238,17 +2237,17 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - - for (i = 0; ppszRawHeaderLines[i]; i++) + if (pszString) { - DWORD len = strlenW(ppszRawHeaderLines[i]); - memcpy(pszString, ppszRawHeaderLines[i], (len+1)*sizeof(WCHAR)); - pszString += len+1; + for (i = 0; ppszRawHeaderLines[i]; i++) + { + DWORD len = strlenW(ppszRawHeaderLines[i]); + memcpy(pszString, ppszRawHeaderLines[i], (len+1)*sizeof(WCHAR)); + pszString += len+1; + } + *pszString = '\0'; + TRACE("returning data: %s\n", debugstr_wn(lpBuffer, size)); } - *pszString = '\0'; - - TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, size)); - *lpdwBufferLength = size * sizeof(WCHAR); HTTP_FreeTokens(ppszRawHeaderLines); @@ -2264,11 +2263,12 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - memcpy(lpBuffer, lpwhr->lpszStatusText, (len+1)*sizeof(WCHAR)); + if (lpBuffer) + { + memcpy(lpBuffer, lpwhr->lpszStatusText, (len + 1) * sizeof(WCHAR)); + TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len)); + } *lpdwBufferLength = len * sizeof(WCHAR); - - TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); - return TRUE; } break; @@ -2282,11 +2282,12 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - memcpy(lpBuffer, lpwhr->lpszVersion, (len+1)*sizeof(WCHAR)); + if (lpBuffer) + { + memcpy(lpBuffer, lpwhr->lpszVersion, (len + 1) * sizeof(WCHAR)); + TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len)); + } *lpdwBufferLength = len * sizeof(WCHAR); - - TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); - return TRUE; } break; @@ -2314,14 +2315,13 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev (*lpdwIndex)++; /* coalesce value to requested type */ - if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) + if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { - *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); - bSuccess = TRUE; - - TRACE(" returning number : %d\n", *(int *)lpBuffer); + *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); + TRACE(" returning number: %d\n", *(int *)lpBuffer); + bSuccess = TRUE; } - else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME) + else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer) { time_t tmpTime; struct tm tmpTM; @@ -2330,24 +2330,22 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev tmpTime = ConvertTimeString(lphttpHdr->lpszValue); tmpTM = *gmtime(&tmpTime); - STHook = (SYSTEMTIME *) lpBuffer; - if(STHook==NULL) - return bSuccess; - - STHook->wDay = tmpTM.tm_mday; - STHook->wHour = tmpTM.tm_hour; - STHook->wMilliseconds = 0; - STHook->wMinute = tmpTM.tm_min; - STHook->wDayOfWeek = tmpTM.tm_wday; - STHook->wMonth = tmpTM.tm_mon + 1; - STHook->wSecond = tmpTM.tm_sec; - STHook->wYear = tmpTM.tm_year; - - bSuccess = TRUE; + STHook = (SYSTEMTIME *)lpBuffer; + if (!STHook) return bSuccess; + + STHook->wDay = tmpTM.tm_mday; + STHook->wHour = tmpTM.tm_hour; + STHook->wMilliseconds = 0; + STHook->wMinute = tmpTM.tm_min; + STHook->wDayOfWeek = tmpTM.tm_wday; + STHook->wMonth = tmpTM.tm_mon + 1; + STHook->wSecond = tmpTM.tm_sec; + STHook->wYear = tmpTM.tm_year; + bSuccess = TRUE; - TRACE(" returning time : %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", - STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek, - STHook->wHour, STHook->wMinute, STHook->wSecond, STHook->wMilliseconds); + TRACE(" returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", + STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek, + STHook->wHour, STHook->wMinute, STHook->wSecond, STHook->wMilliseconds); } else if (lphttpHdr->lpszValue) { @@ -2359,12 +2357,13 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return bSuccess; } - - memcpy(lpBuffer, lphttpHdr->lpszValue, len); + if (lpBuffer) + { + memcpy(lpBuffer, lphttpHdr->lpszValue, len); + TRACE(" returning string: %s\n", debugstr_w(lpBuffer)); + } *lpdwBufferLength = len - sizeof(WCHAR); bSuccess = TRUE; - - TRACE(" returning string : %s\n", debugstr_w(lpBuffer)); } return bSuccess; }

1 0

Hans Leidekker : wininet: Option INTERNET_OPTION_CALLBACK is not settable.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 096fa3b9f56a77cdbcabac1d0ce55143df653234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096fa3b9f56a77cdbcabac1d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 6 15:48:04 2008 +0200 wininet: Option INTERNET_OPTION_CALLBACK is not settable. --- dlls/wininet/internet.c | 22 +++++++++++++++------- dlls/wininet/tests/http.c | 13 ++++++++++++- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4b33ca6..b027c1a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2259,9 +2259,14 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { case INTERNET_OPTION_CALLBACK: { - INTERNET_STATUS_CALLBACK callback = *(INTERNET_STATUS_CALLBACK *)lpBuffer; - ret = (set_status_callback(lpwhh, callback, TRUE) != INTERNET_INVALID_STATUS_CALLBACK); - break; + if (!lpwhh) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } + WININET_Release(lpwhh); + INTERNET_SetLastError(ERROR_INTERNET_OPTION_NOT_SETTABLE); + return FALSE; } case INTERNET_OPTION_HTTP_VERSION: { @@ -2384,12 +2389,15 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_CALLBACK: { LPWININETHANDLEHEADER lpwh; - INTERNET_STATUS_CALLBACK callback = *(INTERNET_STATUS_CALLBACK *)lpBuffer; - if (!(lpwh = WININET_GetObject(hInternet))) return FALSE; - r = (set_status_callback(lpwh, callback, FALSE) != INTERNET_INVALID_STATUS_CALLBACK); + if (!(lpwh = WININET_GetObject(hInternet))) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } WININET_Release(lpwh); - return r; + INTERNET_SetLastError(ERROR_INTERNET_OPTION_NOT_SETTABLE); + return FALSE; } case INTERNET_OPTION_PROXY: { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b6677b6..c9d1d6f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1984,7 +1984,7 @@ static void test_open_url_async(void) { BOOL ret; HINTERNET ses, req; - DWORD size; + DWORD size, error; struct context ctx; ULONG type; @@ -1994,6 +1994,17 @@ static void test_open_url_async(void) ses = InternetOpen("AdvancedInstaller", 0, NULL, NULL, INTERNET_FLAG_ASYNC); ok(ses != NULL, "InternetOpen failed\n"); + SetLastError(0xdeadbeef); + ret = InternetSetOptionA(NULL, INTERNET_OPTION_CALLBACK, &cb, sizeof(DWORD_PTR)); + error = GetLastError(); + ok(!ret, "InternetSetOptionA succeeded\n"); + ok(error == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "got %u expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE\n", error); + + ret = InternetSetOptionA(ses, INTERNET_OPTION_CALLBACK, &cb, sizeof(DWORD_PTR)); + error = GetLastError(); + ok(!ret, "InternetSetOptionA failed\n"); + ok(error == ERROR_INTERNET_OPTION_NOT_SETTABLE, "got %u expected ERROR_INTERNET_OPTION_NOT_SETTABLE\n", error); + pInternetSetStatusCallbackA(ses, cb); ResetEvent(ctx.event);

1 0

Hans Leidekker : wldap32: Add tests for ldap_parse_sort_control and make them pass.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: b9813873838af3ec880ae0c68a7932afdf9e616b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9813873838af3ec880ae0c68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 6 15:47:28 2008 +0200 wldap32: Add tests for ldap_parse_sort_control and make them pass. --- configure | 9 ++++ configure.ac | 1 + dlls/wldap32/error.c | 26 ++++++++++++ dlls/wldap32/parse.c | 50 +++++++++++----------- dlls/wldap32/tests/Makefile.in | 13 ++++++ dlls/wldap32/tests/parse.c | 87 ++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/wldap32.h | 2 + 7 files changed, 163 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9813873838af3ec880ae…

1 0

Hans Leidekker : wldap32: Return an error when ldap_parse_sort_control or ldap_parse_vlv_control is called with NULL control array .
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 927e9e08921fb14397f397f4ce1d424ec6737d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=927e9e08921fb14397f397f4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 6 15:46:54 2008 +0200 wldap32: Return an error when ldap_parse_sort_control or ldap_parse_vlv_control is called with NULL control array. --- dlls/wldap32/parse.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 61c6020..daea812 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -333,12 +333,10 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr ); - if (!ld) return ~0UL; + if (!ld || !control) return ~0UL; - if (control) { - controlU = controlarrayWtoU( control ); - if (!controlU) return WLDAP32_LDAP_NO_MEMORY; - } + controlU = controlarrayWtoU( control ); + if (!controlU) return WLDAP32_LDAP_NO_MEMORY; #ifdef HAVE_LDAP_PARSE_SORT_CONTROL if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU ))) @@ -439,12 +437,10 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos, listcount, context, errcode ); - if (!ld) return ~0UL; + if (!ld || !control) return ~0UL; - if (control) { - controlU = controlarrayWtoU( control ); - if (!controlU) return WLDAP32_LDAP_NO_MEMORY; - } + controlU = controlarrayWtoU( control ); + if (!controlU) return WLDAP32_LDAP_NO_MEMORY; #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,

1 0

Aric Stewart : quartz: Check hr so we are not incrementing a NULL ( Coverity 106).
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: a3c2c5080997817ae34064bfaf42a9ce2ba4cdac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c2c5080997817ae34064bfa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 6 07:44:29 2008 -0500 quartz: Check hr so we are not incrementing a NULL (Coverity 106). --- dlls/quartz/filesource.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d41899d..c862362 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -168,12 +168,10 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p if (!(wszPatternString = strchrW(wszPatternString, ','))) hr = E_INVALIDARG; - wszPatternString++; /* skip ',' */ - if (hr == S_OK) { - for ( ; !isxdigitW(*wszPatternString) && (*wszPatternString != ','); wszPatternString++) - ; + wszPatternString++; /* skip ',' */ + while (!isxdigitW(*wszPatternString) && (*wszPatternString != ',')) wszPatternString++; for (strpos = 0; isxdigitW(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++) {

1 0

Alexandre Julliard : ntdll: Preserve the 2K block size returned for CDROMs.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 4d958a1cb3f79f5e6fe643542385840b497ff867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d958a1cb3f79f5e6fe643542… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 6 17:52:23 2008 +0200 ntdll: Preserve the 2K block size returned for CDROMs. --- dlls/ntdll/file.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3dee4ee..52e75ab 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2264,10 +2264,18 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } bsize = stfs.f_bsize; #endif - info->BytesPerSector = 512; - info->SectorsPerAllocationUnit = 8; - info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (512 * 8); - info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (512 * 8); + if (bsize == 2048) /* assume CD-ROM */ + { + info->BytesPerSector = 2048; + info->SectorsPerAllocationUnit = 1; + } + else + { + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + } + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); io->Information = sizeof(*info); io->u.Status = STATUS_SUCCESS; }

1 0

Jeremy Newman : disable Google ad box for now
by Jeremy Newman 06 Oct '08

06 Oct '08

Module: website Branch: master Commit: 1ba617f2dfe72e9b4b62e90d05c6171f9914de62 URL: http://source.winehq.org/git/website.git/?a=commit;h=1ba617f2dfe72e9b4b62e9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 6 14:33:26 2008 -0500 disable Google ad box for now --- site | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/site b/site index 4404b13..5139197 100644 --- a/site +++ b/site @@ -104,7 +104,7 @@ function home_page () $quote_box = $html->theme_box($config->theme, "box_title", "Quote", "99%", view_quote(), '10', 'white', 'topMenu'); // get google ad - $ad_box = $html->theme_box($config->theme, "box_title", "Ads by Google", "99%", $html->template("base", 'ads'), '10', 'white', 'topMenu'); + //$ad_box = $html->theme_box($config->theme, "box_title", "Ads by Google", "99%", $html->template("base", 'ads'), '10', 'white', 'topMenu'); // get wwn news $wwn = new wwn();

1 0

Paul Vriens : kernel32/tests: Add some skips to fix failures on WinMe.
by Alexandre Julliard 06 Oct '08

06 Oct '08

Module: wine Branch: master Commit: a1131786e49dd87343677917523dc88c280e95c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1131786e49dd873436779175… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 6 14:02:44 2008 +0200 kernel32/tests: Add some skips to fix failures on WinMe. --- dlls/kernel32/tests/locale.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0c6bd92..5b2722e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2042,12 +2042,22 @@ static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName, static void test_EnumSystemLanguageGroupsA(void) { + BOOL ret; + if (!pEnumSystemLanguageGroupsA || !pIsValidLanguageGroup) + { + win_skip("EnumSystemLanguageGroupsA and/or IsValidLanguageGroup are not available\n"); return; + } /* No enumeration proc */ SetLastError(0); pEnumSystemLanguageGroupsA(0, LGRPID_INSTALLED, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("EnumSystemLanguageGroupsA is not implemented\n"); + return; + } EXPECT_INVALID; /* Invalid flags */ @@ -2083,12 +2093,22 @@ static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, static void test_EnumLanguageGroupLocalesA(void) { + BOOL ret; + if (!pEnumLanguageGroupLocalesA || !pIsValidLanguageGroup) + { + win_skip("EnumLanguageGroupLocalesA and/or IsValidLanguageGroup are not available\n"); return; + } /* No enumeration proc */ SetLastError(0); - pEnumLanguageGroupLocalesA(0, LGRPID_WESTERN_EUROPE, 0, 0); + ret = pEnumLanguageGroupLocalesA(0, LGRPID_WESTERN_EUROPE, 0, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("EnumLanguageGroupLocalesA is not implemented\n"); + return; + } EXPECT_INVALID; /* lgrpid too small */ @@ -2159,6 +2179,11 @@ static void test_EnumUILanguageA(void) SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(luilocale_proc1A, 0, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("EnumUILanguagesA is not implemented\n"); + return; + } EXPECT_TRUE; EXPECT_VALID; enumCount = 0;

1 0