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

Jacek Caban : gdi32: Use ntgdi names for bitmap functions.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 6b3c811c763b745f910d96741da36357b805f58a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3c811c763b745f910d9674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:41:16 2021 +0200 gdi32: Use ntgdi names for bitmap functions. 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/bitmap.c | 18 +++++++++--------- dlls/gdi32/gdi32.spec | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c5a7ef9ca76..22629f95af4 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -176,7 +176,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, } if (bits) - SetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); + NtGdiSetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); TRACE("%dx%d, bpp %d planes %d: returning %p\n", width, height, bpp, planes, hbitmap); return hbitmap; @@ -184,7 +184,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, /*********************************************************************** - * GetBitmapBits [GDI32.@] + * NtGdiGetBitmapBits (win32u.@) * * Copies bitmap bits of bitmap to buffer. * @@ -192,7 +192,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, * Success: Number of bytes copied * Failure: 0 */ -LONG WINAPI GetBitmapBits( +LONG WINAPI NtGdiGetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ LONG count, /* [in] Number of bytes to copy */ LPVOID bits) /* [out] Pointer to buffer to receive bits */ @@ -253,7 +253,7 @@ done: /****************************************************************************** - * SetBitmapBits [GDI32.@] + * NtGdiSetBitmapBits (win32u.@) * * Sets bits of color data for a bitmap. * @@ -261,7 +261,7 @@ done: * Success: Number of bytes used in setting the bitmap bits * Failure: 0 */ -LONG WINAPI SetBitmapBits( +LONG WINAPI NtGdiSetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ LONG count, /* [in] Number of bytes in bitmap array */ LPCVOID bits) /* [in] Address of array with bitmap bits */ @@ -493,7 +493,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( /****************************************************************************** - * GetBitmapDimensionEx [GDI32.@] + * NtGdiGetBitmapDimension (win32u.@) * * Retrieves dimensions of a bitmap. * @@ -501,7 +501,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetBitmapDimensionEx( +BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP hbitmap, /* [in] Handle to bitmap */ LPSIZE size) /* [out] Address of struct receiving dimensions */ { @@ -514,7 +514,7 @@ BOOL WINAPI GetBitmapDimensionEx( /****************************************************************************** - * SetBitmapDimensionEx [GDI32.@] + * NtGdiSetBitmapDimension (win32u.@) * * Assigns dimensions to a bitmap. * MSDN says that this function will fail if hbitmap is a handle created by @@ -524,7 +524,7 @@ BOOL WINAPI GetBitmapDimensionEx( * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetBitmapDimensionEx( +BOOL WINAPI NtGdiSetBitmapDimension( HBITMAP hbitmap, /* [in] Handle to bitmap */ INT x, /* [in] Bitmap width */ INT y, /* [in] Bitmap height */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index b21f22c3629..6da3721a00b 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -240,8 +240,8 @@ @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) # @ stub GetBitmapAttributes -@ stdcall GetBitmapBits(long long ptr) -@ stdcall GetBitmapDimensionEx(long ptr) +@ stdcall GetBitmapBits(long long ptr) NtGdiGetBitmapBits +@ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) @ stdcall GetBoundsRect(long ptr long) @@ -474,8 +474,8 @@ @ stdcall SetAbortProc(long ptr) @ stdcall SetArcDirection(long long) # @ stub SetBitmapAttributes -@ stdcall SetBitmapBits(long long ptr) -@ stdcall SetBitmapDimensionEx(long long long ptr) +@ stdcall SetBitmapBits(long long ptr) NtGdiSetBitmapBits +@ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) @ stdcall SetBoundsRect(long ptr long)

1 0

Francois Gouget : user32/tests: Use WineTest contexts to simplify test_mdi().
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: ce0b7342c0eecc814ab75497bd111e1c02939f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0b7342c0eecc814ab75497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:40:06 2021 +0200 user32/tests: Use WineTest contexts to simplify test_mdi(). This also fixes the many ok() calls that were missing context information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c1a9ba50df1..228395e0469 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2145,6 +2145,7 @@ static void test_mdi(void) SCROLLINFO si; BOOL ret, gotit; + winetest_push_context("style %#x", style[i]); mdi_client = CreateWindowExA(0, "mdiclient", NULL, WS_CHILD | style[i], 0, 0, rc.right, rc.bottom, @@ -2183,7 +2184,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2191,12 +2192,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2204,7 +2205,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); SetWindowPos(mdi_child, 0, -100, -100, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); @@ -2213,7 +2214,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2221,12 +2222,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2234,7 +2235,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); gotit = FALSE; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) @@ -2261,7 +2262,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2270,12 +2271,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2284,11 +2285,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); DestroyMenu(child_menu); DestroyWindow(mdi_child); DestroyWindow(mdi_client); + winetest_pop_context(); } SetMenu(mdi_hwndMain, frame_menu);

