April 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : ntoskrnl/tests: Test child device enumeration.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 5e63c849b4f4a4198955cc80b50efc32e5877ea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e63c849b4f4a4198955cc80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:15 2021 -0500 ntoskrnl/tests: Test child device enumeration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 4 +- dlls/ntoskrnl.exe/tests/Makefile.in | 2 +- dlls/ntoskrnl.exe/tests/driver.h | 4 + dlls/ntoskrnl.exe/tests/driver_pnp.c | 295 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 131 +++++++++++++++- include/cfgmgr32.h | 12 ++ include/ddk/wdm.h | 6 +- 7 files changed, 447 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e63c849b4f4a4198955…

1 0

Nikolay Sivov : mf/topology: Copy input topology attributes on Load().
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: b75301b471a77bc2aab548163880bd5ace430cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75301b471a77bc2aab54816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:51 2021 +0300 mf/topology: Copy input topology attributes on Load(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 4 ++++ dlls/mf/topology.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index df286db6385..458da0cb275 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2109,9 +2109,13 @@ todo_wine { IMFTopologyNode_Release(sink_node2); + hr = IMFTopology_SetUINT32(full_topology, &IID_IMFTopology, 123); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology2, "Unexpected instance.\n"); + hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFTopology_Release(topology2); IMFTopology_Release(full_topology); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 58639a67bdb..bbed2cba893 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2567,6 +2567,8 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (FAILED(hr = MFCreateTopology(&output_topology))) return hr; + IMFTopology_CopyAllItems(input_topology, (IMFAttributes *)output_topology); + context.input_topology = input_topology; context.output_topology = output_topology; memset(&context.key, 0xff, sizeof(context.key));

1 0

Gijs Vermeulen : jscript: Remove unreachable statement in disp_call_value().
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 9268407bc69c10278ab515fcce4eec9e10c60b93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9268407bc69c10278ab515fc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 12 00:35:24 2021 +0200 jscript: Remove unreachable statement in disp_call_value(). Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49277 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 188de659c4a..67b7cfad005 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2094,8 +2094,6 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp && jsdisp->ctx == ctx) { - if(ctx != jsdisp->ctx) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); jsdisp_release(jsdisp); return hres;

1 0

Anton Baskanov : winegstreamer: Add missing RGB16 format to wg_video_format_from_gst.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: d57d8bbc3558870a8f52c379c3de2b05ccd7dd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d57d8bbc3558870a8f52c379… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Apr 11 18:08:31 2021 +0700 winegstreamer: Add missing RGB16 format to wg_video_format_from_gst. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e0eff9ee309..5529321490e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -192,6 +192,8 @@ static enum wg_video_format wg_video_format_from_gst(GstVideoFormat format) return WG_VIDEO_FORMAT_BGR; case GST_VIDEO_FORMAT_RGB15: return WG_VIDEO_FORMAT_RGB15; + case GST_VIDEO_FORMAT_RGB16: + return WG_VIDEO_FORMAT_RGB16; case GST_VIDEO_FORMAT_AYUV: return WG_VIDEO_FORMAT_AYUV; case GST_VIDEO_FORMAT_I420:

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::EndOfStream.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: eea53b3c400db5f66de95d1f6c526233bc036ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea53b3c400db5f66de95d1f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Apr 11 14:35:28 2021 +0700 amstream: Implement MediaStreamFilter::EndOfStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 42 ++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 72 +++++++++++++++++++++--------------------- 2 files changed, 76 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eea53b3c400db5f66de9…

1 0

