April 2020 - Wine-commits - list.winehq.org

Ziqing Hui : comctl32/tests: Add more tests for ILD_PRESERVEALPHA.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: a6bb675eb7b9c12020e0af93793442aaba967b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bb675eb7b9c12020e0af93… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 14 10:39:50 2020 +0800 comctl32/tests: Add more tests for ILD_PRESERVEALPHA. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 1c047e046c..d3f12e1679 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1599,7 +1599,10 @@ static void test_ImageList_DrawIndirect(void) todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0xFFD3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0xFFD3E5F7, __LINE__); + todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x895D6F81, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, ILS_ALPHA, 127, 0xFFE9F2FB, 0xFFAEB7C0, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, ILS_SATURATE, 0, 0xFFAFAFAF, 0xFFF0F0F0, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0xFFFFFFFF, __LINE__);

1 0

Ziqing Hui : comctl32/imagelist: Add support for ILD_PRESERVEALPHA.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 28c60b64c7cbc4ef891f972ea4f88e3fcf59ad3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28c60b64c7cbc4ef891f972e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 14 10:40:16 2020 +0800 comctl32/imagelist: Add support for ILD_PRESERVEALPHA. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 38 ++++++++++++++++++++++++-------------- dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 013ae42f88..a6d9c73c49 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -23,7 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE + * - Add support for ILD_SCALE, ILD_DPISCALE * - Add support for ILS_GLOW, ILS_SHADOW * - Thread-safe locking */ @@ -1234,17 +1234,23 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, - int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, - UINT style, COLORREF blend_col, BOOL has_alpha, BOOL grayscale ) + int src_x, int src_y, int cx, int cy, UINT style, UINT state, + DWORD frame, COLORREF blend_col, BOOL has_alpha ) { BOOL ret = FALSE; HDC hdc; HBITMAP bmp = 0, mask = 0; BITMAPINFO *info; + BLENDFUNCTION func; void *bits, *mask_bits; unsigned int *ptr; int i, j; + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = 255; + func.AlphaFormat = AC_SRC_ALPHA; + if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1286,7 +1292,12 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } - if (grayscale) + + if (state & ILS_ALPHA) + { + func.SourceConstantAlpha = (BYTE)frame; + } + else if (state & ILS_SATURATE) { for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) { @@ -1297,6 +1308,12 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des *ptr = (*ptr & 0xff000000)| (gray << 16) | (gray << 8) | gray; } } + else if (style & ILD_PRESERVEALPHA) + { + HBRUSH old_brush = SelectObject( dest_dc, GetStockObject(BLACK_BRUSH) ); + PatBlt( dest_dc, dest_x, dest_y, cx, cy, PATCOPY ); + SelectObject( dest_dc, old_brush ); + } if (has_alpha) /* we already have an alpha channel in this case */ { @@ -1430,7 +1447,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (!bMask && (has_alpha || (fState & ILS_ALPHA) || (fState & ILS_SATURATE))) { COLORREF colour, blend_col = CLR_NONE; - BLENDFUNCTION func; if (bBlend) { @@ -1439,15 +1455,10 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) else if (blend_col == CLR_NONE) blend_col = GetTextColor( pimldp->hdcDst ); } - func.BlendOp = AC_SRC_OVER; - func.BlendFlags = 0; - func.SourceConstantAlpha = (fState & ILS_ALPHA) ? pimldp->Frame : 255; - func.AlphaFormat = AC_SRC_ALPHA; - if (bIsTransparent) { bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, pt.x, pt.y, cx, cy, - func, fStyle, blend_col, has_alpha, fState & ILS_SATURATE ); + fStyle, fState, pimldp->Frame, blend_col, has_alpha ); goto end; } colour = pimldp->rgbBk; @@ -1456,8 +1467,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, - fStyle, blend_col, has_alpha, fState & ILS_SATURATE ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, fStyle, fState, + pimldp->Frame, blend_col, has_alpha ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; @@ -1554,7 +1565,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); - if (fStyle & ILD_PRESERVEALPHA) FIXME("ILD_PRESERVEALPHA: unimplemented!\n"); if (fStyle & ILD_SCALE) FIXME("ILD_SCALE: unimplemented!\n"); if (fStyle & ILD_DPISCALE) FIXME("ILD_DPISCALE: unimplemented!\n"); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d3f12e1679..db18443f89 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1600,7 +1600,7 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0xFFD3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0xFFD3E5F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x895D6F81, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x895D6F81, __LINE__); check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, ILS_ALPHA, 127, 0xFFE9F2FB, 0xFFAEB7C0, __LINE__); check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, ILS_SATURATE, 0, 0xFFAFAFAF, 0xFFF0F0F0, __LINE__);

