February 2018 - Wine-Commits

Zebediah Figura : msi/tests: Add a test for creating MTA objects from a custom action.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 77e6bd13b60ca2a6c1793687be60c1efaf0d9967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e6bd13b60ca2a6c1793687… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 14 20:54:55 2018 -0600 msi/tests: Add a test for creating MTA objects from a custom action. 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/tests/Makefile.in | 2 +- dlls/msi/tests/custom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 1 + dlls/msi/tests/install.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 70080ea..9c991d6 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -custom_IMPORTS = msi +custom_IMPORTS = uuid msi ole32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d68d082..c00b7aa 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -23,9 +23,51 @@ #include <windef.h> #include <winbase.h> +#define COBJMACROS +#include <objbase.h> +#include <unknwn.h> #include <msi.h> #include <msiquery.h> +static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) +{ + static char buffer[2000]; + MSIHANDLE record; + va_list valist; + + va_start(valist, msg); + vsprintf(buffer, msg, valist); + va_end(valist); + + record = MsiCreateRecord(5); + MsiRecordSetInteger(record, 1, todo); + MsiRecordSetStringA(record, 2, file); + MsiRecordSetInteger(record, 3, line); + MsiRecordSetInteger(record, 4, condition); + MsiRecordSetStringA(record, 5, buffer); + MsiProcessMessage(hinst, INSTALLMESSAGE_USER, record); + MsiCloseHandle(record); +} +#define ok(hinst, condition, ...) ok_(hinst, 0, __FILE__, __LINE__, condition, __VA_ARGS__) +#define todo_wine_ok(hinst, condition, ...) ok_(hinst, 1, __FILE__, __LINE__, condition, __VA_ARGS__) + + +/* Main test. Anything that doesn't depend on a specific install configuration + * or have undesired side effects should go here. */ +UINT WINAPI main_test(MSIHANDLE hinst) +{ + IUnknown *unk = NULL; + HRESULT hres; + + /* Test for an MTA apartment */ + hres = CoCreateInstance(&CLSID_Picture_Metafile, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + todo_wine_ok(hinst, hres == S_OK, "CoCreateInstance failed with %08x\n", hres); + + if (unk) IUnknown_Release(unk); + + return ERROR_SUCCESS; +} + UINT WINAPI test_retval(MSIHANDLE hinst) { char prop[10]; diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 2a01b3d..9d1e821 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -1 +1,2 @@ +@ stdcall main_test(long) @ stdcall test_retval(long) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9ba4f07..55d83d4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -695,11 +695,13 @@ static const CHAR wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAtt static const CHAR ca1_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "testretval\t\t710\n"; + "maintest\tMAIN_TEST\t700\n" + "testretval\tTEST_RETVAL\t710\n"; static const CHAR ca1_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" + "maintest\t1\tcustom.dll\tmain_test\n" "testretval\t1\tcustom.dll\ttest_retval\n"; static const CHAR ca51_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -4081,6 +4083,27 @@ static void add_custom_dll(void) MsiCloseHandle(hdb); } +static INT CALLBACK ok_callback(void *context, UINT message_type, MSIHANDLE record) +{ + if (message_type == INSTALLMESSAGE_USER) + { + char file[200]; + char msg[2000]; + DWORD len; + + len = sizeof(file); + MsiRecordGetStringA(record, 2, file, &len); + len = sizeof(msg); + MsiRecordGetStringA(record, 5, msg, &len); + + todo_wine_if(MsiRecordGetInteger(record, 1)) + ok_(file, MsiRecordGetInteger(record, 3)) (MsiRecordGetInteger(record, 4), "%s", msg); + + return 1; + } + return 0; +} + static void test_customaction1(void) { UINT r; @@ -4090,6 +4113,10 @@ static void test_customaction1(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + r = MsiInstallProductA(msifile, "MAIN_TEST=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* Test return values */ r = MsiInstallProductA(msifile, "TEST_RETVAL=0"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -6083,6 +6110,7 @@ START_TEST(install) MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); customdll = load_resource("custom.dll"); + MsiSetExternalUIRecord(ok_callback, INSTALLLOGMODE_USER, NULL, NULL); if (pSRSetRestorePointA) /* test has side-effects on win2k3 that cause failures in following tests */ test_MsiInstallProduct();

1 0

Akihiro Sagawa : gdi32: Fix text metrics in synthetic bold bitmap fonts.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: dce3e171858d831e9861ed02df30a5aeddcc3a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce3e171858d831e9861ed02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 18 21:34:42 2018 +0900 gdi32: Fix text metrics in synthetic bold bitmap fonts. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 9 +++++++-- dlls/gdi32/tests/font.c | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ba8855a..420f936 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7523,6 +7523,9 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmPitchAndFamily = FT_IS_FIXED_WIDTH(ft_face) ? 0 : TMPF_FIXED_PITCH; TM.tmCharSet = font->charset; } + + if(font->fake_bold) + TM.tmWeight = FW_BOLD; #undef TM return TRUE; @@ -7552,10 +7555,12 @@ static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm) SCALE_Y(ptm->tmDescent); SCALE_Y(ptm->tmInternalLeading); SCALE_Y(ptm->tmExternalLeading); - SCALE_Y(ptm->tmOverhang); - if(FT_IS_SCALABLE(font->ft_face) && font->fake_bold) + SCALE_X(ptm->tmOverhang); + if(font->fake_bold) { + if(!FT_IS_SCALABLE(font->ft_face)) + ptm->tmOverhang++; ptm->tmAveCharWidth++; ptm->tmMaxCharWidth++; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8070536..6243a6d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6583,15 +6583,12 @@ static void test_fake_bold_font(void) "expected %d, got %d\n", data[i].tm.tmAscent, data[i+1].tm.tmAscent); ok(data[i].tm.tmDescent == data[i+1].tm.tmDescent, "expected %d, got %d\n", data[i].tm.tmDescent, data[i+1].tm.tmDescent); - todo_wine ok(data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth == diff, "expected %d, got %d\n", diff, data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth); - todo_wine ok(data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth == diff, "expected %d, got %d\n", diff, data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth); ok(data[i].tm.tmOverhang == 0, "expected 0, got %d\n", data[i].tm.tmOverhang); - todo_wine ok(data[i+1].tm.tmOverhang == 1, "expected 1, got %d\n", data[i+1].tm.tmOverhang); ok(data[i].w + 1 == data[i+1].w,

1 0

Zebediah Figura : msi/tests: Add tests for custom action return values.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 6dcb3dabd4d540b65d68193d7037db748bcf7c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dcb3dabd4d540b65d68193d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 14 20:54:54 2018 -0600 msi/tests: Add tests for custom action return values. 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/tests/Makefile.in | 6 ++- dlls/msi/tests/custom.c | 38 +++++++++++++++++ dlls/msi/tests/custom.spec | 1 + dlls/msi/tests/install.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 66f8abb..70080ea 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,9 +1,13 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -C_SRCS = \ +custom_IMPORTS = msi + +SOURCES = \ action.c \ automation.c \ + custom.c \ + custom.spec \ db.c \ format.c \ install.c \ diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c new file mode 100644 index 0000000..d68d082 --- /dev/null +++ b/dlls/msi/tests/custom.c @@ -0,0 +1,38 @@ +/* + * DLL for testing type 1 custom actions + * + * Copyright 2017 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include <msi.h> +#include <msiquery.h> + +UINT WINAPI test_retval(MSIHANDLE hinst) +{ + char prop[10]; + DWORD len = sizeof(prop); + UINT retval; + + MsiGetPropertyA(hinst, "TEST_RETVAL", prop, &len); + sscanf(prop, "%u", &retval); + return retval; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec new file mode 100644 index 0000000..2a01b3d --- /dev/null +++ b/dlls/msi/tests/custom.spec @@ -0,0 +1 @@ +@ stdcall test_retval(long) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index acbf162..9ba4f07 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -70,6 +70,8 @@ static CHAR COMMON_FILES_DIR[MAX_PATH]; static CHAR APP_DATA_DIR[MAX_PATH]; static CHAR WINDOWS_DIR[MAX_PATH]; +static const char *customdll; + /* msi database data */ static const CHAR component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -690,6 +692,16 @@ static const CHAR wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAtt "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; +static const CHAR ca1_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "testretval\t\t710\n"; + +static const CHAR ca1_custom_action_dat[] = "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "testretval\t1\tcustom.dll\ttest_retval\n"; + static const CHAR ca51_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" @@ -1683,6 +1695,13 @@ static const msi_table sf_tables[] = ADD_TABLE(property), }; +static const msi_table ca1_tables[] = +{ + ADD_TABLE(property), + ADD_TABLE(ca1_install_exec_seq), + ADD_TABLE(ca1_custom_action), +}; + static const msi_table ca51_tables[] = { ADD_TABLE(ca51_component), @@ -2589,6 +2608,29 @@ static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) return RegDeleteKeyA( key, subkey ); } +static char *load_resource(const char *name) +{ + static char path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempFileNameA(".", name, 0, path); + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return path; +} + static void test_MsiInstallProduct(void) { UINT r; @@ -4014,6 +4056,59 @@ error: DeleteFileA("augustus"); } +static void add_custom_dll(void) +{ + MSIHANDLE hdb = 0, record; + UINT res; + + res = MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb); + ok(res == ERROR_SUCCESS, "failed to open db: %u\n", res); + + res = run_query(hdb, 0, "CREATE TABLE `Binary` (`Name` CHAR(72) NOT NULL, `Data` OBJECT NOT NULL PRIMARY KEY `Name`)"); + ok(res == ERROR_SUCCESS, "failed to create Binary table: %u\n", res); + + record = MsiCreateRecord(1); + res = MsiRecordSetStreamA(record, 1, customdll); + ok(res == ERROR_SUCCESS, "failed to add %s to stream: %u\n", customdll, res); + + res = run_query(hdb, record, "INSERT INTO `Binary` (`Name`, `Data`) VALUES ('custom.dll', ?)"); + ok(res == ERROR_SUCCESS, "failed to insert into Binary table: %u\n", res); + + res = MsiDatabaseCommit(hdb); + ok(res == ERROR_SUCCESS, "failed to commit database: %u\n", res); + + MsiCloseHandle(record); + MsiCloseHandle(hdb); +} + +static void test_customaction1(void) +{ + UINT r; + + create_database(msifile, ca1_tables, sizeof(ca1_tables) / sizeof(msi_table)); + add_custom_dll(); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "TEST_RETVAL=0"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "TEST_RETVAL=1626"); /* ERROR_FUNCTION_NOT_CALLED*/ + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "TEST_RETVAL=1602"); + ok(r == ERROR_INSTALL_USEREXIT, "Expected ERROR_INSTALL_USEREXIT, got %u\n", r); + + r = MsiInstallProductA(msifile, "TEST_RETVAL=259"); /* ERROR_NO_MORE_ITEMS */ + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* any other error maps to ERROR_INSTALL_FAILURE */ + r = MsiInstallProductA(msifile, "TEST_RETVAL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + DeleteFileA(msifile); +} + static void test_customaction51(void) { UINT r; @@ -5987,6 +6082,8 @@ START_TEST(install) lstrcatA(log_file, "\\msitest.log"); MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); + customdll = load_resource("custom.dll"); + if (pSRSetRestorePointA) /* test has side-effects on win2k3 that cause failures in following tests */ test_MsiInstallProduct(); test_MsiSetComponentState(); @@ -6006,6 +6103,7 @@ START_TEST(install) test_adminprops(); test_missingcab(); test_sourcefolder(); + test_customaction1(); test_customaction51(); test_installstate(); test_sourcepath(); @@ -6031,6 +6129,8 @@ START_TEST(install) test_feature_tree(); test_deferred_action(); + DeleteFileA(customdll); + DeleteFileA(log_file); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret)

1 0

Alexandre Julliard : makefiles: Add support for creating helper dlls in tests.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 2435357d60d2236fea5f8ccd529a5130c65591dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2435357d60d2236fea5f8ccd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 11:46:25 2018 +0100 makefiles: Add support for creating helper dlls in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 4 +++ tools/makedep.c | 98 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 13 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index a3f19d8..0cf2344 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -431,6 +431,10 @@ sub assign_sources_to_makefiles(@) { push @{${$make}{"=IN_SRCS"}}, $name; } + elsif ($name =~ /\.spec$/) + { + next unless defined ${$make}{"TESTDLL"}; + } else { next; diff --git a/tools/makedep.c b/tools/makedep.c index 0db2733..0083661 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2685,20 +2685,96 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c /******************************************************************* + * output_source_spec + */ +static void output_source_spec( struct makefile *make, struct incl_file *source, const char *obj ) +{ + struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); + struct strarray all_libs, dep_libs = empty_strarray; + + if (!imports.count) imports = make->imports; + all_libs = add_import_libs( make, &dep_libs, imports, 0 ); + add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ + strarray_addall( &all_libs, libs ); + + strarray_add( &make->clean_files, strmake( "%s.dll%s", obj, dll_ext )); + strarray_add( &make->object_files, strmake( "%s.res", obj )); + output( "%s.res: %s.dll%s\n", obj_dir_path( make, obj ), obj_dir_path( make, obj ), dll_ext ); + output( "\techo \"%s.dll TESTDLL \\\"%s.dll%s\\\"\" | %s -o $@\n", obj, + obj_dir_path( make, obj ), dll_ext, tools_path( make, "wrc" )); + + output( "%s.dll%s:", obj_dir_path( make, obj ), dll_ext ); + output_filename( source->filename ); + output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output( "\t%s -s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filenames( target_flags ); + output_filenames( unwind_flags ); + output_filenames( make->extradllflags ); + output_filename( "-shared" ); + output_filename( source->filename ); + output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + + if (crosstarget) + { + dep_libs = empty_strarray; + all_libs = add_import_libs( make, &dep_libs, imports, 1 ); + add_import_libs( make, &dep_libs, get_default_imports( make ), 1 ); /* dependencies only */ + strarray_addall( &all_libs, libs ); + + strarray_add( &make->clean_files, strmake( "%s.dll", obj )); + strarray_add( &make->crossobj_files, strmake( "%s.cross.res", obj )); + output( "%s.cross.res: %s.dll\n", obj_dir_path( make, obj ), obj_dir_path( make, obj ) ); + output( "\techo \"%s.dll TESTDLL \\\"%s.dll\\\"\" | %s -o $@\n", obj, + obj_dir_path( make, obj ), tools_path( make, "wrc" )); + + output( "%s.dll:", obj_dir_path( make, obj )); + output_filename( source->filename ); + output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); + output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output( "\t%s -s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filename( "--lib-suffix=.cross.a" ); + output_filename( "-shared" ); + output_filename( source->filename ); + output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } +} + + +/******************************************************************* * output_source_default */ static void output_source_default( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray extradefs = get_expanded_file_local_var( make, obj, "EXTRADEFS" ); - int need_cross = make->testdll || - (source->file->flags & FLAG_C_IMPLIB) || - (make->module && make->staticlib); + int is_dll_src = (make->testdll && + strendswith( source->name, ".c" ) && + find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); + int need_cross = (make->testdll || + (source->file->flags & FLAG_C_IMPLIB) || + (make->module && make->staticlib)); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) strarray_add( &make->clean_files, source->filename ); if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->implib_objs, strmake( "%s.o", obj )); - strarray_add( &make->object_files, strmake( "%s.o", obj )); + strarray_add( is_dll_src ? &make->clean_files : &make->object_files, strmake( "%s.o", obj )); output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( make->include_args ); @@ -2715,7 +2791,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\n" ); if (crosstarget && need_cross) { - strarray_add( &make->crossobj_files, strmake( "%s.cross.o", obj )); + strarray_add( is_dll_src ? &make->clean_files : &make->crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( make->include_args ); @@ -2730,7 +2806,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (strendswith( source->name, ".c" ) && !(source->file->flags & FLAG_GENERATED)) { strarray_add( &make->c2man_files, source->filename ); - if (make->testdll) + if (make->testdll && !is_dll_src) { strarray_add( &make->ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); @@ -2770,6 +2846,7 @@ static const struct { "po", output_source_po }, { "in", output_source_in }, { "x", output_source_x }, + { "spec", output_source_spec }, { NULL, output_source_default } }; @@ -3453,15 +3530,10 @@ static void output_testlist( const struct makefile *make ) { const char *dest = base_dir_path( make, "testlist.c" ); struct strarray files = empty_strarray; - struct incl_file *source; unsigned int i; - LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) - { - if (source->file->flags & FLAG_GENERATED) continue; - if (!strendswith( source->name, ".c" )) continue; - strarray_add( &files, replace_extension( source->name, ".c", "" )); - } + for (i = 0; i < make->ok_files.count; i++) + strarray_add( &files, replace_extension( make->ok_files.str[i], ".ok", "" )); output_file = create_temp_file( dest );

1 0

Alexandre Julliard : makefiles: Split the makefile generation into multiple functions.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 4eb9ad983ecc33d24ccf68692590605dcd02914a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb9ad983ecc33d24ccf6869… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 09:53:42 2018 +0100 makefiles: Split the makefile generation into multiple functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1617 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 889 insertions(+), 728 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4eb9ad983ecc33d24ccf…

1 0

Henri Verbeet : ddraw: Compare with the correct view in ddraw_surface_delete_attached_surface().
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 1bd9cb3471688a18974f1a5fad0ab394c7d36d95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd9cb3471688a18974f1a5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 18 21:56:38 2018 +0330 ddraw: Compare with the correct view in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 739e68f..30276b4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2069,7 +2069,7 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa * particular, modify the QueryInterface() pointer in the surface vtbl * but don't cleanup properly after the relevant dll is unloaded. */ if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER - && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == surface->wined3d_rtv) + && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == attachment->wined3d_rtv) wined3d_device_set_depth_stencil_view(surface->ddraw->wined3d_device, NULL); wined3d_mutex_unlock();

1 0

Nikolay Sivov : shell32/tests: Add a basic test for NewMenu object creation.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 1f1f190bf05ca44d2aef47a2eee508925c888adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1f190bf05ca44d2aef47a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 18 19:10:42 2018 +0300 shell32/tests: Add a basic test for NewMenu object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlview.c | 30 ++++++++++++++++++++++++++++++ include/shlguid.h | 1 + 2 files changed, 31 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 7685506..f31d16e 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1476,6 +1476,35 @@ if (0) IShellFolder_Release(desktop); } +static void test_newmenu(void) +{ + IUnknown *unk, *unk2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); +todo_wine + ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); + if (hr != S_OK) + { + skip("NewMenu is not supported.\n"); + return; + } + + hr = IUnknown_QueryInterface(unk, &IID_IShellExtInit, (void **)&unk2); + ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); + ok(hr == S_OK, "Failed to get IContextMenu3, hr %#x.\n", hr); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2); + ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#x.\n", hr); + IUnknown_Release(unk2); + + IUnknown_Release(unk); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1491,6 +1520,7 @@ START_TEST(shlview) test_IOleCommandTarget(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); + test_newmenu(); OleUninitialize(); } diff --git a/include/shlguid.h b/include/shlguid.h index 028cb61..687bbec 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -146,6 +146,7 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); +DEFINE_GUID(CLSID_NewMenu, 0xd969a300, 0xe7ff, 0x11d0, 0xa9, 0x3b, 0x0, 0xa0, 0xc9, 0xf, 0x27, 0x19); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0);

1 0

