wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Huw Davies : gdi32/tests: Simplify some of the tests.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 3a2d8b74cf5335cb17d305ebbba67cb209b70c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2d8b74cf5335cb17d305ebb… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:30 2011 +0100 gdi32/tests: Simplify some of the tests. --- dlls/gdi32/tests/bitmap.c | 131 +++++++++++++-------------------------------- 1 files changed, 37 insertions(+), 94 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f12a40e..7358ccd 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1185,34 +1185,31 @@ static void test_bmBits(void) static void test_GetDIBits_selected_DIB(UINT bpp) { HBITMAP dib; - BITMAPINFO * info; - BITMAPINFO * info2; + char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)bmibuf; + BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; void * bits; void * bits2; UINT dib_size, dib32_size; DWORD pixel; HDC dib_dc, dc; HBITMAP old_bmp; - BOOL equalContents; UINT i; int res; /* Create a DIB section with a color table */ - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD)); - info2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD)); - assert(info); - assert(info2); - - info->bmiHeader.biSize = sizeof(info->bmiHeader); - - /* Choose width and height such that the row length (in bytes) - is a multiple of 4 (makes things easier) */ - info->bmiHeader.biWidth = 32; - info->bmiHeader.biHeight = 32; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bpp; - info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = 32; + info->bmiHeader.biHeight = 32; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bpp; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; for (i=0; i < (1u << bpp); i++) { @@ -1224,7 +1221,6 @@ static void test_GetDIBits_selected_DIB(UINT bpp) } dib = CreateDIBSection(NULL, info, DIB_RGB_COLORS, &bits, NULL, 0); - assert(dib); dib_size = bpp * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; dib32_size = 32 * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; @@ -1239,44 +1235,27 @@ static void test_GetDIBits_selected_DIB(UINT bpp) old_bmp = SelectObject(dib_dc, dib); dc = CreateCompatibleDC(NULL); bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib32_size); - assert(bits2); /* Copy the DIB attributes but not the color table */ memcpy(info2, info, sizeof(BITMAPINFOHEADER)); res = GetDIBits(dc, dib, 0, info->bmiHeader.biHeight, bits2, info2, DIB_RGB_COLORS); - ok(res, "GetDIBits failed\n"); + ok( res == info->bmiHeader.biHeight, "got %d (bpp %d)\n", res, bpp ); /* Compare the color table and the bits */ - equalContents = TRUE; for (i=0; i < (1u << bpp); i++) - { - if ((info->bmiColors[i].rgbRed != info2->bmiColors[i].rgbRed) - || (info->bmiColors[i].rgbGreen != info2->bmiColors[i].rgbGreen) - || (info->bmiColors[i].rgbBlue != info2->bmiColors[i].rgbBlue) - || (info->bmiColors[i].rgbReserved != info2->bmiColors[i].rgbReserved)) - { - equalContents = FALSE; - break; - } - } - ok(equalContents, "GetDIBits with DIB selected in DC: Invalid DIB color table\n"); + ok( info->bmiColors[i].rgbRed == info2->bmiColors[i].rgbRed && + info->bmiColors[i].rgbGreen == info2->bmiColors[i].rgbGreen && + info->bmiColors[i].rgbBlue == info2->bmiColors[i].rgbBlue && + info->bmiColors[i].rgbReserved == info2->bmiColors[i].rgbReserved, + "color table entry %d differs (bpp %d)\n", i, bpp ); - equalContents = TRUE; - for (i=0; i < dib_size / sizeof(DWORD); i++) - { - if (((DWORD *)bits)[i] != ((DWORD *)bits2)[i]) - { - equalContents = FALSE; - break; - } - } - ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); + ok( !memcmp( bits, bits2, dib_size ), "bit mismatch (bpp %d)\n", bpp ); /* Map into a 32bit-DIB */ info2->bmiHeader.biBitCount = 32; res = GetDIBits(dc, dib, 0, info->bmiHeader.biHeight, bits2, info2, DIB_RGB_COLORS); - ok(res, "GetDIBits failed\n"); + ok( res == info->bmiHeader.biHeight, "got %d (bpp %d)\n", res, bpp ); /* Check if last pixel was set */ pixel = ((DWORD *)bits2)[info->bmiHeader.biWidth * info->bmiHeader.biHeight - 1]; @@ -1288,21 +1267,19 @@ static void test_GetDIBits_selected_DIB(UINT bpp) SelectObject(dib_dc, old_bmp); DeleteDC(dib_dc); DeleteObject(dib); - - HeapFree(GetProcessHeap(), 0, info2); - HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits_selected_DDB(BOOL monochrome) { HBITMAP ddb; - BITMAPINFO * info; - BITMAPINFO * info2; + char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)bmibuf; + BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; void * bits; void * bits2; HDC ddb_dc, dc; HBITMAP old_bmp; - BOOL equalContents; UINT width, height; UINT bpp; UINT i, j; @@ -1337,11 +1314,6 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) } SelectObject(ddb_dc, old_bmp); - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - info2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - assert(info); - assert(info2); - info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = height; @@ -1357,12 +1329,10 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage); bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage); - assert(bits); - assert(bits2); /* Get the bits */ res = GetDIBits(dc, ddb, 0, height, bits, info, DIB_RGB_COLORS); - ok(res, "GetDIBits failed\n"); + ok( res == height, "got %d (bpp %d)\n", res, bpp ); /* Copy the DIB attributes but not the color table */ memcpy(info2, info, sizeof(BITMAPINFOHEADER)); @@ -1372,58 +1342,34 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) /* Get the bits */ res = GetDIBits(dc, ddb, 0, height, bits2, info2, DIB_RGB_COLORS); - ok(res, "GetDIBits failed\n"); + ok( res == height, "got %d (bpp %d)\n", res, bpp ); /* Compare the color table and the bits */ if (bpp <= 8) { - equalContents = TRUE; for (i=0; i < (1u << bpp); i++) - { - if ((info->bmiColors[i].rgbRed != info2->bmiColors[i].rgbRed) - || (info->bmiColors[i].rgbGreen != info2->bmiColors[i].rgbGreen) - || (info->bmiColors[i].rgbBlue != info2->bmiColors[i].rgbBlue) - || (info->bmiColors[i].rgbReserved != info2->bmiColors[i].rgbReserved)) - { - equalContents = FALSE; - break; - } - } - ok(equalContents, "GetDIBits with DDB selected in DC: Got a different color table\n"); + ok( info->bmiColors[i].rgbRed == info2->bmiColors[i].rgbRed && + info->bmiColors[i].rgbGreen == info2->bmiColors[i].rgbGreen && + info->bmiColors[i].rgbBlue == info2->bmiColors[i].rgbBlue && + info->bmiColors[i].rgbReserved == info2->bmiColors[i].rgbReserved, + "color table entry %d differs (bpp %d)\n", i, bpp ); } - equalContents = TRUE; - for (i=0; i < info->bmiHeader.biSizeImage / sizeof(DWORD); i++) - { - if (((DWORD *)bits)[i] != ((DWORD *)bits2)[i]) - { - equalContents = FALSE; - } - } - ok(equalContents, "GetDIBits with DDB selected in DC: Got different DIB bits\n"); + ok( !memcmp( bits, bits2, info->bmiHeader.biSizeImage ), "bit mismatch (bpp %d)\n", bpp ); /* Test the palette */ - equalContents = TRUE; if (info2->bmiHeader.biBitCount <= 8) { WORD *colors = (WORD*)info2->bmiColors; /* Get the palette indices */ res = GetDIBits(dc, ddb, 0, 0, NULL, info2, DIB_PAL_COLORS); - ok(res, "GetDIBits failed\n"); + ok( res, "got %d (bpp %d)\n", res, bpp ); - for (i=0;i < 1 << info->bmiHeader.biSizeImage; i++) - { - if (colors[i] != i) - { - equalContents = FALSE; - break; - } - } + for (i = 0; i < (1 << info->bmiHeader.biBitCount); i++) + ok( colors[i] == i, "%d: got %d (bpp %d)\n", i, colors[i], bpp ); } - ok(equalContents, "GetDIBits with DDB selected in DC: non 1:1 palette indices\n"); - HeapFree(GetProcessHeap(), 0, bits2); HeapFree(GetProcessHeap(), 0, bits); DeleteDC(dc); @@ -1431,9 +1377,6 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) SelectObject(ddb_dc, old_bmp); DeleteDC(ddb_dc); DeleteObject(ddb); - - HeapFree(GetProcessHeap(), 0, info2); - HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits(void)