1 0

Gerald Pfeifer : nsiproxy: Include netinet/in.h before if_ether.h.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: cefe9f6b9132e5166a381dd2b085f1f80cf8150c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefe9f6b9132e5166a381dd2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 3 09:02:43 2021 +0200 nsiproxy: Include netinet/in.h before if_ether.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 38e6802e3bd..332df7159b9 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -38,6 +38,10 @@ #include <net/if_arp.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif

1 0

Jacek Caban : gdi32: Introduce NtGdiExtGetObjectW.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 14a39fcfe785cf2a35204912bc399cc309af7cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a39fcfe785cf2a35204912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:39:05 2021 +0200 gdi32: Introduce NtGdiExtGetObjectW. 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/gdiobj.c | 10 ++++------ dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2f795a3f12f..67c2ddc19e6 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1060,9 +1060,9 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) } /*********************************************************************** - * GetObjectW (GDI32.@) + * NtGdiExtGetObjectW (win32u.@) */ -INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) +INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) { GDI_HANDLE_ENTRY *entry; const struct gdi_obj_funcs *funcs = NULL; @@ -1078,11 +1078,9 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) } LeaveCriticalSection( &gdi_section ); - if (funcs) + if (funcs && funcs->pGetObjectW) { - if (!funcs->pGetObjectW) - SetLastError( ERROR_INVALID_HANDLE ); - else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ SetLastError( ERROR_NOACCESS ); else result = funcs->pGetObjectW( handle, count, buffer ); diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 854f4783f5b..af1e2a19f06 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -111,3 +111,32 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ obj ) if (!ret) SetLastError( ERROR_INVALID_HANDLE ); return ret; } + +/*********************************************************************** + * GetObjectW (GDI32.@) + */ +INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) +{ + int result; + + TRACE( "%p %d %p\n", handle, count, buffer ); + + result = NtGdiExtGetObjectW( handle, count, buffer ); + if (!result && count) + { + switch(get_object_type( handle )) + { + case 0: + case OBJ_BITMAP: + case OBJ_BRUSH: + case OBJ_FONT: + case OBJ_PAL: + case OBJ_PEN: + case OBJ_EXTPEN: + break; + default: + SetLastError( ERROR_INVALID_HANDLE ); + } + } + return result; +}

1 0

