September 2019 - Wine-Devel

[PATCH] dxgi: Add IDXGIDevice3 stub.
by Andrey Gusev Sept. 9, 2019

Sept. 9, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/device.c | 8 ++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5500452653..4b23155754 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -42,6 +42,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) || IsEqualGUID(riid, &IID_IDXGIDevice2) + || IsEqualGUID(riid, &IID_IDXGIDevice3) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -321,6 +322,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *if return E_NOTIMPL; } +static void STDMETHODCALLTYPE dxgi_device_Trim(IWineDXGIDevice *iface) +{ + FIXME("iface %p stub!\n", iface); +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -376,6 +382,8 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_OfferResources, dxgi_device_ReclaimResources, dxgi_device_EnqueueSetEvent, + /* IDXGIDevice3 methods */ + dxgi_device_Trim, /* IWineDXGIDevice methods */ dxgi_device_create_surface, }; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 610b7c0485..070ac2fdda 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -42,7 +42,7 @@ interface IWineDXGISwapChainFactory : IUnknown local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice2 +interface IWineDXGIDevice : IDXGIDevice3 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture, -- 2.21.0

3 2

[PATCH] Include: Add DSFX_I3DL2REVERB defines
by Alistair Leslie-Hughes Sept. 9, 2019

Sept. 9, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dsound.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index 44bfccf2ad..2f65e194cb 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -460,6 +460,46 @@ typedef struct _DSFXI3DL2Reverb FLOAT flHFReference; } DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; +#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f +#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f +#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f +#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f +#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2 +#define DSFX_I3DL2REVERB_QUALITY_MIN 0 +#define DSFX_I3DL2REVERB_QUALITY_MAX 3 +#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT -2602 +#define DSFX_I3DL2REVERB_REFLECTIONS_MIN -10000 +#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000 +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f +#define DSFX_I3DL2REVERB_REVERB_MIN -10000 +#define DSFX_I3DL2REVERB_REVERB_MAX 2000 +#define DSFX_I3DL2REVERB_REVERB_DEFAULT 200 +#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f +#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f +#define DSFX_I3DL2REVERB_ROOM_DEFAULT -1000 +#define DSFX_I3DL2REVERB_ROOM_MIN 10000 +#define DSFX_I3DL2REVERB_ROOM_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_MIN -10000 +#define DSFX_I3DL2REVERB_ROOMHF_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT -100 +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f + typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER -- 2.17.1

1 0

[PATCH 1/5] winegstreamer: Get rid of the unused "gstpool" field from GSTOutPin.
by Zebediah Figura Sept. 8, 2019

Sept. 8, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bf8f1de9e23..ef11ed69962 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -82,7 +82,6 @@ struct GSTOutPin { GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - GstBufferPool *gstpool; BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; @@ -1769,8 +1768,6 @@ static void free_source_pin(GSTOutPin *pin) CloseHandle(pin->caps_event); DeleteMediaType(pin->pmt); gst_segment_free(pin->segment); - if (pin->gstpool) - gst_object_unref(pin->gstpool); strmbase_source_cleanup(&pin->pin); heap_free(pin); -- 2.23.0

1 4

[PATCH] iphlpapi: fixed size to MBtoWC
by Marcus Meissner Sept. 8, 2019

Sept. 8, 2019

Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d4b1100af6..1b0bc9383a 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2331,7 +2331,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; @@ -2357,7 +2357,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; -- 2.23.0

1 0

[PATCH] dwrite: Silence a compiler warning in test_fontsetbuilder.
by Gerald Pfeifer Sept. 8, 2019

Sept. 8, 2019

GCC 10 alphas (and probably before that) issue font.c: In function ‘test_fontsetbuilder’: font.c:9149:21: warning: ‘ivalue’ may be used uninitialized in this function [-Wmaybe-uninitialized] 9149 | wsprintfW(buffW, fmtW, ivalue); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ in dlls/dwrite/tests/font.c. The structure of our code is switch ... { case 1: ivalue =... ; break; case 2: ivalue =... ; break; default: ; } switch ... { case 1: case 2: do something with ivalue; default: ; } so this looks like a false positive, however one that appears rather involved for compilers to handle. Hence, best to pragmatically silence this by initializing ivalue in the default case? Gerald --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 309c0a2b08..3b6c2dc3c2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9126,7 +9126,7 @@ todo_wine ivalue = IDWriteFont3_GetStyle(font); break; default: - ; + ivalue = 0; } switch (id) -- 2.22.0

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo Sept. 8, 2019

