September 2017 - Wine-Commits

Nikolay Sivov : gdiplus: Implement playback for EmfPlusRecordTypeSetCompositingQuality.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 024750b182929847a316c0810e33df50281d5966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024750b182929847a316c0810… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:42:45 2017 +0300 gdiplus: Implement playback for EmfPlusRecordTypeSetCompositingQuality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e8e35d3..fbaee28 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1836,6 +1836,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetPixelOffsetMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); } + case EmfPlusRecordTypeSetCompositingQuality: + { + return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Alexandre Julliard : server: Don' t return debug registers unless explicitly requested.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: cb7f04ce6f9bbd4d0d951ca19e924b912e29b9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7f04ce6f9bbd4d0d951ca19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:50:16 2017 +0200 server: Don't return debug registers unless explicitly requested. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 903420b..2c864a6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1653,7 +1653,7 @@ DECL_HANDLER(get_thread_context) memset( context, 0, sizeof(context_t) ); context->cpu = thread->process->cpu; if (thread->context) copy_context( context, thread->context, req->flags & ~flags ); - if (flags) get_thread_context( thread, context, flags ); + if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); } release_object( thread ); }

1 0

Alexandre Julliard : libwine: Also apply the load delta to the FirstThunk table.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 20d13d0b788c807d54cd8d0896350818989fd5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d13d0b788c807d54cd8d089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:41:43 2017 +0200 libwine: Also apply the load delta to the FirstThunk table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 172bfa0..c07042a 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -320,22 +320,27 @@ static inline void fixup_rva_dwords( DWORD *ptr, int delta, unsigned int count ) } +/* fixup an array of name/ordinal RVAs by adding the specified delta */ +static inline void fixup_rva_names( UINT_PTR *ptr, int delta ) +{ + while (*ptr) + { + if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta; + ptr++; + } +} + + /* fixup RVAs in the import directory */ static void fixup_imports( IMAGE_IMPORT_DESCRIPTOR *dir, BYTE *base, int delta ) { - UINT_PTR *ptr; - while (dir->Name) { fixup_rva_dwords( &dir->u.OriginalFirstThunk, delta, 1 ); fixup_rva_dwords( &dir->Name, delta, 1 ); fixup_rva_dwords( &dir->FirstThunk, delta, 1 ); - ptr = (UINT_PTR *)(base + (dir->u.OriginalFirstThunk ? dir->u.OriginalFirstThunk : dir->FirstThunk)); - while (*ptr) - { - if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta; - ptr++; - } + if (dir->u.OriginalFirstThunk) fixup_rva_names( (UINT_PTR *)(base + dir->u.OriginalFirstThunk), delta ); + if (dir->FirstThunk) fixup_rva_names( (UINT_PTR *)(base + dir->FirstThunk), delta ); dir++; } }

1 0

Hugh McMaster : regedit/tests: Use a helper function to write registry files.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 77442049624ee74c7c6540e2154286d1129b9c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77442049624ee74c7c6540e21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:42 2017 +0000 regedit/tests: Use a helper function to write registry files. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 52 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 60f93c9..1f2284f 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -48,23 +48,33 @@ static BOOL run_regedit_exe_(unsigned line, const char *cmd) return (ret != WAIT_TIMEOUT); } +static BOOL write_file(const void *str, DWORD size) +{ + HANDLE file; + BOOL ret; + DWORD written; + + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); + + return ret; +} + #define exec_import_str(c) r_exec_import_str(__LINE__, c) static BOOL r_exec_import_str(unsigned line, const char *file_contents) { - HANDLE regfile; - DWORD written; BOOL br; - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (!write_file(file_contents, strlen(file_contents))) return FALSE; - br = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - run_regedit_exe("regedit.exe /s test.reg"); br = DeleteFileA("test.reg"); @@ -78,9 +88,7 @@ static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) { int lenA, len, memsize; WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL br; + BOOL br = FALSE; lenA = strlen(file_contents); @@ -90,26 +98,16 @@ static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if (regfile == INVALID_HANDLE_VALUE) - { - HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; - } - - br = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!write_file(wstr, memsize)) + goto exit; run_regedit_exe("regedit.exe /s test.reg"); br = DeleteFileA("test.reg"); lok(br, "DeleteFile failed: %u\n", GetLastError()); +exit: + HeapFree(GetProcessHeap(), 0, wstr); return br; }