Esme Povirk : kernel32: Add stub for GetMaximumProcessorGroupCount.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 773161f84b9e413e74b6bea750ca5e35b0549941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773161f84b9e413e74b6bea7… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Apr 9 15:05:29 2021 -0500 kernel32: Add stub for GetMaximumProcessorGroupCount. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- .../api-ms-win-downlevel-kernel32-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec index e653ac6d212..b6af37ab0aa 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec @@ -21,7 +21,7 @@ @ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx -@ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 4998af04d9b..5ce8e24713b 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -26,7 +26,7 @@ @ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW @ stub GetFirmwareType -@ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx diff --git a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec index 750badec24b..042bb066b9e 100644 --- a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec @@ -33,7 +33,7 @@ @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) kernel32.GetFirmwareEnvironmentVariableW -@ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0312e044a86..06f524a8080 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -719,7 +719,7 @@ @ stdcall -import GetLongPathNameW(wstr ptr long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @ stdcall GetMaximumProcessorCount(long) -# @ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() @ stdcall -import GetModuleFileNameA(long ptr long) @ stdcall -import GetModuleFileNameW(long ptr long) @ stdcall -import GetModuleHandleA(str) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 41a5b34af19..f07a997bea3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -635,6 +635,15 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) return cpus; } +/*********************************************************************** + * GetMaximumProcessorGroupCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorGroupCount(void) +{ + FIXME("semi-stub, always returning 1\n"); + return 1; +} + /*********************************************************************** * GetFirmwareEnvironmentVariableA (KERNEL32.@) */

1 0

Zebediah Figura : ntoskrnl: Do not send power IRPs on device start and removal.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 94037f90a01a489d404ebfe80e5b1ce2263453d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94037f90a01a489d404ebfe8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:18 2021 -0500 ntoskrnl: Do not send power IRPs on device start and removal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index f8dc8c31935..0d9d816e3c0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -141,30 +141,6 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer ) return STATUS_SUCCESS; } -static void send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) -{ - IO_STATUS_BLOCK irp_status; - IO_STACK_LOCATION *irpsp; - KEVENT event; - IRP *irp; - - device = IoGetAttachedDevice( device ); - - KeInitializeEvent( &event, NotificationEvent, FALSE ); - if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, &event, &irp_status ))) - return; - - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->MinorFunction = IRP_MN_SET_POWER; - - irpsp->Parameters.Power.Type = DevicePowerState; - irpsp->Parameters.Power.State.DeviceState = power; - - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; - if (IoCallDriver( device, irp ) == STATUS_PENDING) - KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); -} - static NTSTATUS get_device_caps( DEVICE_OBJECT *device, DEVICE_CAPABILITIES *caps ) { IO_STACK_LOCATION *irpsp; @@ -317,10 +293,7 @@ static void start_device( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA * { load_function_driver( device, set, sp_device ); if (device->DriverObject) - { send_pnp_irp( device, IRP_MN_START_DEVICE ); - send_power_irp( device, PowerDeviceD0 ); - } } static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) @@ -384,7 +357,6 @@ static void remove_device( DEVICE_OBJECT *device ) remove_device( wine_device->children->Objects[i] ); } - send_power_irp( device, PowerDeviceD3 ); send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); }

1 0

Anton Baskanov : quartz: Use a separate critical section for events.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 86cbfa4bea7199ffa1507420b7f5b1f3c3a70a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86cbfa4bea7199ffa1507420… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Apr 10 11:45:35 2021 -0500 quartz: Use a separate critical section for events. This undoes dc836b85c1458c916c5ad3b86ff8df59ce634dd9. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a8c6cc3391c..825bef9e12e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -104,6 +104,11 @@ struct filter_graph IReferenceClock *refClock; IBaseFilter *refClockProvider; + /* We may indirectly wait for streaming threads while holding graph->cs in + * IMediaFilter::Stop() or IMediaSeeking::SetPositions(). Since streaming + * threads call IMediaEventSink::Notify() to queue EC_COMPLETE, we must + * use a separate lock to avoid them deadlocking on graph->cs. */ + CRITICAL_SECTION event_cs; struct list media_events; HANDLE media_event_handle; HWND media_event_window; @@ -116,6 +121,8 @@ struct filter_graph int HandleEcComplete; int HandleEcRepaint; int HandleEcClockChanged; + unsigned int got_ec_complete : 1; + unsigned int media_events_disabled : 1; CRITICAL_SECTION cs; ITF_CACHE_ENTRY ItfCacheEntries[MAX_ITF_CACHE_ENTRIES]; @@ -135,8 +142,6 @@ struct filter_graph LONGLONG current_pos; unsigned int needs_async_run : 1; - unsigned int got_ec_complete : 1; - unsigned int media_events_disabled : 1; }; struct enum_filters @@ -467,6 +472,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->message_thread); CloseHandle(This->message_thread_ret); } + DeleteCriticalSection(&This->event_cs); DeleteCriticalSection(&This->cs); free(This); @@ -1695,8 +1701,10 @@ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_sta struct filter *filter; HRESULT hr = S_OK; + EnterCriticalSection(&graph->event_cs); graph->EcCompleteCount = 0; update_render_count(graph); + LeaveCriticalSection(&graph->event_cs); LIST_FOR_EACH_ENTRY_SAFE(event, next, &graph->media_events, struct media_event, entry) { @@ -1813,7 +1821,10 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) } sort_filters(graph); + + EnterCriticalSection(&graph->event_cs); update_render_count(graph); + LeaveCriticalSection(&graph->event_cs); if (graph->state == State_Stopped) { @@ -4752,12 +4763,12 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, if (WaitForSingleObject(graph->media_event_handle, timeout)) return E_ABORT; - EnterCriticalSection(&graph->cs); + EnterCriticalSection(&graph->event_cs); if (!(entry = list_head(&graph->media_events))) { ResetEvent(graph->media_event_handle); - LeaveCriticalSection(&graph->cs); + LeaveCriticalSection(&graph->event_cs); return E_ABORT; } event = LIST_ENTRY(entry, struct media_event, entry); @@ -4767,7 +4778,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, *param2 = event->param2; free(event); - LeaveCriticalSection(&graph->cs); + LeaveCriticalSection(&graph->event_cs); return S_OK; } @@ -5015,7 +5026,10 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) } sort_filters(graph); + + EnterCriticalSection(&graph->event_cs); update_render_count(graph); + LeaveCriticalSection(&graph->event_cs); if (graph->defaultclock && !graph->refClock) IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); @@ -5261,7 +5275,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, TRACE("graph %p, code %#x, param1 %#Ix, param2 %#Ix.\n", graph, code, param1, param2); - EnterCriticalSection(&graph->cs); + EnterCriticalSection(&graph->event_cs); if (code == EC_COMPLETE && graph->HandleEcComplete) { @@ -5285,7 +5299,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, queue_media_event(graph, code, param1, param2); } - LeaveCriticalSection(&graph->cs); + LeaveCriticalSection(&graph->event_cs); return S_OK; } @@ -5591,6 +5605,8 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": filter_graph.cs"); + InitializeCriticalSection(&object->event_cs); + object->event_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": filter_graph.event_cs"); object->defaultclock = TRUE;

