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

[PATCH] l3codeca.acm: Check input format in MPEG3_StreamOpen.
by Vijay Kiran Kamuju April 2, 2019

April 2, 2019

Add comments on a test which crashes on XP, Vista Modify broken test for Win 8 From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/l3codeca.acm/mpegl3.c | 15 ++++++- dlls/msacm32/tests/msacm.c | 83 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 8ad6ae83dc..2e929371ae 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -212,6 +212,7 @@ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) */ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { + LRESULT error = MMSYSERR_NOTSUPPORTED; AcmMpeg3Data* aad; int err; @@ -235,6 +236,18 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { + if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + { + MPEGLAYER3WAVEFORMAT *formatmp3 = (MPEGLAYER3WAVEFORMAT *)adsi->pwfxSrc; + + if (adsi->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES || + formatmp3->wID != MPEGLAYER3_ID_MPEG) + { + error = ACMERR_NOTPOSSIBLE; + goto theEnd; + } + } + /* resampling or mono <=> stereo not available * MPEG3 algo only define 16 bit per sample output */ @@ -270,7 +283,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) theEnd: HeapFree(GetProcessHeap(), 0, aad); adsi->dwDriver = 0L; - return MMSYSERR_NOTSUPPORTED; + return error; } /*********************************************************************** diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 180639fa54..a6b17e8441 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1276,6 +1276,88 @@ static void test_acmFormatChoose(void) HeapFree(GetProcessHeap(), 0, pwfx); } +static void test_mp3(void) +{ + MPEGLAYER3WAVEFORMAT src; + WAVEFORMATEX dst; + HACMSTREAM has; + DWORD output; + MMRESULT mr; + + src.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + src.wfx.nSamplesPerSec = 11025; + src.wfx.wBitsPerSample = 0; + src.wfx.nChannels = 1; + src.wfx.nBlockAlign = 576; + src.wfx.nAvgBytesPerSec = 2000; + + src.wID = MPEGLAYER3_ID_MPEG; + src.fdwFlags = 0; + src.nBlockSize = 576; + src.nFramesPerBlock = 1; + src.nCodecDelay = 0; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 11025; + dst.wBitsPerSample = 16; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + src.wfx.cbSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + src.wID = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wID = MPEGLAYER3_ID_MPEG; + src.nBlockSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } + src.nBlockSize = 576; + src.wfx.nAvgBytesPerSec = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + /* causes a division by zero exception in XP, Vista, + but throws ACMERR_NOTPOSSIBLE on others */ + if (0) acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } + + src.wfx.nAvgBytesPerSec = 2000; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + mr = acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } +} + static struct { struct @@ -1446,6 +1528,7 @@ START_TEST(msacm) test_acmFormatSuggest(); test_acmFormatTagDetails(); test_acmFormatChoose(); + test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd(); -- 2.21.0

2 4

[PATCH] ntdll/tests: Fix failures in the file tests (GetOverlappedResult)
by Detlef Riekenberg April 1, 2019

April 1, 2019

Setting LastError to ERROR_SUCCESS in GetOverlappedResult seems to be broken. Example test failure: http://test.winehq.org/data/c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96/win10_… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=50279 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/ntdll/tests/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d107c2ed2b..0aa3c041af 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4464,7 +4464,8 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || broken(GetLastError() == ERROR_SUCCESS), + "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -4493,7 +4494,8 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || broken(GetLastError() == ERROR_SUCCESS), + "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); -- 2.21.0.windows.1

2 1

[PATCH] hid: Fix length argument to GetOverlappedResult().
by Zebediah Figura April 1, 2019

April 1, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hid/hidd.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4b703ca536..ca14c4f571 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,15 +38,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len) { OVERLAPPED ovl = {0}; + DWORD ret_len; BOOL ret; ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &ret_len, &ovl); if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + ret = GetOverlappedResult(file, &ovl, &ret_len, TRUE); CloseHandle(ovl.hEvent); return ret; } @@ -65,7 +66,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION)); if (ret) { @@ -79,7 +80,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -91,43 +92,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers)); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -137,14 +138,12 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(info))) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, data, info.DescriptorSize)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -156,5 +155,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); } -- 2.17.1

