wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Zebediah Figura : dinput/tests: Don't pump messages in test_acquire().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 292e43263f60c602ae35658f29cba3eda85272e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=292e43263f60c602ae35658f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:59 2017 -0500 dinput/tests: Don't pump messages in test_acquire(). This causes intermittent failures due to implementation of our window drivers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51895145fd67d3dd055888caaba7af413e4753f6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 262ed0e..0f9e375 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -93,7 +93,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; - MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -132,7 +131,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Nikolay Sivov : advapi32: Partially implement LsaLookupPrivilegeName().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: f13ad9e3169bf365cbe4a82c7301edba5acc0d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13ad9e3169bf365cbe4a82c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:19 2017 +0300 advapi32: Partially implement LsaLookupPrivilegeName(). Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c8427e0dc59edcbafc3d664d92f04063c69c30c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 1 + dlls/advapi32/lsa.c | 32 ++++++++++++++++++++++++++------ dlls/advapi32/security.c | 9 +++++++++ dlls/advapi32/tests/lsa.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntlsa.h | 19 +++++++++++++++++++ 6 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 425a7be..240abc8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -34,6 +34,7 @@ WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; +const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* heap allocation helpers */ static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 28d9061..47ed8e5 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -966,11 +966,31 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( * LsaLookupPrivilegeName [ADVAPI32.@] * */ -NTSTATUS WINAPI LsaLookupPrivilegeName( - LSA_HANDLE handle, - LUID *luid, - UNICODE_STRING **name) +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE handle, LUID *luid, LSA_UNICODE_STRING **name) { - FIXME("(%p,%p,%p) stub\n", handle, luid, name); - return STATUS_NO_SUCH_PRIVILEGE; + const WCHAR *privnameW; + DWORD length; + WCHAR *strW; + + TRACE("(%p,%p,%p)\n", handle, luid, name); + + if (!luid || !handle) + return STATUS_INVALID_PARAMETER; + + *name = NULL; + + if (!(privnameW = get_wellknown_privilege_name(luid))) + return STATUS_NO_SUCH_PRIVILEGE; + + length = strlenW(privnameW); + *name = heap_alloc(sizeof(**name) + (length + 1) * sizeof(WCHAR)); + if (!*name) + return STATUS_NO_MEMORY; + + strW = (WCHAR *)(*name + 1); + memcpy(strW, privnameW, length * sizeof(WCHAR)); + strW[length] = 0; + RtlInitUnicodeString(*name, strW); + + return STATUS_SUCCESS; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7e41c0a..9c419a3 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1872,6 +1872,15 @@ static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = SE_CREATE_GLOBAL_NAME_W, }; +const WCHAR *get_wellknown_privilege_name(const LUID *luid) +{ + if (luid->HighPart || luid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || + luid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE || !WellKnownPrivNames[luid->LowPart]) + return NULL; + + return WellKnownPrivNames[luid->LowPart]; +} + /****************************************************************************** * LookupPrivilegeValueW [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 1a0d211..6e3694a 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -32,6 +32,8 @@ #include "objbase.h" #include "initguid.h" #include "wine/test.h" +#include "winternl.h" +#include "ntlsa.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -405,6 +407,39 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupPrivilegeName(void) +{ + LSA_OBJECT_ATTRIBUTES attrs; + LSA_UNICODE_STRING *name; + LSA_HANDLE policy; + NTSTATUS status; + LUID luid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "Failed to open policy, %#x.\n", status); + + name = (void *)0xdeadbeef; + status = LsaLookupPrivilegeName(policy, NULL, &name); + ok(status != STATUS_SUCCESS, "Unexpected status %#x.\n", status); + ok(name == (void *)0xdeadbeef, "Unexpected name pointer.\n"); + + name = (void *)0xdeadbeef; + luid.HighPart = 1; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == STATUS_NO_SUCH_PRIVILEGE, "Unexpected status %#x.\n", status); + ok(name == NULL, "Unexpected name pointer.\n"); + + luid.HighPart = 0; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == 0, "got %#x.\n", status); + LsaFreeMemory(name); +} + START_TEST(lsa) { if (!init()) { @@ -415,4 +450,5 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupPrivilegeName(); } diff --git a/include/Makefile.in b/include/Makefile.in index 0b5e6ad..94d8f75 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -521,6 +521,7 @@ HEADER_SRCS = \ ntddstor.h \ ntdef.h \ ntdsapi.h \ + ntlsa.h \ ntquery.h \ ntsecapi.h \ ntsecpkg.h \ diff --git a/include/ntlsa.h b/include/ntlsa.h new file mode 100644 index 0000000..468c14e --- /dev/null +++ b/include/ntlsa.h @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Alex Henrie : advapi32: Add stub for LsaLookupPrivilegeName.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 6c71e0f52fd8562294517dcf9d401308df461937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c71e0f52fd8562294517dcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 19 09:10:28 2017 -0600 advapi32: Add stub for LsaLookupPrivilegeName. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 252385db7f8d83c4512955875e2d36592e7442c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0ecd4e9..600255d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -446,7 +446,7 @@ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) @ stdcall LsaLookupNames(long long ptr ptr ptr) @ stub LsaLookupPrivilegeDisplayName -# @ stub LsaLookupPrivilegeName +@ stdcall LsaLookupPrivilegeName(long ptr ptr) # @ stub LsaLookupPrivilegeValue @ stdcall LsaLookupSids(ptr long ptr ptr ptr) # @ stub LsaManageSidNameMapping diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 2a8b791..28d9061 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -961,3 +961,16 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( FIXME("(%d,%p) stub\n", class, event); return STATUS_SUCCESS; } + +/****************************************************************************** + * LsaLookupPrivilegeName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaLookupPrivilegeName( + LSA_HANDLE handle, + LUID *luid, + UNICODE_STRING **name) +{ + FIXME("(%p,%p,%p) stub\n", handle, luid, name); + return STATUS_NO_SUCH_PRIVILEGE; +}

1 0

Andrey Gusev : d3dx10: Add D3DX10PreprocessShaderFromMemory stub.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: e2951030e23a9406705381ceb58b17bc318c53af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2951030e23a9406705381ce… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 9 16:25:05 2017 +0200 d3dx10: Add D3DX10PreprocessShaderFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 010119085b4cee3d7edbad2c5a46d35daa95000d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/async.c | 11 +++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10async.h | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index fb988a4..397ec93 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -396,3 +396,14 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } + +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, " + "hresult %p stub!\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 49a6d3a..a36220f 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -57,7 +57,7 @@ @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) -@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) +@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) @ stub D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 6663be4..c8204bc 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -54,6 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader);

1 0

Alexandre Julliard : setupapi: Use correct architecture for fake dlls on ARM and ARM64.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 9b50f08d6d6b086685d8be341e558638c356a566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b50f08d6d6b086685d8be34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 10:41:51 2017 +0100 setupapi: Use correct architecture for fake dlls on ARM and ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35719665d79bc1cc3be19628021a154f563daa51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/fakedll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index d521b0a..d310cc9 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -713,6 +713,10 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR static const char current_arch[] = "x86"; #elif defined __x86_64__ static const char current_arch[] = "amd64"; +#elif defined __arm__ + static const char current_arch[] = "arm"; +#elif defined __aarch64__ + static const char current_arch[] = "arm64"; #else static const char current_arch[] = "none"; #endif

1 0

Józef Kucia : wined3d: Use correct data type for immediate constants.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 5a6f24d2abdc54706fa1ac35e14c0453d6f34516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6f24d2abdc54706fa1ac35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:26 2017 +0200 wined3d: Use correct data type for immediate constants. In order to generate correct GLSL for image stores. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 033df637578ba76201a7ab6d4de1f506108f27b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 78e1764..f0dbe97 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2475,7 +2475,8 @@ static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifi /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) + enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2697,7 +2698,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2714,13 +2715,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; case WINED3D_IMMCONST_VEC4: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2752,7 +2753,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -2874,7 +2875,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); if (wined3d_src->reg.type == WINED3DSPR_IMMCONST || wined3d_src->reg.type == WINED3DSPR_PRIMID) @@ -2925,7 +2926,8 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, glsl_dst->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, + glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3212,7 +3214,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); }

1 0

Alex Henrie : ucrtbase: Add __stdio_common_vsprintf_p.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 98811bc25544d22020820ed6c9e9bb14e914285e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98811bc25544d22020820ed6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 13 20:11:24 2017 +0200 ucrtbase: Add __stdio_common_vsprintf_p. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b6eada458a632e443d653da23f997840ffa5d8c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 33 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6196fb4..8315d3c 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -12,7 +12,7 @@ @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf -@ stub __stdio_common_vsprintf_p +@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2ff9ec8..509f699 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1447,11 +1447,8 @@ int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElemen format, locale, args ); } -/********************************************************************* - * _vsprintf_p_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, - MSVCRT__locale_t locale, __ms_va_list args) +static int MSVCRT_vsprintf_p_l_opt(char *buffer, MSVCRT_size_t length, const char *format, + DWORD options, MSVCRT__locale_t locale, __ms_va_list args) { static const char nullbyte = '\0'; printf_arg args_ctx[MSVCRT__ARGMAX+1]; @@ -1466,11 +1463,11 @@ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *fo *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &args); + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); else ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_positional, args_ctx, NULL); puts_clbk_str_a(&puts_ctx, 1, &nullbyte); @@ -1478,6 +1475,15 @@ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *fo } /********************************************************************* + * _vsprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, + MSVCRT__locale_t locale, __ms_va_list args) +{ + return MSVCRT_vsprintf_p_l_opt(buffer, length, format, 0, locale, args); +} + +/********************************************************************* * _vsprintf_p (MSVCRT.@) */ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, @@ -1487,6 +1493,17 @@ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, } /********************************************************************* + * __stdio_common_vsprintf_p (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer, MSVCRT_size_t length, + const char *format, MSVCRT__locale_t locale, __ms_va_list args) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); +} + +/********************************************************************* * _sprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ee95ee4..deee852 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -157,7 +157,7 @@ @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf -@ stub __stdio_common_vsprintf_p +@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf

1 0

Alexandre Julliard : kernel32: Also set the preloader range for 64-bit binaries.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: ba50246f94a598b66c1d4c9fd1aa5b2bf7bdc0bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba50246f94a598b66c1d4c9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 23 11:35:24 2017 +0200 kernel32: Also set the preloader range for 64-bit binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1d49a57e77c2e18dd0b9e74aa6b71fc95ac57017) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/kernel_private.h | 4 ++-- dlls/kernel32/module.c | 12 +++++++----- dlls/kernel32/process.c | 20 +++++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 76611d7..7e7ee61 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -84,8 +84,8 @@ struct binary_info enum binary_type type; DWORD arch; DWORD flags; - void *res_start; - void *res_end; + ULONGLONG res_start; + ULONGLONG res_end; }; /* module.c */ diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index badfe1d..3179b67 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -319,6 +319,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) { IMAGE_OS2_HEADER os2; IMAGE_NT_HEADERS32 nt; + IMAGE_NT_HEADERS64 nt64; } ext_header; /* We do have a DOS image so we will now try to seek into @@ -347,16 +348,17 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) info->arch = ext_header.nt.FileHeader.Machine; if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) info->flags |= BINARY_FLAG_DLL; - if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ - memset( (char *)&ext_header.nt + len, 0, sizeof(ext_header.nt) - len ); + if (len < sizeof(ext_header)) /* clear remaining part of header if missing */ + memset( (char *)&ext_header + len, 0, sizeof(ext_header) - len ); switch (ext_header.nt.OptionalHeader.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - info->res_start = (void *)(ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase; - info->res_end = (void *)((ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase + - ext_header.nt.OptionalHeader.SizeOfImage); + info->res_start = ext_header.nt.OptionalHeader.ImageBase; + info->res_end = info->res_start + ext_header.nt.OptionalHeader.SizeOfImage; break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + info->res_start = ext_header.nt64.OptionalHeader.ImageBase; + info->res_end = info->res_start + ext_header.nt64.OptionalHeader.SizeOfImage; info->flags |= BINARY_FLAG_64BIT; break; } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e1372fb..595adf9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -207,8 +207,8 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil } binary_info->type = BINARY_UNIX_LIB; binary_info->flags = flags; - binary_info->res_start = NULL; - binary_info->res_end = NULL; + binary_info->res_start = 0; + binary_info->res_end = 0; /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) binary_info->arch = (flags & BINARY_FLAG_64BIT) ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; @@ -1916,8 +1916,9 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, signal( SIGPIPE, SIG_DFL ); sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); - sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", - (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); + sprintf( preloader_reserve, "WINEPRELOADRESERVE=%x%08x-%x%08x", + (ULONG)(binary_info->res_start >> 32), (ULONG)binary_info->res_start, + (ULONG)(binary_info->res_end >> 32), (ULONG)binary_info->res_end ); putenv( preloader_reserve ); putenv( socket_env ); @@ -2383,10 +2384,10 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A else switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p, arch %04x%s)\n", + TRACE( "starting %s as Win%d binary (%s-%s, arch %04x%s)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end, binary_info.arch, - (binary_info.flags & BINARY_FLAG_FAKEDLL) ? ", fakedll" : "" ); + wine_dbgstr_longlong(binary_info.res_start), wine_dbgstr_longlong(binary_info.res_end), + binary_info.arch, (binary_info.flags & BINARY_FLAG_FAKEDLL) ? ", fakedll" : "" ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2536,9 +2537,10 @@ static void exec_process( LPCWSTR name ) switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", + TRACE( "starting %s as Win%d binary (%s-%s, arch %04x)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end, binary_info.arch ); + wine_dbgstr_longlong(binary_info.res_start), wine_dbgstr_longlong(binary_info.res_end), + binary_info.arch ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE ); break;

1 0

Alexandre Julliard : Wine release 3.4
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: website Branch: master Commit: 744a0e3b974182e0bbe55d92c615abdcddae0c6a URL: https://source.winehq.org/git/website.git/?a=commit;h=744a0e3b974182e0bbe55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:53:25 2018 +0100 Wine release 3.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018031601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018031601.xml b/news/en/2018031601.xml new file mode 100644 index 0000000..96d0226 --- /dev/null +++ b/news/en/2018031601.xml @@ -0,0 +1,16 @@ +<news> +<date>March 16, 2018</date> +<title>Wine 3.4 Released</title> +<body> + The Wine development release 3.4 is now available. + <a href="{$root}/announce/3.4">What's new</a> in this release: +<ul> + <li>More Vulkan support, including integration with the X11 driver.</li> + <li>Better handling of privileged instructions on x86-64.</li> + <li>Hex edit dialog improvements in RegEdit.</li> + <li>Assortment of patches merged from wine-staging.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.4 : Alexandre Julliard : Release 3.4
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: refs/tags/wine-3.4 Tag: 4b415467bbf398c5fa1c5ec56a38489d27d740e2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=4b415467bbf398c5fa1c5ec56a3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:50:20 2018 +0100 Release 3.4

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018