1 0

Hans Leidekker : msi: Make sure the source directory has a trailing backslash.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 7b7c95425a8d23ca0a30756017018aca32533702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7c95425a8d23ca0a3075601… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 4 13:34:07 2011 +0200 msi: Make sure the source directory has a trailing backslash. --- dlls/msi/media.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 9f29ef7..c879af1 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -712,6 +712,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) msi_set_sourcedir_props(package, FALSE); source_dir = msi_dup_property(package->db, szSourceDir); lstrcpyW(mi->sourcedir, source_dir); + PathAddBackslashW(mi->sourcedir); mi->type = get_drive_type(source_dir); options = MSICODE_PRODUCT; @@ -797,6 +798,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) } lstrcpyW(mi->sourcedir, volume); + PathAddBackslashW(mi->sourcedir); TRACE("Found network source %s\n", debugstr_w(mi->sourcedir)); return ERROR_SUCCESS; } @@ -827,6 +829,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { /* FIXME: what about SourceDir */ lstrcpyW(mi->sourcedir, source); + PathAddBackslashW(mi->sourcedir); TRACE("Found disk source %s\n", debugstr_w(mi->sourcedir)); return ERROR_SUCCESS; } @@ -866,6 +869,7 @@ UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIA } if ((p = strrchrW(temppath, '\\'))) *p = 0; strcpyW(mi->sourcedir, temppath); + PathAddBackslashW(mi->sourcedir); msi_free(mi->cabinet); mi->cabinet = strdupW(p + 1);