Nikolay Sivov : shell32/tests: Run context menu tests on background menu too.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 68056a3d27af5931b236021dc1c6d897e269e456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68056a3d27af5931b236021d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 18 19:10:43 2018 +0300 shell32/tests: Run context menu tests on background menu too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 191 +++++++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 83 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 40ba378..1cf04b5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4343,6 +4343,96 @@ static void test_desktop_IPersist(void) IShellFolder_Release(desktop); } +static void test_contextmenu(IContextMenu *menu, BOOL background) +{ + HMENU hmenu = CreatePopupMenu(); + const int id_upper_limit = 32767; + const int baseItem = 0x40; + INT max_id, max_id_check; + IUnknown *unk; + UINT count, i; + HRESULT hr; + + hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); +todo_wine + ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); +if (hr == S_OK) + IUnknown_Release(unk); + + hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk); +todo_wine + ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); +if (hr == S_OK) + IUnknown_Release(unk); + + hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); + ok(SUCCEEDED(hr), "Failed to query the menu, hr %#x.\n", hr); + + max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ + ok(max_id <= id_upper_limit, "Got %d\n", max_id); + count = GetMenuItemCount(hmenu); + ok(count, "Got %d\n", count); + + max_id_check = 0; + for (i = 0; i < count; i++) + { + MENUITEMINFOA mii; + INT res; + char buf[255], buf2[255]; + ZeroMemory(&mii, sizeof(MENUITEMINFOA)); + mii.cbSize = sizeof(MENUITEMINFOA); + mii.fMask = MIIM_ID | MIIM_FTYPE | MIIM_STRING; + mii.dwTypeData = buf2; + mii.cch = sizeof(buf2); + + res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); + ok(res, "Failed to get menu item info, error %d.\n", GetLastError()); + + ok((mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), + "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); + if (!(mii.fType & MFT_SEPARATOR)) + { + max_id_check = (mii.wID > max_id_check) ? mii.wID : max_id_check; + hr = IContextMenu_GetCommandString(menu, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); + todo_wine_if(background) + ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); + if (SUCCEEDED(hr)) + trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); + else if (hr == E_NOTIMPL) + trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); + } + } + max_id_check -= baseItem; + ok((max_id_check == max_id) || + (max_id_check == max_id-1) || /* Win 7 */ + (max_id_check == max_id-2) || /* Win 8 */ + (max_id_check == max_id-3), + "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); + + if (count) + { + CMINVOKECOMMANDINFO cmi; + + memset(&cmi, 0, sizeof(CMINVOKECOMMANDINFO)); + cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); + + /* Attempt to execute a nonexistent command */ + cmi.lpVerb = MAKEINTRESOURCEA(9999); + hr = IContextMenu_InvokeCommand(menu, &cmi); + todo_wine_if(background) + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + + cmi.lpVerb = "foobar_wine_test"; + hr = IContextMenu_InvokeCommand(menu, &cmi); + todo_wine_if(background) + ok((hr == E_INVALIDARG) || (hr == E_FAIL /* Win7 */) || + (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), + "Unexpected hr %#x.\n", hr); + } + + DestroyMenu(hmenu); +} + static void test_GetUIObject(void) { IShellFolder *psf_desktop; @@ -4352,6 +4442,8 @@ static void test_GetUIObject(void) WCHAR path[MAX_PATH]; const WCHAR filename[] = {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; + LPCITEMIDLIST pidl_child; + IShellFolder *psf; GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) @@ -4366,91 +4458,24 @@ static void test_GetUIObject(void) hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - IShellFolder *psf; - LPCITEMIDLIST pidl_child; - hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_GetUIObjectOf(psf, NULL, 1, &pidl_child, &IID_IContextMenu, NULL, - (void**)&pcm); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - const int baseItem = 0x40; - HMENU hmenu = CreatePopupMenu(); - INT max_id, max_id_check; - UINT count, i; - const int id_upper_limit = 32767; - hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); - ok(SUCCEEDED(hr), "Got 0x%08x\n", hr); - max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ - ok(max_id <= id_upper_limit, "Got %d\n", max_id); - count = GetMenuItemCount(hmenu); - ok(count, "Got %d\n", count); - - max_id_check = 0; - for(i = 0; i < count; i++) - { - MENUITEMINFOA mii; - INT res; - char buf[255], buf2[255]; - ZeroMemory(&mii, sizeof(MENUITEMINFOA)); - mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_ID | MIIM_FTYPE | MIIM_STRING; - mii.dwTypeData = buf2; - mii.cch = sizeof(buf2); - - SetLastError(0); - res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); - ok(res, "Failed (last error: %d).\n", GetLastError()); - - ok( (mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), - "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); - if(!(mii.fType & MFT_SEPARATOR)) - { - max_id_check = (mii.wID>max_id_check)?mii.wID:max_id_check; - hr = IContextMenu_GetCommandString(pcm, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); - ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); - if (SUCCEEDED(hr)) - trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); - else if (hr == E_NOTIMPL) - trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); - } - } - max_id_check -= baseItem; - ok((max_id_check == max_id) || - (max_id_check == max_id-1) || /* Win 7 */ - (max_id_check == max_id-2), /* Win 8 */ - "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); - if(count) - { - CMINVOKECOMMANDINFO cmi; - ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); - cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); - - /* Attempt to execute a nonexistent command */ - cmi.lpVerb = MAKEINTRESOURCEA(9999); - hr = IContextMenu_InvokeCommand(pcm, &cmi); - ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); - - cmi.lpVerb = "foobar_wine_test"; - hr = IContextMenu_InvokeCommand(pcm, &cmi); - ok( (hr == E_INVALIDARG) || (hr == E_FAIL /* Win7 */) || - (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), - "Got 0x%08x\n", hr); - } + hr = SHBindToParent(pidl, &IID_IShellFolder, (void **)&psf, &pidl_child); + ok(hr == S_OK, "Failed to bind to folder, hr %#x.\n", hr); - DestroyMenu(hmenu); - IContextMenu_Release(pcm); - } - IShellFolder_Release(psf); - } - ILFree(pidl); - } + /* Item menu */ + hr = IShellFolder_GetUIObjectOf(psf, NULL, 1, &pidl_child, &IID_IContextMenu, NULL, (void **)&pcm); + ok(hr == S_OK, "GetUIObjectOf() failed, hr %#x.\n", hr); + test_contextmenu(pcm, FALSE); + IContextMenu_Release(pcm); + + /* Background menu */ + hr = IShellFolder_GetUIObjectOf(psf_desktop, NULL, 0, NULL, &IID_IContextMenu, NULL, (void **)&pcm); + ok(hr == S_OK, "GetUIObjectOf() failed, hr %#x.\n", hr); + test_contextmenu(pcm, TRUE); + IContextMenu_Release(pcm); + + IShellFolder_Release(psf); + ILFree(pidl); IShellFolder_Release(psf_desktop); Cleanup();

1 0

Nikolay Sivov : shell32: Added IShellExtInit stub for context menus.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 408f856f02d33042bb6ec48bb181251a38666687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=408f856f02d33042bb6ec48b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 18 19:10:44 2018 +0300 shell32: Added IShellExtInit stub for context menus. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 48 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shlfolder.c | 2 -- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 3f09413..2b5d526 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { IContextMenu3 IContextMenu3_iface; + IShellExtInit IShellExtInit_iface; LONG ref; IShellFolder* parent; @@ -64,6 +65,11 @@ static inline ContextMenu *impl_from_IContextMenu3(IContextMenu3 *iface) return CONTAINING_RECORD(iface, ContextMenu, IContextMenu3_iface); } +static inline ContextMenu *impl_from_IShellExtInit(IShellExtInit *iface) +{ + return CONTAINING_RECORD(iface, ContextMenu, IShellExtInit_iface); +} + static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID riid, LPVOID *ppvObj) { ContextMenu *This = impl_from_IContextMenu3(iface); @@ -79,9 +85,9 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID ri { *ppvObj = &This->IContextMenu3_iface; } - else if (IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/ + else if (IsEqualIID(riid, &IID_IShellExtInit)) { - FIXME("-- LPSHELLEXTINIT pointer requested\n"); + *ppvObj = &This->IShellExtInit_iface; } if(*ppvObj) @@ -580,6 +586,42 @@ static const IContextMenu3Vtbl ItemContextMenuVtbl = ContextMenu_HandleMenuMsg2 }; +static HRESULT WINAPI ShellExtInit_QueryInterface(IShellExtInit *iface, REFIID riid, void **obj) +{ + ContextMenu *This = impl_from_IShellExtInit(iface); + return IContextMenu3_QueryInterface(&This->IContextMenu3_iface, riid, obj); +} + +static ULONG WINAPI ShellExtInit_AddRef(IShellExtInit *iface) +{ + ContextMenu *This = impl_from_IShellExtInit(iface); + return IContextMenu3_AddRef(&This->IContextMenu3_iface); +} + +static ULONG WINAPI ShellExtInit_Release(IShellExtInit *iface) +{ + ContextMenu *This = impl_from_IShellExtInit(iface); + return IContextMenu3_Release(&This->IContextMenu3_iface); +} + +static HRESULT WINAPI ShellExtInit_Initialize(IShellExtInit *iface, LPCITEMIDLIST folder, + IDataObject *dataobj, HKEY progidkey) +{ + ContextMenu *This = impl_from_IShellExtInit(iface); + + FIXME("(%p)->(%p %p %p): stub\n", This, folder, dataobj, progidkey); + + return E_NOTIMPL; +} + +static const IShellExtInitVtbl ShellExtInitVtbl = +{ + ShellExtInit_QueryInterface, + ShellExtInit_AddRef, + ShellExtInit_Release, + ShellExtInit_Initialize +}; + HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl, REFIID riid, void **pObj) { @@ -591,6 +633,7 @@ HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPC if (!This) return E_OUTOFMEMORY; This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; + This->IShellExtInit_iface.lpVtbl = &ShellExtInitVtbl; This->ref = 1; This->parent = parent; if (parent) IShellFolder_AddRef(parent); @@ -899,6 +942,7 @@ HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID ri if (!This) return E_OUTOFMEMORY; This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; + This->IShellExtInit_iface.lpVtbl = &ShellExtInitVtbl; This->ref = 1; This->parent = parent; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1cf04b5..fac0801 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4354,9 +4354,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) HRESULT hr; hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); -todo_wine ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) IUnknown_Release(unk); hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk);

1 0

Nikolay Sivov : shell32/tests: Run more tests on menus created with SHCreateDefaultContextMenu().
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 0282f3aadee9b6570a2f2d20763a7ab62f68257e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0282f3aadee9b6570a2f2d20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 18 19:10:46 2018 +0300 shell32/tests: Run more tests on menus created with SHCreateDefaultContextMenu(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ee7ec49..716a486 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4343,23 +4343,34 @@ static void test_desktop_IPersist(void) IShellFolder_Release(desktop); } -static void test_contextmenu(IContextMenu *menu, BOOL background) +static void test_contextmenu_qi(IContextMenu *menu, BOOL todo) { - HMENU hmenu = CreatePopupMenu(); - const int id_upper_limit = 32767; - const int baseItem = 0x40; - INT max_id, max_id_check; IUnknown *unk; - UINT count, i; HRESULT hr; hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); +todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); +if (hr == S_OK) IUnknown_Release(unk); hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk); +todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); +if (hr == S_OK) IUnknown_Release(unk); +} + +static void test_contextmenu(IContextMenu *menu, BOOL background) +{ + HMENU hmenu = CreatePopupMenu(); + const int id_upper_limit = 32767; + const int baseItem = 0x40; + INT max_id, max_id_check; + UINT count, i; + HRESULT hr; + + test_contextmenu_qi(menu, FALSE); hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); ok(SUCCEEDED(hr), "Failed to query the menu, hr %#x.\n", hr); @@ -5011,7 +5022,6 @@ static void test_SHCreateDefaultContextMenu(void) IPersistFolder2_Release(persist); if(SUCCEEDED(hr)) { - cminfo.hwnd=NULL; cminfo.pcmcb=NULL; cminfo.psf=folder; @@ -5021,13 +5031,18 @@ static void test_SHCreateDefaultContextMenu(void) cminfo.aKeys=NULL; cminfo.cKeys=0; cminfo.punkAssociationInfo=NULL; + hr = pSHCreateDefaultContextMenu(&cminfo,&IID_IContextMenu,(void**)&cmenu); ok(hr==S_OK,"Got 0x%08x\n", hr); + test_contextmenu_qi(cmenu, TRUE); IContextMenu_Release(cmenu); + cminfo.pidlFolder=pidlFolder; hr = pSHCreateDefaultContextMenu(&cminfo,&IID_IContextMenu,(void**)&cmenu); ok(hr==S_OK,"Got 0x%08x\n", hr); + test_contextmenu_qi(cmenu, TRUE); IContextMenu_Release(cmenu); + status = RegOpenKeyExA(HKEY_CLASSES_ROOT,"*",0,KEY_READ,keys); if(status==ERROR_SUCCESS){ for(i=1;i<16;i++)

1 0

Henri Verbeet : wined3d: Split WINED3D_RESOURCE_ACCESS_MAP into WINED3D_RESOURCE_ACCESS_MAP_R and WINED3D_RESOURCE_ACCESS_MAP_W.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 6ca15e9c13d2098ae4a991389857d2270f50bbb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca15e9c13d2098ae4a99138… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 18 21:56:35 2018 +0330 wined3d: Split WINED3D_RESOURCE_ACCESS_MAP into WINED3D_RESOURCE_ACCESS_MAP_R and WINED3D_RESOURCE_ACCESS_MAP_W. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 12 ++++-------- dlls/d3d11/tests/d3d11.c | 6 ++---- dlls/d3d11/utils.c | 12 ++++++------ dlls/d3d8/buffer.c | 6 ++++-- dlls/d3d8/d3d8_private.h | 7 ++++--- dlls/d3d8/device.c | 7 ++++--- dlls/d3d8/texture.c | 6 ++++-- dlls/d3d9/buffer.c | 6 ++++-- dlls/d3d9/d3d9_private.h | 7 ++++--- dlls/d3d9/device.c | 7 ++++--- dlls/d3d9/texture.c | 6 ++++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 7 ++++--- dlls/ddraw/surface.c | 7 ++++--- dlls/ddraw/vertexbuffer.c | 4 ++-- dlls/wined3d/resource.c | 10 ++++++++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 3 ++- include/wine/wined3d.h | 3 ++- 20 files changed, 70 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ca15e9c13d2098ae4a9…

1 0

Michael Müller : ntdll: Parse execution level information in manifest data.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 5875dcd6f9b8fe7586f820595d49b7a9d78b65d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5875dcd6f9b8fe7586f82059… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Feb 17 17:41:15 2018 +0300 ntdll: Parse execution level information in manifest data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 157 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 956f255..3ba407d 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -490,17 +490,19 @@ enum assembly_type struct assembly { - enum assembly_type type; - struct assembly_identity id; - struct file_info manifest; - WCHAR *directory; - BOOL no_inherit; - struct dll_redirect *dlls; - unsigned int num_dlls; - unsigned int allocated_dlls; - struct entity_array entities; - COMPATIBILITY_CONTEXT_ELEMENT* compat_contexts; - ULONG num_compat_contexts; + enum assembly_type type; + struct assembly_identity id; + struct file_info manifest; + WCHAR *directory; + BOOL no_inherit; + struct dll_redirect *dlls; + unsigned int num_dlls; + unsigned int allocated_dlls; + struct entity_array entities; + COMPATIBILITY_CONTEXT_ELEMENT *compat_contexts; + ULONG num_compat_contexts; + ACTCTX_REQUESTED_RUN_LEVEL run_level; + ULONG ui_access; }; enum context_sections @@ -629,6 +631,10 @@ static const WCHAR compatibilityNSW[] = {'u','r','n',':','s','c','h','e','m','a' static const WCHAR applicationW[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR supportedOSW[] = {'s','u','p','p','o','r','t','e','d','O','S',0}; static const WCHAR IdW[] = {'I','d',0}; +static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e','d','E','x','e','c','u','t','i','o','n','L','e','v','e','l',0}; +static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; +static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; +static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; struct olemisc_entry { @@ -2317,6 +2323,141 @@ static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly return ret; } +static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +{ + static const WCHAR levelW[] = {'l','e','v','e','l',0}; + static const WCHAR asInvokerW[] = {'a','s','I','n','v','o','k','e','r',0}; + static const WCHAR requireAdministratorW[] = {'r','e','q','u','i','r','e','A','d','m','i','n','i','s','t','r','a','t','o','r',0}; + static const WCHAR highestAvailableW[] = {'h','i','g','h','e','s','t','A','v','a','i','l','a','b','l','e',0}; + static const WCHAR uiAccessW[] = {'u','i','A','c','c','e','s','s',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, ret = TRUE, error; + + /* Multiple requestedExecutionLevel elements are not supported. */ + if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) + return FALSE; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, levelW)) + { + if (xmlstr_cmpi(&attr_value, asInvokerW)) + assembly->run_level = ACTCTX_RUN_LEVEL_AS_INVOKER; + else if (xmlstr_cmpi(&attr_value, highestAvailableW)) + assembly->run_level = ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE; + else if (xmlstr_cmpi(&attr_value, requireAdministratorW)) + assembly->run_level = ACTCTX_RUN_LEVEL_REQUIRE_ADMIN; + else + FIXME("unknown execution level: %s\n", debugstr_xmlstr(&attr_value)); + } + else if (xmlstr_cmp(&attr_name, uiAccessW)) + { + if (xmlstr_cmpi(&attr_value, falseW)) + assembly->ui_access = FALSE; + else if (xmlstr_cmpi(&attr_value, trueW)) + assembly->ui_access = TRUE; + else + FIXME("unknown uiAccess value: %s\n", debugstr_xmlstr(&attr_value)); + } + else + FIXME("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + } + + if (error) return FALSE; + if (end) return TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, requestedExecutionLevelW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + FIXME("unknown element %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_requested_privileges_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, requestedPrivilegesW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, requestedExecutionLevelW)) + ret = parse_requested_execution_level_elem(xmlbuf, assembly, acl); + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_security_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, securityW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, requestedPrivilegesW)) + ret = parse_requested_privileges_elem(xmlbuf, assembly, acl); + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_trust_info_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, trustInfoW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, securityW)) + ret = parse_security_elem(xmlbuf, assembly, acl); + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, struct assembly* assembly, struct assembly_identity* expected_ai) @@ -2405,6 +2546,11 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_clr_surrogate_elem(xmlbuf, assembly, acl); } + else if (xml_elem_cmp(&elem, trustInfoW, asmv2W) || + xml_elem_cmp(&elem, trustInfoW, asmv1W)) + { + ret = parse_trust_info_elem(xmlbuf, assembly, acl); + } else if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE;

1 0

Henri Verbeet : usp10: Avoid leaking "open_stack" and "stack_index" in case of 0 "pair_count" in computeBracketPairs().
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 99e61cee75d705b6f67a6a832ac9f6815bab58ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e61cee75d705b6f67a6a83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 18 21:56:37 2018 +0330 usp10: Avoid leaking "open_stack" and "stack_index" in case of 0 "pair_count" in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index d94dc7b..8f94ede 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -741,6 +741,10 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) } } } + + heap_free(open_stack); + heap_free(stack_index); + if (pair_count == 0) { heap_free(out); @@ -749,8 +753,6 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) else if (pair_count > 1) qsort(out, pair_count, sizeof(BracketPair), compr); - heap_free(open_stack); - heap_free(stack_index); return out; }

1 0

Nikolay Sivov : shell32: Add IObjectWithSite stub for context menus.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 308a5ff7c86ffd61e64eebaa6720c3d43a79c41b URL: https://source.winehq.org/git/wine.git/?a=commit;h=308a5ff7c86ffd61e64eebaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 18 19:10:45 2018 +0300 shell32: Add IObjectWithSite stub for context menus. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 57 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 2 -- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 2b5d526..4a7263e 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -46,6 +46,7 @@ typedef struct { IContextMenu3 IContextMenu3_iface; IShellExtInit IShellExtInit_iface; + IObjectWithSite IObjectWithSite_iface; LONG ref; IShellFolder* parent; @@ -70,6 +71,11 @@ static inline ContextMenu *impl_from_IShellExtInit(IShellExtInit *iface) return CONTAINING_RECORD(iface, ContextMenu, IShellExtInit_iface); } +static inline ContextMenu *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, ContextMenu, IObjectWithSite_iface); +} + static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID riid, LPVOID *ppvObj) { ContextMenu *This = impl_from_IContextMenu3(iface); @@ -89,6 +95,10 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID ri { *ppvObj = &This->IShellExtInit_iface; } + else if (IsEqualIID(riid, &IID_IObjectWithSite)) + { + *ppvObj = &This->IObjectWithSite_iface; + } if(*ppvObj) { @@ -622,6 +632,51 @@ static const IShellExtInitVtbl ShellExtInitVtbl = ShellExtInit_Initialize }; +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **obj) +{ + ContextMenu *This = impl_from_IObjectWithSite(iface); + return IContextMenu3_QueryInterface(&This->IContextMenu3_iface, riid, obj); +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + ContextMenu *This = impl_from_IObjectWithSite(iface); + return IContextMenu3_AddRef(&This->IContextMenu3_iface); +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + ContextMenu *This = impl_from_IObjectWithSite(iface); + return IContextMenu3_Release(&This->IContextMenu3_iface); +} + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *site) +{ + ContextMenu *This = impl_from_IObjectWithSite(iface); + + FIXME("(%p)->(%p): stub\n", This, site); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID riid, void **site) +{ + ContextMenu *This = impl_from_IObjectWithSite(iface); + + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), site); + + return E_NOTIMPL; +} + +static const IObjectWithSiteVtbl ObjectWithSiteVtbl = +{ + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite, +}; + HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl, REFIID riid, void **pObj) { @@ -634,6 +689,7 @@ HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPC This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; This->IShellExtInit_iface.lpVtbl = &ShellExtInitVtbl; + This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->ref = 1; This->parent = parent; if (parent) IShellFolder_AddRef(parent); @@ -943,6 +999,7 @@ HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID ri This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; This->IShellExtInit_iface.lpVtbl = &ShellExtInitVtbl; + This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->ref = 1; This->parent = parent; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index fac0801..ee7ec49 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4358,9 +4358,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) IUnknown_Release(unk); hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk); -todo_wine ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) IUnknown_Release(unk); hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL);

1 0

Henri Verbeet : wined3d: Introduce separate read and write resource map flags.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: acc0f49aae9d9d1f00c1544a7ca7dd9923acf0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc0f49aae9d9d1f00c1544a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 18 21:56:34 2018 +0330 wined3d: Introduce separate read and write resource map flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 12 +++++++----- dlls/d3d8/device.c | 17 +++++++++++------ dlls/d3d9/device.c | 17 +++++++++++------ dlls/ddraw/device.c | 14 +++++++------- dlls/ddraw/executebuffer.c | 7 +++---- dlls/ddraw/surface.c | 4 ++-- dlls/ddraw/utils.c | 11 ++++++++--- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/resource.c | 38 +++++++++++++++++++++++++------------- dlls/wined3d/surface.c | 17 +++++++++-------- dlls/wined3d/texture.c | 5 +++-- include/wine/wined3d.h | 13 +++++++------ 14 files changed, 103 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acc0f49aae9d9d1f00c1…

1 0

