October 2018 - Wine-commits

Matteo Bruni : wined3d: Add fallback to EXT_polygon_offset_clamp.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: b34a21740f4bc8d7d7d27ad462a4de7fc078cfcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34a21740f4bc8d7d7d27ad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:56 2018 +0200 wined3d: Add fallback to EXT_polygon_offset_clamp. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 16a26b8..cedfe23 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, {"GL_EXT_packed_float", EXT_PACKED_FLOAT }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS }, + {"GL_EXT_polygon_offset_clamp", ARB_POLYGON_OFFSET_CLAMP }, {"GL_EXT_provoking_vertex", EXT_PROVOKING_VERTEX }, {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR }, {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE }, @@ -2481,6 +2482,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) + /* GL_EXT_polgyon_offset_clamp */ + USE_GL_FUNC(glPolygonOffsetClampEXT) /* GL_EXT_provoking_vertex */ USE_GL_FUNC(glProvokingVertexEXT) /* GL_EXT_secondary_color */ @@ -2774,6 +2777,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION(glMinSampleShading, glMinSampleShadingARB); + MAP_GL_FUNCTION(glPolygonOffsetClamp, glPolygonOffsetClampEXT); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT);

1 0

Matteo Bruni : wined3d: Avoid using GL_MAX_VARYING_FLOATS_ARB in core profile contexts.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 985b96b09e3608498ca717abe384a5d37fab31e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=985b96b09e3608498ca717ab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:57 2018 +0200 wined3d: Avoid using GL_MAX_VARYING_FLOATS_ARB in core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cedfe23..99df19c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3079,9 +3079,18 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); gl_info->limits.glsl_ps_float_constants = gl_max / 4; TRACE("Max ARB_FRAGMENT_SHADER float constants: %u.\n", gl_info->limits.glsl_ps_float_constants); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max); - gl_info->limits.glsl_varyings = gl_max; - TRACE("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max); + gl_info->limits.glsl_varyings = gl_max; + } + else + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_INPUT_COMPONENTS, &gl_max); + gl_info->limits.glsl_varyings = gl_max - 4; + } + TRACE("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_info->limits.glsl_varyings, + gl_info->limits.glsl_varyings / 4); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) {

1 0

Jacek Caban : ntdll/tests: Use FILE_INFORMATION_CLASS values instead of hardcoded numbers.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: a0669eeeadfe3bb57b46ce8bc7434ad9d7f6045f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0669eeeadfe3bb57b46ce8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 17:50:06 2018 +0200 ntdll/tests: Use FILE_INFORMATION_CLASS values instead of hardcoded numbers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index ebf228d..dcd7c3c 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -218,7 +218,7 @@ static void test_create_invalid(void) 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); ok(!res, "NtCreateNamedPipeFile returned %x\n", res); - res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), FilePipeLocalInformation); ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res); /* test FILE_CREATE creation disposition */ @@ -258,14 +258,14 @@ static void test_create(void) res = listen_pipe(hserver, hEvent, &iosb, FALSE); ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); - res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), FilePipeLocalInformation); ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", info.NamedPipeConfiguration, pipe_config[j]); hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); if (hclient != INVALID_HANDLE_VALUE) { - res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), FilePipeLocalInformation); ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", res, access[k], sharing[j]); ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", @@ -564,7 +564,7 @@ static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG if (handle != INVALID_HANDLE_VALUE) { memset(&fpi, 0x55, sizeof(fpi)); - res = pNtQueryInformationFile(handle, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtQueryInformationFile(handle, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok_(__FILE__, line)(!res, "NtQueryInformationFile returned %x\n", res); ok_(__FILE__, line)(fpi.ReadMode == read, "Unexpected ReadMode, expected %x, got %x\n", read, fpi.ReadMode); @@ -597,12 +597,12 @@ static void test_filepipeinfo(void) timeout.QuadPart = -100000000; /* test with INVALID_HANDLE_VALUE */ - res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtQueryInformationFile returned %x\n", res); fpi.ReadMode = 0; fpi.CompletionMode = 0; - res = pNtSetInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtSetInformationFile returned %x\n", res); /* server end with read-only attributes */ @@ -622,7 +622,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 0; fpi.CompletionMode = 0; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 0, 1); @@ -630,7 +630,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 1; /* invalid on a byte stream pipe */ fpi.CompletionMode = 1; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 0, 1); @@ -640,7 +640,7 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 1; /* invalid on a byte stream pipe */ fpi.CompletionMode = 1; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER, "NtSetInformationFile returned %x\n", res); } @@ -651,7 +651,7 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 0; fpi.CompletionMode = 1; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); } @@ -662,12 +662,12 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 0; fpi.CompletionMode = 2; /* not in range 0-1 */ - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); fpi.ReadMode = 2; /* not in range 0-1 */ fpi.CompletionMode = 0; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); } @@ -677,7 +677,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 0; fpi.CompletionMode = 0; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); CloseHandle(hServer); @@ -701,7 +701,7 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 1; fpi.CompletionMode = 1; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); } @@ -710,7 +710,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 0; fpi.CompletionMode = 1; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 0, 1); @@ -720,12 +720,12 @@ static void test_filepipeinfo(void) { fpi.ReadMode = 0; fpi.CompletionMode = 2; /* not in range 0-1 */ - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); fpi.ReadMode = 2; /* not in range 0-1 */ fpi.CompletionMode = 0; - res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); } @@ -735,7 +735,7 @@ static void test_filepipeinfo(void) fpi.ReadMode = 1; fpi.CompletionMode = 0; - res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation); ok(!res, "NtSetInformationFile returned %x\n", res); check_pipe_handle_state(hServer, 1, 0);

