December 2011 - Wine-Commits

Francois Gouget : ole32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: d21c37a8607145b8f6bf0828ff3757a9adcf1e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21c37a8607145b8f6bf0828f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:09 2011 +0100 ole32: Avoid hardcoding the Unicode string literal lengths. --- dlls/ole32/comcat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 93e1f26..b3cd889 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -1333,7 +1333,7 @@ static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct( This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); if (This) { - WCHAR prefix[6] = { 'C', 'L', 'S', 'I', 'D', '\\' }; + WCHAR prefix[] = { 'C', 'L', 'S', 'I', 'D', '\\' }; This->lpVtbl = &COMCAT_CATID_IEnumGUID_Vtbl; memcpy(This->keyname, prefix, sizeof(prefix));

1 0

Francois Gouget : quartz: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: e8f42fb29efc5e3b4e871c3a18651f0e1dbd7253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f42fb29efc5e3b4e871c3a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:04 2011 +0100 quartz: Avoid hardcoding the Unicode string literal lengths. --- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/regsvr.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ab72f4f..6d3e554 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -60,9 +60,9 @@ static inline AsyncReader *impl_from_IFileSourceFilter( IFileSourceFilter *iface return (AsyncReader *)((char*)iface - FIELD_OFFSET(AsyncReader, lpVtblFSF)); } -static WCHAR const mediatype_name[11] = { +static WCHAR const mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; -static WCHAR const subtype_name[8] = { +static WCHAR const subtype_name[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index d41e2f5..db5428e 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -124,43 +124,43 @@ static HRESULT unregister_filters(struct regsvr_filter const *list); /*********************************************************************** * static string constants */ -static WCHAR const interface_keyname[10] = { +static WCHAR const interface_keyname[] = { 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { +static WCHAR const base_ifa_keyname[] = { 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { +static WCHAR const num_methods_keyname[] = { 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { +static WCHAR const ps_clsid_keyname[] = { 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { +static WCHAR const ps_clsid32_keyname[] = { 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { +static WCHAR const clsid_keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { +static WCHAR const curver_keyname[] = { 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { +static WCHAR const ips_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; -static WCHAR const ips32_keyname[15] = { +static WCHAR const ips32_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { +static WCHAR const progid_keyname[] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { +static WCHAR const viprogid_keyname[] = { 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; -static WCHAR const mediatype_name[11] = { +static WCHAR const mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; -static WCHAR const subtype_valuename[8] = { +static WCHAR const subtype_valuename[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; -static WCHAR const sourcefilter_valuename[14] = { +static WCHAR const sourcefilter_valuename[] = { 'S', 'o', 'u', 'r', 'c', 'e', ' ', 'F', 'i', 'l', 't', 'e', 'r', 0 }; -static WCHAR const extensions_keyname[11] = { +static WCHAR const extensions_keyname[] = { 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', 0 }; /*********************************************************************** @@ -209,7 +209,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) } if (0 <= list->num_methods) { - static WCHAR const fmt[3] = { '%', 'd', 0 }; + static WCHAR const fmt[] = { '%', 'd', 0 }; HKEY key; res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,

1 0

Francois Gouget : cmd: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: eb109f46e33011f5b23eb4c684346a24e89d4643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb109f46e33011f5b23eb4c68… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:23 2011 +0100 cmd: Avoid hardcoding the Unicode string literal lengths. --- programs/cmd/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index d58351e..8b556f7 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -562,7 +562,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le static void WCMD_dir_trailer(WCHAR drive) { ULARGE_INTEGER avail, total, freebytes; DWORD status; - WCHAR driveName[4] = {'c',':','\\','\0'}; + WCHAR driveName[] = {'c',':','\\','\0'}; driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes);

1 0

Francois Gouget : strmbase: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 7b8d9e84ac2c3cb7426de19b62845e541e1fcc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8d9e84ac2c3cb7426de19b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:11 2011 +0100 strmbase: Avoid hardcoding the Unicode string literal lengths. --- dlls/strmbase/dllfunc.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index adb5655..41d8b6b 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -53,14 +53,10 @@ static LONG server_locks = 0; */ #define MAX_KEY_LEN 260 -static WCHAR const clsid_keyname[6] = -{'C','L','S','I','D',0 }; -static WCHAR const ips32_keyname[15] = -{'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; -static WCHAR const tmodel_keyname[15] = -{'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; -static WCHAR const tmodel_both[] = -{'B','o','t','h',0}; +static WCHAR const clsid_keyname[] = {'C','L','S','I','D',0 }; +static WCHAR const ips32_keyname[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; +static WCHAR const tmodel_keyname[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; +static WCHAR const tmodel_both[] = {'B','o','t','h',0}; /* * SetupRegisterClass()

1 0

Francois Gouget : kernel32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 632ac0b227ec9631543b36da8c990c8498a56c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=632ac0b227ec9631543b36da8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:08:23 2011 +0100 kernel32: Avoid hardcoding the Unicode string literal lengths. --- dlls/kernel32/console.c | 3 +-- dlls/kernel32/tests/atom.c | 8 ++++---- dlls/kernel32/tests/codepage.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e66e9b8..2ca74c9 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2430,8 +2430,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber break; case '\t': { - WCHAR tmp[8] = {' ',' ',' ',' ',' ',' ',' ',' '}; - + static const WCHAR tmp[] = {' ',' ',' ',' ',' ',' ',' ',' '}; if (!write_block(hConsoleOutput, &csbi, mode, tmp, ((csbi.dwCursorPosition.X + 8) & ~7) - csbi.dwCursorPosition.X)) goto the_end; diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 15ef04c..a0f99d1 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -168,11 +168,11 @@ static void test_get_atom_name(void) if (unicode_OS) { - static const WCHAR sampleW[10] = {'.','.','.','.','.','.','.','.','.','.'}; + static const WCHAR sampleW[] = {'.','.','.','.','.','.','.','.','.','.'}; for (i = 0; i < 10; i++) bufW[i] = '.'; ok( !GlobalGetAtomNameW( atom, bufW, 0 ), "succeeded\n" ); - ok( !memcmp( bufW, sampleW, 10 * sizeof(WCHAR) ), "should not touch buffer\n" ); + ok( !memcmp( bufW, sampleW, sizeof(sampleW) ), "should not touch buffer\n" ); } /* Test integer atoms */ @@ -442,11 +442,11 @@ static void test_local_get_atom_name(void) if (unicode_OS) { - static const WCHAR sampleW[10] = {'.','.','.','.','.','.','.','.','.','.'}; + static const WCHAR sampleW[] = {'.','.','.','.','.','.','.','.','.','.'}; for (i = 0; i < 10; i++) bufW[i] = '.'; ok( !GetAtomNameW( atom, bufW, 0 ), "succeeded\n" ); - ok( !memcmp( bufW, sampleW, 10 * sizeof(WCHAR) ), "should not touch buffer\n" ); + ok( !memcmp( bufW, sampleW, sizeof(sampleW) ), "should not touch buffer\n" ); } /* Test integer atoms */ diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8f9c4e1..61bcf54 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -211,8 +211,8 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) int ret; WCHAR wc1 = 228; /* Western Windows-1252 character */ WCHAR wc2 = 1088; /* Russian Windows-1251 character not displayable for Windows-1252 */ - WCHAR wcs[5] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ - WCHAR dbwcs[3] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ + static const WCHAR wcs[] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ + static const WCHAR dbwcs[] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar);

1 0

Francois Gouget : krnl386.exe16: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 95577f33681b3c880fbf83a7e75bfbc00e13beb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95577f33681b3c880fbf83a7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:35 2011 +0100 krnl386.exe16: Avoid hardcoding the Unicode string literal lengths. --- dlls/krnl386.exe16/int21.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f8e235a..241ecc1 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -599,7 +599,7 @@ static WORD INT21_GetHeapSelector( CONTEXT *context ) */ static BOOL INT21_FillDrivePB( BYTE drive ) { - WCHAR drivespec[3] = {'A', ':', 0}; + WCHAR drivespec[] = {'A', ':', 0}; INT21_HEAP *heap = INT21_GetHeapPointer(); INT21_DPB *dpb; UINT drivetype;

1 0

Francois Gouget : gdi32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 2ae10acb615b2778dbc645126bd22bc298293e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae10acb615b2778dbc645126… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:08:31 2011 +0100 gdi32: Avoid hardcoding the Unicode string literal lengths. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9762230..9b07b97 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -410,7 +410,7 @@ static const WCHAR FixedSys_Value[] = {'F','I','X','E','D','F','O','N','.','F',' static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; -static const WCHAR * const SystemFontValues[4] = { +static const WCHAR * const SystemFontValues[] = { System_Value, OEMFont_Value, FixedSys_Value,

1 0

Francois Gouget : riched20: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 8dd66bc927ba0ac3f4ce9745b90da372fce46185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd66bc927ba0ac3f4ce9745b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:45 2011 +0100 riched20: Avoid hardcoding the Unicode string literal lengths. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 45047bd..a5e5d50 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -927,7 +927,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, if (!editor->bEmulateVersion10 && cursor.pRun->member.run.nFlags & MERF_ENDPARA) { - static const WCHAR szEOL[2] = { '\r', '\n' }; + static const WCHAR szEOL[] = { '\r', '\n' }; /* richedit 2.0 - all line breaks are \r\n */ if (dwFormat & SF_UNICODE)

1 0

Francois Gouget : windowscodecs: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 268d364e1f0b1b0c4ecd3d5df7f46b7096875c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=268d364e1f0b1b0c4ecd3d5df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:31 2011 +0100 windowscodecs: Avoid hardcoding the Unicode string literal lengths. --- dlls/windowscodecs/regsvr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index bc12e40..9b7baea 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -99,19 +99,19 @@ static HRESULT unregister_converters(struct regsvr_converter const *list); /*********************************************************************** * static string constants */ -static WCHAR const clsid_keyname[6] = { +static WCHAR const clsid_keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { +static WCHAR const curver_keyname[] = { 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { +static WCHAR const ips_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; -static WCHAR const ips32_keyname[15] = { +static WCHAR const ips32_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { +static WCHAR const progid_keyname[] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { +static WCHAR const viprogid_keyname[] = { 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 };

1 0

Alexandre Julliard : comctl32: Use GetDIBits to retrieve the default color map for an imagelist DIB section .
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: e0fc985f32b7f97f51cd662edb0ef4e695eeac91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fc985f32b7f97f51cd662ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 14:20:05 2011 +0100 comctl32: Use GetDIBits to retrieve the default color map for an imagelist DIB section. --- dlls/comctl32/imagelist.c | 48 ++++++++++---------------------------------- 1 files changed, 11 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 4e71795..c1edbdf 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3093,54 +3093,28 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - VOID* bits; - BITMAPINFO *bmi; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", sz.cx, sz.cy, himl->uBitsPixel); - if (himl->uBitsPixel <= ILC_COLOR8) - { - LPPALETTEENTRY pal; - ULONG i, colors; - BYTE temp; - - colors = 1 << himl->uBitsPixel; - bmi = Alloc(sizeof(BITMAPINFOHEADER) + - sizeof(PALETTEENTRY) * colors); - - pal = (LPPALETTEENTRY)bmi->bmiColors; - GetPaletteEntries(GetStockObject(DEFAULT_PALETTE), 0, colors, pal); - - /* Swap colors returned by GetPaletteEntries so we can use them for - * CreateDIBSection call. */ - for (i = 0; i < colors; i++) - { - temp = pal[i].peBlue; - bmi->bmiColors[i].rgbRed = pal[i].peRed; - bmi->bmiColors[i].rgbBlue = temp; - } - } - else - { - bmi = Alloc(sizeof(BITMAPINFOHEADER)); - } - + memset( buffer, 0, sizeof(buffer) ); bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = sz.cx; bmi->bmiHeader.biHeight = sz.cy; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biBitCount = himl->uBitsPixel; bmi->bmiHeader.biCompression = BI_RGB; - bmi->bmiHeader.biSizeImage = 0; - bmi->bmiHeader.biXPelsPerMeter = 0; - bmi->bmiHeader.biYPelsPerMeter = 0; - bmi->bmiHeader.biClrUsed = 0; - bmi->bmiHeader.biClrImportant = 0; - - hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, &bits, 0, 0); - Free (bmi); + if (himl->uBitsPixel <= ILC_COLOR8) + { + /* retrieve the default color map */ + HBITMAP tmp = CreateBitmap( 1, 1, 1, 1, NULL ); + GetDIBits( hdc, tmp, 0, 0, NULL, bmi, DIB_RGB_COLORS ); + DeleteObject( tmp ); + } + hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0); } else /*if (ilc == ILC_COLORDDB)*/ {

1 0