December 2009 - Wine-Commits

Paul Vriens : msi/tests: Fix test failures on Win9x/WinMe.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 4749b079b597fbb780e085207e92aa3418147d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4749b079b597fbb780e085207… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Dec 20 19:42:48 2009 +0100 msi/tests: Fix test failures on Win9x/WinMe. --- dlls/msi/tests/install.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 68f9266..c1e0afc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6988,7 +6988,31 @@ static void test_allusers_prop(void) /* ALLUSERS property set to 2, conditioned on ALLUSERS = 1 */ r = MsiInstallProductA(msifile, "FULL=1"); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + if (r == ERROR_SUCCESS) + { + /* Win9x/WinMe */ + win_skip("Win9x and WinMe act differently with respect to ALLUSERS\n"); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); + } + else + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); } static char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager";

1 0

André Hentschel : dbghelp: Implement literal dwarf opcodes.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 255a1ebaadfb8795ab76ebd0360708973bb825cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=255a1ebaadfb8795ab76ebd03… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 20 17:27:35 2009 +0100 dbghelp: Implement literal dwarf opcodes. --- dlls/dbghelp/dwarf.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 16ea011..d9e52d3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -684,6 +684,15 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, op = dwarf2_parse_byte(ctx); switch (op) { + case DW_OP_lit0: case DW_OP_lit1: case DW_OP_lit2: case DW_OP_lit3: + case DW_OP_lit4: case DW_OP_lit5: case DW_OP_lit6: case DW_OP_lit7: + case DW_OP_lit8: case DW_OP_lit9: case DW_OP_lit10: case DW_OP_lit11: + case DW_OP_lit12: case DW_OP_lit13: case DW_OP_lit14: case DW_OP_lit15: + case DW_OP_lit16: case DW_OP_lit17: case DW_OP_lit18: case DW_OP_lit19: + case DW_OP_lit20: case DW_OP_lit21: case DW_OP_lit22: case DW_OP_lit23: + case DW_OP_lit24: case DW_OP_lit25: case DW_OP_lit26: case DW_OP_lit27: + case DW_OP_lit28: case DW_OP_lit29: case DW_OP_lit30: case DW_OP_lit31: + stack[++stk] = op - DW_OP_lit0; break; case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx); break; case DW_OP_const1u: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const1s: stack[++stk] = (long)(signed char)dwarf2_parse_byte(ctx); break;

1 0

André Hentschel : include: Do not separate control names.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 738e94506ed1ed1320864f8fff701bf0702229ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=738e94506ed1ed1320864f8ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 20 15:35:01 2009 +0100 include: Do not separate control names. --- include/commctrl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index b88d694..27bd745 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5159,7 +5159,7 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 }; #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) /************************************************************************** - * List box control + * Listbox control */ #define WC_LISTBOXA "ListBox" @@ -5173,7 +5173,7 @@ static const WCHAR WC_LISTBOXW[] = { 'L','i','s','t','B','o','x',0 }; #define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX) /************************************************************************** - * Scroll bar control + * Scrollbar control */ #define WC_SCROLLBARA "ScrollBar"

1 0

Nikolay Sivov : comctl32/rebar: Use DPA to manage bands data.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 1e74d5992c9b5eb52bf52e9593df058c57c7ce96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e74d5992c9b5eb52bf52e959… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 19 13:04:35 2009 +0300 comctl32/rebar: Use DPA to manage bands data. --- dlls/comctl32/rebar.c | 225 +++++++++++++++++++++++-------------------------- 1 files changed, 104 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e74d5992c9b5eb52bf52…

1 0

Hans Leidekker : secur32/tests: Fix a couple of memory leaks.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 44f9595454e022c82bc5e467b1cd952a2a4d2b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f9595454e022c82bc5e467b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Dec 19 22:29:52 2009 +0100 secur32/tests: Fix a couple of memory leaks. Found by Valgrind. --- dlls/secur32/tests/ntlm.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index db00d73..d9f9538 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -775,6 +775,8 @@ static void testInitializeSecurityContextFlags(void) tISCFend: cleanupBuffers(&client); pFreeCredentialsHandle(client.cred); + HeapFree(GetProcessHeap(), 0, client.cred); + HeapFree(GetProcessHeap(), 0, client.ctxt); } @@ -911,6 +913,11 @@ tAuthend: sec_status = pFreeCredentialsHandle(client.cred); ok(sec_status == SEC_E_OK, "FreeCredentialsHandle(client) returned %s\n", getSecError(sec_status)); + + HeapFree(GetProcessHeap(), 0, client.cred); + HeapFree(GetProcessHeap(), 0, client.ctxt); + HeapFree(GetProcessHeap(), 0, server.cred); + HeapFree(GetProcessHeap(), 0, server.ctxt); } static void testSignSeal(void) @@ -1186,6 +1193,8 @@ end: HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); + HeapFree(GetProcessHeap(), 0, server.cred); + HeapFree(GetProcessHeap(), 0, server.ctxt); } static void testAcquireCredentialsHandle(void) @@ -1317,6 +1326,8 @@ static void test_cred_multiple_use(void) ok(ret == SEC_E_OK, "DeleteSecurityContext failed with error 0x%x\n", ret); ret = pFreeCredentialsHandle(&cred); ok(ret == SEC_E_OK, "FreeCredentialsHandle failed with error 0x%x\n", ret); + + HeapFree(GetProcessHeap(), 0, buffers[0].pvBuffer); } static void test_null_auth_data(void) @@ -1358,6 +1369,8 @@ static void test_null_auth_data(void) ISC_REQ_CONNECTION, 0, SECURITY_NETWORK_DREP, NULL, 0, &ctx, &buffer_desc, &attr, &ttl); ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); + + HeapFree(GetProcessHeap(), 0, buffers[0].pvBuffer); } START_TEST(ntlm)

