diff --git a/minipath/language/mp_af_za/dialogs_af_za.rc b/minipath/language/mp_af_za/dialogs_af_za.rc index bde3f286c..9401cfe41 100644 Binary files a/minipath/language/mp_af_za/dialogs_af_za.rc and b/minipath/language/mp_af_za/dialogs_af_za.rc differ diff --git a/minipath/language/mp_de_de/dialogs_de_de.rc b/minipath/language/mp_de_de/dialogs_de_de.rc index 81d4643c2..e2295c0ad 100644 Binary files a/minipath/language/mp_de_de/dialogs_de_de.rc and b/minipath/language/mp_de_de/dialogs_de_de.rc differ diff --git a/minipath/language/mp_de_de/menu_de_de.rc b/minipath/language/mp_de_de/menu_de_de.rc index f25817978..ac29ddc78 100644 Binary files a/minipath/language/mp_de_de/menu_de_de.rc and b/minipath/language/mp_de_de/menu_de_de.rc differ diff --git a/minipath/language/mp_de_de/strings_de_de.rc b/minipath/language/mp_de_de/strings_de_de.rc index 40c685c7f..e4d71b56d 100644 Binary files a/minipath/language/mp_de_de/strings_de_de.rc and b/minipath/language/mp_de_de/strings_de_de.rc differ diff --git a/minipath/language/mp_en_gb/dialogs_en_gb.rc b/minipath/language/mp_en_gb/dialogs_en_gb.rc index 8d51243d6..62c95f95b 100644 Binary files a/minipath/language/mp_en_gb/dialogs_en_gb.rc and b/minipath/language/mp_en_gb/dialogs_en_gb.rc differ diff --git a/minipath/language/mp_en_us/dialogs_en_us.rc b/minipath/language/mp_en_us/dialogs_en_us.rc index 016ed9fbf..08604436d 100644 Binary files a/minipath/language/mp_en_us/dialogs_en_us.rc and b/minipath/language/mp_en_us/dialogs_en_us.rc differ diff --git a/minipath/language/mp_es_es/dialogs_es_es.rc b/minipath/language/mp_es_es/dialogs_es_es.rc index 73d8b06ae..403af6a87 100644 Binary files a/minipath/language/mp_es_es/dialogs_es_es.rc and b/minipath/language/mp_es_es/dialogs_es_es.rc differ diff --git a/minipath/language/mp_fr_fr/dialogs_fr_fr.rc b/minipath/language/mp_fr_fr/dialogs_fr_fr.rc index 6f1370c4c..12cfc185d 100644 Binary files a/minipath/language/mp_fr_fr/dialogs_fr_fr.rc and b/minipath/language/mp_fr_fr/dialogs_fr_fr.rc differ diff --git a/minipath/language/mp_nl_nl/dialogs_nl_nl.rc b/minipath/language/mp_nl_nl/dialogs_nl_nl.rc index d9aa35314..d797d4893 100644 Binary files a/minipath/language/mp_nl_nl/dialogs_nl_nl.rc and b/minipath/language/mp_nl_nl/dialogs_nl_nl.rc differ diff --git a/minipath/src/Dialogs.c b/minipath/src/Dialogs.c index cf07f48da..75105e7d2 100644 --- a/minipath/src/Dialogs.c +++ b/minipath/src/Dialogs.c @@ -103,11 +103,11 @@ BOOL GetDirectory(HWND hwndParent,int iTitle,LPWSTR pszFolder,LPCWSTR pszBase,BO BROWSEINFO bi; LPITEMIDLIST pidl; - WCHAR szTitle[256]; - WCHAR szBase[MAX_PATH]; + WCHAR szTitle[256] = { L'\0' }; + WCHAR szBase[MAX_PATH] = { L'\0' }; BOOL fOk = FALSE; - lstrcpy(szTitle,L""); + lstrcpy(szTitle, L""); GetLngString(iTitle,szTitle,COUNTOF(szTitle)); if (!pszBase || !*pszBase) @@ -146,7 +146,7 @@ BOOL GetDirectory2(HWND hwndParent,int iTitle,LPWSTR pszFolder,int iBase) BROWSEINFO bi; LPITEMIDLIST pidl,pidlRoot; - WCHAR szTitle[256]; + WCHAR szTitle[256] = { L'\0' }; BOOL fOk = FALSE; lstrcpy(szTitle,L""); @@ -175,7 +175,6 @@ BOOL GetDirectory2(HWND hwndParent,int iTitle,LPWSTR pszFolder,int iBase) CoTaskMemFree(pidlRoot); return fOk; - } @@ -548,9 +547,7 @@ INT_PTR CALLBACK GotoDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) // void GotoDlg(HWND hwnd) { - ThemedDialogBox(g_hLngResContainer,MAKEINTRESOURCE(IDD_GOTO),hwnd,GotoDlgProc); - } diff --git a/minipath/src/Dlapi.c b/minipath/src/Dlapi.c index 37bd47c79..e291460fa 100644 --- a/minipath/src/Dlapi.c +++ b/minipath/src/Dlapi.c @@ -990,7 +990,6 @@ BOOL DirList_SelectItem(HWND hwnd,LPCWSTR lpszDisplayName,LPCWSTR lpszFullPath) } return(FALSE); - } @@ -1001,15 +1000,16 @@ BOOL DirList_SelectItem(HWND hwnd,LPCWSTR lpszDisplayName,LPCWSTR lpszFullPath) // // Create a valid DL_FILTER structure // -void DirList_CreateFilter(PDL_FILTER pdlf,LPCWSTR lpszFileSpec, - BOOL bExcludeFilter) +void DirList_CreateFilter(PDL_FILTER pdlf,LPCWSTR lpszFileSpec,BOOL bExcludeFilter) { ZeroMemory(pdlf,sizeof(DL_FILTER)); - lstrcpyn(pdlf->tFilterBuf,lpszFileSpec,(DL_FILTER_BUFSIZE-1)); + + if (lpszFileSpec) + lstrcpyn(pdlf->tFilterBuf, lpszFileSpec, (DL_FILTER_BUFSIZE - 1)); + pdlf->bExcludeFilter = bExcludeFilter; - if (!lstrcmp(lpszFileSpec,L"*.*") || !lstrlen(lpszFileSpec)) - return; + if (!lpszFileSpec || !lstrcmp(lpszFileSpec, L"*.*") || !lstrlen(lpszFileSpec)) { return; } pdlf->nCount = 1; pdlf->pFilter[0] = &pdlf->tFilterBuf[0]; // Zeile zum Ausprobieren @@ -1022,7 +1022,6 @@ void DirList_CreateFilter(PDL_FILTER pdlf,LPCWSTR lpszFileSpec, p = StrChr(pdlf->pFilter[pdlf->nCount], L';'); pdlf->nCount++; // Increase number of filters } - } @@ -1540,7 +1539,6 @@ LPITEMIDLIST IL_Create(LPCITEMIDLIST pidl1,UINT cb1, // UINT IL_GetSize(LPCITEMIDLIST pidl) { - LPITEMIDLIST pidlTmp; UINT cb = 0; @@ -1553,9 +1551,7 @@ UINT IL_GetSize(LPCITEMIDLIST pidl) cb += pidlTmp->mkid.cb; - return cb; - } @@ -1572,21 +1568,15 @@ BOOL IL_GetDisplayName(LPSHELLFOLDER lpsf, LPWSTR lpszDisplayName, int nDisplayName) { - STRRET str; - - if (NOERROR == lpsf->lpVtbl->GetDisplayNameOf(lpsf, - pidl, - dwFlags, - &str)) + if (NOERROR == lpsf->lpVtbl->GetDisplayNameOf(lpsf,pidl,dwFlags,&str)) { - // Shlwapi.dll provides new function: return StrRetToBuf(&str,pidl,lpszDisplayName,nDisplayName); + // ...but I suppose my version is faster ;-) /*switch (str.uType) { - case STRRET_WSTR: WideCharToMultiByte(CP_ACP, 0, @@ -1610,7 +1600,6 @@ BOOL IL_GetDisplayName(LPSHELLFOLDER lpsf, break; } - return TRUE;*/ } diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c index 4953299e9..ad6a78a1d 100644 --- a/minipath/src/minipath.c +++ b/minipath/src/minipath.c @@ -2080,7 +2080,7 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam) case IDM_VIEW_OPTIONS: - OptionsPropSheet(hwnd,g_hInstance); + OptionsPropSheet(hwnd, g_hLngResContainer); break;