August 2020 - Wine-Commits - list.winehq.org

Louis Lenders : ntdll: RtlConvertToAutoInheritSecurityObject is NTSTATUS, not BOOL.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 518d06404ad70aa9812a77d019a18fe79c16f831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=518d06404ad70aa9812a77d0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Aug 31 08:37:32 2020 +0200 ntdll: RtlConvertToAutoInheritSecurityObject is NTSTATUS, not BOOL. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 70828a76c6..c0f962f056 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1707,7 +1707,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl( return status; } -BOOL WINAPI RtlConvertToAutoInheritSecurityObject( +NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( PSECURITY_DESCRIPTOR pdesc, PSECURITY_DESCRIPTOR cdesc, PSECURITY_DESCRIPTOR* ndesc, @@ -1717,5 +1717,5 @@ BOOL WINAPI RtlConvertToAutoInheritSecurityObject( { FIXME("%p %p %p %p %d %p - stub\n", pdesc, cdesc, ndesc, objtype, isdir, genmap); - return FALSE; + return STATUS_NOT_IMPLEMENTED; }

1 0

Zebediah Figura : winegstreamer: Fix a leak in gstdecoder_source_get_media_type().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 0c34a2c97a9e21847eb965ef869e345be7503266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c34a2c97a9e21847eb965ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 29 12:37:36 2020 -0500 winegstreamer: Fix a leak in gstdecoder_source_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e8f65a0e6e..2c9aafd7a6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1713,6 +1713,7 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, gst_caps_unref(caps); return S_OK; } + FreeMediaType(mt); } if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats))

1 0

Zebediah Figura : amstream/tests: Get rid of test_renderfile().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 5f71e720fd7532e72b6e506d5a856d63f51959b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f71e720fd7532e72b6e506d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 29 12:37:38 2020 -0500 amstream/tests: Get rid of test_renderfile(). It's not testing anything anymore that's not tested elsewhere. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 122 ----------------------------------------- 1 file changed, 122 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 746a956303..b9b4092197 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -102,9 +102,6 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -static IDirectDraw7* pdd7; -static IDirectDrawSurface7* pdds7; - static IAMMultiMediaStream *create_ammultimediastream(void) { IAMMultiMediaStream *stream = NULL; @@ -114,50 +111,6 @@ static IAMMultiMediaStream *create_ammultimediastream(void) return stream; } -static int create_directdraw(void) -{ - HRESULT hr; - IDirectDraw* pdd = NULL; - DDSURFACEDESC2 ddsd; - - hr = DirectDrawCreate(NULL, &pdd, NULL); - ok(hr==DD_OK, "DirectDrawCreate returned: %x\n", hr); - if (hr != DD_OK) - goto error; - - hr = IDirectDraw_QueryInterface(pdd, &IID_IDirectDraw7, (LPVOID*)&pdd7); - ok(hr==DD_OK, "QueryInterface returned: %x\n", hr); - if (hr != DD_OK) goto error; - - hr = IDirectDraw7_SetCooperativeLevel(pdd7, GetDesktopWindow(), DDSCL_NORMAL); - ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); - - ZeroMemory(&ddsd, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw7_CreateSurface(pdd7, &ddsd, &pdds7, NULL); - ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); - - return TRUE; - -error: - if (pdds7) - IDirectDrawSurface7_Release(pdds7); - if (pdd7) - IDirectDraw7_Release(pdd7); - if (pdd) - IDirectDraw_Release(pdd); - - return FALSE; -} - -static void release_directdraw(void) -{ - IDirectDrawSurface7_Release(pdds7); - IDirectDraw7_Release(pdd7); -} - static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -449,74 +402,6 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_renderfile(const WCHAR *test_avi_path) -{ - IAMMultiMediaStream *pams; - HRESULT hr; - IMediaStream *pvidstream = NULL; - IDirectDrawMediaStream *pddstream = NULL; - IDirectDrawStreamSample *pddsample = NULL; - IDirectDrawSurface *surface; - RECT rect; - - if (!(pams = create_ammultimediastream())) - return; - if (!create_directdraw()) - { - IAMMultiMediaStream_Release(pams); - return; - } - - hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); - ok(hr==S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); - - hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); - ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); - - hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); - ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); - - hr = IAMMultiMediaStream_OpenFile(pams, test_avi_path, 0); - ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); - - hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); - ok(hr==S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); - if (FAILED(hr)) goto error; - - hr = IMediaStream_QueryInterface(pvidstream, &IID_IDirectDrawMediaStream, (LPVOID*)&pddstream); - ok(hr==S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); - if (FAILED(hr)) goto error; - - hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); - ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); - - surface = NULL; - hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface != NULL, "Expected non-NULL surface.\n"); - IDirectDrawSurface_Release(surface); - IDirectDrawStreamSample_Release(pddsample); - - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); - ok(hr == S_OK, "got 0x%08x\n", hr); - - EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, &rect, 0, &pddsample); - ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); - EXPECT_REF(surface, 2); - IDirectDrawStreamSample_Release(pddsample); - IDirectDrawSurface_Release(surface); - -error: - if (pddstream) - IDirectDrawMediaStream_Release(pddstream); - if (pvidstream) - IMediaStream_Release(pvidstream); - - release_directdraw(); - IAMMultiMediaStream_Release(pams); -} - static const GUID test_mspid = {0x88888888}; struct teststream @@ -1405,11 +1290,6 @@ static void test_media_streams(void) if (!(pams = create_ammultimediastream())) return; - if (!create_directdraw()) - { - IAMMultiMediaStream_Release(pams); - return; - } hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); ok(hr == S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); @@ -1604,7 +1484,6 @@ static void test_media_streams(void) if (media_stream_filter) IMediaStreamFilter_Release(media_stream_filter); - release_directdraw(); IAMMultiMediaStream_Release(pams); } @@ -5906,7 +5785,6 @@ START_TEST(amstream) test_openfile(test_avi_path); test_mmstream_get_duration(test_avi_path); - test_renderfile(test_avi_path); unload_resource(test_avi_path);

