August 2020 - Wine-commits - list.winehq.org

Henri Verbeet : vkd3d-compiler: Add an option to list the supported target types.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: vkd3d Branch: master Commit: 67173a0021bbba902649643b30bdba25d20140e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=67173a0021bbba902649643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 15:54:37 2020 +0430 vkd3d-compiler: Add an option to list the supported target types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4a889f0..5baaf8a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Józef Kucia for CodeWeavers + * Copyright 2020 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,7 @@ enum OPTION_BUFFER_UAV, OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, + OPTION_PRINT_TARGET_TYPES, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -52,6 +54,19 @@ source_type_info[] = " This is the format used for Direct3D shader model 4 and 5 shaders."}, }; +static const struct +{ + enum vkd3d_shader_target_type type; + const char *name; + const char *description; +} +target_type_info[] = +{ + {VKD3D_SHADER_TARGET_SPIRV_BINARY, + "spirv-binary", "A SPIR-V shader in binary form.\n" + " This is the format used for Vulkan shaders.\n"}, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -121,6 +136,8 @@ static void print_usage(const char *program_name) " 'storage-buffer'.\n" " -o, --output=<file> Write the output to <file>.\n" " --print-source-types Display the supported source types and exit.\n" + " --print-target-types Display the supported target types for the specified\n" + " source type and exit.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Valid values are\n" @@ -138,6 +155,7 @@ struct options enum vkd3d_shader_source_type source_type; bool print_version; bool print_source_types; + bool print_target_types; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -215,6 +233,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, + {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, @@ -248,6 +267,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->print_source_types = true; return true; + case OPTION_PRINT_TARGET_TYPES: + options->print_target_types = true; + break; + case OPTION_STRIP_DEBUG: add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; @@ -270,6 +293,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (options->print_target_types) + return true; + if (optind >= argc) return false; @@ -298,6 +324,36 @@ static void print_source_types(void) } } +static void print_target_types(enum vkd3d_shader_source_type source_type) +{ + const enum vkd3d_shader_target_type *target_types; + const char *source_type_name; + unsigned int count, i, j; + + for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) + { + if (source_type == source_type_info[i].type) + { + source_type_name = source_type_info[i].name; + break; + } + } + + target_types = vkd3d_shader_get_supported_target_types(source_type, &count); + fprintf(stdout, "Supported target types for source type '%s':\n", source_type_name); + for (i = 0; i < count; ++i) + { + for (j = 0; j < ARRAY_SIZE(target_type_info); ++j) + { + if (target_types[i] == target_type_info[j].type) + { + fprintf(stdout, " %s %s", target_type_info[j].name, target_type_info[j].description); + break; + } + } + } +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; @@ -326,6 +382,12 @@ int main(int argc, char **argv) return 0; } + if (options.print_target_types) + { + print_target_types(options.source_type); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type;

1 0

Henri Verbeet : vkd3d-compiler: Add an option to specify the target type.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: vkd3d Branch: master Commit: ea1cb2e699e446d0e97ad80ae3537b07daaf5c98 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea1cb2e699e446d0e97ad80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 15:54:38 2020 +0430 vkd3d-compiler: Add an option to specify the target type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5baaf8a..ed4b0ee 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -131,6 +131,8 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " -b <type> Specify the target type. Currently the only valid value\n" + " is 'spirv-binary'.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" @@ -153,6 +155,7 @@ struct options const char *filename; const char *output_filename; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; bool print_version; bool print_source_types; bool print_target_types; @@ -222,6 +225,19 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) return VKD3D_SHADER_SOURCE_NONE; } +static enum vkd3d_shader_target_type parse_target_type(const char *target) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + { + if (!strcmp(target, target_type_info[i].name)) + return target_type_info[i].type; + } + + return VKD3D_SHADER_TARGET_NONE; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; @@ -241,14 +257,23 @@ static bool parse_command_line(int argc, char **argv, struct options *options) memset(options, 0, sizeof(*options)); options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; for (;;) { - if ((option = getopt_long(argc, argv, "ho:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:ho:Vx:", long_options, NULL)) == -1) break; switch (option) { + case 'b': + if ((options->target_type = parse_target_type(optarg)) == VKD3D_SHADER_TARGET_NONE) + { + fprintf(stderr, "Invalid target type '%s' specified.\n", optarg); + return false; + } + break; + case OPTION_BUFFER_UAV: if (!parse_buffer_uav(&buffer_uav, optarg)) { @@ -391,7 +416,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; - info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + info.target_type = options.target_type; info.options = options.compile_options; info.option_count = options.compile_option_count; info.log_level = VKD3D_SHADER_LOG_INFO;

1 0

Henri Verbeet : vkd3d-shader: Support register spaces for combined samplers.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: vkd3d Branch: master Commit: 7bae1a606a301750283da957959598689388ee91 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7bae1a606a301750283da95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 15:54:39 2020 +0430 vkd3d-shader: Support register spaces for combined samplers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7bae1a606a301750283…

1 0

Henri Verbeet : build: Link vkd3d-utils with PTHREAD_LIBS.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: vkd3d Branch: master Commit: a8937ede3a22ce9e7b076a431e1da3dee609d15e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a8937ede3a22ce9e7b076a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 15:54:40 2020 +0430 build: Link vkd3d-utils with PTHREAD_LIBS. Since it uses pthread functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fc10ba6..58b3174 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 -libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la +libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map

1 0

Jeremy Newman : take down wineconf notice
by Jeremy Newman 11 Aug '20

11 Aug '20

Module: website Branch: master Commit: d05976ff1dfa3c56dba6a3919f428b6050add3d5 URL: https://source.winehq.org/git/website.git/?a=commit;h=d05976ff1dfa3c56dba6a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 11 12:54:47 2020 -0500 take down wineconf notice --- templates/en/home.template | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index 75db7fdc..9fc15054 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -159,22 +159,6 @@ <div class="whq-page-container margin-top-md"> - <h2 class="title"><a href="http://wiki.winehq.org/Organising_WineConf">WineConf Call for Hosts</a></h2> - - <p>This is a call for proposals to host the next WineConf sometime this year. Ideally proposals would present;</p> - - <ul> - <li>Proposed dates</li> - <li>Proposed city</li> - <li>Information on potential venues and travel</li> - </ul> - - <p>We'll need to choose a host relatively quickly as it does take time to plan and book the event. I'm hoping we can settle on a host by the end of February but ultimately that decision goes to the Wine Committee. Questions, comments, concerns can be posted on the <a href="{$root}/forums">WineConf mailing list</a>. A draft of a guide to hosting has been started on the wiki [1]. Please take a look to get a sense of what is involved in hosting the conference.</p> - - <p>1. <a href="https://wiki.winehq.org/Organising_WineConf">https://wiki.winehq.org/Organising_WineConf</a></p> - - <br> - <h2 class="title"><a href="{$root}/news">News and Updates</a></h2>

1 0

Jacek Caban : include: Add pseudoconsole declarations.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 7e1957f097d1aa0cd4658b33ef034950e8be1cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e1957f097d1aa0cd4658b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:48 2020 +0200 include: Add pseudoconsole declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/consoleapi.h | 5 +++++ include/wincontypes.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/include/consoleapi.h b/include/consoleapi.h index 439e64eb7b..5bba09d37f 100644 --- a/include/consoleapi.h +++ b/include/consoleapi.h @@ -35,6 +35,8 @@ #define ENABLE_PROCESSED_OUTPUT 0x01 #define ENABLE_WRAP_AT_EOL_OUTPUT 0x02 +#define PSEUDOCONSOLE_INHERIT_CURSOR 0x01 + /* handler routine control signal type */ #define CTRL_C_EVENT 0 #define CTRL_BREAK_EVENT 1 @@ -58,6 +60,8 @@ extern "C" { WINBASEAPI BOOL WINAPI AllocConsole(void); WINBASEAPI BOOL WINAPI AttachConsole(DWORD); +WINBASEAPI void WINAPI ClosePseudoConsole(HPCON); +WINBASEAPI HRESULT WINAPI CreatePseudoConsole(COORD,HANDLE,HANDLE,DWORD,HPCON *); WINBASEAPI BOOL WINAPI FreeConsole(void); WINBASEAPI UINT WINAPI GetConsoleCP(void); WINBASEAPI BOOL WINAPI GetConsoleMode( HANDLE,DWORD *); @@ -72,6 +76,7 @@ WINBASEAPI BOOL WINAPI ReadConsoleW(HANDLE,void *,DWORD,DWORD *,void *); WINBASEAPI BOOL WINAPI ReadConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,DWORD *); WINBASEAPI BOOL WINAPI ReadConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,DWORD *); #define ReadConsoleInput WINELIB_NAME_AW(ReadConsoleInput) +WINBASEAPI HRESULT WINAPI ResizePseudoConsole(HPCON,COORD); WINBASEAPI BOOL WINAPI SetConsoleCtrlHandler( PHANDLER_ROUTINE,BOOL); WINBASEAPI BOOL WINAPI SetConsoleMode( HANDLE,DWORD); WINBASEAPI BOOL WINAPI WriteConsoleA(HANDLE,const void *,DWORD,DWORD *,void *); diff --git a/include/wincontypes.h b/include/wincontypes.h index e416c448a3..d724a80921 100644 --- a/include/wincontypes.h +++ b/include/wincontypes.h @@ -130,4 +130,6 @@ typedef struct _CONSOLE_FONT_INFO COORD dwFontSize; } CONSOLE_FONT_INFO,*LPCONSOLE_FONT_INFO; +typedef void *HPCON; + #endif /* _WINCONTYPES_ */

1 0

Jacek Caban : kernelbase: Add pseudoconsole stubs.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 9b7311e7094149f268521146de4f065d63f955df URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7311e7094149f268521146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:58 2020 +0200 kernelbase: Add pseudoconsole stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 3 +++ dlls/kernelbase/console.c | 26 ++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 3 +++ 3 files changed, 32 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7b89d19c2d..8d4776c21e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -226,6 +226,7 @@ @ stdcall -import CloseHandle(long) # @ stub ClosePrivateNamespace @ stdcall CloseProfileUserMapping() +@ stdcall -import ClosePseudoConsole(ptr) @ stub CloseSystemHandle @ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool @ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup @@ -316,6 +317,7 @@ @ stdcall -import CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) # @ stub CreateProcessInternalWSecure @ stdcall -import CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) +@ stdcall -import CreatePseudoConsole(long long long long ptr) @ stdcall -import CreateRemoteThread(long ptr long ptr long long ptr) @ stdcall -import CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateSemaphoreA(ptr long long str) @@ -1287,6 +1289,7 @@ @ stdcall RequestWakeupLatency(long) @ stdcall -import ResetEvent(long) @ stdcall -import ResetWriteWatch(ptr long) +@ stdcall -import ResizePseudoConsole(ptr long) @ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) ntdll.LdrResolveDelayLoadedAPI @ stdcall -import ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index caae098c12..0eb87ec7e9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1584,3 +1584,29 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS HeapFree( GetProcessHeap(), 0, params ); return ret; } + +/****************************************************************************** + * CreatePseudoConsole (kernelbase.@) + */ +HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWORD flags, HPCON *ret ) +{ + FIXME( "(%u,%u) %p %p %x %p\n", size.X, size.Y, input, output, flags, ret ); + return E_NOTIMPL; +} + +/****************************************************************************** + * ClosePseudoConsole (kernelbase.@) + */ +void WINAPI ClosePseudoConsole( HPCON handle ) +{ + FIXME( "%p\n", handle ); +} + +/****************************************************************************** + * ResizePseudoConsole (kernelbase.@) + */ +HRESULT WINAPI ResizePseudoConsole( HPCON handle, COORD size ) +{ + FIXME( "%p (%u,%u)\n", handle, size.X, size.Y ); + return E_NOTIMPL; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 3f778685a7..f5411a161f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -138,6 +138,7 @@ @ stdcall CloseHandle(long) # @ stub ClosePackageInfo # @ stub ClosePrivateNamespace +@ stdcall ClosePseudoConsole(ptr) # @ stub CloseState # @ stub CloseStateAtom # @ stub CloseStateChangeNotification @@ -211,6 +212,7 @@ @ stdcall CreateProcessInternalA(long str str ptr ptr long long ptr str ptr ptr ptr) @ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) +@ stdcall CreatePseudoConsole(long long long long ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @@ -1343,6 +1345,7 @@ @ stdcall ResetEvent(long) # @ stub ResetState @ stdcall ResetWriteWatch(ptr long) +@ stdcall ResizePseudoConsole(ptr long) @ stdcall -import ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) LdrResolveDelayLoadedAPI # @ stub ResolveDelayLoadsFromDll @ stdcall ResolveLocaleName(wstr ptr long)

1 0

Dmitry Kislyuk : vbscript: Implement case insensitive search in InStrRev function.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: b900567f04dce34c11065411959ad0e3c8335114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b900567f04dce34c11065411… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Fri Aug 7 02:41:15 2020 -0500 vbscript: Implement case insensitive search in InStrRev function. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 97 +++++++++++++++++++++++++++------------------ dlls/vbscript/tests/api.vbs | 49 ++++++++++++++++++++--- 2 files changed, 102 insertions(+), 44 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 414ede5ed0..122f5c7b71 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2398,61 +2398,80 @@ static HRESULT Global_StrReverse(BuiltinDisp *This, VARIANT *arg, unsigned args_ static HRESULT Global_InStrRev(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - int start, ret = 0; + int start = -1, ret = -1, mode = 0; BSTR str1, str2; + size_t len1, len2; HRESULT hres; TRACE("%s %s arg_cnt=%u\n", debugstr_variant(args), debugstr_variant(args+1), args_cnt); - if(args_cnt > 3) { - FIXME("Unsupported args\n"); - return E_NOTIMPL; - } - assert(2 <= args_cnt && args_cnt <= 4); - if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || (args_cnt > 2 && V_VT(args+2) == VT_NULL)) + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || (args_cnt > 2 && V_VT(args+2) == VT_NULL) + || (args_cnt == 4 && V_VT(args+3) == VT_NULL)) return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); - hres = to_string(args, &str1); - if(FAILED(hres)) - return hres; + if(args_cnt == 4) { + hres = to_int(args+3, &mode); + if(FAILED(hres)) + return hres; + if (mode != 0 && mode != 1) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } - hres = to_string(args+1, &str2); - if(SUCCEEDED(hres)) { - if(args_cnt > 2) { - hres = to_int(args+2, &start); - if(SUCCEEDED(hres) && start <= 0) { - FIXME("Unsupported start %d\n", start); - hres = E_NOTIMPL; - } - }else { - start = SysStringLen(str1); - } - } else { - str2 = NULL; + if(args_cnt >= 3) { + hres = to_int(args+2, &start); + if(FAILED(hres)) + return hres; + if(!start || start < -1) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } - if(SUCCEEDED(hres)) { - const WCHAR *ptr; - size_t len; - - len = SysStringLen(str2); - if(start >= len && start <= SysStringLen(str1)) { - for(ptr = str1+start-SysStringLen(str2); ptr >= str1; ptr--) { - if(!memcmp(ptr, str2, len*sizeof(WCHAR))) { - ret = ptr-str1+1; - break; - } - } + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &str1); + if(FAILED(hres)) + return hres; + } + else + str1 = V_BSTR(args); + + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &str2); + if(FAILED(hres)) { + if(V_VT(args) != VT_BSTR) + SysFreeString(str1); + return hres; } } + else + str2 = V_BSTR(args+1); - SysFreeString(str1); - SysFreeString(str2); - if(FAILED(hres)) - return hres; + len1 = SysStringLen(str1); + if(!len1) { + ret = 0; + goto end; + } + + if(start == -1) + start = len1; + + len2 = SysStringLen(str2); + if(!len2) { + ret = start; + goto end; + } + + if(start >= len2 && start <= len1) { + ret = FindStringOrdinal(FIND_FROMEND, str1, start, + str2, len2, mode); + } + ret++; +end: + if(V_VT(args) != VT_BSTR) + SysFreeString(str1); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(str2); return return_int(res, ret); } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index f829afc101..6af49c849d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -508,18 +508,57 @@ Call ok(x = 3, "InStrRev returned " & x) x = InStrRev(1234, 34) Call ok(x = 3, "InStrRev returned " & x) -Sub testInStrRevError(arg1, arg2, arg3, error_num) +x = InStrRev("abcd", "A", 1, 0) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "A", 1, 1) +Call ok(x = 1, "InStrRev returned " & x) + +x = InStrRev("abcd", "Ab", 1, 1) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "Ab", -1, 1) +Call ok(x = 1, "InStrRev returned " & x) + +x = InStrRev("abcd", "cd", 3, 1) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "cd", 4, 1) +Call ok(x = 3, "InStrRev returned " & x) + +x = InStrRev("abcd", "cd", 5, 1) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abc" & Chr(0) & "A" & Chr(0) & "BC", "c", 8, 0) +Call ok(x = 3, "InStrRev returned " & x) + +x = InStrRev("abc" & Chr(0) & "ABC", Chr(0) & "a", 6, 1) +Call ok(x = 4, "InStrRev returned " & x) + +x = InStrRev("", "hi", 1, 0) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "", 3, 1) +Call ok(x = 3, "InStrRev returned " & x) + +x = InStrRev("", "", 3, 0) +Call ok(x = 0, "InStrRev returned " & x) + +Sub testInStrRevError(arg1, arg2, arg3, arg4, error_num) on error resume next Dim x Call Err.clear() - x = InStrRev(arg1, arg2, arg3) + x = InStrRev(arg1, arg2, arg3, arg4) Call ok(Err.number = error_num, "Err.number = " & Err.number) End Sub -call testInStrRevError("abcd", null, 2, 94) -call testInStrRevError(null, "abcd", 2, 94) -call testInStrRevError("abcd", "abcd", null, 94) +call testInStrRevError("abcd", null, 2, 0, 94) +call testInStrRevError(null, "abcd", 2, 0, 94) +call testInStrRevError("abcd", "abcd", null, 0, 94) +call testInStrRevError("abcd", "abcd", 2, null, 94) +call testInStrRevError("abcd", "abcd", -20, 1, 5) +Call testInStrRevError("abcd", "abcd", 2, 10, 5) Sub TestMid(str, start, len, ex) x = Mid(str, start, len)

