March 2019 - Wine-Devel - list.winehq.org

[PATCH 1/8] msvfw32: Use the global HeapAlloc() wrappers.
by Zebediah Figura March 6, 2019

March 6, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 118 +++++++++++++++++------------------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4b09913667..da227402ce 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -40,6 +40,7 @@ #include "vfw.h" #include "msvideo_private.h" #include "wine/debug.h" +#include "wine/heap.h" /* Drivers32 settings */ #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" @@ -366,8 +367,8 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDe if (driver) return FALSE; /* Register the driver */ - driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(reg_driver)); - if (!driver) goto oom; + if (!(driver = heap_alloc_zero(sizeof(*driver)))) + return FALSE; driver->fccType = fccType; driver->fccHandler = fccHandler; @@ -375,29 +376,27 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDe { case ICINSTALL_FUNCTION: driver->proc = (DRIVERPROC)lParam; - driver->name = NULL; break; case ICINSTALL_DRIVER: - driver->proc = NULL; len = MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, NULL, 0); - driver->name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!driver->name) goto oom; + if (!(driver->name = heap_alloc(len * sizeof(WCHAR)))) + { + heap_free(driver); + return FALSE; + } MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, driver->name, len); - break; + break; default: - ERR("Invalid flags!\n"); - HeapFree(GetProcessHeap(), 0, driver); - return FALSE; - } + ERR("Invalid flags!\n"); + heap_free(driver); + return FALSE; + } /* Insert our driver in the list*/ driver->next = reg_driver_list; reg_driver_list = driver; - - return TRUE; -oom: - HeapFree(GetProcessHeap(), 0, driver); - return FALSE; + + return TRUE; } /*********************************************************************** @@ -423,8 +422,8 @@ BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags) /* Remove the driver from the list */ drv = *pdriver; *pdriver = (*pdriver)->next; - HeapFree(GetProcessHeap(), 0, drv->name); - HeapFree(GetProcessHeap(), 0, drv); + heap_free(drv->name); + heap_free(drv); return TRUE; } @@ -517,8 +516,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) return 0; } - whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); - if (!whic) + if (!(whic = heap_alloc(sizeof(*whic)))) { CloseDriver(hdrv, 0, 0); return FALSE; @@ -557,8 +555,8 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO icopen.pV2Reserved = NULL; icopen.dnDevNode = 0; /* FIXME */ - whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); - if (!whic) return 0; + if (!(whic = heap_alloc(sizeof(*whic)))) + return NULL; whic->driverproc = lpfnHandler; while (MSVIDEO_GetHicPtr((HIC)(ULONG_PTR)IC_HandleRef) != NULL) IC_HandleRef++; @@ -573,7 +571,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO { WARN("DRV_LOAD failed for hic %p\n", whic->hic); MSVIDEO_FirstHic = whic->next; - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } /* return value is not checked */ @@ -587,7 +585,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO { WARN("DRV_OPEN failed for hic %p\n", whic->hic); MSVIDEO_FirstHic = whic->next; - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } @@ -925,7 +923,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic = heap_alloc(sizeof(*ic)); ic->icinfo = icinfo; ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); @@ -978,7 +976,7 @@ static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARA LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic = heap_alloc(sizeof(*ic)); ic->icinfo.fccType = streamtypeVIDEO; ic->icinfo.fccHandler = comptypeDIB; ic->hic = 0; @@ -1099,7 +1097,7 @@ static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARA if (!ic || (LONG_PTR)ic == CB_ERR) break; if (ic->hic) ICClose(ic->hic); - HeapFree(GetProcessHeap(), 0, ic); + heap_free(ic); } EndDialog(hdlg, LOWORD(wparam) == IDOK); @@ -1171,23 +1169,25 @@ BOOL VFWAPI ICCompressorChoose(HWND hwnd, UINT uiFlags, LPVOID pvIn, */ void VFWAPI ICCompressorFree(PCOMPVARS pc) { - TRACE("(%p)\n",pc); + TRACE("(%p)\n", pc); - if (pc != NULL && pc->cbSize == sizeof(COMPVARS)) { - if (pc->hic != NULL) { - ICClose(pc->hic); - pc->hic = NULL; + if (pc && pc->cbSize == sizeof(COMPVARS)) + { + if (pc->hic) + { + ICClose(pc->hic); + pc->hic = NULL; + } + heap_free(pc->lpbiIn); + pc->lpbiIn = NULL; + heap_free(pc->lpBitsOut); + pc->lpBitsOut = NULL; + heap_free(pc->lpBitsPrev); + pc->lpBitsPrev = NULL; + heap_free(pc->lpState); + pc->lpState = NULL; + pc->dwFlags = 0; } - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - pc->lpbiIn = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - pc->lpBitsPrev = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpState); - pc->lpState = NULL; - pc->dwFlags = 0; - } } /*********************************************************************** @@ -1297,7 +1297,7 @@ LRESULT WINAPI ICClose(HIC hic) } } - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } @@ -1382,8 +1382,7 @@ HANDLE VFWAPI ICImageDecompress( cbHdr = ICDecompressGetFormatSize(hic,lpbiIn); if ( cbHdr < sizeof(BITMAPINFOHEADER) ) goto err; - pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); - if ( pHdr == NULL ) + if (!(pHdr = heap_alloc_zero(cbHdr + sizeof(RGBQUAD) * 256))) goto err; if ( ICDecompressGetFormat( hic, lpbiIn, pHdr ) != ICERR_OK ) goto err; @@ -1438,7 +1437,7 @@ err: ICDecompressEnd( hic ); if ( bReleaseIC ) ICClose(hic); - HeapFree(GetProcessHeap(),0,pHdr); + heap_free(pHdr); if ( pMem != NULL ) GlobalUnlock( hMem ); if ( !bSucceeded && hMem != NULL ) @@ -1509,14 +1508,14 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL static void clear_compvars(PCOMPVARS pc) { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - HeapFree(GetProcessHeap(), 0, pc->lpState); + heap_free(pc->lpbiIn); + heap_free(pc->lpBitsPrev); + heap_free(pc->lpBitsOut); + heap_free(pc->lpState); pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; if (pc->dwFlags & 0x80000000) { - HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + heap_free(pc->lpbiOut); pc->lpbiOut = NULL; pc->dwFlags &= ~0x80000000; } @@ -1542,15 +1541,13 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) */ DWORD ret; ICCOMPRESS* icComp; - pc->lpbiIn = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); - if (!pc->lpbiIn) + + if (!(pc->lpbiIn = heap_alloc(sizeof(BITMAPINFO)))) return FALSE; *pc->lpbiIn = *lpbiIn; - pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS) - + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)); - if (!pc->lpState) + if (!(pc->lpState = heap_alloc(sizeof(ICCOMPRESS) + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)))) goto error; pc->cbState = sizeof(ICCOMPRESS); @@ -1563,8 +1560,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (size <= 0) goto error; - pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!pc->lpbiOut) + if (!(pc->lpbiOut = heap_alloc_zero(size))) goto error; /* Flag to show that we allocated lpbiOut for proper cleanup */ pc->dwFlags |= 0x80000000; @@ -1600,13 +1596,11 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut->bmiHeader.biSizeImage); /* Buffer for compressed frame data */ - pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); - if (!pc->lpBitsOut) + if (!(pc->lpBitsOut = heap_alloc(pc->lpbiOut->bmiHeader.biSizeImage))) goto error; /* Buffer for previous compressed frame data */ - pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); - if (!pc->lpBitsPrev) + if (!(pc->lpBitsPrev = heap_alloc(pc->lpbiOut->bmiHeader.biSizeImage))) goto error; TRACE("Compvars:\n" -- 2.20.1

2 11

[PATCH] msvcrt: Fix vtable alignment on macOS.
by Ken Thomases March 6, 2019

March 6, 2019

On macOS, the .align <n> directive aligns to 2^n, not just n. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/msvcrt/cxx.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 027026e..7174f7e 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -42,9 +42,15 @@ #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" +#ifdef __APPLE__ +#define __ASM_VTABLE_ALIGN ".align 3" +#else +#define __ASM_VTABLE_ALIGN ".align 8" +#endif + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 8\n" \ + "\t" __ASM_VTABLE_ALIGN "\n" \ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ @@ -54,9 +60,15 @@ #define VTABLE_ADD_FUNC(name) "\t.long " THISCALL_NAME(name) "\n" +#ifdef __APPLE__ +#define __ASM_VTABLE_ALIGN ".align 2" +#else +#define __ASM_VTABLE_ALIGN ".align 4" +#endif + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 4\n" \ + "\t" __ASM_VTABLE_ALIGN "\n" \ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ -- 2.10.2

1 0

[PATCH 1/3] libwine: On Mac, use a more capable Mach function to map memory and avoid calling mmap() in some cases.
by Ken Thomases March 6, 2019

March 6, 2019

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- libs/wine/mmap.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 458cc13..affdc0a 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -165,23 +165,29 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, #elif defined(__APPLE__) #include <mach/mach_init.h> -#include <mach/vm_map.h> +#include <mach/mach_vm.h> /* - * On Darwin, we can use the Mach call vm_allocate to allocate - * anonymous memory at the specified address, and then use mmap with - * MAP_FIXED to replace the mapping. + * On Darwin, we can use the Mach call mach_vm_map to allocate + * anonymous memory at the specified address and then, if necessary, use + * mmap with MAP_FIXED to replace the mapping. */ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, int fildes, off_t off) { - vm_address_t result = (vm_address_t)addr; + mach_vm_address_t result = (mach_vm_address_t)addr; + int vm_flags = VM_FLAGS_FIXED; - if (!vm_allocate(mach_task_self(),&result,len,0)) + if (flags & MAP_NOCACHE) + vm_flags |= VM_FLAGS_NO_CACHE; + if (!mach_vm_map( mach_task_self(), &result, len, 0, vm_flags, MEMORY_OBJECT_NULL, + 0, 0, prot, VM_PROT_ALL, VM_INHERIT_COPY )) { - if (mmap( (void *)result, len, prot, flags | MAP_FIXED, fildes, off ) != MAP_FAILED) + flags |= MAP_FIXED; + if (((flags & ~(MAP_NORESERVE | MAP_NOCACHE)) == (MAP_ANON | MAP_FIXED | MAP_PRIVATE)) || + mmap( (void *)result, len, prot, flags, fildes, off ) != MAP_FAILED) return 1; - vm_deallocate(mach_task_self(),result,len); + mach_vm_deallocate(mach_task_self(),result,len); } return 0; } -- 2.10.2

1 2

[PATCH] kernel32: Remove some duplicate code.
by Ken Thomases March 6, 2019

March 6, 2019

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/kernel32/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 89b561e..09f0433 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -344,11 +344,6 @@ static enum binary_type get_binary_info( HANDLE hfile, pe_image_info_t *info ) case 2: return BINARY_UNIX_EXE; case 8: return BINARY_UNIX_LIB; } - switch(header.macho.filetype) - { - case 2: return BINARY_UNIX_EXE; - case 8: return BINARY_UNIX_LIB; - } } return BINARY_UNKNOWN; } -- 2.10.2

1 0

[PATCH 1/3] setupapi: Added CM_Request_Device_EjectA/W stub
by Vijay Kiran Kamuju March 6, 2019

March 6, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45879 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ include/cfgmgr32.h | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cea6daca3f5..d633211db99 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -168,8 +168,8 @@ @ stub CM_Remove_SubTree_Ex @ stub CM_Remove_Unmarked_Children @ stub CM_Remove_Unmarked_Children_Ex -@ stub CM_Request_Device_EjectA -@ stub CM_Request_Device_EjectW +@ stdcall CM_Request_Device_EjectA(ptr ptr ptr long long) +@ stdcall CM_Request_Device_EjectW(ptr ptr ptr long long) @ stub CM_Request_Eject_PC @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4994ca4854d..4db32dd51c7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -696,3 +696,21 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA Devi SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * CM_Request_Device_EjectA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags) +{ + FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Request_Device_EjectW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags) +{ + FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + return CR_SUCCESS; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index da091153e4d..15340a60c64 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -175,6 +175,23 @@ typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; +typedef enum _PNP_VETO_TYPE +{ + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) @@ -213,6 +230,9 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags); +CMAPI CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags); +#define CM_Request_Device_Eject WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) #ifdef __cplusplus } -- 2.17.0

1 3

[PATCH 1/2] ntdll/tests: Mark sync NtWriteFile() result for async regular file as broken.
by Paul Gofman March 6, 2019

March 6, 2019

Vista+ always return async status. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3320ccecfa..75166feddb 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -619,7 +619,8 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); - ok( status == STATUS_SUCCESS || status == STATUS_PENDING, "wrong status %x\n", status ); + todo_wine ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "wrong status %x.\n", status ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); @@ -725,7 +726,8 @@ static void read_file_test(void) ResetEvent(event); status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || status == STATUS_SUCCESS, + todo_wine ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING + || broken(status == STATUS_SUCCESS) /* before Vista */, "Wrong status %x.\n", status); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); @@ -3472,6 +3474,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3490,8 +3494,6 @@ static void test_file_completion_information(void) ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key); ok(pov == &ov, "expected %p, got %p\n", &ov, pov); } - else - win_skip("WriteFile never returned TRUE\n"); info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); @@ -3502,6 +3504,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3516,8 +3520,6 @@ static void test_file_completion_information(void) ok(!ret, "GetQueuedCompletionStatus succeeded\n"); ok(pov == NULL, "expected NULL, got %p\n", pov); } - else - win_skip("WriteFile never returned TRUE\n"); info.Flags = 0; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); @@ -3528,6 +3530,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3544,8 +3548,6 @@ static void test_file_completion_information(void) ok(!ret, "GetQueuedCompletionStatus succeeded\n"); ok(pov == NULL, "expected NULL, got %p\n", pov); } - else - win_skip("WriteFile never returned TRUE\n"); CloseHandle(port); CloseHandle(h); @@ -4365,7 +4367,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4580,7 +4583,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4622,10 +4626,10 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); - /* WriteFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); ret = WaitForSingleObject(hfile, 3000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); -- 2.20.1

2 3

Re: RFC: reducing wasted disk space from addon files
by Olivier F. R. Dierick March 6, 2019

March 6, 2019

I have more than one version of wine installed and more than one wineprefix. I added a configuration file in each wineprefix that remember the wine version used, and my scripts use that to launch the apps in the prefix with the proper wine version. Since the wine versions may depend on different wine-mono version, the sharing mechanism would have to allow parallel installation of multiple wine-mono versions, and wine would have to make the prefix link to the right wine-mono shared install. Updating the prefix with another wine version will have to update the wine-mono link to the right wine-mono shared install, when it differs. Whatever sharing mechanism that will end up in wine would have to handle that situation. Also, having to use another filesystem type/partition is not a solution. It must work on ANY filesystem used by the user. -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

1 0

[PATCH] user32: GetRawInputDeviceInfo uses characters for RIDI_DEVICENAME size
by Andrew Eikum March 6, 2019

March 6, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/rawinput.c | 41 ++++++++++++++++++++++-------- dlls/user32/tests/input.c | 53 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index b247c157dc..2085fd3f9f 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -329,16 +329,37 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, */ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) { - UINT ret; - TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); - ret = GetRawInputDeviceInfoW(device, command, data, data_size); - if (command == RIDI_DEVICENAME && ret && ret != ~0U) - ret = WideCharToMultiByte(CP_ACP, 0, data, -1, data, *data_size, NULL, NULL); + /* RIDI_DEVICENAME data_size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, nameW_sz; - return ret; + if (!data_size) return ~0U; + + nameW_sz = *data_size; + + if (data && nameW_sz > 0) + nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz); + else + nameW = NULL; + + ret = GetRawInputDeviceInfoW(device, command, nameW, &nameW_sz); + + if (ret && ret != ~0U) + WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL); + + *data_size = nameW_sz; + + HeapFree(GetProcessHeap(), 0, nameW); + + return ret; + } + + return GetRawInputDeviceInfoW(device, command, data, data_size); } /*********************************************************************** @@ -366,18 +387,18 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: if (device == WINE_MOUSE_HANDLE) { - s = sizeof(mouse_name); + s = ARRAY_SIZE(mouse_name); name = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = sizeof(keyboard_name); + s = ARRAY_SIZE(keyboard_name); name = keyboard_name; } else { hid_device = device; - s = (strlenW(hid_device->path) + 1) * sizeof(WCHAR); + s = strlenW(hid_device->path) + 1; name = hid_device->path; } break; @@ -402,7 +423,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT if (command == RIDI_DEVICENAME) { - memcpy(data, name, s); + memcpy(data, name, s * sizeof(WCHAR)); return s; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 835dfb108d..625de3d768 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -80,6 +80,8 @@ static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); +static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); +static UINT (WINAPI *pGetRawInputDeviceInfoA) (HANDLE, UINT, void *, UINT *); #define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -164,6 +166,8 @@ static void init_function_pointers(void) GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetRawInputDeviceList); + GET_PROC(GetRawInputDeviceInfoW); + GET_PROC(GetRawInputDeviceInfoA); #undef GET_PROC } @@ -1555,7 +1559,7 @@ static void test_GetMouseMovePointsEx(void) static void test_GetRawInputDeviceList(void) { RAWINPUTDEVICELIST devices[32]; - UINT ret, oret, devcount, odevcount; + UINT ret, oret, devcount, odevcount, i; DWORD err; SetLastError(0xdeadbeef); @@ -1587,6 +1591,53 @@ static void test_GetRawInputDeviceList(void) ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); + for(i = 0; i < devcount; ++i) + { + WCHAR name[128]; + char nameA[128]; + UINT sz, len; + RID_DEVICE_INFO info; + + /* get required buffer size */ + name[0] = '\0'; + sz = 5; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICENAME, name, &sz); + ok(ret == -1, "GetRawInputDeviceInfo gave wrong failure: %d\n", err); + ok(sz > 5 && sz < ARRAY_SIZE(name), "Size should have been set and not too large (got: %u)\n", sz); + + /* buffer size for RIDI_DEVICENAME is in CHARs, not BYTEs */ + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICENAME, name, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %d\n", err); + len = lstrlenW(name); + ok(len + 1 == ret, "GetRawInputDeviceInfo returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + + /* test A variant with same size */ + ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICENAME, nameA, &sz); + ok(ret == sz, "GetRawInputDeviceInfoA gave wrong return: %d\n", err); + len = strlen(nameA); + ok(len + 1 == ret, "GetRawInputDeviceInfoA returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + + /* buffer size for RIDI_DEVICEINFO is in BYTEs */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + sz = sizeof(info) - 1; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == -1, "GetRawInputDeviceInfo gave wrong failure: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + } + /* check if variable changes from larger to smaller value */ devcount = odevcount = ARRAY_SIZE(devices); oret = ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); -- 2.21.0

2 1

[PATCH] wined3d: Implement eval_sample_index shader instruction.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Fixes text rendering in Metro Exodus. --- dlls/wined3d/glsl_shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa6e302a4b9d..ebc015957784 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6175,6 +6175,22 @@ static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins shader_addline(buffer, ", 0, 0, 0)%s);\n", dst_swizzle); } +static void shader_glsl_interpolate(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_src_param *input = &ins->src[0]; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param sample_param; + char dst_swizzle[6]; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + shader_glsl_get_swizzle(input, FALSE, write_mask, dst_swizzle); + + shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &sample_param); + shader_addline(buffer, "interpolateAtSample(shader_in.reg%u, %s)%s);\n", + input->reg.idx[0].offset, sample_param.param_str, dst_swizzle); +} + static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -11466,7 +11482,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, + /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_F16TOF32 */ shader_glsl_float16, -- 2.19.2

2 1

[PATCH 6/8] dxgi: Reject DXGI_FORMAT_UNKNOWN for swapchains.
by Józef Kucia March 6, 2019

March 6, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cf084f7183c2..07764826c01b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -85,7 +85,7 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; - if (!dxgi_validate_flip_swap_effect_format(desc->Format)) + if (desc->Format && !dxgi_validate_flip_swap_effect_format(desc->Format)) return FALSE; if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) @@ -738,6 +738,9 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi */ if (!implicit) { + if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) + return E_INVALIDARG; + if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, &IID_IDXGIFactory, (void **)&swapchain->factory))) { @@ -2604,6 +2607,9 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu ID3D12Device *device; HRESULT hr; + if (swapchain_desc->Format == DXGI_FORMAT_UNKNOWN) + return DXGI_ERROR_INVALID_CALL; + if (!fullscreen_desc) { memset(&default_fullscreen_desc, 0, sizeof(default_fullscreen_desc)); -- 2.19.2

3 2