system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 15:45:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when lpTemplateName is gotten from MAKEINTRESOURCE.

Browse source
This commit is contained in:
Eric Pouech 2000-06-25 12:51:14 +00:00 committed by Alexandre Julliard
parent cbe749f16a
commit 9a5b0d4fbf
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/commdlg/colordlg.c
View file

@ -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;
}