Zebediah Figura : msi/tests: Add a test for MsiGetDatabaseState() called from a custom action.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 237ec6480749741af45e852151089dada22ae8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=237ec6480749741af45e8521… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 14 20:54:56 2018 -0600 msi/tests: Add a test for MsiGetDatabaseState() called from a custom action. 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/tests/custom.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c00b7aa..0eedb8e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -56,6 +56,7 @@ static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condi * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) { + UINT res; IUnknown *unk = NULL; HRESULT hres; @@ -65,6 +66,10 @@ UINT WINAPI main_test(MSIHANDLE hinst) if (unk) IUnknown_Release(unk); + /* Test MsiGetDatabaseState() */ + res = MsiGetDatabaseState(hinst); + todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); + return ERROR_SUCCESS; }

1 0

Akihiro Sagawa : gdi32/tests: Add more text metrics tests in synthetic bold bitmap fonts.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: b4a10d17c62d340a9578e8bf7715d78ec34551bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4a10d17c62d340a9578e8bf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 18 21:34:40 2018 +0900 gdi32/tests: Add more text metrics tests in synthetic bold bitmap fonts. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d6fe9e3..8070536 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6483,7 +6483,7 @@ static void test_fake_bold_font(void) ABC abc; INT w; GLYPHMETRICS gm; - } data[2]; + } data[4]; int i; DWORD r; @@ -6540,6 +6540,63 @@ static void test_fake_bold_font(void) "expected %d, got %d\n", data[0].gm.gmCellIncX + 1, data[1].gm.gmCellIncX); ok(data[0].gm.gmCellIncY == data[1].gm.gmCellIncY, "expected %d, got %d\n", data[0].gm.gmCellIncY, data[1].gm.gmCellIncY); + + /* Test bitmap font */ + memset(&data, 0xaa, sizeof(data)); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Courier"); + lf.lfCharSet = ANSI_CHARSET; + + hdc = GetDC(NULL); + + for (i = 0; i < 4; i++) + { + HFONT hfont, hfont_old; + + lf.lfWeight = (i % 2) ? FW_BOLD : FW_NORMAL; + lf.lfHeight = (i > 1) ? data[0].tm.tmHeight * x2_mat.eM11.value : 0; + hfont = CreateFontIndirectA(&lf); + hfont_old = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &data[i].tm); + ok(ret, "got %d\n", ret); + ret = pGetCharWidth32A(hdc, 0x76, 0x76, &data[i].w); + ok(ret, "got %d\n", ret); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + } + ReleaseDC(NULL, hdc); + + /* compare results (bitmap) */ + for (i = 0; i < 4; i+=2) + { + int diff = (i > 1) ? x2_mat.eM11.value : 1; + if (data[i].tm.tmPitchAndFamily & TMPF_TRUETYPE) + { + skip("TrueType font is selected (expected a bitmap one)\n"); + continue; + } + ok(data[i].tm.tmHeight == data[i+1].tm.tmHeight, + "expected %d, got %d\n", data[i].tm.tmHeight, data[i+1].tm.tmHeight); + ok(data[i].tm.tmAscent == data[i+1].tm.tmAscent, + "expected %d, got %d\n", data[i].tm.tmAscent, data[i+1].tm.tmAscent); + ok(data[i].tm.tmDescent == data[i+1].tm.tmDescent, + "expected %d, got %d\n", data[i].tm.tmDescent, data[i+1].tm.tmDescent); + todo_wine + ok(data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth == diff, + "expected %d, got %d\n", diff, data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth); + todo_wine + ok(data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth == diff, + "expected %d, got %d\n", diff, data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth); + ok(data[i].tm.tmOverhang == 0, + "expected 0, got %d\n", data[i].tm.tmOverhang); + todo_wine + ok(data[i+1].tm.tmOverhang == 1, + "expected 1, got %d\n", data[i+1].tm.tmOverhang); + ok(data[i].w + 1 == data[i+1].w, + "expected %d, got %d\n", data[i].w + 1, data[i+1].w); + } } static void test_bitmap_font_glyph_index(void)

1 0

Alexandre Julliard : makefiles: Add support for a generic SOURCES variable.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 54a123f4ef96d554180ccce1f69eb71726da1c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a123f4ef96d554180ccce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 11:39:05 2018 +0100 makefiles: Add support for a generic SOURCES variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 444 +++++++++++++++++++++++++-------------------------- tools/make_makefiles | 29 ++-- tools/makedep.c | 1 + 3 files changed, 239 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54a123f4ef96d554180c…

1 0

Akihiro Sagawa : gdi32: Fix synthetic bold outline text metrics.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 68f9fb556d6ac51ed628d106a33737c13095fad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68f9fb556d6ac51ed628d106… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 18 21:33:57 2018 +0900 gdi32: Fix synthetic bold outline text metrics. Without this fix, synthetic tmAveCharWidth value unintentionally affects SCALE_X calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3833147..ba8855a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7554,6 +7554,11 @@ static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm) SCALE_Y(ptm->tmExternalLeading); SCALE_Y(ptm->tmOverhang); + if(FT_IS_SCALABLE(font->ft_face) && font->fake_bold) + { + ptm->tmAveCharWidth++; + ptm->tmMaxCharWidth++; + } SCALE_X(ptm->tmAveCharWidth); SCALE_X(ptm->tmMaxCharWidth); @@ -7778,11 +7783,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) } TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); TM.tmWeight = FW_REGULAR; - if (font->fake_bold) { - TM.tmAveCharWidth++; - TM.tmMaxCharWidth++; + if (font->fake_bold) TM.tmWeight = FW_BOLD; - } else { if (ft_face->style_flags & FT_STYLE_FLAG_BOLD)

1 0

Francois Gouget : testbot: Add some traces to help diagnose scheduler issues.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: tools Branch: master Commit: b8967f23d80d84311decba77b3febc76385566b9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8967f23d80d84311decba7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 19 04:25:14 2018 +0100 testbot: Add some traces to help diagnose scheduler issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 0362221..9a0f8bc 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1012,6 +1012,63 @@ sub _SacrificeVM($$$) return 1; } +sub _DumpHostCounters($$) +{ + my ($Sched, $VM) = @_; + my $Host = _GetSchedHost($Sched, $VM); + return if ($Host->{dumpedcounters}); + + my $Counters = ""; + if ($Host->{active}) + { + $Counters .= " active=$Host->{active}/$Host->{MaxActiveVMs}"; + } + if ($Host->{idle}) + { + $Counters .= " idle=$Host->{idle}". ($Host->{queued} ? "" : "/$Host->{MaxVMsWhenIdle}"); + } + if ($Host->{reverting}) + { + $Counters .= " reverting=$Host->{reverting}/". _GetMaxReverts($Host); + } + for my $Counter ("sleeping", "running", "dirty", "queued") + { + $Counters .= " $Counter=$Host->{$Counter}" if ($Host->{$Counter}); + } + my $HostKey = $VM->GetHost(); + my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || + $HostKey; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$PrettyHost:$Counters\n") if ($Counters); + + $Host->{dumpedcounters} = 1; +} + +sub _DumpHostVMs($$$$) +{ + my ($Sched, $VM, $SortedNeededVMs, $NeededVMs) = @_; + my $Host = _GetSchedHost($Sched, $VM); + return if ($Host->{dumpedvms}); + + _DumpHostCounters($Sched, $VM); + + my @VMInfo; + my $HostKey = $VM->GetHost(); + foreach my $VMKey (@$SortedNeededVMs) + { + $VM = $Sched->{VMs}->GetItem($VMKey); + next if ($VM->GetHost() ne $HostKey); + + push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]); + } + my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || + $HostKey; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$PrettyHost: @VMInfo\n"); + + $Host->{dumpedvms} = 1; +} + sub _RevertVMs($$) { my ($Sched, $NeededVMs) = @_; @@ -1027,6 +1084,7 @@ sub _RevertVMs($$) # Check if the host has reached its reverting VMs limit my $Host = _GetSchedHost($Sched, $VM); next if ($Host->{reverting} >= _GetMaxReverts($Host)); + _DumpHostCounters($Sched, $VM); # Skip this VM if the previous step's tasks are not about to run yet next if (_HasMissingDependencies($Sched, $NeededVMs, $VMKey)); @@ -1071,6 +1129,7 @@ sub _RevertVMs($$) $NeedsSacrifice = ($FutureActive > $Host->{MaxActiveVMs}); } + _DumpHostVMs($Sched, $VM, \@SortedNeededVMs, $NeededVMs); if ($NeedsSacrifice) { # Find an active VM to sacrifice so we can revert this VM in the next

1 0

Francois Gouget : testbot: Make the job scheduler more extensible.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: tools Branch: master Commit: 66723015efdc15538bbb8c01ea91543f68893627 URL: https://source.winehq.org/git/tools.git/?a=commit;h=66723015efdc15538bbb8c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 19 04:25:04 2018 +0100 testbot: Make the job scheduler more extensible. - The new scheduler splits the work into smaller steps: assessing the current situation, starting tasks on idle VMs and building a list of needed VMs, reverting the VMs, powering off the remaining VMs, updating the activity records. Each part can be analyzed independently. It uses the $Sched structure to pass information between these functions. - Sometimes a VM that no Task needs must be powered off in order to be able to prepare a VM that is needed. The job of picking which VM to sacrifice is now delegated to _SacrificeVM(). - The scheduler used to handle each VM host independently. As a result it was unable to prepare a VM for the 'next step' if that VM was on another VM host. The lack of a global picture also made many other extensions impossible. The new scheduler handles scheduling on all VM hosts at the same time, thus solving this issue. - This and other improvements mean the scheduler no longer needs to loop over the jobs and tasks multiple times. - In order to respect the per-VM-host limits the scheduler stores the host-related counters and limits in the $Sched->{hosts} table. - The scheduler also used to build multiple lists of VMs to revert depending on whether they were needed now, for the next step, or for future jobs. The new scheduler builds a single prioritised list of VMs to revert which can be handled in one go. It also keeps more information so it can better decide which VM to prepare next. - The scheduler can now also prepare VMs for the 'next step' earlier, thus making it more likely they will be ready in time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 914 ++++++++++++++++++++++++++++------------ 1 file changed, 637 insertions(+), 277 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=66723015efdc15538bb…

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.13.
by Alexandre Julliard Feb. 17, 2018

Feb. 17, 2018

Module: bugzilla Branch: master Commit: e1a085af1689c07fb06f145d16d5624222691a72 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=e1a085af1689c07fb06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:03 2018 +0100 Import of upstream bugzilla release 4.4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/CGI.pm | 64 +++++++++++++++++++++++ Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Sqlite.pm | 1 + attachment.cgi | 1 + docs/bugzilla.ent.tmpl | 6 +-- taskgraph.json | 42 ++++++++------- template/en/default/pages/release-notes.html.tmpl | 14 +++++ 7 files changed, 106 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e1a085af1689c07f…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Feb. 17, 2018

Feb. 17, 2018

Module: bugzilla Branch: master Commit: 68fa9518d63526c152bc72a6c3365e32dfdc866d URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=68fa9518d63526c152bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:54 2018 +0100 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.13.
by Alexandre Julliard Feb. 17, 2018

Feb. 17, 2018

Module: bugzilla Branch: upstream Commit: e1a085af1689c07fb06f145d16d5624222691a72 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=e1a085af1689c07fb06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:03 2018 +0100 Import of upstream bugzilla release 4.4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/CGI.pm | 64 +++++++++++++++++++++++ Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Sqlite.pm | 1 + attachment.cgi | 1 + docs/bugzilla.ent.tmpl | 6 +-- taskgraph.json | 42 ++++++++------- template/en/default/pages/release-notes.html.tmpl | 14 +++++ 7 files changed, 106 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e1a085af1689c07f…

1 0

Alexandre Julliard : Wine release 3.2
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: website Branch: master Commit: 924b7c93d971d4de6bc4eeb1ec796e4ea0064ce9 URL: https://source.winehq.org/git/website.git/?a=commit;h=924b7c93d971d4de6bc4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:41:49 2018 +0100 Wine release 3.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018021601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018021601.xml b/news/en/2018021601.xml new file mode 100644 index 0000000..120bf20 --- /dev/null +++ b/news/en/2018021601.xml @@ -0,0 +1,17 @@ +<news> +<date>February 16, 2018</date> +<title>Wine 3.2 Released</title> +<body> + The Wine development release 3.2 is now available. + <a href="{$root}/announce/3.2">What's new</a> in this release: +<ul> + <li>Separate implementation of USER controls for ComCtl32 v6.</li> + <li>Multisample texture support in Direct3D.</li> + <li>Support for HID gamepads.</li> + <li>More event support in MSHTML.</li> + <li>Obsolete DOS code removed.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alex Henrie : setupapi/tests: Drop install test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 02acc6514a376ef6ffefa6a132066c4fb8d8c40c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02acc6514a376ef6ffefa6a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 16 08:41:15 2018 -0700 setupapi/tests: Drop install test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/install.c | 182 ++++++++++------------------------------ 2 files changed, 46 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02acc6514a376ef6ffef…

1 0

Alexandre Julliard : Release 3.2.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 2936f3f9bb9dc01c595498a821d6adb6775b62cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2936f3f9bb9dc01c595498a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:37:35 2018 +0100 Release 3.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 906 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 5 files changed, 456 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2936f3f9bb9dc01c5954…

1 0

Tag wine-3.2 : Alexandre Julliard : Release 3.2
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: refs/tags/wine-3.2 Tag: 3605adb9657cb21c1f5f63338d7baba16eb5e625 URL: https://source.winehq.org/git/wine.git/?a=tag;h=3605adb9657cb21c1f5f63338d7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:37:35 2018 +0100 Release 3.2

1 0

Nikolay Sivov : comctl32/edit: Force update on focus change.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: dadea2d11d78c73ce918d0c130db6dd32d06e6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dadea2d11d78c73ce918d0c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 16 14:19:00 2018 +0300 comctl32/edit: Force update on focus change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 63 ++++++++++---------- dlls/comctl32/tests/edit.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 67d77da..10ff5fb 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3382,16 +3382,23 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) * WM_KILLFOCUS * */ -static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) +static LRESULT EDIT_WM_KillFocus(HTHEME theme, EDITSTATE *es) { - es->flags &= ~EF_FOCUSED; - DestroyCaret(); - if(!(es->style & ES_NOHIDESEL)) - EDIT_InvalidateText(es, es->selection_start, es->selection_end); - EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); - /* throw away left over scroll when we lose focus */ - es->wheelDeltaRemainder = 0; - return 0; + UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; + + es->flags &= ~EF_FOCUSED; + DestroyCaret(); + if (!(es->style & ES_NOHIDESEL)) + EDIT_InvalidateText(es, es->selection_start, es->selection_end); + EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + /* Throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; + + if (theme) + flags |= RDW_FRAME; + + RedrawWindow(es->hwndSelf, NULL, NULL, flags); + return 0; } @@ -3656,26 +3663,24 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) * WM_SETFOCUS * */ -static void EDIT_WM_SetFocus(EDITSTATE *es) +static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) { - es->flags |= EF_FOCUSED; + UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; - if (!(es->style & ES_NOHIDESEL)) - EDIT_InvalidateText(es, es->selection_start, es->selection_end); + es->flags |= EF_FOCUSED; - /* single line edit updates itself */ - if (IsWindowVisible(es->hwndSelf) && !(es->style & ES_MULTILINE)) - { - HDC hdc = GetDC(es->hwndSelf); - EDIT_WM_Paint(es, hdc); - ReleaseDC(es->hwndSelf, hdc); - } + if (!(es->style & ES_NOHIDESEL)) + EDIT_InvalidateText(es, es->selection_start, es->selection_end); - CreateCaret(es->hwndSelf, 0, 1, es->line_height); - EDIT_SetCaretPos(es, es->selection_end, - es->flags & EF_AFTER_WRAP); - ShowCaret(es->hwndSelf); - EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); + CreateCaret(es->hwndSelf, 0, 1, es->line_height); + EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); + ShowCaret(es->hwndSelf); + EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); + + if (theme) + flags |= RDW_FRAME | RDW_ERASE; + + RedrawWindow(es->hwndSelf, NULL, NULL, flags); } @@ -4827,9 +4832,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_KILLFOCUS: - result = EDIT_WM_KillFocus(es); - if (theme) - RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + result = EDIT_WM_KillFocus(theme, es); break; case WM_LBUTTONDBLCLK: @@ -4866,9 +4869,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_SETFOCUS: - EDIT_WM_SetFocus(es); - if (theme) - RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + EDIT_WM_SetFocus(theme, es); break; case WM_SETFONT: diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 41eb585..7e9e7e7 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -23,6 +23,7 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" #ifndef ES_COMBO #define ES_COMBO 0x200 @@ -32,6 +33,20 @@ #define ID_EDITTEST2 99 #define MAXLEN 200 +enum seq_index +{ + COMBINED_SEQ_INDEX = 0, + NUM_MSG_SEQUENCES, +}; + +enum msg_id +{ + PARENT_ID, + EDIT_ID, +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + struct edit_notify { int en_change, en_maxtext, en_update; }; @@ -865,6 +880,66 @@ static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR return DefWindowProcA(hWnd, msg, wParam, lParam); } +static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + msg.message = message; + msg.flags = sent|wparam|id; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.id = PARENT_ID; + + if (message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY && + message != WM_GETICON && + message != WM_DWMNCRENDERINGCHANGED && + message != WM_GETMINMAXINFO && + message != WM_PAINT && + message != WM_CTLCOLOREDIT && + message < 0xc000) + { + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static LRESULT CALLBACK edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + msg.message = message; + msg.flags = sent|wparam|id; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.id = EDIT_ID; + + if (message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY) + { + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + if (IsWindowUnicode(hwnd)) + ret = CallWindowProcW(oldproc, hwnd, message, wParam, lParam); + else + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + /* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response * to these messages. */ @@ -2365,6 +2440,7 @@ static BOOL register_classes(void) WNDCLASSA test3; WNDCLASSA test4; WNDCLASSA text_position; + WNDCLASSA wc; test2.style = 0; test2.lpfnWndProc = ET2_WndProc; @@ -2414,6 +2490,12 @@ static BOOL register_classes(void) text_position.lpfnWndProc = DefWindowProcA; if (!RegisterClassA(&text_position)) return FALSE; + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = parent_wnd_proc; + wc.hInstance = GetModuleHandleA(NULL); + wc.lpszClassName = "ParentWnd"; + if (!RegisterClassA(&wc)) return FALSE; + return TRUE; } @@ -2958,6 +3040,60 @@ static void test_wordbreak_proc(void) DestroyWindow(hwnd); } +static const struct message setfocus_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_SETFOCUS), 0, PARENT_ID }, + { WM_PAINT, sent|id, 0, 0, EDIT_ID }, + { WM_NCPAINT, sent|id|defwinproc|optional, 0, 0, EDIT_ID }, + { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, EDIT_ID }, + { 0 } +}; + +static const struct message killfocus_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_KILLFOCUS), 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, PARENT_ID }, + { WM_PAINT, sent|id, 0, 0, EDIT_ID }, + { WM_NCPAINT, sent|id|defwinproc|optional, 0, 0, EDIT_ID }, + { 0 } +}; + +static void test_change_focus(void) +{ + HWND hwnd, parent_wnd; + WNDPROC oldproc; + MSG msg; + + parent_wnd = CreateWindowA("ParentWnd", "", WS_OVERLAPPEDWINDOW, + 0, 0, 200, 200, NULL, NULL, GetModuleHandleA(NULL), NULL); + ok(parent_wnd != NULL, "Failed to create control parent.\n"); + SetWindowPos(parent_wnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ShowWindow(parent_wnd, SW_SHOW); + + hwnd = CreateWindowExA(0, WC_EDITA, "Test", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, + parent_wnd, (HMENU)1, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create Edit control.\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + + SetFocus(parent_wnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(hwnd); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_combined_seq, "Set focus", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(parent_wnd); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -2967,6 +3103,8 @@ START_TEST(edit) if (!load_v6_module(&ctx_cookie, &hCtx)) return; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + hinst = GetModuleHandleA(NULL); b = register_classes(); ok(b, "Failed to register test classes.\n"); @@ -2999,6 +3137,7 @@ START_TEST(edit) test_paste(); test_EM_GETLINE(); test_wordbreak_proc(); + test_change_focus(); UnregisterWindowClasses();

1 0

Józef Kucia : d3d10core/tests: Add test for alpha to coverage.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 6062a51108d2cf4c6b91081002a67903941bf9a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6062a51108d2cf4c6b910810… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:29 2018 +0100 d3d10core/tests: Add test for alpha to coverage. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 219 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6062a51108d2cf4c6b91…

1 0