2 4

[PATCH v2 1/4] shell32/autocomplete: Forward to the original listbox proc outside the switch
by Gabriel Ivăncescu April 1, 2019

April 1, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Split the owner-drawn patch into two patches. dlls/shell32/autocomplete.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index bd9b872..ed8b270 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -801,23 +801,21 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_MOUSEMOVE: sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); SendMessageW(hwnd, LB_SETCURSEL, sel, 0); - break; + return 0; case WM_LBUTTONDOWN: sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); if (sel < 0) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); hide_listbox(This, hwnd, TRUE); heap_free(msg); - break; - default: - return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + return 0; } - return 0; + return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } static void create_listbox(IAutoCompleteImpl *This) -- 2.20.1

3 9

Re: TestBot job 50182 results: [PATCH 1/2] kernel32: Partially implement VirtualAllocExNuma
by Fabian Maurer April 1, 2019

April 1, 2019

This is unrelated since I didn't touch the tests, or code that the tests used. PS: Still don't know why the PATCH is marked as OK on https:// source.winehq.org/patches/, when the testbot says it failed. Regards, Fabian Maurer > VM Status Failures Command > debian9 failed 2 > debian9 failed 2 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=50182 > > > === debian9 (32 bit report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebcc85d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit Chinese:China report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebd785d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebcc85d). > > Report errors: > kernel32:virtual prints too much data (90502 bytes) > > === debian9 (64 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 64-bit code > (0x00007f9902d9e8a1). > > Report errors: > kernel32:virtual prints too much data (87157 bytes)

2 1

[PATCH v2] include: add missing tags and defines in mmreg.h
by Vijay Kiran Kamuju March 31, 2019