1 0

Vincent Povirk : ole32: Add some tests for IEnumSTATSTG.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 2010e0fb28cad8c8cba57869926558d408ea3c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2010e0fb28cad8c8cba578699… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 18:36:23 2009 -0600 ole32: Add some tests for IEnumSTATSTG. --- dlls/ole32/tests/storage32.c | 152 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 148 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 12f2504..766c83c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -845,6 +845,8 @@ static void test_streamenum(void) HRESULT r; IStream *stm = NULL; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'A','B','C','D','E','F','G','H','I',0 }; + static const WCHAR stmname3[] = { 'A','B','C','D','E','F','G','H','I','J',0 }; STATSTG stat; IEnumSTATSTG *ee = NULL; ULONG count; @@ -887,7 +889,7 @@ static void test_streamenum(void) ok(r==S_OK, "IStorage->EnumElements failed\n"); r = IStorage_DestroyElement(stg, stmname); - ok(r==S_OK, "IStorage->EnumElements failed\n"); + ok(r==S_OK, "IStorage->DestroyElement failed\n"); todo_wine { count = 0xf00; @@ -905,11 +907,104 @@ static void test_streamenum(void) ok(r==S_FALSE, "IEnumSTATSTG->Next failed\n"); ok(count == 0, "count wrong\n"); - r = IEnumSTATSTG_Release(ee); - ok (r == 0, "enum not released\n"); + /* add a stream before reading */ + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + todo_wine ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + todo_wine ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + todo_wine ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + todo_wine ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname2) == 0, "expected ABCDEFGHI, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + /* delete previous and next stream after reading */ + r = IStorage_CreateStream(stg, stmname3, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + r = IStorage_DestroyElement(stg, stmname); + ok(r==S_OK, "IStorage->DestroyElement failed\n"); + + r = IStorage_DestroyElement(stg, stmname2); + ok(r==S_OK, "IStorage->DestroyElement failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + todo_wine ok(lstrcmpiW(stat.pwcsName, stmname3) == 0, "expected ABCDEFGHIJ, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } r = IStorage_Release( stg ); - ok (r == 0, "storage not released\n"); + todo_wine ok (r == 0, "storage not released\n"); + + /* enumerator is still valid and working after the storage is released */ + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + if (r == S_OK) + { + ok(lstrcmpiW(stat.pwcsName, stmname3) == 0, "expected ABCDEFGHIJ, got %s\n", wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + } + + /* the storage is left open until the enumerator is freed */ + r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, NULL, 0, &stg); + ok(r==STG_E_SHAREVIOLATION, "StgCreateDocfile failed, res=%x\n", r); + + r = IEnumSTATSTG_Release(ee); + ok (r == 0, "enum not released\n"); DeleteFileA(filenameA); } @@ -2564,6 +2659,54 @@ static void test_toplevel_stat(void) DeleteFileA(filenameA); } +static void test_substorage_enum(void) +{ + IStorage *stg, *stg2; + IEnumSTATSTG *ee; + HRESULT r; + ULONG ref; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* create an enumelements */ + r = IStorage_EnumElements(stg2, 0, NULL, 0, &ee); + ok(r==S_OK, "IStorage->EnumElements failed, hr=%08x\n", r); + + /* release the substorage */ + ref = IStorage_Release(stg2); + todo_wine ok(ref==0, "storage not released\n"); + + /* reopening fails, because the substorage is really still open */ + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage failed, hr=%08x\n", r); + + /* destroying the storage invalidates the enumerator */ + r = IStorage_DestroyElement(stg, stgname); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + +if (0) { /* crashes on wine */ + r = IEnumSTATSTG_Reset(ee); + ok(r==STG_E_REVERTED, "IEnumSTATSTG->Reset failed, hr=%08x\n", r); +} + + IEnumSTATSTG_Release(ee); + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2602,4 +2745,5 @@ START_TEST(storage32) test_copyto_iidexclusions_stream(); test_rename(); test_toplevel_stat(); + test_substorage_enum(); }

