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

Nikolay Sivov : dwrite: Enable global directional substitution features.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 1f90b33daf1051800ca96af9db8d3b6f7868b2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f90b33daf1051800ca96af9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:44:45 2020 +0300 dwrite: Enable global directional substitution features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index e7693b58ae..0372d739b5 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -301,6 +301,17 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i struct shaping_features features = { 0 }; unsigned int i; + if (!context->is_sideways) + { + if (context->is_rtl) + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a')); + else + { + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a')); + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','m')); + } + } + for (i = 0; i < ARRAY_SIZE(common_features); ++i) shape_add_feature(&features, common_features[i]);

1 0

Nikolay Sivov : mf: Fix timer instance leak on error path in SetTimer().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 35242aa417cd1dd7d61e72a1c8fdabd29517367f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35242aa417cd1dd7d61e72a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:49:11 2020 +0300 mf: Fix timer instance leak on error path in SetTimer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d6b881218b..25832afdbb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4093,15 +4093,19 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, hr = MF_S_CLOCK_STOPPED; if (SUCCEEDED(hr)) + { list_add_tail(&clock->timers, &clock_timer->entry); + if (cancel_key) + { + *cancel_key = &clock_timer->IUnknown_iface; + IUnknown_AddRef(*cancel_key); + } + } LeaveCriticalSection(&clock->cs); - if (SUCCEEDED(hr) && cancel_key) - { - *cancel_key = &clock_timer->IUnknown_iface; - IUnknown_AddRef(*cancel_key); - } + if (FAILED(hr)) + IUnknown_Release(&clock_timer->IUnknown_iface); return hr; }

1 0