Matteo Bruni : d3d9/tests: Add a test for GenerateMipSubLevels().
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 4477231ab13dd6f7f3ec743f3e059c3a74a48ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4477231ab13dd6f7f3ec743f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:54 2018 +0100 d3d9/tests: Add a test for GenerateMipSubLevels(). 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/d3d9/tests/visual.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0439ebd..b5e260d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5864,6 +5864,136 @@ done: DestroyWindow(window); } +static void test_generate_mipmap(void) +{ + static const RECT r1 = {256, 256, 512, 512}; + static const RECT r2 = {512, 256, 768, 512}; + static const RECT r3 = {256, 512, 512, 768}; + static const RECT r4 = {512, 512, 768, 768}; + static const float quad[] = + { + -0.5f, -0.5f, 0.1f, 0.0f, 0.0f, + -0.5f, 0.5f, 0.1f, 0.0f, 1.0f, + 0.5f, -0.5f, 0.1f, 1.0f, 0.0f, + 0.5f, 0.5f, 0.1f, 1.0f, 1.0f, + }; + IDirect3DTexture9 *texture, *texture2; + IDirect3DSurface9 *surface, *surface2; + IDirect3DDevice9 *device; + unsigned int x, y; + D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Make the texture big enough that a mipmap level > 0 is used. */ + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 0, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &texture2, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture2, 0, &surface2); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surface2, &lr, NULL, 0); + ok(SUCCEEDED(hr), "Failed to map surface, hr %#x.\n", hr); + for (y = 0; y < 1024; ++y) + { + for(x = 0; x < 1024; ++x) + { + DWORD *dst = (DWORD *)((BYTE *)lr.pBits + y * lr.Pitch + x * 4); + POINT pt; + + pt.x = x; + pt.y = y; + if (PtInRect(&r1, pt)) + *dst = 0xffff0000; + else if (PtInRect(&r2, pt)) + *dst = 0xff00ff00; + else if (PtInRect(&r3, pt)) + *dst = 0xff0000ff; + else if (PtInRect(&r4, pt)) + *dst = 0xff000000; + else + *dst = 0xffffffff; + } + } + hr = IDirect3DSurface9_UnlockRect(surface2); + ok(SUCCEEDED(hr), "Failed to unmap surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface, NULL); + ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface2); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture2); + + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_LINEAR); + ok(SUCCEEDED(hr), "Failed to set mipmap autogen filter type, hr %#x.\n", hr); + + IDirect3DTexture9_GenerateMipSubLevels(texture); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mipmap filtering, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + color = getPixelColor(device, 200, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 200, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_mipmap_autogen(void) { IDirect3DSurface9 *surface, *surface2, *surface3, *backbuffer; @@ -23533,6 +23663,7 @@ START_TEST(visual) g16r16_texture_test(); pixelshader_blending_test(); texture_transform_flags_test(); + test_generate_mipmap(); test_mipmap_autogen(); fixed_function_decl_test(); conditional_np2_repeat_test();

1 0

Józef Kucia : d3d11: Add DXGI_FORMAT_B4G4R4A4_UNORM format.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 0c1658907641f61e0e92d9e47d051145fcf14324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c1658907641f61e0e92d9e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:31 2018 +0100 d3d11: Add DXGI_FORMAT_B4G4R4A4_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 3885078..3a48907 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -150,6 +150,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; @@ -311,6 +312,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -421,6 +423,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN;

1 0

Józef Kucia : d3d9/tests: Add basic test for StretchRect() with multisample resources.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 10e7f7ca47f77762baa661ee7337087907cb3f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e7f7ca47f77762baa661ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:32 2018 +0100 d3d9/tests: Add basic test for StretchRect() with multisample resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b5e260d..23fd1fb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4072,6 +4072,135 @@ done: DestroyWindow(window); } +static void test_multisample_stretch_rect(void) +{ + static const D3DTEXTUREFILTERTYPE filters[] = + { + D3DTEXF_NONE, + D3DTEXF_POINT, + D3DTEXF_LINEAR, + }; + IDirect3DSurface9 *rt, *ms_rt, *rt_r5g6b5; + struct surface_readback rb; + IDirect3DDevice9 *device; + DWORD quality_levels; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + DWORD color; + HRESULT hr; + RECT rect; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &quality_levels) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt, NULL); + ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + + for (i = 0; i < sizeof(filters) / sizeof(*filters); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + color = getPixelColor(device, 64, 64); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + } + + /* Scaling */ + SetRect(&rect, 0, 0, 64, 64); + for (i = 0; i < sizeof(filters) / sizeof(*filters); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, &rect, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 32, 32); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 64, 64); + ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 96, 96); + ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, rt, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 32, 32); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 64, 64); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 96, 96); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + release_surface_readback(&rb); + } + + /* Format conversion */ + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_R5G6B5, D3DMULTISAMPLE_NONE, 0, FALSE, &rt_r5g6b5, NULL); + if (FAILED(hr)) + { + skip("Failed to create D3DFMT_R5G6B5 render target.\n"); + goto done; + } + + for (i = 0; i < sizeof(filters) / sizeof(*filters); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt_r5g6b5, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, rt_r5g6b5, NULL, rt, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + color = getPixelColor(device, 64, 64); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + } + + IDirect3DSurface9_Release(rt_r5g6b5); + +done: + IDirect3DSurface9_Release(ms_rt); + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void maxmip_test(void) { IDirect3DTexture9 *texture; @@ -23645,6 +23774,7 @@ START_TEST(visual) test_sanity(); depth_clamp_test(); stretchrect_test(); + test_multisample_stretch_rect(); lighting_test(); test_specular_lighting(); clear_test();

1 0

Matteo Bruni : d3d9/tests: Add a test for cube texture mipmap autogeneration.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 0d8dc0c0b72a81ef002b2917448c58d77525e6d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d8dc0c0b72a81ef002b2917… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:52 2018 +0100 d3d9/tests: Add a test for cube texture mipmap autogeneration. 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/d3d9/tests/visual.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c745c1b..0439ebd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5868,8 +5868,9 @@ static void test_mipmap_autogen(void) { IDirect3DSurface9 *surface, *surface2, *surface3, *backbuffer; IDirect3DTexture9 *texture, *texture2, *texture3; + IDirect3DCubeTexture9 *cube_texture; IDirect3DDevice9 *device; - unsigned int x, y; + unsigned int i, x, y; D3DLOCKED_RECT lr; IDirect3D9 *d3d; D3DCOLOR color; @@ -6130,6 +6131,77 @@ static void test_mipmap_autogen(void) IDirect3DTexture9_Release(texture3); IDirect3DTexture9_Release(texture2); IDirect3DTexture9_Release(texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("No cube textures support.\n"); + IDirect3DSurface9_Release(backbuffer); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_CreateCubeTexture(device, 1024, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &cube_texture, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + for (i = 0; i < 6; ++i) + { + hr = IDirect3DCubeTexture9_LockRect(cube_texture, i, 0, &lr, NULL, 0); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + + for (y = 0; y < 1024; ++y) + { + for (x = 0; x < 1024; ++x) + { + DWORD *dst = (DWORD *)((BYTE *)lr.pBits + y * lr.Pitch + x * 4); + POINT pt; + + pt.x = x; + pt.y = y; + if (PtInRect(&r1, pt)) + *dst = 0xffff0000; + else if (PtInRect(&r2, pt)) + *dst = 0xff00ff00; + else if (PtInRect(&r3, pt)) + *dst = 0xff0000ff; + else if (PtInRect(&r4, pt)) + *dst = 0xff000000; + else + *dst = 0xffffffff; + } + } + hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, i, 0); + ok(SUCCEEDED(hr), "Failed to unmap texture, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)cube_texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); + + color = getPixelColor(device, 200, 200); + ok(color == 0x00000000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 200, 270); + ok(color == 0x00000000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 270); + ok(color == 0x0000ff00, "Unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(backbuffer); refcount = IDirect3DDevice9_Release(device);

1 0

Matteo Bruni : d3d9: Introduce a d3d9_texture_cleanup() function.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 280ea40aab59189edc733b7dbee475054055390d URL: https://source.winehq.org/git/wine.git/?a=commit;h=280ea40aab59189edc733b7d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:50 2018 +0100 d3d9: Introduce a d3d9_texture_cleanup() function. 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/d3d9/texture.c | 66 ++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d3662f8..ec00776 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -78,6 +78,23 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource return texture->wined3d_srv; } +static void d3d9_texture_cleanup(struct d3d9_texture *texture) +{ + IDirect3DDevice9Ex *parent_device = texture->parent_device; + struct d3d9_surface *surface; + + wined3d_mutex_lock(); + if (texture->wined3d_srv) + wined3d_shader_resource_view_decref(texture->wined3d_srv); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) + wined3d_rendertarget_view_decref(surface->wined3d_rtv); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parent_device); +} + /* wined3d critical section must be taken by the caller. */ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) { @@ -146,23 +163,7 @@ static ULONG WINAPI d3d9_texture_2d_Release(IDirect3DTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - struct d3d9_surface *surface; - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } @@ -560,25 +561,7 @@ static ULONG WINAPI d3d9_texture_cube_Release(IDirect3DCubeTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - struct d3d9_surface *surface; - - TRACE("Releasing child %p.\n", texture->wined3d_texture); - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } @@ -996,16 +979,7 @@ static ULONG WINAPI d3d9_texture_3d_Release(IDirect3DVolumeTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - - wined3d_mutex_lock(); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; }

1 0

Nikolay Sivov : user32/tests: Test auto-registration for more redirected builtin classes.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: f31cb68fc3efe4ae04821772037f19f85634f8cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31cb68fc3efe4ae04821772… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 16 16:23:01 2018 +0300 user32/tests: Test auto-registration for more redirected builtin classes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 7701f25..a9eee41 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1237,6 +1237,9 @@ static void test_comctl32_classes(void) "!Button", "!Edit", "!Static", + "!Listbox", + "!ComboBox", + "!ComboLBox", }; winetest_get_mainargs( &argv );

1 0

Matteo Bruni : server: Avoid writing out of bounds in get_selector_entry() .
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 1f006f075d3db4a1dec55e6183519480d81ce961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f006f075d3db4a1dec55e61… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:55 2018 +0100 server: Avoid writing out of bounds in get_selector_entry(). Fixes c6dfce272309c1ad869886a0fce186c795f3e5b7. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 704b17d..4eda8eb 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -289,7 +289,7 @@ static int suspend_for_ptrace( struct thread *thread ) } /* read a long from a thread address space */ -static long read_thread_long( struct thread *thread, long *addr, long *data ) +static int read_thread_long( struct thread *thread, void *addr, unsigned long *data ) { errno = 0; *data = ptrace( PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr, 0 ); @@ -301,14 +301,26 @@ static long read_thread_long( struct thread *thread, long *addr, long *data ) return 0; } +static int read_thread_int( struct thread *thread, void *addr, unsigned int *data ) +{ + unsigned long long_data; + int ret; + + ret = read_thread_long( thread, addr, &long_data ); + *data = long_data; + return ret; +} + /* write a long to a thread address space */ -static long write_thread_long( struct thread *thread, long *addr, long data, unsigned long mask ) +static long write_thread_long( struct thread *thread, void *addr, unsigned long data, unsigned long mask ) { - long res; + unsigned long old_data; + int res; + if (mask != ~0ul) { - if (read_thread_long( thread, addr, &res ) == -1) return -1; - data = (data & mask) | (res & ~mask); + if (read_thread_long( thread, addr, &old_data ) == -1) return -1; + data = (data & mask) | (old_data & ~mask); } if ((res = ptrace( PTRACE_POKEDATA, get_ptrace_pid(thread), (caddr_t)addr, data )) == -1) file_set_error(); @@ -333,7 +345,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t { struct thread *thread = get_ptrace_thread( process ); unsigned int first_offset, last_offset, len; - long data, *addr; + unsigned long data, *addr; if (!thread) return 0; @@ -347,7 +359,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t last_offset = (size + first_offset) % sizeof(long); if (!last_offset) last_offset = sizeof(long); - addr = (long *)(unsigned long)(ptr - first_offset); + addr = (unsigned long *)(unsigned long)(ptr - first_offset); len = (size + first_offset + sizeof(long) - 1) / sizeof(long); if (suspend_for_ptrace( thread )) @@ -517,13 +529,14 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } if (suspend_for_ptrace( thread )) { - unsigned char flags_buf[4]; + unsigned int flags_buf; unsigned long addr = (unsigned long)thread->process->ldt_copy + (entry * 4); - if (read_thread_long( thread, (long *)addr, (long *)base ) == -1) goto done; - if (read_thread_long( thread, (long *)(addr + (8192 * 4)), (long *)limit ) == -1) goto done; + + if (read_thread_int( thread, (void *)addr, base ) == -1) goto done; + if (read_thread_int( thread, (void *)(addr + (8192 * 4)), limit ) == -1) goto done; addr = (unsigned long)thread->process->ldt_copy + (2 * 8192 * 4) + (entry & ~3); - if (read_thread_long( thread, (long *)addr, (long *)flags_buf ) == -1) goto done; - *flags = flags_buf[entry % 4]; + if (read_thread_int( thread, (void *)addr, &flags_buf ) == -1) goto done; + *flags = flags_buf >> (entry & 3) * 8; done: resume_after_ptrace( thread ); }

1 0

Józef Kucia : wined3d: Use renderbuffers when resolving multisample textures with conversion.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: de9ebcff70a41d1600c26734b3b0f2b3935992d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9ebcff70a41d1600c26734… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:33 2018 +0100 wined3d: Use renderbuffers when resolving multisample textures with conversion. Direct3D 9 allows blits from multisample resources to non-multisample resources with scaling or format conversion. In OpenGL, we resolve multisample texture to the renderbuffer associated with the texture before doing the actual blit with scaling/format conversion. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1f5a98a..5cb9cda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -350,6 +350,15 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, context_release(context); } +static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) +{ + if (location == WINED3D_LOCATION_RB_MULTISAMPLE) + return TRUE; + if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) + return FALSE; + return texture->target == GL_TEXTURE_2D_MULTISAMPLE || texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; +} + /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void surface_blt_fbo(const struct wined3d_device *device, @@ -392,7 +401,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, } /* Resolve the source surface first if needed. */ - if (src_location == WINED3D_LOCATION_RB_MULTISAMPLE + if (is_multisample_location(src_texture, src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left)))

1 0

Jacek Caban : mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent:: which properties implementation.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: abd27e0926f01ca3a82f18ba6e00ad08cb046544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd27e0926f01ca3a82f18ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 16 16:36:14 2018 +0100 mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent::which properties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 4 ++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 413ca2d..3a83e47 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1619,8 +1619,17 @@ static HRESULT WINAPI DOMMouseEvent_get_layerY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_which(IDOMMouseEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetWhich(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static const IDOMMouseEventVtbl DOMMouseEventVtbl = { @@ -1874,8 +1883,17 @@ static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LO static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetWhich(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_char(IDOMKeyboardEvent *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index c5030d0..f645e37 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -628,6 +628,7 @@ function test_mouse_event() { ok(e.buttons === 0, "buttons = " + e.buttons); ok(e.pageX === 0, "pageX = " + e.pageX); ok(e.pageY === 0, "pageY = " + e.pageY); + ok(e.which === 1, "which = " + e.which); e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); ok(e.type === "test", "type = " + e.type); @@ -646,6 +647,7 @@ function test_mouse_event() { ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 1, "button = " + e.button); ok(e.buttons === 0, "buttons = " + e.buttons); + ok(e.which === 2, "which = " + e.which); e.initMouseEvent("test", false, false, window, 9, 8, 7, 6, 5, true, true, true, true, 127, document); ok(e.type === "test", "type = " + e.type); @@ -661,6 +663,7 @@ function test_mouse_event() { ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); ok(e.metaKey === true, "metaKey = " + e.metaKey); ok(e.button === 127, "button = " + e.button); + ok(e.which === 128, "which = " + e.which); e.initEvent("testevent", true, true); ok(e.type === "testevent", "type = " + e.type); @@ -728,6 +731,7 @@ function test_keyboard_event() { ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.location === 0, "location = " + e.location); ok(e.detail === 0, "detail = " + e.detail); + ok(e.which === 0, "which = " + e.which); next_test(); }

1 0

Henri Verbeet : d3d8: Explicitly translate resource map flags.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 8a1a94cd200cc5894a2953211ce37d9b7fd02771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1a94cd200cc5894a295321… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:06 2018 +0330 d3d8: Explicitly translate resource map flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 18 ++++++++++++++++++ dlls/d3d8/surface.c | 2 +- dlls/d3d8/volume.c | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 772a233..d4d73ad 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -193,7 +193,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 5e59065..ecde77a 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -273,6 +273,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a6363d2..fc40026 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -141,6 +141,24 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +{ + static const unsigned int handled = D3DLOCK_READONLY + | D3DLOCK_NOSYSLOCK + | D3DLOCK_NOOVERWRITE + | D3DLOCK_DISCARD + | D3DLOCK_NO_DIRTY_UPDATE; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + flags &= ~handled; + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count) { switch (primitive_type) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 6ad43a4..fff47f5 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -244,7 +244,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, } hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, flags); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index e8ff74b..89aa84f 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -147,7 +147,8 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), - volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags))) + volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, + wined3dmapflags_from_d3dmapflags(flags)))) map_desc.data = NULL; wined3d_mutex_unlock();

1 0

Nikolay Sivov : comctl32/tests: Replace asserts with regular test checks for Edit tests.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 335f865ed57fa8edd538ecc37a1704b22c40fc4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=335f865ed57fa8edd538ecc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 16 14:18:59 2018 +0300 comctl32/tests: Replace asserts with regular test checks for Edit tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 122 ++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=335f865ed57fa8edd538…

1 0

Henri Verbeet : d3d11: Set resource access based on usage and CPU access flags.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: b6f917b1023ea2b9591f6b72d34ff2afa34bd914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6f917b1023ea2b9591f6b72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:04 2018 +0330 d3d11: Set resource access based on usage and CPU access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 16 ++++++++-------- dlls/d3d11/buffer.c | 4 +--- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/tests/d3d11.c | 8 ++++---- dlls/d3d11/texture.c | 8 ++++---- dlls/d3d11/utils.c | 15 +++++++++++++++ dlls/d3d8/volume.c | 2 ++ dlls/d3d9/volume.c | 2 ++ dlls/wined3d/resource.c | 2 +- 9 files changed, 38 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6f917b1023ea2b9591f…

1 0

Henri Verbeet : ddraw: Explicitly translate resource map flags.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 72c31c146be3e425d948f9f5cdca5a98915f9b4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c31c146be3e425d948f9f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:05 2018 +0330 ddraw: Explicitly translate resource map flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 3 ++- dlls/ddraw/utils.c | 20 ++++++++++++++++++++ dlls/ddraw/vertexbuffer.c | 14 ++------------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index af58c11..3cf9b76 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -587,6 +587,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *ddraw_format, BOOL wined3d_colour_from_ddraw_colour(const DDPIXELFORMAT *pf, const struct ddraw_palette *palette, DWORD colour, struct wined3d_color *wined3d_colour) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) DECLSPEC_HIDDEN; void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN; void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN; void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6307911..f09aaba 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -992,7 +992,8 @@ static HRESULT surface_lock(struct ddraw_surface *surface, hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), - surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); + surface->sub_resource_idx, &map_desc, rect ? &box : NULL, + wined3dmapflags_from_ddrawmapflags(flags)); if (FAILED(hr)) { wined3d_mutex_unlock(); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 3785158..bb75666 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -561,6 +561,26 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix return WINED3DFMT_UNKNOWN; } +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) +{ + static const unsigned int handled = DDLOCK_READONLY + | DDLOCK_NOSYSLOCK + | DDLOCK_NOOVERWRITE + | DDLOCK_DISCARDCONTENTS + | DDLOCK_DONOTWAIT; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + if (flags & DDLOCK_NODIRTYUPDATE) + wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_NODIRTYUPDATE); + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static float colour_to_float(DWORD colour, DWORD mask) { if (!mask) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f89b620..b661e73 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -162,26 +162,16 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; HRESULT hr; - DWORD wined3d_flags = 0; TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, flags, data, data_size); if (buffer->version != 7) flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); - /* Writeonly: Pointless. Event: Unsupported by native according to the sdk - * nosyslock: Not applicable - */ if (!(flags & DDLOCK_WAIT)) - wined3d_flags |= WINED3D_MAP_DONOTWAIT; - if (flags & DDLOCK_READONLY) - wined3d_flags |= WINED3D_MAP_READONLY; - if (flags & DDLOCK_NOOVERWRITE) - wined3d_flags |= WINED3D_MAP_NOOVERWRITE; + flags |= DDLOCK_DONOTWAIT; if (flags & DDLOCK_DISCARDCONTENTS) { - wined3d_flags |= WINED3D_MAP_DISCARD; - if (!buffer->dynamic) { struct wined3d_buffer *new_buffer; @@ -211,7 +201,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, } hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, NULL, wined3d_flags); + 0, &wined3d_map_desc, NULL, wined3dmapflags_from_ddrawmapflags(flags)); *data = wined3d_map_desc.data; wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Explicitly translate resource map flags.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: b5d0cad40d19720d78b32d93b085f396bb5e6aa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d0cad40d19720d78b32d93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:07 2018 +0330 d3d9: Explicitly translate resource map flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 19 +++++++++++++++++++ dlls/d3d9/surface.c | 2 +- dlls/d3d9/volume.c | 3 ++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index b7277fe..04c87c8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -194,7 +194,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6ed3994..92bbacd 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -56,6 +56,7 @@ HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLS D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN; void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ff95bef..c057c77 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -160,6 +160,25 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +{ + static const unsigned int handled = D3DLOCK_READONLY + | D3DLOCK_NOSYSLOCK + | D3DLOCK_NOOVERWRITE + | D3DLOCK_DISCARD + | D3DLOCK_DONOTWAIT + | D3DLOCK_NO_DIRTY_UPDATE; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + flags &= ~handled; + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count) { switch (primitive_type) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 813f89c..0605e71 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -249,7 +249,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, flags); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 6c61b99..f4c43bc 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -147,7 +147,8 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), - volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags))) + volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, + wined3dmapflags_from_d3dmapflags(flags)))) map_desc.data = NULL; wined3d_mutex_unlock();