1 0

Vincent Povirk : ole32: Make IEnumSTATSTG functions fail when the parent is invalid.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 44928502007fe624998ee1d206c8ce7cf20b9ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44928502007fe624998ee1d20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 19:16:02 2009 -0600 ole32: Make IEnumSTATSTG functions fail when the parent is invalid. --- dlls/ole32/storage32.c | 12 ++++++++++++ dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 7d267b6..e21acf1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4513,6 +4513,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) ) return E_INVALIDARG; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * To avoid the special case, get another pointer to a ULONG value if * the caller didn't supply one. @@ -4588,6 +4591,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( ULONG objectFetched = 0; DirRef currentSearchNode; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * Start with the node at the top of the stack. */ @@ -4638,6 +4644,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( DirEntry storageEntry; HRESULT hr; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * Re-initialize the search stack to an empty stack */ @@ -4672,6 +4681,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( IEnumSTATSTGImpl* newClone; + if (This->parentStorage->reverted) + return STG_E_REVERTED; + /* * Perform a sanity check on the parameters. */ diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 766c83c..f8a6134 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2694,10 +2694,8 @@ static void test_substorage_enum(void) r = IStorage_DestroyElement(stg, stgname); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); -if (0) { /* crashes on wine */ r = IEnumSTATSTG_Reset(ee); ok(r==STG_E_REVERTED, "IEnumSTATSTG->Reset failed, hr=%08x\n", r); -} IEnumSTATSTG_Release(ee);

1 0

Vincent Povirk : ole32: Store the most recent item name in IEnumSTATSTG instead of a stack.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: fc50ff07d63af54fe96ce08d9da58f4e63f551f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc50ff07d63af54fe96ce08d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 19:45:36 2009 -0600 ole32: Store the most recent item name in IEnumSTATSTG instead of a stack. --- dlls/ole32/storage32.c | 246 +++++++++++------------------------------ dlls/ole32/tests/storage32.c | 12 +-- 2 files changed, 71 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc50ff07d63af54fe96ce…

1 0

Vincent Povirk : gdiplus: Allocate a new ImageAttributes object in GdipCloneImageAttributes.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 149c44eb4c4d390d1d84625137dd06dfd7a5b1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=149c44eb4c4d390d1d8462513… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:18:49 2009 -0600 gdiplus: Allocate a new ImageAttributes object in GdipCloneImageAttributes. --- dlls/gdiplus/imageattributes.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 8f49c67..a52c297 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,14 +30,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { + GpStatus stat; + TRACE("(%p, %p)\n", imageattr, cloneImageattr); if(!imageattr || !cloneImageattr) return InvalidParameter; - **cloneImageattr = *imageattr; + stat = GdipCreateImageAttributes(cloneImageattr); - return Ok; + if (stat == Ok) + **cloneImageattr = *imageattr; + + return stat; } GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr)

1 0

Vincent Povirk : gdiplus: Add a test for GdipSetImageAttributesColorMatrix.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 70bdc43c20a01d01920c1e397c2e9a26829f76bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bdc43c20a01d01920c1e397… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 17:38:40 2009 -0600 gdiplus: Add a test for GdipSetImageAttributesColorMatrix. --- dlls/gdiplus/tests/image.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 522e5de..14a4b1b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1092,6 +1092,109 @@ static void test_palette(void) GdipDisposeImage((GpImage*)bitmap); } +static void test_colormatrix(void) +{ + GpStatus stat; + ColorMatrix colormatrix, graymatrix; + GpImageAttributes *imageattr; + const ColorMatrix identity = {{ + {1.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + const ColorMatrix double_red = {{ + {2.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + + colormatrix = identity; + graymatrix = identity; + + stat = GdipSetImageAttributesColorMatrix(NULL, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, NULL, NULL, ColorMatrixFlagsDefault); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsSkipGrays); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsAltGray); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsAltGray); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, 3); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeCount, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeAny, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + FALSE, NULL, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + /* Drawing a bitmap transforms the colors */ + colormatrix = double_red; + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ffff); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + todo_wine expect(0xff80ffff, color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1120,6 +1223,7 @@ START_TEST(image) test_createhbitmap(); test_getsetpixel(); test_palette(); + test_colormatrix(); GdiplusShutdown(gdiplusToken); }

1 0