Jacek Caban : winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: e4e05cdaab4044b0e3a66723d51e74daf6a6ac35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e05cdaab4044b0e3a66723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 6 16:18:31 2020 +0200 winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/utils.c | 6 ++++++ tools/winebuild/winebuild.man.in | 3 +++ 4 files changed, 17 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b30785b74a..c162888a03 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -364,6 +364,7 @@ extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; extern int unix_lib; +extern int safe_seh; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 47f2787b10..efb86b705e 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -47,6 +47,7 @@ int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; int unix_lib = 0; +int safe_seh = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -290,6 +291,7 @@ static const char usage_str[] = " -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -o, --output=NAME Set the output file name (default: stdout)\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" +" --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" @@ -324,6 +326,7 @@ enum long_options_values LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, LONG_OPT_RESOURCES, + LONG_OPT_SAFE_SEH, LONG_OPT_SAVE_TEMPS, LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, @@ -350,6 +353,7 @@ static const struct option long_options[] = { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, { "resources", 0, 0, LONG_OPT_RESOURCES }, + { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, { "version", 0, 0, LONG_OPT_VERSION }, @@ -543,6 +547,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (optarg[0] == 'n' || optarg[0] == 'N') spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_NX_COMPAT; break; + case LONG_OPT_SAFE_SEH: + safe_seh = 1; + break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 669520711c..2a1fc96092 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -684,6 +684,12 @@ void output_standard_file_header(void) else output( "/* File generated automatically; do not edit! */\n" ); output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); + if (safe_seh) + { + output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.globl @feat.00\n" ); + output( ".set @feat.00, 1\n" ); + } } /* dump a byte stream into the assembly code */ diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 9c91c1a504..63ea2a3226 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -219,6 +219,9 @@ and will automatically be handled correctly (though the .B \-r option will also work for Win32 files). .TP +.B --safeseh +Mark object files as SEH compatible. +.TP .B --save-temps Do not delete the various temporary files that \fBwinebuild\fR generates. .TP

1 0

Jacek Caban : winegcc: Use --safeseh winebuild option on msvc target.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: d784de82c835321111a0e2d637e34757a8aed1fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d784de82c835321111a0e2d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 6 16:18:41 2020 +0200 winegcc: Use --safeseh winebuild option on msvc target. lld-link requires all x86 object files to be SEH compatible unless it's explicitly disabled. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 89f8eca5c2..8a7db2ad34 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1250,6 +1250,8 @@ static void build(struct options* opts) if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); } + if (opts->target_platform == PLATFORM_WINDOWS) strarray_add(spec_args, "--safeseh"); + if (entry_point) { strarray_add(spec_args, "--entry");

1 0

Gabriel Ivăncescu : cmd.exe: Don't treat explicit paths as a PATH search list.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: a19a770f96ca1b09c4bef449c082b7da38964dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a19a770f96ca1b09c4bef449… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 5 16:10:37 2020 +0300 cmd.exe: Don't treat explicit paths as a PATH search list. For example, the explicit path "C:\some;path" is currently treated as if the PATH environment variable is "C:\some;path" which is obviously wrong, and searches for the directories "C:\some" and "path". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 63 +++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 16843e4087..4026f3e6be 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1045,6 +1045,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; + BOOL explicit_path = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1084,6 +1085,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and c:\windows\a.bat syntax */ if (lastSlash) *(lastSlash + 1) = 0x00; + explicit_path = TRUE; } /* Now extract PATHEXT */ @@ -1103,37 +1105,48 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL found = FALSE; BOOL inside_quotes = FALSE; - /* Work on the first directory on the search path */ - pos = pathposn; - while ((inside_quotes || *pos != ';') && *pos != 0) + if (explicit_path) { - if (*pos == '"') - inside_quotes = !inside_quotes; - pos++; + lstrcpyW(thisDir, pathposn); + pathposn = NULL; } + else + { + /* Work on the next directory on the search path */ + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } - if (*pos) { /* Reached semicolon */ - memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); - thisDir[(pos-pathposn)] = 0x00; - pathposn = pos+1; - } else { /* Reached string end */ - lstrcpyW(thisDir, pathposn); - pathposn = NULL; - } + if (*pos) /* Reached semicolon */ + { + memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); + thisDir[(pos-pathposn)] = 0x00; + pathposn = pos+1; + } + else /* Reached string end */ + { + lstrcpyW(thisDir, pathposn); + pathposn = NULL; + } - /* Remove quotes */ - length = lstrlenW(thisDir); - if (thisDir[length - 1] == '"') - thisDir[length - 1] = 0; + /* Remove quotes */ + length = lstrlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; - if (*thisDir != '"') - lstrcpyW(temp, thisDir); - else - lstrcpyW(temp, thisDir + 1); + if (*thisDir != '"') + lstrcpyW(temp, thisDir); + else + lstrcpyW(temp, thisDir + 1); - /* Since you can have eg. ..\.. on the path, need to expand - to full information */ - GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + /* Since you can have eg. ..\.. on the path, need to expand + to full information */ + GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + } /* 1. If extension supplied, see if that file exists */ lstrcatW(thisDir, slashW);

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CreateModule function.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 84096382fc4ca80f5fc59908bf287e28a291bae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84096382fc4ca80f5fc59908… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 13:51:36 2020 +0200 msasn1: Implement ASN1_CreateModule function. Based on patch from Austin English. Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 30 +++++++++++++++++++++++++++++- dlls/msasn1/tests/asn1.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 90c4a8a9c9..6882fbf6c9 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msasn1); @@ -49,10 +50,37 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; + module = heap_alloc(sizeof(module)); + if (module) + { + module->nModuleName = magic; + module->eRule = rule; + module->dwFlags = flags; + module->cPDUs = pdu; + module->apfnFreeMemory = freemem; + module->acbStructSize = size; + + if (rule & ASN1_PER_RULE) + { + module->PER.apfnEncoder = (ASN1PerEncFun_t *)encoder; + module->PER.apfnDecoder = (ASN1PerDecFun_t *)decoder; + } + else if (rule & ASN1_BER_RULE) + { + module->BER.apfnEncoder = (ASN1BerEncFun_t *)encoder; + module->BER.apfnDecoder = (ASN1BerDecFun_t *)decoder; + } + else + { + module->PER.apfnEncoder = NULL; + module->PER.apfnDecoder = NULL; + } + } + return module; } diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 19019fc72b..adbf547efa 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -46,10 +46,39 @@ static void test_CreateModule(void) ok(!mod, "Expected Failure.\n"); mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==0, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==0, "Got eRule = %08x\n.",mod->eRule); + ok(mod->dwFlags==0, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->cPDUs==0, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); + ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_BER_RULE_DER, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); + ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_PER_RULE_ALIGNED, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->PER.apfnEncoder==(ASN1PerEncFun_t *)encfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); + ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); } START_TEST(asn1)

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CloseModule function.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 0d2f30370067e194dfdcc72b3e675aaedcc2061b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d2f30370067e194dfdcc72b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 14:21:43 2020 +0200 msasn1: Implement ASN1_CloseModule function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 7 +++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 6882fbf6c9..b30725aa63 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -84,3 +84,10 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, return module; } + +void WINAPI ASN1_CloseModule(ASN1module_t module) +{ + TRACE("(%p)\n", module); + + heap_free(module); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index ca6a461c65..09935f5149 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -219,7 +219,7 @@ @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 @ stub ASN1_CloseEncoder -@ stub ASN1_CloseModule +@ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx @ stub ASN1_CreateEncoder diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index adbf547efa..80f4dd5990 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -55,6 +55,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -66,6 +67,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -79,6 +81,7 @@ static void test_CreateModule(void) broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); + ASN1_CloseModule(mod); } START_TEST(asn1)

