August 2011 - Wine-Commits - list.winehq.org

Piotr Caban : mshtml: Fix DOCUMENT_NODE handling in nsnode_to_nsstring_rec.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: 0bbc95e4f6f5776a6dfccc80878406cffc78de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbc95e4f6f5776a6dfccc808… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 14:05:23 2011 +0200 mshtml: Fix DOCUMENT_NODE handling in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 33d34b9..2bebf8b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -794,10 +794,12 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo return E_FAIL; } - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIContent, (void**)&nscontent); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDontent interface: %08x\n", nsres); - return E_FAIL; + if(type != DOCUMENT_NODE) { + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIContent, (void**)&nscontent); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIContent interface: %08x\n", nsres); + return E_FAIL; + } } switch(type) { @@ -849,7 +851,8 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo if(type == ELEMENT_NODE) nsIContentSerializer_AppendElementEnd(serializer, nscontent, str); - nsIContent_Release(nscontent); + if(type != DOCUMENT_NODE) + nsIContent_Release(nscontent); return S_OK; }

1 0

Mariusz Pluciński : shell32: Check if known folder' s relative path was passed to function.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: f3bd5210b821826b4787f777c8d7636c9c61ad0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3bd5210b821826b4787f777c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:26:33 2011 +0200 shell32: Check if known folder's relative path was passed to function. All non-virtual known folders must have set relative path field. --- dlls/shell32/shellpath.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8336479..9898bc2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3846,9 +3846,18 @@ static HRESULT WINAPI foldermanager_RegisterFolder( } if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); + { + if(!pKFD->pszRelativePath) + hr = E_INVALIDARG; + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); + } RegCloseKey(hKey); + + if(FAILED(hr)) + SHDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath); } HeapFree(GetProcessHeap(), 0, registryPath);

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders attributes.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: 183bc5006da1ae7d15d31d0555d3f3cb8c9ffd0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=183bc5006da1ae7d15d31d055… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:25:17 2011 +0200 shell32/tests: Add verification of known folders attributes. --- dlls/shell32/tests/shellpath.c | 319 +++++++++++++++++++++++++++------------- 1 files changed, 213 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=183bc5006da1ae7d15d31…

1 0