March 31, 2019

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/mmreg.h | 78 ++++++++++++++++++++++++++++++++++++++++++++-- include/mmsystem.h | 4 +-- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/include/mmreg.h b/include/mmreg.h index e7d70bbd63..8f4e4cb45b 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -75,6 +75,21 @@ typedef struct _WAVEFORMATEX { } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ +#ifndef WAVE_FORMAT_PCM +typedef struct waveformat_tag { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; +} WAVEFORMAT, *PWAVEFORMAT, *NPWAVEFORMAT, *LPWAVEFORMAT; + +typedef struct pcmwaveformat_tag { + WAVEFORMAT wf; + WORD wBitsPerSample; +} PCMWAVEFORMAT, *PPCMWAVEFORMAT, *NPPCMWAVEFORMAT, *LPPCMWAVEFORMAT; +#endif /* WAVE_FORMAT_PCM */ + /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #ifndef WAVE_FORMAT_PCM @@ -117,6 +132,8 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_MPEGLAYER3 0x0055 #define WAVE_FORMAT_MSRT24 0x0082 /* Microsoft Corporation */ #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 +#define WAVE_FORMAT_RAW_AAC1 0x00FF +#define WAVE_FORMAT_MSAUDIO1 0x0160 #define WAVE_FORMAT_WMAUDIO2 0x0161 #define WAVE_FORMAT_WMAUDIO3 0x0162 #define WAVE_FORMAT_WMAUDIO_LOSSLESS 0x0163 @@ -124,6 +141,7 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_CREATIVE_ADPCM 0x0200 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH8 0x0202 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH10 0x0203 /* Creative Labs, Inc */ +#define WAVE_FORMAT_GENERIC_PASSTHRU 0x0249 #define WAVE_FORMAT_FM_TOWNS_SND 0x0300 /* Fujitsu Corp. */ #define WAVE_FORMAT_OLIGSM 0x1000 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIADPCM 0x1001 /* Ing C. Olivetti & C., S.p.A. */ @@ -131,14 +149,19 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_OLISBC 0x1003 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIOPR 0x1004 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_MPEG_ADTS_AAC 0x1600 +#define WAVE_FORMAT_MPEG_RAW_AAC 0x1601 +#define WAVE_FORMAT_MPEG_LOAS 0x1602 #define WAVE_FORMAT_MPEG_HEAAC 0x1610 +#define WAVE_FORMAT_DTS2 0x2001 #define WAVE_FORMAT_ALAC 0x6c61 #define WAVE_FORMAT_OPUS 0x704f #define WAVE_FORMAT_AMR_NB 0x7361 #define WAVE_FORMAT_AMR_WB 0x7362 #define WAVE_FORMAT_AMR_WP 0x7363 +#define WAVE_FORMAT_MPEG_AAC 0xa106 #define WAVE_FORMAT_FLAC 0xf1ac + #ifndef MM_MICROSOFT #define MM_MICROSOFT 0x01 #endif @@ -147,6 +170,9 @@ typedef struct _WAVEFORMATEX { #define MM_MSFT_ACM_GSM610 0x24 #define MM_MSFT_ACM_G711 0x25 #define MM_MSFT_ACM_PCM 0x26 +#define MM_MSFT_ACM_WMAUDIO 39 +#define MM_MSFT_ACM_MSAUDIO1 39 +#define MM_MSFT_ACM_WMAUDIO2 101 #define MM_FRAUNHOFER_IIS 0xAC #define MM_FHGIIS_MPEGLAYER3_DECODE 0x09 @@ -175,6 +201,15 @@ typedef struct adpcmwaveformat_tag { typedef ADPCMWAVEFORMAT *PADPCMWAVEFORMAT, *NPADPCMWAVEFORMAT, *LPADPCMWAVEFORMAT; +typedef struct drmwaveformat_tag { + WAVEFORMATEX wfx; + WORD wReserved; + ULONG ulContentId; + WAVEFORMATEX wfxSecure; +} DRMWAVEFORMAT; +typedef DRMWAVEFORMAT *PDRMWAVEFORMAT, *NPDRMWAVEFORMAT, + *LPDRMWAVEFORMAT; + typedef struct dvi_adpcmwaveformat_tag { WAVEFORMATEX wfx; WORD wSamplesPerBlock; @@ -410,7 +445,9 @@ typedef struct mpeg1waveformat_tag { WORD fwHeadFlags; DWORD dwPTSLow; DWORD dwPTSHigh; -} MPEG1WAVEFORMAT,* PMPEG1WAVEFORMAT; +} MPEG1WAVEFORMAT; +typedef MPEG1WAVEFORMAT *PMPEG1WAVEFORMAT, + *NPMPEG1WAVEFORMAT, *LPMPEG1WAVEFORMAT; #define ACM_MPEG_LAYER1 0x0001 #define ACM_MPEG_LAYER2 0x0002 @@ -434,6 +471,8 @@ typedef struct mpeglayer3waveformat_tag { WORD nFramesPerBlock; WORD nCodecDelay; } MPEGLAYER3WAVEFORMAT; +typedef MPEGLAYER3WAVEFORMAT *PMPEGLAYER3WAVEFORMAT, + *NPMPEGLAYER3WAVEFORMAT, *LPMPEGLAYER3WAVEFORMAT; #define MPEGLAYER3_WFX_EXTRA_BYTES 12 @@ -445,6 +484,42 @@ typedef struct mpeglayer3waveformat_tag { #define MPEGLAYER3_FLAG_PADDING_ON 0x00000001 #define MPEGLAYER3_FLAG_PADDING_OFF 0x00000002 +typedef struct msaudio1waveformat_tag { + WAVEFORMATEX wfx; + WORD wSamplesPerBlock; + WORD wEncodeOptions; +} MSAUDIO1WAVEFORMAT, *LPMSAUDIO1WAVEFORMAT; + +#define WMAUDIO_BITS_PER_SAMPLE 16 +#define WMAUDIO_MAX_CHANNELS 2 + +#define MSAUDIO1_BITS_PER_SAMPLE WMAUDIO_BITS_PER_SAMPLE +#define MSAUDIO1_MAX_CHANNELS WMAUDIO_MAX_CHANNELS +#define MSAUDIO1_WFX_EXTRA_BYTES sizeof(MSAUDIO1WAVEFORMAT) - sizeof(WAVEFORMATEX) + +typedef struct wmaudio2waveformat_tag { + WAVEFORMATEX wfx; + DWORD dwSamplesPerBlock; + WORD wEncodeOptions; + DWORD dwSuperBlockAlign; +} WMAUDIO2WAVEFORMAT, *LPWMAUDIO2WAVEFORMAT; + +#define WMAUDIO2_BITS_PER_SAMPLE WMAUDIO_BITS_PER_SAMPLE +#define WMAUDIO2_MAX_CHANNELS WMAUDIO_MAX_CHANNELS +#define WMAUDIO2_WFX_EXTRA_BYTES sizeof(WMAUDIO2WAVEFORMAT) - sizeof(WAVEFORMATEX) + +typedef struct wmaudio3waveformat_tag { + WAVEFORMATEX wfx; + WORD wValidBitsPerSample; + DWORD dwChannelMask; + DWORD dwReserved1; + DWORD dwReserved2; + WORD wEncodeOptions; + WORD wReserved3; +} WMAUDIO3WAVEFORMAT, *LPWMAUDIO3WAVEFORMAT; + +#define WMAUDIO3_WFX_EXTRA_BYTES sizeof(WMAUDIO3WAVEFORMAT) - sizeof(WAVEFORMATEX) + #ifdef GUID_DEFINED #ifndef _WAVEFORMATEXTENSIBLE_ @@ -499,7 +574,6 @@ typedef WAVEFORMATIEEEFLOATEX* LPWAVEFORMATIEEEFLOATEX; #endif /* _SPEAKER_POSITIONS_ */ - /* DIB stuff */ #ifndef BI_BITFIELDS diff --git a/include/mmsystem.h b/include/mmsystem.h index ee7e316660..2a0782d0cb 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -474,6 +474,7 @@ DECL_WINELIB_TYPE_AW(LPWAVEINCAPS2) #define WAVE_FORMAT_96M16 0x00040000 /* 96 kHz, Mono, 16-bit */ #define WAVE_FORMAT_96S16 0x00080000 /* 96 kHz, Stereo, 16-bit */ +#ifndef WAVE_FORMAT_PCM /* General format structure common to all formats, same for Win16 and Win32 */ typedef struct waveformat_tag { WORD wFormatTag; @@ -483,14 +484,13 @@ typedef struct waveformat_tag { WORD nBlockAlign; } WAVEFORMAT, *LPWAVEFORMAT; -#ifndef WAVE_FORMAT_PCM #define WAVE_FORMAT_PCM 1 -#endif typedef struct pcmwaveformat_tag { WAVEFORMAT wf; WORD wBitsPerSample; } PCMWAVEFORMAT, *LPPCMWAVEFORMAT; +#endif #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ -- 2.21.0