Alexandre Julliard : ntdll: Get rid of the almost empty directory.c.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 73a281104bd2df7d5dcd1106724d81f82b38b160 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a281104bd2df7d5dcd1106… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 5 12:22:32 2021 +0200 ntdll: Get rid of the almost empty directory.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/directory.c | 100 ------------------------------------------------- dlls/ntdll/path.c | 19 ++++++++++ dlls/ntdll/process.c | 33 ++++++++++++++++ 4 files changed, 52 insertions(+), 101 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index b0607952431..eb125c07722 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ critsection.c \ crypt.c \ debugbuffer.c \ - directory.c \ env.c \ error.c \ exception.c \ diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c deleted file mode 100644 index 3c601fe016a..00000000000 --- a/dlls/ntdll/directory.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * NTDLL directory functions - * - * Copyright 1993 Erik Bos - * Copyright 2003 Eric Pouech - * Copyright 1996, 2004 Alexandre Julliard - * - * 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 - */ - -#include <assert.h> -#include <sys/types.h> -#include <fcntl.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> -#include <stdio.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define NONAMELESSUNION -#include "windef.h" -#include "winnt.h" -#include "winternl.h" -#include "ddk/wdm.h" -#include "ntdll_misc.h" -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/exception.h" - - -/****************************************************************** - * RtlWow64EnableFsRedirection (NTDLL.@) - */ -NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) -{ - if (!NtCurrentTeb64()) return STATUS_NOT_IMPLEMENTED; - NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR] = !enable; - return STATUS_SUCCESS; -} - - -/****************************************************************** - * RtlWow64EnableFsRedirectionEx (NTDLL.@) - */ -NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) -{ - if (!NtCurrentTeb64()) return STATUS_NOT_IMPLEMENTED; - - __TRY - { - *old_value = NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR]; - } - __EXCEPT_PAGE_FAULT - { - return STATUS_ACCESS_VIOLATION; - } - __ENDTRY - - NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR] = disable; - return STATUS_SUCCESS; -} - - -/****************************************************************** - * RtlDoesFileExists_U (NTDLL.@) - */ -BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR file_name) -{ - UNICODE_STRING nt_name; - FILE_BASIC_INFORMATION basic_info; - OBJECT_ATTRIBUTES attr; - BOOLEAN ret; - - if (!RtlDosPathNameToNtPathName_U( file_name, &nt_name, NULL, NULL )) return FALSE; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nt_name; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - ret = NtQueryAttributesFile(&attr, &basic_info) == STATUS_SUCCESS; - - RtlFreeUnicodeString( &nt_name ); - return ret; -} diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 58983aca194..53be23fe4ec 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -768,6 +768,25 @@ DWORD WINAPI RtlGetLongestNtPathLength(void) return MAX_NT_PATH_LENGTH; } + +/****************************************************************** + * RtlDoesFileExists_U (NTDLL.@) + */ +BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR file_name) +{ + UNICODE_STRING nt_name; + FILE_BASIC_INFORMATION basic_info; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + if (!RtlDosPathNameToNtPathName_U( file_name, &nt_name, NULL, NULL )) return FALSE; + InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); + status = NtQueryAttributesFile(&attr, &basic_info); + RtlFreeUnicodeString( &nt_name ); + return !status; +} + + /****************************************************************** * RtlIsNameLegalDOS8Dot3 (NTDLL.@) * diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index d10d731e3ef..160b1f549c9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -49,6 +49,39 @@ PEB * WINAPI RtlGetCurrentPeb(void) } +/****************************************************************** + * RtlWow64EnableFsRedirection (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) +{ + if (!NtCurrentTeb64()) return STATUS_NOT_IMPLEMENTED; + NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR] = !enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * RtlWow64EnableFsRedirectionEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) +{ + if (!NtCurrentTeb64()) return STATUS_NOT_IMPLEMENTED; + + __TRY + { + *old_value = NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR]; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY + + NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR] = disable; + return STATUS_SUCCESS; +} + + /********************************************************************** * RtlWow64GetCurrentMachine (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Get rid of the almost empty nt.c.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: d4509765a69a34a47fafa5178d4b5eb2cbf0415a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4509765a69a34a47fafa517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 5 12:18:29 2021 +0200 ntdll: Get rid of the almost empty nt.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/nt.c | 76 -------------------------------------------------- dlls/ntdll/rtl.c | 8 ++++++ dlls/ntdll/version.c | 18 ++++++++++++ 4 files changed, 26 insertions(+), 77 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 6dfe2eb12f9..b0607952431 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -22,7 +22,6 @@ C_SRCS = \ loader.c \ locale.c \ misc.c \ - nt.c \ path.c \ printf.c \ process.c \ diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c deleted file mode 100644 index b9f747570f4..00000000000 --- a/dlls/ntdll/nt.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * NT basis DLL - * - * This file contains the Nt* API functions of NTDLL.DLL. - * In the original ntdll.dll they all seem to just call int 0x2e (down to the NTOSKRNL) - * - * Copyright 1996-1998 Marcus Meissner - * - * 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 - */ - -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#define NONAMELESSUNION -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "wine/debug.h" -#include "windef.h" -#include "winternl.h" -#include "ntdll_misc.h" -#include "ddk/wdm.h" - - -/*********************************************************************** - * RtlIsProcessorFeaturePresent [NTDLL.@] - */ -BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) -{ - return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; -} - -/****************************************************************************** - * VerSetConditionMask (NTDLL.@) - */ -ULONGLONG WINAPI VerSetConditionMask( ULONGLONG dwlConditionMask, DWORD dwTypeBitMask, - BYTE dwConditionMask) -{ - if(dwTypeBitMask == 0) - return dwlConditionMask; - dwConditionMask &= 0x07; - if(dwConditionMask == 0) - return dwlConditionMask; - - if(dwTypeBitMask & VER_PRODUCT_TYPE) - dwlConditionMask |= dwConditionMask << 7*3; - else if (dwTypeBitMask & VER_SUITENAME) - dwlConditionMask |= dwConditionMask << 6*3; - else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) - dwlConditionMask |= dwConditionMask << 5*3; - else if (dwTypeBitMask & VER_SERVICEPACKMINOR) - dwlConditionMask |= dwConditionMask << 4*3; - else if (dwTypeBitMask & VER_PLATFORMID) - dwlConditionMask |= dwConditionMask << 3*3; - else if (dwTypeBitMask & VER_BUILDNUMBER) - dwlConditionMask |= dwConditionMask << 2*3; - else if (dwTypeBitMask & VER_MAJORVERSION) - dwlConditionMask |= dwConditionMask << 1*3; - else if (dwTypeBitMask & VER_MINORVERSION) - dwlConditionMask |= dwConditionMask << 0*3; - return dwlConditionMask; -} diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d7740a7a044..bb005d60807 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2140,6 +2140,14 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) processor->Reserved = 0; } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; +} + /*********************************************************************** * RtlInitializeGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index cde340cca1d..5f956d9d2e6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -759,3 +759,21 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } + + +/****************************************************************************** + * VerSetConditionMask (NTDLL.@) + */ +ULONGLONG WINAPI VerSetConditionMask( ULONGLONG condition_mask, DWORD type_mask, BYTE condition ) +{ + condition &= 0x07; + if (type_mask & VER_PRODUCT_TYPE) condition_mask |= condition << 7*3; + else if (type_mask & VER_SUITENAME) condition_mask |= condition << 6*3; + else if (type_mask & VER_SERVICEPACKMAJOR) condition_mask |= condition << 5*3; + else if (type_mask & VER_SERVICEPACKMINOR) condition_mask |= condition << 4*3; + else if (type_mask & VER_PLATFORMID) condition_mask |= condition << 3*3; + else if (type_mask & VER_BUILDNUMBER) condition_mask |= condition << 2*3; + else if (type_mask & VER_MAJORVERSION) condition_mask |= condition << 1*3; + else if (type_mask & VER_MINORVERSION) condition_mask |= condition << 0*3; + return condition_mask; +}