Frédéric Delanoy : cmd/tests: Add FOR /A tests.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: 28fe027eee5d093aa3fd99839161a907cdd568d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fe027eee5d093aa3fd99839… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 16:01:48 2011 +0200 cmd/tests: Add FOR /A tests. --- programs/cmd/tests/test_builtins.cmd | 79 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 70 ++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a27c833..a83e568 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -385,6 +385,85 @@ rem for /L %%i in (1,1,1) do echo %%i rem for /L %%i in (1,-2,-1) do echo %%i rem for /L %%i in (-1,-1,-1) do echo %%i rem for /L %%i in (1,2, 3) do echo %%i +echo ...for /a +rem No output when using "set expr" syntax, unless in interactive mode +rem Need to use "set envvar=expr" to use in a batch script +echo ......individual operations +set var=0 +set /a var=1 +2 & echo %var% +set /a var=1 +-2 & echo %var% +set /a var=1 --2 & echo %var% +set /a var=2* 3 & echo %var% +set /a var=-2* -5 & echo %var% +set /a var=12/3 & echo %var% +set /a var=13/3 & echo %var% +set /a var=-13/3 & echo %var% +rem FIXME Divide by zero should return an error, but error messages cannot be tested with current infrastructure +set /a var=5 %% 5 & echo %var% +set /a var=5 %% 3 & echo %var% +set /a var=5 %% -3 & echo %var% +set /a var=-5 %% -3 & echo %var% +set /a var=1 ^<^< 0 & echo %var% +set /a var=1 ^<^< 2 & echo %var% +set /a var=1 ^<^< -2 & echo %var% +set /a var=-1 ^<^< -2 & echo %var% +set /a var=-1 ^<^< 2 & echo %var% +set /a var=9 ^>^> 0 & echo %var% +set /a var=9 ^>^> 2 & echo %var% +set /a var=9 ^>^> -2 & echo %var% +set /a var=-9 ^>^> -2 & echo %var% +set /a var=-9 ^>^> 2 & echo %var% +set /a var=5 ^& 0 & echo %var% +set /a var=5 ^& 1 & echo %var% +set /a var=5 ^& 3 & echo %var% +set /a var=5 ^& 4 & echo %var% +set /a var=5 ^& 1 & echo %var% +set /a var=5 ^| 0 & echo %var% +set /a var=5 ^| 1 & echo %var% +set /a var=5 ^| 3 & echo %var% +set /a var=5 ^| 4 & echo %var% +set /a var=5 ^| 1 & echo %var% +set /a var=5 ^^ 0 & echo %var% +set /a var=5 ^^ 1 & echo %var% +set /a var=5 ^^ 3 & echo %var% +set /a var=5 ^^ 4 & echo %var% +set /a var=5 ^^ 1 & echo %var% +echo ......precedence and grouping +set /a var=4 + 2*3 & echo %var% +set /a var=(4+2)*3 & echo %var% +set /a var=4 * 3/5 & echo %var% +set /a var=(4 * 3)/5 & echo %var% +set /a var=4 * 5 %% 4 & echo %var% +set /a var=4 * (5 %% 4) & echo %var% +set /a var=3 %% (5 + 8 %% 3 ^^ 2) & echo %var% +set /a var=3 %% (5 + 8 %% 3 ^^ -2) & echo %var% +echo ......octal and hexadecimal +set /a var=0xf + 3 & echo %var% +set /a var=0xF + 3 & echo %var% +set /a var=015 + 2 & echo %var% +set /a var=3, 8+3,0 & echo %var% +echo ......variables +set /a var=foo=3, foo+1 & echo %var% +if defined foo (echo %foo%) else ( + echo foo not defined +) +set /a var=foo=3, foo+=1 & echo %var% +set /a var=foo=3, bar=1, bar+=foo, bar & echo %var% +set /a var=foo*= foo & echo %var% +set /a var=whateverNonExistingVar & echo %var% +set /a var=whateverNonExistingVar + bar & echo %var% +set /a var=foo -= foo + 7 & echo %var% +set /a var=foo /= 3 + 2 & echo %var% +set /a var=foo=5, foo %%=2 & echo %var% +set /a var=foo ^<^<= 2 & echo %var% +set /a var=foo ^>^>= 2 & echo %var% +set /a var=foo ^&= 2 & echo %var% +set /a var=foo=5, foo ^|= 2 & echo %var% +set /a var=foo=5, foo ^^= 2 & echo %var% +set /a var=foo=19, foo %%= 4 + (bar %%= 7) & echo. +set foo= +set bar= +set var= echo -----------Testing del /a----------- del /f/q *.test > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c4f0d76..ec0ece4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -253,6 +253,76 @@ bar -1 @todo_wine(a)ErrorLevel 0 @todo_wine(a)ErrorLevel 0 +...for /a +......individual operations +0 +(a)todo_wine@3 +(a)todo_wine@-1 +(a)todo_wine@3 +(a)todo_wine@6 +(a)todo_wine@10 +(a)todo_wine@4 +(a)todo_wine@4 +(a)todo_wine@-4 +0 +(a)todo_wine@2 +(a)todo_wine@2 +(a)todo_wine@-2 +(a)todo_wine@1 +(a)todo_wine@4 +0(a)or_broken@1073741824 +0(a)or_broken@-1073741824 +(a)todo_wine@-4 +(a)todo_wine@9 +(a)todo_wine@2 +0 +(a)todo_wine@-1 +(a)todo_wine@-3 +0 +(a)todo_wine@1 +(a)todo_wine@1 +(a)todo_wine@4 +(a)todo_wine@1 +(a)todo_wine@5 +(a)todo_wine@5 +(a)todo_wine@7 +(a)todo_wine@5 +(a)todo_wine@5 +(a)todo_wine@5 +(a)todo_wine@4 +(a)todo_wine@6 +(a)todo_wine@1 +......precedence and grouping +(a)todo_wine@4 +(a)todo_wine@10 +(a)todo_wine@18(a)or_broken@10 +(a)todo_wine@2(a)or_broken@0 +(a)todo_wine@2(a)or_broken@0 +0(a)or_broken@4 +(a)todo_wine@4 +(a)todo_wine@3(a)or_broken@4 +......octal and hexadecimal +(a)todo_wine@3(a)or_broken@4 +(a)todo_wine@18 +(a)todo_wine@18 +(a)todo_wine@15 +......variables +(a)todo_wine@3 +(a)todo_wine@3(a)or_broken@foo not defined +(a)todo_wine@3(a)or_broken@0 +(a)todo_wine@3(a)or_broken@0 +(a)todo_wine@3(a)or_broken@0 +(a)todo_wine@9(a)or_broken@0 +0 +(a)todo_wine@4(a)or_broken@0 +(a)todo_wine@-7(a)or_broken@0 +(a)todo_wine@-1(a)or_broken@0 +(a)todo_wine@5(a)or_broken@0 +(a)todo_wine@4(a)or_broken@0 +(a)todo_wine@1(a)or_broken@0 +0 +(a)todo_wine@5(a)or_broken@0 + -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders definition attributes.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: 20cd9f631bdfff8e10b3098a09799daf016bb452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20cd9f631bdfff8e10b3098a0… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:25:25 2011 +0200 shell32/tests: Add verification of known folders definition attributes. --- dlls/shell32/tests/shellpath.c | 220 ++++++++++++++++++++++++++++++---------- 1 files changed, 164 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20cd9f631bdfff8e10b30…

1 0

