February 2008 - Wine-Commits

Rob Shearman : wininet: Fix the return value check of SHGetSpecialFolderPathW in URLCacheContainers_CreateDefaults .
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 2e99817a406bc3ff957fa875e143111ab43a5b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e99817a406bc3ff957fa875e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:06:38 2008 +0000 wininet: Fix the return value check of SHGetSpecialFolderPathW in URLCacheContainers_CreateDefaults. It returns a BOOL, not an HRESULT. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 06dfd85..24e5b9d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -543,7 +543,7 @@ void URLCacheContainers_CreateDefaults(void) WCHAR wszMutexName[MAX_PATH]; int path_len, suffix_len; - if (FAILED(SHGetSpecialFolderPathW(NULL, wszCachePath, DefaultContainerData[i].nFolder, TRUE))) + if (!SHGetSpecialFolderPathW(NULL, wszCachePath, DefaultContainerData[i].nFolder, TRUE)) { ERR("Couldn't get path for default container %u\n", i); continue;

1 0

Frans Kool : mshtml: Added missing Dutch translations.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 33348f59ffe8a50607f2b0366857297bba263301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33348f59ffe8a50607f2b0366… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Fri Feb 15 14:49:53 2008 +0100 mshtml: Added missing Dutch translations. --- dlls/mshtml/Nl.rc | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index ef5c799..54885c8 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -42,3 +42,17 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Afbreken", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Webverwijzing" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Webverwijzing Informatie", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +}

1 0

Rob Shearman : urlmon: Check the return value of ReadFile and return INET_E_DOWNLOAD_FAILURE is it fails .
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 229e024a53b12b152dc983bac4fd3f9389ae4b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=229e024a53b12b152dc983bac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:09:25 2008 +0000 urlmon: Check the return value of ReadFile and return INET_E_DOWNLOAD_FAILURE is it fails. Initialise *pcbRead to zero, if the parameter is not NULL. --- dlls/urlmon/file.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 41ee617..91aca2c 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -229,10 +229,14 @@ static HRESULT WINAPI FileProtocol_Read(IInternetProtocol *iface, void *pv, TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + if (pcbRead) + *pcbRead = 0; + if(!This->file) return INET_E_DATA_NOT_AVAILABLE; - ReadFile(This->file, pv, cb, &read, NULL); + if (!ReadFile(This->file, pv, cb, &read, NULL)) + return INET_E_DOWNLOAD_FAILURE; if(pcbRead) *pcbRead = read;

1 0

Rob Shearman : wininet: Fix an off-by-one error in the boundary checks in HTTP_DecodeBase64.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: f8f9dbbbe7de084fb9751abd4b523d357b605843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f9dbbbe7de084fb9751abd4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:06:32 2008 +0000 wininet: Fix an off-by-one error in the boundary checks in HTTP_DecodeBase64. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0245d2b..083eda6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1129,9 +1129,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) { signed char in[4]; - if (base64[0] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[0] >= ARRAYSIZE(HTTP_Base64Dec) || ((in[0] = HTTP_Base64Dec[base64[0]]) == -1) || - base64[1] > ARRAYSIZE(HTTP_Base64Dec) || + base64[1] >= ARRAYSIZE(HTTP_Base64Dec) || ((in[1] = HTTP_Base64Dec[base64[1]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(base64));

1 0

Rob Shearman : shell32: Fix character count passed into lstrcpnA in SHGetDataFromIDListA.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: d92fe2cbfcf6d69531dddc3be64f6120589ef4f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92fe2cbfcf6d69531dddc3be… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:06:13 2008 +0000 shell32: Fix character count passed into lstrcpnA in SHGetDataFromIDListA. --- dlls/shell32/pidl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 18bfebf..58cb080 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1125,12 +1125,12 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, shortname = _ILGetSTextPointer(pidl); if (filename) - lstrcpynA(pfd->cFileName, filename, MAX_PATH); + lstrcpynA(pfd->cFileName, filename, sizeof(pfd->cFileName)); else pfd->cFileName[0] = '\0'; if (shortname) - lstrcpynA(pfd->cAlternateFileName, shortname, MAX_PATH); + lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); else pfd->cAlternateFileName[0] = '\0'; return NOERROR;

1 0

Rob Shearman : shell32: Fix the character count passed into LoadStringW in ISFHelper_fnAddFolder.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 8aa361740e48fada8b6667976d35d706e9977dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa361740e48fada8b6667976… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:06:20 2008 +0000 shell32: Fix the character count passed into LoadStringW in ISFHelper_fnAddFolder. --- dlls/shell32/shfldr_fs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 830013b..94080d0 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1155,9 +1155,9 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, /* Cannot Create folder because of permissions */ LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_DENIED, wszTempText, - sizeof (wszTempText)); + sizeof (wszTempText)/sizeof (wszTempText[0])); LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_CAPTION, wszCaption, - sizeof (wszCaption)); + sizeof (wszCaption)/sizeof (wszCaption[0])); sprintfW (wszText, wszTempText, wszNewDir); MessageBoxW (hwnd, wszText, wszCaption, MB_OK | MB_ICONEXCLAMATION); }