1 0

Alexandre Julliard : wine.inf: Also install start.exe in syswow64.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: ee13ab0f022f1b89cdc0e6f36ac55a5fb151d6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee13ab0f022f1b89cdc0e6f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:20:16 2021 +0200 wine.inf: Also install start.exe in syswow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50867 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 45ba4fabfa1..d699bd1e4f3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2608,6 +2608,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd +11,,start.exe 11,,winhlp32.exe 52,win40\0,wineps16.drv,wineps16.drv16 @@ -2674,7 +2675,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,explorer.exe 11,,iexplore.exe 11,,notepad.exe -11,,start.exe 11,,winetest.exe,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,-

1 0

Alexandre Julliard : ntdll: Cleanup the path with collapse_path() in unix_to_nt_file_name().
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: cdb1f3ae55f37318e99590b5f5ae8917ce826bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb1f3ae55f37318e99590b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 10:27:53 2021 +0200 ntdll: Cleanup the path with collapse_path() in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 116 ++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 9ee5e84ee43..0ba0ee7b586 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3431,64 +3431,6 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nam } -/****************************************************************** - * unix_to_nt_file_name - */ -NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) -{ - static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0}; - WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0}; - const WCHAR *prefix = unix_prefixW; - unsigned int lenW, lenA = strlen(name); - const char *path = name; - NTSTATUS status; - WCHAR *p, *buffer; - int drive; - - status = find_drive_rootA( &path, lenA, &drive ); - lenA -= path - name; - - if (status == STATUS_SUCCESS) - { - while (lenA && path[0] == '/') { lenA--; path++; } - dos_prefixW[4] += drive; - prefix = dos_prefixW; - } - else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; - - lenW = wcslen( prefix ); - if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); - lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); - buffer[lenW] = 0; - for (p = buffer; *p; p++) if (*p == '/') *p = '\\'; - *nt = buffer; - return STATUS_SUCCESS; -} - - -/****************************************************************** - * wine_unix_to_nt_file_name - */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) -{ - WCHAR *nt_name = NULL; - NTSTATUS status; - - if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ - - status = unix_to_nt_file_name( name, &nt_name ); - if (nt_name) - { - if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); - else status = STATUS_BUFFER_TOO_SMALL; - *size = wcslen(nt_name) + 1; - free( nt_name ); - } - return status; -} - - /****************************************************************** * collapse_path * @@ -3567,7 +3509,63 @@ static void collapse_path( WCHAR *path ) } -#define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') +/****************************************************************** + * unix_to_nt_file_name + */ +NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) +{ + static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0}; + WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0}; + const WCHAR *prefix = unix_prefixW; + unsigned int lenW, lenA = strlen(name); + const char *path = name; + NTSTATUS status; + WCHAR *buffer; + int drive; + + status = find_drive_rootA( &path, lenA, &drive ); + lenA -= path - name; + + if (status == STATUS_SUCCESS) + { + while (lenA && path[0] == '/') { lenA--; path++; } + dos_prefixW[4] += drive; + prefix = dos_prefixW; + } + else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; + + lenW = wcslen( prefix ); + if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; + memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); + lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); + buffer[lenW] = 0; + collapse_path( buffer ); + *nt = buffer; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * wine_unix_to_nt_file_name + */ +NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) +{ + WCHAR *nt_name = NULL; + NTSTATUS status; + + if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ + + status = unix_to_nt_file_name( name, &nt_name ); + if (nt_name) + { + if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); + else status = STATUS_BUFFER_TOO_SMALL; + *size = wcslen(nt_name) + 1; + free( nt_name ); + } + return status; +} + /*********************************************************************** * get_full_path

1 0