wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Alexandre Julliard : winedevice: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 8a52a73fe923dea772dd1e709cce74e3809dfae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52a73fe923dea772dd1e70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 11:08:01 2019 +0200 winedevice: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/Makefile.in | 3 ++- programs/winedevice/device.c | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index a0a4450..c4f1d9e 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,6 +1,7 @@ MODULE = winedevice.exe -APPMODE = -mwindows -municode IMPORTS = advapi32 ntoskrnl +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ device.c diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 201a041..f4ebad2 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "ntstatus.h" @@ -30,7 +27,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/svcctl.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -70,7 +66,7 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) DWORD result = NO_ERROR; WCHAR *str; - if (!(str = heap_alloc( sizeof(servicesW) + strlenW(driver_name)*sizeof(WCHAR) ))) + if (!(str = heap_alloc( sizeof(servicesW) + lstrlenW(driver_name)*sizeof(WCHAR) ))) return STATUS_NO_MEMORY; lstrcpyW( str, servicesW );

1 0

Austin English : iphlpapi: Add GetBestRoute2 stub.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: d48ffbdc014954907d3280a3b53eb9b478b10195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48ffbdc014954907d3280a3… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 28 08:13:27 2019 +0200 iphlpapi: Add GetBestRoute2 stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44850 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 2a4b3d8..abc7152 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -78,7 +78,7 @@ @ stdcall GetBestInterfaceEx( ptr ptr ) @ stub GetBestInterfaceFromStack @ stdcall GetBestRoute( long long ptr ) -#@ stub GetBestRoute2 +@ stdcall GetBestRoute2( ptr long ptr ptr long ptr ptr ) @ stub GetBestRouteFromStack #@ stub GetCurrentThreadCompartmentId @ stdcall GetExtendedTcpTable( ptr ptr long long long long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5df4cd8..f1aa0d1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3313,3 +3313,23 @@ DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE * FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetBestRoute2 (IPHLPAPI.@) + */ +DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index, + const SOCKADDR_INET *source, const SOCKADDR_INET *destination, + ULONG options, PMIB_IPFORWARD_ROW2 bestroute, + SOCKADDR_INET *bestaddress) +{ + static int once; + + if (!once++) + FIXME("(%p, %d, %p, %p, 0x%08x, %p, %p): stub\n", luid, index, source, + destination, options, bestroute, bestaddress); + + if (!destination || !bestroute || !bestaddress) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; +}

1 0

