From 3772c73a6ced79339f3d6dc764055b6f28c3b45d Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Mon, 13 Sep 2004 23:22:30 +0000 Subject: [PATCH] CreateDCA -> CreateDCW --- dlls/comctl32/treeview.c | 3 ++- dlls/gdi/enhmetafile.c | 3 ++- dlls/gdi/wing.c | 3 ++- windows/dce.c | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 69edf2adba9..3a26add59ee 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4633,6 +4633,7 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam) static LRESULT TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { + static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; RECT rcClient; TREEVIEW_INFO *infoPtr; @@ -4736,7 +4737,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - hdcScreen = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdcScreen = CreateDCW(szDisplayW, NULL, NULL, NULL); /* Create a coloured bitmap compatible with the screen depth because checkboxes are not black&white */ diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c index c242302bf96..2ac164f2af0 100644 --- a/dlls/gdi/enhmetafile.c +++ b/dlls/gdi/enhmetafile.c @@ -2509,6 +2509,7 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, CONST METAFILEPICT *lpmfp ) { + static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; HMETAFILE hmf = 0; HENHMETAFILE ret = 0; HDC hdc = 0, hdcdisp = 0; @@ -2528,7 +2529,7 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, } if(!hdcRef) - hdcRef = hdcdisp = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdcRef = hdcdisp = CreateDCW(szDisplayW, NULL, NULL, NULL); if(!lpmfp) { lpmfp = &mfp; diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c index a6c24fae5b1..ffd48435f22 100644 --- a/dlls/gdi/wing.c +++ b/dlls/gdi/wing.c @@ -92,12 +92,13 @@ HDC16 WINAPI WinGCreateDC16(void) */ BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi) { + static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; HDC hdc; TRACE("(%p)\n", bmpi); if (!bmpi) return FALSE; - hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL ); + hdc = CreateDCW( szDisplayW, NULL, NULL, NULL ); bmpi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmpi->bmiHeader.biWidth = 320; bmpi->bmiHeader.biHeight = -1; diff --git a/windows/dce.c b/windows/dce.c index 6f0340b2c8d..faba8822dbe 100644 --- a/windows/dce.c +++ b/windows/dce.c @@ -81,10 +81,13 @@ static void DCE_DumpCache(void) */ DCE *DCE_AllocDCE( HWND hWnd, DCE_TYPE type ) { + static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; DCE * dce; + TRACE("(%p,%d)\n", hWnd, type); + if (!(dce = HeapAlloc( GetProcessHeap(), 0, sizeof(DCE) ))) return NULL; - if (!(dce->hDC = CreateDCA( "DISPLAY", NULL, NULL, NULL ))) + if (!(dce->hDC = CreateDCW( szDisplayW, NULL, NULL, NULL ))) { HeapFree( GetProcessHeap(), 0, dce ); return 0;