1 0

Hans Leidekker : wbemdisp: Implement ISWbemPropertySet::get_Count.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: ce923c3f57574262b966c881ad42516c2d3dd803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce923c3f57574262b966c881… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 19:17:32 2018 +0200 wbemdisp: Implement ISWbemPropertySet::get_Count. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40534 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 15 +++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 78b81d8..c307e34 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -438,8 +438,19 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) { - FIXME( "\n" ); - return E_NOTIMPL; + static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + HRESULT hr; + VARIANT val; + + TRACE( "%p, %p\n", propertyset, count ); + + hr = IWbemClassObject_Get( propertyset->object, propcountW, 0, &val, NULL, NULL ); + if (SUCCEEDED(hr)) + { + *count = V_I4( &val ); + } + return hr; } static HRESULT WINAPI propertyset_Add( ISWbemPropertySet *iface, BSTR name, WbemCimtypeEnum type, diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 68c0e3b..57baf84 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -302,6 +302,7 @@ static void test_locator(void) ISWbemProperty *prop; ISWbemSecurity *security; VARIANT var; + LONG count; WbemImpersonationLevelEnum imp_level; WbemAuthenticationLevelEnum auth_level; @@ -379,6 +380,11 @@ static void test_locator(void) ok( hr == S_OK, "got %x\n", hr ); SysFreeString( procid_bstr ); + count = 0; + hr = ISWbemPropertySet_get_Count( prop_set, &count ); + ok( hr == S_OK, "got %x\n", hr ); + ok( count > 0, "got %d\n", count ); + hr = ISWbemProperty_get_Value( prop, &var ); ok( hr == S_OK, "got %x\n", hr ); ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) );

1 0

