September 2017 - Wine-Commits

Ihsan Akmal : dxgi1_2.idl: Add missing structs and interfaces.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: b5f27803c8ab4ccb38782178343d073e525396f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f27803c8ab4ccb387821783… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Mon Sep 18 17:59:34 2017 +0800 dxgi1_2.idl: Add missing structs and interfaces. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi1_2.idl | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index 92f9c0e..64163dd 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -32,6 +32,122 @@ typedef enum DXGI_ALPHA_MODE { DXGI_ALPHA_MODE_FORCE_DWORD = 0xffffffff } DXGI_ALPHA_MODE; +typedef struct DXGI_OUTDUPL_MOVE_RECT +{ + POINT SourcePoint; + RECT DestinationRect; +} DXGI_OUTDUPL_MOVE_RECT; + +typedef struct DXGI_OUTDUPL_DESC +{ + DXGI_MODE_DESC ModeDesc; + DXGI_MODE_ROTATION Rotation; + BOOL DesktopImageInSystemMemory; +} DXGI_OUTDUPL_DESC; + +typedef struct DXGI_OUTDUPL_POINTER_POSITION +{ + POINT Position; + BOOL Visible; +} DXGI_OUTDUPL_POINTER_POSITION; + +typedef enum DXGI_OUTDUPL_POINTER_SHAPE_TYPE +{ + DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME = 0x00000001, + DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR = 0x00000002, + DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR = 0x00000004 +} DXGI_OUTDUPL_POINTER_SHAPE_TYPE; + +typedef struct DXGI_OUTDUPL_POINTER_SHAPE_INFO +{ + UINT Type; + UINT Width; + UINT Height; + UINT Pitch; + POINT HotSpot; +} DXGI_OUTDUPL_POINTER_SHAPE_INFO; + +typedef struct DXGI_OUTDUPL_FRAME_INFO +{ + LARGE_INTEGER LastPresentTime; + LARGE_INTEGER LastMouseUpdateTime; + UINT AccumulatedFrames; + BOOL RectsCoalesced; + BOOL ProtectedContentMaskedOut; + DXGI_OUTDUPL_POINTER_POSITION PointerPosition; + UINT TotalMetadataBufferSize; + UINT PointerShapeBufferSize; +} DXGI_OUTDUPL_FRAME_INFO; + +typedef struct DXGI_MODE_DESC1 +{ + UINT Width; + UINT Height; + DXGI_RATIONAL RefreshRate; + DXGI_FORMAT Format; + DXGI_MODE_SCANLINE_ORDER ScanlineOrdering; + DXGI_MODE_SCALING Scaling; + BOOL Stereo; +} DXGI_MODE_DESC1; + +[ + object, + uuid(191cfac3-a341-470d-b26e-a864f428319c), + local, + pointer_default(unique) +] +interface IDXGIOutputDuplication : IDXGIObject +{ + void GetDesc( + [out] DXGI_OUTDUPL_DESC *desc + ); + + HRESULT AcquireNextFrame( + [in] UINT timeout_in_milliseconds, + [out] DXGI_OUTDUPL_FRAME_INFO *frame_info, + [out] IDXGIResource **desktop_resource + ); + + HRESULT GetFrameDirtyRects( + [in] UINT dirty_rects_buffer_size, + [out] RECT *dirty_rects_buffer, + [out] UINT *dirty_rects_buffer_size_required + ); + + HRESULT GetFrameMoveRects( + [in] UINT move_rects_buffer_size, + [out] DXGI_OUTDUPL_MOVE_RECT *move_rect_buffer, + [out] UINT *move_rects_buffer_size_required + ); + + HRESULT GetFramePointerShape( + [in] UINT pointer_shape_buffer_size, + [out] void *pointer_shape_buffer, + [out] UINT *pointer_shape_buffer_size_required, + [out] DXGI_OUTDUPL_POINTER_SHAPE_INFO *pointer_shape_info + ); + + HRESULT MapDesktopSurface( + [out] DXGI_MAPPED_RECT *locked_rect + ); + + HRESULT UnMapDesktopSurface(); + + HRESULT ReleaseFrame(); +} + +[ + object, + uuid(ea9dbf1a-c88e-4486-854a-98aa0138f30c), + local, + pointer_default(unique) +] +interface IDXGIDisplayControl : IUnknown +{ + BOOL IsStereoEnabled(); + void SetStereoEnabled(BOOL enabled); +} + [ object, uuid(05008617-fbfd-4051-a790-144884b4f6a9), @@ -232,3 +348,34 @@ interface IDXGIAdapter2 : IDXGIAdapter1 { HRESULT GetDesc2([out] DXGI_ADAPTER_DESC2 *pDesc); } + +[ + object, + uuid(00cddea8-939b-4b83-a340-a685226666cc), + local, + pointer_default(unique) +] +interface IDXGIOutput1 : IDXGIOutput +{ + HRESULT GetDisplayModeList1( + [in] DXGI_FORMAT enum_format, + [in] UINT flags, + [in, out] UINT *num_modes, + [out] DXGI_MODE_DESC1 *desc + ); + + HRESULT FindClosestMatchingMode1( + [in] const DXGI_MODE_DESC1 *mode_to_match, + [out] DXGI_MODE_DESC1 *closest_match, + [in] IUnknown *concerned_device + ); + + HRESULT GetDisplaySurfaceData1( + [in] IDXGIResource *destination + ); + + HRESULT DuplicateOutput( + [in] IUnknown *device, + [out] IDXGIOutputDuplication **output_duplication + ); +}

1 0

Ihsan Akmal : d3d11.idl: Add missing D3D11_DEVICE_CONTEXT_TYPE enums and D3D11_FEATURE_DATA_* declaration.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 9db3a709e1ce5fe1853db3a96dbd57fbac864794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db3a709e1ce5fe1853db3a96… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 19 13:14:31 2017 +0200 d3d11.idl: Add missing D3D11_DEVICE_CONTEXT_TYPE enums and D3D11_FEATURE_DATA_* declaration. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index be5b3c0..73a6ca0 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -460,6 +460,12 @@ typedef enum D3D11_DEPTH_WRITE_MASK D3D11_DEPTH_WRITE_MASK_ALL, } D3D11_DEPTH_WRITE_MASK; +typedef enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS +{ + D3D11_STANDARD_MULTISAMPLE_PATTERN = 0xffffffff, + D3D11_CENTER_MULTISAMPLE_PATTERN = 0xfffffffe, +} D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS; + typedef enum D3D11_DEVICE_CONTEXT_TYPE { D3D11_DEVICE_CONTEXT_IMMEDIATE, @@ -488,7 +494,16 @@ typedef enum D3D11_FEATURE D3D11_FEATURE_ARCHITECTURE_INFO, D3D11_FEATURE_D3D9_OPTIONS, D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT, - D3D11_FEATURE_D3D9_SHADOW_SUPPORT + D3D11_FEATURE_D3D9_SHADOW_SUPPORT, + D3D11_FEATURE_D3D11_OPTIONS1, + D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT, + D3D11_FEATURE_MARKER_SUPPORT, + D3D11_FEATURE_D3D9_OPTIONS1, + D3D11_FEATURE_D3D11_OPTIONS2, + D3D11_FEATURE_D3D11_OPTIONS3, + D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, + D3D11_FEATURE_D3D11_OPTIONS4, + D3D11_FEATURE_SHADER_CACHE, } D3D11_FEATURE; typedef struct D3D11_FEATURE_DATA_THREADING @@ -502,6 +517,18 @@ typedef struct D3D11_FEATURE_DATA_DOUBLES BOOL DoublePrecisionFloatShaderOps; } D3D11_FEATURE_DATA_DOUBLES; +typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT +{ + DXGI_FORMAT InFormat; + UINT OutFormatSupport; +} D3D11_FEATURE_DATA_FORMAT_SUPPORT; + +typedef struct D3D11_FEATURE_DATA_FORMAT_SUPPORT2 +{ + DXGI_FORMAT InFormat; + UINT OutFormatSupport2; +} D3D11_FEATURE_DATA_FORMAT_SUPPORT2; + typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS { BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; @@ -525,6 +552,110 @@ typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS BOOL ExtendedResourceSharing; } D3D11_FEATURE_DATA_D3D11_OPTIONS; +typedef struct D3D11_FEATURE_DATA_ARCHITECTURE_INFO +{ + BOOL TileBasedDeferredRenderer; +} D3D11_FEATURE_DATA_ARCHITECTURE_INFO; + +typedef struct D3D11_FEATURE_DATA_D3D9_OPTIONS +{ + BOOL FullNonPow2TextureSupport; +} D3D11_FEATURE_DATA_D3D9_OPTIONS; + +typedef struct D3D11_FEATURE_DATA_D3D9_SHADOW_SUPPORT +{ + BOOL SupportsDepthAsTextureWithLessEqualComparisonFilter; +} D3D11_FEATURE_DATA_D3D9_SHADOW_SUPPORT; + +typedef enum D3D11_SHADER_MIN_PRECISION_SUPPORT +{ + D3D11_SHADER_MIN_PRECISION_10_BIT = 0x1, + D3D11_SHADER_MIN_PRECISION_16_BIT = 0x2, +} D3D11_SHADER_MIN_PRECISION_SUPPORT; + +typedef struct D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT +{ + UINT PixelShaderMinPrecision; + UINT AllOtherShaderStagesMinPrecision; +} D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT; + +typedef enum D3D11_TILED_RESOURCES_TIER +{ + D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0x0, + D3D11_TILED_RESOURCES_TIER_1 = 0x1, + D3D11_TILED_RESOURCES_TIER_2 = 0x2, + D3D11_TILED_RESOURCES_TIER_3 = 0x3, +} D3D11_TILED_RESOURCES_TIER; + +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS1 +{ + D3D11_TILED_RESOURCES_TIER TiledResourcesTier; + BOOL MinMaxFiltering; + BOOL ClearViewAlsoSupportsDepthOnlyFormats; + BOOL MapOnDefaultBuffers; +} D3D11_FEATURE_DATA_D3D11_OPTIONS1; + +typedef struct D3D11_FEATURE_DATA_D3D9_SIMPLE_INSTANCING_SUPPORT +{ + BOOL SimpleInstancingSupported; +} D3D11_FEATURE_DATA_D3D9_SIMPLE_INSTANCING_SUPPORT; + +typedef struct D3D11_FEATURE_DATA_MARKER_SUPPORT +{ + BOOL Profile; +} D3D11_FEATURE_DATA_MARKER_SUPPORT; + +typedef struct D3D11_FEATURE_DATA_D3D9_OPTIONS1 +{ + BOOL FullNonPow2TextureSupported; + BOOL DepthAsTextureWithLessEqualComparisonFilterSupported; + BOOL SimpleInstancingSupported; + BOOL TextureCubeFaceRenderTargetWithNonCubeDepthStencilSupported; +} D3D11_FEATURE_DATA_D3D9_OPTIONS1; + +typedef enum D3D11_CONSERVATIVE_RASTERIZATION_TIER +{ + D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0x0, + D3D11_CONSERVATIVE_RASTERIZATION_TIER_1 = 0x1, + D3D11_CONSERVATIVE_RASTERIZATION_TIER_2 = 0x2, + D3D11_CONSERVATIVE_RASTERIZATION_TIER_3 = 0x3, +} D3D11_CONSERVATIVE_RASTERIZATION_TIER; + +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS2 +{ + BOOL PSSpecifiedStencilRefSupported; + BOOL TypedUAVLoadAdditionalFormats; + BOOL ROVsSupported; + D3D11_CONSERVATIVE_RASTERIZATION_TIER ConservativeRasterizationTier; + D3D11_TILED_RESOURCES_TIER TiledResourcesTier; + BOOL MapOnDefaultTextures; + BOOL StandardSwizzle; + BOOL UnifiedMemoryArchitecture; +} D3D11_FEATURE_DATA_D3D11_OPTIONS2; + +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS3 +{ + BOOL VPAndRTArrayIndexFromAnyShaderFeedingRasterizer; +} D3D11_FEATURE_DATA_D3D11_OPTIONS3; + +typedef struct D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT +{ + UINT MaxGPUVirtualAddressBitsPerResource; + UINT MaxGPUVirtualAddressBitsPerProcess; +} D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT; + +typedef enum D3D11_SHADER_CACHE_SUPPORT_FLAGS +{ + D3D11_SHADER_CACHE_SUPPORT_NONE = 0x0, + D3D11_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE = 0x1, + D3D11_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x2, +} D3D11_SHADER_CACHE_SUPPORT_FLAGS; + +typedef struct D3D11_FEATURE_DATA_SHADER_CACHE +{ + UINT SupportFlags; +} D3D11_FEATURE_DATA_SHADER_CACHE; + typedef enum D3D11_FILL_MODE { D3D11_FILL_WIREFRAME = 2,

1 0

Alexandre Julliard : ntdll: Suspend the process before attaching dlls, using the process initial context.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 0eefa767919e81f3467141377b5ebb88eb794517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eefa767919e81f3467141377… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:26:06 2017 +0200 ntdll: Suspend the process before attaching dlls, using the process initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 19 ++++++++++--------- dlls/ntdll/server.c | 3 +++ include/wine/server_protocol.h | 4 +++- server/process.c | 2 +- server/protocol.def | 2 ++ server/request.h | 2 ++ server/trace.c | 7 ++++++- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e7fe35c..07daea8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3079,7 +3079,6 @@ static void test_SuspendProcessState(void) ok(orig_iat_entry_value, "IAT entry in OriginalFirstThunk is NULL\n"); /* The IAT should be UNRESOLVED */ - todo_wine ok(iat_entry_value == orig_iat_entry_value, "IAT entry resolved prematurely\n"); server_pipe_handle = CreateNamedPipeA(pipe_name, PIPE_ACCESS_DUPLEX | FILE_FLAG_WRITE_THROUGH, @@ -3107,14 +3106,19 @@ static void test_SuspendProcessState(void) #ifdef __x86_64__ ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); ok( !ctx.Rax, "rax is not zero %lx\n", ctx.Rax ); - todo_wine - { ok( !ctx.Rbx, "rbx is not zero %lx\n", ctx.Rbx ); ok( !ctx.Rsi, "rsi is not zero %lx\n", ctx.Rsi ); ok( !ctx.Rdi, "rdi is not zero %lx\n", ctx.Rdi ); ok( !ctx.Rbp, "rbp is not zero %lx\n", ctx.Rbp ); + ok( !ctx.R8, "r8 is not zero %lx\n", ctx.R8 ); + ok( !ctx.R9, "r9 is not zero %lx\n", ctx.R9 ); + ok( !ctx.R10, "r10 is not zero %lx\n", ctx.R10 ); + ok( !ctx.R11, "r11 is not zero %lx\n", ctx.R11 ); + ok( !ctx.R12, "r12 is not zero %lx\n", ctx.R12 ); + ok( !ctx.R13, "r13 is not zero %lx\n", ctx.R13 ); + ok( !ctx.R14, "r14 is not zero %lx\n", ctx.R14 ); + ok( !ctx.R15, "r15 is not zero %lx\n", ctx.R15 ); ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %lx\n", ctx.Rsp ); - } entry_ptr = (void *)ctx.Rcx; peb_ptr = (void *)ctx.Rdx; @@ -3133,7 +3137,6 @@ static void test_SuspendProcessState(void) ok(ret, "Failed to write to remote process thread stack (%d)\n", GetLastError()); #else ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); - todo_wine ok( !ctx.Ebp || broken(ctx.Ebp), /* winxp */ "ebp is not zero %08x\n", ctx.Ebp ); if (!ctx.Ebp) /* winxp is completely different */ { @@ -3141,8 +3144,9 @@ static void test_SuspendProcessState(void) ok( !ctx.Edx, "edx is not zero %08x\n", ctx.Edx ); ok( !ctx.Esi, "esi is not zero %08x\n", ctx.Esi ); ok( !ctx.Edi, "edi is not zero %08x\n", ctx.Edi ); - ok( !((ctx.Esp + 0x10) & 0xfff), "esp is not at top of stack page %08x\n", ctx.Esp ); } + ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ + "esp is not at top of stack page or properly aligned: %08x\n", ctx.Esp ); entry_ptr = (void *)ctx.Eax; peb_ptr = (void *)ctx.Ebx; @@ -3163,12 +3167,9 @@ static void test_SuspendProcessState(void) #endif ret = ReadProcessMemory( pi.hProcess, peb_ptr, &child_peb, sizeof(child_peb), NULL ); - todo_wine ok( ret, "Failed to read PEB (%u)\n", GetLastError() ); - if (ret) ok( child_peb.ImageBaseAddress == exe_base, "wrong base %p/%p\n", child_peb.ImageBaseAddress, exe_base ); - todo_wine ok( entry_ptr == (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint, "wrong entry point %p/%p\n", entry_ptr, (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint ); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index b20f1a5..c3b878e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1427,6 +1427,7 @@ NTSTATUS server_init_process_done( CONTEXT *context ) IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; NTSTATUS status; + int suspend; /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that @@ -1446,9 +1447,11 @@ NTSTATUS server_init_process_done( CONTEXT *context ) req->entry = wine_server_client_ptr( entry ); req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); status = wine_server_call( req ); + suspend = reply->suspend; } SERVER_END_REQ; + if (suspend) wait_suspend( context ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f903df4..592dbf0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -799,6 +799,8 @@ struct init_process_done_request struct init_process_done_reply { struct reply_header __header; + int suspend; + char __pad_12[4]; }; @@ -6406,6 +6408,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 536 +#define SERVER_PROTOCOL_VERSION 537 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 2327a26..d8c7ff7 100644 --- a/server/process.c +++ b/server/process.c @@ -1322,8 +1322,8 @@ DECL_HANDLER(init_process_done) set_process_startup_state( process, STARTUP_DONE ); if (req->gui) process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); - stop_thread_if_suspended( current ); if (process->debugger) set_process_debug_flag( process, 1 ); + reply->suspend = (current->suspend || process->suspend); } /* open a handle to a process */ diff --git a/server/protocol.def b/server/protocol.def index 35e1c7b..4b21390 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -785,6 +785,8 @@ struct rawinput_device mod_handle_t module; /* main module base address */ client_ptr_t ldt_copy; /* address of LDT copy (in thread address space) */ client_ptr_t entry; /* process entry point */ +(a)REPLY + int suspend; /* is process suspended? */ @END diff --git a/server/request.h b/server/request.h index f7c6dba..de2f493 100644 --- a/server/request.h +++ b/server/request.h @@ -757,6 +757,8 @@ C_ASSERT( FIELD_OFFSET(struct init_process_done_request, module) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_request, ldt_copy) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_request, entry) == 32 ); C_ASSERT( sizeof(struct init_process_done_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, suspend) == 8 ); +C_ASSERT( sizeof(struct init_process_done_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, unix_pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, unix_tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, debug_level) == 20 ); diff --git a/server/trace.c b/server/trace.c index 62b0cfe..3256c17 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1281,6 +1281,11 @@ static void dump_init_process_done_request( const struct init_process_done_reque dump_uint64( ", entry=", &req->entry ); } +static void dump_init_process_done_reply( const struct init_process_done_reply *req ) +{ + fprintf( stderr, " suspend=%d", req->suspend ); +} + static void dump_init_thread_request( const struct init_thread_request *req ) { fprintf( stderr, " unix_pid=%d", req->unix_pid ); @@ -4755,7 +4760,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_new_process_info_reply, (dump_func)dump_new_thread_reply, (dump_func)dump_get_startup_info_reply, - NULL, + (dump_func)dump_init_process_done_reply, (dump_func)dump_init_thread_reply, (dump_func)dump_terminate_process_reply, (dump_func)dump_terminate_thread_reply,

1 0

Alexandre Julliard : ntdll: Set the initial process context on x86_64.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: e6f68708c505e93c18e33c0d008a0cc63b379732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f68708c505e93c18e33c0d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:14:58 2017 +0200 ntdll: Set the initial process context on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6e95257..691ee1f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3057,6 +3057,16 @@ static void *mac_thread_gsbase(void) } #endif + +/*********************************************************************** + * start_process + */ +static void CDECL start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +{ + call_thread_entry_point( kernel32_start_process, entry ); +} + + /********************************************************************** * signal_init_thread */ @@ -3132,7 +3142,15 @@ void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif - /* FIXME: set the initial context */ + /* build the initial context */ + context->ContextFlags = CONTEXT_FULL; + __asm__( "movw %%cs,%0" : "=m" (context->SegCs) ); + __asm__( "movw %%ss,%0" : "=m" (context->SegSs) ); + __asm__( "fxsave %0" : "=m" (context->u.FltSave) ); + context->Rcx = (ULONG_PTR)entry; + context->Rdx = (ULONG_PTR)NtCurrentTeb()->Peb; + context->Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; + context->Rip = (ULONG_PTR)start_process; return; error:

1 0

Alexandre Julliard : ntdll: Add support for setting a platform-specific initial context.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 8c103f298b099bbc58b1daef228fbaa5c18f00ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c103f298b099bbc58b1daef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:10:01 2017 +0200 ntdll: Add support for setting a platform-specific initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +++- dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/server.c | 7 ++++--- dlls/ntdll/signal_arm.c | 4 +++- dlls/ntdll/signal_arm64.c | 4 +++- dlls/ntdll/signal_i386.c | 4 +++- dlls/ntdll/signal_powerpc.c | 4 +++- dlls/ntdll/signal_x86_64.c | 4 +++- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 31d8323..5d8b4e2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3115,6 +3115,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; + CONTEXT context = { 0 }; kernel32_start_process = kernel_start; if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ @@ -3145,7 +3146,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0 )) != STATUS_SUCCESS) goto error; - if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error; + if ((status = server_init_process_done( &context )) != STATUS_SUCCESS) goto error; actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -3157,6 +3158,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, virtual_release_address_space(); virtual_clear_thread_stack(); + if (context.ContextFlags) NtSetContextThread( GetCurrentThread(), &context ); wine_switch_to_stack( start_process, wm->ldr.EntryPoint, NtCurrentTeb()->Tib.StackBase ); error: diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index baa10ce..8dae676 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -67,7 +67,7 @@ extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) DECLSPEC_HI extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; -extern void signal_init_process(void) DECLSPEC_HIDDEN; +extern void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) DECLSPEC_HIDDEN; extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern HANDLE thread_init(void) DECLSPEC_HIDDEN; @@ -82,7 +82,7 @@ extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; extern void server_init_process(void) DECLSPEC_HIDDEN; -extern NTSTATUS server_init_process_done(void) DECLSPEC_HIDDEN; +extern NTSTATUS server_init_process_done( CONTEXT *context ) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN terminate_thread( int status ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c02a12a..b20f1a5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1421,10 +1421,11 @@ void server_init_process(void) /*********************************************************************** * server_init_process_done */ -NTSTATUS server_init_process_done(void) +NTSTATUS server_init_process_done( CONTEXT *context ) { PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); + void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; NTSTATUS status; /* Install signal handlers; this cannot be done earlier, since we cannot @@ -1433,7 +1434,7 @@ NTSTATUS server_init_process_done(void) * We do need the handlers in place by the time the request is over, so * we set them up here. If we segfault between here and the server call * something is very wrong... */ - signal_init_process(); + signal_init_process( context, entry ); /* Signal the parent process to continue */ SERVER_START_REQ( init_process_done ) @@ -1442,7 +1443,7 @@ NTSTATUS server_init_process_done(void) #ifdef __i386__ req->ldt_copy = wine_server_client_ptr( &wine_ldt_copy ); #endif - req->entry = wine_server_client_ptr( (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint ); + req->entry = wine_server_client_ptr( entry ); req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); status = wine_server_call( req ); } diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 106699d..e5e3140 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -981,7 +981,7 @@ void signal_init_thread( TEB *teb ) /********************************************************************** * signal_init_process */ -void signal_init_process(void) +void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) { struct sigaction sig_act; @@ -1010,6 +1010,8 @@ void signal_init_process(void) sig_act.sa_sigaction = trap_handler; if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif + + /* FIXME: set the initial context */ return; error: diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4b305e3..5b3e887 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -852,7 +852,7 @@ void signal_init_thread( TEB *teb ) /********************************************************************** * signal_init_process */ -void signal_init_process(void) +void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) { struct sigaction sig_act; @@ -881,6 +881,8 @@ void signal_init_process(void) sig_act.sa_sigaction = trap_handler; if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif + + /* FIXME: set the initial context */ return; error: diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ab8d114..a373e3d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2557,7 +2557,7 @@ void signal_init_thread( TEB *teb ) /********************************************************************** * signal_init_process */ -void signal_init_process(void) +void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) { struct sigaction sig_act; @@ -2599,6 +2599,8 @@ void signal_init_process(void) #endif wine_ldt_init_locking( ldt_lock, ldt_unlock ); + + /* FIXME: set the initial context */ return; error: diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index f5560f1..e5a009c 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1054,7 +1054,7 @@ void signal_init_thread( TEB *teb ) /********************************************************************** * signal_init_process */ -void signal_init_process(void) +void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) { struct sigaction sig_act; @@ -1083,6 +1083,8 @@ void signal_init_process(void) sig_act.sa_sigaction = trap_handler; if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif + + /* FIXME: set the initial context */ return; error: diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ed43682..6e95257 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3102,7 +3102,7 @@ void signal_init_thread( TEB *teb ) /********************************************************************** * signal_init_process */ -void signal_init_process(void) +void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) { struct sigaction sig_act; @@ -3131,6 +3131,8 @@ void signal_init_process(void) sig_act.sa_sigaction = trap_handler; if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif + + /* FIXME: set the initial context */ return; error:

1 0

Alexandre Julliard : ntdll: Store the kernel32 process entry point in a global variable.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: a003f0aed80660cbf30c108de7da018233efa023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a003f0aed80660cbf30c108de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 11:59:58 2017 +0200 ntdll: Store the kernel32 process entry point in a global variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 17 +++-------------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 1 + 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 295b5e8..1bfd8f1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -100,12 +100,6 @@ struct builtin_load_info static struct builtin_load_info default_load_info; static struct builtin_load_info *builtin_load_info = &default_load_info; -struct start_params -{ - void *kernel_start; - LPTHREAD_START_ROUTINE entry; -}; - static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ @@ -3106,8 +3100,7 @@ static void load_global_options(void) */ static void start_process( void *arg ) { - struct start_params *start_params = (struct start_params *)arg; - call_thread_entry_point( start_params->kernel_start, start_params->entry ); + call_thread_entry_point( kernel32_start_process, arg ); } /****************************************************************** @@ -3122,8 +3115,8 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; - struct start_params start_params; + kernel32_start_process = kernel_start; if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ /* allocate the modref for the main exe (if not already done) */ @@ -3159,16 +3152,12 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() ); - /* Store original entrypoint (in case it gets corrupted) */ - start_params.kernel_start = kernel_start; - start_params.entry = wm->ldr.EntryPoint; - status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; virtual_release_address_space(); virtual_clear_thread_stack(); - wine_switch_to_stack( start_process, &start_params, NtCurrentTeb()->Tib.StackBase ); + wine_switch_to_stack( start_process, wm->ldr.EntryPoint, NtCurrentTeb()->Tib.StackBase ); error: ERR( "Main exe initialization for %s failed, status %x\n", diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 7b13448..baa10ce 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -114,6 +114,7 @@ extern UNICODE_STRING system_dir DECLSPEC_HIDDEN; typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter DECLSPEC_HIDDEN; +extern LPTHREAD_START_ROUTINE kernel32_start_process DECLSPEC_HIDDEN; /* redefine these to make sure we don't reference kernel symbols */ #define GetProcessHeap() (NtCurrentTeb()->Peb->ProcessHeap) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6ded7ea..85ceb2b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -51,6 +51,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); struct _KUSER_SHARED_DATA *user_shared_data = NULL; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; +LPTHREAD_START_ROUTINE kernel32_start_process = NULL; /* info passed to a starting thread */ struct startup_info

1 0

Alexandre Julliard : ntdll: Don' t clear the last page of the initial stack.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 9979c793e80cf91d15efb3b87f99080b59f0450b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9979c793e80cf91d15efb3b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:03:09 2017 +0200 ntdll: Don't clear the last page of the initial stack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/virtual.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1bfd8f1..31d8323 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3152,7 +3152,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() ); - status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); + status = wine_call_on_stack( attach_process_dlls, wm, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); if (status != STATUS_SUCCESS) goto error; virtual_release_address_space(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e4896ea..a452c58 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1745,8 +1745,8 @@ void virtual_clear_thread_stack(void) void *stack = NtCurrentTeb()->Tib.StackLimit; size_t size = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; - wine_anon_mmap( stack, size, PROT_READ | PROT_WRITE, MAP_FIXED ); - if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); + wine_anon_mmap( stack, size - page_size, PROT_READ | PROT_WRITE, MAP_FIXED ); + if (force_exec_prot) mprotect( stack, size - page_size, PROT_READ | PROT_WRITE | PROT_EXEC ); }