1 0

Alexandre Julliard : ntdll: Don't call entry point for the main process so that we don't need to check the dll flag.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: fd7992972b252ed262d33ef604e9e1235d2108c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7992972b252ed262d33ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 14 12:55:38 2020 +0200 ntdll: Don't call entry point for the main process so that we don't need to check the dll flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48817 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 79165c2dac..2be0cde537 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1191,7 +1191,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); - if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !is_dll_native_subsystem( &wm->ldr, nt, p )) + if (!is_dll_native_subsystem( &wm->ldr, nt, p )) { if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) wm->ldr.Flags |= LDR_IMAGE_IS_DLL; @@ -1311,7 +1311,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry || !(wm->ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; + if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) { @@ -1463,6 +1463,7 @@ static void attach_implicitly_loaded_dlls( LPVOID reserved ) { LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); + if (!(mod->Flags & LDR_IMAGE_IS_DLL)) continue; if (mod->Flags & (LDR_LOAD_IN_PROGRESS | LDR_PROCESS_ATTACHED)) continue; TRACE( "found implicitly loaded %s, attaching to it\n", debugstr_w(mod->BaseDllName.Buffer)); @@ -3740,7 +3741,10 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { static const LARGE_INTEGER zero; + static int attach_done; + int i; NTSTATUS status; + ULONG_PTR cookie; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -3774,25 +3778,35 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock(); - if (!(wm->ldr.Flags & LDR_PROCESS_ATTACHED)) /* first time around */ + if (!attach_done) /* first time around */ { + attach_done = 1; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) { ERR( "TLS init failed when loading %s, status %x\n", debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); NtTerminateProcess( GetCurrentProcess(), status ); } - if ((status = process_attach( wm, context )) != STATUS_SUCCESS) + wm->ldr.LoadCount = -1; + if (wm->ldr.ActivationContext) + RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); + + for (i = 0; i < wm->nDeps; i++) { - if (last_failed_modref) - ERR( "%s failed to initialize, aborting\n", - debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); - ERR( "Initializing dlls for %s failed, status %x\n", - debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); - NtTerminateProcess( GetCurrentProcess(), status ); + if (!wm->deps[i]) continue; + if ((status = process_attach( wm->deps[i], context )) != STATUS_SUCCESS) + { + if (last_failed_modref) + ERR( "%s failed to initialize, aborting\n", + debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); + ERR( "Initializing dlls for %s failed, status %x\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } } attach_implicitly_loaded_dlls( context ); virtual_release_address_space(); + if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); } else {

1 0

Alexandre Julliard : ntdll: Allow the module file name to not be null-terminated.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 19c48204bb0aa3dadde1247a66b69d9cd51b7e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c48204bb0aa3dadde1247a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 14 21:58:23 2020 +0200 ntdll: Allow the module file name to not be null-terminated. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2be0cde537..524eab7460 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1174,6 +1174,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) */ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name, BOOL builtin ) { + WCHAR *buffer; WINE_MODREF *wm; const WCHAR *p; const IMAGE_NT_HEADERS *nt = RtlImageNtHeader(hModule); @@ -1186,9 +1187,16 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; - RtlCreateUnicodeString( &wm->ldr.FullDllName, nt_name->Buffer + 4 /* \??\ prefix */ ); - if ((p = wcsrchr( wm->ldr.FullDllName.Buffer, '\\' ))) p++; - else p = wm->ldr.FullDllName.Buffer; + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, nt_name->Length - 3 * sizeof(WCHAR) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, wm ); + return NULL; + } + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); + buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; + if ((p = wcsrchr( buffer, '\\' ))) p++; + else p = buffer; + RtlInitUnicodeString( &wm->ldr.FullDllName, buffer ); RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); if (!is_dll_native_subsystem( &wm->ldr, nt, p ))