1 0

Józef Kucia : dxgi: Add DXGI_FORMAT_B4G4R4A4_UNORM format.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 9cb8e220d048aaa83a02386e90fd468639da6f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb8e220d048aaa83a02386e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:30 2018 +0100 dxgi: Add DXGI_FORMAT_B4G4R4A4_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index a881746..74f0ae05 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -148,6 +148,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; @@ -260,6 +261,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -370,6 +372,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN;

1 0

Nikolay Sivov : wincodecs: Create default encoder options for BMP encoder.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: afe89eaec18a4943daae9ee3856f92c88e558c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe89eaec18a4943daae9ee3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 11:01:42 2018 +0300 wincodecs: Create default encoder options for BMP encoder. 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/windowscodecs/bmpencode.c | 11 ++++++++++- dlls/windowscodecs/tests/converter.c | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 047154e..afd0baf 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -72,6 +72,8 @@ typedef struct BmpFrameEncode { BOOL committed; } BmpFrameEncode; +static const WCHAR wszEnableV5Header32bppBGRA[] = {'E','n','a','b','l','e','V','5','H','e','a','d','e','r','3','2','b','p','p','B','G','R','A',0}; + static inline BmpFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) { return CONTAINING_RECORD(iface, BmpFrameEncode, IWICBitmapFrameEncode_iface); @@ -135,6 +137,9 @@ static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, if (This->initialized) return WINCODEC_ERR_WRONGSTATE; + if (pIEncoderOptions) + WARN("ignoring encoder options.\n"); + This->initialized = TRUE; return S_OK; @@ -501,6 +506,10 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); BmpFrameEncode *encode; HRESULT hr; + static const PROPBAG2 opts[1] = + { + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszEnableV5Header32bppBGRA }, + }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -510,7 +519,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) return hr; } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 80423dc..690e787 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -467,6 +467,7 @@ static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; +static const WCHAR wszEnableV5Header32bppBGRA[] = {'E','n','a','b','l','e','V','5','H','e','a','d','e','r','3','2','b','p','p','B','G','R','A',0}; static const struct property_opt_test_data testdata_tiff_props[] = { { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, @@ -490,6 +491,11 @@ static const struct property_opt_test_data testdata_jpeg_props[] = { { NULL } }; +static const struct property_opt_test_data testdata_bmp_props[] = { + { wszEnableV5Header32bppBGRA, VT_BOOL, VT_BOOL, VARIANT_FALSE, 0.0f, TRUE }, /* Supported since Win7 */ + { NULL } +}; + static int find_property_index(const WCHAR* name, PROPBAG2* all_props, int all_prop_cnt) { int i; @@ -616,6 +622,8 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o test_specific_encoder_properties(options, testdata_png_props, all_props, cProperties2); else if (IsEqualCLSID(clsid_encoder, &CLSID_WICJpegEncoder)) test_specific_encoder_properties(options, testdata_jpeg_props, all_props, cProperties2); + else if (IsEqualCLSID(clsid_encoder, &CLSID_WICBmpEncoder)) + test_specific_encoder_properties(options, testdata_bmp_props, all_props, cProperties2); for (i=0; i < cProperties2; i++) {

1 0

Matteo Bruni : d3d9/tests: Extend autogen_mipmap_test().
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: a0fbbba85e08d51fac014f54c30139103fa167e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0fbbba85e08d51fac014f54… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:51 2018 +0100 d3d9/tests: Extend autogen_mipmap_test(). 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/d3d9/tests/visual.c | 168 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 160 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0fbbba85e08d51fac01…

1 0

Joachim Priesner : windowscodecs/tiffformat: Fix TiffFrameDecode_GetResolution, add test.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 1c65b993dfd85fd4362445050a163eb93d50dcaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c65b993dfd85fd436244505… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Feb 5 20:34:59 2018 +0100 windowscodecs/tiffformat: Fix TiffFrameDecode_GetResolution, add test. The behavior for the invalid resolution case is different for Windows XP and Server 2003. Implement the behavior of current Windows versions, but allow the old behavior in the test. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 137 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tiffformat.c | 70 +++++++++-------- 2 files changed, 172 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c65b993dfd85fd43624…

1 0

Henri Verbeet : wined3d: Enable the multi-threaded command stream by default.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: dd0ea0a61463db83c647a9367ca61e2b69a98eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd0ea0a61463db83c647a936… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:08 2018 +0330 wined3d: Enable the multi-threaded command stream by default. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 814a78a..cc0dc25 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,7 +72,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - FALSE, /* No multithreaded CS by default. */ + TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */

1 0

Dmitry Timoshkov : adsldp: Add a stub for IADsADSystemInfo.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 0509b9a4571263a6b34c0ac76be2c0958568d874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0509b9a4571263a6b34c0ac7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 9 12:15:34 2018 +0800 adsldp: Add a stub for IADsADSystemInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/adsldp/Makefile.in | 7 + dlls/adsldp/adsldp.c | 358 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/adsldp.idl | 28 ++++ dlls/adsldp/adsldp.spec | 4 + 6 files changed, 400 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0509b9a4571263a6b34c…

1 0

Alexandre Julliard : include: Added activeds library definition.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 441017ce7d7c5cef2a33553bbe36a7f2bfa421d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=441017ce7d7c5cef2a33553b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 13:31:22 2018 +0100 include: Added activeds library definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iads.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/iads.idl b/include/iads.idl index e7ad5fb..dcaf133 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -18,6 +18,16 @@ import "oaidl.idl"; +[ + helpstring("Active DS Type Library"), + uuid(97d25db0-0363-11cf-abc4-02608c9e7553), + version(1.0) +] +library ActiveDs +{ + +importlib("stdole2.tlb"); + typedef enum { ADS_RIGHT_DS_CREATE_CHILD = 0x00000001, @@ -777,3 +787,5 @@ interface IDirectorySearch : IUnknown HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } + +} /* library */

1 0

Dmitry Timoshkov : include: Add IADsADSystemInfo definition.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: b66da4565750ffefff41194fede01c328ce19c72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66da4565750ffefff41194f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 9 12:15:25 2018 +0800 include: Add IADsADSystemInfo definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iads.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/include/iads.idl b/include/iads.idl index dcaf133..6931b6f 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ helpstring("Active DS Type Library"), uuid(97d25db0-0363-11cf-abc4-02608c9e7553), @@ -788,4 +794,55 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IADsADSystemInfo interface + */ +[ + odl, + uuid(5bb11929-afd1-11d2-9cb9-0000f87a369e), + dual, + oleautomation +] +interface IADsADSystemInfo : IDispatch +{ + [id(0x00000002), propget] + HRESULT UserName([out, retval] BSTR *retval); + [id(0x00000003), propget] + HRESULT ComputerName([out, retval] BSTR *retval); + [id(0x00000004), propget] + HRESULT SiteName([out, retval] BSTR *retval); + [id(0x00000005), propget] + HRESULT DomainShortName([out, retval] BSTR *retval); + [id(0x00000006), propget] + HRESULT DomainDNSName([out, retval] BSTR *retval); + [id(0x00000007), propget] + HRESULT ForestDNSName([out, retval] BSTR *retval); + [id(0x00000008), propget] + HRESULT PDCRoleOwner([out, retval] BSTR *retval); + [id(0x00000009), propget] + HRESULT SchemaRoleOwner([out, retval] BSTR *retval); + [id(0x0000000a), propget] + HRESULT IsNativeMode([out, retval] VARIANT_BOOL *retval); + [id(0x0000000b)] + HRESULT GetAnyDCName([out, retval] BSTR *retval); + [id(0x0000000c)] + HRESULT GetDCSiteName([in] BSTR server, [out, retval] BSTR *retval); + [id(0x0000000d)] + HRESULT RefreshSchemaCache(); + [id(0x0000000e)] + HRESULT GetTrees([out, retval] VARIANT *retval); +} + +[ + helpstring("AD System Info Object"), + uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), + progid("ADSystemInfo"), + version(1.0) +] +coclass ADSystemInfo +{ + [default] interface IADsADSystemInfo; + interface IDispatch; +} + } /* library */

1 0

Andrey Gusev : amstream: Return S_OK in IDirectDrawStreamSampleImpl_Update.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 65989f2ace1b06617638e31cb7ba56deb38fe690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65989f2ace1b06617638e31c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 13 14:11:27 2018 +0200 amstream: Return S_OK in IDirectDrawStreamSampleImpl_Update. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 53556af..7a2e013 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -929,7 +929,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds)

1 0

Alex Henrie : oleaut32/tests: Mark some tmarshal tests as todo on x64 and ARM.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 96e9da5c8797ff6c7fd7f93f54ac252ee862a466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e9da5c8797ff6c7fd7f93f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 13 09:19:05 2018 -0700 oleaut32/tests: Mark some tmarshal tests as todo on x64 and ARM. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 67b8e22..00cb464 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -34,6 +34,12 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) +#ifdef __i386__ +static const int tmarshal_todo = 0; +#else +static const int tmarshal_todo = 1; +#endif + /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) @@ -1305,6 +1311,7 @@ static void test_typelibmarshal(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW); + todo_wine_if(tmarshal_todo) ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); @@ -1331,6 +1338,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1350,6 +1358,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1481,6 +1490,7 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONEDISPATCH, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1498,6 +1508,7 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONECOCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1514,6 +1525,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); todo_wine ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1533,6 +1545,7 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1588,9 +1601,9 @@ static void test_typelibmarshal(void) V_I4(&vararg[1]) = 2; hr = IWidget_VariantCArray(pWidget, 2, vararg); ok_ole_success(hr, IWidget_VariantCArray); - todo_wine + todo_wine_if(!tmarshal_todo) ok(V_VT(&vararg[0]) == VT_I4 && V_I4(&vararg[0]) == 2, "vararg[0] = %d[%d]\n", V_VT(&vararg[0]), V_I4(&vararg[0])); - todo_wine + todo_wine_if(!tmarshal_todo) ok(V_VT(&vararg[1]) == VT_I4 && V_I4(&vararg[1]) == 3, "vararg[1] = %d[%d]\n", V_VT(&vararg[1]), V_I4(&vararg[1])); /* call VarArg */ @@ -1661,6 +1674,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_ERROR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "IDispatch_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1687,6 +1701,7 @@ static void test_typelibmarshal(void) hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult)); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1998,6 +2013,7 @@ static void test_external_connection(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); + todo_wine_if(tmarshal_todo) ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); ok(external_connections == 1, "external_connections = %d\n", external_connections); @@ -2006,6 +2022,7 @@ static void test_external_connection(void) /* Creating a stub for new iface causes new external connection. */ hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second); + todo_wine_if(tmarshal_todo) ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres); todo_wine ok(external_connections == 2, "external_connections = %d\n", external_connections); @@ -2017,6 +2034,7 @@ static void test_external_connection(void) expect_last_release_closes = TRUE; ItestDual_Release(iface); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); end_host_object(tid, thread); @@ -2028,12 +2046,14 @@ static void test_external_connection(void) expect_last_release_closes = FALSE; hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); /* Two separated marshal data are still one external connection. */ @@ -2044,21 +2064,25 @@ static void test_external_connection(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); hres = CoMarshalInterface(stream2, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream2); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Release(stream); @@ -2070,17 +2094,20 @@ static void test_external_connection(void) hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); ItestDual_Release(iface); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Release(stream);

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent:: buttons property implementation.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 5896677d9e28f79305810d2af3d398fd4efbda6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5896677d9e28f79305810d2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 15 17:05:07 2018 +0100 mshtml: Added IDOMMouseEvent::buttons property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.js | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 382ed6d..094ae05 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1515,8 +1515,17 @@ static HRESULT WINAPI DOMMouseEvent_getModifierState(IDOMMouseEvent *iface, BSTR static HRESULT WINAPI DOMMouseEvent_get_buttons(IDOMMouseEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT16 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetButtons(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_fromElement(IDOMMouseEvent *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index fe21efe..9fe4895 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -642,6 +642,7 @@ function test_mouse_event() { ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 1, "button = " + e.button); + ok(e.buttons === 0, "buttons = " + e.buttons); e.initMouseEvent("test", false, false, window, 9, 8, 7, 6, 5, true, true, true, true, 127, document); ok(e.type === "test", "type = " + e.type);

1 0

Jacek Caban : mshtml: Added IDOMEvent:: pageX and pageY properties implementation.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 881ba0627b4a13d56925301ab3777511e3bc7ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881ba0627b4a13d56925301a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 15 17:05:13 2018 +0100 mshtml: Added IDOMEvent::pageX and pageY properties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 094ae05..413ca2d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1573,15 +1573,33 @@ static HRESULT WINAPI DOMMouseEvent_get_offsetY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetPageX(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetPageY(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_layerX(IDOMMouseEvent *iface, LONG *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 9fe4895..c5030d0 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -625,6 +625,9 @@ function test_mouse_event() { ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 0, "button = " + e.button); + ok(e.buttons === 0, "buttons = " + e.buttons); + ok(e.pageX === 0, "pageX = " + e.pageX); + ok(e.pageY === 0, "pageY = " + e.pageY); e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); ok(e.type === "test", "type = " + e.type);

1 0

Jacek Caban : mshtml: Added IDOMEvent::view property implementation.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 2e91bf3212d7033c6eecc6df20beb6b874cd61aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e91bf3212d7033c6eecc6df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 15 17:05:00 2018 +0100 mshtml: Added IDOMEvent::view property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 27 +++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/tests/events.js | 4 ++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c5ae758..382ed6d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1175,8 +1175,25 @@ static HRESULT WINAPI DOMUIEvent_Invoke(IDOMUIEvent *iface, DISPID dispIdMember, static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + mozIDOMWindowProxy *moz_window; + HTMLOuterWindow *view = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMUIEvent_GetView(This->ui_event, &moz_window); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(moz_window) { + view = mozwindow_to_window(moz_window); + mozIDOMWindowProxy_Release(moz_window); + } + if(view) + IHTMLWindow2_AddRef((*p = &view->base.inner_window->base.IHTMLWindow2_iface)); + else + *p = NULL; + return S_OK; } static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p) @@ -1210,6 +1227,9 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI return S_OK; } + if(view) + FIXME("view argument is not supported\n"); + hres = IDOMEvent_initEvent(&This->IDOMEvent_iface, type, can_bubble, cancelable); if(FAILED(hres)) return hres; @@ -1463,6 +1483,9 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t return S_OK; } + if(view) + FIXME("view argument is not supported\n"); + hres = IDOMEvent_initEvent(&This->IDOMEvent_iface, type, can_bubble, cancelable); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 04add4d..34f83ab 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3175,7 +3175,7 @@ interface nsIDOMUIEvent : nsISupports nsresult GetView(mozIDOMWindowProxy **aView); nsresult GetDetail(int32_t *aDetail); nsresult InitUIEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg, - mozIDOMWindowProxy *viewArg, int32_t detailArg); + mozIDOMWindow *viewArg, int32_t detailArg); nsresult GetLayerX(int32_t *aLayerX); nsresult GetLayerY(int32_t *aLayerY); nsresult GetPageX(int32_t *aPageX); diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 6051295..fe21efe 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -631,6 +631,8 @@ function test_mouse_event() { ok(e.cancelable === true, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); ok(e.detail === 1, "detail = " + e.detail); + todo_wine. + ok(e.view === window, "view != window"); ok(e.screenX === 2, "screenX = " + e.screenX); ok(e.screenY === 3, "screenY = " + e.screenY); ok(e.clientX === 4, "clientX = " + e.clientX); @@ -700,6 +702,8 @@ function test_ui_event() { ok(e.cancelable === true, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); ok(e.detail === 3, "detail = " + e.detail); + todo_wine. + ok(e.view === window, "view != window"); next_test(); }

1 0

Nikolay Sivov : comctl32/tests: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 8874a6ecc3358a7512e15b37654b896c5c7b4f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8874a6ecc3358a7512e15b37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 15 11:00:08 2018 +0300 comctl32/tests: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 4 ++-- dlls/comctl32/tests/listbox.c | 9 +++++---- dlls/comctl32/tests/mru.c | 5 +++-- dlls/comctl32/tests/msg.h | 12 +++++------- dlls/comctl32/tests/rebar.c | 13 +++++++------ dlls/comctl32/tests/subclass.c | 9 +++++---- dlls/comctl32/tests/taskdialog.c | 5 +++-- dlls/comctl32/tests/toolbar.c | 14 +++++++------- 8 files changed, 37 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8874a6ecc3358a7512e1…

1 0

Nikolay Sivov : comctl32/edit: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: e265c49306115b094a7af1fea892d83fc9f863dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e265c49306115b094a7af1fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 15 11:00:06 2018 +0300 comctl32/edit: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 67 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index e1a79b1..67d77da 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -50,6 +50,7 @@ #include "vsstyle.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(edit); @@ -242,7 +243,7 @@ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT memset(&psa,0,sizeof(SCRIPT_ANALYSIS)); psa.eScript = SCRIPT_UNDEFINED; - es->logAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * get_text_length(es)); + es->logAttr = heap_alloc(sizeof(SCRIPT_LOGATTR) * get_text_length(es)); ScriptBreak(es->text, get_text_length(es), &psa, es->logAttr); } @@ -480,7 +481,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { /* The buffer has been expanded, create a new line and insert it into the link list */ - LINEDEF *new_line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)); + LINEDEF *new_line = heap_alloc_zero(sizeof(*new_line)); new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -490,7 +491,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { /* The previous line merged with this line so we delete this extra entry */ previous_line->next = current_line->next; - HeapFree(GetProcessHeap(), 0, current_line); + heap_free(current_line); current_line = previous_line->next; es->line_count--; continue; @@ -590,7 +591,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (current_line->ssa) { count = ScriptString_pcOutChars(current_line->ssa); - piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); + piDx = heap_alloc(sizeof(INT) * (*count)); ScriptStringGetLogicalWidths(current_line->ssa,piDx); prev = current_line->net_length-1; @@ -600,7 +601,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta } while ( prev > 0 && current_line->width > fw); if (prev<=0) prev = 1; - HeapFree(GetProcessHeap(),0,piDx); + heap_free(piDx); } else prev = (fw / es->char_width); @@ -689,7 +690,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { pnext = current_line->next; EDIT_InvalidateUniscribeData_linedef(current_line); - HeapFree(GetProcessHeap(), 0, current_line); + heap_free(current_line); current_line = pnext; es->line_count--; } @@ -1181,7 +1182,7 @@ static inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; - HeapFree( GetProcessHeap(), 0, es->logAttr ); + heap_free( es->logAttr ); es->logAttr = NULL; EDIT_InvalidateUniscribeData(es); } @@ -2463,7 +2464,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r /* there is something to be deleted */ TRACE("deleting stuff.\n"); bufl = e - s; - buf = HeapAlloc(GetProcessHeap(), 0, (bufl + 1) * sizeof(WCHAR)); + buf = heap_alloc((bufl + 1) * sizeof(WCHAR)); if (!buf) return; memcpy(buf, es->text + s, bufl * sizeof(WCHAR)); buf[bufl] = 0; /* ensure 0 termination */ @@ -2576,7 +2577,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r EDIT_EM_EmptyUndoBuffer(es); } - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); s += strl; @@ -2803,12 +2804,12 @@ static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, const INT *tabs) { if (!(es->style & ES_MULTILINE)) return FALSE; - HeapFree(GetProcessHeap(), 0, es->tabs); + heap_free(es->tabs); es->tabs_count = count; if (!count) es->tabs = NULL; else { - es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); + es->tabs = heap_alloc(count * sizeof(INT)); memcpy(es->tabs, tabs, count * sizeof(INT)); } EDIT_InvalidateUniscribeData(es); @@ -2852,7 +2853,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) ulength = strlenW(es->undo_text); - utext = HeapAlloc(GetProcessHeap(), 0, (ulength + 1) * sizeof(WCHAR)); + utext = heap_alloc((ulength + 1) * sizeof(WCHAR)); strcpyW(utext, es->undo_text); @@ -2866,7 +2867,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) /* send the notification after the selection start and end are set */ EDIT_NOTIFY_PARENT(es, EN_CHANGE); EDIT_EM_ScrollCaret(es); - HeapFree(GetProcessHeap(), 0, utext); + heap_free(utext); TRACE("after UNDO:insertion length = %d, deletion buffer = %s\n", es->undo_insert_count, debugstr_w(es->undo_text)); @@ -4171,7 +4172,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen); + lpCompStr = heap_alloc(buflen); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -4191,11 +4192,11 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) if (dwBufLenAttr) { dwBufLenAttr ++; - lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr+1); + lpCompStrAttr = heap_alloc(dwBufLenAttr + 1); if (!lpCompStrAttr) { ERR("Unable to allocate IME Attribute String\n"); - HeapFree(GetProcessHeap(),0,lpCompStr); + heap_free(lpCompStr); return; } ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, @@ -4222,8 +4223,8 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->selection_start + es->composition_len; - HeapFree(GetProcessHeap(),0,lpCompStrAttr); - HeapFree(GetProcessHeap(),0,lpCompStr); + heap_free(lpCompStrAttr); + heap_free(lpCompStr); } static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) @@ -4237,7 +4238,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen); + lpResultStr = heap_alloc(buflen); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); @@ -4256,7 +4257,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) es->composition_start = es->selection_end; es->composition_len = 0; - HeapFree(GetProcessHeap(),0,lpResultStr); + heap_free(lpResultStr); } static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) @@ -4303,9 +4304,9 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) TRACE("Creating edit control, style = %08x\n", lpcs->style); - if (!(es = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*es)))) - return FALSE; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)es ); + if (!(es = heap_alloc_zero(sizeof(*es)))) + return FALSE; + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)es ); /* * Note: since the EDITSTATE has not been fully initialized yet, @@ -4365,13 +4366,13 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) goto cleanup; es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; - if (!(es->undo_text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (es->buffer_size + 1) * sizeof(WCHAR)))) + if (!(es->undo_text = heap_alloc_zero((es->buffer_size + 1) * sizeof(WCHAR)))) goto cleanup; es->undo_buffer_size = es->buffer_size; if (es->style & ES_MULTILINE) - if (!(es->first_line_def = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)))) - goto cleanup; + if (!(es->first_line_def = heap_alloc_zero(sizeof(LINEDEF)))) + goto cleanup; es->line_count = 1; /* @@ -4395,11 +4396,11 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) cleanup: SetWindowLongPtrW(es->hwndSelf, 0, 0); EDIT_InvalidateUniscribeData(es); - HeapFree(GetProcessHeap(), 0, es->first_line_def); - HeapFree(GetProcessHeap(), 0, es->undo_text); + heap_free(es->first_line_def); + heap_free(es->undo_text); if (es->hloc32W) LocalFree(es->hloc32W); - HeapFree(GetProcessHeap(), 0, es->logAttr); - HeapFree(GetProcessHeap(), 0, es); + heap_free(es->logAttr); + heap_free(es); return FALSE; } @@ -4482,13 +4483,13 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) while (pc) { pp = pc->next; - HeapFree(GetProcessHeap(), 0, pc); + heap_free(pc); pc = pp; } SetWindowLongPtrW( es->hwndSelf, 0, 0 ); - HeapFree(GetProcessHeap(), 0, es->undo_text); - HeapFree(GetProcessHeap(), 0, es); + heap_free(es->undo_text); + heap_free(es); return 0; }

1 0

Jacek Caban : mshtml: Added IDOMEvent:: stopImmediatePropagation implementaition.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: ab210dd7a4c1966c5586d07d00b845a0409fef1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab210dd7a4c1966c5586d07d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 15 17:04:51 2018 +0100 mshtml: Added IDOMEvent::stopImmediatePropagation implementaition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 11 ++++++++--- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.js | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d91de28..c5ae758 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1051,8 +1051,12 @@ static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) static HRESULT WINAPI DOMEvent_stopImmediatePropagation(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->stop_immediate_propagation = This->stop_propagation = TRUE; + nsIDOMEvent_StopImmediatePropagation(This->nsevent); + return S_OK; } static HRESULT WINAPI DOMEvent_get_isTrusted(IDOMEvent *iface, VARIANT_BOOL *p) @@ -2210,7 +2214,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp } } - for(listener = listeners; listener < listeners + listeners_cnt; listener++) { + for(listener = listeners; !event->stop_immediate_propagation + && listener < listeners + listeners_cnt; listener++) { if(listener->type != LISTENER_TYPE_ATTACHED) { DISPID named_arg = DISPID_THIS; VARIANTARG args[2]; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e78c78c..182a36e 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -79,6 +79,7 @@ typedef struct { BOOL cancelable; BOOL prevent_default; BOOL stop_propagation; + BOOL stop_immediate_propagation; DOM_EVENT_PHASE phase; IHTMLEventObj *event_obj; diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 4560d93..6051295 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -251,9 +251,19 @@ function test_stop_propagation() { ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); } + function stop_immediate_propagation(e) { + calls += "immediateStop,"; + e.stopImmediatePropagation(); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); + } + + div1.addEventListener("click", stop_immediate_propagation, true); div1.addEventListener("click", stop_propagation, true); div1.addEventListener("click", record_call("div1.click(capture)"), true); + div2.addEventListener("click", stop_immediate_propagation, true); div2.addEventListener("click", stop_propagation, true); div2.addEventListener("click", record_call("div2.click(capture)"), true); @@ -265,11 +275,21 @@ function test_stop_propagation() { calls = ""; div2.click(); + ok(calls === "immediateStop,", "calls = " + calls); + + div1.removeEventListener("click", stop_immediate_propagation, true); + calls = ""; + div2.click(); ok(calls === "stop,div1.click(capture),", "calls = " + calls); div1.removeEventListener("click", stop_propagation, true); calls = ""; div2.click(); + ok(calls === "div1.click(capture),immediateStop,", "calls = " + calls); + + div2.removeEventListener("click", stop_immediate_propagation, true); + calls = ""; + div2.click(); ok(calls === "div1.click(capture),stop,div2.click(capture),stop,div2.click(bubble),", "calls = " + calls);

1 0

Józef Kucia : wined3d: Create dummy textures for multisample texture targets.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: d9fa6bb6c239aeba48a781ef0526156584032042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fa6bb6c239aeba48a781ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 13:49:35 2018 +0100 wined3d: Create dummy textures for multisample texture targets. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 17 ++++++++++++++++- dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8c2ea86..7eeb8c4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1756,7 +1756,15 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); - checkGLcall("Bind dummy textures"); + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, + device->dummy_textures.tex_2d_ms); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, + device->dummy_textures.tex_2d_ms_array); + } + + checkGLcall("bind dummy textures"); } } @@ -2759,6 +2767,13 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); checkGLcall("glBindTexture"); break; + case GL_TEXTURE_2D_MULTISAMPLE: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, device->dummy_textures.tex_2d_ms); + break; + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, + device->dummy_textures.tex_2d_ms_array); + break; default: ERR("Unexpected texture target %#x.\n", old_texture_type); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89083fc..83ba2b6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -727,6 +727,31 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glDeleteBuffers"); } + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_2d_ms); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, device->dummy_textures.tex_2d_ms); + GL_EXTCALL(glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_TRUE)); + + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_2d_ms_array); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, device->dummy_textures.tex_2d_ms_array); + GL_EXTCALL(glTexImage3DMultisample(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 1, GL_RGBA8, 1, 1, 1, GL_TRUE)); + + if (gl_info->supported[ARB_CLEAR_TEXTURE]) + { + GL_EXTCALL(glClearTexImage(device->dummy_textures.tex_2d_ms, + 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); + GL_EXTCALL(glClearTexImage(device->dummy_textures.tex_2d_ms_array, + 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); + } + else + { + WARN("ARB_clear_texture is currently required to clear dummy multisample textures.\n"); + } + + checkGLcall("create dummy multisample textures"); + } + context_bind_dummy_textures(device, context); } @@ -735,6 +760,12 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d { const struct wined3d_gl_info *gl_info = context->gl_info; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_ms); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_ms_array); + } + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_buffer); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02f471b..7cf5fc3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2942,6 +2942,8 @@ struct wined3d_device GLuint tex_cube_array; GLuint tex_2d_array; GLuint tex_buffer; + GLuint tex_2d_ms; + GLuint tex_2d_ms_array; } dummy_textures; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */

1 0

Daniel Lehman : include: Add some tchar forwards.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 94faa161ee3ca69a6b6dcc3fc72ac02fe2237291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94faa161ee3ca69a6b6dcc3f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 22 18:23:24 2016 -0700 include: Add some tchar forwards. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/tchar.h b/include/tchar.h index 13c8ee6..d6f2b00 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -75,7 +75,7 @@ extern "C" { #define _gettc WINE_tchar_routine(getc, getc, getwc) #define _gettchar WINE_tchar_routine(getchar, getchar, getwchar) #define _getts WINE_tchar_routine(gets, gets, getws) -#define _isalnum WINE_tchar_routine(isalnum, _ismbcalnum, iswalnum) +#define _istalnum WINE_tchar_routine(isalnum, _ismbcalnum, iswalnum) #define _istalpha WINE_tchar_routine(isalpha, _ismbcalpha, iswalpha) #define _istascii WINE_tchar_routine(isascii, __isascii, iswascii) #define _istcntrl WINE_tchar_routine(iscntrl, iscntrl, iswcntrl) @@ -197,6 +197,7 @@ extern "C" { #define _tspawnvpe WINE_tchar_routine(_spawnvpe, _spawnvpe, _tspawnvpe) #define _tsplitpath WINE_tchar_routine(_splitpath, _splitpath, _wsplitpath) #define _tstat WINE_tchar_routine(_stat, _stat, _wstat) +#define _tstati64 WINE_tchar_routine(_stati64, _stati64, _wstati64) #define _tstrdate WINE_tchar_routine(_strdate, _strdate, _wstrdate) #define _tstrtime WINE_tchar_routine(_strtime, _strtime, _wstrtime) #define _tsystem WINE_tchar_routine(system, system, _wsystem)

1 0

Alexandre Julliard : kernel32/tests: Add some tests for CIL 32-bit image flags.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 2df367a4f7e84a5c97d26ae326167755c7197207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df367a4f7e84a5c97d26ae3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 08:07:09 2018 +0100 kernel32/tests: Add some tests for CIL 32-bit image flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 29 ++++++++++++++++++++++++++++- include/winnt.h | 3 ++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b4fb1c6..877d381 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -405,7 +405,8 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE todo_wine ok( S(U(image)).ComPlusILOnly || broken(is_winxp), "%u: wrong ComPlusILOnly flags %02x\n", id, U(image).ImageFlags ); - if (nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + if (nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC && + !(cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED)) todo_wine ok( S(U(image)).ComPlusNativeReady || broken(is_winxp), "%u: wrong ComPlusNativeReady flags %02x\n", id, U(image).ImageFlags ); @@ -1019,6 +1020,14 @@ static void test_Loader(void) status = map_image_section( &nt_header, &section, &cor_header, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + cor_header.Flags = COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_32BITREQUIRED; + status = map_image_section( &nt_header, &section, &cor_header, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + cor_header.Flags = COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_32BITPREFERRED; + status = map_image_section( &nt_header, &section, &cor_header, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + cor_header.Flags = 0; status = map_image_section( &nt_header, &section, &cor_header, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); @@ -1122,6 +1131,16 @@ static void test_Loader(void) ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); + cor_header.Flags = COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_32BITREQUIRED; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, &section, &cor_header, __LINE__ ); + ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), + "NtCreateSection error %08x\n", status ); + + cor_header.Flags = COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_32BITPREFERRED; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, &section, &cor_header, __LINE__ ); + ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), + "NtCreateSection error %08x\n", status ); + cor_header.Flags = 0; status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, &section, &cor_header, __LINE__ ); ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), @@ -1218,6 +1237,14 @@ static void test_Loader(void) status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, &cor_header, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + cor_header.Flags = COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_32BITREQUIRED; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, &cor_header, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + cor_header.Flags = COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_32BITPREFERRED; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, &cor_header, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + cor_header.Flags = 0; status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, &cor_header, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); diff --git a/include/winnt.h b/include/winnt.h index 855d2a8..56b533c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3621,10 +3621,11 @@ typedef enum ReplacesCorHdrNumericDefines COMIMAGE_FLAGS_STRONGNAMESIGNED = 0x00000008, COMIMAGE_FLAGS_NATIVE_ENTRYPOINT= 0x00000010, COMIMAGE_FLAGS_TRACKDEBUGDATA = 0x00010000, + COMIMAGE_FLAGS_32BITPREFERRED = 0x00020000, COR_VERSION_MAJOR_V2 = 2, COR_VERSION_MAJOR = COR_VERSION_MAJOR_V2, - COR_VERSION_MINOR = 0, + COR_VERSION_MINOR = 5, COR_DELETED_NAME_LENGTH = 8, COR_VTABLEGAP_NAME_LENGTH = 8,

1 0

Józef Kucia : d3d10core/tests: Fix typo in #undef.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: e65c3d1c35828f8deb88e1ffaa0024b9bcec20d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e65c3d1c35828f8deb88e1ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 13:49:37 2018 +0100 d3d10core/tests: Fix typo in #undef. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 66591b2..103b670 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1936,7 +1936,7 @@ static void test_create_depthstencil_view(void) }; #undef FMT_UNKNOWN #undef D24S8 -#undef R24S8_TL +#undef R24G8_TL #undef DIM_UNKNOWN #undef TEX_1D #undef TEX_1D_ARRAY

1 0

Józef Kucia : wined3d: Align OpenGL version comments for newer core functions.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: a9e30882310608f6665089bd1803b10094a8ca9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e30882310608f6665089bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 13:49:34 2018 +0100 wined3d: Align OpenGL version comments for newer core functions. Signed-off-by: Józef Kucia <jkucia(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 | 232 ++++++++++++++++++++++++------------------------- 1 file changed, 116 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9e30882310608f66650…

1 0

Aric Stewart : xinput: Detect and setup HID gamepads.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 755422a2be2db4641ad33c9d41d5d0f0e9226e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=755422a2be2db4641ad33c9d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:40:59 2018 -0600 xinput: Detect and setup HID gamepads. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 2 + dlls/xinput1_2/Makefile.in | 2 + dlls/xinput1_3/Makefile.in | 2 + dlls/xinput1_3/hid.c | 331 ++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 27 ++-- dlls/xinput1_3/xinput_private.h | 30 ++++ dlls/xinput1_4/Makefile.in | 2 + dlls/xinput9_1_0/Makefile.in | 2 + 8 files changed, 387 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=755422a2be2db4641ad3…

1 0

Aric Stewart : xinput: Update state of HID device.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 9e321a6f96714111c51466303caed89c9fabacf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e321a6f96714111c5146630… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:41:33 2018 -0600 xinput: Update state of HID device. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 94 ++++++++++++++++++++++++++++++++++++++--- dlls/xinput1_3/xinput_main.c | 14 +++--- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 96 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 32a7ef5..5d82f05 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -66,9 +66,9 @@ struct hid_platform_private { CRITICAL_SECTION crit; - CHAR *last_report; - CHAR *current_report; DWORD report_length; + BYTE current_report; + CHAR *reports[2]; LONG ThumbLXRange[3]; LONG ThumbLYRange[3]; @@ -201,8 +201,9 @@ static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_ private->ppd = ppd; private->device = device; private->report_length = caps->InputReportByteLength + 1; - private->current_report = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - private->last_report = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); + private->current_report = 0; + private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); + private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); size = (strlenW(path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); memcpy(private->device_path, path, size); @@ -309,8 +310,8 @@ static void remove_gamepad(xinput_controller *device) EnterCriticalSection(&private->crit); CloseHandle(private->device); - HeapFree(GetProcessHeap(), 0, private->current_report); - HeapFree(GetProcessHeap(), 0, private->last_report); + HeapFree(GetProcessHeap(), 0, private->reports[0]); + HeapFree(GetProcessHeap(), 0, private->reports[1]); HeapFree(GetProcessHeap(), 0, private->device_path); HidD_FreePreparsedData(private->ppd); device->platform_private = NULL; @@ -329,3 +330,84 @@ void HID_destroy_gamepads(xinput_controller *devices) remove_gamepad(&devices[i]); LeaveCriticalSection(&hid_xinput_crit); } + +#define SIGN(v,b) ((b==8)?(BYTE)v:(b==16)?(SHORT)v:(INT)v) +#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(SIGN(v,r[1]) - r[0]))/r[2])-32767) +#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(SIGN(v,r[1]) - r[0]))/r[2])) + +void HID_update_state(xinput_controller* device) +{ + struct hid_platform_private *private = device->platform_private; + int i; + CHAR *report = private->reports[(private->current_report)%2]; + CHAR *target_report = private->reports[(private->current_report+1)%2]; + + USAGE buttons[15]; + ULONG button_length; + ULONG value; + + EnterCriticalSection(&private->crit); + if (!HidD_GetInputReport(private->device, target_report, private->report_length)) + { + if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) + remove_gamepad(device); + else + ERR("Failed to get Input Report (%x)\n", GetLastError()); + LeaveCriticalSection(&private->crit); + return; + } + if (memcmp(report, target_report, private->report_length) == 0) + { + LeaveCriticalSection(&private->crit); + return; + } + + private->current_report = (private->current_report+1)%2; + + device->state.dwPacketNumber++; + button_length = 15; + HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, target_report, private->report_length); + + device->state.Gamepad.wButtons = 0; + for (i = 0; i < button_length; i++) + { + switch (buttons[i]) + { + case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; + case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; + case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; + case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; + case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; + case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; + case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; + + case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + case 12: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; break; + case 13: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; break; + case 14: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; break; + case 15: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; break; + } + } + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->ThumbLXRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ThumbLYRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->ThumbRXRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ThumbRYRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->RightTriggerRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->LeftTriggerRange); + LeaveCriticalSection(&private->crit); +} diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index a796688..83ecb71 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -76,10 +76,8 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { DWORD ret; - static int warn_once; - if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state); + TRACE("(index %u, state %p)!\n", index, state); ret = XInputGetStateEx(index, state); if (ret != ERROR_SUCCESS) @@ -93,17 +91,19 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state) { - static int warn_once; + TRACE("(index %u, state %p)!\n", index, state); - if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state); + HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + HID_update_state(&controllers[index]); + memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + + return ERROR_SUCCESS; } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 35414ac..67ddbe4 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -28,3 +28,4 @@ typedef struct _xinput_controller void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; +void HID_update_state(xinput_controller* device) DECLSPEC_HIDDEN;

1 0

Aric Stewart : xinput: Implement XInputSetState.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: f3391311f3f1b730df97b65cf5650301c5714d16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3391311f3f1b730df97b65c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:41:44 2018 -0600 xinput: Implement XInputSetState. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 6 ++++-- dlls/xinput1_3/xinput_private.h | 1 + include/xinput.h | 2 ++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 5d82f05..33a92e1 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -192,6 +192,11 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ xinput_caps->Type = XINPUT_DEVTYPE_GAMEPAD; xinput_caps->SubType = XINPUT_DEVSUBTYPE_GAMEPAD; + + value_caps_count = caps->NumberOutputValueCaps; + if (value_caps_count > 0) + xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; + return TRUE; } @@ -411,3 +416,40 @@ void HID_update_state(xinput_controller* device) device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->LeftTriggerRange); LeaveCriticalSection(&private->crit); } + +DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) +{ + struct hid_platform_private *private = device->platform_private; + + struct { + BYTE report; + BYTE pad1[2]; + BYTE left; + BYTE right; + BYTE pad2[3]; + } report; + + if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + { + BOOLEAN rc; + + device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed; + + report.report = 0; + report.pad1[0] = 0x8; + report.pad1[1] = 0x0; + report.left = (BYTE)(state->wLeftMotorSpeed / 255); + report.right = (BYTE)(state->wRightMotorSpeed / 255); + memset(&report.pad2, 0, sizeof(report.pad2)); + + EnterCriticalSection(&private->crit); + rc = HidD_SetOutputReport(private->device, &report, sizeof(report)); + LeaveCriticalSection(&private->crit); + if (rc) + return ERROR_SUCCESS; + return GetLastError(); + } + + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 83ecb71..680aba3 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -63,14 +63,16 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) { - FIXME("(index %u, vibration %p) Stub!\n", index, vibration); + TRACE("(index %u, vibration %p)\n", index, vibration); + + HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + return HID_set_state(&controllers[index], vibration); } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 67ddbe4..c10f869 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -29,3 +29,4 @@ typedef struct _xinput_controller void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_update_state(xinput_controller* device) DECLSPEC_HIDDEN; +DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; diff --git a/include/xinput.h b/include/xinput.h index 99ff0cc..dae8cad 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -156,6 +156,8 @@ #define XUSER_MAX_COUNT 4 #define XUSER_INDEX_ANY 0x000000FF +#define XINPUT_CAPS_FFB_SUPPORTED 0x0001 + /* * Defines the structure of an xbox 360 joystick. */

1 0