Sept. 8, 2019

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 72 ++++++----------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 0b6284a5d0..2e345fcb38 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -172,7 +172,7 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine fant ikke wine-mono-pakken, som er nødvendig for at .NET programmer " +"Wine fant ikke wine-mono pakken, som er nødvendig for at .NET programmer " "skal fungere ordentlig. Wine kan laste ned og installere denne pakken for " "deg.\n" "\n" @@ -7333,10 +7333,8 @@ msgid "Stream descriptor is not selected.\n" msgstr "Enheten er ikke koblet til.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Indeksen mangler.\n" +msgstr "Kilde mangler.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -11161,10 +11159,6 @@ msgid "" msgstr "Tidsformatet til \"song pointer\" og SMPTE kan ikke brukes sammen." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11185,10 +11179,6 @@ msgid "An error occurred with the specified port." msgstr "En feil oppstod med den oppgitte porten." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15339,7 +15329,7 @@ msgstr "Vanlig metafil-framviser" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafiler (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15510,16 +15500,12 @@ msgid "Drive configuration" msgstr "Oppsett av stasjoner" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Klarte ikke koble til monteringsbehandleren; diskstasjonene kan derfor ikke " -"redigeres." +"Klarte ikke koble til monteringsbehandleren; stasjonsoppsettet kan derfor " +"ikke redigeres." #: winecfg.rc:236 msgid "A&dd..." @@ -15804,12 +15790,6 @@ msgid "System drive" msgstr "Systemstasjon" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16888,10 +16868,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstdokument (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstdokument (*.txt)" +msgstr "Unicode-tekstdokumenter (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17093,42 +17071,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17192,7 +17134,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" -"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" +"[/K] Kopier filegenskaper; uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n" -- 2.17.1

1 0

[PATCH] winemac.drv: Avoid an unneeded lstrlenW() call.
by Francois Gouget Sept. 8, 2019

Sept. 8, 2019

Note that since tiptext is a buffer it cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index a2c32b238fe..75bca5e3d51 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -123,7 +123,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) if (icon->image) update_image = TRUE; - if (lstrlenW(icon->tiptext)) + if (*icon->tiptext) update_tooltip = TRUE; } else -- 2.20.1

2 1

[PATCH] dinput8/tests: A spelling fix in a comment.
by Francois Gouget Sept. 8, 2019

Sept. 8, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 0bf6936812f..f3e7b542355 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -109,7 +109,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); - /* Check for buffer owerflow */ + /* Check for buffer overflow */ for (i = 0; i < 17; i++) if (event_type == INPUT_KEYBOARD) { -- 2.20.1

2 1

[PATCH 1/2] testbot/WineReconfig: Use the PE TestLauncher executable.
by Francois Gouget Sept. 8, 2019

Sept. 8, 2019

Wine VMs now should have MinGW to compile Wine so they can use it to produce the PE TestLauncher executable as well. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is the bit that was missing for the '--build' patch that did not apply. testbot/bin/build/WineReconfig.pl | 13 +------------ testbot/bin/build/WineTest.pl | 2 +- testbot/lib/Build/Utils.pm | 10 +++++++++- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 9f0544e3..ff0c11c8 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -71,18 +71,6 @@ sub BuildWine($$$$;$) return !1; } - # Compile TestLauncher - my $Bits = ($Build =~ /64/) ? "64" : "32"; - $WithWine ||= "."; - system("cd '$DataDir/wine-$Build' && set -x && ". - "gcc -m$Bits -c -o TestLauncher.o ../../src/TestLauncher/TestLauncher.c -fPIC -Iinclude -I../wine/include && ". - "'$WithWine/tools/winegcc/winegcc' -B'$WithWine/tools/winebuild' --sysroot=. -m$Bits -o TestLauncher.exe.so TestLauncher.o"); - if ($? != 0) - { - LogMsg "The $Build TestLauncher build failed\n"; - return !1; - } - return 1; } @@ -266,6 +254,7 @@ if ($DataDir =~ /'/) # exit(1) if (!BuildNativeTestAgentd()); +exit(1) if (!BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index a3997361..4b9a4b99 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -197,7 +197,7 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "TestLauncher.exe.so", + RunWine($Mission, GetTestLauncher($Mission), "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'$DataDir/$BaseName.report'"); diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index d31db820..02253922 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -29,7 +29,7 @@ use Exporter 'import'; our @EXPORT = qw(GetToolName InfoMsg LogMsg Error GitPull ApplyPatch GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd - BuildTestLauncher UpdateAddOns + GetTestLauncher BuildTestLauncher UpdateAddOns SetupWineEnvironment RunWine CreateWinePrefix); use Digest::SHA; @@ -219,6 +219,14 @@ sub BuildWindowsTestAgentd() return 1; } +sub GetTestLauncher($) +{ + my ($Mission) = @_; + + my $Bits = ($Mission->{Build} =~ /64/) ? "64" : "32"; + return "$::RootDir/src/TestLauncher/TestLauncher$Bits.exe"; +} + sub BuildTestLauncher() { InfoMsg "\nRebuilding TestLauncher\n"; -- 2.20.1

1 1

[PATCH] testbot/TestAgent: Don't wait for the ssh process if there is none.
by Francois Gouget Sept. 8, 2019

Sept. 8, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e6b0e0f6..ca81283d 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -129,7 +129,7 @@ sub Disconnect($) # This may close the SSH channel ($self->{fd}) as a side-effect, # which will avoid undue delays. $self->{ssh} = undef; - waitpid($self->{sshpid}, 0); + waitpid($self->{sshpid}, 0) if ($self->{sshpid}); $self->{sshpid} = undef; } if ($self->{fd}) -- 2.20.1

1 0