July 2017 - Wine-commits - list.winehq.org

Jacek Caban : server: Don' t allow APCs on objects associated with completion port.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 82e6713b75d223ee1ac68812a394626aa2884c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e6713b75d223ee1ac68812a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 12:51:05 2017 +0200 server: Don't allow APCs on objects associated with completion port. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 -- dlls/ws2_32/tests/sock.c | 1 - server/async.c | 11 +++++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 71b37e4..ff27d98 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1045,7 +1045,6 @@ static void test_iocp_fileio(HANDLE h) /* using APCs on handle with associated completion port is not allowed */ res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -1094,7 +1093,6 @@ static void test_iocp_fileio(HANDLE h) /* using APCs on handle with associated completion port is not allowed */ res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2790fea..efe10b3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6824,7 +6824,6 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); completion_called = 0; iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); - todo_wine ok(iret == SOCKET_ERROR && GetLastError() == WSAEINVAL, "WSARecv failed - %d error %d\n", iret, GetLastError()); ok(!completion_called, "completion called\n"); diff --git a/server/async.c b/server/async.c index 0205807..1cb020f 100644 --- a/server/async.c +++ b/server/async.c @@ -192,7 +192,7 @@ void free_async_queue( struct async_queue *queue ) LIST_FOR_EACH_ENTRY_SAFE( async, next, &queue->queue, struct async, queue_entry ) { - async->completion = fd_get_completion( async->fd, &async->comp_key ); + if (!async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); async->fd = NULL; async_terminate( async, STATUS_HANDLES_CLOSED ); async->queue = NULL; @@ -236,7 +236,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; - async->completion = NULL; + async->completion = fd_get_completion( fd, &async->comp_key ); if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -244,6 +244,13 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da list_add_head( &thread->process->asyncs, &async->process_entry ); if (event) reset_event( event ); + if (async->completion && data->apc) + { + release_object( async ); + set_error( STATUS_INVALID_PARAMETER ); + return NULL; + } + return async; }

1 0

Hugh McMaster : regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ hex data during concatenation if we reach EOF.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 7f11a24fee2ffe538b6991b6d57dad618485acee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f11a24fee2ffe538b6991b6d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 10 11:28:17 2017 +0000 regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ hex data during concatenation if we reach EOF. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 40 +++++++++++++++++++++++----------------- programs/regedit/tests/regedit.c | 4 ++-- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0a356cb..ea0b6f8 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -504,6 +504,27 @@ static void free_parser_data(struct parser *parser) parser->data_size = 0; } +static void prepare_hex_string_data(struct parser *parser) +{ + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + { + BYTE *data = parser->data; + + if (data[parser->data_size - 1] != 0) + { + data[parser->data_size] = 0; + parser->data_size++; + } + + if (!parser->is_unicode) + { + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); + parser->data_size *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, data); + } + } +} + enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -852,23 +873,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; } - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) - { - BYTE *data = parser->data; - - if (data[parser->data_size - 1] != 0x00) - { - data[parser->data_size] = 0x00; - parser->data_size++; - } - - if (!parser->is_unicode) - { - parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); - parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, data); - } - } + prepare_hex_string_data(parser); set_state(parser, SET_VALUE); return line; @@ -903,6 +908,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) if (!(line = get_line(parser->file))) { + prepare_hex_string_data(parser); set_state(parser, SET_VALUE); return pos; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b3f6e76..2839a11 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -500,7 +500,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17b\"=hex(2):25,50,41,54,48,25,\\"); - verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE | TODO_REG_DATA); + verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -510,7 +510,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17d\"=hex(7):4c,69,6e,65,\\"); - verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE | TODO_REG_DATA); + verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Andrey Gusev : api-ms-win-core-psapi-ansi-l1-1-0: Add dll.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 68bcb8e6759da45a41cbe483b6eb4f45b7855760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bcb8e6759da45a41cbe483b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 10 13:30:38 2017 +0300 api-ms-win-core-psapi-ansi-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-psapi-ansi-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index c421baf..92199ea 100755 --- a/configure +++ b/configure @@ -949,6 +949,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 +enable_api_ms_win_core_psapi_ansi_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 @@ -17957,6 +17958,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 +wine_fn_config_dll api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 diff --git a/configure.ac b/configure.ac index 23937f1..6c4316a 100644 --- a/configure.ac +++ b/configure.ac @@ -2785,6 +2785,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-psapi-ansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0) diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..26836cc --- /dev/null +++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-psapi-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec new file mode 100644 index 0000000..e4f7585 --- /dev/null +++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall K32EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA +@ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA +@ stdcall K32GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA +@ stdcall K32GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA +@ stdcall K32GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA +@ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA diff --git a/tools/make_specfiles b/tools/make_specfiles index 85eb1ff..c8ac40f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -233,6 +233,7 @@ my @dll_groups = "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0", + "api-ms-win-core-psapi-ansi-l1-1-0", "api-ms-win-core-psapi-obsolete-l1-1-0", "api-ms-win-core-threadpool-l1-1-0", "api-ms-win-core-threadpool-l1-2-0",

