diff --git a/dlls/user/resources/user32.rc b/dlls/user/resources/user32.rc index 7be64c79b1f..1367986fcb1 100644 --- a/dlls/user/resources/user32.rc +++ b/dlls/user/resources/user32.rc @@ -24,7 +24,8 @@ #include "dlgs.h" #define MDI_IDC_LISTBOX 100 -#define MDI_IDS_MOREWINDOWS 13 +#define IDS_MDI_MOREWINDOWS 13 +#define IDS_ERROR 2 /* * Everything that does not depend on language, diff --git a/dlls/user/resources/user32_En.rc b/dlls/user/resources/user32_En.rc index f4980217e0f..b38ccc0acd8 100644 --- a/dlls/user/resources/user32_En.rc +++ b/dlls/user/resources/user32_En.rc @@ -77,5 +77,6 @@ END STRINGTABLE DISCARDABLE { - MDI_IDS_MOREWINDOWS "&More Windows..." /* defined in mdi.h */ + IDS_ERROR "Error" + IDS_MDI_MOREWINDOWS "&More Windows..." } diff --git a/dlls/user/resources/user32_Ru.rc b/dlls/user/resources/user32_Ru.rc index e89cec59068..19b8c9cc0f0 100644 --- a/dlls/user/resources/user32_Ru.rc +++ b/dlls/user/resources/user32_Ru.rc @@ -64,3 +64,8 @@ BEGIN PUSHBUTTON "&Íåò", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "Îøèáêà" + IDS_MDI_MOREWINDOWS "&More Windows..." +} diff --git a/dlls/user/resources/user32_Sk.rc b/dlls/user/resources/user32_Sk.rc index 21a101c5636..0d5bb2461cc 100644 --- a/dlls/user/resources/user32_Sk.rc +++ b/dlls/user/resources/user32_Sk.rc @@ -77,5 +77,6 @@ END STRINGTABLE DISCARDABLE { - MDI_IDS_MOREWINDOWS "&Viac okien..." /* defined in mdi.h */ + IDS_ERROR "Error" + IDS_MDI_MOREWINDOWS "&Viac okien..." } diff --git a/dlls/user/resources/user32_Zh.rc b/dlls/user/resources/user32_Zh.rc index af13ace0b05..71194d410c1 100644 --- a/dlls/user/resources/user32_Zh.rc +++ b/dlls/user/resources/user32_Zh.rc @@ -72,7 +72,8 @@ END STRINGTABLE DISCARDABLE { - MDI_IDS_MOREWINDOWS "¸ü¶à´°¿Ú(&M)..." /* defined in mdi.h */ + IDS_ERROR "Error" + IDS_MDI_MOREWINDOWS "¸ü¶à´°¿Ú(&M)..." /* defined in mdi.h */ } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -132,7 +133,8 @@ END STRINGTABLE DISCARDABLE { - MDI_IDS_MOREWINDOWS "¸ü¶àÒ•´°(&M)..." /* defined in mdi.h */ + IDS_ERROR "Error" + IDS_MDI_MOREWINDOWS "¸ü¶àÒ•´°(&M)..." } #pragma code_page(default) diff --git a/windows/mdi.c b/windows/mdi.c index 0241e9a13c2..ad9d058627d 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -114,7 +114,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi); #define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..." option will appear under the Windows menu */ #define MDI_IDC_LISTBOX 100 -#define MDI_IDS_MOREWINDOWS 13 +#define IDS_MDI_MOREWINDOWS 13 #define MDIF_NEEDUPDATE 0x0001 @@ -279,7 +279,7 @@ static BOOL MDI_MenuDeleteItem( HWND client, HWND hWndChild ) if (clientInfo->nActiveChildren - 1 > MDI_MOREWINDOWSLIMIT) { WCHAR szTmp[50]; - LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0])); + LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0])); AppendMenuW(clientInfo->hWindowMenu, MF_STRING, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT, szTmp); } return TRUE; @@ -596,7 +596,7 @@ static HWND MDICreateChild( HWND parent, MDICLIENTINFO *ci, if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1) { WCHAR szTmp[50]; - LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0])); + LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0])); ModifyMenuW(ci->hWindowMenu, ci->idFirstChild + MDI_MOREWINDOWSLIMIT, diff --git a/windows/msgbox.c b/windows/msgbox.c index 58fc3e38acb..80b0dead0ba 100644 --- a/windows/msgbox.c +++ b/windows/msgbox.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dialog); #define MSGBOX_IDICON 1088 #define MSGBOX_IDTEXT 100 +#define IDS_ERROR 2 static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) { @@ -61,8 +62,17 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) if (HIWORD(lpmb->lpszCaption)) { SetWindowTextW(hwnd, lpmb->lpszCaption); } else { - if (LoadStringW(lpmb->hInstance, LOWORD(lpmb->lpszCaption), buf, 256)) - SetWindowTextW(hwnd, buf); + UINT res_id = LOWORD(lpmb->lpszCaption); + if (res_id) + { + if (LoadStringW(lpmb->hInstance, res_id, buf, 256)) + SetWindowTextW(hwnd, buf); + } + else + { + if (LoadStringW(0, IDS_ERROR, buf, 256)) + SetWindowTextW(hwnd, buf); + } } if (HIWORD(lpmb->lpszText)) { lpszText = lpmb->lpszText;