March 2021 - Wine-devel - list.winehq.org

[PATCH resend v3 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye 12 Mar '21

12 Mar '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..44ead2580bf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,84 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + todo_wine ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + todo_wine ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} + START_TEST(iphlpapi) { @@ -2370,6 +2448,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

2 2

[PATCH 1/6] dwrite/tests: Do not segfault in tests if NULL is returned.
by Giovanni Mascellani 12 Mar '21

12 Mar '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43a00b7e22e..d186f47cc94 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4714,6 +4714,7 @@ if (font) { ok(scale == 1.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); +if (font) { exists = FALSE; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists); @@ -4722,6 +4723,7 @@ if (font) { ok(!lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); +} /* 2. Hiragana character, force Tahoma font does not support Japanese */ g_source = str2W; @@ -4735,6 +4737,7 @@ if (font) { ok(scale == 1.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); +if (font) { exists = FALSE; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists); @@ -4744,6 +4747,7 @@ todo_wine ok(lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); +} IDWriteFontFallback_Release(fallback); IDWriteFactory2_Release(factory2); -- 2.30.1

2 11

[PATCH 5/5] riched20: Handle EM_FINDTEXTEX's unicode conversion in the host.
by Huw Davies 12 Mar '21

12 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 19 +------------------ dlls/riched20/txthost.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 93daa472048..eb1ec78d962 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4167,30 +4167,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { return editor->nTextLimit; } - case EM_FINDTEXTEX: - { - LRESULT r; - if(!unicode){ - FINDTEXTEXA *ex = (FINDTEXTEXA *)lParam; - int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); - WCHAR *tmp; - - if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) - MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); - r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); - heap_free(tmp); - }else{ - FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; - r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText); - } - return r; - } case EM_FINDTEXT: case EM_FINDTEXTW: { FINDTEXTW *ft = (FINDTEXTW *)lParam; return ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); } + case EM_FINDTEXTEX: case EM_FINDTEXTEXW: { FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 00801b5b9af..d249137d829 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -850,6 +850,27 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); break; } + case EM_FINDTEXTEX: + { + FINDTEXTEXA *paramsA = (FINDTEXTEXA *)lparam; + FINDTEXTEXW *params = (FINDTEXTEXW *)lparam; + FINDTEXTEXW new_params; + int len; + + if (!unicode) + { + new_params.chrg = params->chrg; + new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len ); + params = &new_params; + } + hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTEXW, wparam, (LPARAM)params, &res ); + if (!unicode) + { + ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); + paramsA->chrgText = params->chrgText; + } + break; + } case WM_GETTEXT: { GETTEXTEX params; -- 2.23.0

1 0

[PATCH 4/5] riched20: Handle EM_FINDTEXT's unicode conversion in the host.
by Huw Davies 12 Mar '21

12 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 19 +------------------ dlls/riched20/txthost.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f96f52ef56d..93daa472048 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4167,24 +4167,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { return editor->nTextLimit; } - case EM_FINDTEXT: - { - LRESULT r; - if(!unicode){ - FINDTEXTA *ft = (FINDTEXTA *)lParam; - int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); - WCHAR *tmp; - - if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) - MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); - r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); - heap_free(tmp); - }else{ - FINDTEXTW *ft = (FINDTEXTW *)lParam; - r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); - } - return r; - } case EM_FINDTEXTEX: { LRESULT r; @@ -4203,6 +4185,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } return r; } + case EM_FINDTEXT: case EM_FINDTEXTW: { FINDTEXTW *ft = (FINDTEXTW *)lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3c968ddfecc..00801b5b9af 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -834,6 +834,22 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case EM_FINDTEXT: + { + FINDTEXTW *params = (FINDTEXTW *)lparam; + FINDTEXTW new_params; + int len; + + if (!unicode) + { + new_params.chrg = params->chrg; + new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len ); + params = &new_params; + } + hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTW, wparam, (LPARAM)params, &res ); + if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); + break; + } case WM_GETTEXT: { GETTEXTEX params; -- 2.23.0

1 0

[PATCH 3/5] richedit: Handle EM_GETTEXTRANGE's unicode conversion in the host.
by Huw Davies 12 Mar '21

12 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 5 ++--- dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/txthost.c | 38 ++++++++++++++++++++++++++++++++++++ dlls/riched32/tests/editor.c | 2 +- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 53d54a3b8e2..f96f52ef56d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4014,15 +4014,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nEnd = rng->chrg.cpMax; int textlength = ME_GetTextLength(editor); - TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d textlength=%d\n", - rng->chrg.cpMin, rng->chrg.cpMax, unicode, textlength); + TRACE( "EM_GETTEXTRANGE min = %d max = %d textlength = %d\n", rng->chrg.cpMin, rng->chrg.cpMax, textlength ); if (nStart < 0) return 0; if ((nStart == 0 && nEnd == -1) || nEnd > textlength) nEnd = textlength; if (nStart >= nEnd) return 0; cursor_from_char_ofs( editor, nStart, &start ); - return ME_GetTextRange(editor, rng->lpstrText, &start, nEnd - nStart, unicode); + return ME_GetTextRange( editor, rng->lpstrText, &start, nEnd - nStart, TRUE ); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4c87869c4a3..170c29f186e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1790,8 +1790,8 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - todo_wine ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); } DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ca911453010..3c968ddfecc 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -753,6 +753,39 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula return TRUE; } +static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT *res ) +{ + TEXTRANGEW range; + HRESULT hr; + unsigned int count; + LRESULT len; + + *res = 0; + if (rangeA->chrg.cpMin < 0) return S_OK; + ITextServices_TxSendMessage( host->text_srv, WM_GETTEXTLENGTH, 0, 0, &len ); + range.chrg = rangeA->chrg; + if ((range.chrg.cpMin == 0 && range.chrg.cpMax == -1) || range.chrg.cpMax > len) + range.chrg.cpMax = len; + if (range.chrg.cpMin >= range.chrg.cpMax) return S_OK; + count = range.chrg.cpMax - range.chrg.cpMin + 1; + range.lpstrText = heap_alloc( count * sizeof(WCHAR) ); + if (!range.lpstrText) return E_OUTOFMEMORY; + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTRANGE, 0, (LPARAM)&range, &len ); + if (hr == S_OK && len) + { + if (!host->emulate_10) count = INT_MAX; + len = WideCharToMultiByte( CP_ACP, 0, range.lpstrText, -1, rangeA->lpstrText, count, NULL, NULL ); + if (!host->emulate_10) *res = len - 1; + else + { + *res = count - 1; + rangeA->lpstrText[*res] = '\0'; + } + } + heap_free( range.lpstrText ); + return hr; +} + static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { @@ -822,6 +855,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTLENGTHEX, (WPARAM)&params, 0, &res ); break; } + case EM_GETTEXTRANGE: + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else hr = get_text_rangeA( host, (TEXTRANGEA *)lparam, &res ); + break; + case WM_PAINT: { HDC hdc; diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f4f6ebeb709..0f5ca9f738b 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -584,7 +584,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); } DestroyWindow(hwndRichEdit); -- 2.23.0

1 0

[PATCH 2/5] riched20: Use EM_GETTEXTEX to implement WM_GETTEXT.
by Huw Davies 12 Mar '21

12 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/txthost.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6532f7c65cb..53d54a3b8e2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3978,9 +3978,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETTEXT: { GETTEXTEX ex; - ex.cb = wParam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); + ex.cb = wParam * sizeof(WCHAR); ex.flags = GT_USECRLF; - ex.codepage = unicode ? CP_UNICODE : CP_ACP; + ex.codepage = CP_UNICODE; ex.lpDefaultChar = NULL; ex.lpUsedDefChar = NULL; return ME_GetTextEx(editor, &ex, lParam); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index e401759991f..ca911453010 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -801,6 +801,18 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case WM_GETTEXT: + { + GETTEXTEX params; + + params.cb = wparam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); + params.flags = GT_USECRLF; + params.codepage = unicode ? CP_UNICODE : CP_ACP; + params.lpDefaultChar = NULL; + params.lpUsedDefChar = NULL; + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTEX, (WPARAM)&params, lparam, &res ); + break; + } case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX params; -- 2.23.0

