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

Nikolay Sivov : wininet: Adjust IsHostInProxyBypassList() prototype.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 8a016805f0b15ba72c38ebf303eb611324f7788b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a016805f0b15ba72c38ebf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 3 12:06:17 2021 +0300 wininet: Adjust IsHostInProxyBypassList() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 11 ++++------- include/winineti.h | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index eedb210cd23..e9363208471 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6314,13 +6314,10 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index) /*********************************************************************** - * IsHostInProxyBypassList (@) - * - * Undocumented - * + * IsHostInProxyBypassList (WININET.@) */ -BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) +BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME scheme, LPCSTR szHost, DWORD length) { - FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); - return FALSE; + FIXME("STUB: scheme=%d host=%s length=%d\n", scheme, szHost, length); + return FALSE; } diff --git a/include/winineti.h b/include/winineti.h index 812ff793317..5dc3088a881 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -128,6 +128,7 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,LPDWORD, #define GetUrlCacheConfigInfo WINELIB_NAME_AW(GetUrlCacheConfigInfo) BOOL WINAPI IncrementUrlCacheHeaderData(DWORD,LPDWORD); BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); +BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME,LPCSTR,DWORD); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired)

1 0

Zebediah Figura : ieproxy: Remove incorrect comments.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 760a9d1daab032ba5c87a810d922afd2f1d90547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=760a9d1daab032ba5c87a810… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 14:55:15 2021 -0500 ieproxy: Remove incorrect comments. The PSFactoryBuffer CLSID does not match the IInternetExplorerManager IID. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/ieproxy_ieautomation.idl | 2 +- dlls/ieproxy/ieproxy_perhist.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieproxy/ieproxy_ieautomation.idl b/dlls/ieproxy/ieproxy_ieautomation.idl index 9ffe91b7956..f97f176a764 100644 --- a/dlls/ieproxy/ieproxy_ieautomation.idl +++ b/dlls/ieproxy/ieproxy_ieautomation.idl @@ -26,6 +26,6 @@ [ threading(both), - uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) ] coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/ieproxy/ieproxy_perhist.idl b/dlls/ieproxy/ieproxy_perhist.idl index 12268f55c80..eee7b2ccd27 100644 --- a/dlls/ieproxy/ieproxy_perhist.idl +++ b/dlls/ieproxy/ieproxy_perhist.idl @@ -25,6 +25,6 @@ [ threading(both), - uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) ] coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Jacek Caban : gdi32: Don't restore DC state in EnumEnhMetaFile when using metafiles.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 3c6075e4b46b73e465cd65b716bc0bf389c93903 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c6075e4b46b73e465cd65b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:55:40 2021 +0200 gdi32: Don't restore DC state in EnumEnhMetaFile when using metafiles. Querying state is not supported on metafiles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 99f692adb98..25ffcff93bf 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2415,26 +2415,27 @@ BOOL WINAPI EnumEnhMetaFile( info->state.next = NULL; info->save_level = 0; info->saved_state = NULL; + info->init_transform = info->state.world_transform; ht = (HANDLETABLE*) &info[1]; ht->objectHandle[0] = hmf; for(i = 1; i < emh->nHandles; i++) ht->objectHandle[i] = NULL; - if(hdc) + if (hdc && !is_meta_dc( hdc )) { - savedMode = SetGraphicsMode(hdc, GM_ADVANCED); - GetWorldTransform(hdc, &savedXform); + savedMode = SetGraphicsMode(hdc, GM_ADVANCED); + GetWorldTransform(hdc, &savedXform); GetViewportExtEx(hdc, &vp_size); GetWindowExtEx(hdc, &win_size); GetViewportOrgEx(hdc, &vp_org); GetWindowOrgEx(hdc, &win_org); mapMode = GetMapMode(hdc); - /* save DC */ - hPen = GetCurrentObject(hdc, OBJ_PEN); - hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hFont = GetCurrentObject(hdc, OBJ_FONT); + /* save DC */ + hPen = GetCurrentObject(hdc, OBJ_PEN); + hBrush = GetCurrentObject(hdc, OBJ_BRUSH); + hFont = GetCurrentObject(hdc, OBJ_FONT); hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); if (!GetClipRgn(hdc, hRgn)) @@ -2451,17 +2452,7 @@ BOOL WINAPI EnumEnhMetaFile( old_polyfill = SetPolyFillMode(hdc, ALTERNATE); old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE); - if ( IS_WIN9X() ) - { - /* Win95 leaves the vp/win ext/org info alone */ - info->init_transform.eM11 = 1.0; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = 1.0; - info->init_transform.eDx = 0.0; - info->init_transform.eDy = 0.0; - } - else + if (!IS_WIN9X()) { /* WinNT combines the vp/win ext/org info into a transform */ double xscale, yscale; @@ -2505,7 +2496,7 @@ BOOL WINAPI EnumEnhMetaFile( } /* WinNT resets the current vp/win org/ext */ - if ( !IS_WIN9X() ) + if (!IS_WIN9X()) { SetMapMode(hdc, MM_TEXT); SetWindowOrgEx(hdc, 0, 0, NULL); @@ -2537,7 +2528,7 @@ BOOL WINAPI EnumEnhMetaFile( offset += emr->nSize; } - if (hdc) + if (hdc && !is_meta_dc( hdc )) { SetStretchBltMode(hdc, old_stretchblt); SetPolyFillMode(hdc, old_polyfill); @@ -2554,9 +2545,9 @@ BOOL WINAPI EnumEnhMetaFile( ExtSelectClipRgn(hdc, hRgn, RGN_COPY); DeleteObject(hRgn); - SetWorldTransform(hdc, &savedXform); - if (savedMode) - SetGraphicsMode(hdc, savedMode); + SetWorldTransform(hdc, &savedXform); + if (savedMode) + SetGraphicsMode(hdc, savedMode); SetMapMode(hdc, mapMode); SetWindowOrgEx(hdc, win_org.x, win_org.y, NULL); SetWindowExtEx(hdc, win_size.cx, win_size.cy, NULL);

1 0

Alexandre Julliard : msvcrt: Remove leftover __wine_init_unix_lib() call.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 08e5080089220d6bcce0c0a33cf49e8c95ed711f URL: https://source.winehq.org/git/wine.git/?a=commit;h=08e5080089220d6bcce0c0a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 16:40:06 2021 +0200 msvcrt: Remove leftover __wine_init_unix_lib() call. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 124cdf80098..05eacbb36fb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -66,8 +66,6 @@ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; BOOL sse2_supported; static BOOL sse2_enabled; -static const struct unix_funcs *unix_funcs; - void msvcrt_init_math( void *module ) { sse2_supported = IsProcessorFeaturePresent( PF_XMMI64_INSTRUCTIONS_AVAILABLE ); @@ -76,7 +74,6 @@ void msvcrt_init_math( void *module ) #else sse2_enabled = sse2_supported; #endif - __wine_init_unix_lib( module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); } /* Copied from musl: src/internal/libm.h */

1 0

Alexandre Julliard : ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: e5339ecbc66f20193a0a6b1dfdce98d42d2ad926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5339ecbc66f20193a0a6b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 13:31:15 2021 +0200 ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 29 +++++++++++++++++++++++++++-- dlls/ntdll/unix/loader.c | 29 +++++++++++++---------------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ dlls/ntdll/unixlib.h | 3 +-- dlls/wow64/virtual.c | 3 +++ include/winternl.h | 3 +++ 7 files changed, 63 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1139a228c2c..c8ea2452e66 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1338,6 +1338,31 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } } + +/************************************************************************* + * init_builtin_dll + */ +static void init_builtin_dll( HMODULE module ) +{ + void *buffer[16]; + void (**funcs)(int, char **, char **) = (void *)buffer; + SIZE_T i, size; + NTSTATUS status; + + status = NtQueryVirtualMemory( GetCurrentProcess(), module, MemoryWineImageInitFuncs, + buffer, sizeof(buffer), &size ); + if (status == STATUS_BUFFER_TOO_SMALL) + { + if (!(funcs = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return; + status = NtQueryVirtualMemory( GetCurrentProcess(), module, MemoryWineImageInitFuncs, + funcs, size, &size ); + } + if (!status) for (i = 0; i < size / sizeof(*funcs); i++) funcs[i]( 0, NULL, NULL ); + + if ((void *)funcs != (void *)buffer) RtlFreeHeap( GetProcessHeap(), 0, funcs ); +} + + /************************************************************************* * MODULE_InitDLL */ @@ -1354,7 +1379,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.DllBase, reason ); if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) - unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) @@ -3914,7 +3939,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_INTERNAL) init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bf5f8048124..c2f79bc2c44 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1700,26 +1700,21 @@ static BOOL get_relocbase(caddr_t mapbase, caddr_t *relocbase) #endif /************************************************************************* - * init_builtin_dll + * get_builtin_init_funcs */ -static void CDECL init_builtin_dll( void *module ) +NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T *retlen ) { #ifdef HAVE_DLINFO - void *handle = NULL; struct link_map *map; - void (*init_func)(int, char **, char **) = NULL; - void (**init_array)(int, char **, char **) = NULL; - ULONG_PTR i, init_arraysz = 0; + void *init_func = NULL, **init_array = NULL; + ULONG_PTR i, count, init_arraysz = 0; #ifdef _WIN64 const Elf64_Dyn *dyn; #else const Elf32_Dyn *dyn; #endif - if (!(handle = get_builtin_so_handle( module ))) return; - if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) map = NULL; - release_builtin_module( module ); - if (!map) return; + if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) return STATUS_INVALID_IMAGE_FORMAT; for (dyn = map->l_ld; dyn->d_tag; dyn++) { @@ -1738,13 +1733,16 @@ static void CDECL init_builtin_dll( void *module ) } } - TRACE( "%p: got init_func %p init_array %p %lu\n", module, init_func, init_array, init_arraysz ); + TRACE( "%p: got init_func %p init_array %p %lu\n", handle, init_func, init_array, init_arraysz ); - if (init_func) init_func( main_argc, main_argv, main_envp ); + count = init_arraysz / sizeof(*init_array); + if (init_func) count++; + if (retlen) *retlen = count * sizeof(*funcs); - if (init_array) - for (i = 0; i < init_arraysz / sizeof(*init_array); i++) - init_array[i]( main_argc, main_argv, main_envp ); + if (count > len / sizeof(*funcs)) return STATUS_BUFFER_TOO_SMALL; + if (init_func) *funcs++ = init_func; + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; + return STATUS_SUCCESS; #endif } @@ -1896,7 +1894,6 @@ static struct unix_funcs unix_funcs = ntdll_sqrt, ntdll_tan, load_so_dll, - init_builtin_dll, init_unix_lib, unwind_builtin_dll, }; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d65807b8057..a51b04fb3c8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -158,6 +158,7 @@ extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPE extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module ) DECLSPEC_HIDDEN; extern NTSTATUS load_start_exe( WCHAR **image, void **module ) DECLSPEC_HIDDEN; +extern NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T *retlen ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6d6d52e7208..f055be94238 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4281,6 +4281,21 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryMappedFilenameInformation: return get_memory_section_name( process, addr, buffer, len, res_len ); + case MemoryWineImageInitFuncs: + if (process == GetCurrentProcess()) + { + void *module = (void *)addr; + void *handle = get_builtin_so_handle( module ); + + if (handle) + { + NTSTATUS status = get_builtin_init_funcs( handle, buffer, len, res_len ); + release_builtin_module( module ); + return status; + } + } + return STATUS_INVALID_HANDLE; + default: FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", process, addr, info_class, buffer, len, res_len); diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 8747ec5039f..f22e0c12d22 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 124 +#define NTDLL_UNIXLIB_VERSION 125 struct unix_funcs { @@ -71,7 +71,6 @@ struct unix_funcs /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); - void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 2c60718d516..e1acd0c9609 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -363,6 +363,9 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) break; } + case MemoryWineImageInitFuncs: + return STATUS_INVALID_INFO_CLASS; + default: FIXME( "unsupported class %u\n", class ); return STATUS_INVALID_INFO_CLASS; diff --git a/include/winternl.h b/include/winternl.h index ae86040d6f0..9dff3a98bed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1918,6 +1918,9 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryEnclaveImageInformation, MemoryBasicInformationCapped, MemoryPhysicalContiguityInformation, +#ifdef __WINESRC__ + MemoryWineImageInitFuncs = 1000 +#endif } MEMORY_INFORMATION_CLASS; typedef struct _MEMORY_SECTION_NAME

1 0

Jacek Caban : gdi32: Use DC_ATTR for SetBrushOrgEx implementation.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: be71f33146a2a53cc76020256ea3f3247c29ea82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be71f33146a2a53cc7602025… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:56:29 2021 +0200 gdi32: Use DC_ATTR for SetBrushOrgEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 43 ------------------------------------------- dlls/gdi32/gdidc.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index a59fee700ce..5febac710dc 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -370,49 +370,6 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) } -/*********************************************************************** - * SetBrushOrgEx (GDI32.@) - * - * Set the brush origin for a device context. - * - * PARAMS - * hdc [I] Device context to set the brush origin for - * x [I] New x origin - * y [I] New y origin - * oldorg [O] If non NULL, destination for previously set brush origin. - * - * RETURNS - * Success: TRUE. The origin is set to (x,y), and oldorg is updated if given. - */ -BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg ) -{ - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - if (oldorg) - *oldorg = dc->attr->brush_org; - - dc->attr->brush_org.x = x; - dc->attr->brush_org.y = y; - release_dc_ptr( dc ); - return TRUE; -} - -/*********************************************************************** - * FixBrushOrgEx (GDI32.@) - * - * See SetBrushOrgEx. - * - * NOTES - * This function is no longer documented by MSDN, but in Win95 GDI32 it - * is the same as SetBrushOrgEx(). - */ -BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg ) -{ - return SetBrushOrgEx(hdc,x,y,oldorg); -} - - /*********************************************************************** * NtGdiSelectBrush (win32u.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index a0af23c169d..bc02beea429 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -341,6 +341,27 @@ BOOL WINAPI GetBrushOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * SetBrushOrgEx (GDI32.@) + */ +BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, POINT *oldorg ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (oldorg) *oldorg = dc_attr->brush_org; + dc_attr->brush_org.x = x; + dc_attr->brush_org.y = y; + return TRUE; +} + +/*********************************************************************** + * FixBrushOrgEx (GDI32.@) + */ +BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, POINT *oldorg ) +{ + return SetBrushOrgEx( hdc, x, y, oldorg ); +} + /*********************************************************************** * GetDCOrgEx (GDI32.@) */

