Nikolay Sivov : comctl32: Remove LoadString() fallback when loading from same module.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 18 07:57:35 CDT 2015
Module: wine
Branch: master
Commit: 6be21eeb3f24885a1b708aacddf1055cf8c91f2a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be21eeb3f24885a1b708aacddf1055cf8c91f2a
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon May 18 12:39:33 2015 +0300
comctl32: Remove LoadString() fallback when loading from same module.
---
dlls/comctl32/monthcal.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 84a01da..a49fad7 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -1018,13 +1018,7 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons
if(infoPtr->dwStyle & MCS_NOTODAY) return;
- if (!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);
- }
-
+ LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW));
col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1;
if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--;
/* 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
MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam)
{
- static const WCHAR todayW[] = { 'G','o',' ','t','o',' ','T','o','d','a','y',':',0 };
HMENU hMenu;
POINT menupoint;
WCHAR buf[32];
hMenu = CreatePopupMenu();
- if (!LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf)))
- {
- WARN("Can't load resource\n");
- strcpyW(buf, todayW);
- }
+ LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf));
AppendMenuW(hMenu, MF_STRING|MF_ENABLED, 1, buf);
menupoint.x = (short)LOWORD(lParam);
menupoint.y = (short)HIWORD(lParam);
More information about the wine-cvs
mailing list