1 0

[PATCH 1/5] riched20: Use EM_GETTEXTLENGTHEX to implement WM_GETTEXTLENGTH.
by Huw Davies 12 Mar '21

12 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 +--- dlls/riched20/txthost.c | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 217394eaafb..6532f7c65cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3969,10 +3969,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX how; - - /* CR/LF conversion required in 2.0 mode, verbatim in 1.0 mode */ how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; - how.codepage = unicode ? CP_UNICODE : CP_ACP; + how.codepage = CP_UNICODE; return ME_GetTextLengthEx(editor, &how); } case EM_GETTEXTLENGTHEX: diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 064ce3fb827..e401759991f 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -801,6 +801,15 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case WM_GETTEXTLENGTH: + { + GETTEXTLENGTHEX params; + + params.flags = GTL_CLOSE | (host->emulate_10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; + params.codepage = unicode ? CP_UNICODE : CP_ACP; + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTLENGTHEX, (WPARAM)&params, 0, &res ); + break; + } case WM_PAINT: { HDC hdc; -- 2.23.0

1 0

[PATCH v2 2/2 resend] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 12 Mar '21

12 Mar '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 39 +++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 913cabe1e48..a3a0e490024 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -974,8 +974,43 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.0

1 0

[PATCH v2 1/2 resend] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 12 Mar '21

12 Mar '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 54 +++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..913cabe1e48 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -985,8 +985,58 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.30.0

1 0

[PATCH] include: Add colrst.idl
by Alistair Leslie-Hughes 12 Mar '21

12 Mar '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 30 +++++++++++++++++++++++++ include/colrst.idl | 48 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 79 insertions(+) create mode 100644 include/colrst.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index a71dbd5f5a5..27de85077b8 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1583,6 +1583,36 @@ HRESULT CALLBACK IGetDataSource_GetDataSource_Proxy(IGetDataSource* This, REFIID return E_NOTIMPL; } +HRESULT CALLBACK IColumnsRowset_GetAvailableColumns_Proxy(IColumnsRowset* This, DBORDINAL *count, DBID **columns) +{ + FIXME("(%p)->(%p %p): stub\n", This, count, columns); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsRowset_GetAvailableColumns_Stub(IColumnsRowset* This, DBORDINAL *count, DBID **columns, + IErrorInfo **error) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, count, columns, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IColumnsRowset_GetColumnsRowset_Proxy(IColumnsRowset* This, IUnknown *outer, DBORDINAL count, + const DBID columns[], REFIID riid, ULONG property_cnt, DBPROPSET property_sets[], IUnknown **rowset) +{ + FIXME("(%p)->(%p %ld %p %s %d %p %p): stub\n", This, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, rowset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsRowset_GetColumnsRowset_Stub(IColumnsRowset* This, IUnknown *outer, + DBORDINAL count, const DBID *columns, REFIID riid, ULONG property_cnt, DBPROPSET *property_sets, + IUnknown **rowset, ULONG props_cnt, DBPROPSTATUS *prop_status, IErrorInfo **error) +{ + FIXME("(%p)->(%p %ld %p %s %d %p %p %u %p %p): stub\n", This, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, rowset, props_cnt, prop_status, error); + return E_NOTIMPL; +} + HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFIID riid, IUnknown **datasource, IErrorInfo **error) { diff --git a/include/colrst.idl b/include/colrst.idl new file mode 100644 index 00000000000..7e4d399e3d5 --- /dev/null +++ b/include/colrst.idl @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a10-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] + +interface IColumnsRowset : IUnknown +{ + [local] + HRESULT GetAvailableColumns( [in, out] DBORDINAL *count, [out, size_is(,(ULONG)*count)] DBID **columns); + + [call_as(GetAvailableColumns)] + HRESULT RemoteGetAvailableColumns([in, out] DBORDINAL *count, [out, size_is(,(ULONG)*count)] DBID **columns, + [out] IErrorInfo **error); + + [local] + HRESULT GetColumnsRowset([in] IUnknown *outer, [in] DBORDINAL count, [in, size_is((ULONG)count)] const DBID columns[], + [in] REFIID riid, [in] ULONG property_cnt, [in, out, size_is((ULONG)property_cnt)] DBPROPSET property_sets[], + [out, iid_is(riid)] IUnknown **rowset); + + [call_as(GetColumnsRowset)] + HRESULT RemoteGetColumnsRowset([in] IUnknown *outer, [in] DBORDINAL count, [in, unique, size_is((ULONG)count)] const DBID *columns, + [in] REFIID riid, [in] ULONG property_cnt, [in, unique, size_is((ULONG)property_cnt)] DBPROPSET * roperty_sets, + [out, iid_is(riid)] IUnknown **rowset, [in] ULONG props_cnt, [out, size_is((ULONG)props_cnt)] DBPROPSTATUS *prop_status, + [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 475eb85642e..4976a8ce33e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -52,6 +52,7 @@ typedef LONG_PTR DB_LRESERVE; #include "cmdbas.idl" #include "cmdtxt.idl" #include "colinf.idl" +#include "colrst.idl" #include "dbccmd.idl" #include "dbcses.idl" #include "srcrst.idl" -- 2.30.1

1 0