Michael Müller : include: Add dxva.h header file.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 029a80aaf3eaf295528a41959aad3335975d3400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=029a80aaf3eaf295528a4195… Author: Michael Müller <michael(a)fds-team.de> Date: Wed May 1 12:46:48 2019 +0200 include: Add dxva.h header file. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxva.h | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4a0f927..6c8d39a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -251,6 +251,7 @@ SOURCES = \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ + dxva.h \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ diff --git a/include/dxva.h b/include/dxva.h new file mode 100644 index 0000000..1260d75 --- /dev/null +++ b/include/dxva.h @@ -0,0 +1,215 @@ +/* + * Copyright 2015 Michael Müller + * + * 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 + */ + +#ifndef __WINE_DXVA_H +#define __WINE_DXVA_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DXVA_USUAL_BLOCK_WIDTH 8 +#define DXVA_USUAL_BLOCK_HEIGHT 8 +#define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT) + +#include <pshpack1.h> + +typedef struct _DXVA_PictureParameters +{ + WORD wDecodedPictureIndex; + WORD wDeblockedPictureIndex; + WORD wForwardRefPictureIndex; + WORD wBackwardRefPictureIndex; + WORD wPicWidthInMBminus1; + WORD wPicHeightInMBminus1; + BYTE bMacroblockWidthMinus1; + BYTE bMacroblockHeightMinus1; + BYTE bBlockWidthMinus1; + BYTE bBlockHeightMinus1; + BYTE bBPPminus1; + BYTE bPicStructure; + BYTE bSecondField; + BYTE bPicIntra; + BYTE bPicBackwardPrediction; + BYTE bBidirectionalAveragingMode; + BYTE bMVprecisionAndChromaRelation; + BYTE bChromaFormat; + BYTE bPicScanFixed; + BYTE bPicScanMethod; + BYTE bPicReadbackRequests; + BYTE bRcontrol; + BYTE bPicSpatialResid8; + BYTE bPicOverflowBlocks; + BYTE bPicExtrapolation; + BYTE bPicDeblocked; + BYTE bPicDeblockConfined; + BYTE bPic4MVallowed; + BYTE bPicOBMC; + BYTE bPicBinPB; + BYTE bMV_RPS; + BYTE bReservedBits; + WORD wBitstreamFcodes; + WORD wBitstreamPCEelements; + BYTE bBitstreamConcealmentNeed; + BYTE bBitstreamConcealmentMethod; +} DXVA_PictureParameters, *LPDXVA_PictureParameters; + +typedef struct _DXVA_SliceInfo +{ + WORD wHorizontalPosition; + WORD wVerticalPosition; + DWORD dwSliceBitsInBuffer; + DWORD dwSliceDataLocation; + BYTE bStartCodeBitOffset; + BYTE bReservedBits; + WORD wMBbitOffset; + WORD wNumberMBsInSlice; + WORD wQuantizerScaleCode; + WORD wBadSliceChopping; +} DXVA_SliceInfo, *LPDXVA_SliceInfo; + +typedef struct _DXVA_QmatrixData +{ + BYTE bNewQmatrix[4]; + WORD Qmatrix[4][DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT]; +} DXVA_QmatrixData, *LPDXVA_QmatrixData; + +typedef struct +{ + union + { + struct + { + UCHAR Index7Bits : 7; + UCHAR AssociatedFlag : 1; + } DUMMYSTRUCTNAME; + UCHAR bPicEntry; + } DUMMYUNIONNAME; +} DXVA_PicEntry_H264; + +typedef struct +{ + USHORT wFrameWidthInMbsMinus1; + USHORT wFrameHeightInMbsMinus1; + DXVA_PicEntry_H264 CurrPic; + UCHAR num_ref_frames; + union + { + struct + { + USHORT field_pic_flag : 1; + USHORT MbaffFrameFlag : 1; + USHORT residual_colour_transform_flag : 1; + USHORT sp_for_switch_flag : 1; + USHORT chroma_format_idc : 2; + USHORT RefPicFlag : 1; + USHORT constrained_intra_pred_flag : 1; + USHORT weighted_pred_flag : 1; + USHORT weighted_bipred_idc : 2; + USHORT MbsConsecutiveFlag : 1; + USHORT frame_mbs_only_flag : 1; + USHORT transform_8x8_mode_flag : 1; + USHORT MinLumaBipredSize8x8Flag : 1; + USHORT IntraPicFlag : 1; + } DUMMYSTRUCTNAME; + USHORT wBitFields; + } DUMMYUNIONNAME; + UCHAR bit_depth_luma_minus8; + UCHAR bit_depth_chroma_minus8; + USHORT Reserved16Bits; + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_H264 RefFrameList[16]; + INT CurrFieldOrderCnt[2]; + INT FieldOrderCntList[16][2]; + CHAR pic_init_qs_minus26; + CHAR chroma_qp_index_offset; + CHAR second_chroma_qp_index_offset; + UCHAR ContinuationFlag; + CHAR pic_init_qp_minus26; + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + UCHAR Reserved8BitsA; + USHORT FrameNumList[16]; + + UINT UsedForReferenceFlags; + USHORT NonExistingFrameFlags; + USHORT frame_num; + UCHAR log2_max_frame_num_minus4; + UCHAR pic_order_cnt_type; + UCHAR log2_max_pic_order_cnt_lsb_minus4; + UCHAR delta_pic_order_always_zero_flag; + UCHAR direct_8x8_inference_flag; + UCHAR entropy_coding_mode_flag; + UCHAR pic_order_present_flag; + UCHAR num_slice_groups_minus1; + UCHAR slice_group_map_type; + UCHAR deblocking_filter_control_present_flag; + UCHAR redundant_pic_cnt_present_flag; + UCHAR Reserved8BitsB; + USHORT slice_group_change_rate_minus1; + UCHAR SliceGroupMap[810]; +} DXVA_PicParams_H264; + +typedef struct +{ + UCHAR bScalingLists4x4[6][16]; + UCHAR bScalingLists8x8[2][64]; +} DXVA_Qmatrix_H264; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; + USHORT first_mb_in_slice; + USHORT NumMbsForSlice; + USHORT BitOffsetToSliceData; + UCHAR slice_type; + UCHAR luma_log2_weight_denom; + UCHAR chroma_log2_weight_denom; + + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + CHAR slice_alpha_c0_offset_div2; + CHAR slice_beta_offset_div2; + UCHAR Reserved8Bits; + DXVA_PicEntry_H264 RefPicList[2][32]; + SHORT Weights[2][32][3][2]; + CHAR slice_qs_delta; + CHAR slice_qp_delta; + UCHAR redundant_pic_cnt; + UCHAR direct_spatial_mv_pred_flag; + UCHAR cabac_init_idc; + UCHAR disable_deblocking_filter_idc; + USHORT slice_id; +} DXVA_Slice_H264_Long; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; +} DXVA_Slice_H264_Short; + +#include <poppack.h> + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DXVA_H */