1 0

Anton Romanov : secur32: Fix race between schan_(Encrypt|Decrypt)Message.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 3c40ffbfad793af11225cbb55f08b88278a9816a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c40ffbfad793af11225cbb55… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Fri Sep 15 22:40:02 2017 -0700 secur32: Fix race between schan_(Encrypt|Decrypt)Message. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 82374ef..88b6521 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -57,6 +57,7 @@ struct schan_handle struct schan_context { schan_imp_session session; + struct schan_transport transport; ULONG req_ctx_attr; const CERT_CONTEXT *cert; }; @@ -789,7 +790,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_context *ctx; struct schan_buffers *out_buffers; struct schan_credentials *cred; - struct schan_transport transport; SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; @@ -833,6 +833,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } + ctx->transport.ctx = ctx; + schan_imp_set_session_transport(ctx->session, &ctx->transport); + if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); @@ -891,24 +894,22 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; - transport.ctx = ctx; - init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); - transport.in.limit = expected_size; - init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); - schan_imp_set_session_transport(ctx->session, &transport); + init_schan_buffers(&ctx->transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); + ctx->transport.in.limit = expected_size; + init_schan_buffers(&ctx->transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); /* Perform the TLS handshake */ ret = schan_imp_handshake(ctx->session); - if(transport.in.offset && transport.in.offset != pInput->pBuffers[0].cbBuffer) { + if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) return SEC_E_INVALID_TOKEN; pInput->pBuffers[1].BufferType = SECBUFFER_EXTRA; - pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-transport.in.offset; + pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - out_buffers = &transport.out; + out_buffers = &ctx->transport.out; if (out_buffers->current_buffer_idx != -1) { SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; @@ -1205,7 +1206,6 @@ static int schan_encrypt_message_get_next_buffer_token(const struct schan_transp static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, ULONG quality, PSecBufferDesc message, ULONG message_seq_no) { - struct schan_transport transport; struct schan_context *ctx; struct schan_buffers *b; SECURITY_STATUS status; @@ -1235,13 +1235,10 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle data = HeapAlloc(GetProcessHeap(), 0, data_size); memcpy(data, buffer->pvBuffer, data_size); - transport.ctx = ctx; - init_schan_buffers(&transport.in, NULL, NULL); if (schan_find_sec_buffer_idx(message, 0, SECBUFFER_STREAM_HEADER) != -1) - init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer); + init_schan_buffers(&ctx->transport.out, message, schan_encrypt_message_get_next_buffer); else - init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer_token); - schan_imp_set_session_transport(ctx->session, &transport); + init_schan_buffers(&ctx->transport.out, message, schan_encrypt_message_get_next_buffer_token); length = data_size; status = schan_imp_send(ctx->session, data, &length); @@ -1251,7 +1248,7 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle if (length != data_size) status = SEC_E_INTERNAL_ERROR; - b = &transport.out; + b = &ctx->transport.out; b->desc->pBuffers[b->current_buffer_idx].cbBuffer = b->offset; HeapFree(GetProcessHeap(), 0, data); @@ -1327,7 +1324,6 @@ static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { - struct schan_transport transport; struct schan_context *ctx; SecBuffer *buffer; SIZE_T data_size; @@ -1371,11 +1367,8 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle data_size = expected_size - 5; data = HeapAlloc(GetProcessHeap(), 0, data_size); - transport.ctx = ctx; - init_schan_buffers(&transport.in, message, schan_decrypt_message_get_next_buffer); - transport.in.limit = expected_size; - init_schan_buffers(&transport.out, NULL, NULL); - schan_imp_set_session_transport(ctx->session, &transport); + init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); + ctx->transport.in.limit = expected_size; while (received < data_size) {

1 0

Andrey Gusev : api-ms-win-mm-joystick-l1-1-0: Add dll.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 302153117e20b62c9170aed62aa33e83cacfaf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302153117e20b62c9170aed62… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Sep 17 20:48:47 2017 +0300 api-ms-win-mm-joystick-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in | 1 + .../api-ms-win-mm-joystick-l1-1-0.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 90fde59..6643778 100755 --- a/configure +++ b/configure @@ -1031,6 +1031,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_legacy_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 +enable_api_ms_win_mm_joystick_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 @@ -18094,6 +18095,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event wine_fn_config_dll api-ms-win-eventing-legacy-l1-1-0 enable_api_ms_win_eventing_legacy_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-mm-joystick-l1-1-0 enable_api_ms_win_mm_joystick_l1_1_0 wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 diff --git a/configure.ac b/configure.ac index f01162b..f5a617c 100644 --- a/configure.ac +++ b/configure.ac @@ -2884,6 +2884,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-mm-joystick-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) diff --git a/dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in b/dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in new file mode 100644 index 0000000..0da1efb --- /dev/null +++ b/dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-joystick-l1-1-0.dll diff --git a/dlls/api-ms-win-mm-joystick-l1-1-0/api-ms-win-mm-joystick-l1-1-0.spec b/dlls/api-ms-win-mm-joystick-l1-1-0/api-ms-win-mm-joystick-l1-1-0.spec new file mode 100644 index 0000000..f9748d5 --- /dev/null +++ b/dlls/api-ms-win-mm-joystick-l1-1-0/api-ms-win-mm-joystick-l1-1-0.spec @@ -0,0 +1,10 @@ +@ stdcall joyConfigChanged(long) winmm.joyConfigChanged +@ stdcall joyGetDevCapsA(long ptr long) winmm.joyGetDevCapsA +@ stdcall joyGetDevCapsW(long ptr long) winmm.joyGetDevCapsW +@ stdcall joyGetNumDevs() winmm.joyGetNumDevs +@ stdcall joyGetPos(long ptr) winmm.joyGetPos +@ stdcall joyGetPosEx(long ptr) winmm.joyGetPosEx +@ stdcall joyGetThreshold(long ptr) winmm.joyGetThreshold +@ stdcall joyReleaseCapture(long) winmm.joyReleaseCapture +@ stdcall joySetCapture(long long long long) winmm.joySetCapture +@ stdcall joySetThreshold(long long) winmm.joySetThreshold diff --git a/tools/make_specfiles b/tools/make_specfiles index 3332313..a49dff9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -342,6 +342,7 @@ my @dll_groups = ], [ "winmm", + "api-ms-win-mm-joystick-l1-1-0", "api-ms-win-mm-misc-l1-1-1", "api-ms-win-mm-mme-l1-1-0", "api-ms-win-mm-time-l1-1-0",

1 0

Fabian Maurer : strmiids: Add evr interface GUIDS.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 8fef79d48b4efeae020887364a1fcd3c6da3ca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fef79d48b4efeae020887364… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 18 18:24:12 2017 +0200 strmiids: Add evr interface GUIDS. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmiids/Makefile.in | 1 + dlls/strmiids/evr.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index baf7019..09edc70 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,5 @@ MODULE = libstrmiids.a C_SRCS = \ + evr.c \ strmiids.c diff --git a/dlls/strmiids/evr.c b/dlls/strmiids/evr.c new file mode 100644 index 0000000..74ec145 --- /dev/null +++ b/dlls/strmiids/evr.c @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Fabian Maurer + * + * 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 + */ + +/* Don't define those GUIDs here */ +#include "propidl.h" +#include "mfidl.h" + +#include "initguid.h" + +#include "evr.h"

1 0