Serge Gautherie : ddraw: Get rid of a redundant assignment in ddraw7_GetDisplayMode().
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: ff64475e99973b24e4679736cff2c08805805ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff64475e99973b24e4679736… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Oct 12 21:09:10 2018 +0330 ddraw: Get rid of a redundant assignment in ddraw7_GetDisplayMode(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9e06ee..43bc36b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1648,11 +1648,10 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 memset(DDSD, 0, DDSD->dwSize); DDSD->dwSize = sizeof(*DDSD); - DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; DDSD->u2.dwRefreshRate = 60; - DDSD->ddsCaps.dwCaps = 0; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8;

1 0

Alexandre Julliard : Release 3.18.
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: master Commit: 3f4455c0f043650151873d899e6f7526b994fa93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4455c0f043650151873d89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 13 00:59:01 2018 +0200 Release 3.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 667 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 293 insertions(+), 395 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f4455c0f04365015187…

1 0

Tag wine-3.18 : Alexandre Julliard : Release 3.18
by Alexandre Julliard 12 Oct '18

12 Oct '18

Module: wine Branch: refs/tags/wine-3.18 Tag: 77bead7d8cee04eea59824352ccd2f737633e61f URL: https://source.winehq.org/git/wine.git/?a=tag;h=77bead7d8cee04eea59824352cc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 13 00:59:01 2018 +0200 Release 3.18

1 0

Alexandre Julliard : server: Also return CPU type in the mapping image information.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: wine Branch: master Commit: 33584dc12ce9ec4aaa2adc77b581beff448134de URL: https://source.winehq.org/git/wine.git/?a=commit;h=33584dc12ce9ec4aaa2adc77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 15:12:29 2018 +0200 server: Also return CPU type in the mapping image information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 ++- server/mapping.c | 5 +++++ server/protocol.def | 1 + server/trace.c | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e8611ce..3114c1c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -700,6 +700,7 @@ typedef struct unsigned int header_size; unsigned int file_size; unsigned int checksum; + cpu_type_t cpu; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02 @@ -6531,6 +6532,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 565 +#define SERVER_PROTOCOL_VERSION 566 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index 2955766..affe8fc 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -600,14 +600,17 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.FileHeader.Machine) { case IMAGE_FILE_MACHINE_I386: + mapping->image.cpu = CPU_x86; if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_ARM: case IMAGE_FILE_MACHINE_THUMB: case IMAGE_FILE_MACHINE_ARMNT: + mapping->image.cpu = CPU_ARM; if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_POWERPC: + mapping->image.cpu = CPU_POWERPC; if (cpu_mask & CPU_FLAG(CPU_POWERPC)) break; return STATUS_INVALID_IMAGE_FORMAT; default: @@ -643,9 +646,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.FileHeader.Machine) { case IMAGE_FILE_MACHINE_AMD64: + mapping->image.cpu = CPU_x86_64; if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_ARM64: + mapping->image.cpu = CPU_ARM64; if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; return STATUS_INVALID_IMAGE_FORMAT; default: diff --git a/server/protocol.def b/server/protocol.def index 1a76f22..e72dea6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -716,6 +716,7 @@ typedef struct unsigned int header_size; unsigned int file_size; unsigned int checksum; + cpu_type_t cpu; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02 diff --git a/server/trace.c b/server/trace.c index 5140ab1..6ccc777 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1177,10 +1177,12 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) dump_uint64( ",stack_commit=", &info.stack_commit ); fprintf( stderr, ",zerobits=%08x,subsystem=%08x,subsystem_low=%04x,subsystem_high=%04x,gp=%08x" ",image_charact=%04x,dll_charact=%04x,machine=%04x,contains_code=%u,image_flags=%02x" - ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x}", + ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x", info.zerobits, info.subsystem, info.subsystem_low, info.subsystem_high, info.gp, info.image_charact, info.dll_charact, info.machine, info.contains_code, info.image_flags, info.loader_flags, info.header_size, info.file_size, info.checksum ); + dump_cpu_type( ",cpu=", &info.cpu ); + fputc( '}', stderr ); remove_data( size ); }

1 0

Alexandre Julliard : kernel32: Use the CPU type from the image information in CreateProcess().
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: wine Branch: master Commit: 0964b3cd1329f2bf7e56026362abebcb5cf94ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0964b3cd1329f2bf7e560263… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 16:54:19 2018 +0200 kernel32: Use the CPU type from the image information in CreateProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 93 ++++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0964b3cd1329f2bf7e56…

1 0

Alexandre Julliard : kernel32: Build a standard process parameters structure in CreateProcess().
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: wine Branch: master Commit: 79e2afaaaeefb5ffcd3a09ea8668b4a9354993f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e2afaaaeefb5ffcd3a09ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 17:48:25 2018 +0200 kernel32: Build a standard process parameters structure in CreateProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 208 ++++++++++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79e2afaaaeefb5ffcd3a…

1 0