Michael Stefaniuc : comdlg32: Use IS_INTRESOURCE instead of HIWORD to check a resource.
Alexandre Julliard
julliard at winehq.org
Wed Jan 27 12:27:23 CST 2010
Module: wine
Branch: master
Commit: 5b389bacc5b3fc8342852334ca555150164b1a3b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b389bacc5b3fc8342852334ca555150164b1a3b
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Jan 27 12:07:28 2010 +0100
comdlg32: Use IS_INTRESOURCE instead of HIWORD to check a resource.
---
dlls/comdlg32/colordlg.c | 2 +-
dlls/comdlg32/filedlg31.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index 2a61706..ed806ac 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -1366,7 +1366,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
lpcc->lCustData = lpChCol->lCustData;
lpcc->lpfnHook = lpChCol->lpfnHook;
if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) {
- if (HIWORD(lpChCol->lpTemplateName)) {
+ if (!IS_INTRESOURCE(lpChCol->lpTemplateName)) {
INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0);
template_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, template_name, len );
diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index afe5f31..29c6310 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -778,7 +778,7 @@ void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL op
ofnW->lpstrDefExt = FD31_DupToW(ofnA->lpstrDefExt, 3);
if ((ofnA->Flags & OFN_ENABLETEMPLATE) && (ofnA->lpTemplateName))
{
- if (HIWORD(ofnA->lpTemplateName))
+ if (!IS_INTRESOURCE(ofnA->lpTemplateName))
{
RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpTemplateName);
ofnW->lpTemplateName = usBuffer.Buffer;
@@ -801,7 +801,7 @@ void FD31_FreeOfnW(OPENFILENAMEW *ofnW)
HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle);
HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir);
HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle);
- if (HIWORD(ofnW->lpTemplateName))
+ if (!IS_INTRESOURCE(ofnW->lpTemplateName))
HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName);
}
More information about the wine-cvs
mailing list