June 2020 - Wine-devel - list.winehq.org

[PATCH] winex11.drv: Ensure output IDs are unique for mirrored displays.
by Brendan Shanks 03 Jun '20

03 Jun '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winex11.drv/display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index cf661f9f06f..4acd7299624 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -484,7 +484,7 @@ done: } static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, - int video_index, const LUID *gpu_luid) + int video_index, const LUID *gpu_luid, UINT output_id) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR bufferW[MAX_PATH]; @@ -509,7 +509,7 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, - DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; /* Create driver key */ @@ -614,6 +614,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; LUID gpu_luid; + UINT output_id = 0; mutex = get_display_device_init_mutex(); @@ -664,7 +665,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); - if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid, output_id++)) goto done; } -- 2.26.2

1 0

[PATCH v3 01/11] netio.sys: Add driver stub.
by Paul Gofman 02 Jun '20

02 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - add stubs for all natively exported functions (taken from Windows 7 netio.sys version). configure.ac | 1 + dlls/netio.sys/Makefile.in | 7 + dlls/netio.sys/netio.c | 48 +++++ dlls/netio.sys/netio.sys.spec | 391 ++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 5 files changed, 449 insertions(+) create mode 100644 dlls/netio.sys/Makefile.in create mode 100644 dlls/netio.sys/netio.c create mode 100644 dlls/netio.sys/netio.sys.spec diff --git a/configure.ac b/configure.ac index 83c451e0870..33a8a9a2888 100644 --- a/configure.ac +++ b/configure.ac @@ -3552,6 +3552,7 @@ WINE_CONFIG_MAKEFILE(dlls/netapi32) WINE_CONFIG_MAKEFILE(dlls/netapi32/tests) WINE_CONFIG_MAKEFILE(dlls/netcfgx) WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests) +WINE_CONFIG_MAKEFILE(dlls/netio.sys) WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/newdev) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in new file mode 100644 index 00000000000..76e541021a6 --- /dev/null +++ b/dlls/netio.sys/Makefile.in @@ -0,0 +1,7 @@ +MODULE = netio.sys +IMPORTLIB = netio +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native + +C_SRCS = \ + netio.c diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c new file mode 100644 index 00000000000..16bf47ca0a2 --- /dev/null +++ b/dlls/netio.sys/netio.c @@ -0,0 +1,48 @@ +/* + * WSK (Winsock Kernel) driver library. + * + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netio); + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + TRACE("driver %p.\n", driver); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + driver->DriverUnload = driver_unload; + return STATUS_SUCCESS; +} + diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec new file mode 100644 index 00000000000..a390f96674c --- /dev/null +++ b/dlls/netio.sys/netio.sys.spec @@ -0,0 +1,391 @@ +@ stub CancelMibChangeNotify2 +@ stub ConvertInterfaceAliasToLuid +@ stub ConvertInterfaceGuidToLuid +@ stub ConvertInterfaceIndexToLuid +@ stub ConvertInterfaceLuidToAlias +@ stub ConvertInterfaceLuidToGuid +@ stub ConvertInterfaceLuidToIndex +@ stub ConvertInterfaceLuidToNameA +@ stub ConvertInterfaceLuidToNameW +@ stub ConvertInterfaceNameToLuidA +@ stub ConvertInterfaceNameToLuidW +@ stub ConvertInterfacePhysicalAddressToLuid +@ stub ConvertStringToInterfacePhysicalAddress +@ stub CreateAnycastIpAddressEntry +@ stub CreateIpForwardEntry2 +@ stub CreateIpNetEntry2 +@ stub CreateSortedAddressPairs +@ stub CreateUnicastIpAddressEntry +@ stub DeleteAnycastIpAddressEntry +@ stub DeleteIpForwardEntry2 +@ stub DeleteIpNetEntry2 +@ stub DeleteUnicastIpAddressEntry +@ stub DllInitialize +@ stub DllUnload +@ stub FeAcquireClassifyHandle +@ stub FeAcquireWritableLayerDataPointer +@ stub FeApplyModifiedLayerData +@ stub FeCompleteClassify +@ stub FeGetWfpGlobalPtr +@ stub FePendClassify +@ stub FeReleaseCalloutContextList +@ stub FeReleaseClassifyHandle +@ stub FlushIpNetTable2 +@ stub FlushIpPathTable +@ stub FreeMibTable +@ stub FsbAllocate +@ stub FsbAllocateAtDpcLevel +@ stub FsbCreatePool +@ stub FsbDestroyPool +@ stub FsbFree +@ stub FwppAdvanceStreamDataPastOffset +@ stub FwppCopyStreamDataToBuffer +@ stub FwppStreamContinue +@ stub FwppStreamDeleteDpcQueue +@ stub FwppStreamInject +@ stub FwppTruncateStreamDataAfterOffset +@ stub GetAnycastIpAddressEntry +@ stub GetAnycastIpAddressTable +@ stub GetBestInterface +@ stub GetBestInterfaceEx +@ stub GetBestRoute2 +@ stub GetIfEntry2 +@ stub GetIfStackTable +@ stub GetIfTable2 +@ stub GetIfTable2Ex +@ stub GetInvertedIfStackTable +@ stub GetIpForwardEntry2 +@ stub GetIpForwardTable2 +@ stub GetIpInterfaceEntry +@ stub GetIpInterfaceTable +@ stub GetIpNetEntry2 +@ stub GetIpNetTable2 +@ stub GetIpPathEntry +@ stub GetIpPathTable +@ stub GetMulticastIpAddressEntry +@ stub GetMulticastIpAddressTable +@ stub GetTeredoPort +@ stub GetUnicastIpAddressEntry +@ stub GetUnicastIpAddressTable +@ stub HfAllocateHandle32 +@ stub HfCreateFactory +@ stub HfDestroyFactory +@ stub HfFreeHandle32 +@ stub HfGetPointerFromHandle32 +@ stub HfResumeHandle32 +@ stub HfSuspendHandle32 +@ stub if_indextoname +@ stub if_nametoindex +@ stub InitializeIpForwardEntry +@ stub InitializeIpInterfaceEntry +@ stub InitializeUnicastIpAddressEntry +@ stub InternalCleanupPersistentStore +@ stub InternalCreateAnycastIpAddressEntry +@ stub InternalCreateIpForwardEntry2 +@ stub InternalCreateIpNetEntry2 +@ stub InternalCreateUnicastIpAddressEntry +@ stub InternalDeleteAnycastIpAddressEntry +@ stub InternalDeleteIpForwardEntry2 +@ stub InternalDeleteIpNetEntry2 +@ stub InternalDeleteUnicastIpAddressEntry +@ stub InternalFindInterfaceByAddress +@ stub InternalGetAnycastIpAddressEntry +@ stub InternalGetAnycastIpAddressTable +@ stub InternalGetForwardIpTable2 +@ stub InternalGetIfEntry2 +@ stub InternalGetIfTable2 +@ stub InternalGetIpForwardEntry2 +@ stub InternalGetIpInterfaceEntry +@ stub InternalGetIpInterfaceTable +@ stub InternalGetIpNetEntry2 +@ stub InternalGetIpNetTable2 +@ stub InternalGetMulticastIpAddressEntry +@ stub InternalGetMulticastIpAddressTable +@ stub InternalGetUnicastIpAddressEntry +@ stub InternalGetUnicastIpAddressTable +@ stub InternalSetIpForwardEntry2 +@ stub InternalSetIpInterfaceEntry +@ stub InternalSetIpNetEntry2 +@ stub InternalSetTeredoPort +@ stub InternalSetUnicastIpAddressEntry +@ stub IoctlKfdAbortTransaction +@ stub IoctlKfdAddCache +@ stub IoctlKfdAddIndex +@ stub IoctlKfdBatchUpdate +@ stub IoctlKfdBeginEnumFilters +@ stub IoctlKfdCommitTransaction +@ stub IoctlKfdDeleteCache +@ stub IoctlKfdDeleteIndex +@ stub IoctlKfdEndEnumFilters +@ stub IoctlKfdMoveFilter +@ stub IoctlKfdQueryEnumFilters +@ stub IoctlKfdQueryLayerStatistics +@ stub IoctlKfdResetState +@ stub KfdAddCalloutEntry +@ stub KfdAleAcquireFlowHandleForFlow +@ stub KfdAleGetTableFromHandle +@ stub KfdAleInitializeFlowHandles +@ stub KfdAleInitializeFlowTable +@ stub KfdAleNotifyFlowDeletion +@ stub KfdAleReleaseFlowHandleForFlow +@ stub KfdAleRemoveFlowContextTable +@ stub KfdAleUninitializeFlowHandles +@ stub KfdAleUpdateEndpointContextStatus +@ stub KfdCheckAcceptBypass +@ stub KfdCheckAndCacheAcceptBypass +@ stub KfdCheckAndCacheConnectBypass +@ stub KfdCheckClassifyNeededAndUpdateEpoch +@ stub KfdCheckConnectBypass +@ stub KfdClassify +@ stub KfdDeleteCalloutEntry +@ stub KfdDeRefCallout +@ stub KfdDerefFilterContext +@ stub KfdDeregisterLayerChangeCallback +@ stub KfdDeregisterLayerChangeCallback2 +@ stub KfdEnumLayer +@ stub KfdFreeEnumHandle +@ stub KfdGetLayerActionFromEnumTemplate +@ stub KfdGetLayerCacheEpoch +@ stub KfdGetNextFilter +@ stub KfdGetOffloadEpoch +@ stub KfdGetRefCallout +@ stub KfdIsActiveCallout +@ stub KfdIsLayerEmpty +@ stub KfdIsLsoOffloadPossibleV4 +@ stub KfdIsLsoOffloadPossibleV6 +@ stub KfdIsV4InTransportFastEmpty +@ stub KfdIsV4OutTransportFastEmpty +@ stub KfdIsV6InTransportFastEmpty +@ stub KfdIsV6OutTransportFastEmpty +@ stub KfdNotifyFlowDeletion +@ stub KfdQueryLayerStats +@ stub KfdRegisterLayerChangeCallback +@ stub KfdRegisterLayerChangeCallback2 +@ stub KfdToggleFilterActivation +@ stub MatchCondition +@ stub MdpAllocate +@ stub MdpAllocateAtDpcLevel +@ stub MdpCreatePool +@ stub MdpDestroyPool +@ stub MdpFree +@ stub NetioAdvanceNetBufferList +@ stub NetioAdvanceToLocationInNetBuffer +@ stub NetioAllocateAndInitializeStackBlock +@ stub NetioAllocateAndReferenceCloneNetBufferList +@ stub NetioAllocateAndReferenceCloneNetBufferListEx +@ stub NetioAllocateAndReferenceCopyNetBufferListEx +@ stub NetioAllocateAndReferenceFragmentNetBufferList +@ stub NetioAllocateAndReferenceNetBufferAndNetBufferList +@ stub NetioAllocateAndReferenceNetBufferList +@ stub NetioAllocateAndReferenceNetBufferListNetBufferMdlAndData +@ stub NetioAllocateAndReferenceReassembledNetBufferList +@ stub NetioAllocateAndReferenceVacantNetBufferList +@ stub NetioAllocateMdl +@ stub NetioAllocateNetBuffer +@ stub NetioAllocateNetBufferListNetBufferMdlAndDataPool +@ stub NetioAllocateNetBufferMdlAndData +@ stub NetioAllocateNetBufferMdlAndDataPool +@ stub NetioAllocateOpaquePerProcessorContext +@ stub NetioAssociateQoSFlowWithNbl +@ stub NetioCleanupNetBufferListInformation +@ stub NetioCompleteCloneNetBufferListChain +@ stub NetioCompleteCopyNetBufferListChain +@ stub NetioCompleteNetBufferAndNetBufferListChain +@ stub NetioCompleteNetBufferListChain +@ stub NetioCopyNetBufferListInformation +@ stub NetioCreateQoSFlow +@ stub NetioDeleteQoSFlow +@ stub NetioDereferenceNetBufferList +@ stub NetioDereferenceNetBufferListChain +@ stub NetioExpandNetBuffer +@ stub NetioExtendNetBuffer +@ stub NetioFreeCloneNetBufferList +@ stub NetioFreeCopyNetBufferList +@ stub NetioFreeMdl +@ stub NetioFreeNetBuffer +@ stub NetioFreeNetBufferAndNetBufferList +@ stub NetioFreeNetBufferList +@ stub NetioFreeNetBufferListNetBufferMdlAndDataPool +@ stub NetioFreeNetBufferMdlAndDataPool +@ stub NetioFreeOpaquePerProcessorContext +@ stub NetioFreeStackBlock +@ stub NetioGetStatsForQoSFlow +@ stub NetioInitializeMdl +@ stub NetioInitializeNetBufferListAndFirstNetBufferContext +@ stub NetioInitializeNetBufferListContext +@ stub NetioInitializeNetBufferListContextPrimitive +@ stub NetioInitializeNetBufferListLibrary +@ stub NetioInitializeWorkQueue +@ stub NetioInsertWorkQueue +@ stub NetioQueryNetBufferListTrafficClass +@ stub NetioReferenceNetBufferList +@ stub NetioReferenceNetBufferListChain +@ stub NetioRegisterProcessorAddCallback +@ stub NetioRegSyncDefaultChangeHandler +@ stub NetioRegSyncInterface +@ stub NetioRegSyncQueryAndUpdateKeyValue +@ stub NetioRetreatNetBuffer +@ stub NetioRetreatNetBufferList +@ stub NetioShutdownWorkQueue +@ stub NetioSqmInitialize +@ stub NetioSqmTerminate +@ stub NetioSqmWriteEvent +@ stub NetioStackBlockProcessorAddHandler +@ stub NetioUnInitializeNetBufferListLibrary +@ stub NetioUnRegisterProcessorAddCallback +@ stub NetioUpdateNetBufferListContext +@ stub NetioValidateNetBuffer +@ stub NetioValidateNetBufferList +@ stub NmrClientAttachProvider +@ stub NmrClientDetachProviderComplete +@ stub NmrDeregisterClient +@ stub NmrDeregisterProvider +@ stub NmrProviderDetachClientComplete +@ stub NmrRegisterClient +@ stub NmrRegisterProvider +@ stub NmrWaitForClientDeregisterComplete +@ stub NmrWaitForProviderDeregisterComplete +@ stub NotifyIpInterfaceChange +@ stub NotifyRouteChange2 +@ stub NotifyStableUnicastIpAddressTable +@ stub NotifyTeredoPortChange +@ stub NotifyUnicastIpAddressChange +@ stub NsiAllocateAndGetTable +@ stub NsiClearPersistentSetting +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiDeregisterLegacyHandler +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiGetModuleHandle +@ stub NsiGetObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiReferenceDefaultObjectSecurity +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRegisterLegacyHandler +@ stub NsiResetPersistentSetting +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx +@ stub PtCheckTable +@ stub PtCreateTable +@ stub PtDeleteEntry +@ stub PtDestroyTable +@ stub PtEnumOverTable +@ stub PtGetData +@ stub PtGetExactMatch +@ stub PtGetKey +@ stub PtGetLongestMatch +@ stub PtGetNextShorterMatch +@ stub PtGetNumNodes +@ stub PtInsertEntry +@ stub PtSetData +@ stub ResolveIpNetEntry2 +@ stub RtlAllocateDummyMdlChain +@ stub RtlCleanupTimerWheel +@ stub RtlCleanupTimerWheelEntry +@ stub RtlCleanupToeplitzHash +@ stub RtlCompute37Hash +@ stub RtlComputeToeplitzHash +@ stub RtlCopyBufferToMdl +@ stub RtlCopyMdlToBuffer +@ stub RtlCopyMdlToMdl +@ stub RtlCopyMdlToMdlIndirect +@ stub RtlDeleteElementGenericTableBasicAvl +@ stub RtlEndTimerWheelEnumeration +@ stub RtlEnumerateNextTimerWheelEntry +@ stub RtlFreeDummyMdlChain +@ stub RtlGetNextExpirationTimerWheelTick +@ stub RtlGetNextExpiredTimerWheelEntry +@ stub RtlIndicateTimerWheelEntryTimerStart +@ stub RtlInitializeTimerWheel +@ stub RtlInitializeTimerWheelEntry +@ stub RtlInitializeTimerWheelEnumeration +@ stub RtlInitializeToeplitzHash +@ stub RtlInsertElementGenericTableBasicAvl +@ stub RtlInvalidateExpiredTimerWheelEntryTimers +@ stub RtlInvokeStartRoutines +@ stub RtlInvokeStopRoutines +@ stub RtlIsTimerWheelSuspended +@ stub RtlResumeTimerWheel +@ stub RtlReturnTimerWheelEntry +@ stub RtlSuspendTimerWheel +@ stub RtlUpdateCurrentTimerWheelTick +@ stub SetIpForwardEntry2 +@ stub SetIpInterfaceEntry +@ stub SetIpNetEntry2 +@ stub SetUnicastIpAddressEntry +@ stub SetWfpDeviceObject +@ stub TlDefaultEventAbort +@ stub TlDefaultEventConnect +@ stub TlDefaultEventDisconnect +@ stub TlDefaultEventError +@ stub TlDefaultEventInspect +@ stub TlDefaultEventNotify +@ stub TlDefaultEventReceive +@ stub TlDefaultEventReceiveMessages +@ stub TlDefaultEventSendBacklog +@ stub TlDefaultRequestCancel +@ stub TlDefaultRequestCloseEndpoint +@ stub TlDefaultRequestConnect +@ stub TlDefaultRequestDisconnect +@ stub TlDefaultRequestEndpoint +@ stub TlDefaultRequestIoControl +@ stub TlDefaultRequestIoControlEndpoint +@ stub TlDefaultRequestListen +@ stub TlDefaultRequestMessage +@ stub TlDefaultRequestQueryDispatch +@ stub TlDefaultRequestQueryDispatchEndpoint +@ stub TlDefaultRequestReceive +@ stub TlDefaultRequestReleaseIndicationList +@ stub TlDefaultRequestResume +@ stub TlDefaultRequestSend +@ stub TlDefaultRequestSendMessages +@ stub WfpAssociateContextToFlow +@ stub WfpDeleteEntryLru +@ stub WfpExpireEntryLru +@ stub WfpGetPacketTagCount +@ stub WfpInitializeLeastRecentlyUsedList +@ stub WfpInsertEntryLru +@ stub WfpMacInboundShim +@ stub WfpMacOutboundShim +@ stub WfpNblInfoAlloc +@ stub WfpNblInfoCleanup +@ stub WfpNblInfoClone +@ stub WfpNblInfoDestroyIfUnused +@ stub WfpNblInfoDispatchTableClear +@ stub WfpNblInfoDispatchTableSet +@ stub WfpNblInfoGet +@ stub WfpNblInfoInit +@ stub WfpNblInfoSet +@ stub WfpPacketTagCountIncrement +@ stub WfpProcessFlowDelete +@ stub WfpRefreshEntryLru +@ stub WfpRemoveContextFromFlow +@ stub WfpScavangeLeastRecentlyUsedList +@ stub WfpSetBucketsToEmptyLru +@ stub WfpStartMacShim +@ stub WfpStartStreamShim +@ stub WfpStopStreamShim +@ stub WfpStreamEndpointCleanupBegin +@ stub WfpStreamInspectDisconnect +@ stub WfpStreamInspectReceive +@ stub WfpStreamInspectRemoteDisconnect +@ stub WfpStreamInspectSend +@ stub WfpStreamIsFilterPresent +@ stub WfpUninitializeLeastRecentlyUsedList +@ stub WskCaptureProviderNPI +@ stub WskDeregister +@ stub WskQueryProviderCharacteristics +@ stub WskRegister +@ stub WskReleaseProviderNPI diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0a43cc779cb..de0dd4e4554 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2617,6 +2617,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,netio.sys,- 12,,scsiport.sys,- 12,,tdi.sys,- 12,,usbd.sys,- @@ -2673,6 +2674,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys +12,,netio.sys 12,,scsiport.sys 12,,tdi.sys 12,,usbd.sys -- 2.26.2

2 11

[PATCH v2 01/11] netio.sys: Add driver stub.
by Paul Gofman 02 Jun '20

02 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- configure.ac | 1 + dlls/netio.sys/Makefile.in | 7 +++++ dlls/netio.sys/netio.c | 48 +++++++++++++++++++++++++++++++++++ dlls/netio.sys/netio.sys.spec | 1 + loader/wine.inf.in | 2 ++ 5 files changed, 59 insertions(+) create mode 100644 dlls/netio.sys/Makefile.in create mode 100644 dlls/netio.sys/netio.c create mode 100644 dlls/netio.sys/netio.sys.spec diff --git a/configure.ac b/configure.ac index 83c451e0870..33a8a9a2888 100644 --- a/configure.ac +++ b/configure.ac @@ -3552,6 +3552,7 @@ WINE_CONFIG_MAKEFILE(dlls/netapi32) WINE_CONFIG_MAKEFILE(dlls/netapi32/tests) WINE_CONFIG_MAKEFILE(dlls/netcfgx) WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests) +WINE_CONFIG_MAKEFILE(dlls/netio.sys) WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/newdev) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in new file mode 100644 index 00000000000..76e541021a6 --- /dev/null +++ b/dlls/netio.sys/Makefile.in @@ -0,0 +1,7 @@ +MODULE = netio.sys +IMPORTLIB = netio +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native + +C_SRCS = \ + netio.c diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c new file mode 100644 index 00000000000..16bf47ca0a2 --- /dev/null +++ b/dlls/netio.sys/netio.c @@ -0,0 +1,48 @@ +/* + * WSK (Winsock Kernel) driver library. + * + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netio); + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + TRACE("driver %p.\n", driver); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + driver->DriverUnload = driver_unload; + return STATUS_SUCCESS; +} + diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec new file mode 100644 index 00000000000..792d6005489 --- /dev/null +++ b/dlls/netio.sys/netio.sys.spec @@ -0,0 +1 @@ +# diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0a43cc779cb..de0dd4e4554 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2617,6 +2617,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,netio.sys,- 12,,scsiport.sys,- 12,,tdi.sys,- 12,,usbd.sys,- @@ -2673,6 +2674,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys +12,,netio.sys 12,,scsiport.sys 12,,tdi.sys 12,,usbd.sys -- 2.26.2

2 15

How to install new typelibs on multilib
by Michael Cronenworth 02 Jun '20

02 Jun '20

Wine 5.9 installed typelibs for the first time in /usr/include: oleacc.tlb, stdole2.tlb, and stdole32.tlb Are these meant to be shipped there? I cannot find the commit that did this. They're arch specific so how do 32-bit and 64-bit users install them at the same time? Thanks, Michael

2 4

[PATCH] ntdll: Add support for FileFsFullSizeInformation class in NtQueryVolumeInformationFile
by Alistair Leslie-Hughes 02 Jun '20

02 Jun '20

From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/file.c | 54 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/file.c | 8 +----- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 31e0f1680b..99076791d5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3485,7 +3485,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io FIXME( "%p: control info not supported\n", handle ); break; case FileFsFullSizeInformation: - FIXME( "%p: full size info not supported\n", handle ); + if (length < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + io->u.Status = STATUS_BUFFER_TOO_SMALL; + else + { + FILE_FS_FULL_SIZE_INFORMATION *info = buffer; + + if (fstat( fd, &st ) < 0) + { + io->u.Status = FILE_GetNtStatus(); + break; + } + if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + { + io->u.Status = STATUS_INVALID_DEVICE_REQUEST; + } + else + { + ULONGLONG bsize; +#if !defined(linux) || !defined(HAVE_FSTATFS) + struct statvfs stfs; + + if (fstatvfs( fd, &stfs ) < 0) + { + io->u.Status = FILE_GetNtStatus(); + break; + } + bsize = stfs.f_frsize; +#else + struct statfs stfs; + if (fstatfs( fd, &stfs ) < 0) + { + io->u.Status = FILE_GetNtStatus(); + break; + } + bsize = stfs.f_bsize; +#endif + if (bsize == 2048) /* assume CD-ROM */ + { + info->BytesPerSector = 2048; + info->SectorsPerAllocationUnit = 1; + } + else + { + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + } + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->CallerAvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->ActualAvailableAllocationUnits.QuadPart = bsize * stfs.f_bfree / (info->BytesPerSector * info->SectorsPerAllocationUnit); + io->Information = sizeof(*info); + io->u.Status = STATUS_SUCCESS; + } + } break; case FileFsObjectIdInformation: FIXME( "%p: object id info not supported\n", handle ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0..99c4a5cdc7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1265,7 +1265,7 @@ static void test_file_full_size_information(void) /* Assume No Quota Settings configured on Wine Testbot */ res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); - todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); @@ -1281,8 +1281,6 @@ static void test_file_full_size_information(void) ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); - todo_wine - { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); @@ -1300,14 +1298,10 @@ static void test_file_full_size_information(void) "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); - } /* Assume file system is NTFS */ - todo_wine - { ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); - } CloseHandle( h ); } -- 2.26.2