1 0

[PATCH] include: add missing tags and defines in mmreg.h
by Vijay Kiran Kamuju March 31, 2019

March 31, 2019

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/mmreg.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/include/mmreg.h b/include/mmreg.h index e7d70bbd63..edb209907d 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -75,6 +75,21 @@ typedef struct _WAVEFORMATEX { } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ +#ifndef WAVE_FORMAT_PCM +typedef struct waveformat_tag { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; +} WAVEFORMAT, *PWAVEFORMAT, *NPWAVEFORMAT, *LPWAVEFORMAT; + +typedef struct pcmwaveformat_tag { + WAVEFORMAT wf; + WORD wBitsPerSample; +} PCMWAVEFORMAT, *PPCMWAVEFORMAT, *NPPCMWAVEFORMAT, *LPPCMWAVEFORMAT; +#endif /* WAVE_FORMAT_PCM */ + /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #ifndef WAVE_FORMAT_PCM @@ -117,6 +132,8 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_MPEGLAYER3 0x0055 #define WAVE_FORMAT_MSRT24 0x0082 /* Microsoft Corporation */ #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 +#define WAVE_FORMAT_RAW_AAC1 0x00FF +#define WAVE_FORMAT_MSAUDIO1 0x0160 #define WAVE_FORMAT_WMAUDIO2 0x0161 #define WAVE_FORMAT_WMAUDIO3 0x0162 #define WAVE_FORMAT_WMAUDIO_LOSSLESS 0x0163 @@ -124,6 +141,7 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_CREATIVE_ADPCM 0x0200 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH8 0x0202 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH10 0x0203 /* Creative Labs, Inc */ +#define WAVE_FORMAT_GENERIC_PASSTHRU 0x0249 #define WAVE_FORMAT_FM_TOWNS_SND 0x0300 /* Fujitsu Corp. */ #define WAVE_FORMAT_OLIGSM 0x1000 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIADPCM 0x1001 /* Ing C. Olivetti & C., S.p.A. */ @@ -131,14 +149,19 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_OLISBC 0x1003 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIOPR 0x1004 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_MPEG_ADTS_AAC 0x1600 +#define WAVE_FORMAT_MPEG_RAW_AAC 0x1601 +#define WAVE_FORMAT_MPEG_LOAS 0x1602 #define WAVE_FORMAT_MPEG_HEAAC 0x1610 +#define WAVE_FORMAT_DTS2 0x2001 #define WAVE_FORMAT_ALAC 0x6c61 #define WAVE_FORMAT_OPUS 0x704f #define WAVE_FORMAT_AMR_NB 0x7361 #define WAVE_FORMAT_AMR_WB 0x7362 #define WAVE_FORMAT_AMR_WP 0x7363 +#define WAVE_FORMAT_MPEG_AAC 0xa106 #define WAVE_FORMAT_FLAC 0xf1ac + #ifndef MM_MICROSOFT #define MM_MICROSOFT 0x01 #endif @@ -147,6 +170,9 @@ typedef struct _WAVEFORMATEX { #define MM_MSFT_ACM_GSM610 0x24 #define MM_MSFT_ACM_G711 0x25 #define MM_MSFT_ACM_PCM 0x26 +#define MM_MSFT_ACM_WMAUDIO 39 +#define MM_MSFT_ACM_MSAUDIO1 39 +#define MM_MSFT_ACM_WMAUDIO2 101 #define MM_FRAUNHOFER_IIS 0xAC #define MM_FHGIIS_MPEGLAYER3_DECODE 0x09 @@ -175,6 +201,15 @@ typedef struct adpcmwaveformat_tag { typedef ADPCMWAVEFORMAT *PADPCMWAVEFORMAT, *NPADPCMWAVEFORMAT, *LPADPCMWAVEFORMAT; +typedef struct drmwaveformat_tag { + WAVEFORMATEX wfx; + WORD wReserved; + ULONG ulContentId; + WAVEFORMATEX wfxSecure; +} DRMWAVEFORMAT; +typedef DRMWAVEFORMAT *PDRMWAVEFORMAT, *NPDRMWAVEFORMAT, + *LPDRMWAVEFORMAT; + typedef struct dvi_adpcmwaveformat_tag { WAVEFORMATEX wfx; WORD wSamplesPerBlock; @@ -410,7 +445,9 @@ typedef struct mpeg1waveformat_tag { WORD fwHeadFlags; DWORD dwPTSLow; DWORD dwPTSHigh; -} MPEG1WAVEFORMAT,* PMPEG1WAVEFORMAT; +} MPEG1WAVEFORMAT; +typedef MPEG1WAVEFORMAT *PMPEG1WAVEFORMAT, + *NPMPEG1WAVEFORMAT, *LPMPEG1WAVEFORMAT; #define ACM_MPEG_LAYER1 0x0001 #define ACM_MPEG_LAYER2 0x0002 @@ -434,6 +471,8 @@ typedef struct mpeglayer3waveformat_tag { WORD nFramesPerBlock; WORD nCodecDelay; } MPEGLAYER3WAVEFORMAT; +typedef MPEGLAYER3WAVEFORMAT *PMPEGLAYER3WAVEFORMAT, + *NPMPEGLAYER3WAVEFORMAT, *LPMPEGLAYER3WAVEFORMAT; #define MPEGLAYER3_WFX_EXTRA_BYTES 12 @@ -445,6 +484,42 @@ typedef struct mpeglayer3waveformat_tag { #define MPEGLAYER3_FLAG_PADDING_ON 0x00000001 #define MPEGLAYER3_FLAG_PADDING_OFF 0x00000002 +typedef struct msaudio1waveformat_tag { + WAVEFORMATEX wfx; + WORD wSamplesPerBlock; + WORD wEncodeOptions; +} MSAUDIO1WAVEFORMAT, *LPMSAUDIO1WAVEFORMAT; + +#define WMAUDIO_BITS_PER_SAMPLE 16 +#define WMAUDIO_MAX_CHANNELS 2 + +#define MSAUDIO1_BITS_PER_SAMPLE WMAUDIO_BITS_PER_SAMPLE +#define MSAUDIO1_MAX_CHANNELS WMAUDIO_MAX_CHANNELS +#define MSAUDIO1_WFX_EXTRA_BYTES sizeof(MSAUDIO1WAVEFORMAT) - sizeof(WAVEFORMATEX) + +typedef struct wmaudio2waveformat_tag { + WAVEFORMATEX wfx; + DWORD dwSamplesPerBlock; + WORD wEncodeOptions; + DWORD dwSuperBlockAlign; +} WMAUDIO2WAVEFORMAT, *LPWMAUDIO2WAVEFORMAT; + +#define WMAUDIO2_BITS_PER_SAMPLE WMAUDIO_BITS_PER_SAMPLE +#define WMAUDIO2_MAX_CHANNELS WMAUDIO_MAX_CHANNELS +#define WMAUDIO2_WFX_EXTRA_BYTES sizeof(WMAUDIO2WAVEFORMAT) - sizeof(WAVEFORMATEX) + +typedef struct wmaudio3waveformat_tag { + WAVEFORMATEX wfx; + WORD wValidBitsPerSample; + DWORD dwChannelMask; + DWORD dwReserved1; + DWORD dwReserved2; + WORD wEncodeOptions; + WORD wReserved3; +} WMAUDIO3WAVEFORMAT, *LPWMAUDIO3WAVEFORMAT; + +#define WMAUDIO3_WFX_EXTRA_BYTES sizeof(WMAUDIO3WAVEFORMAT) - sizeof(WAVEFORMATEX) + #ifdef GUID_DEFINED #ifndef _WAVEFORMATEXTENSIBLE_ @@ -499,7 +574,6 @@ typedef WAVEFORMATIEEEFLOATEX* LPWAVEFORMATIEEEFLOATEX; #endif /* _SPEAKER_POSITIONS_ */ - /* DIB stuff */ #ifndef BI_BITFIELDS -- 2.21.0

