Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backing out b=418703, caused test 40118 to fail on WINNT 5.2 qm-win2k3-01 dep unit test tinderbox

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@247139 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blassey%mozilla.com
2008-03-05 22:56:48 +00:00
parent 84bba37f5d
commit ca294d36ae
58 changed files with 551 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mozilla/modules/plugin/samples/default/windows/dialogs.cpp
View File

@@ -79,18 +79,17 @@ static BOOL onInitDialog(HWND hWnd, HWND hWndFocus, LPARAM lParam)
pPlugin->m_hWndDialog = hWnd;
wchar_t szString[512];
LoadStringW(hInst, IDS_TITLE, szString, sizeof(szString));
SetWindowTextW(hWnd, szString);
char szString[512];
LoadString(hInst, IDS_TITLE, szString, sizeof(szString));
SetWindowText(hWnd, szString);
LoadStringW(hInst, IDS_INFO, szString, sizeof(szString));
SetDlgItemTextW(hWnd, IDC_STATIC_INFO, szString);
LoadString(hInst, IDS_INFO, szString, sizeof(szString));
SetDlgItemText(hWnd, IDC_STATIC_INFO, szString);
// convert m_pNPMIMEType dougt
SetDlgItemTextA(hWnd, IDC_STATIC_INFOTYPE, pPlugin->m_pNPMIMEType);
SetDlgItemText(hWnd, IDC_STATIC_INFOTYPE, (LPSTR)pPlugin->m_pNPMIMEType);
LoadStringW(hInst, IDS_LOCATION, szString, sizeof(szString));
SetDlgItemTextW(hWnd, IDC_STATIC_LOCATION, szString);
LoadString(hInst, IDS_LOCATION, szString, sizeof(szString));
SetDlgItemText(hWnd, IDC_STATIC_LOCATION, szString);
char contentTypeIsJava = 0;
@@ -100,36 +99,30 @@ static BOOL onInitDialog(HWND hWnd, HWND hWndFocus, LPARAM lParam)
}
if(pPlugin->m_szPageURL == NULL || contentTypeIsJava)
LoadStringW(hInst, IDS_FINDER_PAGE, szString, sizeof(szString));
LoadString(hInst, IDS_FINDER_PAGE, szString, sizeof(szString));
else
{
MultiByteToWideChar( CP_ACP, 0,
pPlugin->m_szPageURL,
strlen(pPlugin->m_szPageURL)+1,
szString,
511 ); // defect #362738
}
strncpy(szString, pPlugin->m_szPageURL,511); // defect #362738
SetDlgItemTextWrapped(hWnd, IDC_STATIC_URL, szString);
LoadStringW(hInst, IDS_QUESTION, szString, sizeof(szString));
SetDlgItemTextW(hWnd, IDC_STATIC_QUESTION, szString);
LoadString(hInst, IDS_QUESTION, szString, sizeof(szString));
SetDlgItemText(hWnd, IDC_STATIC_QUESTION, szString);
SetDlgItemTextW(hWnd, IDC_STATIC_WARNING, L"");
SetDlgItemText(hWnd, IDC_STATIC_WARNING, "");
if(!pPlugin->m_bOnline)
{
EnableWindow(GetDlgItem(hWnd, IDC_GET_PLUGIN), FALSE);
LoadStringW(hInst, IDS_WARNING_OFFLINE, szString, sizeof(szString));
SetDlgItemTextW(hWnd, IDC_STATIC_WARNING, szString);
SetDlgItemTextW(hWnd, IDC_STATIC_QUESTION, L"");
LoadString(hInst, IDS_WARNING_OFFLINE, szString, sizeof(szString));
SetDlgItemText(hWnd, IDC_STATIC_WARNING, szString);
SetDlgItemText(hWnd, IDC_STATIC_QUESTION, "");
return TRUE;
}
if((!pPlugin->m_bJava) || (!pPlugin->m_bJavaScript) || (!pPlugin->m_bSmartUpdate))
{
LoadStringW(hInst, IDS_WARNING_JS, szString, sizeof(szString));
SetDlgItemTextW(hWnd, IDC_STATIC_WARNING, szString);
LoadString(hInst, IDS_WARNING_JS, szString, sizeof(szString));
SetDlgItemText(hWnd, IDC_STATIC_WARNING, szString);
return TRUE;
}