1 0

Jacek Caban : gdi32: Store window extent in DC_ATTR.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 215a352eddd4981adc2cb8a46108aecb72eb320f URL: https://source.winehq.org/git/wine.git/?a=commit;h=215a352eddd4981adc2cb8a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:56:10 2021 +0200 gdi32: Store window extent in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/font.c | 3 ++- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 44 ++++++++++++++++++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 7 files changed, 43 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=215a352eddd4981adc2c…

1 0

Alexandre Julliard : ntdll: Update the MEMORY_INFORMATION_CLASS enumeration.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: c6373abc10100f7b1c564afe3c6148a904732220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6373abc10100f7b1c564afe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 13:09:35 2021 +0200 ntdll: Update the MEMORY_INFORMATION_CLASS enumeration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/kernelbase/debug.c | 6 ++++-- dlls/ntdll/tests/info.c | 18 +++++++++--------- dlls/ntdll/unix/virtual.c | 11 +++-------- dlls/psapi/tests/psapi_main.c | 2 +- dlls/wow64/virtual.c | 2 +- include/winternl.h | 15 +++++++++++---- 7 files changed, 30 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6373abc10100f7b1c56…

1 0

Martin Storsjö : mailmap: Add a mailmap entry for myself with the proper spelling.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: c44218ba501e7bafc3dadc5486f4340a183d5f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44218ba501e7bafc3dadc54… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Aug 2 12:03:09 2021 +0300 mailmap: Add a mailmap entry for myself with the proper spelling. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 81ca6946268..c545fa05d81 100644 --- a/.mailmap +++ b/.mailmap @@ -90,6 +90,7 @@ Luis Carlos Busquets Pérez <luiscar2001(a)yahoo.es> Mariusz Pluciński <vshader(a)gmail.com> Mark G. Adams <mark(a)transgaming.com> Markus Gömmel <m.goemmel(a)compulab.de> +Martin Storsjö <martin(a)martin.st> Matej Špindler <matej.spindler(a)gmail.com> Matej Špindler <spindler.matej(a)gmail.com> Matthew Finnicum <mattfinn(a)gmail.com>

1 0

Zebediah Figura : ws2_32/tests: Expand tests for inet_pton().
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 53fe477d827738a9dd895acf4f6a51ee562ddbb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fe477d827738a9dd895acf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 2 19:37:40 2021 -0500 ws2_32/tests: Expand tests for inet_pton(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 393 ++++++++++++++++++++++++++++++++----------- 1 file changed, 292 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53fe477d827738a9dd89…

1 0