1 0

Zebediah Figura : quartz/videorenderer: Factor out get_bitmap_header().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 665ac338ca17b546f9c81c9016917d5d0a4df7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=665ac338ca17b546f9c81c90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:41 2020 -0500 quartz/videorenderer: Factor out get_bitmap_header(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 85 ++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 54a646fbc0..77afc9fcef 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,6 +79,14 @@ static inline struct video_renderer *impl_from_BaseControlVideo(BaseControlVideo return CONTAINING_RECORD(iface, struct video_renderer, baseControlVideo); } +static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -144,9 +152,7 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; - BITMAPINFOHEADER *bih; HRESULT hr; HDC dc; @@ -159,11 +165,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; - dc = GetDC(filter->baseControlWindow.hwnd); StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right - filter->DestRect.left, @@ -171,7 +172,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->SourceRect.left, filter->SourceRect.top, filter->SourceRect.right - filter->SourceRect.left, filter->SourceRect.bottom - filter->SourceRect.top, - pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + pbSrcStream, (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.hwnd, dc); if (filter->renderer.filter.state == State_Paused) @@ -190,53 +191,31 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *This = impl_from_strmbase_renderer(iface); + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; - if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB32) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) - { - LONG height; + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + return S_FALSE; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) - { - VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; - - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - height = format2->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else - { - WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); - return S_FALSE; - } - return S_OK; - } - return S_FALSE; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) + return S_FALSE; + + bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; } static void video_renderer_destroy(struct strmbase_renderer *iface) @@ -360,7 +339,6 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { struct video_renderer *filter = impl_from_BaseControlVideo(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; const BITMAPINFOHEADER *bih; size_t image_size; BYTE *sample_data; @@ -369,10 +347,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG EnterCriticalSection(&filter->renderer.csRenderLock); - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image)

1 0

Zhiyi Zhang : wined3d: Fix an uninitialised variable warning.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 1976685a0f57bdec939228d73f6252c68ccb8f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1976685a0f57bdec939228d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:43 2020 +0800 wined3d: Fix an uninitialised variable warning. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a1aa3c0bb9..c21ecfd5c3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -257,7 +257,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; - const char *tex_type_str; + const char *tex_type_str = NULL; unsigned int i; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -310,8 +310,6 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { if (!gl_info->supported[texture_type[i].extension])

1 0

Jacek Caban : ntoskrnl.exe: Export _chkstk from importlib.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 92e40853d8b7915187a419633c0e996fafb1bdf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e40853d8b7915187a41963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:49 2020 +0200 ntoskrnl.exe: Export _chkstk from importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3013fe7eb9..7ebce5709d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3741,7 +3741,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret" ); /************************************************************************** * _chkstk (NTOSKRNL.@) */ -__ASM_STDCALL_FUNC( _chkstk, 0, +__ASM_GLOBAL_FUNC( _chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8e3b127b16..76c4afb281 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1500,7 +1500,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @@ -1516,7 +1516,7 @@ @ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -@ stdcall -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl _finite(double)

1 0