1 0

Rob Shearman : comctl32: Remove some more useless asserts.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 783b5b49a228a7bdb93a67a064e5fafbd21d72cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=783b5b49a228a7bdb93a67a06… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:06:04 2008 +0000 comctl32: Remove some more useless asserts. --- dlls/comctl32/treeview.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bff38f6..5650c46 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -405,8 +405,6 @@ TREEVIEW_GetPrevListItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *tvIt static TREEVIEW_ITEM * TREEVIEW_GetNextListItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *tvItem) { - assert(tvItem != NULL); - /* * If this item has children and is expanded, return the first child */ @@ -1047,7 +1045,6 @@ static void TREEVIEW_InsertBefore(TREEVIEW_ITEM *newItem, TREEVIEW_ITEM *sibling, TREEVIEW_ITEM *parent) { - assert(newItem != NULL); assert(parent != NULL); if (sibling != NULL) @@ -1080,7 +1077,6 @@ static void TREEVIEW_InsertAfter(TREEVIEW_ITEM *newItem, TREEVIEW_ITEM *sibling, TREEVIEW_ITEM *parent) { - assert(newItem != NULL); assert(parent != NULL); if (sibling != NULL)

1 0

Rob Shearman : comctl32: Fix the character count passed into LoadStringW from propsheet functions.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: fd291ed3d89b03a031e807629ed6363a9bed6450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd291ed3d89b03a031e807629… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:05:36 2008 +0000 comctl32: Fix the character count passed into LoadStringW from propsheet functions. --- dlls/comctl32/propsheet.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 82d41cc..f2b704f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -555,7 +555,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, if ( !HIWORD( lppsp->pszTitle ) ) { - if (!LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle,szTitle,sizeof(szTitle) )) + if (!LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle,szTitle,sizeof(szTitle)/sizeof(szTitle[0]) )) { pTitle = pszNull; FIXME("Could not load resource #%04x?\n",LOWORD(lppsp->pszTitle)); @@ -2160,7 +2160,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText) TRACE("%s (style %08x)\n", debugstr_w(lpszText), dwStyle); if (HIWORD(lpszText) == 0) { if (!LoadStringW(psInfo->ppshheader.hInstance, - LOWORD(lpszText), szTitle, sizeof(szTitle)-sizeof(WCHAR))) + LOWORD(lpszText), szTitle, sizeof(szTitle)/sizeof(szTitle[0]))) return; lpszText = szTitle; } @@ -3636,7 +3636,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HWND hwndCancel = GetDlgItem(hwnd, IDCANCEL); EnableWindow(hwndCancel, FALSE); - if (LoadStringW(COMCTL32_hModule, IDS_CLOSE, buf, sizeof(buf))) + if (LoadStringW(COMCTL32_hModule, IDS_CLOSE, buf, sizeof(buf)/sizeof(buf[0]))) SetWindowTextW(hwndOK, buf); return FALSE;

1 0

