system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 08:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

comctl32: Remove LoadString() fallback when loading from same module.

Browse source
This commit is contained in:
Nikolay Sivov 2015-05-18 12:39:33 +03:00 committed by Alexandre Julliard
parent ad49634bbe
commit 6be21eeb3f
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dlls/comctl32/monthcal.c
View file

@ -1018,13 +1018,7 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons
if(infoPtr->dwStyle & MCS_NOTODAY) return; if(infoPtr->dwStyle & MCS_NOTODAY) return;
if (!LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW))) LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW));
{
static const WCHAR todayW[] = { 'T','o','d','a','y',':',0 };
WARN("Can't load resource\n");
strcpyW(buf_todayW, todayW);
}
col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1; col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1;
if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--; if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--;
/* label is located below first calendar last row */ /* label is located below first calendar last row */
@ -1984,17 +1978,12 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct
static LRESULT static LRESULT
MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam)
{ {
static const WCHAR todayW[] = { 'G','o',' ','t','o',' ','T','o','d','a','y',':',0 };
HMENU hMenu; HMENU hMenu;
POINT menupoint; POINT menupoint;
WCHAR buf[32]; WCHAR buf[32];
hMenu = CreatePopupMenu(); hMenu = CreatePopupMenu();
if (!LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf))) LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf));
{
WARN("Can't load resource\n");
strcpyW(buf, todayW);
}
AppendMenuW(hMenu, MF_STRING|MF_ENABLED, 1, buf); AppendMenuW(hMenu, MF_STRING|MF_ENABLED, 1, buf);
menupoint.x = (short)LOWORD(lParam); menupoint.x = (short)LOWORD(lParam);
menupoint.y = (short)HIWORD(lParam); menupoint.y = (short)HIWORD(lParam);