Michael Stefaniuc : shlwapi: Use IS_INTRESOURCE not HIWORD to check a resource.

Alexandre Julliard julliard at winehq.org
Mon Feb 1 08:55:55 CST 2010


Module: wine
Branch: master
Commit: 32ea7ce1a756bb4f3bfa967e9d9ed9b4d1a71fba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=32ea7ce1a756bb4f3bfa967e9d9ed9b4d1a71fba

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Jan 29 21:28:52 2010 +0100

shlwapi: Use IS_INTRESOURCE not HIWORD to check a resource.

---

 dlls/shlwapi/msgbox.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c
index 0936e0b..506bd46 100644
--- a/dlls/shlwapi/msgbox.c
+++ b/dlls/shlwapi/msgbox.c
@@ -147,10 +147,10 @@ INT_PTR WINAPI SHMessageBoxCheckExA(HWND hWnd, HINSTANCE hInst, LPCSTR lpszName,
   WCHAR szNameBuff[MAX_PATH], szIdBuff[MAX_PATH];
   LPCWSTR szName = szNameBuff;
 
-  if (HIWORD(lpszName))
-    MultiByteToWideChar(CP_ACP, 0, lpszName, -1, szNameBuff, MAX_PATH);
-  else
+  if (IS_INTRESOURCE(lpszName))
     szName = (LPCWSTR)lpszName; /* Resource Id or NULL */
+  else
+    MultiByteToWideChar(CP_ACP, 0, lpszName, -1, szNameBuff, MAX_PATH);
 
   MultiByteToWideChar(CP_ACP, 0, lpszId, -1, szIdBuff, MAX_PATH);
 




More information about the wine-cvs mailing list