1 0

Alexandre Julliard : ntdll: Forward RtlGetNativeSystemInformation() to NtWow64GetNativeSystemInformation() on 32-bit.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 9a224788b7ed09a1e1936ed1d9e12e4d115e7e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a224788b7ed09a1e1936ed1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 5 12:13:30 2021 +0200 ntdll: Forward RtlGetNativeSystemInformation() to NtWow64GetNativeSystemInformation() on 32-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 28 ---------------------------- dlls/ntdll/ntdll.spec | 3 ++- dlls/ntdll/tests/info.c | 2 +- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3d7063caa1d..b9f747570f4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -35,15 +35,6 @@ #include "ntdll_misc.h" #include "ddk/wdm.h" -WINE_DEFAULT_DEBUG_CHANNEL(ntdll); - -/* - * Token - */ - -/* - * Misc - */ /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] @@ -53,25 +44,6 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; } -/****************************************************************************** - * RtlGetNativeSystemInformation [NTDLL.@] - */ -NTSTATUS WINAPI /* DECLSPEC_HOTPATCH */ RtlGetNativeSystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - FIXME( "semi-stub, SystemInformationClass %#x, SystemInformation %p, Length %#x, ResultLength %p.\n", - SystemInformationClass, SystemInformation, Length, ResultLength ); - - /* RtlGetNativeSystemInformation function is the same as NtQuerySystemInformation on some Win7 - * versions but there are differences for earlier and newer versions, at least: - * - HighestUserAddress field for SystemBasicInformation; - * - Some information classes are not supported by RtlGetNativeSystemInformation. */ - return NtQuerySystemInformation( SystemInformationClass, SystemInformation, Length, ResultLength ); -} - /****************************************************************************** * VerSetConditionMask (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 85fa37fddb3..3924458f5f2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -721,7 +721,8 @@ # Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators @ stdcall RtlGetLongestNtPathLength() -@ stdcall RtlGetNativeSystemInformation(long ptr long ptr) +@ stdcall -syscall -arch=win32 RtlGetNativeSystemInformation(long ptr long ptr) NtWow64GetNativeSystemInformation +@ stdcall -syscall -arch=win64 RtlGetNativeSystemInformation(long ptr long ptr) NtQuerySystemInformation # @ stub RtlGetNextRange @ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index df08ef19b5e..c873a224a7c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -200,11 +200,11 @@ static void test_query_basic(void) ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */ "got %08x\n", status); status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength ); - todo_wine ok( !status || status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) || broken(status == STATUS_NOT_IMPLEMENTED), "failed %x\n", status ); if (!status || status == STATUS_INFO_LENGTH_MISMATCH) + todo_wine_if( is_wow64 ) ok( !status == !is_wow64, "got wrong status %x wow64 %u\n", status, is_wow64 ); if (!status) {