1 0

Louis Lenders : dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: abee97e469686d1e55a7ccfe39c86d05c8c0de81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abee97e469686d1e55a7ccfe… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 1 15:04:51 2019 +0200 dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31350 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067..eb06d15 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index 79be438..32680e0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3091,6 +3091,13 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) +#define DWM_E_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80263002) +#define DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x80263003) +#define DWM_E_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x80263004) +#define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) +#define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003)

1 0

Jacek Caban : ntoskrnl.exe: Add work item tests.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 7099c0be2cc93a46d916e9a5cb2057be8af7b911 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7099c0be2cc93a46d916e9a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 17:54:39 2019 +0200 ntoskrnl.exe: Add work item tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 74 +++++++++++++++++++++++++++++----------- include/ddk/wdm.h | 5 +++ 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index e5d5dd8..ac31a4d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -51,6 +51,7 @@ static int winetest_debug; static int winetest_report_success; static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType; +static PEPROCESS *pPsInitialSystemProcess; void WINAPI ObfReferenceObject( void *obj ); @@ -319,7 +320,7 @@ static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) return ZwWaitForSingleObject(handle, FALSE, &integer); } -static void test_currentprocess(void) +static void test_current_thread(BOOL is_system) { DISPATCHER_HEADER *header; PEPROCESS current; @@ -334,6 +335,11 @@ static void test_currentprocess(void) ret = wait_single(current, 0); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + if (is_system) + ok(current == *pPsInitialSystemProcess, "current != PsInitialSystemProcess\n"); + else + ok(current != *pPsInitialSystemProcess, "current == PsInitialSystemProcess\n"); + ok(PsGetProcessId(current) == PsGetCurrentProcessId(), "process IDs don't match\n"); thread = PsGetCurrentThread(); @@ -341,7 +347,7 @@ static void test_currentprocess(void) ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); - ok(!PsIsSystemThread((PETHREAD)KeGetCurrentThread()), "unexpected system thread\n"); + ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); } static void sleep(void) @@ -1212,7 +1218,35 @@ static void test_lookup_thread(void) "PsLookupThreadByThreadId returned %#x\n", status); } -static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +static PIO_WORKITEM main_test_work_item; + +static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) +{ + IRP *irp = context; + void *buffer = irp->AssociatedIrp.SystemBuffer; + + IoFreeWorkItem(main_test_work_item); + main_test_work_item = NULL; + + test_current_thread(TRUE); + + /* print process report */ + if (winetest_debug) + { + kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + } + ZwClose(okfile); + + *((LONG *)buffer) = failures; + irp->IoStatus.Status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(failures); + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + +static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; @@ -1244,8 +1278,11 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st pPsThreadType = get_proc_address("PsThreadType"); ok(!!pPsThreadType, "IofileObjectType not found\n"); + pPsInitialSystemProcess = get_proc_address("PsInitialSystemProcess"); + ok(!!pPsInitialSystemProcess, "PsInitialSystemProcess not found\n"); + test_irp_struct(irp, device); - test_currentprocess(); + test_current_thread(FALSE); test_mdl_map(); test_init_funcs(); test_load_driver(); @@ -1257,18 +1294,13 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_resource(); test_lookup_thread(); - /* print process report */ - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - ZwClose(okfile); - *((LONG *)buffer) = failures; - *info = sizeof(failures); - return STATUS_SUCCESS; + if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; + + main_test_work_item = IoAllocateWorkItem(device); + ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); + + IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); + return STATUS_PENDING; } static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) @@ -1327,7 +1359,7 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) status = test_basic_ioctl(irp, stack, &irp->IoStatus.Information); break; case IOCTL_WINETEST_MAIN_TEST: - status = main_test(device, irp, stack, &irp->IoStatus.Information); + status = main_test(device, irp, stack); break; case IOCTL_WINETEST_LOAD_DRIVER: status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); @@ -1336,8 +1368,12 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) break; } - irp->IoStatus.Status = status; - IoCompleteRequest(irp, IO_NO_INCREMENT); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + else IoMarkIrpPending(irp); return status; } diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index f2b2723..25f2d49 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1505,6 +1505,11 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi if (on_cancel) irpsp->Control |= SL_INVOKE_ON_CANCEL; } +static inline void IoMarkIrpPending(IRP *irp) +{ + IoGetCurrentIrpStackLocation(irp)->Control |= SL_PENDING_RETURNED; +} + #define KernelMode 0 #define UserMode 1