2 1

[PATCH v2 1/2] kernel32: Use RtlAnsiStringToUnicodeString() in OpenMutexA.
by Akihiro Sagawa 02 Jun '20

02 Jun '20

v2: No updates for kernel32/sync.c. Just remove a test part. This commit makes consistent with the commit 2db497e89e8e4a37a8bd569b8691b9b87ae63606, which introduces RtlAnsiStringToUnicodeString() into CreateMutexA(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/sync.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

2 1

[PATCH] ole2.dll16: Add stub OleIsCurrentClipboard function
by Vijay Kiran Kamuju 02 Jun '20

02 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7102 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v3 01/11] msscript.ocx: Add IScriptModuleCollection stub implementation.
by Gabriel Ivăncescu 02 Jun '20

02 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Split tests and use separate objects for externally referenced modules. v3: Use the index in the module object instead of a pointer. dlls/msscript.ocx/msscript.c | 166 ++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..57200da 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -106,6 +106,9 @@ struct ScriptControl { IAdviseSink *view_sink; DWORD view_sink_flags; + /* modules */ + IScriptModuleCollection IScriptModuleCollection_iface; + ScriptHost *host; }; @@ -113,6 +116,7 @@ static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, + IScriptModuleCollection_tid, LAST_tid } tid_t; @@ -120,7 +124,8 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { - &IID_IScriptControl + &IID_IScriptControl, + &IID_IScriptModuleCollection, }; static HRESULT load_typelib(void) @@ -277,6 +282,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -551,6 +561,151 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptModuleCollection_QueryInterface(IScriptModuleCollection *iface, REFIID riid, void **ppv) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptModuleCollection, riid)) + { + *ppv = &This->IScriptModuleCollection_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptModuleCollection_AddRef(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI ScriptModuleCollection_Release(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfoCount(IScriptModuleCollection *iface, UINT *pctinfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfo(IScriptModuleCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptModuleCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptModuleCollection_GetIDsOfNames(IScriptModuleCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_Invoke(IScriptModuleCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_get__NewEnum(IScriptModuleCollection *iface, IUnknown **ppenumContexts) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumContexts); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *iface, VARIANT index, + IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *iface, LONG *plCount) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, + VARIANT *object, IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %s %p)\n", This, wine_dbgstr_w(name), wine_dbgstr_variant(object), ppmod); + + return E_NOTIMPL; +} + +static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { + ScriptModuleCollection_QueryInterface, + ScriptModuleCollection_AddRef, + ScriptModuleCollection_Release, + ScriptModuleCollection_GetTypeInfoCount, + ScriptModuleCollection_GetTypeInfo, + ScriptModuleCollection_GetIDsOfNames, + ScriptModuleCollection_Invoke, + ScriptModuleCollection_get__NewEnum, + ScriptModuleCollection_get_Item, + ScriptModuleCollection_get_Count, + ScriptModuleCollection_Add +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -922,8 +1077,12 @@ static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VAR static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptModuleCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = &This->IScriptModuleCollection_iface; + IScriptControl_AddRef(iface); + return S_OK; } static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptError **p) @@ -2031,6 +2190,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl; script_control->IPointerInactive_iface.lpVtbl = &PointerInactiveVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + script_control->IScriptModuleCollection_iface.lpVtbl = &ScriptModuleCollectionVtbl; script_control->ref = 1; script_control->site = NULL; script_control->cp_list = NULL; -- 2.21.0

1 10

[PATCH v2 01/11] msscript.ocx: Add IScriptModuleCollection stub implementation.
by Gabriel Ivăncescu 02 Jun '20

02 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Split tests and use separate objects for externally referenced modules. dlls/msscript.ocx/msscript.c | 166 ++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..57200da 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -106,6 +106,9 @@ struct ScriptControl { IAdviseSink *view_sink; DWORD view_sink_flags; + /* modules */ + IScriptModuleCollection IScriptModuleCollection_iface; + ScriptHost *host; }; @@ -113,6 +116,7 @@ static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, + IScriptModuleCollection_tid, LAST_tid } tid_t; @@ -120,7 +124,8 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { - &IID_IScriptControl + &IID_IScriptControl, + &IID_IScriptModuleCollection, }; static HRESULT load_typelib(void) @@ -277,6 +282,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -551,6 +561,151 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptModuleCollection_QueryInterface(IScriptModuleCollection *iface, REFIID riid, void **ppv) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptModuleCollection, riid)) + { + *ppv = &This->IScriptModuleCollection_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptModuleCollection_AddRef(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI ScriptModuleCollection_Release(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfoCount(IScriptModuleCollection *iface, UINT *pctinfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfo(IScriptModuleCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptModuleCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptModuleCollection_GetIDsOfNames(IScriptModuleCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_Invoke(IScriptModuleCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_get__NewEnum(IScriptModuleCollection *iface, IUnknown **ppenumContexts) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumContexts); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *iface, VARIANT index, + IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *iface, LONG *plCount) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, + VARIANT *object, IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %s %p)\n", This, wine_dbgstr_w(name), wine_dbgstr_variant(object), ppmod); + + return E_NOTIMPL; +} + +static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { + ScriptModuleCollection_QueryInterface, + ScriptModuleCollection_AddRef, + ScriptModuleCollection_Release, + ScriptModuleCollection_GetTypeInfoCount, + ScriptModuleCollection_GetTypeInfo, + ScriptModuleCollection_GetIDsOfNames, + ScriptModuleCollection_Invoke, + ScriptModuleCollection_get__NewEnum, + ScriptModuleCollection_get_Item, + ScriptModuleCollection_get_Count, + ScriptModuleCollection_Add +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -922,8 +1077,12 @@ static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VAR static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptModuleCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = &This->IScriptModuleCollection_iface; + IScriptControl_AddRef(iface); + return S_OK; } static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptError **p) @@ -2031,6 +2190,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl; script_control->IPointerInactive_iface.lpVtbl = &PointerInactiveVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + script_control->IScriptModuleCollection_iface.lpVtbl = &ScriptModuleCollectionVtbl; script_control->ref = 1; script_control->site = NULL; script_control->cp_list = NULL; -- 2.21.0

1 11

[PATCH v2] user32:Fix z order error when child window want to be topmost windows
by cuijiajin＠uniontech.com 02 Jun '20

02 Jun '20

when set_window_pos the second param is HWND_TOPMOST, window with WS_CHILD do not change z order. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/tests/win.c | 88 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 6 +++ 2 files changed, 94 insertions(+)

3 2