1 0

Andrey Gusev : api-ms-win-mm-time-l1-1-0: Add dll.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 478462ef0b3a09e7ff26b405893b76151d2be3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=478462ef0b3a09e7ff26b4058… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 10 13:31:05 2017 +0300 api-ms-win-mm-time-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-mm-time-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 92199ea..b4c2ad7 100755 --- a/configure +++ b/configure @@ -1027,6 +1027,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_mm_mme_l1_1_0 +enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -18036,6 +18037,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 +wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index 6c4316a..1fcf957 100644 --- a/configure.ac +++ b/configure.ac @@ -2863,6 +2863,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-mm-time-l1-1-0/Makefile.in b/dlls/api-ms-win-mm-time-l1-1-0/Makefile.in new file mode 100644 index 0000000..b77d360 --- /dev/null +++ b/dlls/api-ms-win-mm-time-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-time-l1-1-0.dll diff --git a/dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec b/dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec new file mode 100644 index 0000000..0d46016 --- /dev/null +++ b/dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall timeBeginPeriod(long) winmm.timeBeginPeriod +@ stdcall timeEndPeriod(long) winmm.timeEndPeriod +@ stdcall timeGetDevCaps(ptr long) winmm.timeGetDevCaps +@ stdcall timeGetSystemTime(ptr long) winmm.timeGetSystemTime +@ stdcall timeGetTime() winmm.timeGetTime diff --git a/tools/make_specfiles b/tools/make_specfiles index c8ac40f..82f4c82 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -338,6 +338,7 @@ my @dll_groups = "winmm", "api-ms-win-mm-misc-l1-1-1", "api-ms-win-mm-mme-l1-1-0", + "api-ms-win-mm-time-l1-1-0", ], [ "msvcrt",

1 0

Andrey Gusev : api-ms-win-security-provider-l1-1-0: Add dll.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: e80b6b64ba0b42edc841e8e4f75228f7a1c7e595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80b6b64ba0b42edc841e8e4f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 10 13:31:25 2017 +0300 api-ms-win-security-provider-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-provider-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-provider-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index b4c2ad7..f6053f1 100755 --- a/configure +++ b/configure @@ -1043,6 +1043,7 @@ enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_lsapolicy_l1_1_0 +enable_api_ms_win_security_provider_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_security_systemfunctions_l1_1_0 enable_api_ms_win_service_core_l1_1_0 @@ -18053,6 +18054,7 @@ wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_securi wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 +wine_fn_config_dll api-ms-win-security-provider-l1-1-0 enable_api_ms_win_security_provider_l1_1_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-security-systemfunctions-l1-1-0 enable_api_ms_win_security_systemfunctions_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core_l1_1_0 diff --git a/configure.ac b/configure.ac index 1fcf957..d557df8 100644 --- a/configure.ac +++ b/configure.ac @@ -2879,6 +2879,7 @@ WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-systemfunctions-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) diff --git a/dlls/api-ms-win-security-provider-l1-1-0/Makefile.in b/dlls/api-ms-win-security-provider-l1-1-0/Makefile.in new file mode 100644 index 0000000..fb5047c --- /dev/null +++ b/dlls/api-ms-win-security-provider-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-provider-l1-1-0.dll diff --git a/dlls/api-ms-win-security-provider-l1-1-0/api-ms-win-security-provider-l1-1-0.spec b/dlls/api-ms-win-security-provider-l1-1-0/api-ms-win-security-provider-l1-1-0.spec new file mode 100644 index 0000000..b244ad8 --- /dev/null +++ b/dlls/api-ms-win-security-provider-l1-1-0/api-ms-win-security-provider-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall GetExplicitEntriesFromAclW(ptr ptr ptr) advapi32.GetExplicitEntriesFromAclW +@ stdcall GetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr ptr) advapi32.GetNamedSecurityInfoW +@ stdcall GetSecurityInfo(long long long ptr ptr ptr ptr ptr) advapi32.GetSecurityInfo +@ stdcall SetEntriesInAclW(long ptr ptr ptr) advapi32.SetEntriesInAclW +@ stdcall SetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr) advapi32.SetNamedSecurityInfoW +@ stdcall SetSecurityInfo(long long long ptr ptr ptr ptr) advapi32.SetSecurityInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 82f4c82..58207ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -129,6 +129,7 @@ my @dll_groups = "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", + "api-ms-win-security-provider-l1-1-0", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-security-systemfunctions-l1-1-0", "api-ms-win-service-core-l1-1-0",