1 0

Jacek Caban : ntoskrnl.exe: Implement IoQueueWorkItem.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 43ba0a1bec4139e2cb90097a26d6fd25ebb5d47a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ba0a1bec4139e2cb90097a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 17:54:23 2019 +0200 ntoskrnl.exe: Implement IoQueueWorkItem. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 29 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 10 ++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf053ca..eff90bb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1235,6 +1235,8 @@ void WINAPI IoFreeMdl(PMDL mdl) struct _IO_WORKITEM { DEVICE_OBJECT *device; + PIO_WORKITEM_ROUTINE worker; + void *context; }; /*********************************************************************** @@ -1262,6 +1264,33 @@ void WINAPI IoFreeWorkItem( PIO_WORKITEM work_item ) } +void WINAPI run_work_item_worker(TP_CALLBACK_INSTANCE *instance, void *context) +{ + PIO_WORKITEM work_item = context; + DEVICE_OBJECT *device = work_item->device; + + TRACE( "%p: calling %p(%p %p)\n", work_item, work_item->worker, device, work_item->context ); + work_item->worker( device, work_item->context ); + TRACE( "done\n" ); + + ObDereferenceObject( device ); +} + +/*********************************************************************** + * IoQueueWorkItem (NTOSKRNL.EXE.@) + */ +void WINAPI IoQueueWorkItem( PIO_WORKITEM work_item, PIO_WORKITEM_ROUTINE worker, + WORK_QUEUE_TYPE type, void *context ) +{ + TRACE( "%p %p %u %p\n", work_item, worker, type, context ); + + ObReferenceObject( work_item->device ); + work_item->worker = worker; + work_item->context = context; + TrySubmitThreadpoolCallback( run_work_item_worker, work_item, NULL ); +} + + /*********************************************************************** * IoAttachDeviceToDeviceStack (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3103159..a1c84ee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -428,7 +428,7 @@ @ stub IoQueryFileInformation @ stub IoQueryVolumeInformation @ stub IoQueueThreadIrp -@ stub IoQueueWorkItem +@ stdcall IoQueueWorkItem(ptr ptr long ptr) @ stub IoRaiseHardError @ stub IoRaiseInformationalHardError @ stub IoReadDiskSignature diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4772793..f2b2723 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1460,6 +1460,15 @@ typedef enum _DIRECTORY_NOTIFY_INFORMATION_CLASS { DirectoryNotifyExtendedInformation } DIRECTORY_NOTIFY_INFORMATION_CLASS, *PDIRECTORY_NOTIFY_INFORMATION_CLASS; +typedef enum _WORK_QUEUE_TYPE { + CriticalWorkQueue, + DelayedWorkQueue, + HyperCriticalWorkQueue, + MaximumWorkQueue +} WORK_QUEUE_TYPE; + +typedef void (WINAPI *PIO_WORKITEM_ROUTINE)(PDEVICE_OBJECT,void*); + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION @@ -1568,6 +1577,7 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN);

1 0

Jacek Caban : ntoskrnl.exe: Implement IoAllocateWorkItem and IoFreeWorkItem.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 322f0b57a81badd218c1a5f6d8d03d951f2689ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=322f0b57a81badd218c1a5f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 17:54:14 2019 +0200 ntoskrnl.exe: Implement IoAllocateWorkItem and IoFreeWorkItem. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 26 +++++++++++++++++++++++--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1a2a6d1..cf053ca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1232,13 +1232,33 @@ void WINAPI IoFreeMdl(PMDL mdl) } +struct _IO_WORKITEM +{ + DEVICE_OBJECT *device; +}; + /*********************************************************************** * IoAllocateWorkItem (NTOSKRNL.EXE.@) */ -PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT DeviceObject ) +PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT device ) { - FIXME( "stub: %p\n", DeviceObject ); - return NULL; + PIO_WORKITEM work_item; + + TRACE( "%p\n", device ); + + if (!(work_item = ExAllocatePool( PagedPool, sizeof(*work_item) ))) return NULL; + work_item->device = device; + return work_item; +} + + +/*********************************************************************** + * IoFreeWorkItem (NTOSKRNL.EXE.@) + */ +void WINAPI IoFreeWorkItem( PIO_WORKITEM work_item ) +{ + TRACE( "%p\n", work_item ); + ExFreePool( work_item ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1e46de3..3103159 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -383,7 +383,7 @@ @ stub IoFreeErrorLogEntry @ stdcall IoFreeIrp(ptr) @ stdcall IoFreeMdl(ptr) -@ stub IoFreeWorkItem +@ stdcall IoFreeWorkItem(ptr) @ stdcall IoGetAttachedDevice(ptr) @ stdcall IoGetAttachedDeviceReference(ptr) @ stub IoGetBaseFileSystemDeviceObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 57a5357..4772793 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1543,6 +1543,7 @@ NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOI PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); +PIO_WORKITEM WINAPI IoAllocateWorkItem(PDEVICE_OBJECT); PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT,PDEVICE_OBJECT); PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*); PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PLARGE_INTEGER,PKEVENT,IO_STATUS_BLOCK*); @@ -1557,6 +1558,7 @@ void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); void WINAPI IoFreeMdl(MDL*); +void WINAPI IoFreeWorkItem(PIO_WORKITEM); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceInterfaces(const GUID*,PDEVICE_OBJECT,ULONG,PWSTR*); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*);