1 0

Rémi Bernon : xaudio2_9: Use new FAudioCreateReverb9 interface.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 196cb7afef48f717794828b3ac00838c7aa013c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=196cb7afef48f717794828b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 5 09:08:10 2020 +0200 xaudio2_9: Use new FAudioCreateReverb9 interface. XAudio 2.9 and Windows 10 introduced a new SideDelay field in the middle of the XAUDIO2FX_REVERB_PARAMETERS structure, which causes other fields to be offseted and incorrectly read from the parameter buffer. FAudio 20.08 introduces this new interface to create reverb effects that use the new parameter structure layout. This fixes audio glitches in Dragon Quest Builders 2. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- dlls/xaudio2_7/xapo.c | 11 +++++++++++ include/config.h.in | 4 ++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c9afbc0ab8..ffe5ecca89 100755 --- a/configure +++ b/configure @@ -15531,7 +15531,8 @@ done LIBS="$LIBS $FAUDIO_LIBS" for ac_func in FAudio_CommitOperationSet \ F3DAudioInitialize8 \ - FAudioLinkedVersion + FAudioLinkedVersion \ + FAudioCreateReverb9WithCustomAllocatorEXT do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 360ef2b11f..67729e0c0a 100644 --- a/configure.ac +++ b/configure.ac @@ -1784,7 +1784,8 @@ then [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ F3DAudioInitialize8 \ - FAudioLinkedVersion], [$FAUDIO_LIBS]) + FAudioLinkedVersion \ + FAudioCreateReverb9WithCustomAllocatorEXT], [$FAUDIO_LIBS]) ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index e64523ea19..e47442959d 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -313,6 +313,16 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#if XAUDIO2_VER >= 9 && HAVE_FAUDIOCREATEREVERB9WITHCUSTOMALLOCATOREXT + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverb9WithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#else if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) return FAudioCreateReverbWithCustomAllocatorEXT( fapo, @@ -322,6 +332,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Realloc ); #endif +#endif #if XAUDIO2_VER >= 8 || defined XAPOFX1_VER if(IsEqualGUID(clsid, &CLSID_FXReverb) || IsEqualGUID(clsid, &CLSID_FXEQ) || diff --git a/include/config.h.in b/include/config.h.in index fc9305418c..1748a8b8d8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,6 +152,10 @@ /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE +/* Define to 1 if you have the `FAudioCreateReverb9WithCustomAllocatorEXT' + function. */ +#undef HAVE_FAUDIOCREATEREVERB9WITHCUSTOMALLOCATOREXT + /* Define to 1 if you have the `FAudioLinkedVersion' function. */ #undef HAVE_FAUDIOLINKEDVERSION

1 0

Serge Gautherie : winapi: Use $cwd variable instead of pwd command.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 49936b31b3155f5f0a76b6ebf941a4ac45b5015b URL: https://source.winehq.org/git/wine.git/?a=commit;h=49936b31b3155f5f0a76b6eb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 25 21:35:09 2020 +0200 winapi: Use $cwd variable instead of pwd command. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/setup.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index ed0846049b..f23bba1ad1 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -54,7 +54,7 @@ BEGIN { if($wine_dir =~ /^\./) { $current_dir = "."; - my $pwd; chomp($pwd = `pwd`); + my $pwd; chomp($pwd = $cwd); foreach my $n (1..((length($wine_dir) + 1) / 3)) { $pwd =~ s/\/([^\/]*)$//; $current_dir = "$1/$current_dir";

1 0