1 0

Michael Stefaniuc : d3dx9/tests: Use string concatenation for a multiline string.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 041a0ff1c048084539a9d936985661c9ae9e7c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=041a0ff1c048084539a9d9369… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 6 15:23:38 2017 +0200 d3dx9/tests: Use string concatenation for a multiline string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bbebfc3..55f48e9 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4338,8 +4338,8 @@ static void test_effect_preshader_compare_vconsts_(unsigned int line, IDirect3DD & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { ok_(__FILE__, line)(!memcmp(&fdata[i], &test_effect_preshader_fvect_v[i], sizeof(fdata[i])), - "Vertex shader float constants do not match, expected (%g, %g, %g, %g), \ -got (%g, %g, %g, %g), parameter %s.\n", + "Vertex shader float constants do not match, expected (%g, %g, %g, %g), " + "got (%g, %g, %g, %g), parameter %s.\n", test_effect_preshader_fvect_v[i].x, test_effect_preshader_fvect_v[i].y, test_effect_preshader_fvect_v[i].z, test_effect_preshader_fvect_v[i].w, fdata[i].x, fdata[i].y, fdata[i].z, fdata[i].w, updated_param);

1 0

Paul Gofman : d3dx9/tests: Add test for skip_constants effect parameter.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: ec7e76663577c6e2333171c0e4faa1727858b6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7e76663577c6e2333171c0e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:05 2017 +0300 d3dx9/tests: Add test for skip_constants effect parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 148 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 55f48e9..b966b42 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6837,6 +6837,153 @@ static void test_effect_get_pass_desc(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +#if 0 +float v1 : register(c2); +float v2 : register(c3); +float v3; +float v4 : register(c4); +float v5; +float v6[2] : register(c5) = {11, 22}; + +struct VS_OUTPUT +{ + float4 Position : POSITION; +}; + +VS_OUTPUT RenderSceneVS(float4 vPos : POSITION) +{ + VS_OUTPUT Output; + + Output.Position = v1 * v2 * vPos + v2 + v3 + v4; + Output.Position += v6[0] + v6[1]; + return Output; +} + +technique tech0 +{ + pass p0 + { + PointScale_A = v4; + VertexShader = compile vs_3_0 RenderSceneVS(); + } +} +#endif +static const DWORD test_effect_skip_constants_blob[] = +{ + 0xfeff0901, 0x00000144, 0x00000000, 0x00000003, 0x00000000, 0x00000024, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000000, 0x00000003, 0x00003176, 0x00000003, 0x00000000, 0x0000004c, + 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000003, 0x00003276, 0x00000003, + 0x00000000, 0x00000074, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000003, + 0x00003376, 0x00000003, 0x00000000, 0x0000009c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000000, 0x00000003, 0x00003476, 0x00000003, 0x00000000, 0x000000c4, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000000, 0x00000003, 0x00003576, 0x00000003, 0x00000000, 0x000000f0, + 0x00000000, 0x00000002, 0x00000001, 0x00000001, 0x41300000, 0x41b00000, 0x00000003, 0x00003676, + 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000001, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00003070, + 0x00000006, 0x68636574, 0x00000030, 0x00000006, 0x00000001, 0x00000002, 0x00000002, 0x00000004, + 0x00000020, 0x00000000, 0x00000000, 0x0000002c, 0x00000048, 0x00000000, 0x00000000, 0x00000054, + 0x00000070, 0x00000000, 0x00000000, 0x0000007c, 0x00000098, 0x00000000, 0x00000000, 0x000000a4, + 0x000000c0, 0x00000000, 0x00000000, 0x000000cc, 0x000000e8, 0x00000000, 0x00000000, 0x00000138, + 0x00000000, 0x00000001, 0x00000130, 0x00000000, 0x00000002, 0x00000041, 0x00000000, 0x000000fc, + 0x000000f8, 0x00000092, 0x00000000, 0x0000011c, 0x00000118, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0xffffffff, 0x00000001, 0x00000000, 0x000001bc, 0xfffe0300, 0x0047fffe, 0x42415443, + 0x0000001c, 0x000000e7, 0xfffe0300, 0x00000005, 0x0000001c, 0x20000000, 0x000000e0, 0x00000080, + 0x00020002, 0x000a0001, 0x00000084, 0x00000094, 0x000000a4, 0x00030002, 0x000e0001, 0x00000084, + 0x00000094, 0x000000a7, 0x00000002, 0x00000001, 0x00000084, 0x00000094, 0x000000aa, 0x00040002, + 0x00120001, 0x00000084, 0x00000094, 0x000000ad, 0x00050002, 0x00160002, 0x000000b0, 0x000000c0, + 0xab003176, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x76003276, 0x34760033, 0x00367600, 0x00030000, 0x00010001, 0x00000002, 0x00000000, + 0x41300000, 0x00000000, 0x00000000, 0x00000000, 0x41b00000, 0x00000000, 0x00000000, 0x00000000, + 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x0200001f, 0x80000000, + 0x900f0000, 0x0200001f, 0x80000000, 0xe00f0000, 0x02000001, 0x80010000, 0xa0000003, 0x03000005, + 0x80010000, 0x80000000, 0xa0000002, 0x04000004, 0x800f0000, 0x80000000, 0x90e40000, 0xa0000003, + 0x03000002, 0x800f0000, 0x80e40000, 0xa0000000, 0x03000002, 0x800f0000, 0x80e40000, 0xa0000004, + 0x02000001, 0x80010001, 0xa0000005, 0x03000002, 0x80010001, 0x80000001, 0xa0000006, 0x03000002, + 0xe00f0000, 0x80e40000, 0x80000001, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, + 0x00000000, 0x000000d8, 0x46580200, 0x0023fffe, 0x42415443, 0x0000001c, 0x00000057, 0x46580200, + 0x00000001, 0x0000001c, 0x20000100, 0x00000054, 0x00000030, 0x00040002, 0x00120001, 0x00000034, + 0x00000044, 0xab003476, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, + 0x54494c43, 0x00000000, 0x000cfffe, 0x434c5846, 0x00000001, 0x10000001, 0x00000001, 0x00000000, + 0x00000002, 0x00000010, 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, +}; + +static void test_effect_skip_constants(IDirect3DDevice9 *device) +{ + HRESULT hr; + ID3DXEffect *effect; + unsigned int passes_count; + D3DXVECTOR4 fvect; + unsigned int i; + + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, "v3", 0, NULL, &effect, NULL); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + effect->lpVtbl->Release(effect); + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, "v4", 0, NULL, &effect, NULL); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + effect->lpVtbl->Release(effect); + + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, " v1#,.+-= &\t\nv2*/!\"'v5 v6[1]", 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + todo_wine + ok(!effect->lpVtbl->IsParameterUsed(effect, "v1", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect->lpVtbl->IsParameterUsed(effect, "v2", "tech0"), + "Unexpected IsParameterUsed result.\n"); + ok(effect->lpVtbl->IsParameterUsed(effect, "v3", "tech0"), + "Unexpected IsParameterUsed result.\n"); + ok(effect->lpVtbl->IsParameterUsed(effect, "v4", "tech0"), + "Unexpected IsParameterUsed result.\n"); + ok(!effect->lpVtbl->IsParameterUsed(effect, "v5", "tech0"), + "Unexpected IsParameterUsed result.\n"); + + hr = effect->lpVtbl->SetFloat(effect, "v1", 28.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v2", 29.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v3", 30.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v4", 31.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v5", 32.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_clear_vconsts(device); + + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + fvect.y = fvect.z = fvect.w = 0.0f; + fvect.x = 30.0f; + test_effect_shared_parameters_compare_vconst(device, 0, &fvect, FALSE); + for (i = 1; i < 4; ++i) + test_effect_shared_parameters_compare_vconst(device, i, &fvect_filler, i > 1); + fvect.x = 31.0f; + test_effect_shared_parameters_compare_vconst(device, 4, &fvect, FALSE); + for (i = 5; i < 256; ++i) + test_effect_shared_parameters_compare_vconst(device, i, &fvect_filler, i < 7); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -6888,6 +7035,7 @@ START_TEST(effect) test_effect_shared_parameters(device); test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); + test_effect_skip_constants(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Paul Gofman : d3dx9: Factor out is_parameter_used() function.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 57de7e99192c5dd260dfcaa85fdd71fa1fbba051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57de7e99192c5dd260dfcaa85… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:06 2017 +0300 d3dx9: Factor out is_parameter_used() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c3647d3..333feab 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4030,16 +4030,11 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ return FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_technique *tech) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); unsigned int i, j; - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); struct d3dx_pass *pass; - TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); - TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); if (!tech || !param) return FALSE; @@ -4049,16 +4044,27 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL for (j = 0; j < pass->state_count; ++j) { if (walk_state_dep(&pass->states[j], is_same_parameter, param)) - { - TRACE("Returning TRUE.\n"); return TRUE; - } } } - TRACE("Returning FALSE.\n"); return FALSE; } +static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +{ + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + BOOL ret; + + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); + + ret = is_parameter_used(param, tech); + TRACE("Returning %#x.\n", ret); + return ret; +} + static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);

1 0

Paul Gofman : d3dx9: Simplify init and cleanup in get_constants_desc().
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 9fc4e4a1a9a5aa257fded8fcdeaa83b4f1d9903c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc4e4a1a9a5aa257fded8fcd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:07 2017 +0300 d3dx9: Simplify init and cleanup in get_constants_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2fb14ab..cabddcd 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -618,10 +618,6 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab D3DXHANDLE hc; unsigned int i; - out->inputs = cdesc = NULL; - out->inputs_param = NULL; - out->input_count = 0; - inputs_param = NULL; hr = D3DXGetShaderConstantTable(byte_code, &ctab); if (FAILED(hr) || !ctab) { @@ -635,8 +631,8 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab goto err_out; } - cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); - inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); + out->inputs = cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); + out->inputs_param = inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); if (!cdesc || !inputs_param) { hr = E_OUTOFMEMORY; @@ -678,16 +674,9 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab } } out->input_count = desc.Constants; - out->inputs = cdesc; - out->inputs_param = inputs_param; hr = init_set_constants(out, ctab); - ID3DXConstantTable_Release(ctab); - return hr; err_out: - HeapFree(GetProcessHeap(), 0, cdesc); - HeapFree(GetProcessHeap(), 0, inputs_param); - if (ctab) - ID3DXConstantTable_Release(ctab); + ID3DXConstantTable_Release(ctab); return hr; }

