Skip to content

W
wine-cw
Commit 9a5b0d4f authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

Fixed crash when lpTemplateName is gotten from MAKEINTRESOURCE.

parent cbe749f1
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
dlls/commdlg/colordlg.c
View file @ 9a5b0d4f
......@@ -1468,14 +1468,18 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
lpcc->Flags = lpChCol->Flags;
lpcc->lCustData = lpChCol->lCustData;
lpcc->lpfnHook = (LPCCHOOKPROC) lpChCol->lpfnHook;
if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName))
lpcc->lpTemplateName = HEAP_strdupAtoW(GetProcessHeap(), 0, lpChCol->lpTemplateName);
if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) {
if (HIWORD(lpChCol->lpTemplateName))
lpcc->lpTemplateName = HEAP_strdupAtoW(GetProcessHeap(), 0, lpChCol->lpTemplateName);
else
lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName;
}
ret = ChooseColorW(lpcc);
if (ret)
lpChCol->rgbResult = lpcc->rgbResult;
if (lpcc->lpTemplateName) HeapFree(GetProcessHeap(), 0, (LPSTR)lpcc->lpTemplateName);
if (HIWORD(lpcc->lpTemplateName)) HeapFree(GetProcessHeap(), 0, (LPSTR)lpcc->lpTemplateName);
HeapFree(GetProcessHeap(), 0, lpcc);
return ret;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment