November 2022 - Wine-commits

Rémi Bernon : opengl32: Build with msvcrt.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 60eeb92ae0342a13e6e407a44d116b657b7e9ee5 URL: https://gitlab.winehq.org/wine/wine/-/commit/60eeb92ae0342a13e6e407a44d116b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 16:26:41 2022 +0100 opengl32: Build with msvcrt. --- dlls/opengl32/Makefile.in | 4 +- dlls/opengl32/make_opengl | 16 ++++-- dlls/opengl32/unix_thunks.c | 8 ++- dlls/opengl32/unix_wgl.c | 130 +++++++++++++++++++++----------------------- dlls/opengl32/unixlib.h | 6 +- dlls/opengl32/wgl.c | 22 +++++--- 6 files changed, 101 insertions(+), 85 deletions(-)

1 0

Rémi Bernon : opengl32: Use msvcrt allocation functions.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 613bed5327d95df430c9a1e957e792cc3d145885 URL: https://gitlab.winehq.org/wine/wine/-/commit/613bed5327d95df430c9a1e957e792… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 16:17:00 2022 +0200 opengl32: Use msvcrt allocation functions. --- dlls/opengl32/wgl.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3d547783f31..274fd7d5333 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -429,10 +429,10 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l if (needed_size > size) { size = needed_size; - HeapFree(GetProcessHeap(), 0, bitmap); - HeapFree(GetProcessHeap(), 0, gl_bitmap); - bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - gl_bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + free( bitmap ); + free( gl_bitmap ); + bitmap = calloc( 1, size ); + gl_bitmap = calloc( 1, size ); } if (needed_size != 0) { if (unicode) @@ -496,8 +496,8 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l } glPixelStorei( GL_UNPACK_ALIGNMENT, org_alignment ); - HeapFree(GetProcessHeap(), 0, bitmap); - HeapFree(GetProcessHeap(), 0, gl_bitmap); + free( bitmap ); + free( gl_bitmap ); return ret; } @@ -658,7 +658,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(needed == GDI_ERROR) goto error; - buf = HeapAlloc(GetProcessHeap(), 0, needed); + buf = malloc( needed ); if(unicode) GetGlyphOutlineW(hdc, glyph, GGO_NATIVE, &gm, needed, buf, &identity); @@ -692,8 +692,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, while(!vertices) { - if(vertex_total != -1) - vertices = HeapAlloc(GetProcessHeap(), 0, vertex_total * 3 * sizeof(GLdouble)); + if (vertex_total != -1) vertices = malloc( vertex_total * 3 * sizeof(GLdouble) ); vertex_total = 0; pph = (TTPOLYGONHEADER*)buf; @@ -767,7 +766,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, curve[2].y = (curve[1].y + curve[2].y)/2; } num = bezier_approximate(curve, NULL, deviation); - points = HeapAlloc(GetProcessHeap(), 0, num*sizeof(bezier_vector)); + points = malloc( num * sizeof(bezier_vector) ); num = bezier_approximate(curve, points, deviation); vertex_total += num; if(vertices) @@ -783,7 +782,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, vertices += 3; } } - HeapFree(GetProcessHeap(), 0, points); + free( points ); previous[0] = curve[2].x; previous[1] = curve[2].y; } @@ -808,8 +807,8 @@ error_in_list: if (format == WGL_FONT_POLYGONS) gluTessEndPolygon( tess ); glTranslated( (GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0 ); glEndList(); - HeapFree(GetProcessHeap(), 0, buf); - HeapFree(GetProcessHeap(), 0, vertices); + free( buf ); + free( vertices ); } error:

1 0

Rémi Bernon : opengl32: Use RtlSetLastWin32Error instead of SetLastError.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 2f5c985eeaa0e4e98a5d93cfd2d959c99c208080 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f5c985eeaa0e4e98a5d93cfd2d959… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 16:19:55 2022 +0200 opengl32: Use RtlSetLastWin32Error instead of SetLastError. --- dlls/opengl32/unix_wgl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 7c6204d966d..7a6b3bb0ca4 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -104,7 +104,7 @@ static struct wgl_handle *get_handle_ptr( HANDLE handle, enum wgl_handle_type ty if (index < handle_count && ULongToHandle(wgl_handles[index].handle) == handle) return &wgl_handles[index]; - SetLastError( ERROR_INVALID_HANDLE ); + RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); return NULL; } @@ -124,7 +124,7 @@ static HANDLE alloc_handle( enum wgl_handle_type type, struct opengl_funcs *func ptr->u.context = user_ptr; handle = next_handle( ptr, type ); } - else SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + else RtlSetLastWin32Error( ERROR_NOT_ENOUGH_MEMORY ); return handle; } @@ -545,7 +545,7 @@ static BOOL wrap_wglCopyContext( HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask ) if (!(src = get_handle_ptr( hglrcSrc, HANDLE_CONTEXT ))) return FALSE; if ((dst = get_handle_ptr( hglrcDst, HANDLE_CONTEXT ))) { - if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); + if (src->funcs != dst->funcs) RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); else ret = src->funcs->wgl.p_wglCopyContext( src->u.context->drv_ctx, dst->u.context->drv_ctx, mask ); } return ret; @@ -592,7 +592,7 @@ static BOOL wrap_wglMakeCurrent( HDC hdc, HGLRC hglrc ) } else { - SetLastError( ERROR_BUSY ); + RtlSetLastWin32Error( ERROR_BUSY ); ret = FALSE; } } @@ -605,7 +605,7 @@ static BOOL wrap_wglMakeCurrent( HDC hdc, HGLRC hglrc ) } else if (!hdc) { - SetLastError( ERROR_INVALID_HANDLE ); + RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); ret = FALSE; } return ret; @@ -618,7 +618,7 @@ static BOOL wrap_wglDeleteContext( HGLRC hglrc ) if (!(ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ))) return FALSE; if (ptr->u.context->tid && ptr->u.context->tid != GetCurrentThreadId()) { - SetLastError( ERROR_BUSY ); + RtlSetLastWin32Error( ERROR_BUSY ); return FALSE; } if (hglrc == NtCurrentTeb()->glCurrentRC) wrap_wglMakeCurrent( 0, 0 ); @@ -638,7 +638,7 @@ static BOOL wrap_wglShareLists( HGLRC hglrcSrc, HGLRC hglrcDst ) if (!(src = get_handle_ptr( hglrcSrc, HANDLE_CONTEXT ))) return FALSE; if ((dst = get_handle_ptr( hglrcDst, HANDLE_CONTEXT ))) { - if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); + if (src->funcs != dst->funcs) RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); else ret = src->funcs->wgl.p_wglShareLists( src->u.context->drv_ctx, dst->u.context->drv_ctx ); } return ret; @@ -661,13 +661,13 @@ static HGLRC wrap_wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *a if (!funcs) { - SetLastError( ERROR_DC_NOT_FOUND ); + RtlSetLastWin32Error( ERROR_DC_NOT_FOUND ); return 0; } if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) { - SetLastError( ERROR_INVALID_OPERATION ); + RtlSetLastWin32Error( ERROR_INVALID_OPERATION ); return 0; } if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs ))) @@ -752,7 +752,7 @@ static BOOL wrap_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hgl } else { - SetLastError( ERROR_BUSY ); + RtlSetLastWin32Error( ERROR_BUSY ); ret = FALSE; } }

1 0

Jacek Caban : winevulkan: Support conversion of optional parameters.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 19a23b783842a205bbcf3725b882560464784ef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/19a23b783842a205bbcf3725b88256… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 14:33:46 2022 +0100 winevulkan: Support conversion of optional parameters. --- dlls/winevulkan/make_vulkan | 16 ++++++++++++++-- dlls/winevulkan/vulkan_thunks.c | 12 ++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0611388e477..2ed2a5144ed 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -759,6 +759,9 @@ class VkFunction(object): host_type = p.type + "_host" if conv and p.needs_host_type() else p.type if p.is_dynamic_array(): body += " {0} *{1}_host;\n".format(host_type, p.name) + elif p.optional: + body += " {0} *{1}_host = NULL;\n".format(host_type, p.name) + needs_alloc = True else: body += " {0} {1}_host;\n".format(host_type, p.name) if p.needs_alloc(conv, unwrap): @@ -1558,6 +1561,13 @@ class VkParam(VkVariable): if self.is_dynamic_array(): return " {1}_host = convert_{2}_array_{4}_to_{6}host({5}{0}{1}, {3});\n".format( prefix, self.name, self.type, self.get_dyn_array_len(prefix), win_type, ctx_param, wrap_part) + elif self.optional: + ret = " if ({0}{1})\n".format(prefix, self.name) + ret += " {\n" + ret += " {0}_host = conversion_context_alloc(&ctx, sizeof(*{0}_host));\n".format(self.name) + ret += " convert_{0}_{3}_to_{5}host({4}{1}{2}, {2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part) + ret += " }\n" + return ret else: return " convert_{0}_{3}_to_{5}host({4}{1}{2}, &{2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part) else: @@ -1565,7 +1575,9 @@ class VkParam(VkVariable): return " convert_{0}_array_{1}host_to_{2}({3}_host, {4}{3}, {5});\n".format( self.type, wrap_part, win_type, self.name, prefix, self.get_dyn_array_len(prefix)) else: - return " convert_{0}_host_to_{3}(&{2}_host, {1}{2});\n".format(self.type, prefix, self.name, win_type) + ref_part = "" if self.optional else "&" + return " convert_{0}_host_to_{3}({4}{2}_host, {1}{2});\n".format( + self.type, prefix, self.name, win_type, ref_part) def definition(self, postfix=None, is_member=False, is_thunk=False): """ Return prototype for the parameter. E.g. 'const char *foo' """ @@ -1700,7 +1712,7 @@ class VkParam(VkVariable): return "NULL" if self.needs_variable(conv, unwrap): - if self.is_dynamic_array(): + if self.is_dynamic_array() or self.optional: return "{0}_host".format(self.name) else: return "&{0}_host".format(self.name) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fce2a0efa3d..c7f15d3e294 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -20582,17 +20582,21 @@ static NTSTATUS thunk32_vkGetDeviceFaultInfoEXT(void *args) { struct vkGetDeviceFaultInfoEXT_params *params = args; VkDeviceFaultCountsEXT_host pFaultCounts_host; - VkDeviceFaultInfoEXT_host pFaultInfo_host; + VkDeviceFaultInfoEXT_host *pFaultInfo_host = NULL; struct conversion_context ctx; TRACE("%p, %p, %p\n", params->device, params->pFaultCounts, params->pFaultInfo); init_conversion_context(&ctx); convert_VkDeviceFaultCountsEXT_win32_to_host(params->pFaultCounts, &pFaultCounts_host); - convert_VkDeviceFaultInfoEXT_win32_to_host(&ctx, params->pFaultInfo, &pFaultInfo_host); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceFaultInfoEXT(wine_device_from_handle(params->device)->device, &pFaultCounts_host, &pFaultInfo_host); + if (params->pFaultInfo) + { + pFaultInfo_host = conversion_context_alloc(&ctx, sizeof(*pFaultInfo_host)); + convert_VkDeviceFaultInfoEXT_win32_to_host(&ctx, params->pFaultInfo, pFaultInfo_host); + } + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceFaultInfoEXT(wine_device_from_handle(params->device)->device, &pFaultCounts_host, pFaultInfo_host); convert_VkDeviceFaultCountsEXT_host_to_win32(&pFaultCounts_host, params->pFaultCounts); - convert_VkDeviceFaultInfoEXT_host_to_win32(&pFaultInfo_host, params->pFaultInfo); + convert_VkDeviceFaultInfoEXT_host_to_win32(pFaultInfo_host, params->pFaultInfo); free_conversion_context(&ctx); return STATUS_SUCCESS; }

1 0

Brendan Shanks : winemac.drv: Stop using deprecated kIOMasterPortDefault constant.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: ce386a870b2328ccb7536e683efd32c4c12f02e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce386a870b2328ccb7536e683efd32… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 9 14:00:55 2022 -0800 winemac.drv: Stop using deprecated kIOMasterPortDefault constant. --- dlls/winemac.drv/cocoa_display.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index f64a6c0f6ad..04f6dda4481 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -250,7 +250,7 @@ static int macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t int ret; io_registry_entry_t entry; - entry = IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(registry_id)); + entry = IOServiceGetMatchingService(0, IORegistryEntryIDMatching(registry_id)); ret = macdrv_get_gpu_info_from_entry(gpu, entry); IOObjectRelease(entry); return ret; @@ -422,7 +422,7 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) if (!gpus) goto done; - if (IOServiceGetMatchingServices(kIOMasterPortDefault, IOServiceMatching("IOPCIDevice"), &iterator) + if (IOServiceGetMatchingServices(0, IOServiceMatching("IOPCIDevice"), &iterator) != kIOReturnSuccess) goto done;

1 0

Eric Pouech : cmd: Use CRT file I/O function inside 'for /F' handling.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: e1c37c21da9a27b55aaad58ca50a3f8f8244b964 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1c37c21da9a27b55aaad58ca50a3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jul 20 14:58:05 2022 +0200 cmd: Use CRT file I/O function inside 'for /F' handling. This allows: - to mimic native behavior when a stray '\0' is present in file (in 'FOR /F' execution, it's interpreted as an EOF marker) (prevents an infinite loop) - supports (with /USEBACKQ) unicode output (if BOM is present) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53386 --- programs/cmd/builtins.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index dd3ae5b509b..82008c3ec7a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2048,9 +2048,9 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /************************************************************************** - * WCMD_forf_getinputhandle + * WCMD_forf_getinput * - * Return a file handle which can be used for reading the input lines, + * Return a FILE* which can be used for reading the input lines, * either to a specific file (which may be quote delimited as we have to * read the parameters in raw mode) or to a command which we need to * execute. The command being executed runs in its own shell and stores @@ -2064,12 +2064,12 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, * * Returns a file handle which can be used to read the input lines from. */ -static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { +static FILE* WCMD_forf_getinput(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING]; WCHAR *trimmed = NULL; - HANDLE hinput = INVALID_HANDLE_VALUE; + FILE* ret; /* Remove leading and trailing character (but there may be trailing whitespace too) */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || @@ -2097,17 +2097,14 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd WCMD_execute (temp_cmd, temp_str, NULL, FALSE); /* Open the file, read line by line and process */ - hinput = CreateFileW(temp_file, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); - + ret = _wfopen(temp_file, L"rt,ccs=unicode"); } else { /* Open the file, read line by line and process */ WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); - hinput = CreateFileW(itemstr, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ret = _wfopen(itemstr, L"rt,ccs=unicode"); } heap_free(trimmed); - return hinput; + return ret; } /************************************************************************** @@ -2389,7 +2386,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else if (doFileset && ((!forf_usebackq && *itemStart != '"') || (forf_usebackq && *itemStart != '\''))) { - HANDLE input; + FILE *input; WCHAR *itemparm; WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, @@ -2407,10 +2404,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Use item because the file to process is just the first item in the set */ itemparm = item; } - input = WCMD_forf_getinputhandle(forf_usebackq, itemparm, (itemparm==itemStart)); + input = WCMD_forf_getinput(forf_usebackq, itemparm, (itemparm==itemStart)); /* Process the input file */ - if (input == INVALID_HANDLE_VALUE) { + if (!input) { WCMD_print_error (); WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), item); errorlevel = 1; @@ -2419,12 +2416,20 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else { /* Read line by line until end of file */ - while (WCMD_fgets(buffer, ARRAY_SIZE(buffer), input)) { + while (fgetws(buffer, ARRAY_SIZE(buffer), input)) { + size_t len = wcslen(buffer); + /* Either our buffer isn't large enough to fit a full line, or there's a stray + * '\0' in the buffer. + */ + if (!feof(input) && (len == 0 || (buffer[len - 1] != '\n' && buffer[len - 1] != '\r'))) + break; + while (len && (buffer[len - 1] == '\n' || buffer[len - 1] == '\r')) + buffer[--len] = L'\0'; WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable[1], buffer, &doExecuted, &forf_skip, forf_eol, forf_delims, forf_tokens); buffer[0] = 0; } - CloseHandle (input); + fclose (input); } /* When we have processed the item as a whole command, abort future set processing */

1 0

Arkadiusz Hiler : cmd/tests: Make sure for /f doesn't loop infinitely on NULs.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 92e4cad8e08b64fc0e66c2a275896e2c1de45eba URL: https://gitlab.winehq.org/wine/wine/-/commit/92e4cad8e08b64fc0e66c2a275896e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Aug 1 17:53:29 2022 +0300 cmd/tests: Make sure for /f doesn't loop infinitely on NULs. --- programs/cmd/tests/batch.c | 22 ++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 27 insertions(+) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3846693ef2e..ade6587be81 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -455,6 +455,24 @@ static int cmd_available(void) return FALSE; } +void create_nul_test_file(void) +{ + HANDLE file; + DWORD size; + BOOL bres; + char contents[] = "a b c\nd e\0f\ng h i"; + + file = CreateFileA("nul_test_file", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + bres = WriteFile(file, contents, ARRAYSIZE(contents), &size, NULL); + ok(bres, "Could not write to file: %lu\n", GetLastError()); + CloseHandle(file); +} + START_TEST(batch) { int argc; @@ -479,9 +497,13 @@ START_TEST(batch) } shortpath_len = GetShortPathNameA(path, shortpath, ARRAY_SIZE(shortpath)); + create_nul_test_file(); + argc = winetest_get_mainargs(&argv); if(argc > 2) run_from_file(argv[2]); else EnumResourceNamesA(NULL, "TESTCMD", test_enum_proc, 0); + + DeleteFileA("nul_test_file"); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..3829be50f1a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1957,6 +1957,9 @@ FOR /F "delims=. tokens=1*" %%A IN (testfile) DO @echo 5:%%A,%%B FOR /F "delims=. tokens=2*" %%A IN (testfile) DO @echo 6:%%A,%%B FOR /F "delims=. tokens=3*" %%A IN (testfile) DO @echo 7:%%A,%%B del testfile +rem file contains NUL, created by the .exe +for /f %%A in (nul_test_file) DO echo %%A +for /f "tokens=*" %%A in (nul_test_file) DO echo %%A echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..437ded18000 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1315,6 +1315,8 @@ h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o 4:3.14,%B 5:3,14 6:14, +a +a b c ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Santino Mazza : user32/tests: Test for MB_SYSTEMMODAL.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 18b5cc5ee7a05e36e685fa420b15811d948d2bab URL: https://gitlab.winehq.org/wine/wine/-/commit/18b5cc5ee7a05e36e685fa420b1581… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 8 16:33:44 2022 -0300 user32/tests: Test for MB_SYSTEMMODAL. --- dlls/user32/tests/dialog.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3df1a0eab32..b439b6f08c0 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2151,6 +2151,25 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) return CallNextHookEx(NULL, code, wParam, lParam); } +static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARAM lParam) +{ + if (code == HCBT_ACTIVATE) + { + HWND msgbox = (HWND)wParam; + LONG exstyles = GetWindowLongA(msgbox, GWL_EXSTYLE); + + if (msgbox) + { + todo_wine ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); + + SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); + SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); + } + } + + return CallNextHookEx(NULL, code, wParam, lParam); +} + static void test_MessageBox(void) { HHOOK hook; @@ -2162,6 +2181,13 @@ static void test_MessageBox(void) ok(ret == IDCANCEL, "got %d\n", ret); UnhookWindowsHookEx(hook); + + /* Test for MB_SYSTEMMODAL */ + hook = SetWindowsHookExA(WH_CBT, msgbox_sysmodal_hook_proc, NULL, GetCurrentThreadId()); + + MessageBoxA(NULL, NULL, "system modal", MB_OKCANCEL | MB_SYSTEMMODAL); + + UnhookWindowsHookEx(hook); } static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Santino Mazza : user32/msgbox: Implement MB_SYSTEMMODAL.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 0c24f2b895038125d8f7d7d46ec81fcf77c45b38 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c24f2b895038125d8f7d7d46ec81f… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 8 16:34:29 2022 -0300 user32/msgbox: Implement MB_SYSTEMMODAL. --- dlls/user32/msgbox.c | 10 ++++++---- dlls/user32/tests/dialog.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index cc53ab0457e..22ddc30efed 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -109,6 +109,12 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) lpszText = lpmb->lpszText; } + /* handle modal message boxes */ + if (((lpmb->dwStyle & MB_TASKMODAL) && (lpmb->hwndOwner==NULL))) + NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); + else if (lpmb->dwStyle & MB_SYSTEMMODAL) + NtUserSetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED ); + TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); SetWindowTextW(GetDlgItem(hwnd, MSGBOX_IDTEXT), lpszText); @@ -309,10 +315,6 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) } } - /*handle modal message boxes*/ - if (((lpmb->dwStyle & MB_TASKMODAL) && (lpmb->hwndOwner==NULL)) || (lpmb->dwStyle & MB_SYSTEMMODAL)) - NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); - HeapFree( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b439b6f08c0..21958ddb193 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2160,7 +2160,7 @@ static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARA if (msgbox) { - todo_wine ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); + ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0);

1 0

Alex Henrie : mscoree: Use standard C functions for memory allocation in assembly.c.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 15cbe4979867955d44f86d2617527dc5d270728a URL: https://gitlab.winehq.org/wine/wine/-/commit/15cbe4979867955d44f86d2617527d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 7 21:54:14 2022 -0700 mscoree: Use standard C functions for memory allocation in assembly.c. The big win here is getting rid of the reimplementation of wcsdup. --- dlls/mscoree/assembly.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 240225a14da..8a209dad425 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -79,20 +79,6 @@ struct tagASSEMBLY METADATAHDR *metadatahdr; }; -static inline LPWSTR strdupW(LPCWSTR src) -{ - LPWSTR dest; - - if (!src) - return NULL; - - dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dest) - lstrcpyW(dest, src); - - return dest; -} - static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) { if (assembly->is_mapped_file) @@ -130,7 +116,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); + assembly->metadatahdr = malloc(sizeof(METADATAHDR)); if (!assembly->metadatahdr) return E_OUTOFMEMORY; @@ -210,13 +196,13 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + assembly = calloc(1, sizeof(ASSEMBLY)); if (!assembly) return E_OUTOFMEMORY; assembly->is_mapped_file = TRUE; - assembly->path = strdupW(file); + assembly->path = wcsdup(file); if (!assembly->path) { hr = E_OUTOFMEMORY; @@ -264,7 +250,7 @@ HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + assembly = calloc(1, sizeof(ASSEMBLY)); if (!assembly) return E_OUTOFMEMORY; @@ -292,9 +278,9 @@ HRESULT assembly_release(ASSEMBLY *assembly) CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); } - HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); - HeapFree(GetProcessHeap(), 0, assembly->path); - HeapFree(GetProcessHeap(), 0, assembly); + free(assembly->metadatahdr); + free(assembly->path); + free(assembly); return S_OK; }

1 0