2 1

[PATCH v2 1/2] kernel32: Partially implement VirtualAllocExNuma
by Fabian Maurer March 31, 2019

March 31, 2019

Ignoring the preferred node should be good enough Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46927 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/virtual.c | 27 +++++++++++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c8d52cec58..1cf7b58a02 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1559,7 +1559,7 @@ @ stdcall VerifyVersionInfoW(long long int64) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) -# @ stub VirtualAllocExNuma +@ stdcall VirtualAllocExNuma(long ptr long long long long) @ stub VirtualBufferExceptionHandler @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 42da7f0d8c..35ca4c0876 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -46,6 +46,7 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(file); +WINE_DECLARE_DEBUG_CHANNEL(virtual); /*********************************************************************** @@ -100,6 +101,32 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE hProcess, LPVOID addr, SI return ret; } +/*********************************************************************** + * VirtualAllocExNuma (KERNEL32.@) + * + * Seems to be just as VirtualAllocEx, but with a preferred NUMA node. + * + * PARAMS + * process [I] Handle to process to do mem operation. + * addr [I] Address of region to reserve or commit. + * size [I] Size of region. + * type [I] Type of allocation. + * protect [I] Type of access protection. + * numa_node[I] Preferred NUMA node. + * + * + * RETURNS + * Success: Base address of allocated region of pages. + * Failure: NULL. + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocExNuma(HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, DWORD numa_node) +{ + FIXME_(virtual)("Ignoring preferred numa_node\n"); + + return VirtualAllocEx(process, addr, size, type, protect); +} + /*********************************************************************** * VirtualFree (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 20c73af319..49d0e7ed08 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2698,6 +2698,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDL #define VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo) WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualLock(LPVOID,SIZE_T); -- 2.21.0