1 0

Alexandre Julliard : ntdll: Always use the loaded path as builtin module file name.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: a55feef63a751a04b9f19011d232f3456502d655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55feef63a751a04b9f19011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 14 21:58:56 2020 +0200 ntdll: Always use the loaded path as builtin module file name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 95 +++++++++++++++-------------------------------------- 1 file changed, 26 insertions(+), 69 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 524eab7460..9329dd2a9b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1749,50 +1749,6 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, } -/*********************************************************************** - * get_builtin_fullname - * - * Build the full pathname for a builtin dll. - */ -static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING *path, - const char *filename ) -{ - static const WCHAR nt_prefixW[] = {'\\','?','?','\\',0}; - static const WCHAR soW[] = {'.','s','o',0}; - WCHAR *p, *fullname, filenameW[256]; - size_t len = strlen(filename); - - if (len >= ARRAY_SIZE(filenameW)) return FALSE; - ascii_to_unicode( filenameW, filename, len + 1 ); - - /* check if path can correspond to the dll we have */ - if (path && (p = wcsrchr( path->Buffer, '\\' ))) - { - p++; - if (!wcsnicmp( p, filenameW, len ) && (!p[len] || !wcsicmp( p + len, soW ))) - { - /* the filename matches, use path as the full path */ - len += p - path->Buffer; - if (!(fullname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) - return FALSE; - memcpy( fullname, path->Buffer, len * sizeof(WCHAR) ); - fullname[len] = 0; - goto done; - } - } - - if (!(fullname = RtlAllocateHeap( GetProcessHeap(), 0, - (wcslen(system_dir) + len + 5) * sizeof(WCHAR) ))) - return FALSE; - wcscpy( fullname, nt_prefixW ); - wcscat( fullname, system_dir ); - wcscat( fullname, filenameW ); -done: - RtlInitUnicodeString( nt_name, fullname ); - return TRUE; -} - - /************************************************************************* * is_16bit_builtin */ @@ -1819,17 +1775,16 @@ static void load_builtin_callback( void *module, const char *filename ) static const WCHAR emptyW[1]; IMAGE_NT_HEADERS *nt; WINE_MODREF *wm; - UNICODE_STRING nt_name; const WCHAR *load_path; if (!module) { - ERR("could not map image for %s\n", filename ? filename : "main exe" ); + ERR("could not map image for %s\n", debugstr_us(builtin_load_info->filename) ); return; } if (!(nt = RtlImageNtHeader( module ))) { - ERR( "bad module for %s\n", filename ? filename : "main exe" ); + ERR( "bad module for %s\n", debugstr_us(builtin_load_info->filename) ); builtin_load_info->status = STATUS_INVALID_IMAGE_FORMAT; return; } @@ -1838,18 +1793,10 @@ static void load_builtin_callback( void *module, const char *filename ) /* create the MODREF */ - if (!get_builtin_fullname( &nt_name, builtin_load_info->filename, filename )) - { - ERR( "can't load %s\n", filename ); - builtin_load_info->status = STATUS_NO_MEMORY; - return; - } - - wm = alloc_module( module, &nt_name, TRUE ); - RtlFreeUnicodeString( &nt_name ); + wm = alloc_module( module, builtin_load_info->filename, TRUE ); if (!wm) { - ERR( "can't load %s\n", filename ); + ERR( "can't load %s\n", debugstr_us(builtin_load_info->filename) ); builtin_load_info->status = STATUS_NO_MEMORY; return; } @@ -1875,7 +1822,7 @@ static void load_builtin_callback( void *module, const char *filename ) } builtin_load_info->wm = wm; - TRACE( "loaded %s %p %p\n", filename, wm, module ); + TRACE( "loaded %s %p %p\n", debugstr_us(builtin_load_info->filename), wm, module ); /* send the DLL load event */ @@ -2605,26 +2552,31 @@ done: static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, const char *so_name, WINE_MODREF** pwm ) { + static const WCHAR soW[] = {'.','s','o',0}; + DWORD len; void *handle; struct builtin_load_info info, *prev_info; ANSI_STRING unix_name; + UNICODE_STRING win_name = *nt_name; - if (so_name) - { - TRACE( "loading %s from so lib %s\n", debugstr_us(nt_name), debugstr_a(so_name) ); - unix_name.Buffer = NULL; - } - else + unix_name.Buffer = NULL; + info.load_path = load_path; + info.filename = &win_name; + info.status = STATUS_SUCCESS; + info.wm = NULL; + + if (!so_name) { - TRACE( "loading %s as so lib\n", debugstr_us(nt_name) ); if (wine_nt_to_unix_file_name( nt_name, &unix_name, FILE_OPEN, FALSE )) return STATUS_DLL_NOT_FOUND; + + /* remove .so extension from Windows name */ + len = nt_name->Length / sizeof(WCHAR); + if (len > 3 && !wcsicmp( nt_name->Buffer + len - 3, soW )) win_name.Length -= 3 * sizeof(WCHAR); } - info.load_path = load_path; - info.filename = nt_name; - info.status = STATUS_SUCCESS; - info.wm = NULL; + TRACE( "loading %s from so lib %s\n", debugstr_us(&win_name), + debugstr_a( so_name ? so_name : unix_name.Buffer )); prev_info = builtin_load_info; builtin_load_info = &info; @@ -4254,6 +4206,9 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) */ void __wine_process_init(void) { + static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\', + 'n','t','d','l','l','.','d','l','l',0}; static const WCHAR kernel32W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'k','e','r','n','e','l','3','2','.','d','l','l',0}; @@ -4289,6 +4244,8 @@ void __wine_process_init(void) version_init(); /* setup the load callback and create ntdll modref */ + RtlInitUnicodeString( &nt_name, ntdllW ); + default_load_info.filename = &nt_name; wine_dll_set_callback( load_builtin_callback ); RtlInitUnicodeString( &nt_name, kernel32W );

1 0

Jeff Smith : gdiplus: Clear new multi-point paths that end with Start.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: efd5f670bdac46c788efe566d4e28c3012c8874a URL: https://source.winehq.org/git/wine.git/?a=commit;h=efd5f670bdac46c788efe566… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Apr 13 22:50:51 2020 -0500 gdiplus: Clear new multi-point paths that end with Start. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 3 +++ dlls/gdiplus/tests/graphicspath.c | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index df6a32d22d..2b191dd30d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1228,6 +1228,9 @@ GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, *path = heap_alloc_zero(sizeof(GpPath)); if(!*path) return OutOfMemory; + if(count > 1 && (types[count-1] & PathPointTypePathTypeMask) == PathPointTypeStart) + count = 0; + for(i = 1; i < count; i++) { if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier) { if(i+2 < count && diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 1b3a9a161f..0c5297249a 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -181,8 +181,8 @@ static void test_createpath2(void) GpPathData data; INT i, count, expect_count; - PointF test_line_points[] = {{1.0,1.0}, {2.0,1.0}}; - BYTE test_line_types[] = {PathPointTypeStart, PathPointTypeLine}; + PointF test_line_points[] = {{1.0,1.0}, {2.0,1.0}, {2.0,2.0}}; + BYTE test_line_types[] = {PathPointTypeStart, PathPointTypeLine, PathPointTypeStart}; PointF test_bez_points[] = {{1.0,1.0}, {2.0,1.0}, {3.0,1.0}, {4.0,1.0}, {5.0,1.0}, {6.0,1.0}, {7.0,1.0}}; @@ -235,8 +235,15 @@ static void test_createpath2(void) status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, NULL); expect(InvalidParameter, status); + /* Multi-point paths should not end with Start */ + status = GdipCreatePath2(test_line_points, test_line_types, 3, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + GdipDeletePath(path); + /* Zero-length line points do not get altered */ - path = NULL; test_line_points[1].X = test_line_points[0].X; test_line_points[1].Y = test_line_points[0].Y; status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, &path);

1 0

Jeff Smith : gdiplus: Check that GdipAddPathLine2 is passed at least one point.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 93a5ce24453e12cde5d3b04cf6e300e74439c78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a5ce24453e12cde5d3b04c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Apr 13 22:50:52 2020 -0500 gdiplus: Check that GdipAddPathLine2 is passed at least one point. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/graphicspath.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2b191dd30d..4d5a73588f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -627,7 +627,7 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, TRACE("(%p, %p, %d)\n", path, points, count); - if(!path || !points) + if(!path || !points || count < 1) return InvalidParameter; if(!lengthen_path(path, count)) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 0c5297249a..7670a6c41f 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -308,6 +308,16 @@ static void test_line2(void) } GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathLine2(NULL, line2_points, 2); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, NULL, 2); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, line2_points, 0); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, line2_points, -1); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, line2_points, 3); expect(Ok, status); status = GdipAddPathLine2(path, &(line2_points[3]), 3);