1 0

Zebediah Figura : amstream/tests: Avoid leaking "stream" in test_find_pin().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: b02de178ebef84ba8686f3e55cc3fd1a1a39f9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02de178ebef84ba8686f3e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 29 12:37:37 2020 -0500 amstream/tests: Avoid leaking "stream" in test_find_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f4c033a180..746a956303 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1766,6 +1766,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin); + IMediaStream_Release(stream); IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : quartz/vmr9: Avoid leaking the presenter's reference to the d3d9 device.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: f4d66140ad61597e918b94077f18dbb98f524e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d66140ad61597e918b9407… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 29 12:37:35 2020 -0500 quartz/vmr9: Avoid leaking the presenter's reference to the d3d9 device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 28123dcf7d..5f95f547e3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2622,6 +2622,8 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9_Release(surface); } + if (This->d3d9_dev) + IDirect3DDevice9_Release(This->d3d9_dev); free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0;

1 0

Biswapriyo Nath : include/d3dcommon.idl: Add missing names in D3D_SHADER_VARIABLE_TYPE enum.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 9702ee8d76f7b3233a43a9aa7c78917f26fdbdfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9702ee8d76f7b3233a43a9aa… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add missing names in D3D_SHADER_VARIABLE_TYPE enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 586dec29ed..90243ebc2c 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -215,6 +215,12 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_RWSTRUCTURED_BUFFER, D3D_SVT_APPEND_STRUCTURED_BUFFER, D3D_SVT_CONSUME_STRUCTURED_BUFFER, + D3D_SVT_MIN8FLOAT, + D3D_SVT_MIN10FLOAT, + D3D_SVT_MIN16FLOAT, + D3D_SVT_MIN12INT, + D3D_SVT_MIN16INT, + D3D_SVT_MIN16UINT, D3D10_SVT_VOID = 0, D3D10_SVT_BOOL, D3D10_SVT_INT,

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 09e683ca97a40d3f692cf587cab7281840c8d0dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e683ca97a40d3f692cf587… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Mon Aug 31 10:37:39 2020 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 234 ++++++++++++++++++++---------------------------------------- 1 file changed, 77 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09e683ca97a40d3f692c…

1 0

