March 2020 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Refactor wined3d_get_adapter_raster_status() to wined3d_output_get_raster_status().
by Zhiyi Zhang March 9, 2020

March 9, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 4 ++-- dlls/wined3d/directx.c | 11 ++++------- dlls/wined3d/swapchain.c | 12 ++++++++++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f947ca8b2b6..17a02bbc05d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1824,7 +1824,7 @@ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *s return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = wined3d_get_adapter_raster_status(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &raster_status); + hr = wined3d_output_get_raster_status(ddraw->wined3d_output, &raster_status); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -2170,7 +2170,7 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) TRACE("iface %p, line %p.\n", iface, Scanline); wined3d_mutex_lock(); - hr = wined3d_get_adapter_raster_status(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &raster_status); + hr = wined3d_output_get_raster_status(ddraw->wined3d_output, &raster_status); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ca3053c89b..f5a94b93aa9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1392,7 +1392,7 @@ fail: return WINED3DERR_INVALIDCALL; } -HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_output_get_raster_status(const struct wined3d_output *output, struct wined3d_raster_status *raster_status) { LONGLONG freq_per_frame, freq_per_line; @@ -1401,11 +1401,9 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U static UINT once; if (!once++) - FIXME("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", - wined3d, adapter_idx, raster_status); + FIXME("output %p, raster_status %p semi-stub!\n", output, raster_status); else - WARN("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", - wined3d, adapter_idx, raster_status); + WARN("output %p, raster_status %p semi-stub!\n", output, raster_status); /* Obtaining the raster status is a widely implemented but optional * feature. When this method returns OK StarCraft 2 expects the @@ -1416,8 +1414,7 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) return WINED3DERR_INVALIDCALL; - if (FAILED(wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], &mode, - NULL))) + if (FAILED(wined3d_output_get_display_mode(output, &mode, NULL))) return WINED3DERR_INVALIDCALL; if (mode.refresh_rate == DEFAULT_REFRESH_RATE) mode.refresh_rate = 60; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c0eb25ffb66..c5fd2879c05 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -307,10 +307,18 @@ struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapch HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { + struct wined3d_output *output; + TRACE("swapchain %p, raster_status %p.\n", swapchain, raster_status); - return wined3d_get_adapter_raster_status(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, raster_status); + output = wined3d_swapchain_get_output(swapchain); + if (!output) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + + return wined3d_output_get_raster_status(output, raster_status); } struct wined3d_swapchain_state * CDECL wined3d_swapchain_get_state(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 51745e24183..c426ffd0b6c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,7 +12,6 @@ @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -@ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @@ -161,6 +160,7 @@ @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) +@ cdecl wined3d_output_get_raster_status(ptr ptr) @ cdecl wined3d_output_set_display_mode(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6fc3a1aaa85..d31f1aff490 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2266,8 +2266,6 @@ struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); -HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, - struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2502,6 +2500,8 @@ HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, unsigned int mode_idx, struct wined3d_display_mode *mode); unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); +HRESULT __cdecl wined3d_output_get_raster_status(const struct wined3d_output *output, + struct wined3d_raster_status *raster_status); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, const struct wined3d_display_mode *mode); -- 2.20.1

2 1

[PATCH 1/6] wined3d: Explicitly zero the whole wined3d_rasterizer_state_desc structure in wined3d_device_apply_stateblock().
by Zebediah Figura March 9, 2020

March 9, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 407dd20469..7e727242f4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3622,10 +3622,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, float f; } bias; + memset(&desc, 0, sizeof(desc)); desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; - desc.front_ccw = FALSE; - desc.depth_bias_clamp = 0.0f; bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; desc.scale_bias = bias.f; desc.depth_clip = TRUE; -- 2.25.1

3 13

[PATCH] xaudio2_7: Correct reference count on newly created XAudio2 object
by Alistair Leslie-Hughes March 9, 2020

March 9, 2020

FAudioCOMConstructWithCustomAllocatorEXT initialize the reference count to 1, then QueryInterface increase the count to 2. Thus the finial release wont be called if a balanced AddRef/Release is used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a87e0124d3..1a440072cb 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1961,6 +1961,7 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p HeapFree(GetProcessHeap(), 0, object); return hr; } + IXAudio2_Release(&object->IXAudio2_iface); TRACE("Created XAudio version %u: %p\n", 20 + XAUDIO2_VER, object); -- 2.25.1

2 1

Should the make_xxx scripts be run at build time?
by Francois Gouget March 8, 2020

March 8, 2020

I'm excluding make_opengl from this discussion because it needs to download files so it's best to avoid having to run it. But the various make_errors, make_vulkan and make_fir scripts could potentially generate the relevant files at build time. The question comes up because either the TestBot needs to detect changes to their dependencies and rerun them when needed, or the Wine build system needs to do it. The latter option has some caveats: * These scripts depend on tools like awk, perl and Python 3. We may not want Wine to depend on those for its build. * Generating files like dxerr8/errors.h at build time breaks makedep because it fails to find the header. Any opinions on this? Hints on how to deal with makedep? -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

[PATCH] dsound: Move make_fir to the dsound directory.
by Francois Gouget March 8, 2020

March 8, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The other tools like make_opengl, make_vulkan and make_errors are all in the directory of the related dll. So I don't see why it should be different for make_fir. Also it does not need any file outside the dlls/dsound directory so a cd ../.. does not seem necessary after the move. {tools => dlls/dsound}/make_fir | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename {tools => dlls/dsound}/make_fir (98%) diff --git a/tools/make_fir b/dlls/dsound/make_fir similarity index 98% rename from tools/make_fir rename to dlls/dsound/make_fir index 97c5583d16d..0fd26aaf7f9 100755 --- a/tools/make_fir +++ b/dlls/dsound/make_fir @@ -136,8 +136,7 @@ foreach my $testfreq(@testfreqs) { # Now actually print the FIR to a C header file -chdir ".." if -f "./make_fir"; -open FILE, ">dlls/dsound/fir.h"; +open FILE, ">", "fir.h"; select FILE; print "/* generated by tools/make_fir; DO NOT EDIT! */\n"; -- 2.20.1

1 0

[tools] testbot: Take the patchset version into account.
by Francois Gouget March 8, 2020

March 8, 2020

This avoids errors when a new revision of a patchset is sent before the previous one has been fully received. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch requires updating the database schema by applying update43.sql and then restarting the web server and TestBot Engine. Note that the foreign key deletion (PendingPatches_ibfk_1) is a bit fragile because the '_1' suffix gets incremented every time the foreign key gets recreated. But presumably the TestBot still has the original foreign key that got created by winetestbot.sql so '_1' should be the right value. testbot/bin/Janitor.pl | 3 +- testbot/ddl/update43.sql | 26 +++++ testbot/ddl/winetestbot.sql | 8 +- testbot/doc/winetestbot-schema.dia | 108 ++++++++++++++------ testbot/lib/WineTestBot/PendingPatchSets.pm | 4 +- testbot/lib/WineTestBot/PendingPatches.pm | 3 +- 6 files changed, 115 insertions(+), 37 deletions(-) create mode 100644 testbot/ddl/update43.sql diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index bc9b87603c..9481d51adc 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -162,7 +162,8 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - Trace "Deleting pending series for ", $Set->EMail, " (got ", join(" ", sort @Parts), " / ", $Set->TotalParts, ")\n"; + my $Version = $Version eq "" ? "" : " v$Version"; + Trace "Deleting pending series$Version for ", $Set->EMail, " (got ", join(" ", sort @Parts), " / ", $Set->TotalParts, ")\n"; next if ($DryRun); $Sets->DeleteItem($Set); diff --git a/testbot/ddl/update43.sql b/testbot/ddl/update43.sql new file mode 100644 index 0000000000..80d1a35bb5 --- /dev/null +++ b/testbot/ddl/update43.sql @@ -0,0 +1,26 @@ +USE winetestbot; + +ALTER TABLE PendingPatches + DROP FOREIGN KEY PendingPatches_ibfk_1; + + +ALTER TABLE PendingPatchSets + ADD Version INT(2) NOT NULL + AFTER Email; + +ALTER TABLE PendingPatchSets + DROP PRIMARY KEY, + ADD PRIMARY KEY (EMail, Version, TotalParts); + + +ALTER TABLE PendingPatches + ADD PendingPatchSetVersion INT(2) NOT NULL + AFTER PendingPatchSetEmail; + +ALTER TABLE PendingPatches + DROP PRIMARY KEY, + ADD PRIMARY KEY (PendingPatchSetEMail, PendingPatchSetVersion, PendingPatchSetTotalParts, No); + +ALTER TABLE PendingPatches + ADD FOREIGN KEY (PendingPatchSetEMail, PendingPatchSetVersion, PendingPatchSetTotalParts) + REFERENCES PendingPatchSets(EMail, Version, TotalParts); diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index e1cb5714f3..533941dd62 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -82,19 +82,21 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE PendingPatchSets ( EMail VARCHAR(40) NOT NULL, + Version INT(2) NOT NULL, TotalParts INT(2) NOT NULL, - PRIMARY KEY (EMail, TotalParts) + PRIMARY KEY (EMail, Version, TotalParts) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE PendingPatches ( PendingPatchSetEMail VARCHAR(40) NOT NULL, + PendingPatchSetVersion INT(2) NOT NULL, PendingPatchSetTotalParts INT(2) NOT NULL, No INT(2) NOT NULL, PatchId INT(7) NOT NULL, - FOREIGN KEY (PendingPatchSetEMail, PendingPatchSetTotalParts) - REFERENCES PendingPatchSets(EMail, TotalParts), + FOREIGN KEY (PendingPatchSetEMail, PendingPatchSetVersion, PendingPatchSetTotalParts) + REFERENCES PendingPatchSets(EMail, Version, TotalParts), FOREIGN KEY (PatchId) REFERENCES Patches(Id), PRIMARY KEY (PendingPatchSetEMail, PendingPatchSetTotalParts, No) ) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 81ab656b7f..a5ef142bd2 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -962,22 +962,22 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="-16.4708,-2.55002"/> + <dia:point val="-16.3208,-2.55002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.4708,-2.55002;-5.9308,6.04998"/> + <dia:rectangle val="-16.3208,-2.55002;-6.1658,5.24998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-16.4708,-2.55002"/> + <dia:point val="-16.3208,-2.55002"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="10.539999999999999"/> + <dia:real val="10.155000000000001"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="8.5999999999999996"/> + <dia:real val="7.7999999999999998"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Patches#</dia:string> @@ -1493,22 +1493,22 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="-2.65417,-1.76669"/> + <dia:point val="-2.55417,-2.51669"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-2.65417,-1.76669;12.5058,2.83331"/> + <dia:rectangle val="-2.55417,-2.51669;12.6058,2.88331"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-2.65417,-1.76669"/> + <dia:point val="-2.55417,-2.51669"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="15.16"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.6000000000000005"/> + <dia:real val="5.4000000000000004"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#PendingPatches#</dia:string> @@ -1552,6 +1552,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#PendingPatchSetVersion#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#PendingPatchSetTotalParts#</dia:string> @@ -1658,7 +1681,7 @@ <dia:point val="8.24583,-14.8834"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="8.24583,-14.8834;22.2508,-5.4834"/> + <dia:rectangle val="8.24583,-14.8834;22.2508,-6.2834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -1670,7 +1693,7 @@ <dia:real val="14.004999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="9.3999999999999986"/> + <dia:real val="8.5999999999999996"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Steps#</dia:string> @@ -1935,7 +1958,7 @@ <dia:point val="25.4792,-14.8834"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.4792,-14.8834;36.0192,-5.4834"/> + <dia:rectangle val="25.4792,-14.8834;36.0192,-4.6834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -1947,7 +1970,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="9.3999999999999986"/> + <dia:real val="10.199999999999999"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Tasks#</dia:string> @@ -2258,7 +2281,7 @@ <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;36.5958,10.5708"/> + <dia:rectangle val="25.6708,-2.02919;36.5958,12.1708"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2270,7 +2293,7 @@ <dia:real val="10.925000000000001"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="12.600000000000001"/> + <dia:real val="14.200000000000003"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#VMs#</dia:string> @@ -3005,7 +3028,7 @@ <dia:point val="-4.57083,-6.8167"/> <dia:point val="-18.2307,-6.8167"/> <dia:point val="-18.2307,-0.85002"/> - <dia:point val="-16.4708,-0.85002"/> + <dia:point val="-16.3208,-0.85002"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3053,19 +3076,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O20"> <dia:attribute name="obj_pos"> - <dia:point val="-5.9308,-0.85002"/> + <dia:point val="-6.1658,-0.85002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-5.9808,-1.50002;-2.60417,2.38331"/> + <dia:rectangle val="-6.2158,-1.50002;-2.50417,1.63331"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-5.9308,-0.85002"/> + <dia:point val="-6.1658,-0.85002"/> <dia:point val="-4.29249,-0.85002"/> - <dia:point val="-4.29249,2.33331"/> - <dia:point val="-2.65417,2.33331"/> + <dia:point val="-4.29249,1.58331"/> + <dia:point val="-2.55417,1.58331"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3113,19 +3136,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O21"> <dia:attribute name="obj_pos"> - <dia:point val="12.5058,-0.06669"/> + <dia:point val="12.6058,-0.81669"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.4558,-0.71669;15.3193,-2.33e-05"/> + <dia:rectangle val="12.5558,-1.50002;15.1193,-0.76669"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="12.5058,-0.06669"/> - <dia:point val="13.7696,-0.06669"/> - <dia:point val="13.7696,-0.0500233"/> - <dia:point val="15.2693,-0.0500233"/> + <dia:point val="12.6058,-0.81669"/> + <dia:point val="13.7696,-0.81669"/> + <dia:point val="13.7696,-0.85002"/> + <dia:point val="15.0693,-0.85002"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3173,22 +3196,22 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O22"> <dia:attribute name="obj_pos"> - <dia:point val="15.2693,-1.75002"/> + <dia:point val="15.0693,-2.55002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.2693,-1.75002;24.6543,1.24998"/> + <dia:rectangle val="15.0693,-2.55002;24.4543,1.24998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="15.2693,-1.75002"/> + <dia:point val="15.0693,-2.55002"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9.3850000000000016"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="3"/> + <dia:real val="3.7999999999999998"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#PendingPatchSets#</dia:string> @@ -3232,6 +3255,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Version#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#TotalParts#</dia:string> diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 9e386af588..0fedc52e63 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -191,6 +191,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("EMail", "EMail of series author", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("Version", "Version", 1, 1, "N", 2), CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), ); @@ -233,11 +234,12 @@ sub NewSubmission($$$) return undef; } - my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $SubjectInfo->{MaxPartNo})); + my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $SubjectInfo->{Version}, $SubjectInfo->{MaxPartNo})); if (! defined($Set)) { $Set = $self->Add(); $Set->EMail($Patch->FromEMail); + $Set->Version($SubjectInfo->{Version}); $Set->TotalParts($SubjectInfo->{MaxPartNo}); } diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 74121d7477..118c74900d 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -69,6 +69,7 @@ my @PropertyDescriptors = ( ); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), CreateBasicPropertyDescriptor("PendingPatchSetTotalParts", "Expected number of parts in series", 1, 1, "N", 2), @PropertyDescriptors ); @@ -83,7 +84,7 @@ corresponding parts. In this case the PendingPatch objects don't store the key of their parent. If no PendingPatchSet object is specified all the table rows are returned and -the PendingPatch objects have PendingPatchSetEMail and +the PendingPatch objects have PendingPatchSetEMail, PendingPatchSetVersion and PendingPatchSetTotalParts properties. =back -- 2.20.1

1 0

Solving patch series collisions with domains?
by Francois Gouget March 8, 2020

March 8, 2020

On Thu, 5 Mar 2020, Marvin wrote: [...] > === debiant (build log) === > > error: patch failed: dlls/d3d11/device.c:941 > error: patch failed: dlls/d3d11/state.c:1079 > error: patch failed: dlls/wined3d/device.c:3600 > error: patch failed: include/wine/wined3d.h:2037 > Task: Patch failed to apply The TestBot mixed up this 5-parts wined3d patch series with the other 5-parts patch series for qcap / qedit. One was a v2 and not the other so taking into account the version would have avoided the issue in this case (the patch for this should go in next monday). But this could just as well have happened with unversioned patch series: [PATCH 1/5] wined3d: ... vs. [PATCH 1/5] qcap/capturegraph: ... The subject parsing code extracts a property I have been calling the 'domain' (for lack of a better term) which is a word that's sometimes added in the square brackets. It's usually used to indicate the Git repository the patch should go in: [vkd3d 1/2], [tools], etc. But it could also be used to avoid collisions between patch series: where the TestBot identifies patch series based on the (Sender, Version, PartCount) tuple, it could add the domain to the mix: (Sender, Domain, Version, PartCount). This would allow sending two patch series with the same number of parts without causing a collision: [wined3d 1/5] wined3d: ... + [qcap 1/5] qcap/capturegraph: ... or [wined3d 1/5] wined3d: ... + [PATCH 1/5] qcap/capturegraph: ... or [PATCH 1/5] wined3d: ... + [PATCH qcap 1/5] qcap/capturegraph: ... PATCH can be thrown in to help identify patches, or omitted. It makes no difference to the TestBot. Not using a domain would work just as well in the absence of a collision. And if two patch series risk colliding, adding a domain would help avoid the collision. The only drawback is one has to anticipate and remember to specify the domain before sending the emails. Would taking the domain make sense? Would it be worth it? -- Francois Gouget <fgouget(a)codeweavers.com>

4 6

[PATCH v3 1/3] setupapi: Implement SetupDiGetSelectedDriver().
by Zebediah Figura March 8, 2020

March 8, 2020

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: perform W -> A translation only on success; thanks Zhiyi. v3: fix test failures... dlls/setupapi/devinst.c | 90 +++++++++++++++++++++++++---------- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/devinst.c | 14 ++++++ 3 files changed, 82 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 268965f0fed..ce7268a5e80 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4645,16 +4645,42 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +static BOOL copy_driver_data(SP_DRVINFO_DATA_W *data, const struct driver *driver) +{ + INFCONTEXT ctx; + HINF hinf; + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + data->ProviderName[0] = 0; + if (SetupFindFirstLineW(hinf, L"Version", L"Provider", &ctx)) + SetupGetStringFieldW(&ctx, 1, data->ProviderName, ARRAY_SIZE(data->ProviderName), NULL); + wcscpy(data->Description, driver->description); + wcscpy(data->MfgName, driver->manufacturer); + data->DriverType = SPDIT_COMPATDRIVER; + + SetupCloseInfFile(hinf); + + return TRUE; +} + +static void driver_data_wtoa(SP_DRVINFO_DATA_A *a, const SP_DRVINFO_DATA_W *w) +{ + a->DriverType = w->DriverType; + a->Reserved = w->Reserved; + WideCharToMultiByte(CP_ACP, 0, w->Description, -1, a->Description, sizeof(a->Description), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->MfgName, -1, a->MfgName, sizeof(a->MfgName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->ProviderName, -1, a->ProviderName, sizeof(a->ProviderName), NULL, NULL); +} + /*********************************************************************** * SetupDiEnumDriverInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type, DWORD index, SP_DRVINFO_DATA_W *driver_data) { - static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; struct device *device; - INFCONTEXT ctx; - HINF hinf; TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n", devinfo, device_data, type, index, driver_data); @@ -4675,19 +4701,7 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat return FALSE; } - if ((hinf = SetupOpenInfFileW(device->drivers[index].inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) - return FALSE; - - driver_data->ProviderName[0] = 0; - if (SetupFindFirstLineW(hinf, Version, providerW, &ctx)) - SetupGetStringFieldW(&ctx, 1, driver_data->ProviderName, ARRAY_SIZE(driver_data->ProviderName), NULL); - lstrcpyW(driver_data->Description, device->drivers[index].description); - lstrcpyW(driver_data->MfgName, device->drivers[index].manufacturer); - driver_data->DriverType = SPDIT_COMPATDRIVER; - - SetupCloseInfFile(hinf); - - return TRUE; + return copy_driver_data(driver_data, &device->drivers[index]); } /*********************************************************************** @@ -4701,14 +4715,7 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat driver_dataW.cbSize = sizeof(driver_dataW); ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); - driver_data->DriverType = driver_dataW.DriverType; - driver_data->Reserved = driver_dataW.Reserved; - WideCharToMultiByte(CP_ACP, 0, driver_dataW.Description, -1, driver_data->Description, - sizeof(driver_data->Description), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.MfgName, -1, driver_data->MfgName, - sizeof(driver_data->MfgName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.ProviderName, -1, driver_data->ProviderName, - sizeof(driver_data->ProviderName), NULL, NULL); + driver_data_wtoa(driver_data, &driver_dataW); return ret; } @@ -4738,6 +4745,41 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +/*********************************************************************** + * SetupDiGetSelectedDriverW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_W *driver_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, driver_data %p.\n", devinfo, device_data, driver_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!device->selected_driver) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + return copy_driver_data(driver_data, device->selected_driver); +} + +/*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_A *driver_data) +{ + SP_DRVINFO_DATA_W driver_dataW; + BOOL ret; + + driver_dataW.cbSize = sizeof(driver_dataW); + if ((ret = SetupDiGetSelectedDriverW(devinfo, device_data, &driver_dataW))) + driver_data_wtoa(driver_data, &driver_dataW); + return ret; +} + /*********************************************************************** * SetupDiInstallDriverFiles (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 33ccc480974..233a02e550c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -361,8 +361,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a9ac0d849f6..0b1a1fa3814 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2434,6 +2434,20 @@ static void test_driver_list(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret /* Win10 1809 */ || GetLastError() == ERROR_NO_DRIVER_SELECTED, + "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiSelectBestCompatDrv(set, &device); + ok(ret, "Failed to select driver, error %#x.\n", GetLastError()); + + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret, "Failed to get selected driver, error %#x.\n", GetLastError()); + ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); + ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); + ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName); + SetupDiDestroyDeviceInfoList(set); ret = DeleteFileA(inf_path); ok(ret, "Failed to delete %s, error %u.\n", inf_path, GetLastError()); -- 2.25.1

1 2

[PATCH v2 1/5] qedit: Register the sample grabber and null renderer.
by Zebediah Figura March 8, 2020

March 8, 2020

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/main.c | 77 +++++++++++++++++++++++++++++++++++++- dlls/qedit/qedit_private.h | 3 +- dlls/quartz/regsvr.c | 12 ------ 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a271f9adb79..3797d96dcf3 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -192,12 +192,71 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } +static const REGPINTYPES reg_null_mt = {&GUID_NULL, &GUID_NULL}; + +static const REGFILTERPINS2 reg_sample_grabber_pins[2] = +{ + { + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, +}; + +static const REGFILTER2 reg_sample_grabber = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 2, + .u.s2.rgPins2 = reg_sample_grabber_pins, +}; + +static const REGFILTERPINS2 reg_null_renderer_pins[1] = +{ + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, +}; + +static const REGFILTER2 reg_null_renderer = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 1, + .u.s2.rgPins2 = reg_null_renderer_pins, +}; + /*********************************************************************** * DllRegisterServer (QEDIT.@) */ HRESULT WINAPI DllRegisterServer(void) { - return __wine_register_resources( instance ); + IFilterMapper2 *mapper; + HRESULT hr; + + if (FAILED(hr = __wine_register_resources( instance ))) + return hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **)&mapper))) + return hr; + + IFilterMapper2_RegisterFilter(mapper, &CLSID_SampleGrabber, L"SampleGrabber", + NULL, NULL, NULL, &reg_sample_grabber); + IFilterMapper2_RegisterFilter(mapper, &CLSID_NullRenderer, L"Null Renderer", + NULL, NULL, NULL, &reg_null_renderer); + + IFilterMapper2_Release(mapper); + return S_OK; } /*********************************************************************** @@ -205,5 +264,19 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return __wine_unregister_resources( instance ); + IFilterMapper2 *mapper; + HRESULT hr; + + if (FAILED(hr = __wine_unregister_resources( instance ))) + return hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **)&mapper))) + return hr; + + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_SampleGrabber); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_NullRenderer); + + IFilterMapper2_Release(mapper); + return S_OK; } diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 344656d7d87..96f21bcb3ba 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -23,7 +23,8 @@ #include <stdarg.h> #define COBJMACROS - +#define NONAMELESSSTRUCT +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wtypes.h" diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index ff5db662f04..7196f79a54c 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -174,18 +174,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) */ static struct regsvr_filter const filter_list[] = { - { &CLSID_NullRenderer, - &CLSID_LegacyAmFilterCategory, - L"Null Renderer", - 0x200000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_NULL, &GUID_NULL }, - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_VideoRenderer, &CLSID_LegacyAmFilterCategory, L"Video Renderer", -- 2.25.1

1 4

[PATCH v2 1/3] setupapi: Implement SetupDiGetSelectedDriver().
by Zebediah Figura March 8, 2020

March 8, 2020

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: perform W -> A translation only on success; thanks Zhiyi. dlls/setupapi/devinst.c | 90 +++++++++++++++++++++++++---------- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/devinst.c | 14 ++++++ 3 files changed, 82 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 268965f0fed..ce7268a5e80 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4645,16 +4645,42 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +static BOOL copy_driver_data(SP_DRVINFO_DATA_W *data, const struct driver *driver) +{ + INFCONTEXT ctx; + HINF hinf; + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + data->ProviderName[0] = 0; + if (SetupFindFirstLineW(hinf, L"Version", L"Provider", &ctx)) + SetupGetStringFieldW(&ctx, 1, data->ProviderName, ARRAY_SIZE(data->ProviderName), NULL); + wcscpy(data->Description, driver->description); + wcscpy(data->MfgName, driver->manufacturer); + data->DriverType = SPDIT_COMPATDRIVER; + + SetupCloseInfFile(hinf); + + return TRUE; +} + +static void driver_data_wtoa(SP_DRVINFO_DATA_A *a, const SP_DRVINFO_DATA_W *w) +{ + a->DriverType = w->DriverType; + a->Reserved = w->Reserved; + WideCharToMultiByte(CP_ACP, 0, w->Description, -1, a->Description, sizeof(a->Description), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->MfgName, -1, a->MfgName, sizeof(a->MfgName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->ProviderName, -1, a->ProviderName, sizeof(a->ProviderName), NULL, NULL); +} + /*********************************************************************** * SetupDiEnumDriverInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type, DWORD index, SP_DRVINFO_DATA_W *driver_data) { - static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; struct device *device; - INFCONTEXT ctx; - HINF hinf; TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n", devinfo, device_data, type, index, driver_data); @@ -4675,19 +4701,7 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat return FALSE; } - if ((hinf = SetupOpenInfFileW(device->drivers[index].inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) - return FALSE; - - driver_data->ProviderName[0] = 0; - if (SetupFindFirstLineW(hinf, Version, providerW, &ctx)) - SetupGetStringFieldW(&ctx, 1, driver_data->ProviderName, ARRAY_SIZE(driver_data->ProviderName), NULL); - lstrcpyW(driver_data->Description, device->drivers[index].description); - lstrcpyW(driver_data->MfgName, device->drivers[index].manufacturer); - driver_data->DriverType = SPDIT_COMPATDRIVER; - - SetupCloseInfFile(hinf); - - return TRUE; + return copy_driver_data(driver_data, &device->drivers[index]); } /*********************************************************************** @@ -4701,14 +4715,7 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat driver_dataW.cbSize = sizeof(driver_dataW); ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); - driver_data->DriverType = driver_dataW.DriverType; - driver_data->Reserved = driver_dataW.Reserved; - WideCharToMultiByte(CP_ACP, 0, driver_dataW.Description, -1, driver_data->Description, - sizeof(driver_data->Description), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.MfgName, -1, driver_data->MfgName, - sizeof(driver_data->MfgName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.ProviderName, -1, driver_data->ProviderName, - sizeof(driver_data->ProviderName), NULL, NULL); + driver_data_wtoa(driver_data, &driver_dataW); return ret; } @@ -4738,6 +4745,41 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +/*********************************************************************** + * SetupDiGetSelectedDriverW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_W *driver_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, driver_data %p.\n", devinfo, device_data, driver_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!device->selected_driver) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + return copy_driver_data(driver_data, device->selected_driver); +} + +/*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_A *driver_data) +{ + SP_DRVINFO_DATA_W driver_dataW; + BOOL ret; + + driver_dataW.cbSize = sizeof(driver_dataW); + if ((ret = SetupDiGetSelectedDriverW(devinfo, device_data, &driver_dataW))) + driver_data_wtoa(driver_data, &driver_dataW); + return ret; +} + /*********************************************************************** * SetupDiInstallDriverFiles (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 33ccc480974..233a02e550c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -361,8 +361,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a9ac0d849f6..9eed8e73d87 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2434,6 +2434,20 @@ static void test_driver_list(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_NO_DRIVER_SELECTED, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiSelectBestCompatDrv(set, &device); + ok(ret, "Failed to select driver, error %#x.\n", GetLastError()); + + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret, "Failed to get selected driver, error %#x.\n", GetLastError()); + ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); + ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); + ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName); + SetupDiDestroyDeviceInfoList(set); ret = DeleteFileA(inf_path); ok(ret, "Failed to delete %s, error %u.\n", inf_path, GetLastError()); -- 2.25.1

2 4