1 0

Serge Gautherie : winapi_test: Do not multiply type size when it is undefined, in _refresh().
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 3462153a05197e4951ed6b65195829ed9cea980e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3462153a05197e4951ed6b65… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Apr 14 11:47:23 2020 +0200 winapi_test: Do not multiply type size when it is undefined, in _refresh(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/c_type.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index b00cf81894..c6aeb6a912 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -239,8 +239,14 @@ sub _refresh($) } else { - print STDERR "$type_name -> type_size=undef, count=$count\n" if (!defined $type_size); - $type_size *= int($count); + if (!defined $type_size) + { + print STDERR "$type_name -> type_size=undef, count=$count\n"; + } + else + { + $type_size *= int($count); + } } } if ($bitfield_size != 0)

1 0

Zebediah Figura : d3dcompiler: Check for multiple matrix majority keywords on typedefs.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: d05ee3674efc9227ab628ac71d8acc6e82aa2560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d05ee3674efc9227ab628ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 16:14:10 2020 -0500 d3dcompiler: Check for multiple matrix majority keywords on typedefs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 67393f6ca9..5381fa211a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -814,6 +814,10 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(type->modifiers, v->loc); + if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + ret = add_type_to_scope(hlsl_ctx.cur_scope, type); if (!ret) {

1 0

Zebediah Figura : d3dcompiler: Always set the matrix majority for declaration types.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: f82b44748a51e64bc8ca18e141cbb319e9e7eb1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82b44748a51e64bc8ca18e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 16:14:12 2020 -0500 d3dcompiler: Always set the matrix majority for declaration types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/hlsl.y | 39 ++++++++++++++++++++++++++----- dlls/d3dcompiler_43/utils.c | 8 ++++--- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index df45a7082f..40c4fcffee 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1081,7 +1081,7 @@ void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; -struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) DECLSPEC_HIDDEN; +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5381fa211a..833472a351 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -576,6 +576,9 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, BOOL ret, local = TRUE; struct list *statements_list = d3dcompiler_alloc(sizeof(*statements_list)); + if (basic_type->type == HLSL_CLASS_MATRIX) + assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + if (!statements_list) { ERR("Out of memory.\n"); @@ -717,14 +720,32 @@ static BOOL add_struct_field(struct list *fields, struct hlsl_struct_field *fiel return TRUE; } -static struct hlsl_type *apply_type_modifiers(struct hlsl_type *type, DWORD *modifiers, struct source_location loc) +static struct hlsl_type *apply_type_modifiers(struct hlsl_type *type, + unsigned int *modifiers, struct source_location loc) { + unsigned int default_majority = 0; struct hlsl_type *new_type; - if (!(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) + /* This function is only used for declarations (i.e. variables and struct + * fields), which should inherit the matrix majority. We only explicitly set + * the default majority for declarations—typedefs depend on this—but we + * want to always set it, so that an hlsl_type object is never used to + * represent two different majorities (and thus can be used to store its + * register size, etc.) */ + if (!(*modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + && type->type == HLSL_CLASS_MATRIX) + { + if (hlsl_ctx.matrix_majority == HLSL_COLUMN_MAJOR) + default_majority = HLSL_MODIFIER_COLUMN_MAJOR; + else + default_majority = HLSL_MODIFIER_ROW_MAJOR; + } + + if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) return type; - if (!(new_type = clone_hlsl_type(type))) + if (!(new_type = clone_hlsl_type(type, default_majority))) return NULL; new_type->modifiers = add_modifiers(new_type->modifiers, *modifiers, loc); @@ -738,6 +759,9 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s struct hlsl_struct_field *field; struct list *list; + if (type->type == HLSL_CLASS_MATRIX) + assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + list = d3dcompiler_alloc(sizeof(*list)); if (!list) { @@ -801,7 +825,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis if (v->array_size) type = new_array_type(orig_type, v->array_size); else - type = clone_hlsl_type(orig_type); + type = clone_hlsl_type(orig_type, 0); if (!type) { ERR("Out of memory\n"); @@ -834,6 +858,9 @@ static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, { struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); + if (param->type->type == HLSL_CLASS_MATRIX) + assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + if (!decl) { ERR("Out of memory.\n"); @@ -2066,7 +2093,7 @@ postfix_expr: primary_expr } inc = new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), loc); /* Post increment/decrement expressions are considered const */ - inc->data_type = clone_hlsl_type(inc->data_type); + inc->data_type = clone_hlsl_type(inc->data_type, 0); inc->data_type->modifiers |= HLSL_MODIFIER_CONST; $$ = append_unop($1, inc); } @@ -2083,7 +2110,7 @@ postfix_expr: primary_expr } inc = new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), loc); /* Post increment/decrement expressions are considered const */ - inc->data_type = clone_hlsl_type(inc->data_type); + inc->data_type = clone_hlsl_type(inc->data_type, 0); inc->data_type->modifiers |= HLSL_MODIFIER_CONST; $$ = append_unop($1, inc); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 84323c334f..ff779891fd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -927,7 +927,7 @@ BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) return TRUE; } -struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) { struct hlsl_type *type; struct hlsl_struct_field *old_field, *field; @@ -952,11 +952,13 @@ struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) type->dimx = old->dimx; type->dimy = old->dimy; type->modifiers = old->modifiers; + if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + type->modifiers |= default_majority; type->sampler_dim = old->sampler_dim; switch (old->type) { case HLSL_CLASS_ARRAY: - type->e.array.type = old->e.array.type; + type->e.array.type = clone_hlsl_type(old->e.array.type, default_majority); type->e.array.elements_count = old->e.array.elements_count; break; case HLSL_CLASS_STRUCT: @@ -984,7 +986,7 @@ struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) d3dcompiler_free(type); return NULL; } - field->type = clone_hlsl_type(old_field->type); + field->type = clone_hlsl_type(old_field->type, default_majority); field->name = d3dcompiler_strdup(old_field->name); if (old_field->semantic) field->semantic = d3dcompiler_strdup(old_field->semantic);

1 0