Aaro Altonen : ws2_32: Improve WSCGetProviderPath() stub.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 652f1f9642b35a2a1d1c5b67e4326af7d45363b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652f1f9642b35a2a1d1c5b67… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Tue Aug 25 20:27:28 2020 +0200 ws2_32: Improve WSCGetProviderPath() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45801 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 17 ++++++++++--- dlls/ws2_32/tests/sock.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4d2afa946b..b7a570043c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8940,10 +8940,21 @@ INT WINAPI WSCGetProviderPath( LPGUID provider, LPWSTR path, LPINT len, LPINT er { FIXME( "(%s %p %p %p) Stub!\n", debugstr_guid(provider), path, len, errcode ); - if (!errcode || !provider || !len) return WSAEFAULT; + if (!provider || !len) + { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - *errcode = WSAEINVAL; - return SOCKET_ERROR; + if (*len <= 0) + { + if (errcode) + *errcode = WSAEINVAL; + return SOCKET_ERROR; + } + + return 0; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b523c326d6..c7f88d6f3b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -86,6 +86,7 @@ static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA) static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); static int (WINAPI *pWSCGetProviderInfo)(LPGUID,WSC_PROVIDER_INFO_TYPE,PBYTE,size_t*,DWORD,LPINT); +static int (WINAPI *pWSCGetProviderPath)(LPGUID, LPWSTR, LPINT, LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1303,6 +1304,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); pWSCGetProviderInfo = (void *)GetProcAddress(hws2_32, "WSCGetProviderInfo"); + pWSCGetProviderPath = (void *)GetProcAddress(hws2_32, "WSCGetProviderPath"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -11351,6 +11353,65 @@ static void test_WSCGetProviderInfo(void) ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); } +static void test_WSCGetProviderPath(void) +{ + GUID provider = {}; + WCHAR buffer[256]; + INT ret, err, len; + + if (!pWSCGetProviderPath) + { + skip("WSCGetProviderPath is not available.\n"); + return; + } + + ret = pWSCGetProviderPath(NULL, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(&provider, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(NULL, buffer, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + len = -1; + ret = pWSCGetProviderPath(NULL, NULL, &len, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(len == -1, "Got unexpected len %d.\n", len); + + err = 0; + ret = pWSCGetProviderPath(NULL, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + err = 0; + ret = pWSCGetProviderPath(&provider, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + err = 0; + len = -1; + ret = pWSCGetProviderPath(&provider, NULL, &len, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == -1, "Got unexpected len %d.\n", len); + + err = 0; + len = 256; + ret = pWSCGetProviderPath(&provider, NULL, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == 256, "Got unexpected len %d.\n", len); + + /* Valid pointers and length but invalid GUID */ + err = 0; + len = 256; + ret = pWSCGetProviderPath(&provider, buffer, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == 256, "Got unexpected len %d.\n", len); +} + START_TEST( sock ) { int i; @@ -11432,6 +11493,7 @@ START_TEST( sock ) test_address_list_query(); test_WSCGetProviderInfo(); + test_WSCGetProviderPath(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Biswapriyo Nath : include/d3dcommon.idl: Add missing names in D3D_SHADER_INPUT_TYPE enum.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 9e59345fadb506ba24616f1ab3bb63db966d9cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e59345fadb506ba24616f1a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add missing names in D3D_SHADER_INPUT_TYPE enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 69e4143c40..05577d34da 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -694,6 +694,8 @@ typedef enum _D3D_SHADER_INPUT_TYPE D3D_SIT_UAV_APPEND_STRUCTURED, D3D_SIT_UAV_CONSUME_STRUCTURED, D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, + D3D_SIT_RTACCELERATIONSTRUCTURE, + D3D_SIT_UAV_FEEDBACKTEXTURE, D3D10_SIT_CBUFFER = 0, D3D10_SIT_TBUFFER, D3D10_SIT_TEXTURE,

1 0

Alexandre Julliard : kernel32: Move the initial process breakpoint to LdrInitializeThunk().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 2b40969c58a099f958c58909b666915991a42979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b40969c58a099f958c58909… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 31 11:30:41 2020 +0200 kernel32: Move the initial process breakpoint to LdrInitializeThunk(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 -------------- dlls/ntdll/loader.c | 24 ++++++++++++++++++++ dlls/ntdll/tests/exception.c | 52 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index bf8f056ada..9d725e1a43 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -136,8 +136,6 @@ void CDECL start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) #endif { - BOOL being_debugged; - if (!entry) { ERR( "%s doesn't have an entry point, it cannot be executed\n", @@ -148,20 +146,6 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) TRACE_(relay)( "\1Starting process %s (entryproc=%p)\n", debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); - __TRY - { - if (!CheckRemoteDebuggerPresent( GetCurrentProcess(), &being_debugged )) - being_debugged = FALSE; - - SetLastError( 0 ); /* clear error code */ - if (being_debugged) DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY - __TRY { ExitThread( call_process_entry( peb, entry )); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8e76e39fa5..57fc75cef4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3407,6 +3407,29 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) return ret; } +/*********************************************************************** + * process_breakpoint + * + * Trigger a debug breakpoint if the process is being debugged. + */ +static void process_breakpoint(void) +{ + DWORD_PTR port = 0; + + NtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL ); + if (!port) return; + + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY +} + /****************************************************************** * LdrInitializeThunk (NTDLL.@) @@ -3494,6 +3517,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); + process_breakpoint(); } else { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ca0dec2a62..a9b32f0586 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1049,7 +1049,18 @@ static void test_debugger(void) ok(FALSE, "got way too many exceptions, probably caught in an infinite loop, terminating child\n"); pNtTerminateProcess(pi.hProcess, 1); } - else if (counter >= 2) /* skip startup breakpoint */ + else if (counter < 2) /* startup breakpoint */ + { + /* breakpoint is inside ntdll */ + void *ntdll = GetModuleHandleA( "ntdll.dll" ); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( ntdll ); + + ok( (char *)ctx.Eip >= (char *)ntdll && + (char *)ctx.Eip < (char *)ntdll + nt->OptionalHeader.SizeOfImage, + "wrong eip %p ntdll %p-%p\n", (void *)ctx.Eip, ntdll, + (char *)ntdll + nt->OptionalHeader.SizeOfImage ); + } + else { if (stage == 1) { @@ -3223,7 +3234,18 @@ static void test_debugger(void) ok(FALSE, "got way too many exceptions, probably caught in an infinite loop, terminating child\n"); pNtTerminateProcess(pi.hProcess, 1); } - else if (counter >= 2) /* skip startup breakpoint */ + else if (counter < 2) /* startup breakpoint */ + { + /* breakpoint is inside ntdll */ + void *ntdll = GetModuleHandleA( "ntdll.dll" ); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( ntdll ); + + ok( (char *)ctx.Rip >= (char *)ntdll && + (char *)ctx.Rip < (char *)ntdll + nt->OptionalHeader.SizeOfImage, + "wrong rip %p ntdll %p-%p\n", (void *)ctx.Rip, ntdll, + (char *)ntdll + nt->OptionalHeader.SizeOfImage ); + } + else { if (stage == 1) { @@ -4083,7 +4105,18 @@ static void test_debugger(void) ok(FALSE, "got way too many exceptions, probably caught in an infinite loop, terminating child\n"); pNtTerminateProcess(pi.hProcess, 1); } - else if (counter >= 2) /* skip startup breakpoint */ + else if (counter < 2) /* startup breakpoint */ + { + /* breakpoint is inside ntdll */ + void *ntdll = GetModuleHandleA( "ntdll.dll" ); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( ntdll ); + + ok( (char *)ctx.Pc >= (char *)ntdll && + (char *)ctx.Pc < (char *)ntdll + nt->OptionalHeader.SizeOfImage, + "wrong pc %p ntdll %p-%p\n", (void *)ctx.Pc, ntdll, + (char *)ntdll + nt->OptionalHeader.SizeOfImage ); + } + else { #if 0 /* RtlRaiseException test disabled for now */ if (stage == 1) @@ -5010,7 +5043,18 @@ static void test_debugger(void) ok(FALSE, "got way too many exceptions, probably caught in an infinite loop, terminating child\n"); pNtTerminateProcess(pi.hProcess, 1); } - else if (counter >= 2) /* skip startup breakpoint */ + else if (counter < 2) /* startup breakpoint */ + { + /* breakpoint is inside ntdll */ + void *ntdll = GetModuleHandleA( "ntdll.dll" ); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( ntdll ); + + ok( (char *)ctx.Pc >= (char *)ntdll && + (char *)ctx.Pc < (char *)ntdll + nt->OptionalHeader.SizeOfImage, + "wrong pc %p ntdll %p-%p\n", (void *)ctx.Pc, ntdll, + (char *)ntdll + nt->OptionalHeader.SizeOfImage ); + } + else { #if 0 /* RtlRaiseException test disabled for now */ if (stage == 1)

1 0