2 2

[PATCH] ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64
by André Hentschel March 31, 2019

March 31, 2019

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 10 ++++++++++ include/winnt.h | 6 ++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ff695aa9ca..233c4ef8797 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -722,7 +722,7 @@ # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 75a1133b4fd..32205ea39c3 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/********************************************************************** + * RtlInstallFunctionTableCallback (NTDLL.@) + */ +BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD table, DWORD base, DWORD length, + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) +{ + FIXME( "%x %x %d %p %p %s: stub\n", table, base, length, callback, context, wine_dbgstr_w(dll) ); + return TRUE; +} + /************************************************************************* * RtlAddGrowableFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 1d26125209e..423da258705 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -977,6 +977,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P return TRUE; } +/********************************************************************** + * RtlInstallFunctionTableCallback (NTDLL.@) + */ +BOOLEAN CDECL RtlInstallFunctionTableCallback( ULONG_PTR table, ULONG_PTR base, DWORD length, + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) +{ + FIXME( "%lx %lx %d %p %p %s: stub\n", table, base, length, callback, context, wine_dbgstr_w(dll) ); + return TRUE; +} + /************************************************************************* * RtlAddGrowableFunctionTable (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 5694ad7c01f..28e87c7dff3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1745,8 +1745,11 @@ typedef struct _CONTEXT ULONG Padding2[2]; /* 198 */ } CONTEXT; +typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD,PVOID); + BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD,DWORD,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif /* __arm__ */ @@ -1878,8 +1881,11 @@ typedef struct _CONTEXT DWORD64 Wvr[ARM64_MAX_WATCHPOINTS]; /* 380 */ } CONTEXT; +typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64,PVOID); + BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,ULONG_PTR); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +BOOLEAN CDECL RtlInstallFunctionTableCallback(ULONG_PTR,ULONG_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); #endif /* __aarch64__ */ -- 2.17.1