Huw Davies : gdi32: Don' t load a font replacement if any face of the real family exists.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: 33532613a8572b6dcae51bfe3bbd23f021d0d085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33532613a8572b6dcae51bfe3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 16:15:58 2011 +0100 gdi32: Don't load a font replacement if any face of the real family exists. --- dlls/gdi32/freetype.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cfe8c37..426dc05 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1613,19 +1613,24 @@ static void LoadReplaceList(void) /* "NewName"="Oldname" */ WideCharToMultiByte(CP_ACP, 0, value, -1, familyA, sizeof(familyA), NULL, NULL); - /* Find the old family and hence all of the font files - in that family */ - LIST_FOR_EACH(family_elem_ptr, &font_list) { - family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(family->FamilyName, data)) { - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName), familyA); - /* Now add a new entry with the new family name */ - AddFontToList(face->file, face->font_data_ptr, face->font_data_size, familyA, family->FamilyName, ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + if(!find_family_from_name(value)) + { + /* Find the old family and hence all of the font files + in that family */ + LIST_FOR_EACH(family_elem_ptr, &font_list) { + family = LIST_ENTRY(family_elem_ptr, Family, entry); + if(!strcmpiW(family->FamilyName, data)) { + LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face = LIST_ENTRY(face_elem_ptr, Face, entry); + TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), + debugstr_w(face->StyleName), familyA); + /* Now add a new entry with the new family name */ + AddFontToList(face->file, face->font_data_ptr, face->font_data_size, + familyA, family->FamilyName, + ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + } + break; } - break; } } /* reset dlen and vlen */

1 0

Piotr Caban : mshtml: Added error handling to get_doc_string.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: e934d847b2323f50dac7d27157de3c4a239a8ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e934d847b2323f50dac7d2715… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 14:05:37 2011 +0200 mshtml: Added error handling to get_doc_string. --- dlls/mshtml/persist.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 7f974f0..b73476b 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -334,6 +334,7 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) LPCWSTR strw; nsAString nsstr; nsresult nsres; + HRESULT hres; if(!This->nsdoc) { WARN("NULL nsdoc\n"); @@ -347,8 +348,12 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) } nsAString_Init(&nsstr, NULL); - nsnode_to_nsstring(nsnode, &nsstr); + hres = nsnode_to_nsstring(nsnode, &nsstr); nsIDOMNode_Release(nsnode); + if(FAILED(hres)) { + nsAString_Finish(&nsstr); + return hres; + } nsAString_GetData(&nsstr, &strw); TRACE("%s\n", debugstr_w(strw)); @@ -357,6 +362,8 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) nsAString_Finish(&nsstr); + if(!*str) + return E_OUTOFMEMORY; return S_OK; }

1 0

Hans Leidekker : msi: Make sure the source directory has a trailing backslash.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

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

Huw Davies : gdi32/tests: Add some GetDIBits tests with zero lines and bits parameters.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: d88151704ea375040b38f9a3289146ddeb4bdfb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88151704ea375040b38f9a32… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:31 2011 +0100 gdi32/tests: Add some GetDIBits tests with zero lines and bits parameters. --- dlls/gdi32/tests/bitmap.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7358ccd..69f4d74 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1252,6 +1252,28 @@ static void test_GetDIBits_selected_DIB(UINT bpp) ok( !memcmp( bits, bits2, dib_size ), "bit mismatch (bpp %d)\n", bpp ); + /* Test various combinations of lines = 0 and bits2 = NULL */ + memset( info2->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); + res = GetDIBits( dc, dib, 0, 0, bits2, info2, DIB_RGB_COLORS ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); + ok( !memcmp( info->bmiColors, info2->bmiColors, (1 << bpp) * sizeof(RGBQUAD) ), + "color table mismatch (bpp %d)\n", bpp ); + + memset( info2->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); + res = GetDIBits( dc, dib, 0, 0, NULL, info2, DIB_RGB_COLORS ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); + ok( !memcmp( info->bmiColors, info2->bmiColors, (1 << bpp) * sizeof(RGBQUAD) ), + "color table mismatch (bpp %d)\n", bpp ); + + memset( info2->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); + res = GetDIBits( dc, dib, 0, info->bmiHeader.biHeight, NULL, info2, DIB_RGB_COLORS ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); + ok( !memcmp( info->bmiColors, info2->bmiColors, (1 << bpp) * sizeof(RGBQUAD) ), + "color table 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); @@ -1364,7 +1386,8 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) /* Get the palette indices */ res = GetDIBits(dc, ddb, 0, 0, NULL, info2, DIB_PAL_COLORS); - ok( res, "got %d (bpp %d)\n", res, bpp ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); for (i = 0; i < (1 << info->bmiHeader.biBitCount); i++) ok( colors[i] == i, "%d: got %d (bpp %d)\n", i, colors[i], bpp );

1 0

Huw Davies : gdi32/tests: Simplify some of the tests.
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

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