1 0

Hugh McMaster : reg/tests: Use a helper function to write registry files.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 08a7836ef384d222f298077192f393ae8576f1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a7836ef384d222f29807719… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:39 2017 +0000 reg/tests: Use a helper function to write registry files. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 52 +++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3b6216f..1857545 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -731,23 +731,33 @@ static BOOL write_reg_file(const char *value, char *tmp_name) return ret; } +static BOOL write_file(const void *str, DWORD size) +{ + HANDLE file; + BOOL ret; + DWORD written; + + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); + + return ret; +} + #define test_import_str(c,r) test_import_str_(__LINE__,c,r) static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) { - HANDLE regfile; - DWORD written; BOOL ret; - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (!write_file(file_contents, strlen(file_contents))) return FALSE; - ret = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); - lok(ret, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); @@ -761,9 +771,7 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r { int lenA, len, memsize; WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL ret; + BOOL ret = FALSE; lenA = strlen(file_contents); @@ -773,26 +781,16 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if (regfile == INVALID_HANDLE_VALUE) - { - HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; - } - - ret = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(ret, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!write_file(wstr, memsize)) + goto exit; run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); lok(ret, "DeleteFile failed: %u\n", GetLastError()); +exit: + HeapFree(GetProcessHeap(), 0, wstr); return ret; }

1 0