1 0

Paul Gofman : d3dx9: Get rid of init_set_constants() function.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 35f82ba444930b770684f0bd623c505d52c7b58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f82ba444930b770684f0bd6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:08 2017 +0300 d3dx9: Get rid of init_set_constants() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 58 ++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index cabddcd..1aaf59d 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -305,7 +305,8 @@ static unsigned int get_reg_components(unsigned int table) #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) -static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab); +static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab, + D3DXHANDLE hc, struct d3dx_parameter *param); static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) { @@ -671,10 +672,24 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab hr = D3DERR_INVALIDCALL; goto err_out; } + continue; } + if (FAILED(hr = init_set_constants_param(out, ctab, hc, inputs_param[i]))) + goto err_out; } out->input_count = desc.Constants; - hr = init_set_constants(out, ctab); + if (out->const_set_count) + { + out->const_set = HeapReAlloc(GetProcessHeap(), 0, out->const_set, + sizeof(*out->const_set) * out->const_set_count); + if (!out->const_set) + { + ERR("Out of memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + out->const_set_size = out->const_set_count; + } err_out: ID3DXConstantTable_Release(ctab); return hr; @@ -1452,45 +1467,6 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC return D3D_OK; } -static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab) -{ - unsigned int i; - HRESULT hr, ret; - D3DXHANDLE hc; - - ret = D3D_OK; - for (i = 0; i < const_tab->input_count; ++i) - { - if (!const_tab->inputs_param[i] || const_tab->inputs_param[i]->class == D3DXPC_OBJECT) - continue; - hc = ID3DXConstantTable_GetConstant(ctab, NULL, i); - if (hc) - { - hr = init_set_constants_param(const_tab, ctab, hc, const_tab->inputs_param[i]); - } - else - { - FIXME("Could not get constant, index %u.\n", i); - hr = D3DERR_INVALIDCALL; - } - if (FAILED(hr)) - ret = hr; - } - - if (const_tab->const_set_count) - { - const_tab->const_set = HeapReAlloc(GetProcessHeap(), 0, const_tab->const_set, - sizeof(*const_tab->const_set) * const_tab->const_set_count); - if (!const_tab->const_set) - { - ERR("Out of memory.\n"); - return E_OUTOFMEMORY; - } - const_tab->const_set_size = const_tab->const_set_count; - } - return ret; -} - static double exec_get_reg_value(struct d3dx_regstore *rs, enum pres_reg_tables table, unsigned int offset) { if (!regstore_is_val_set_reg(rs, table, get_reg_offset(table, offset)))

1 0