1 0

Jacek Caban : gdi32: Implement CreateBitmapIndirect on top of CreateBitmap.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 505a6b9cffa5e7081bce4326c15f4f960601760f URL: https://source.winehq.org/git/wine.git/?a=commit;h=505a6b9cffa5e7081bce4326… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:45 2021 +0200 gdi32: Implement CreateBitmapIndirect on top of CreateBitmap. Instead of the other way around. 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/bitmap.c | 121 +++++++++++++++------------------------------------ dlls/gdi32/objects.c | 15 +++++++ 2 files changed, 49 insertions(+), 87 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index aaad76dce36..cebe2dea644 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -43,38 +43,6 @@ static const struct gdi_obj_funcs bitmap_funcs = }; -/****************************************************************************** - * CreateBitmap [GDI32.@] - * - * Creates a bitmap with the specified info. - * - * PARAMS - * width [I] bitmap width - * height [I] bitmap height - * planes [I] Number of color planes - * bpp [I] Number of bits to identify a color - * bits [I] Pointer to array containing color data - * - * RETURNS - * Success: Handle to bitmap - * Failure: 0 - */ -HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, - UINT bpp, LPCVOID bits ) -{ - BITMAP bm; - - bm.bmType = 0; - bm.bmWidth = width; - bm.bmHeight = height; - bm.bmWidthBytes = get_bitmap_stride( width, bpp ); - bm.bmPlanes = planes; - bm.bmBitsPixel = bpp; - bm.bmBits = (LPVOID)bits; - - return CreateBitmapIndirect( &bm ); -} - /****************************************************************************** * CreateCompatibleBitmap [GDI32.@] * @@ -123,81 +91,57 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) /****************************************************************************** - * CreateBitmapIndirect [GDI32.@] + * CreateBitmap [GDI32.@] * * Creates a bitmap with the specified info. - * - * PARAMS - * bmp [I] Pointer to the bitmap info describing the bitmap - * - * RETURNS - * Success: Handle to bitmap - * Failure: NULL. Use GetLastError() to determine the cause. - * - * NOTES - * If a width or height of 0 is given, a 1x1 monochrome bitmap is returned. */ -HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) +HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) { - BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; INT dib_stride; SIZE_T size; - if (!bmp || bmp->bmType) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - - if (bmp->bmWidth > 0x7ffffff || bmp->bmHeight > 0x7ffffff) + if (width > 0x7ffffff || height > 0x7ffffff) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - bm = *bmp; - - if (!bm.bmWidth || !bm.bmHeight) - { + if (!width || !height) return GetStockObject( DEFAULT_BITMAP ); - } - else - { - if (bm.bmHeight < 0) - bm.bmHeight = -bm.bmHeight; - if (bm.bmWidth < 0) - bm.bmWidth = -bm.bmWidth; - } - if (bm.bmPlanes != 1) + if (height < 0) + height = -height; + if (width < 0) + width = -width; + + if (planes != 1) { - FIXME("planes = %d\n", bm.bmPlanes); + FIXME("planes = %d\n", planes); SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } /* Windows only uses 1, 4, 8, 16, 24 and 32 bpp */ - if(bm.bmBitsPixel == 1) bm.bmBitsPixel = 1; - else if(bm.bmBitsPixel <= 4) bm.bmBitsPixel = 4; - else if(bm.bmBitsPixel <= 8) bm.bmBitsPixel = 8; - else if(bm.bmBitsPixel <= 16) bm.bmBitsPixel = 16; - else if(bm.bmBitsPixel <= 24) bm.bmBitsPixel = 24; - else if(bm.bmBitsPixel <= 32) bm.bmBitsPixel = 32; - else { - WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bm.bmBitsPixel); + if(bpp == 1) bpp = 1; + else if(bpp <= 4) bpp = 4; + else if(bpp <= 8) bpp = 8; + else if(bpp <= 16) bpp = 16; + else if(bpp <= 24) bpp = 24; + else if(bpp <= 32) bpp = 32; + else + { + WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bpp); SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - /* Windows ignores the provided bm.bmWidthBytes */ - bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - - dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); - size = dib_stride * bm.bmHeight; + dib_stride = get_dib_stride( width, bpp ); + size = dib_stride * height; /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ - if (dib_stride != size / bm.bmHeight) + if (dib_stride != size / height) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -210,8 +154,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return 0; } - bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + bmpobj->dib.dsBm.bmType = 0; + bmpobj->dib.dsBm.bmWidth = width; + bmpobj->dib.dsBm.bmHeight = height; + bmpobj->dib.dsBm.bmWidthBytes = get_bitmap_stride( width, bpp ); + bmpobj->dib.dsBm.bmPlanes = planes; + bmpobj->dib.dsBm.bmBitsPixel = bpp; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); if (!bmpobj->dib.dsBm.bmBits) { HeapFree( GetProcessHeap(), 0, bmpobj ); @@ -226,12 +175,10 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return 0; } - if (bm.bmBits) - SetBitmapBits( hbitmap, bm.bmHeight * bm.bmWidthBytes, bm.bmBits ); - - TRACE("%dx%d, bpp %d planes %d: returning %p\n", bm.bmWidth, bm.bmHeight, - bm.bmBitsPixel, bm.bmPlanes, hbitmap); + if (bits) + SetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); + TRACE("%dx%d, bpp %d planes %d: returning %p\n", width, height, bpp, planes, hbitmap); return hbitmap; } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 0e8453f4af2..1567a02b128 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -186,3 +186,18 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) if (style < 0 || style > PS_INSIDEFRAME) style = PS_SOLID; return NtGdiCreatePen( style, width, color, NULL ); } + +/*********************************************************************** + * CreateBitmapIndirect (GDI32.@) + */ +HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) +{ + if (!bmp || bmp->bmType) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + return CreateBitmap( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes, + bmp->bmBitsPixel, bmp->bmBits ); +}