Nikolay Sivov : shell32: Implement Parent() property for ShellDispatch objects.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 58b73fa075f5c842e56adc3b8cd5ec6d50cebd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b73fa075f5c842e56adc3b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:39:41 2017 +0300 shell32: Implement Parent() property for ShellDispatch objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 47 ++++++++++++++++++++++++++------------ dlls/shell32/tests/shelldispatch.c | 36 ++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index ee6f340..c489eb6 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -298,7 +298,10 @@ static HRESULT WINAPI FolderItemVerbImpl_get_Application(FolderItemVerb *iface, static HRESULT WINAPI FolderItemVerbImpl_get_Parent(FolderItemVerb *iface, IDispatch **disp) { - FIXME("(%p, %p)\n", iface, disp); + TRACE("(%p, %p)\n", iface, disp); + + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -477,7 +480,10 @@ static HRESULT WINAPI FolderItemVerbsImpl_get_Application(FolderItemVerbs *iface static HRESULT WINAPI FolderItemVerbsImpl_get_Parent(FolderItemVerbs *iface, IDispatch **disp) { - FIXME("(%p, %p)\n", iface, disp); + TRACE("(%p, %p)\n", iface, disp); + + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -718,13 +724,19 @@ static HRESULT WINAPI FolderItemImpl_get_Application(FolderItem2 *iface, IDispat return Folder3_get_Application(&This->folder->Folder3_iface, disp); } -static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, - IDispatch **ppid) +static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + FolderItemImpl *This = impl_from_FolderItem(iface); - *ppid = NULL; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, disp); + + if (disp) + { + *disp = (IDispatch *)&This->folder->Folder3_iface; + IDispatch_AddRef(*disp); + } + + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_Name(FolderItem2 *iface, BSTR *pbs) @@ -1429,11 +1441,12 @@ static HRESULT WINAPI FolderImpl_get_Application(Folder3 *iface, IDispatch **dis return S_OK; } -static HRESULT WINAPI FolderImpl_get_Parent(Folder3 *iface, IDispatch **ppid) +static HRESULT WINAPI FolderImpl_get_Parent(Folder3 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, disp); - *ppid = NULL; + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -1760,13 +1773,17 @@ static HRESULT WINAPI ShellDispatch_get_Application(IShellDispatch6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, - IDispatch **ppid) +static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, disp); - *ppid = NULL; - return E_NOTIMPL; + if (disp) + { + *disp = (IDispatch *)iface; + IDispatch_AddRef(*disp); + } + + return S_OK; } static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index eb8a8c7..fa7e8dc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -124,11 +124,18 @@ static void test_namespace(void) FolderItem *item; VARIANT var; BSTR title, item_path; + IDispatch *disp; int len, i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void **)&sd); ok(SUCCEEDED(r), "Failed to create ShellDispatch object: %#x.\n", r); + disp = NULL; + r = IShellDispatch_get_Parent(sd, &disp); + ok(r == S_OK, "Failed to get Shell object parent, hr %#x.\n", r); + ok(disp == (IDispatch *)sd, "Unexpected parent pointer %p.\n", disp); + IDispatch_Release(disp); + VariantInit(&var); folder = (void*)0xdeadbeef; r = IShellDispatch_NameSpace(sd, var, &folder); @@ -266,6 +273,11 @@ todo_wine { r = IShellDispatch_NameSpace(sd, var, &folder); ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + disp = (void *)0xdeadbeef; + r = Folder_get_Parent(folder, &disp); + ok(r == E_NOTIMPL, "Unexpected hr %#x.\n", r); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + r = Folder_get_Title(folder, &title); ok(r == S_OK, "Failed to get folder title: %#x.\n", r); ok(!lstrcmpW(title, winetestW), "Unexpected title: %s\n", wine_dbgstr_w(title)); @@ -480,6 +492,17 @@ static void test_items(void) r = FolderItems_Item(items, var, &item); ok(r == S_OK, "FolderItems::Item failed: %08x\n", r); ok(!!item, "item is null\n"); + + disp = (void *)0xdeadbeef; + r = FolderItems_get_Parent(items, &disp); + ok(r == E_NOTIMPL, "Unexpected hr %#x.\n", r); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + + r = FolderItem_get_Parent(item, &disp); + ok(r == S_OK, "Failed to get parent pointer, hr %#x.\n", r); + ok(disp == (IDispatch *)folder, "Unexpected parent pointer %p.\n", disp); + IDispatch_Release(disp); + if (item) FolderItem_Release(item); VariantClear(&var); @@ -1209,6 +1232,7 @@ static void test_Verbs(void) IShellDispatch *sd; FolderItem *item; Folder2 *folder2; + IDispatch *disp; Folder *folder; HRESULT hr; LONG count, i; @@ -1241,6 +1265,11 @@ if (0) { /* crashes on some systems */ hr = FolderItem_Verbs(item, &verbs); ok(hr == S_OK, "got 0x%08x\n", hr); + disp = (void *)0xdeadbeef; + hr = FolderItemVerbs_get_Parent(verbs, &disp); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + if (0) { /* crashes on winxp/win2k3 */ hr = FolderItemVerbs_get_Count(verbs, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -1267,7 +1296,12 @@ if (0) { /* crashes on winxp/win2k3 */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "%d: name %s\n", i, wine_dbgstr_w(str)); if (i == count) - ok(str[0] == 0, "%d: got teminating item %s\n", i, wine_dbgstr_w(str)); + ok(str[0] == 0, "%d: got terminating item %s\n", i, wine_dbgstr_w(str)); + + disp = (void *)0xdeadbeef; + hr = FolderItemVerb_get_Parent(verb, &disp); + ok(hr == E_NOTIMPL, "got %#x.\n", hr); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); SysFreeString(str); FolderItemVerb_Release(verb);

1 0

Zebediah Figura : msi: Don' t execute a deferred custom action when not running the install script.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 86bc556f9fd4a964cbaa66bc1fd67e4603ecd450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86bc556f9fd4a964cbaa66bc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 17 23:08:01 2017 -0500 msi: Don't execute a deferred custom action when not running the install script. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 1 + dlls/msi/tests/install.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 922927e..636f77f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1144,6 +1144,7 @@ static BOOL action_type_matches_script( UINT type, UINT script ) switch (script) { case SCRIPT_NONE: + return FALSE; case SCRIPT_INSTALL: return !(type & msidbCustomActionTypeCommit) && !(type & msidbCustomActionTypeRollback); case SCRIPT_COMMIT: diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index dd3e6a3..e429039 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1285,6 +1285,27 @@ static const char ft_install_exec_seq_dat[] = "PublishProduct\t\t1400\n" "InstallFinalize\t\t1500\n"; +static const char da_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "deferred\t1074\tCMDEXE\t/c if exist msitest (exit 0) else (exit 1)\t\n" + "immediate\t50\tCMDEXE\t/c mkdir msitest\t\n" + "cleanup\t50\tCMDEXE\t/c rmdir msitest\t\n"; + +static const char da_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallInitialize\t\t500\n" + "deferred\t\t600\n" + "immediate\t\t700\n" + "InstallFinalize\t\t1100\n" + "cleanup\t\t1200\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1939,6 +1960,19 @@ static const msi_table ft_tables[] = ADD_TABLE(property) }; +static const msi_table da_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(da_install_exec_seq), + ADD_TABLE(da_custom_action), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6046,6 +6080,26 @@ static void test_feature_tree(void) DeleteFileA( msifile ); } +static void test_deferred_action(void) +{ + UINT r; + + create_database(msifile, da_tables, sizeof(da_tables) / sizeof(da_tables[0])); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "CMDEXE=\"cmd.exe\""); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + +error: + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6134,6 +6188,7 @@ START_TEST(install) test_shared_component(); test_remove_upgrade_code(); test_feature_tree(); + test_deferred_action(); DeleteFileA(log_file);

1 0

Dmitry Timoshkov : windowscodecs: Add support for palette image formats to PNG encoder.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 14cca6ee6572441dc6310ffcd72a8ae4aa0e6891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cca6ee6572441dc6310ffcd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 15 11:12:08 2017 -0500 windowscodecs: Add support for palette image formats to PNG encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9e837ca..1ab2c85 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -325,8 +326,10 @@ MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_interlace_handling); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_set_pHYs); +MAKE_FUNCPTR(png_set_PLTE); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); +MAKE_FUNCPTR(png_set_tRNS); MAKE_FUNCPTR(png_set_tRNS_to_alpha); MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); @@ -389,8 +392,10 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_interlace_handling); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_pHYs); + LOAD_FUNCPTR(png_set_PLTE); LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); + LOAD_FUNCPTR(png_set_tRNS); LOAD_FUNCPTR(png_set_tRNS_to_alpha); LOAD_FUNCPTR(png_set_write_fn); LOAD_FUNCPTR(png_read_end); @@ -1349,6 +1354,10 @@ static const struct png_pixelformat formats[] = { {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, + {&GUID_WICPixelFormat1bppIndexed, 1, 1, PNG_COLOR_TYPE_PALETTE, 0, 0}, + {&GUID_WICPixelFormat2bppIndexed, 2, 2, PNG_COLOR_TYPE_PALETTE, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 4, 4, PNG_COLOR_TYPE_PALETTE, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 8, 8, PNG_COLOR_TYPE_PALETTE, 0, 0}, {NULL}, }; @@ -1651,6 +1660,33 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, (This->yres+0.0127) / 0.0254, PNG_RESOLUTION_METER); } + if (This->format->color_type == PNG_COLOR_TYPE_PALETTE && This->colors) + { + png_color png_palette[256]; + png_byte trans[256]; + UINT i, num_trans = 0, colors; + + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + colors = min(This->colors, 1 << This->format->bit_depth); + + for (i = 0; i < colors; i++) + { + png_palette[i].red = (This->palette[i] >> 16) & 0xff; + png_palette[i].green = (This->palette[i] >> 8) & 0xff; + png_palette[i].blue = This->palette[i] & 0xff; + trans[i] = (This->palette[i] >> 24) & 0xff; + if (trans[i] != 0xff) + num_trans = i+1; + } + + ppng_set_PLTE(This->png_ptr, This->info_ptr, png_palette, colors); + + if (num_trans) + ppng_set_tRNS(This->png_ptr, This->info_ptr, trans, num_trans, NULL); + } + ppng_write_info(This->png_ptr, This->info_ptr); if (This->format->remove_filler) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 10a6c03..b011d71 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1359,6 +1359,10 @@ static GUID const * const png_encode_formats[] = { &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL };

1 0

Matteo Bruni : wined3d: Add ARB_texture_filter_anisotropic extension.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 5b7a6d424eefb5261049f60473d6c94099a89722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7a6d424eefb5261049f6047… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:28 2017 +0200 wined3d: Add ARB_texture_filter_anisotropic extension. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 14 ++++++++------ dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3da751e..168e494 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -175,6 +175,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_cube_map_array", ARB_TEXTURE_CUBE_MAP_ARRAY }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, + {"GL_ARB_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC}, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, @@ -233,7 +234,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, - {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, + {"GL_EXT_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, @@ -3595,9 +3596,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.texture3d_size = gl_max; TRACE("Max texture3D size: %d.\n", gl_info->limits.texture3d_size); } - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY, &gl_max); gl_info->limits.anisotropy = gl_max; TRACE("Max anisotropy: %d.\n", gl_info->limits.anisotropy); } @@ -3904,6 +3905,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, + {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; @@ -5631,7 +5633,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | WINED3DPRASTERCAPS_DEPTHBIAS; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | WINED3DPRASTERCAPS_ZBIAS | @@ -5750,7 +5752,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC; @@ -5771,7 +5773,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 86d23a0..8c8d24c 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -98,8 +98,8 @@ static void wined3d_sampler_cs_init(void *object) GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_LOD_BIAS, desc->lod_bias)); GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MIN_LOD, desc->min_lod)); GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MAX_LOD, desc->max_lod)); - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY_EXT, desc->max_anisotropy)); + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY, desc->max_anisotropy)); if (desc->compare) GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE)); GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_FUNC, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 476295c..230f94c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -851,8 +851,8 @@ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, state = sampler_desc->max_anisotropy; if (state != gl_tex->sampler_desc.max_anisotropy) { - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, state); + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY, state); else WARN("Anisotropic filtering not supported.\n"); gl_tex->sampler_desc.max_anisotropy = state; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2a51a7e..33fbe76 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -109,6 +109,7 @@ enum wined3d_gl_extension ARB_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, + ARB_TEXTURE_FILTER_ANISOTROPIC, ARB_TEXTURE_FLOAT, ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, @@ -165,7 +166,6 @@ enum wined3d_gl_extension EXT_TEXTURE_COMPRESSION_S3TC, EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, - EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_INTEGER, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP,

1 0

Nikolay Sivov : d3d9/tests: Test for GetDC() -capable backbuffer created with D3DFMT_UNKNOWN format.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: be1f61e27518428bec8be95930824b5ea9a47b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1f61e27518428bec8be9593… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 16 17:30:27 2017 +0300 d3d9/tests: Test for GetDC()-capable backbuffer created with D3DFMT_UNKNOWN format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5f904a2..d9cfb02b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -34,11 +34,13 @@ struct vec3 float x, y, z; }; -#define CREATE_DEVICE_FULLSCREEN 0x01 -#define CREATE_DEVICE_NOWINDOWCHANGES 0x02 -#define CREATE_DEVICE_FPU_PRESERVE 0x04 -#define CREATE_DEVICE_SWVP_ONLY 0x08 -#define CREATE_DEVICE_MIXED_ONLY 0x10 +#define CREATE_DEVICE_FULLSCREEN 0x01 +#define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_FPU_PRESERVE 0x04 +#define CREATE_DEVICE_SWVP_ONLY 0x08 +#define CREATE_DEVICE_MIXED_ONLY 0x10 +#define CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT 0x20 +#define CREATE_DEVICE_LOCKABLE_BACKBUFFER 0x40 struct device_desc { @@ -152,8 +154,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons { present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; + if (desc->flags & CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT) + present_parameters.BackBufferFormat = D3DFMT_UNKNOWN; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_LOCKABLE_BACKBUFFER) + present_parameters.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; if (desc->flags & CREATE_DEVICE_SWVP_ONLY) behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; else if (desc->flags & CREATE_DEVICE_MIXED_ONLY) @@ -7956,6 +7962,7 @@ static void test_getdc(void) }; IDirect3DSurface9 *surface, *surface2; IDirect3DCubeTexture9 *cube_texture; + struct device_desc device_desc; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; D3DLOCKED_RECT map_desc; @@ -8238,6 +8245,31 @@ static void test_getdc(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* Backbuffer created with D3DFMT_UNKNOWN format. */ + device_desc.width = 640; + device_desc.height = 480; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT | CREATE_DEVICE_LOCKABLE_BACKBUFFER; + + device = create_device(d3d, window, &device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + + dc = NULL; + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(!!dc, "Unexpected DC returned.\n"); + ok(SUCCEEDED(hr), "Failed to get backbuffer DC, hr %#x.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release backbuffer DC, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0