1 0

[PATCH] tools: Increase the failure limit to get more win10 test runs displayed on the winetest result pages
by Detlef Riekenberg March 31, 2019

March 31, 2019

The old puffer was not big enough. winetest results for win10 v1803 should now reach the result page Mar 31 00:25:01 cw1-hd6800-1803-t64: too many failed test units (>70 at user32:win) Mar 30 23:50:02 cw1-hd6800-1803-t32: too many failed test units (>70 at wininet:internet) Mar 30 15:35:02 cw2-gtx560-1803-t64: too many failed test units (>70 at vbscript:createobj) Mar 30 15:05:02 cw2-gtx560-1803-t32: too many failed test units (>70 at wininet:internet) (My win10 test machine had 90 failures on 12.March and reached the old limit at urlmon:url) There will be still test machines rejected: *cw2-gtx560-wow64 reaches 50 failures at dinput:mouse this is too far away from a usable limit *winetest reports other machines reach the file size limit (newtb-debian9-wow64, fg-deb64-wow32, fg-deb64-wow64,fg-deb64-t32, fgtb-debian9-wow64) Some of them reach the current filesize limit near the end (urlmon or user32). Relaxing the limit by 500k might be enough, to get these test results displayed, bur that is only useful, when someone works on fixing the failures. -- bye bye ... ... Detlef --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index a468812..86a5dc2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -369,7 +369,7 @@ foreach my $entry (@idmatch) } } # Give a little slack to the Windows 10 1709. -$maxfailedtests += 20 if ($version eq "win10"); +$maxfailedtests += 45 if ($version eq "win10"); if ($prediluvian and not $acceptprediluvianwin) { -- 2.21.0.windows.1

1 0