Juan Lang : crypt32: Vista doesn't actually add duplicate usage identifiers ; fix tests and change Wine to match.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: b04c4aa6ff7606895a11dbab043a83bad2c3b916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04c4aa6ff7606895a11dbab0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 14 10:54:51 2008 -0800 crypt32: Vista doesn't actually add duplicate usage identifiers; fix tests and change Wine to match. --- dlls/crypt32/cert.c | 48 +++++++++++++++++++++++++++++--------------- dlls/crypt32/tests/cert.c | 8 ++++-- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d747574..84780cb 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1902,29 +1902,43 @@ BOOL WINAPI CertAddEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext, CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, usage, &size); if (ret) { - PCERT_ENHKEY_USAGE newUsage = CryptMemAlloc(size + - sizeof(LPSTR) + strlen(pszUsageIdentifier) + 1); + DWORD i; + BOOL exists = FALSE; - if (newUsage) + /* Make sure usage doesn't already exist */ + for (i = 0; !exists && i < usage->cUsageIdentifier; i++) { - LPSTR nextOID; - DWORD i; + if (!strcmp(usage->rgpszUsageIdentifier[i], + pszUsageIdentifier)) + exists = TRUE; + } + if (!exists) + { + PCERT_ENHKEY_USAGE newUsage = CryptMemAlloc(size + + sizeof(LPSTR) + strlen(pszUsageIdentifier) + 1); - newUsage->rgpszUsageIdentifier = - (LPSTR *)((LPBYTE)newUsage + sizeof(CERT_ENHKEY_USAGE)); - nextOID = (LPSTR)((LPBYTE)newUsage->rgpszUsageIdentifier + - (usage->cUsageIdentifier + 1) * sizeof(LPSTR)); - for (i = 0; i < usage->cUsageIdentifier; i++) + if (newUsage) { + LPSTR nextOID; + + newUsage->rgpszUsageIdentifier = (LPSTR *) + ((LPBYTE)newUsage + sizeof(CERT_ENHKEY_USAGE)); + nextOID = (LPSTR)((LPBYTE)newUsage->rgpszUsageIdentifier + + (usage->cUsageIdentifier + 1) * sizeof(LPSTR)); + for (i = 0; i < usage->cUsageIdentifier; i++) + { + newUsage->rgpszUsageIdentifier[i] = nextOID; + strcpy(nextOID, usage->rgpszUsageIdentifier[i]); + nextOID += strlen(nextOID) + 1; + } newUsage->rgpszUsageIdentifier[i] = nextOID; - strcpy(nextOID, usage->rgpszUsageIdentifier[i]); - nextOID += strlen(nextOID) + 1; + strcpy(nextOID, pszUsageIdentifier); + newUsage->cUsageIdentifier = i + 1; + ret = CertSetEnhancedKeyUsage(pCertContext, newUsage); + CryptMemFree(newUsage); } - newUsage->rgpszUsageIdentifier[i] = nextOID; - strcpy(nextOID, pszUsageIdentifier); - newUsage->cUsageIdentifier = i + 1; - ret = CertSetEnhancedKeyUsage(pCertContext, newUsage); - CryptMemFree(newUsage); + else + ret = FALSE; } } CryptMemFree(usage); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 37a709b..0ab9334 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2053,7 +2053,9 @@ static void testKeyUsage(void) if (pUsage->cUsageIdentifier) ok(!strcmp(pUsage->rgpszUsageIdentifier[0], oid), "Expected %s, got %s\n", oid, pUsage->rgpszUsageIdentifier[0]); - /* Yep, I can re-add the same usage identifier */ + /* Re-adding the same usage identifier succeeds, though it only adds + * a duplicate usage identifier on versions prior to Vista + */ ret = CertAddEnhancedKeyUsageIdentifier(context, oid); ok(ret, "CertAddEnhancedKeyUsageIdentifier failed: %08x\n", GetLastError()); @@ -2061,8 +2063,8 @@ static void testKeyUsage(void) ret = CertGetEnhancedKeyUsage(context, 0, pUsage, &size); ok(ret && GetLastError() == 0, "CertGetEnhancedKeyUsage failed: %08x\n", GetLastError()); - ok(pUsage->cUsageIdentifier == 2, "Expected 2 identifiers, got %d\n", - pUsage->cUsageIdentifier); + ok(pUsage->cUsageIdentifier == 1 || pUsage->cUsageIdentifier == 2, + "Expected 1 or 2 identifiers, got %d\n", pUsage->cUsageIdentifier); if (pUsage->cUsageIdentifier) ok(!strcmp(pUsage->rgpszUsageIdentifier[0], oid), "Expected %s, got %s\n", oid, pUsage->rgpszUsageIdentifier[0]);

1 0

Rob Shearman : comctl32: Fix the character count passed to GetWindowTextW in TREEVIEW_Command.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 82c41bb596164b83901014d6a8d513be8752b189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c41bb596164b83901014d6a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 10:05:48 2008 +0000 comctl32: Fix the character count passed to GetWindowTextW in TREEVIEW_Command. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 89d7218..bff38f6 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3584,7 +3584,7 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) infoPtr->bLabelChanged = TRUE; - len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)); + len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); /* Select font to get the right dimension of the string */ hFont = (HFONT)SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0);

1 0