March 2018 - Wine-Commits - list.winehq.org

Akihiro Sagawa : winex11: Keep the result string in the IME UI window procedure.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 0354a5f3e2559f5f6e62de4f90b44b702f46f161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0354a5f3e2559f5f6e62de4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:51 2017 +0900 winex11: Keep the result string in the IME UI window procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8dc1e7cde64c212882958c0806b50911a360fb9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 1 - dlls/winex11.drv/ime.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bf0f4b2..12e8f99 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -380,7 +380,6 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR imc = ImmGetContext(hWnd); size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, wstring, sizeof(wstring)); - todo_wine ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); ImmReleaseContext(hwnd, imc); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0f4d2b2..d0746c5 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -906,6 +906,11 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, myPrivate->bInComposition = TRUE; } + /* clear existing result */ + newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + flags = GCS_COMPSTR; if (dwCompLen && lpComp) @@ -1256,7 +1261,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) LPCOMPOSITIONSTRING compstr; LPBYTE compdata; LPWSTR ResultStr; - HIMCC newCompStr; LPINPUTCONTEXT lpIMC; lpIMC = LockRealIMC(hIMC); @@ -1269,11 +1273,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); ImmUnlockIMCC(lpIMC->hCompStr); - - /* clear the buffer */ - newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; UnlockRealIMC(hIMC); } else

1 0

Akihiro Sagawa : imm32/tests: Add a skip message when composition string isn't available.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 9b0109da6230e93258d94f51a3aa687f8b8b9dc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0109da6230e93258d94f51… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:47 2017 +0900 imm32/tests: Add a skip message when composition string isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c1dac18c6ae9b19b1549242867e7707807041f2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index b02f85d..99d95c1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -361,11 +361,19 @@ static void test_ImmGetCompositionString(void) static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; char cstring[20]; WCHAR wstring[20]; - DWORD len; - DWORD alen,wlen; + LONG len; + LONG alen,wlen; + BOOL ret; imc = ImmGetContext(hwnd); - ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + if (!ret) { + win_skip("Composition isn't supported\n"); + ImmReleaseContext(hwnd, imc); + return; + } + msg_spy_flush_msgs(); + alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20); /* windows machines without any IME installed just return 0 above */ @@ -376,6 +384,9 @@ static void test_ImmGetCompositionString(void) len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); }

1 0

Alexandre Julliard : setupapi: Use correct architecture for fake dlls on ARM and ARM64.
by Alexandre Julliard March 18, 2018

March 18, 2018

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

Huw Davies : comctl32: Don' t create a masked imagelist if CLR_NONE is specified.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 57657d1673e9be1e5f5a9eaecb6658c494c029c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57657d1673e9be1e5f5a9eae… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 20 13:26:16 2017 +0000 comctl32: Don't create a masked imagelist if CLR_NONE is specified. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92e999f34bff4a27112d22a6d48176daa20ad5f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 3 ++- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c..70457c7 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) color |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 7669fb6..6a62b40 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2253,6 +2255,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2386,6 +2408,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2404,6 +2427,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32);

1 0

Huw Davies : comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 63be724f84cbb9815543e4462d8a52acbe69d302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63be724f84cbb9815543e446… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 30 18:54:07 2017 +0000 comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2dd0fb880c005cd5660928d1646a117407cec238) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 42 +++++++-- dlls/comctl32/tests/imagelist.c | 203 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 239 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63be724f84cbb9815543…

1 0

Alex Henrie : advapi32: Add stub for LsaLookupPrivilegeName.
by Alexandre Julliard March 18, 2018

March 18, 2018

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

Alex Henrie : ucrtbase: Add __stdio_common_vsprintf_p.
by Alexandre Julliard March 18, 2018

March 18, 2018

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 March 18, 2018

March 18, 2018

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 March 16, 2018

March 16, 2018

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

Alexandre Julliard : Release 3.4.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: afe4f54bb439cfa26ca72968cec2da357ea8836e URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe4f54bb439cfa26ca72968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:50:20 2018 +0100 Release 3.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 905 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 417 insertions(+), 511 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afe4f54bb439cfa26ca7…

1 0