1 0

Jacek Caban : gdi32: Introduce NtGdiCreatePen.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: f5c117fb78b8530a31fb15eff7936b1b37aef7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c117fb78b8530a31fb15ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:15 2021 +0200 gdi32: Introduce NtGdiCreatePen. 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/objects.c | 9 +++++++++ dlls/gdi32/pen.c | 33 ++++++++++++++------------------- include/ntgdi.h | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 7fbb0419ec8..0e8453f4af2 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -177,3 +177,12 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN *pen ) { return CreatePen( pen->lopnStyle, pen->lopnWidth.x, pen->lopnColor ); } + +/*********************************************************************** + * CreatePen (GDI32.@) + */ +HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) +{ + if (style < 0 || style > PS_INSIDEFRAME) style = PS_SOLID; + return NtGdiCreatePen( style, width, color, NULL ); +} diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 1fbd467d105..7790278fca6 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -52,27 +52,15 @@ static const struct gdi_obj_funcs pen_funcs = /*********************************************************************** - * CreatePen (GDI32.@) + * NtGdiCreatePen (win32u.@) */ -HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) +HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) { PENOBJ *penPtr; HPEN hpen; TRACE( "%d %d %06x\n", style, width, color ); - - if (style == PS_NULL) - { - hpen = GetStockObject(NULL_PEN); - if (hpen) return hpen; - } - - if (!(penPtr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*penPtr) ))) return 0; - - penPtr->logpen.elpPenStyle = style; - penPtr->logpen.elpWidth = abs(width); - penPtr->logpen.elpColor = color; - penPtr->logpen.elpBrushStyle = BS_SOLID; + if (brush) FIXME( "brush not supported\n" ); switch (style) { @@ -84,14 +72,21 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) case PS_INSIDEFRAME: break; case PS_NULL: - penPtr->logpen.elpWidth = 1; - penPtr->logpen.elpColor = 0; + if ((hpen = GetStockObject( NULL_PEN ))) return hpen; + width = 1; + color = 0; break; default: - penPtr->logpen.elpPenStyle = PS_SOLID; - break; + return 0; } + if (!(penPtr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*penPtr) ))) return 0; + + penPtr->logpen.elpPenStyle = style; + penPtr->logpen.elpWidth = abs(width); + penPtr->logpen.elpColor = color; + penPtr->logpen.elpBrushStyle = BS_SOLID; + if (!(hpen = alloc_gdi_handle( &penPtr->obj, OBJ_PEN, &pen_funcs ))) HeapFree( GetProcessHeap(), 0, penPtr ); return hpen; diff --git a/include/ntgdi.h b/include/ntgdi.h index b4501c46b4e..778f589f550 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -68,7 +68,7 @@ HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, UL ULONG unk4, void *data ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); -HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color ); +HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height );

1 0

Francois Gouget : shell32/test: Fix an ok() message.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: d6d46299dd8bcf58ce25d14f42b8d04efbdc7c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d46299dd8bcf58ce25d14f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:41:57 2021 +0200 shell32/test: Fix an ok() message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ea6f92ce827..96bfd1d94ef 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3010,7 +3010,7 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } CloseHandle(file);

1 0