Aric Stewart : xinput: Implement XInputEnable.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 50e53643300da159a7680fb862a4f4c747a12697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50e53643300da159a7680fb8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:42:00 2018 -0600 xinput: Implement XInputEnable. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 59 ++++++++++++++++++++++++++++++++--------- dlls/xinput1_3/xinput_main.c | 12 ++++++++- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 33a92e1..3c54890 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -63,6 +63,7 @@ struct hid_platform_private { PHIDP_PREPARSED_DATA ppd; HANDLE device; WCHAR *device_path; + BOOL enabled; CRITICAL_SECTION crit; @@ -212,6 +213,7 @@ static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_ size = (strlenW(path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); memcpy(private->device_path, path, size); + private->enabled = TRUE; InitializeCriticalSection(&private->crit); private->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); @@ -351,6 +353,9 @@ void HID_update_state(xinput_controller* device) ULONG button_length; ULONG value; + if (!private->enabled) + return; + EnterCriticalSection(&private->crit); if (!HidD_GetInputReport(private->device, target_report, private->report_length)) { @@ -431,25 +436,53 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) { - BOOLEAN rc; - device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed; - report.report = 0; - report.pad1[0] = 0x8; - report.pad1[1] = 0x0; - report.left = (BYTE)(state->wLeftMotorSpeed / 255); - report.right = (BYTE)(state->wRightMotorSpeed / 255); - memset(&report.pad2, 0, sizeof(report.pad2)); + if (private->enabled) + { + BOOLEAN rc; + + report.report = 0; + report.pad1[0] = 0x8; + report.pad1[1] = 0x0; + report.left = (BYTE)(state->wLeftMotorSpeed / 255); + report.right = (BYTE)(state->wRightMotorSpeed / 255); + memset(&report.pad2, 0, sizeof(report.pad2)); + + EnterCriticalSection(&private->crit); + rc = HidD_SetOutputReport(private->device, &report, sizeof(report)); + LeaveCriticalSection(&private->crit); + if (rc) + return ERROR_SUCCESS; + return GetLastError(); + } + return ERROR_SUCCESS; + } + + return ERROR_NOT_SUPPORTED; +} +void HID_enable(xinput_controller* device, BOOL enable) +{ + struct hid_platform_private *private = device->platform_private; + + if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + { EnterCriticalSection(&private->crit); - rc = HidD_SetOutputReport(private->device, &report, sizeof(report)); + if (private->enabled && !enable) + { + XINPUT_VIBRATION state; + state.wLeftMotorSpeed = 0; + state.wRightMotorSpeed = 0; + HID_set_state(device, &state); + } + else if (!private->enabled && enable) + { + HID_set_state(device, &device->caps.Vibration); + } LeaveCriticalSection(&private->crit); - if (rc) - return ERROR_SUCCESS; - return GetLastError(); } - return ERROR_NOT_SUPPORTED; + private->enabled = enable; } diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 680aba3..46d9918 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -54,11 +54,21 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) { + int index; + + TRACE("(enable %d)\n", enable); + /* Setting to false will stop messages from XInputSetState being sent to the controllers. Setting to true will send the last vibration value (sent to XInputSetState) to the controller and allow messages to be sent */ - FIXME("(enable %d) Stub!\n", enable); + HID_find_gamepads(controllers); + + for (index = 0; index < XUSER_MAX_COUNT; index ++) + { + if (!controllers[index].connected) continue; + HID_enable(&controllers[index], enable); + } } DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index c10f869..00888f4 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -30,3 +30,4 @@ void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_update_state(xinput_controller* device) DECLSPEC_HIDDEN; DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; +void HID_enable(xinput_controller* device, BOOL enable) DECLSPEC_HIDDEN;

1 0

Aric Stewart : winebus.sys: Be more specific as to what we offer as IG_ enumerated devices.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: e48296c2f02081d224505c90e645985f95b30d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48296c2f02081d224505c90… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:24:27 2018 -0600 winebus.sys: Be more specific as to what we offer as IG_ enumerated devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 48 +++++++++++++++++++++++++-- dlls/winebus.sys/bus_udev.c | 79 +++++++++++++++++++++++++++++++++----------- dlls/winebus.sys/main.c | 29 ++++++++++++++++ 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 34783f2..141e6d6 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -49,3 +49,4 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu /* General Bus Functions */ DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; +BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 10635f8..501a40d 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -287,7 +287,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * DWORD vid, pid, version; CFStringRef str = NULL; WCHAR serial_string[256]; - BOOL is_gamepad; + BOOL is_gamepad = FALSE; TRACE("OS/X IOHID Device Added %p\n", IOHIDDevice); @@ -297,8 +297,50 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); if (str) CFStringToWSTR(str, serial_string, sizeof(serial_string) / sizeof(WCHAR)); - is_gamepad = (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || - IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || + IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) + { + if (is_xbox_gamepad(vid, pid)) + is_gamepad = TRUE; + else + { + int axes=0, buttons=0; + CFArrayRef element_array = IOHIDDeviceCopyMatchingElements( + IOHIDDevice, NULL, kIOHIDOptionsTypeNone); + + if (element_array) { + CFIndex index; + CFIndex count = CFArrayGetCount(element_array); + for (index = 0; index < count; index++) + { + IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(element_array, index); + if (element) + { + int type = IOHIDElementGetType(element); + if (type == kIOHIDElementTypeInput_Button) buttons++; + if (type == kIOHIDElementTypeInput_Axis) axes++; + if (type == kIOHIDElementTypeInput_Misc) + { + uint32_t usage = IOHIDElementGetUsage(element); + switch (usage) + { + case kHIDUsage_GD_X: + case kHIDUsage_GD_Y: + case kHIDUsage_GD_Z: + case kHIDUsage_GD_Rx: + case kHIDUsage_GD_Ry: + case kHIDUsage_GD_Rz: + case kHIDUsage_GD_Slider: + axes ++; + } + } + } + } + CFRelease(element_array); + } + is_gamepad = (axes == 6 && buttons >= 14); + } + } device = bus_create_hid_device(iohid_driver_obj, busidW, vid, pid, version, 0, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, &iohid_vtbl, sizeof(struct platform_private)); if (!device) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f80c5d7..18e1854 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -439,13 +439,55 @@ static void set_rel_axis_value(struct wine_input_private *ext, int code, int val } } +static INT count_buttons(int device_fd, BYTE *map) +{ + int i; + int button_count = 0; + BYTE keybits[(KEY_MAX+7)/8]; + + if (ioctl(device_fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits) == -1) + { + WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); + return FALSE; + } + + for (i = BTN_MISC; i < KEY_MAX; i++) + { + if (test_bit(keybits, i)) + { + if (map) map[i] = button_count; + button_count++; + } + } + return button_count; +} + +static INT count_abs_axis(int device_fd) +{ + BYTE absbits[(ABS_MAX+7)/8]; + int abs_count = 0; + int i; + + if (ioctl(device_fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits) == -1) + { + WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); + return 0; + } + + for (i = 0; i < HID_ABS_MAX; i++) + if (test_bit(absbits, i) && + (ABS_TO_HID_MAP[i][1] >= HID_USAGE_GENERIC_X && + ABS_TO_HID_MAP[i][1] <= HID_USAGE_GENERIC_WHEEL)) + abs_count++; + return abs_count; +} + static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) { int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; int rel_pages[TOP_REL_PAGE][HID_REL_MAX+1]; BYTE absbits[(ABS_MAX+7)/8]; BYTE relbits[(REL_MAX+7)/8]; - BYTE keybits[(KEY_MAX+7)/8]; BYTE *report_ptr; INT i, descript_size; INT report_size; @@ -462,25 +504,12 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); return FALSE; } - if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits) == -1) - { - WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); - return FALSE; - } descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); report_size = 0; /* For now lump all buttons just into incremental usages, Ignore Keys */ - button_count = 0; - for (i = BTN_MISC; i < KEY_MAX; i++) - { - if (test_bit(keybits, i)) - { - ext->button_map[i] = button_count; - button_count++; - } - } + button_count = count_buttons(ext->base.device_fd, ext->button_map); if (button_count) { descript_size += sizeof(REPORT_BUTTONS); @@ -1138,7 +1167,7 @@ static void try_add_device(struct udev_device *dev) const char *subsystem; const char *devnode; WCHAR *serial = NULL; - const char* gamepad = NULL; + BOOL is_gamepad = FALSE; int fd; if (!(devnode = udev_device_get_devnode(dev))) @@ -1188,7 +1217,6 @@ static void try_add_device(struct udev_device *dev) if (ioctl(fd, EVIOCGUNIQ(254), device_uid) >= 0 && device_uid[0]) serial = strdupAtoW(device_uid); - gamepad = udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK"); vid = device_id.vendor; pid = device_id.product; version = device_id.version; @@ -1198,18 +1226,31 @@ static void try_add_device(struct udev_device *dev) WARN("Could not get device to query VID, PID, Version and Serial\n"); #endif + if (is_xbox_gamepad(vid, pid)) + is_gamepad = TRUE; +#ifdef HAS_PROPER_INPUT_HEADER + else + { + int axes=0, buttons=0; + axes = count_abs_axis(fd); + buttons = count_buttons(fd, NULL); + is_gamepad = (axes == 6 && buttons >= 14); + } +#endif + + TRACE("Found udev device %s (vid %04x, pid %04x, version %u, serial %s)\n", debugstr_a(devnode), vid, pid, version, debugstr_w(serial)); if (strcmp(subsystem, "hidraw") == 0) { - device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, vid, pid, version, 0, serial, FALSE, + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, vid, pid, version, 0, serial, is_gamepad, &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl, sizeof(struct platform_private)); } #ifdef HAS_PROPER_INPUT_HEADER else if (strcmp(subsystem, "input") == 0) { - device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, (gamepad != NULL), + device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, is_gamepad, &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct wine_input_private)); } #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 87d05f0..6334477 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -43,6 +43,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); +#define VID_MICROSOFT 0x045e + +static const WORD PID_XBOX_CONTROLLERS[] = { + 0x0202, /* Xbox Controller */ + 0x0285, /* Xbox Controller S */ + 0x0289, /* Xbox Controller S */ + 0x028e, /* Xbox360 Controller */ + 0x028f, /* Xbox360 Wireless Controller */ + 0x02d1, /* Xbox One Controller */ + 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e3, /* Xbox One Elite Controller */ + 0x02e6, /* Wireless XBox Controller Dongle */ + 0x02ea, /* Xbox One S Controller */ + 0x0719, /* Xbox 360 Wireless Adapter */ +}; + struct pnp_device { struct list entry; @@ -673,6 +689,19 @@ DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *opti return output; } +BOOL is_xbox_gamepad(WORD vid, WORD pid) +{ + int i; + + if (vid != VID_MICROSOFT) + return FALSE; + + for (i = 0; i < sizeof(PID_XBOX_CONTROLLERS)/sizeof(*PID_XBOX_CONTROLLERS); i++) + if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; + + return FALSE; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0};

1 0

Alexandre Julliard : server: Implement the various image flags in SECTION_IMAGE_INFORMATION.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 4a2ad423a62c90036707bc3e5f91611b37e5e451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a2ad423a62c90036707bc3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 12:22:43 2018 +0100 server: Implement the various image flags in SECTION_IMAGE_INFORMATION. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 6 ---- server/mapping.c | 77 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 65 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a2ad423a62c90036707…

1 0

Alexandre Julliard : ntdll: Use the image information data when mapping an image file.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 5d088206d28806915afd29b92f1b4a6abe92a22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d088206d28806915afd29b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 12:23:23 2018 +0100 ntdll: Use the image information data when mapping an image file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8e764f7..d26be98 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1357,8 +1357,8 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) * * Map an executable (PE format) image into memory. */ -static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, char *base, SIZE_T total_size, - SIZE_T mask, SIZE_T header_size, int shared_fd, BOOL removable, PVOID *addr_ptr ) +static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, SIZE_T mask, + pe_image_info_t *image_info, int shared_fd, BOOL removable, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -1366,12 +1366,21 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, char *ba IMAGE_SECTION_HEADER *sec; IMAGE_DATA_DIRECTORY *imports; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; + SIZE_T header_size, total_size = image_info->map_size; int i; off_t pos; sigset_t sigset; struct stat st; struct file_view *view = NULL; char *ptr, *header_end, *header_start; + char *base = wine_server_get_ptr( image_info->base ); + + if (total_size != image_info->map_size) /* truncated */ + { + WARN( "Modules larger than 4Gb (%s) not supported\n", wine_dbgstr_longlong(image_info->map_size) ); + return STATUS_INVALID_PARAMETER; + } + if ((ULONG_PTR)base != image_info->base) base = NULL; /* zero-map the whole range */ @@ -1397,7 +1406,7 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, char *ba status = FILE_GetNtStatus(); goto error; } - header_size = min( header_size, st.st_size ); + header_size = min( image_info->header_size, st.st_size ); if ((status = map_pe_header( view->base, header_size, fd, &removable )) != STATUS_SUCCESS) goto error; status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ @@ -1419,7 +1428,7 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, char *ba /* check for non page-aligned binary */ - if (nt->OptionalHeader.SectionAlignment <= page_mask) + if (image_info->image_flags & IMAGE_FLAGS_ImageMappedFlat) { /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ @@ -1654,35 +1663,23 @@ NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, S if (sec_flags & SEC_IMAGE) { - void *base = wine_server_get_ptr( image_info->base ); - - if ((ULONG_PTR)base != image_info->base) base = NULL; - size = image_info->map_size; - if (size != image_info->map_size) /* truncated */ - { - WARN( "Modules larger than 4Gb (%s) not supported\n", - wine_dbgstr_longlong(image_info->map_size) ); - res = STATUS_INVALID_PARAMETER; - goto done; - } if (shared_file) { int shared_fd, shared_needs_close; if ((res = server_get_unix_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, &shared_needs_close, NULL, NULL ))) goto done; - res = map_image( handle, access, unix_handle, base, size, mask, image_info->header_size, + res = map_image( handle, access, unix_handle, mask, image_info, shared_fd, needs_close, addr_ptr ); if (shared_needs_close) close( shared_fd ); close_handle( shared_file ); } else { - res = map_image( handle, access, unix_handle, base, size, mask, image_info->header_size, - -1, needs_close, addr_ptr ); + res = map_image( handle, access, unix_handle, mask, image_info, -1, needs_close, addr_ptr ); } if (needs_close) close( unix_handle ); - if (res >= 0) *size_ptr = size; + if (res >= 0) *size_ptr = image_info->map_size; return res; }

1 0

Józef Kucia : d3d11/tests: Fix typo in #undef.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: e95db4c590fba0e2815845d3993dd1294105d79c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95db4c590fba0e2815845d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 13:49:38 2018 +0100 d3d11/tests: Fix typo in #undef. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e0769a7..6267eaf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2870,7 +2870,7 @@ static void test_create_depthstencil_view(void) }; #undef FMT_UNKNOWN #undef D24S8 -#undef R24S8_TL +#undef R24G8_TL #undef DIM_UNKNOWN #undef TEX_1D #undef TEX_1D_ARRAY

1 0

Józef Kucia : wined3d: Introduce structure for dummy textures.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 1b3b2b22682ec79bad8a01ad73ba2e25b33308f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3b2b22682ec79bad8a01ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 13:49:36 2018 +0100 wined3d: Introduce structure for dummy textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 58 ++++++++----------- dlls/wined3d/device.c | 123 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 26 +++++---- 3 files changed, 82 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b3b2b22682ec79bad8a…

1 0

Józef Kucia : d3d8/tests: Add test for changing multisample type of implicit swapchain.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 6503946fc749434804131681ce70af4631403f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6503946fc749434804131681… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 13:49:33 2018 +0100 d3d8/tests: Add test for changing multisample type of implicit swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9efa943..6ae1782 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8492,9 +8492,64 @@ static void test_clip_planes_limits(void) DestroyWindow(window); } +static void test_swapchain_multisample_reset(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + + if (IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; + present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { - HMODULE d3d8_handle = GetModuleHandleA( "d3d8.dll" ); + HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); WNDCLASSA wc = {0}; IDirect3D8 *d3d8; DEVMODEW current_mode; @@ -8600,6 +8655,7 @@ START_TEST(device) test_format_unknown(); test_destroyed_window(); test_clip_planes_limits(); + test_swapchain_multisample_reset(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Nikolay Sivov : comctl32/button: Use allocated structure to keep control data.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 6e5507357457fd5835f24bdbeaae620918100c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e5507357457fd5835f24bdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 15 11:00:09 2018 +0300 comctl32/button: Use allocated structure to keep control data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 354 +++++++++++++++++++++---------------------- dlls/comctl32/tests/button.c | 4 + 2 files changed, 175 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e5507357457fd5835f2…

1 0

Nikolay Sivov : comctl32/combo: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 887836cc6d5a2cb76f6cd413b26bd9d14222667c URL: https://source.winehq.org/git/wine.git/?a=commit;h=887836cc6d5a2cb76f6cd413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 15 11:00:07 2018 +0300 comctl32/combo: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 43b4cb4..7401a7e 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -38,6 +38,7 @@ #include "commctrl.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "comctl32.h" @@ -124,9 +125,9 @@ static BOOL COMBO_Init(void) */ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) { - LPHEADCOMBO lphc; + HEADCOMBO *lphc; - if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) + if (COMBO_Init() && (lphc = heap_alloc_zero(sizeof(*lphc)))) { lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); @@ -157,20 +158,20 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) /*********************************************************************** * COMBO_NCDestroy */ -static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) +static LRESULT COMBO_NCDestroy( HEADCOMBO *lphc ) { + if (lphc) + { + TRACE("[%p]: freeing storage\n", lphc->self); - if( lphc ) - { - TRACE("[%p]: freeing storage\n", lphc->self); + if ( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) + DestroyWindow( lphc->hWndLBox ); - if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - DestroyWindow( lphc->hWndLBox ); + SetWindowLongPtrW( lphc->self, 0, 0 ); + heap_free( lphc ); + } - SetWindowLongPtrW( lphc->self, 0, 0 ); - HeapFree( GetProcessHeap(), 0, lphc ); - } - return 0; + return 0; } /*********************************************************************** @@ -670,7 +671,7 @@ static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0); if (size == LB_ERR) FIXME("LB_ERR probably not handled yet\n"); - if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) + if ((pText = heap_alloc((size + 1) * sizeof(WCHAR)))) { /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, id, (LPARAM)pText); @@ -768,7 +769,8 @@ static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) if( !hdc_paint ) ReleaseDC( lphc->self, hdc ); } - HeapFree( GetProcessHeap(), 0, pText ); + + heap_free(pText); } /*********************************************************************** @@ -891,8 +893,8 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) idx = LB_ERR; length = SendMessageW( lphc->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ); - if( length > 0 ) - pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + if (length > 0) + pText = heap_alloc((length + 1) * sizeof(WCHAR)); TRACE("\t edit text length %i\n", length ); @@ -900,7 +902,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, -1, (LPARAM)pText); - HeapFree( GetProcessHeap(), 0, pText ); + heap_free( pText ); } SendMessageW(lphc->hWndLBox, LB_SETCURSEL, bSelect ? idx : -1, 0); @@ -930,10 +932,8 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, index, 0); if( length != LB_ERR) { - if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) - { + if ((pText = heap_alloc((length + 1) * sizeof(WCHAR)))) SendMessageW(lphc->hWndLBox, LB_GETTEXT, index, (LPARAM)pText); - } } } @@ -947,7 +947,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - HeapFree( GetProcessHeap(), 0, pText ); + heap_free( pText ); } /*********************************************************************** @@ -1367,7 +1367,7 @@ static LRESULT COMBO_GetText( HEADCOMBO *lphc, INT count, LPWSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPWSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + WCHAR *lpBuffer = heap_alloc((length + 1) * sizeof(WCHAR)); if (!lpBuffer) goto error; length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1377,7 +1377,7 @@ static LRESULT COMBO_GetText( HEADCOMBO *lphc, INT count, LPWSTR buf ) lstrcpynW( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + heap_free( lpBuffer ); } else length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf);

1 0

Henri Verbeet : dxgi/tests: Introduce an ARRAY_SIZE macro.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 8a167d85132d083fe5c90e4444c2871d938d8a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a167d85132d083fe5c90e44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:19 2018 +0330 dxgi/tests: Introduce an ARRAY_SIZE macro. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 148cd73..8351a32 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -23,6 +23,10 @@ #include "d3d11.h" #include "wine/test.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + enum frame_latency { DEFAULT_FRAME_LATENCY = 3, @@ -1179,7 +1183,7 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); - for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) + for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; @@ -1275,7 +1279,7 @@ static void test_create_swapchain(void) creation_desc.Windowed = FALSE; - for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) + for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; @@ -1637,16 +1641,16 @@ static void test_get_containing_output(void) break; } - for (j = 0; j < sizeof(offsets) / sizeof(*offsets); ++j) + for (j = 0; j < ARRAY_SIZE(offsets); ++j) { - unsigned int idx = (sizeof(offsets) / sizeof(*offsets)) * i + j; - assert(idx < sizeof(points) / sizeof(*points)); + unsigned int idx = ARRAY_SIZE(offsets) * i + j; + assert(idx < ARRAY_SIZE(points)); points[idx].x = x + offsets[j].x; points[idx].y = y + offsets[j].y; } } - for (i = 0; i < sizeof(points) / sizeof(*points); ++i) + for (i = 0; i < ARRAY_SIZE(points); ++i) { ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); @@ -2089,7 +2093,7 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, expected_state = *state; e = &expected_state.fullscreen_state; - for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { SetRect(&e->client_rect, 0, 0, sizes[i].width, sizes[i].height); e->window_rect = e->client_rect; @@ -2260,7 +2264,7 @@ static void test_resize_target(void) swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { swapchain_desc.Flags = tests[i].flags; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, @@ -2425,7 +2429,7 @@ static void test_inexact_modes(void) check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); - for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { /* Test CreateSwapChain(). */ swapchain_desc.BufferDesc.Width = sizes[i].width; @@ -3190,7 +3194,7 @@ static void test_swapchain_parameters(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&desc, 0, sizeof(desc)); desc.BufferDesc.Width = registry_mode.dmPelsWidth; @@ -3278,7 +3282,7 @@ static void test_swapchain_parameters(void) IDXGISwapChain_Release(swapchain); } - for (i = 0; i < sizeof(usage_tests) / sizeof(*usage_tests); ++i) + for (i = 0; i < ARRAY_SIZE(usage_tests); ++i) { usage = usage_tests[i];

1 0

Henri Verbeet : wined3d: Print a fixme for unimplemented swap effects during swapchain (re) creation.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 0cf21e85a531dbdda42b11207be337fc37138421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cf21e85a531dbdda42b1120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:15 2018 +0330 wined3d: Print a fixme for unimplemented swap effects during swapchain (re)creation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e412272..89083fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4797,6 +4797,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); + if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", swapchain_desc->swap_effect); + /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c20a692..2729df2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -777,6 +777,11 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 "Please configure the application to use double buffering (1 back buffer) if possible.\n"); } + if (desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); + if (device->wined3d->flags & WINED3D_NO3D) swapchain->swapchain_ops = &swapchain_gdi_ops; else

1 0

Henri Verbeet : d3d9: Explicitly translate swap effects.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 5057df1f3e066897cc5978ec3e9f3b594886e862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5057df1f3e066897cc5978ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:17 2018 +0330 d3d9: Explicitly translate swap effects. Note that previously D3DSWAPEFFECT_OVERLAY would get mapped to WINED3D_SWAP_EFFECT_COPY_VSYNC. That didn't matter so much because neither is currently implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- include/wine/wined3d.h | 10 ++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4c1006c..ff95bef 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,6 +186,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_OVERLAY: + return D3DSWAPEFFECT_OVERLAY; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return D3DSWAPEFFECT_FLIPEX; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -195,7 +215,7 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -206,6 +226,26 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_OVERLAY: + return WINED3D_SWAP_EFFECT_OVERLAY; + case D3DSWAPEFFECT_FLIPEX: + return WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) { @@ -232,7 +272,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cca4476..22bb2d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -505,10 +505,12 @@ enum wined3d_patch_edge_style enum wined3d_swap_effect { - WINED3D_SWAP_EFFECT_DISCARD = 1, - WINED3D_SWAP_EFFECT_SEQUENTIAL = 2, - WINED3D_SWAP_EFFECT_COPY = 3, - WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, + WINED3D_SWAP_EFFECT_DISCARD, + WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, + WINED3D_SWAP_EFFECT_COPY, + WINED3D_SWAP_EFFECT_COPY_VSYNC, + WINED3D_SWAP_EFFECT_OVERLAY, }; enum wined3d_sampler_state

1 0

Henri Verbeet : d3d8: Explicitly translate swap effects.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: f0970916704114c2c5e75b589e7c51d2e4ae27ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0970916704114c2c5e75b58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:16 2018 +0330 d3d8: Explicitly translate swap effects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 615f8c7..a6363d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -167,6 +167,24 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_COPY_VSYNC: + return D3DSWAPEFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -175,7 +193,7 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -186,6 +204,24 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_COPY_VSYNC: + return WINED3D_SWAP_EFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -210,7 +246,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil;

1 0

Henri Verbeet : dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd().
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: d612495a72a4368d9c28acf5dd3b7d0845115257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d612495a72a4368d9c28acf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:18 2018 +0330 dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 13 ++++++++++--- dlls/wined3d/swapchain.c | 3 ++- include/wine/wined3d.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 00ca122..7fc3279 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -275,12 +275,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + min_buffer_count = 1; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + min_buffer_count = 2; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -303,8 +313,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->SwapEffect) - FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) @@ -319,7 +327,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = window; wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2729df2..0d76b67 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -505,7 +505,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD + || swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP_DISCARD) wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], 0, WINED3D_LOCATION_DISCARDED); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 22bb2d8..1e3c08b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -507,6 +507,7 @@ enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD, WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_DISCARD, WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, WINED3D_SWAP_EFFECT_COPY, WINED3D_SWAP_EFFECT_COPY_VSYNC,