1 0

Kusanagi Kouichi : winex11.drv: Fix a memory leak.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 806e407193a188fbe99420d6f91ce3bb013da59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=806e407193a188fbe99420d6f… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Aug 4 19:38:54 2011 +0900 winex11.drv: Fix a memory leak. --- dlls/winex11.drv/clipboard.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0899815..cda8f9e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2970,8 +2970,13 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent } else { - TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n", - XGetAtomName(display, atype), aformat, cTargetPropList, remain); + if (TRACE_ON(clipboard)) + { + char * const typeName = XGetAtomName(display, atype); + TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n", + typeName, aformat, cTargetPropList, remain); + XFree(typeName); + } wine_tsx11_unlock(); /*

1 0

Frédéric Delanoy : cmd/tests: Add setlocal/ endlocal tests.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 920bdcc4b82b9bb12f0df489296215e997f19c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=920bdcc4b82b9bb12f0df4892… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:47 2011 +0200 cmd/tests: Add setlocal/endlocal tests. --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 +++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2321e12..a27c833 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -650,6 +650,48 @@ call dir /b cd .. rd /s/q foobar +echo ------------ Testing setlocal/endlocal ------------ +call :setError 0 +rem Note: setlocal EnableDelayedExtension already tested in the variable delayed expansion test section +mkdir foobar & cd foobar +echo ...enable/disable extensions +setlocal DisableEXTensions +echo ErrLev: %ErrorLevel% +endlocal +echo ErrLev: %ErrorLevel% +echo @echo off> tmp.cmd +echo echo ErrLev: %%ErrorLevel%%>> tmp.cmd +rem Enabled by default +cmd /C tmp.cmd +cmd /E:OfF /C tmp.cmd +cmd /e:oN /C tmp.cmd + +rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) +echo ...setlocal with corresponding endlocal +echo @echo off> test.cmd +echo echo %%VAR%%>> test.cmd +echo setlocal>> test.cmd +echo set VAR=localval>> test.cmd +echo echo %%VAR%%>> test.cmd +echo endlocal>> test.cmd +echo echo %%VAR%%>> test.cmd +set VAR=globalval +call test.cmd +echo %VAR% +set VAR= +echo ...setlocal with no corresponding endlocal +echo @echo off> test.cmd +echo echo %%VAR%%>> test.cmd +echo setlocal>> test.cmd +echo set VAR=localval>> test.cmd +echo echo %%VAR%%>> test.cmd +set VAR=globalval +call test.cmd +echo %VAR% +set VAR= +cd .. +rd /q/s foobar + echo -----------Testing Errorlevel----------- rem WARNING: Do *not* add tests using ErrorLevel after this section should_not_exist 2> nul > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c430883..c4f0d76 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -331,6 +331,22 @@ foo '' @todo_wine@1 @todo_wine@1 non-builtin dir +------------ Testing setlocal/endlocal ------------ +...enable/disable extensions +@todo_wine@ErrLev:@space@ +ErrLev: 0 +ErrLev: 0 +@todo_wine@ErrLev:@space@@or_broken@ErrLev: 0 +ErrLev: 0 +...setlocal with corresponding endlocal +globalval +localval +globalval +globalval +...setlocal with no corresponding endlocal +globalval +localval +@todo_wine@globalval -----------Testing Errorlevel----------- 9009 1

1 0

Frédéric Delanoy : cmd/tests: Refactor "broken" keyword handling so all cases are handled correctly.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 8d328ff810fa20fa6243956a7e4c353f9719be0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d328ff810fa20fa6243956a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:46 2011 +0200 cmd/tests: Refactor "broken" keyword handling so all cases are handled correctly. --- programs/cmd/tests/batch.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index da96434..3f8826f 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -152,16 +152,6 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; - /* Corner case where exp_line directly starts with @or_broken@, on Windowses */ - if(broken(1) - && exp_line+sizeof(or_broken_cmd) <= exp_end - && !memcmp(exp_line, or_broken_cmd, sizeof(or_broken_cmd))) { - if(out_line == out_end) - return NULL; - else - exp_ptr = exp_line + sizeof(or_broken_cmd); - } - while(exp_ptr < exp_end) { if(*exp_ptr == '@') { if(exp_ptr+sizeof(pwd_cmd) <= exp_end @@ -183,8 +173,10 @@ static const char *compare_line(const char *out_line, const char *out_end, const continue; }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { - exp_ptr = exp_end; - continue; + if(out_ptr == out_end) + return NULL; + else + err = out_ptr; }else if(out_ptr == out_end || *out_ptr != *exp_ptr) err = out_ptr; }else if(out_ptr == out_end || *out_ptr != *exp_ptr) {

1 0

Frédéric Delanoy : cmd/tests: Remove redundant ok check in compare_line function.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 7158257fd86cdf1990274cfda30df1b3c04b9d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7158257fd86cdf1990274cfda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:45 2011 +0200 cmd/tests: Remove redundant ok check in compare_line function. --- programs/cmd/tests/batch.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 67ecd3d..da96434 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -178,7 +178,6 @@ static const char *compare_line(const char *out_line, const char *out_end, const }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); - ok(*out_ptr == ' ', "expected space\n"); if(out_ptr < out_end && *out_ptr == ' ') out_ptr++; continue;

1 0

Frédéric Delanoy : cmd/tests: Ensure failures are caught in all cases when an expected line ends with a '@'.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 5661e9cdcab065bec30b6dd9ae0805a94daf657e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5661e9cdcab065bec30b6dd9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:44 2011 +0200 cmd/tests: Ensure failures are caught in all cases when an expected line ends with a '@'. --- programs/cmd/tests/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index c4ccaab..67ecd3d 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -186,7 +186,8 @@ static const char *compare_line(const char *out_line, const char *out_end, const && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { exp_ptr = exp_end; continue; - } + }else if(out_ptr == out_end || *out_ptr != *exp_ptr) + err = out_ptr; }else if(out_ptr == out_end || *out_ptr != *exp_ptr) { err = out_ptr; }

1 0

Alexandre Julliard : gdi32: Get rid of the DIB_GetBitmapInfo function.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: e5ce32e54d3ec34977e9ee7b3cf891b9f983e21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ce32e54d3ec34977e9ee7b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 14:40:34 2011 +0200 gdi32: Get rid of the DIB_GetBitmapInfo function. --- dlls/gdi32/dib.c | 78 +++++++++++---------------------------------- dlls/gdi32/gdi_private.h | 2 - 2 files changed, 19 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d53289b..5d08c6e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -28,8 +28,7 @@ Most Windows API functions taking a BITMAPINFO* / BITMAPINFOHEADER* also accept the old "core" structures, and so must WINE. - You can distinguish them by looking at the first member (bcSize/biSize), - or use the internal function DIB_GetBitmapInfo. + You can distinguish them by looking at the first member (bcSize/biSize). * The palettes are stored in different formats: @@ -98,70 +97,35 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) } } - -/*********************************************************************** - * DIB_GetBitmapInfo - * - * Get the info from a bitmap header. - * Return 0 for COREHEADER, 1 for INFOHEADER, -1 for error. - */ -int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) -{ - if (!header) return -1; - if (header->biSize == sizeof(BITMAPCOREHEADER)) - { - const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *planes = core->bcPlanes; - *bpp = core->bcBitCount; - *compr = 0; - *size = 0; - return 0; - } - if (header->biSize >= sizeof(BITMAPINFOHEADER)) /* assume BITMAPINFOHEADER */ - { - *width = header->biWidth; - *height = header->biHeight; - *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; - return 1; - } - ERR("(%d): unknown/wrong size for header\n", header->biSize ); - return -1; -} - /******************************************************************************************* * Fill out a true BITMAPINFOHEADER from a variable sized BITMAPINFOHEADER / BITMAPCOREHEADER. */ static BOOL bitmapinfoheader_from_user_bitmapinfo( BITMAPINFOHEADER *dst, const BITMAPINFOHEADER *info ) { - LONG width, height; - WORD planes, bpp; - DWORD compr, size; - int bitmap_type = DIB_GetBitmapInfo( info, &width, &height, &planes, &bpp, &compr, &size ); - - if (bitmap_type == -1) return FALSE; + if (!info) return FALSE; - if (bitmap_type == 1) + if (info->biSize == sizeof(BITMAPCOREHEADER)) { - *dst = *info; - } - else - { - dst->biWidth = width; - dst->biHeight = height; - dst->biPlanes = planes; - dst->biBitCount = bpp; - dst->biCompression = compr; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + dst->biWidth = core->bcWidth; + dst->biHeight = core->bcHeight; + dst->biPlanes = core->bcPlanes; + dst->biBitCount = core->bcBitCount; + dst->biCompression = BI_RGB; dst->biXPelsPerMeter = 0; dst->biYPelsPerMeter = 0; dst->biClrUsed = 0; dst->biClrImportant = 0; } + else if (info->biSize >= sizeof(BITMAPINFOHEADER)) /* assume BITMAPINFOHEADER */ + { + *dst = *info; + } + else + { + WARN( "(%u): unknown/wrong size for header\n", info->biSize ); + return FALSE; + } dst->biSize = sizeof(*dst); if (dst->biCompression == BI_RGB || dst->biCompression == BI_BITFIELDS) @@ -928,11 +892,7 @@ INT WINAPI GetDIBits( /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our own copy and transfer the colour info back at the end */ - if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) - { - ERR("Invalid bitmap format\n"); - return 0; - } + if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) return 0; dst_info->bmiHeader.biClrUsed = 0; dst_info->bmiHeader.biClrImportant = 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0111951..b24f4eb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -338,8 +338,6 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; -extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFOHEADER in CreateDIBitmap.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 3d0f272a0de152f636da12f96550f753dc263bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0f272a0de152f636da12f96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 12:52:23 2011 +0200 gdi32: Create a sanitized BITMAPINFOHEADER in CreateDIBitmap. --- dlls/gdi32/dib.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eebe3dd..d53289b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1159,32 +1159,24 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD init, LPCVOID bits, const BITMAPINFO *data, UINT coloruse ) { + BITMAPINFOHEADER info; HBITMAP handle; - LONG width; LONG height; - WORD planes, bpp; - DWORD compr, size; - if (!header) return 0; + if (!bitmapinfoheader_from_user_bitmapinfo( &info, header )) return 0; + if (info.biWidth < 0) return 0; - if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &size ) == -1) return 0; - - if (width < 0) - { - TRACE("Bitmap has a negative width\n"); - return 0; - } - /* Top-down DIBs have a negative height */ - if (height < 0) height = -height; + height = abs( info.biHeight ); TRACE("hdc=%p, header=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d, bpp=%u, compr=%u)\n", - hdc, header, init, bits, data, coloruse, width, height, bpp, compr); - + hdc, header, init, bits, data, coloruse, info.biWidth, info.biHeight, + info.biBitCount, info.biCompression); + if (hdc == NULL) - handle = CreateBitmap( width, height, 1, 1, NULL ); + handle = CreateBitmap( info.biWidth, height, 1, 1, NULL ); else - handle = CreateCompatibleBitmap( hdc, width, height ); + handle = CreateCompatibleBitmap( hdc, info.biWidth, height ); if (handle) {

1 0

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFOHEADER in GetDIBits.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: a2c99c7353c521524a0cd582cecd1ccc09ec3b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c99c7353c521524a0cd582c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 14:37:32 2011 +0200 gdi32: Create a sanitized BITMAPINFOHEADER in GetDIBits. --- dlls/gdi32/dib.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5f3dd93..eebe3dd 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -918,24 +918,24 @@ INT WINAPI GetDIBits( DC * dc; BITMAPOBJ * bmp; int i; - int bitmap_type; LONG width; LONG height; - WORD planes, bpp; - DWORD compr, size; + WORD bpp; char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; unsigned int colors = 0; const struct gdi_dc_funcs *funcs; - if (!info) return 0; - - bitmap_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size); - if (bitmap_type == -1) + /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our + own copy and transfer the colour info back at the end */ + if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) { ERR("Invalid bitmap format\n"); return 0; } + dst_info->bmiHeader.biClrUsed = 0; + dst_info->bmiHeader.biClrImportant = 0; + if (!(dc = get_dc_ptr( hdc ))) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -951,27 +951,15 @@ INT WINAPI GetDIBits( funcs = bmp->funcs; if (bmp->dib) funcs = dc->dibdrv.dev.funcs; + width = dst_info->bmiHeader.biWidth; + height = dst_info->bmiHeader.biHeight; + bpp = dst_info->bmiHeader.biBitCount; if (bpp == 0) /* query bitmap info only */ { lines = fill_query_info( info, bmp ); goto done; } - /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our - own copy and transfer the colour info back at the end */ - - dst_info->bmiHeader.biSize = sizeof(dst_info->bmiHeader); - dst_info->bmiHeader.biWidth = width; - dst_info->bmiHeader.biHeight = height; - dst_info->bmiHeader.biPlanes = planes; - dst_info->bmiHeader.biBitCount = bpp; - dst_info->bmiHeader.biCompression = compr; - dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); - dst_info->bmiHeader.biXPelsPerMeter = 0; - dst_info->bmiHeader.biYPelsPerMeter = 0; - dst_info->bmiHeader.biClrUsed = 0; - dst_info->bmiHeader.biClrImportant = 0; - switch (bpp) { case 1:

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011