1 0

Jacek Caban : ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 73b99d296c5c981e0afe614b72e339b41eb250d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b99d296c5c981e0afe614b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 17:54:05 2019 +0200 ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0bb83cb..1a2a6d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -366,6 +366,15 @@ static void ObReferenceObject( void *obj ) LeaveCriticalSection( &obref_cs ); } +/*********************************************************************** + * ObGetObjectType (NTOSKRNL.EXE.@) + */ +POBJECT_TYPE WINAPI ObGetObjectType( void *object ) +{ + struct object_header *header = (struct object_header *)object - 1; + return header->type; +} + static const POBJECT_TYPE *known_types[] = { &ExEventObjectType, @@ -389,7 +398,6 @@ static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { - struct object_header *header; void *obj; NTSTATUS status; @@ -409,12 +417,7 @@ NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret return status; } - if (obj) - { - header = (struct object_header *)obj - 1; - if (type && header->type != type) status = STATUS_OBJECT_TYPE_MISMATCH; - } - else + if (!obj) { char buf[256]; OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buf; @@ -459,6 +462,7 @@ NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret } if (!obj) status = STATUS_NO_MEMORY; } + else if (type && ObGetObjectType( obj ) != type) status = STATUS_OBJECT_TYPE_MISMATCH; LeaveCriticalSection( &handle_map_cs ); if (!status) *ret = obj; @@ -489,15 +493,6 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } /*********************************************************************** - * ObGetObjectType (NTOSKRNL.EXE.@) - */ -POBJECT_TYPE WINAPI ObGetObjectType( void *object ) -{ - struct object_header *header = (struct object_header *)object - 1; - return header->type; -} - -/*********************************************************************** * ObOpenObjectByPointer (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *access_state,

1 0

Zebediah Figura : setupapi/tests: Add some tests for SetupInstallFilesFromInfSection().
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 02df7eeb5bbed4f94840cec4cd8c3d0ad3da9eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=02df7eeb5bbed4f94840cec4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 09:52:04 2019 -0500 setupapi/tests: Add some tests for SetupInstallFilesFromInfSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/install.c | 329 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 330 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02df7eeb5bbed4f94840…

1 0

Zebediah Figura : setupapi/tests: Avoid assert().
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 2d13b6b74cfa4a21f2b575081331619fb6cebfed URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d13b6b74cfa4a21f2b57508… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 09:52:03 2019 -0500 setupapi/tests: Avoid assert(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4232212..cee4b55 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> -#include <assert.h> #include "windef.h" #include "winbase.h" @@ -59,9 +58,9 @@ static void create_inf_file(LPCSTR filename, const char *data) BOOL ret; HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - assert(handle != INVALID_HANDLE_VALUE); + ok(handle != INVALID_HANDLE_VALUE, "Failed to create %s, error %u.\n", filename, GetLastError()); ret = WriteFile(handle, data, strlen(data), &res, NULL); - assert(ret != 0); + ok(ret, "Failed to write file, error %u.\n", GetLastError()); CloseHandle(handle); } @@ -777,7 +776,7 @@ START_TEST(install) /* Set CBT hook to disallow MessageBox creation in current thread */ hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); - assert(hhook != 0); + ok(!!hhook, "Failed to set hook, error %u.\n", GetLastError()); test_cmdline(); test_registry();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019