1 0

Józef Kucia : include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 4c35737940c0487a358160355a2192dea29d8d6d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c35737940c0487a3581603… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:50 2018 +0100 include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 10 ---------- include/vkd3d_d3dcommon.idl | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2ccfa22..5bfc767 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -66,16 +66,6 @@ const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3; const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4); -typedef enum D3D_PRIMITIVE_TOPOLOGY -{ - D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, - D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, -} D3D_PRIMITIVE_TOPOLOGY; - typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT { D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0x0, diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 1ddfce3..a874b6c 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -20,6 +20,16 @@ import "vkd3d_windows.h"; #include "vkd3d_unknown.idl" +typedef enum D3D_PRIMITIVE_TOPOLOGY +{ + D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, + D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, + D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, +} D3D_PRIMITIVE_TOPOLOGY; + typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100,

1 0

Józef Kucia : libs/vkd3d-shader: Avoid UINT.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 5ea8cad967e4bf4d19488bc7840296b5ad9032e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ea8cad967e4bf4d19488bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:53 2018 +0100 libs/vkd3d-shader: Avoid UINT. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b3e81a4..9c43a46 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -607,7 +607,7 @@ enum vkd3d_decl_usage struct vkd3d_shader_semantic { enum vkd3d_decl_usage usage; - UINT usage_idx; + unsigned int usage_idx; enum vkd3d_shader_resource_type resource_type; enum vkd3d_data_type resource_data_type; struct vkd3d_shader_dst_param reg;

1 0

Józef Kucia : libs/vkd3d-shader: Translate control point count declarations.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 1fe62703070c98717186000e3b30862c78d93d95 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fe62703070c98717186000… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:54 2018 +0100 libs/vkd3d-shader: Translate control point count declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5d04b58..89b1187 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5686,6 +5686,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; case VKD3DSIH_DCL_VERTICES_OUT: + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: vkd3d_dxbc_compiler_emit_dcl_vertices_out(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_PRIMITIVE: @@ -5876,7 +5877,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_CUT_STREAM: vkd3d_dxbc_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: + /* nothing to do */ break; default: FIXME("Unhandled instruction %#x.\n", instruction->handler_idx);

1 0

Józef Kucia : libs/vkd3d-shader: Remove dependency on D3D12 headers.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: fddf86e6ea034837566e2d81ca7f8f0f0f50f70b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fddf86e6ea034837566e2d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:51 2018 +0100 libs/vkd3d-shader: Remove dependency on D3D12 headers. We would like to allow building libvkd3d-shader as a standalone library without our Direct3D translation layers. In the long term, it should be possible to build and use libvkd3d-shader without Win32 data types, Vulkan headers and libs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 183 +++++++++++++++++++++++++- libs/vkd3d-shader/dxbc.c | 238 +++++++++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 14 +- libs/vkd3d/state.c | 14 +- libs/vkd3d/vkd3d_main.c | 15 ++- 5 files changed, 325 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=fddf86e6ea034837566…

1 0

Józef Kucia : libs/vkd3d-shader: Avoid Windows data types in public API.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 844c83a83734984fbe0374eaf2fe4bb226df9bbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=844c83a83734984fbe0374e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:52 2018 +0100 libs/vkd3d-shader: Avoid Windows data types in public API. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 26 ++- libs/vkd3d-shader/dxbc.c | 313 +++++++++++++++---------------- libs/vkd3d-shader/spirv.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 46 +++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- libs/vkd3d/state.c | 35 ++-- libs/vkd3d/utils.c | 20 ++ libs/vkd3d/vkd3d_main.c | 17 +- libs/vkd3d/vkd3d_private.h | 1 + 9 files changed, 252 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=844c83a83734984fbe0…

1 0

Jeremy Newman : change width of tabs
by Jeremy Newman Feb. 15, 2018

Feb. 15, 2018

Module: website Branch: master Commit: 50939cab24b6ce5a8a61e0322cae6c217c543e7e URL: https://source.winehq.org/git/website.git/?a=commit;h=50939cab24b6ce5a8a61e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Feb 15 11:22:29 2018 -0600 change width of tabs some translations wrap (KO) due to longer strings --- css/styles.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index ae2481b..e0ff353 100644 --- a/css/styles.css +++ b/css/styles.css @@ -335,7 +335,6 @@ hr } #whq-tabs LI { float: left; - width: 112px; height: 28px; margin: 0px 2px 0px 2px; padding: 0px; @@ -349,9 +348,9 @@ hr #whq-tabs LI:hover { background-color: #832c2c; } #whq-tabs LI A { display: block; - width: 108px; + min-width: 110px; height: 23px; - padding-top: 3px; + padding: 3px 5px 3px 5px; font-size: 16px; color: white; text-decoration: none; }

1 0

Matteo Bruni : d3d9/tests: Extend test_mipmap_gen().
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 457617d545708d08974616d6267898e7f034a0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457617d545708d08974616d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:45 2018 +0100 d3d9/tests: Extend test_mipmap_gen(). 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/d3d9/tests/device.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4b6d60e..0ffc1ae 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7065,12 +7065,12 @@ static void test_mipmap_gen(void) IDirect3DTexture9 *texture; IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + unsigned int i, count; D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; BOOL renderable; ULONG refcount; - unsigned int i; DWORD levels; HWND window; HRESULT hr; @@ -7170,8 +7170,74 @@ static void test_mipmap_gen(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); levels = IDirect3DTexture9_GetLevelCount(texture); ok(levels == 1, "Got unexpected levels %u.\n", levels); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + if (SUCCEEDED(hr)) + { + /* i.e. there is no difference between the D3D_OK and the + * D3DOK_NOAUTOGEN cases. */ + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + formats[i], D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 1, "Unexpected level count %u.\n", count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); + filter_type = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(filter_type == D3DTEXF_LINEAR, "Got unexpected filter_type %#x.\n", filter_type); + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_ANISOTROPIC); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + filter_type = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(filter_type == D3DTEXF_ANISOTROPIC, "Got unexpected filter_type %#x.\n", filter_type); + IDirect3DTexture9_Release(texture); + } + } + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_WRAPANDMIP, D3DRTYPE_TEXTURE, D3DFMT_D16); + if (hr == D3D_OK) + { + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, + D3DFMT_D16, D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 7, "Unexpected level count %u.\n", count); + IDirect3DTexture9_Release(texture); + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_D16); + ok(hr == D3DOK_NOAUTOGEN, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_D16, D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 1, "Unexpected level count %u.\n", count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); + IDirect3DTexture9_Release(texture); + } + else + { + skip("Mipmapping not supported for D3DFMT_D16, skipping test.\n"); + } + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture9 **)&texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Matteo Bruni : wined3d: Update feature check for mipmap generation support.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: c7ebc8ec3229bbfd2a0d6e0f0c0c02c8ee87e98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7ebc8ec3229bbfd2a0d6e0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:43 2018 +0100 wined3d: Update feature check for mipmap generation support. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a1e679b..2139b65 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5296,7 +5296,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; - BOOL mipmap_autogen_supported = TRUE; + BOOL mipmap_gen_supported = TRUE; DWORD format_flags = 0; DWORD allowed_usage; @@ -5440,10 +5440,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) - mipmap_autogen_supported = FALSE; + mipmap_gen_supported = FALSE; } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_autogen_supported) + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_gen_supported) { TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); return WINED3DOK_NOAUTOGEN; @@ -5618,7 +5618,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; - if (gl_info->supported[SGIS_GENERATE_MIPMAP]) + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) caps->Caps2 |= WINED3DCAPS2_CANAUTOGENMIPMAP; caps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD |

1 0

Matteo Bruni : wined3d: Get rid of legacy mipmap autogeneration support.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 9a13d48e4eddff7708506e72ee3c737131b6a507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a13d48e4eddff7708506e72… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:44 2018 +0100 wined3d: Get rid of legacy mipmap autogeneration support. 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/d3d11/device.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/wined3d/directx.c | 13 ++++----- dlls/wined3d/resource.c | 1 - dlls/wined3d/texture.c | 62 ------------------------------------------ dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_gl.h | 2 -- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 13 ++++----- 10 files changed, 14 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a13d48e4eddff770850…

1 0

Nikolay Sivov : comctl32/button: Fix paint handler check when theming is on.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 389c3add0ad93f3b2180c636363b25f6c78757a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389c3add0ad93f3b2180c636… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 14:05:15 2018 +0300 comctl32/button: Fix paint handler check when theming is on. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7184d19..6458ba1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -393,7 +393,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnPaintFunc[btn_type]) + if (theme && btnThemedPaintFunc[btn_type]) { ButtonState drawState; UINT dtflags;

1 0

Matteo Bruni : d3d9: Handle D3DUSAGE_AUTOGENMIPMAP textures entirely in d3d9.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 3d6eb8cf1dc1e509a74f85fd2356c6946372ecc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6eb8cf1dc1e509a74f85fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:42 2018 +0100 d3d9: Handle D3DUSAGE_AUTOGENMIPMAP textures entirely in d3d9. 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/d3d9/d3d9_private.h | 25 ++++- dlls/d3d9/device.c | 75 +++++++++++++ dlls/d3d9/surface.c | 4 + dlls/d3d9/tests/device.c | 5 +- dlls/d3d9/texture.c | 270 ++++++++++++++++++++++++++++++++++++----------- 5 files changed, 313 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6eb8cf1dc1e509a74f…

1 0

Józef Kucia : d3d12: Add dll.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 8d6f7ed292f051f541b8a53df2fd07477f41a082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6f7ed292f051f541b8a53d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:52 2018 +0100 d3d12: Add dll. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3d12/Makefile.in | 5 +++++ dlls/d3d12/d3d12.spec | 8 ++++++++ dlls/d3d12/d3d12_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/configure b/configure index 57577da..126de30 100755 --- a/configure +++ b/configure @@ -1128,6 +1128,7 @@ enable_d3d10 enable_d3d10_1 enable_d3d10core enable_d3d11 +enable_d3d12 enable_d3d8 enable_d3d9 enable_d3dcompiler_33 @@ -18588,6 +18589,7 @@ wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib wine_fn_config_test dlls/d3d11/tests d3d11_test +wine_fn_config_dll d3d12 enable_d3d12 implib wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 58ce104..92c8952 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) WINE_CONFIG_TEST(dlls/d3d11/tests) +WINE_CONFIG_DLL(d3d12,,[implib]) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in new file mode 100644 index 0000000..d7ee1b5 --- /dev/null +++ b/dlls/d3d12/Makefile.in @@ -0,0 +1,5 @@ +MODULE = d3d12.dll +IMPORTLIB = d3d12 + +C_SRCS = \ + d3d12_main.c diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec new file mode 100644 index 0000000..613092b --- /dev/null +++ b/dlls/d3d12/d3d12.spec @@ -0,0 +1,8 @@ +100 stub GetBehaviorValue +101 stdcall D3D12CreateDevice(ptr long ptr ptr) +102 stdcall D3D12GetDebugInterface(ptr ptr) +103 stub D3D12CoreCreateLayeredDevice +104 stub D3D12CoreGetLayeredDeviceSize +105 stub D3D12CoreRegisterLayers +106 stub D3D12CreateRootSignatureDeserializer +107 stub D3D12SerializeRootSignature diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c new file mode 100644 index 0000000..c1598ca --- /dev/null +++ b/dlls/d3d12/d3d12_main.c @@ -0,0 +1,42 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "wine/debug.h" +#include "d3d12.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d12); + +HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) +{ + FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, + REFIID iid, void **device) +{ + FIXME("adapter %p, minimum_feature_level %#x, iid %s, device %p stub!\n", + adapter, minimum_feature_level, debugstr_guid(iid), device); + + return E_NOTIMPL; +}

1 0

Józef Kucia : d3d12/tests: Add test for COM interfaces.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d626aac6c0536517e14ba159ca2f27dfaccc9990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d626aac6c0536517e14ba159… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:53 2018 +0100 d3d12/tests: Add test for COM interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3d12/tests/Makefile.in | 5 ++ dlls/d3d12/tests/d3d12.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/configure b/configure index 126de30..06551fa 100755 --- a/configure +++ b/configure @@ -18590,6 +18590,7 @@ wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib wine_fn_config_test dlls/d3d11/tests d3d11_test wine_fn_config_dll d3d12 enable_d3d12 implib +wine_fn_config_test dlls/d3d12/tests d3d12_test wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 92c8952..925def2 100644 --- a/configure.ac +++ b/configure.ac @@ -3069,6 +3069,7 @@ WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) WINE_CONFIG_TEST(dlls/d3d11/tests) WINE_CONFIG_DLL(d3d12,,[implib]) +WINE_CONFIG_TEST(dlls/d3d12/tests) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in new file mode 100644 index 0000000..d055aba --- /dev/null +++ b/dlls/d3d12/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d12.dll +IMPORTS = d3d12 + +C_SRCS = \ + d3d12.c diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c new file mode 100644 index 0000000..cc37a86 --- /dev/null +++ b/dlls/d3d12/tests/d3d12.c @@ -0,0 +1,107 @@ +/* + * Copyright 2017 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdlib.h> +#define COBJMACROS +#include "initguid.h" +#include "d3d12.h" +#include "dxgi1_6.h" +#include "wine/test.h" + +static ID3D12Device *create_device(void) +{ + ID3D12Device *device; + + if (FAILED(D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + return NULL; + + return device; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + D3D12_COMMAND_QUEUE_DESC desc; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + check_interface(device, &IID_ID3D12Object, TRUE); + check_interface(device, &IID_ID3D12DeviceChild, FALSE); + check_interface(device, &IID_ID3D12Pageable, FALSE); + check_interface(device, &IID_ID3D12Device, TRUE); + + check_interface(device, &IID_IDXGIObject, FALSE); + check_interface(device, &IID_IDXGIDeviceSubObject, FALSE); + check_interface(device, &IID_IDXGIDevice, FALSE); + check_interface(device, &IID_IDXGIDevice1, FALSE); + check_interface(device, &IID_IDXGIDevice2, FALSE); + check_interface(device, &IID_IDXGIDevice3, FALSE); + check_interface(device, &IID_IDXGIDevice4, FALSE); + + desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + + check_interface(queue, &IID_ID3D12Object, TRUE); + check_interface(queue, &IID_ID3D12DeviceChild, TRUE); + check_interface(queue, &IID_ID3D12Pageable, TRUE); + check_interface(queue, &IID_ID3D12CommandQueue, TRUE); + + check_interface(queue, &IID_IDXGIObject, FALSE); + check_interface(queue, &IID_IDXGIDeviceSubObject, FALSE); + check_interface(queue, &IID_IDXGIDevice, FALSE); + check_interface(queue, &IID_IDXGIDevice1, FALSE); + check_interface(queue, &IID_IDXGIDevice2, FALSE); + check_interface(queue, &IID_IDXGIDevice3, FALSE); + check_interface(queue, &IID_IDXGIDevice4, FALSE); + + refcount = ID3D12CommandQueue_Release(queue); + ok(!refcount, "Command queue has %u references left.\n", refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +START_TEST(d3d12) +{ + test_interfaces(); +}

1 0

Michael Müller : imm32: Add stub for ImmDisableLegacyIME.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 478c8b0eb1d51c52edd2f7b12aac1aa3853e1a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=478c8b0eb1d51c52edd2f7b1… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 14 04:35:04 2018 +0000 imm32: Add stub for ImmDisableLegacyIME. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 9 +++++++++ dlls/imm32/imm32.spec | 1 + include/imm.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3f8ad18..377a277 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3145,3 +3145,12 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + +/*********************************************************************** + * IMMDisableLegacyIME(IMM32.@) + */ +BOOL WINAPI ImmDisableLegacyIME(void) +{ + FIXME("stub\n"); + return TRUE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 2be5d92..4197bb8 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME +@ stdcall ImmDisableLegacyIME() @ stdcall ImmDisableTextFrameService(long) @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) diff --git a/include/imm.h b/include/imm.h index aa2fa1d..500aea9 100644 --- a/include/imm.h +++ b/include/imm.h @@ -493,6 +493,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmDisableLegacyIME(void); BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID);

1 0

Józef Kucia : include: Add d3d12.idl.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 6d202658f23e0150ba4c5433cac8ebfeeed84ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d202658f23e0150ba4c5433… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:50 2018 +0100 include: Add d3d12.idl. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d12.idl | 2177 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 4 +- 3 files changed, 2181 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d202658f23e0150ba4c…

1 0

Józef Kucia : dxgi: Use assignment instead of memcpy( ).
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d4daa14802b73705baf7919fe6c0d2cbfe8213c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4daa14802b73705baf7919f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:54 2018 +0100 dxgi: Use assignment instead of memcpy(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7116f3f..b7d7a0a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -184,7 +184,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, desc->DedicatedVideoMemory = adapter_id.video_memory; desc->DedicatedSystemMemory = 0; /* FIXME */ desc->SharedSystemMemory = 0; /* FIXME */ - memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; return hr;

1 0

Hans Leidekker : secur32: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: f0db56775e4231821404b416428b3865c24bd0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db56775e4231821404b416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:09 2018 +0100 secur32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/dispatcher.c | 15 +- dlls/secur32/lsa.c | 50 ++--- dlls/secur32/negotiate.c | 48 ++--- dlls/secur32/ntlm.c | 460 +++++++++++++++++------------------------ dlls/secur32/schannel.c | 55 +++-- dlls/secur32/schannel_macosx.c | 6 +- dlls/secur32/secur32.c | 43 ++-- dlls/secur32/secur32_priv.h | 1 + dlls/secur32/thunks.c | 16 +- dlls/secur32/util.c | 12 +- dlls/secur32/wrapper.c | 10 +- 11 files changed, 311 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0db56775e4231821404…

1 0

Hans Leidekker : kerberos: ISC_REQ_USE_DCE_STYLE is supported.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: ab43b7cb2493cf57255a8f5c7d034676aaec6eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab43b7cb2493cf57255a8f5c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:06 2018 +0100 kerberos: ISC_REQ_USE_DCE_STYLE is supported. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 767a86e..ea9c687 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -902,8 +902,8 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | - ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; - OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE; + OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token;

1 0