- wine-devel - winehq.org

[PATCH resend] server: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker 20 Apr '22

20 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v1: https://www.winehq.org/pipermail/wine-devel/2021-December/202913.html --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/ntdll/unix/file.c | 2 ++ include/wine/server.h | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..4bee4207a37 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %ld\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %ld\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with valid in_buffer=NULL but incorrect in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..3193a21c48f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4913,6 +4913,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (status != STATUS_PENDING) free( async ); + if (wait_handle && status == STATUS_ACCESS_VIOLATION) + ERR("Sending request failed but wait requested. Expect the application to hang.\n"); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } diff --git a/include/wine/server.h b/include/wine/server.h index b05271b7522..d44997bf74f 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -71,7 +71,7 @@ static inline data_size_t wine_server_reply_size( const void *reply ) static inline void wine_server_add_data( void *req_ptr, const void *ptr, data_size_t size ) { struct __server_request_info * const req = req_ptr; - if (size) + if (size && ptr != NULL) { req->data[req->data_count].ptr = ptr; req->data[req->data_count++].size = size; -- 2.35.1

2 2

[PATCH] setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces().
by Zebediah Figura 20 Apr '22

20 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 77fa26726cc..73e721753aa 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2281,8 +2281,8 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, (BYTE *)symbolicLink, &len); if (!l && dataType == REG_SZ) SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); - RegCloseKey(subKey); } + RegCloseKey(subKey); } } /* Allow enumeration to continue */ -- 2.35.1

1 0

[PATCH v2 1/6] user.exe: Implement SetSystemTimer() using SetTimer().
by Zebediah Figura 20 Apr '22

20 Apr '22

Avoid using SetSystemTimer() to specify a callback; it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user.exe16/message.c | 4 ++++ dlls/user.exe16/user_private.h | 2 ++ dlls/user.exe16/window.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 819d9d9b837..8d9e5404b09 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1292,6 +1292,10 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_TIMER: + if (wParam & SYSTEM_TIMER_FLAG) + msg = WM_SYSTIMER; + break; case SBM_SETRANGE: ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); break; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 8a325cf9fb2..0805997246b 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,8 @@ extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPAR #define WM_SYSTIMER 0x0118 +#define SYSTEM_TIMER_FLAG 0x10000 + /* Dialog info structure (must match the user32 one) */ typedef struct tagDIALOGINFO { diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 590b8ae9f7c..e54dd6a803e 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -111,7 +111,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 pr UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 proc ) { TIMERPROC proc32 = (TIMERPROC)WINPROC_AllocProc16( (WNDPROC16)proc ); - return SetSystemTimer( WIN_Handle32(hwnd), id, timeout, proc32 ); + return SetTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG, timeout, proc32 ); } @@ -1087,7 +1087,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore ) */ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) { - return KillSystemTimer( WIN_Handle32(hwnd), id ); + return KillTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG ); } -- 2.35.1

3 9

[PATCH] wusa: Remove string duplication helper.
by Nikolay Sivov 20 Apr '22

20 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wusa/main.c | 6 +++--- programs/wusa/manifest.c | 4 ++-- programs/wusa/wusa.h | 8 -------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 53534628c31..ef7302847cc 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -166,7 +166,7 @@ static BOOL create_directory(const WCHAR *path) static BOOL create_parent_directory(const WCHAR *filename) { - WCHAR *p, *path = strdupW(filename); + WCHAR *p, *path = wcsdup(filename); BOOL ret = FALSE; if (!path) return FALSE; @@ -430,7 +430,7 @@ static struct assembly_entry *lookup_assembly(struct list *manifest_list, struct static WCHAR *get_assembly_source(struct assembly_entry *assembly) { - WCHAR *p, *path = strdupW(assembly->filename); + WCHAR *p, *path = wcsdup(assembly->filename); if (path && (p = wcsrchr(path, '.'))) *p = 0; return path; } @@ -527,7 +527,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); - return strdupW(path); + return wcsdup(path); } static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *expression) diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index efd2845c7e2..620da4fc63b 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -160,7 +160,7 @@ static WCHAR *get_xml_attribute(IXMLDOMElement *root, const WCHAR *name) VariantInit(&var); if (SUCCEEDED(IXMLDOMElement_getAttribute(root, bstr, &var))) { - ret = (V_VT(&var) == VT_BSTR) ? strdupW(V_BSTR(&var)) : NULL; + ret = (V_VT(&var) == VT_BSTR) ? wcsdup(V_BSTR(&var)) : NULL; VariantClear(&var); } SysFreeString(bstr); @@ -554,7 +554,7 @@ struct assembly_entry *load_manifest(const WCHAR *filename) if ((entry = alloc_assembly())) { - entry->filename = strdupW(filename); + entry->filename = wcsdup(filename); entry->displayname = get_xml_attribute(root, L"displayName"); if (iter_assembly(root, entry)) goto done; free_assembly(entry); diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index da679a27f07..e61fc025e09 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -100,14 +100,6 @@ static inline WCHAR *strdupAtoW(const char *str) return ret; } -static inline WCHAR *strdupW(const WCHAR *str) -{ - WCHAR *ret; - if (!str) return NULL; - if ((ret = malloc((lstrlenW(str) + 1) * sizeof(WCHAR)))) lstrcpyW(ret, str); - return ret; -} - static inline WCHAR *strdupWn(const WCHAR *str, DWORD len) { WCHAR *ret; -- 2.35.1

1 0

[PATCH 1/2] dwrite/tests: Use safe table access helpers for GetFontSignature().
by Nikolay Sivov 20 Apr '22

20 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Spotted with some application provided font on Windows, that has malformed OS/2 table. dlls/dwrite/tests/font.c | 43 +++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3fb9a4fb889..5c50b964700 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -157,7 +157,7 @@ enum TT_HEAD_MACSTYLE TT_HEAD_MACSTYLE_EXTENDED = 1 << 6, }; -typedef struct +struct tt_os2 { USHORT version; SHORT xAvgCharWidth; @@ -202,7 +202,7 @@ typedef struct USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} TT_OS2_V2; +}; enum OS2_FSSELECTION { OS2_FSSELECTION_ITALIC = 1 << 0, @@ -2024,7 +2024,7 @@ static void test_CreateFontFace(void) static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS1 *metrics) { void *os2_context, *head_context, *post_context, *hhea_context; - const TT_OS2_V2 *tt_os2; + const struct tt_os2 *tt_os2; const TT_HEAD *tt_head; const TT_POST *tt_post; const TT_HHEA *tt_hhea; @@ -2684,8 +2684,8 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) void *os2_context, *head_context; IDWriteLocalizedStrings *names; DWRITE_FONT_SIMULATIONS sim; + const struct tt_os2 *tt_os2; IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; DWRITE_FONT_STYLE style; const TT_HEAD *tt_head; LONG weight; @@ -6479,8 +6479,8 @@ static void test_GetGdiCompatibleMetrics(void) static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) { + const struct tt_os2 *tt_os2; IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; void *os2_context; UINT32 size; BOOL exists; @@ -7448,7 +7448,7 @@ static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) { BOOL exists, is_symbol = FALSE; struct dwrite_fonttable cmap; - const TT_OS2_V2 *tt_os2; + const struct tt_os2 *tt_os2; const BYTE *tables; void *os2_context; WORD num_tables; @@ -8194,10 +8194,9 @@ static void test_CreateFontFaceReference(void) static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) { - void *os2_context; + struct dwrite_fonttable os2; IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; - UINT32 size; + WORD version; BOOL exists; HRESULT hr; @@ -8206,25 +8205,29 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&os2.data, &os2.size, &os2.context, &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (tt_os2) { - fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); - fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); - fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); - fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + if (os2.data) + { + fontsig->fsUsb[0] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange1)); + fontsig->fsUsb[1] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange2)); + fontsig->fsUsb[2] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange3)); + fontsig->fsUsb[3] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange4)); - if (GET_BE_WORD(tt_os2->version) == 0) { + version = table_read_be_word(&os2, NULL, FIELD_OFFSET(struct tt_os2, version)); + if (version == 0) + { fontsig->fsCsb[0] = 0; fontsig->fsCsb[1] = 0; } - else { - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + else + { + fontsig->fsCsb[0] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulCodePageRange1)); + fontsig->fsCsb[1] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulCodePageRange2)); } - IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + IDWriteFontFace_ReleaseFontTable(fontface, os2.context); } IDWriteFontFace_Release(fontface); -- 2.35.1

1 1

[PATCH v4 1/4] windows.media.speech/tests: Add test to check if IAsyncInfo_Close non is blocking.
by Bernhard Kölbl 20 Apr '22

20 Apr '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v4: Fix races in tests, leaks and implement stubs. + Some rework. --- dlls/windows.media.speech/tests/speech.c | 136 +++++++++++++++++++---- 1 file changed, 112 insertions(+), 24 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index ef75178f8c1..7fca3fa6179 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -239,8 +239,8 @@ struct compilation_handler IAsyncHandler_Compilation IAsyncHandler_Compilation_iface; LONG ref; + HANDLE event_block; HANDLE event_finished; - BOOLEAN sleeping; DWORD thread_id; }; @@ -290,7 +290,9 @@ HRESULT WINAPI compilation_handler_Invoke( IAsyncHandler_Compilation *iface, trace("Iface %p, info %p, status %d.\n", iface, info, status); trace("Caller thread id %lu callback thread id %lu.\n", impl->thread_id, id); - ok(status != Started, "Got unexpected status %#x.\n", status); + /* Block handler until event is set. */ + if (impl->event_block) WaitForSingleObject(impl->event_block, INFINITE); + /* Signal finishing of the handler. */ if (impl->event_finished) SetEvent(impl->event_finished); return S_OK; @@ -813,6 +815,39 @@ static void test_VoiceInformation(void) RoUninitialize(); } +struct async_operation_block_param +{ + IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult *handler; + IAsyncOperation_SpeechRecognitionCompilationResult *operation; +}; + +static DWORD WINAPI async_operation_block_thread(void *arg) +{ + struct async_operation_block_param *param = arg; + HRESULT hr; + + hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(param->operation, param->handler); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + return 0; +} + +struct async_operation_close_param +{ + IAsyncInfo *info; +}; + +static DWORD WINAPI async_operation_close_thread(void *arg) +{ + struct async_operation_close_param *param = arg; + HRESULT hr; + + hr = IAsyncInfo_Close(param->info); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + return 0; +} + static void test_SpeechRecognizer(void) { static const WCHAR *speech_recognition_name = L"Windows.Media.SpeechRecognition.SpeechRecognizer"; @@ -824,21 +859,24 @@ static void test_SpeechRecognizer(void) ISpeechRecognizerFactory *sr_factory = NULL; ISpeechRecognizerStatics *sr_statics = NULL; ISpeechRecognizerStatics2 *sr_statics2 = NULL; - ISpeechRecognizer *recognizer = NULL; + ISpeechRecognizer *recognizer = NULL, *recognizer_2 = NULL; ISpeechRecognizer2 *recognizer2 = NULL; IActivationFactory *factory = NULL; - IInspectable *inspectable = NULL; + IInspectable *inspectable = NULL, *inspectable_2 = NULL; IClosable *closable = NULL; ILanguage *language = NULL; IAsyncInfo *info = NULL; + struct compilation_handler compilation_handler, compilation_handler2, compilation_handler3; struct completed_event_handler completed_handler; struct recognition_result_handler result_handler; - struct compilation_handler compilation_handler; - struct compilation_handler compilation_handler2; + struct async_operation_block_param block_param; + struct async_operation_close_param close_param; SpeechRecognitionResultStatus result_status; EventRegistrationToken token = { .value = 0 }; + HANDLE close_thread, blocked_thread; AsyncStatus async_status; HSTRING hstr, hstr_lang; + DWORD thread_status; HRESULT hr; UINT32 id; LONG ref; @@ -945,6 +983,7 @@ static void test_SpeechRecognizer(void) ok(ref == 1, "Got unexpected ref %lu.\n", ref); compilation_handler_create_static(&compilation_handler); + compilation_handler.event_block = NULL; compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); compilation_handler.thread_id = GetCurrentThreadId(); @@ -965,9 +1004,8 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine check_refcount(&compilation_handler.IAsyncHandler_Compilation_iface, 1); - WaitForSingleObject(compilation_handler.event_finished, INFINITE); + todo_wine ok(!WaitForSingleObject(compilation_handler.event_finished, 1000), "Wait for event_finished failed.\n"); CloseHandle(compilation_handler.event_finished); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); @@ -976,7 +1014,7 @@ static void test_SpeechRecognizer(void) handler = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(handler == NULL, "Handler had value %p.\n", handler); + todo_wine ok(handler == NULL || broken(handler != NULL), "Handler had value %p.\n", handler); /* Broken on Win10 1507 x32... */ hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -1048,7 +1086,7 @@ static void test_SpeechRecognizer(void) compilation_handler2.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); compilation_handler2.thread_id = GetCurrentThreadId(); - ok(compilation_handler2.event_finished != NULL, "Finished event wasn't created.\n"); + todo_wine ok(compilation_handler2.event_finished != NULL, "Finished event wasn't created.\n"); hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); todo_wine ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); @@ -1057,23 +1095,10 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - /* This one can fail, if the async operation had already finished */ - compilation_result = (void*)0xdeadbeef; - hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - todo_wine ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); - - async_status = 0xdeadbeef; - hr = IAsyncInfo_get_Status(info, &async_status); - todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - todo_wine ok(async_status == Started || async_status == Completed, "Status was %#x.\n", async_status); - - IAsyncInfo_Release(info); - hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler2.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - WaitForSingleObject(compilation_handler2.event_finished, INFINITE); + todo_wine ok(!WaitForSingleObject(compilation_handler2.event_finished, 1000), "Wait for event_finished failed.\n"); CloseHandle(compilation_handler2.event_finished); async_status = 0xdeadbeef; @@ -1081,10 +1106,73 @@ static void test_SpeechRecognizer(void) todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); todo_wine ok(async_status == Completed, "Status was %#x.\n", async_status); + ref = IAsyncInfo_Release(info); + todo_wine ok(ref == 1, "Got unexpected ref %lu.\n", ref); + ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); + todo_wine ok(!ref, "Got unexpected ref %lu.\n", ref); + + /* Test if AsyncInfo_Close waits for the handler to finish. */ + hr = RoActivateInstance(hstr, &inspectable_2); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IInspectable_QueryInterface(inspectable_2, &IID_ISpeechRecognizer, (void **)&recognizer_2); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + compilation_handler_create_static(&compilation_handler3); + compilation_handler3.event_block = CreateEventW(NULL, FALSE, FALSE, NULL); + compilation_handler3.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); + compilation_handler3.thread_id = GetCurrentThreadId(); + + todo_wine ok(compilation_handler3.event_finished != NULL, "Finished event wasn't created.\n"); + + hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer_2, &operation); + todo_wine ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); + + block_param.handler = &compilation_handler3.IAsyncHandler_Compilation_iface; + block_param.operation = operation; + blocked_thread = CreateThread(NULL, 0, async_operation_block_thread, &block_param, 0, NULL); + thread_status = WaitForSingleObject(blocked_thread, 1000); + todo_wine ok(thread_status == WAIT_TIMEOUT || broken(thread_status == WAIT_OBJECT_0), "Wait for block_thread didn't time out.\n"); /* Broken on Win10 1507 x32... */ + + if (thread_status == WAIT_TIMEOUT) + { + todo_wine ok(compilation_handler3.ref == 3, "Got unexpected ref %lu.\n", compilation_handler3.ref); + todo_wine check_refcount(operation, 3); + + hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + close_param.info = info; + close_thread = CreateThread(NULL, 0, async_operation_close_thread, &close_param, 0, NULL); + todo_wine ok(!WaitForSingleObject(close_thread, 100), "Wait for close_thread failed.\n"); + + CloseHandle(close_thread); + } + + SetEvent(compilation_handler3.event_block); + todo_wine ok(!WaitForSingleObject(compilation_handler3.event_finished, 500), "Wait for event_finished failed.\n"); + todo_wine ok(!WaitForSingleObject(blocked_thread, 1000), "Wait for block_thread failed.\n"); + + CloseHandle(blocked_thread); + CloseHandle(compilation_handler3.event_block); + CloseHandle(compilation_handler3.event_finished); + + ref = IAsyncInfo_Release(info); + todo_wine ok(ref == 1, "Got unexpected ref %lu.\n", ref); + skip_operation: ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ok(!ref, "Got unexpected ref %lu.\n", ref); + if (recognizer_2) + { + ref = ISpeechRecognizer_Release(recognizer_2); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); + + ref = IInspectable_Release(inspectable_2); + ok(!ref, "Got unexpected ref %lu.\n", ref); + } + ref = ISpeechContinuousRecognitionSession_Release(session); ok(ref == 1, "Got unexpected ref %lu.\n", ref); -- 2.35.1

4 17

[PATCH 0/5] win32u: Improve dibdrv FontSmoothingGamma related code.
by Byeongsik Jeon 20 Apr '22

20 Apr '22

After commit 649dd12, I propose some improvements related to the dibdrv FontSmoothingGamma code. Removing duplicate calculation codes and branches in the inline function can provide some performance improvements. CrystalMark2004R7 GDI Text Bench result [1][2]: - OLD : 6590 (100%) pre 649dd12 - CURRENT : 5567 ( 84%) with gamma == 1000 - CURRENT : 4927 ( 73%) with gamma != 1000 - PATCH 1/5: 5113 ( 77%) - PATCH 2/5: 5494 ( 83%) - PATCH 5/5: 6007 ( 91%) Please, Note that OLD and CURRENT(gamma == 1000) doesn't have FontSmoothingGamma ability. These improvements allow to change the gamma default value to 1400(MS GDI32 default value), while reducing performance losses. [1] If the dibdrv glyph caching code is turned off, the CrystalMark result value is reduced by 10 times! This indicates that dibdrv::draw_glyph() performance is the dominant factor of the CrystalMark result value with the glyph caching turn on. The result does not represent GDI32 text engine performance in all situations, but it can be referred to in the current situation. [2] CrystalMark apply different weights to the result value with the fortsmooth mode. Currently, Wine does not synchronize the xrdb values and the SystemParametersInfo() results. Therefore, some attention is required in the configuration of the test environment and the result analysis. I tested it under the conditions below: $ xrdb -remove $ winetricks fontsmooth=rgb Byeong-Sik Jeon (5): win32u: Remove gamma == 1000 special case code. win32u: Use pre-calculated decoded_text value. win32u: Remove the gamma value calibration code. win32u: Set the default gamma value to 1400. win32u: Remove the branches in blend_color_gamma(). dlls/win32u/dibdrv/primitives.c | 74 +++++++++++++++++---------------- dlls/win32u/font.c | 13 ++---- 2 files changed, 41 insertions(+), 46 deletions(-) -- 2.36.0

1 5

[PATCH v2 1/6] user32/tests: Make test_unicode_wm_char robust against superfluous messages.
by Jinoh Kang 20 Apr '22

20 Apr '22

Commit e445303ab45 (user32/tests: Make a few more messages optional., 2014-03-20) modified test_unicode_wm_char so that it skips non-essential messages (e.g. WM_DWMNCRENDERINGCHANGED) from GetMessageW. Extend this for messages from GetMessageA as well. Also, handle the case where no messages other than WM_QUIT are received at all. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: add patch, fixes intermittent test failures on w1064 dlls/user32/tests/msg.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a2adf56565d..918ee97bfa5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15182,6 +15182,16 @@ static void test_dbcs_wm_char(void) DestroyWindow(hwnd2); } +static BOOL get_next_msg( BOOL (*WINAPI getmessage)(MSG *, HWND, UINT, UINT), + MSG *msg, HWND hwnd ) +{ + while ((*getmessage)( msg, hwnd, 0, 0 )) + { + if (!ignore_message( msg->message )) return TRUE; + } + return FALSE; +} + static void test_unicode_wm_char(void) { HWND hwnd; @@ -15212,11 +15222,7 @@ static void test_unicode_wm_char(void) PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); - while (GetMessageW( &msg, hwnd, 0, 0 )) - { - if (!ignore_message( msg.message )) break; - } - + ok( get_next_msg( GetMessageW, &msg, hwnd ), "expected a recongized message\n" ); ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); ok( msg.wParam == 0x3b1, "bad wparam %Ix\n", msg.wParam ); @@ -15236,7 +15242,7 @@ static void test_unicode_wm_char(void) /* greek alpha -> 'a' in cp1252 */ PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); - ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( get_next_msg( GetMessageA, &msg, hwnd ), "expected a recognized message\n" ); ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); ok( msg.wParam == 0x61, "bad wparam %Ix\n", msg.wParam ); @@ -15257,7 +15263,7 @@ static void test_unicode_wm_char(void) /* greek alpha -> 0xe1 in cp1253 */ PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); - ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( get_next_msg( GetMessageA, &msg, hwnd ), "expected a recognized message\n" ); ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); ok( msg.wParam == 0xe1, "bad wparam %Ix\n", msg.wParam ); -- 2.34.1

2 6

[PATCH v2] include: Add IArcadeStick interface in windows.gaming.input.idl
by Biswapriyo Nath 20 Apr '22

20 Apr '22

1 0

[PATCH 6/6] winex11: Use Unix environment variable in remove_startup_notification.
by Jacek Caban 20 Apr '22

20 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/window.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)

2 1

[PATCH 5/6] win32u: Move is_window_rect_full_screen implementation from winex11.
by Jacek Caban 20 Apr '22

20 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- NtUserEnumDisplayMonitors needs client callback, so it's not useful for unixlibs right now. Since we need to expose that functionality differently, we may as well move the functionality to win32u. dlls/win32u/sysparams.c | 24 ++++++++++++++++++++++++ dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/window.c | 34 +++------------------------------- dlls/winex11.drv/x11drv.h | 1 - include/ntuser.h | 6 ++++++ 6 files changed, 35 insertions(+), 34 deletions(-)

2 1

[PATCH 4/6] win32u: Move GetMenuInfo implementation from user32.
by Jacek Caban 20 Apr '22

20 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 35 +++-------------------------------- dlls/win32u/menu.c | 23 +++++++++++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 7 +++++++ 5 files changed, 37 insertions(+), 32 deletions(-)

2 1

[PATCH 3/6] win32u: Move NtUserSetMenu implemenetation from user32.
by Jacek Caban 20 Apr '22

20 Apr '22

3 2

[PATCH 2/6] win32u: Move NtUserGetMenuItemRect implementation from user32.
by Jacek Caban 20 Apr '22

20 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 49 ++--------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 40 +++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 +++++++++ include/ntuser.h | 1 + 8 files changed, 57 insertions(+), 49 deletions(-)

2 1

[PATCH 1/6] win32u: Move NtUserSetMenuContextHelpId implementation from user32.
by Jacek Caban 20 Apr '22

20 Apr '22

3 2

[PATCH 0/3] winepulse: Add Wow64 handlers.
by Huw Davies 20 Apr '22

20 Apr '22

Since the wineoss queue has stalled for today, I thought I'd send in the Wow64 handlers for winepulse. The first two patches can be tested with a regular setup. The third requires enabling the new Wow64 mode (see the patch below). With that applied you build and install 32-bit and 64-bit versions of Wine and then run a 32-bit app with wine64. There's obviously no graphics at this point, but the 32-bit mmdevapi tests run well. Huw D. M. Davies (3): winepulse: Use handles to represent the stream. winepulse: Return offsets rather than ptrs to the strings. winepulse: Implement Wow64 entry points in the Unix library. dlls/winepulse.drv/mmdevdrv.c | 17 +- dlls/winepulse.drv/pulse.c | 522 ++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 44 ++- 3 files changed, 524 insertions(+), 59 deletions(-) -- diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d750f7a7579..b18f1c7fba9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1548,8 +1548,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) - unix_funcs->init_builtin_dll( wm->ldr.DllBase ); +// if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) +// unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ee958ae71f4..2bb5e8bbf83 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1919,7 +1919,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params( void **module ) if (!status) { if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; - if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; +// if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; } if (status) /* try launching it through start.exe */

5 5

[PATCH 1/5] webservices: Don't advance binary encoding reader if record type doesn't match.
by Connor McAdams 20 Apr '22

20 Apr '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/webservices/reader.c | 18 ++++++++++++------ dlls/webservices/tests/reader.c | 15 ++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7da0c8335ea..b22bcbd51b1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1486,8 +1486,9 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE GUID guid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -1771,9 +1772,10 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret unsigned char type = 0; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; if (!(attr = calloc( 1, sizeof(*attr) ))) return E_OUTOFMEMORY; + read_skip( reader, 1 ); if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) { @@ -2068,8 +2070,9 @@ static HRESULT read_element_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_element_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2480,8 +2483,9 @@ static HRESULT read_text_bin( struct reader *reader ) GUID uuid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -2835,8 +2839,9 @@ static HRESULT read_endelement_bin( struct reader *reader ) if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) { - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2917,8 +2922,9 @@ static HRESULT read_comment_bin( struct reader *reader ) ULONG len; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if ((hr = read_int31( reader, &len )) != S_OK) return hr; if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1a2cd1fe420..f62697b9662 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5764,15 +5764,12 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); - todo_wine ok( hr == S_OK, "got %#lx\n", hr ); - if (SUCCEEDED(hr)) - { - ok( test_struct->a == 1, "got %d\n", test_struct->a ); - ok( !!test_struct->s, "s is not set\n" ); - ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); - ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); - ok( test_struct->b == 1, "got %d\n", test_struct->b ); - } + ok( hr == S_OK, "got %#lx\n", hr ); + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); WsFreeHeap( heap ); WsFreeReader( reader ); -- 2.25.1

2 9

[tools 1/2] testbot/web: Always return "ro" or false in CollectionBlock::DisplayProperty().
by Francois Gouget 20 Apr '22

20 Apr '22

This better matches FormPage::DisplayProperty() and opens the door to later extending collection blocks to support edition. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/web/JobDetails.pl | 6 +----- testbot/web/PatchesList.pl | 5 ++--- testbot/web/admin/UsersList.pl | 3 +-- testbot/web/admin/VMDetails.pl | 4 ++-- testbot/web/admin/VMsList.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 3e3ee2952..bd0c8f6eb 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -179,7 +179,7 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - return $PropertyDescriptor->GetClass ne "Detailref"; + return $PropertyDescriptor->GetClass eq "Detailref" ? "" : "ro"; } sub GetSortedItems($$) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2c7901a75..f681ca5d6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -49,11 +49,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "StepNo" || $PropertyName eq "TaskNo" || - $PropertyName eq "Status" || $PropertyName eq "VM" || - $PropertyName eq "Timeout" || $PropertyName eq "FileName" || - $PropertyName eq "CmdLineArg" || $PropertyName eq "Started" || - $PropertyName eq "Ended" || $PropertyName eq "TestFailures"; + return $PropertyName =~ /^(?:StepNo|TaskNo|Status|VM|Timeout|FileName|CmdLineArg|Started|Ended|TestFailures)$/ ? "ro" : ""; } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 48c8382e7..a1c5171df 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,9 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - return $PropertyName eq "Received" || $PropertyName eq "Disposition" || - $PropertyName eq "FromName" || $PropertyName eq "Subject"; + return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + ""; } sub GenerateDataView($$$) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index bc5ced8a7..368a6ceac 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -42,8 +42,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || - $PropertyName eq "Status" || $PropertyName eq "RealName"; + return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } sub GenerateDataCell($$$) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 35b26811a..fd2d40de3 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,8 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); } sub Save($) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index f8162c63e..6c3ff2036 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -38,9 +38,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; } sub OnItemAction($$$) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a18920533..0b8a9cb78 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -183,9 +183,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; } -- 2.30.2

1 1

[tools] testbot/cgi: Fix the CollectionBlock::GenerateHeaderRow() prototype.
by Francois Gouget 20 Apr '22

20 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 0a737c71c..e849d5a59 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -336,7 +336,7 @@ sub GenerateHeaderCell($$$) print "</th>\n"; } -sub GenerateHeaderRow($$$) +sub GenerateHeaderRow($$) { my ($self, $Row) = @_; -- 2.30.2

1 0

[tools] testbot/web: Simplify the register page's DisplayProperty().
by Francois Gouget 20 Apr '22

20 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Register.pl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index b10be75e7..b31dc14c1 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -79,15 +79,9 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - my $Display; - if ($PropertyName ne "Name" && $PropertyName ne "EMail" && - $PropertyName ne "RealName") - { - return ""; - } - - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:Name|EMail|RealName)$/ ? + $self->SUPER::DisplayProperty($PropertyDescriptor) : + ""; } sub GenerateFields($) -- 2.30.2

1 0

[tools] testbot/cgi: Fix the CollectionBlock::GenerateHeaderView() documentation.
by Francois Gouget 20 Apr '22

20 Apr '22

The Row and Rows fields were undocumented and there was a bug in the POD formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index bd0c8f6eb..0a737c71c 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -241,7 +241,13 @@ The base link to the item details page if any. See GetDetailsPage(). =item ItemActions The list of per-item actions. -=cut +=item Row +The row index; 0 for the header. + +=item Rows +The total number of rows (excluding the header). + +=back =back =cut -- 2.30.2

1 0

[tools] testbot/web: Use GenerateDataView() for the users list.
by Francois Gouget 20 Apr '22

20 Apr '22

There is no need to override GenerateDataCell(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 368a6ceac..dcdb8111c 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -45,7 +45,7 @@ sub DisplayProperty($$) return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } -sub GenerateDataCell($$$) +sub GenerateDataView($$$) { my ($self, $Row, $PropertyDescriptor) = @_; @@ -83,11 +83,11 @@ sub GenerateDataCell($$$) ($Class, $Label) = ('usernone', 'none'); } my $DetailsLink = $self->GetDetailsLink($Row); - print "<td><a href='$DetailsLink'><span class='$Class'>$Label</span></a></td>"; + print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else { - $self->SUPER::GenerateDataCell($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } } -- 2.30.2

1 0

[PATCH 5/5 v2] wineoss: Move MODM_OPEN and MODM_CLOSE to the unixlib.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> They are both moved together because of the memory allocated for "lpExtra". Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 180 ++++++---------------------------- dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 191 +++++++++++++++++++++++++++++++++++-- dlls/wineoss.drv/unixlib.h | 28 +++++- 4 files changed, 235 insertions(+), 166 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 7d21dd32ae8..d66e926655d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -149,6 +149,15 @@ static LRESULT OSS_MidiExit(void) return 0; } +static void notify_client(struct notify_context *notify) +{ + TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", + notify->dev_id, notify->msg, notify->param_1, notify->param_2); + + DriverCallback(notify->callback, notify->flags, notify->device, notify->msg, + notify->instance, notify->param_1, notify->param_2); +} + /************************************************************************** * MIDI_NotifyClient [internal] */ @@ -164,8 +173,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_OPEN: - case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: if (wDevID > MODM_NumDevs) return; @@ -723,20 +730,6 @@ typedef struct sFMextra { */ } sFMextra; -/************************************************************************** - * modFMLoad [internal] - */ -static int modFMLoad(WORD dev, int fd) -{ - struct midi_out_fm_load_params params; - - params.dev_id = dev; - params.fd = fd; - OSS_CALL(midi_out_fm_load, &params); - - return params.ret; -} - #define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) /************************************************************************** @@ -754,132 +747,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modOpen [internal] - */ -static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int fd = -1; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - if (wDevID >= MODM_NumDevs) { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } - if (MidiOutDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if (!MidiOutDev[wDevID].bEnabled) { - WARN("device disabled !\n"); - return MIDIERR_NODEVICE; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - WARN("bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - MidiOutDev[wDevID].lpExtra = 0; - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - { - void* extra; - - extra = HeapAlloc(GetProcessHeap(), 0, - offsetof(struct sFMextra, voice[MidiOutDev[wDevID].caps.wVoices])); - - if (extra == 0) { - WARN("can't alloc extra data !\n"); - return MMSYSERR_NOMEM; - } - MidiOutDev[wDevID].lpExtra = extra; - fd = midiOpenSeq(); - if (fd < 0) { - MidiOutDev[wDevID].lpExtra = 0; - HeapFree(GetProcessHeap(), 0, extra); - return MMSYSERR_ERROR; - } - if (modFMLoad(wDevID, fd) < 0) { - midiCloseSeq(fd); - MidiOutDev[wDevID].lpExtra = 0; - HeapFree(GetProcessHeap(), 0, extra); - return MMSYSERR_ERROR; - } - OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); - } - break; - case MOD_MIDIPORT: - case MOD_SYNTH: - fd = midiOpenSeq(); - if (fd < 0) { - return MMSYSERR_ALLOCATED; - } - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].midiDesc = *lpDesc; - MidiOutDev[wDevID].fd = fd; - - MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); - return MMSYSERR_NOERROR; -} - - -/************************************************************************** - * modClose [internal] - */ -static DWORD modClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (MidiOutDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - /* FIXME: should test that no pending buffer is still in the queue for - * playing */ - - if (MidiOutDev[wDevID].fd == -1) { - WARN("can't close !\n"); - return MMSYSERR_ERROR; - } - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - case MOD_SYNTH: - case MOD_MIDIPORT: - midiCloseSeq(MidiOutDev[wDevID].fd); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); - MidiOutDev[wDevID].lpExtra = 0; - MidiOutDev[wDevID].fd = -1; - - MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); - MidiOutDev[wDevID].midiDesc.hMidi = 0; - return ret; -} - /************************************************************************** * modData [internal] */ @@ -1378,6 +1245,10 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_out_message_params params; + struct notify_context notify; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -1386,14 +1257,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; - case MODM_OPEN: - return modOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MODM_CLOSE: - return modClose(wDevID); case MODM_DATA: return modData(wDevID, dwParam1); case MODM_LONGDATA: @@ -1412,10 +1275,21 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); - default: - TRACE("Unsupported message\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + params.notify = &notify; + + OSS_CALL(midi_out_message, &params); + + if (!err && notify.send_notify) notify_client(&notify); + + return err; } /************************************************************************** diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 902685c11b8..1bd5ddb5762 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,8 +1406,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + midi_out_message, midi_seq_open, - midi_out_fm_load, midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index dcafbe609d9..613b070fde5 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -424,11 +424,8 @@ void seqbuf_dump(void) extern const unsigned char midiFMInstrumentPatches[16 * 128]; extern const unsigned char midiFMDrumsPatches[16 * 128]; -NTSTATUS midi_out_fm_load(void *args) +static int midi_out_fm_load(WORD dev_id, int fd) { - struct midi_out_fm_load_params *params = args; - WORD dev_id = params->dev_id; - int fd = params->fd; struct sbi_instrument sbi; int i; @@ -444,8 +441,7 @@ NTSTATUS midi_out_fm_load(void *args) if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - params->ret = -1; - return STATUS_SUCCESS; + return -1; } } for (i = 0; i < 128; i++) @@ -456,12 +452,10 @@ NTSTATUS midi_out_fm_load(void *args) if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - params->ret = -1; - return STATUS_SUCCESS; + return -1; } } - params->ret = 0; - return STATUS_SUCCESS; + return 0; } NTSTATUS midi_out_fm_reset(void *args) @@ -501,3 +495,180 @@ NTSTATUS midi_out_fm_reset(void *args) return STATUS_SUCCESS; } + +static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = dest->midiDesc.dwCallback; + notify->flags = dest->wFlags; + notify->device = dest->midiDesc.hMidi; + notify->instance = dest->midiDesc.dwInstance; +} + +static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify) +{ + struct midi_dest *dest; + int fd = -1; + + TRACE("(%04X, %p, %08X);\n", dev_id, midi_desc, flags); + if (midi_desc == NULL) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + if (dest->midiDesc.hMidi != 0) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (!dest->bEnabled) + { + WARN("device disabled !\n"); + return MIDIERR_NODEVICE; + } + if ((flags & ~CALLBACK_TYPEMASK) != 0) + { + WARN("bad flags\n"); + return MMSYSERR_INVALFLAG; + } + + dest->lpExtra = NULL; + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + { + void *extra; + + extra = malloc(offsetof(struct sFMextra, voice[dest->caps.wVoices])); + if (!extra) + { + WARN("can't alloc extra data !\n"); + return MMSYSERR_NOMEM; + } + dest->lpExtra = extra; + fd = seq_open(); + if (fd < 0) + { + dest->lpExtra = NULL; + free(extra); + return MMSYSERR_ERROR; + } + if (midi_out_fm_load(dev_id, fd) < 0) + { + seq_close(fd); + dest->lpExtra = NULL; + free(extra); + return MMSYSERR_ERROR; + } + midi_out_fm_reset((void *)(UINT_PTR)dev_id); + break; + } + case MOD_MIDIPORT: + case MOD_SYNTH: + fd = seq_open(); + if (fd < 0) + return MMSYSERR_ALLOCATED; + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + dest->lpQueueHdr= NULL; + dest->midiDesc = *midi_desc; + dest->fd = fd; + + set_out_notify(notify, dest, dev_id, MOM_OPEN, 0, 0); + TRACE("Successful !\n"); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_dest *dest; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + + if (dest->midiDesc.hMidi == 0) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + /* FIXME: should test that no pending buffer is still in the queue for + * playing */ + + if (dest->fd == -1) + { + WARN("can't close !\n"); + return MMSYSERR_ERROR; + } + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + case MOD_SYNTH: + case MOD_MIDIPORT: + seq_close(dest->fd); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + free(dest->lpExtra); + dest->lpExtra = NULL; + dest->fd = -1; + + set_out_notify(notify, dest, dev_id, MOM_CLOSE, 0, 0); + dest->midiDesc.hMidi = 0; + return MMSYSERR_NOERROR; +} + + +NTSTATUS midi_out_message(void *args) +{ + struct midi_out_message_params *params = args; + + params->notify->send_notify = FALSE; + + switch (params->msg) + { + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = MMSYSERR_NOERROR; + break; + case MODM_OPEN: + *params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MODM_CLOSE: + *params->err = midi_out_close(params->dev_id, params->notify); + break; + default: + TRACE("Unsupported message\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + } + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ecca092d540..75506d445bc 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -246,6 +246,30 @@ struct midi_init_params struct midi_src *srcs; }; +struct notify_context +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT_PTR param_1; + UINT_PTR param_2; + UINT_PTR callback; + UINT flags; + HANDLE device; + UINT_PTR instance; +}; + +struct midi_out_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -285,15 +309,15 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + oss_midi_out_message, oss_midi_seq_open, /* temporary */ - oss_midi_out_fm_load, oss_midi_out_fm_reset, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.36.0

2 1

[PATCH 4/5 v2] wineoss: Add a temporary midi_out_fm_reset syscall.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 40 +------------ dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 113 +++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 2 + 4 files changed, 118 insertions(+), 38 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3d2552007cd..7d21dd32ae8 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -737,42 +737,6 @@ static int modFMLoad(WORD dev, int fd) return params.ret; } -/************************************************************************** - * modFMReset [internal] - */ -static void modFMReset(WORD wDevID) -{ - sFMextra* extra = MidiOutDev[wDevID].lpExtra; - sVoice* voice = extra->voice; - sChannel* channel = extra->channel; - int i; - - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status != sVS_UNUSED) { - SEQ_STOP_NOTE(wDevID, i, voice[i].note, 64); - } - SEQ_KEY_PRESSURE(wDevID, i, 127, 0); - SEQ_CONTROL(wDevID, i, SEQ_VOLMODE, VOL_METHOD_LINEAR); - voice[i].note = 0; - voice[i].channel = -1; - voice[i].cntMark = 0; - voice[i].status = sVS_UNUSED; - } - for (i = 0; i < 16; i++) { - channel[i].program = 0; - channel[i].bender = 8192; - channel[i].benderRange = 2; - channel[i].bank = 0; - channel[i].volume = 127; - channel[i].balance = 64; - channel[i].expression = 0; - channel[i].sustain = 0; - } - extra->counter = 0; - extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ - SEQ_DUMPBUF(); -} - #define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) /************************************************************************** @@ -846,7 +810,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; } - modFMReset(wDevID); + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); } break; case MOD_MIDIPORT: @@ -1120,7 +1084,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) case MIDI_SYSTEM_PREFIX: switch (evt & 0x0F) { case 0x0F: /* Reset */ - modFMReset(wDevID); + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); break; default: WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2fc6c81e560..902685c11b8 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1409,4 +1409,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_seq_open, midi_out_fm_load, + midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index ba5dbca7e4f..dcafbe609d9 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -52,6 +52,47 @@ static unsigned int num_dests, num_srcs, num_synths, seq_refs; static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; +typedef struct sVoice +{ + int note; /* 0 means not used */ + int channel; + unsigned cntMark : 30, + status : 2; +#define sVS_UNUSED 0 +#define sVS_PLAYING 1 +#define sVS_SUSTAINED 2 +} sVoice; + +typedef struct sChannel +{ + int program; + + int bender; + int benderRange; + /* controllers */ + int bank; /* CTL_BANK_SELECT */ + int volume; /* CTL_MAIN_VOLUME */ + int balance; /* CTL_BALANCE */ + int expression; /* CTL_EXPRESSION */ + int sustain; /* CTL_SUSTAIN */ + + unsigned char nrgPmtMSB; /* Non register Parameters */ + unsigned char nrgPmtLSB; + unsigned char regPmtMSB; /* Non register Parameters */ + unsigned char regPmtLSB; +} sChannel; + +typedef struct sFMextra +{ + unsigned counter; + int drumSetMask; + sChannel channel[16]; /* MIDI has only 16 channels */ + sVoice voice[1]; /* dyn allocated according to sound card */ + /* do not append fields below voice[1] since the size of this structure + * depends on the number of available voices on the FM synth... + */ +} sFMextra; + WINE_DEFAULT_DEBUG_CHANNEL(midi); static int oss_to_win_device_type(int type) @@ -346,6 +387,40 @@ wrapup: return STATUS_SUCCESS; } +/* FIXME: this is a bad idea, it's even not static... */ +SEQ_DEFINEBUF(1024); + +/* FIXME: this is not reentrant, not static - because of global variable + * _seqbuf and al. + */ +/************************************************************************** + * seqbuf_dump [internal] + * + * Used by SEQ_DUMPBUF to flush the buffer. + * + */ +void seqbuf_dump(void) +{ + int fd; + + /* The device is already open, but there's no way to pass the + fd to this function. Rather than rely on a global variable + we pretend to open the seq again. */ + fd = seq_open(); + if (_seqbufptr) + { + if (write(fd, _seqbuf, _seqbufptr) == -1) + { + WARN("Can't write data to sequencer %d, errno %d (%s)!\n", + fd, errno, strerror(errno)); + } + /* FIXME: In any case buffer is lost so that if many errors occur the buffer + * will not overrun */ + _seqbufptr = 0; + } + seq_close(fd); +} + extern const unsigned char midiFMInstrumentPatches[16 * 128]; extern const unsigned char midiFMDrumsPatches[16 * 128]; @@ -388,3 +463,41 @@ NTSTATUS midi_out_fm_load(void *args) params->ret = 0; return STATUS_SUCCESS; } + +NTSTATUS midi_out_fm_reset(void *args) +{ + WORD dev_id = (WORD)(UINT_PTR)args; + struct midi_dest *dest = dests + dev_id; + sFMextra *extra = dest->lpExtra; + sVoice *voice = extra->voice; + sChannel *channel = extra->channel; + int i; + + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status != sVS_UNUSED) + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + SEQ_KEY_PRESSURE(dev_id, i, 127, 0); + SEQ_CONTROL(dev_id, i, SEQ_VOLMODE, VOL_METHOD_LINEAR); + voice[i].note = 0; + voice[i].channel = -1; + voice[i].cntMark = 0; + voice[i].status = sVS_UNUSED; + } + for (i = 0; i < 16; i++) + { + channel[i].program = 0; + channel[i].bender = 8192; + channel[i].benderRange = 2; + channel[i].bank = 0; + channel[i].volume = 127; + channel[i].balance = 64; + channel[i].expression = 0; + channel[i].sustain = 0; + } + extra->counter = 0; + extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ + SEQ_DUMPBUF(); + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 4dab53f5148..ecca092d540 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -288,11 +288,13 @@ enum oss_funcs oss_midi_seq_open, /* temporary */ oss_midi_out_fm_load, + oss_midi_out_fm_reset, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.36.0

2 1

[PATCH 3/5 v2] wineoss: Add a temporary midi_out_fm_patch syscall.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 34 +++++----------------------- dlls/wineoss.drv/midipatch.c | 4 ++++ dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++++ 5 files changed, 63 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 58047380639..3d2552007cd 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -723,40 +723,18 @@ typedef struct sFMextra { */ } sFMextra; -extern const unsigned char midiFMInstrumentPatches[16 * 128]; -extern const unsigned char midiFMDrumsPatches [16 * 128]; - /************************************************************************** * modFMLoad [internal] */ -static int modFMLoad(int dev, int fd) +static int modFMLoad(WORD dev, int fd) { - int i; - struct sbi_instrument sbi; + struct midi_out_fm_load_params params; - sbi.device = dev; - sbi.key = FM_PATCH; + params.dev_id = dev; + params.fd = fd; + OSS_CALL(midi_out_fm_load, &params); - memset(sbi.operators + 16, 0, 16); - for (i = 0; i < 128; i++) { - sbi.channel = i; - memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); - - if (write(fd, &sbi, sizeof(sbi)) == -1) { - WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - return -1; - } - } - for (i = 0; i < 128; i++) { - sbi.channel = 128 + i; - memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); - - if (write(fd, &sbi, sizeof(sbi)) == -1) { - WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - return -1; - } - } - return 0; + return params.ret; } /************************************************************************** diff --git a/dlls/wineoss.drv/midipatch.c b/dlls/wineoss.drv/midipatch.c index 41d8e07b99a..4ff48623260 100644 --- a/dlls/wineoss.drv/midipatch.c +++ b/dlls/wineoss.drv/midipatch.c @@ -24,6 +24,10 @@ * Eric POUECH : MIDI FM patches for GM instruments */ +#if 0 +#pragma makedep unix +#endif + #define NOT_DEFINED 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, const unsigned char midiFMInstrumentPatches[128 * 16] = { diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ac8847920b0..2fc6c81e560 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1408,4 +1408,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_init, midi_seq_open, + midi_out_fm_load, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index a0a0b1caad2..ba5dbca7e4f 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -345,3 +345,46 @@ wrapup: return STATUS_SUCCESS; } + +extern const unsigned char midiFMInstrumentPatches[16 * 128]; +extern const unsigned char midiFMDrumsPatches[16 * 128]; + +NTSTATUS midi_out_fm_load(void *args) +{ + struct midi_out_fm_load_params *params = args; + WORD dev_id = params->dev_id; + int fd = params->fd; + struct sbi_instrument sbi; + int i; + + sbi.device = dev_id; + sbi.key = FM_PATCH; + + memset(sbi.operators + 16, 0, 16); + for (i = 0; i < 128; i++) + { + sbi.channel = i; + memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); + + if (write(fd, &sbi, sizeof(sbi)) == -1) + { + WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); + params->ret = -1; + return STATUS_SUCCESS; + } + } + for (i = 0; i < 128; i++) + { + sbi.channel = 128 + i; + memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); + + if (write(fd, &sbi, sizeof(sbi)) == -1) + { + WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); + params->ret = -1; + return STATUS_SUCCESS; + } + } + params->ret = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 68d41e41f74..4dab53f5148 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -252,6 +252,13 @@ struct midi_seq_open_params int fd; }; +struct midi_out_fm_load_params +{ + WORD dev_id; + int fd; + int ret; +}; + enum oss_funcs { oss_test_connect, @@ -280,10 +287,12 @@ enum oss_funcs oss_midi_init, oss_midi_seq_open, /* temporary */ + oss_midi_out_fm_load, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.36.0

2 1

[PATCH 2/5 v2] wineoss: Add a temporary syscall to open and close the seq fd.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 51 ++++++++------------------------------ dlls/wineoss.drv/oss.c | 2 ++ dlls/wineoss.drv/ossmidi.c | 12 +++++++++ dlls/wineoss.drv/unixlib.h | 9 +++++++ 4 files changed, 34 insertions(+), 40 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 10e5ba854b1..58047380639 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -75,7 +75,6 @@ static int MODM_NumFMSynthDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffers queues */ @@ -199,49 +198,18 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static int midi_warn = 1; /************************************************************************** * midiOpenSeq [internal] */ static int midiOpenSeq(void) { - static int midiSeqFD = -1; + struct midi_seq_open_params params; - if (numOpenMidiSeq == 0) { - const char* device; - device=getenv("MIDIDEV"); - if (!device) device="/dev/sequencer"; - midiSeqFD = open(device, O_RDWR, 0); - if (midiSeqFD == -1) { - if (midi_warn) - { - WARN("Can't open MIDI device '%s' ! (%s). If your " - "program needs this (probably not): %s\n", - device, strerror(errno), - errno == ENOENT ? - "create it ! (\"man MAKEDEV\" ?)" : - errno == ENODEV ? - "load MIDI sequencer kernel driver !" : - errno == EACCES ? - "grant access ! (\"man chmod\")" : "" - ); - } - midi_warn = 0; - return -1; - } -#if 0 - if (fcntl(midiSeqFD, F_SETFL, O_NONBLOCK) < 0) { - WARN("can't set sequencer fd to non-blocking, errno %d (%s)\n", errno, strerror(errno)); - close(midiSeqFD); - midiSeqFD = -1; - return -1; - } -#endif - fcntl(midiSeqFD, F_SETFD, 1); /* set close on exec flag */ - ioctl(midiSeqFD, SNDCTL_SEQ_RESET); - } - numOpenMidiSeq++; - return midiSeqFD; + params.close = 0; + params.fd = -1; + OSS_CALL(midi_seq_open, &params); + + return params.fd; } /************************************************************************** @@ -249,8 +217,11 @@ static int midiOpenSeq(void) */ static int midiCloseSeq(int fd) { - if (--numOpenMidiSeq == 0) - close(fd); + struct midi_seq_open_params params; + + params.close = 1; + params.fd = fd; + OSS_CALL(midi_seq_open, &params); return 0; } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 4f3c0bcb2cf..ac8847920b0 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,4 +1406,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + + midi_seq_open, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 75fbf6d7bee..a0a0b1caad2 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -119,6 +119,18 @@ static int seq_close(int fd) return 0; } +NTSTATUS midi_seq_open(void *args) +{ + struct midi_seq_open_params *params = args; + + if (!params->close) + params->fd = seq_open(); + else + seq_close(params->fd); + + return STATUS_SUCCESS; +} + NTSTATUS midi_init(void *args) { struct midi_init_params *params = args; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 8c131037b76..68d41e41f74 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -246,6 +246,12 @@ struct midi_init_params struct midi_src *srcs; }; +struct midi_seq_open_params +{ + int close; + int fd; +}; + enum oss_funcs { oss_test_connect, @@ -272,9 +278,12 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + + oss_midi_seq_open, /* temporary */ }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.36.0

1 0

[PATCH 1/5 v2] wineoss: Store the sequencer fd in the driver struct.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> This avoids using a global variable. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 78 ++++++++++++++++++++++++-------------- dlls/wineoss.drv/unixlib.h | 2 + 2 files changed, 51 insertions(+), 29 deletions(-) v2: Clean up some of the wonky whitespace. diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 626b3d43d83..10e5ba854b1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -75,7 +75,6 @@ static int MODM_NumFMSynthDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static int midiSeqFD = -1; static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; @@ -96,7 +95,7 @@ static HANDLE hThread; *======================================================================*/ static int midiOpenSeq(void); -static int midiCloseSeq(void); +static int midiCloseSeq(int); static int MIDI_loadcount; /************************************************************************** @@ -206,6 +205,8 @@ static int midi_warn = 1; */ static int midiOpenSeq(void) { + static int midiSeqFD = -1; + if (numOpenMidiSeq == 0) { const char* device; device=getenv("MIDIDEV"); @@ -240,18 +241,17 @@ static int midiOpenSeq(void) ioctl(midiSeqFD, SNDCTL_SEQ_RESET); } numOpenMidiSeq++; - return 0; + return midiSeqFD; } /************************************************************************** * midiCloseSeq [internal] */ -static int midiCloseSeq(void) +static int midiCloseSeq(int fd) { - if (--numOpenMidiSeq == 0) { - close(midiSeqFD); - midiSeqFD = -1; - } + if (--numOpenMidiSeq == 0) + close(fd); + return 0; } @@ -269,10 +269,16 @@ SEQ_DEFINEBUF(1024); */ void seqbuf_dump(void) { + int fd; + + /* The device is already open, but there's no way to pass the + fd to this function. Rather than rely on a global variable + we pretend to open the seq again. */ + fd = midiOpenSeq(); if (_seqbufptr) { - if (write(midiSeqFD, _seqbuf, _seqbufptr) == -1) { + if (write(fd, _seqbuf, _seqbufptr) == -1) { WARN("Can't write data to sequencer %d, errno %d (%s)!\n", - midiSeqFD, errno, strerror(errno)); + fd, errno, strerror(errno)); } /* FIXME: * in any case buffer is lost so that if many errors occur the buffer @@ -280,6 +286,7 @@ void seqbuf_dump(void) */ _seqbufptr = 0; } + midiCloseSeq(fd); } /************************************************************************** @@ -392,8 +399,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } -static DWORD WINAPI midRecThread(LPVOID arg) +static DWORD WINAPI midRecThread(void *arg) { + int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; int len, idx; DWORD dwTime; @@ -401,7 +409,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) TRACE("Thread startup\n"); - pfd.fd = midiSeqFD; + pfd.fd = fd; pfd.events = POLLIN; while(!end_thread) { @@ -411,7 +419,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) if (poll(&pfd, 1, 250) <= 0) continue; - len = read(midiSeqFD, buffer, sizeof(buffer)); + len = read(fd, buffer, sizeof(buffer)); TRACE("Received %d bytes\n", len); if (len < 0) continue; @@ -470,6 +478,8 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) */ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { + int fd; + TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -501,17 +511,18 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - if (midiOpenSeq() < 0) { + fd = midiOpenSeq(); + if (fd < 0) { return MMSYSERR_ERROR; } if (numStartedMidiIn++ == 0) { end_thread = 0; - hThread = CreateThread(NULL, 0, midRecThread, NULL, 0, NULL); + hThread = CreateThread(NULL, 0, midRecThread, (void *)(INT_PTR)fd, 0, NULL); if (!hThread) { numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); - midiCloseSeq(); + midiCloseSeq(fd); return MMSYSERR_ERROR; } SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); @@ -525,6 +536,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].state = 0; MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].startTime = 0; + MidiInDev[wDevID].fd = fd; MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; @@ -551,7 +563,7 @@ static DWORD midClose(WORD wDevID) return MIDIERR_STILLPLAYING; } - if (midiSeqFD == -1) { + if (MidiInDev[wDevID].fd == -1) { WARN("ooops !\n"); return MMSYSERR_ERROR; } @@ -564,7 +576,8 @@ static DWORD midClose(WORD wDevID) } TRACE("Stopped thread for midi-in\n"); } - midiCloseSeq(); + midiCloseSeq(MidiInDev[wDevID].fd); + MidiInDev[wDevID].fd = -1; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; @@ -745,7 +758,7 @@ extern const unsigned char midiFMDrumsPatches [16 * 128]; /************************************************************************** * modFMLoad [internal] */ -static int modFMLoad(int dev) +static int modFMLoad(int dev, int fd) { int i; struct sbi_instrument sbi; @@ -758,7 +771,7 @@ static int modFMLoad(int dev) sbi.channel = i; memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); - if (write(midiSeqFD, &sbi, sizeof(sbi)) == -1) { + if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); return -1; } @@ -767,7 +780,7 @@ static int modFMLoad(int dev) sbi.channel = 128 + i; memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); - if (write(midiSeqFD, &sbi, sizeof(sbi)) == -1) { + if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); return -1; } @@ -833,6 +846,8 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) */ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { + int fd = -1; + TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); @@ -870,13 +885,14 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_NOMEM; } MidiOutDev[wDevID].lpExtra = extra; - if (midiOpenSeq() < 0) { + fd = midiOpenSeq(); + if (fd < 0) { MidiOutDev[wDevID].lpExtra = 0; HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; } - if (modFMLoad(wDevID) < 0) { - midiCloseSeq(); + if (modFMLoad(wDevID, fd) < 0) { + midiCloseSeq(fd); MidiOutDev[wDevID].lpExtra = 0; HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; @@ -886,7 +902,8 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) break; case MOD_MIDIPORT: case MOD_SYNTH: - if (midiOpenSeq() < 0) { + fd = midiOpenSeq(); + if (fd < 0) { return MMSYSERR_ALLOCATED; } break; @@ -900,6 +917,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].lpQueueHdr = NULL; MidiOutDev[wDevID].midiDesc = *lpDesc; + MidiOutDev[wDevID].fd = fd; MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); TRACE("Successful !\n"); @@ -923,15 +941,16 @@ static DWORD modClose(WORD wDevID) /* FIXME: should test that no pending buffer is still in the queue for * playing */ - if (midiSeqFD == -1) { + if (MidiOutDev[wDevID].fd == -1) { WARN("can't close !\n"); return MMSYSERR_ERROR; } switch (MidiOutDev[wDevID].caps.wTechnology) { case MOD_FMSYNTH: + case MOD_SYNTH: case MOD_MIDIPORT: - midiCloseSeq(); + midiCloseSeq(MidiOutDev[wDevID].fd); break; default: WARN("Technology not supported (yet) %d !\n", @@ -941,6 +960,7 @@ static DWORD modClose(WORD wDevID) HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); MidiOutDev[wDevID].lpExtra = 0; + MidiOutDev[wDevID].fd = -1; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; @@ -961,7 +981,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - if (midiSeqFD == -1) { + if (MidiOutDev[wDevID].fd == -1) { WARN("can't play !\n"); return MIDIERR_NODEVICE; } @@ -1256,7 +1276,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - if (midiSeqFD == -1) { + if (MidiOutDev[wDevID].fd == -1) { WARN("can't play !\n"); return MIDIERR_NODEVICE; } diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2b30c5992c7..8c131037b76 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -222,6 +222,7 @@ typedef struct midi_src char incLen; UINT startTime; MIDIINCAPSW caps; + int fd; } WINE_MIDIIN; typedef struct midi_dest @@ -232,6 +233,7 @@ typedef struct midi_dest MIDIHDR *lpQueueHdr; void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; + int fd; } WINE_MIDIOUT; struct midi_init_params -- 2.36.0

1 0

[PATCH v2 1/3] conhost: Save console settings as global defaults on first run
by Hugh McMaster 20 Apr '22

20 Apr '22

On Windows, HKCU\Console holds global default settings, while subkeys hold any app-specific settings that differ from the defaults. Wine's conhost.exe implementation currently saves all console settings to an app-specific subkey on the first run, while global defaults are only saved to HKCU\Console if the user selects the Default pop-up menu option. This is the opposite of the behaviour on Windows. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index fb02ef9fd94..130be396820 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -817,9 +817,9 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW fc->done = 1; - /* since we've modified the current config with new font information, - * set this information as the new default. - */ + /* Save default font and console configuration to the registry */ + load_config( NULL, &config ); + load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; @@ -827,10 +827,8 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW fc->console->active->font.face_len * sizeof(WCHAR) ); config.face_name[fc->console->active->font.face_len] = 0; - /* Force also its writing back to the registry so that we can get it - * the next time. - */ - save_config( fc->console->window->config_key, &config ); + save_config( NULL, &config ); + return 0; } } -- 2.35.2

2 5

[PATCH] kernelbase: Allocate global memory handle table dynamically.
by Rémi Bernon 20 Apr '22

20 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52763 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/main.c | 1 + dlls/kernelbase/memory.c | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index f4bd3e99283..6043fe49dd5 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -33,6 +33,7 @@ struct pseudo_console extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; +extern void init_global_data(void) DECLSPEC_HIDDEN; extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_console(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 2f2312eccb8..0309ec91589 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -46,6 +46,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { DisableThreadLibraryCalls( hinst ); IsWow64Process( GetCurrentProcess(), &is_wow64 ); + init_global_data(); init_locale( hinst ); init_startup_info( NtCurrentTeb()->Peb->ProcessParameters ); init_console(); diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 21e7c5ef9d9..ea223c3986a 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -608,14 +608,8 @@ struct mem_entry C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); #define MAX_MEM_HANDLES 0x10000 -static struct mem_entry mem_entries[MAX_MEM_HANDLES]; -static struct mem_entry *next_free_mem = mem_entries; - -static struct kernelbase_global_data kernelbase_global_data = -{ - .mem_entries = mem_entries, - .mem_entries_end = mem_entries + MAX_MEM_HANDLES, -}; +static struct mem_entry *next_free_mem; +static struct kernelbase_global_data global_data = {0}; /* align the storage needed for the HLOCAL on an 8-byte boundary thus * LocalAlloc/LocalReAlloc'ing with LMEM_MOVEABLE of memory with @@ -627,7 +621,7 @@ static struct kernelbase_global_data kernelbase_global_data = static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); - struct kernelbase_global_data *data = &kernelbase_global_data; + struct kernelbase_global_data *data = &global_data; if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (!(mem->flags & MEM_FLAG_USED)) return NULL; @@ -646,6 +640,12 @@ static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) return handle; } +void init_global_data(void) +{ + global_data.mem_entries = VirtualAlloc( NULL, MAX_MEM_HANDLES * sizeof(struct mem_entry), MEM_COMMIT, PAGE_READWRITE ); + if (!(next_free_mem = global_data.mem_entries)) ERR( "Failed to allocate kernelbase global handle table\n" ); + global_data.mem_entries_end = global_data.mem_entries + MAX_MEM_HANDLES; +} /*********************************************************************** * KernelBaseGetGlobalData (kernelbase.@) @@ -653,7 +653,7 @@ static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) void *WINAPI KernelBaseGetGlobalData(void) { WARN_(globalmem)( "semi-stub!\n" ); - return &kernelbase_global_data; + return &global_data; } @@ -709,7 +709,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) } RtlLockHeap( heap ); - if ((mem = next_free_mem) < mem_entries || mem >= mem_entries + MAX_MEM_HANDLES) + if ((mem = next_free_mem) < global_data.mem_entries || mem >= global_data.mem_entries_end) mem = NULL; else { -- 2.35.1

1 0

[PATCH V2] dlls/kernel32/tests: test when passing non inheritable handles in CreateProcess
by Eric Pouech 20 Apr '22

20 Apr '22

V2: - fix broken results on Win7 note: a couple of errors reported by Marvin when running these tests are fixed by the other 2 patch-serie (and others have been present on Debian from some locale) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ebadc2e8d12..446a2b25713 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -512,7 +512,22 @@ static void doChild(const char* file, const char* option) ok(WriteFile(hStdOut, buf, r, &w, NULL) && w == r, "Writing message to output pipe\n"); } } + if (option && strcmp(option, "stdinfo") == 0) + { + DWORD flin, flout, flerr; + BOOL bin = GetHandleInformation(GetStdHandle(STD_INPUT_HANDLE), &flin); + BOOL bout = GetHandleInformation(GetStdHandle(STD_OUTPUT_HANDLE), &flout); + BOOL berr = GetHandleInformation(GetStdHandle(STD_ERROR_HANDLE), &flerr); + if (bin || bout || berr) + { + childPrintf(hFile, "[StdHandleInfo]\n"); + if (bin ) childPrintf(hFile, "hStdInput=%lu", flin); + if (bout) childPrintf(hFile, "hStdOutput=%lu", flout); + if (berr) childPrintf(hFile, "hStdError=%lu", flerr); + childPrintf(hFile, "\n"); + } + } if (option && strcmp(option, "exit_code") == 0) { childPrintf(hFile, "[ExitCode]\nvalue=%d\n\n", 123); @@ -523,6 +538,15 @@ static void doChild(const char* file, const char* option) CloseHandle(hFile); } +static BOOL isChildPresent( const char* sect, const char* key ) +{ + char buf[1024+4*MAX_LISTED_ENV_VAR]; + + GetPrivateProfileStringA(sect, key, "-", buf, sizeof(buf), resfile); + if (buf[0] == '\0' || (buf[0] == '-' && buf[1] == '\0')) return FALSE; + return TRUE; +} + static char* getChildString(const char* sect, const char* key) { char buf[1024+4*MAX_LISTED_ENV_VAR]; @@ -614,10 +638,17 @@ static void ok_child_int( int line, const char *sect, const char *key, UINT expe ok_(__FILE__, line)( result == expect, "%s:%s expected %u, but got %u\n", sect, key, expect, result ); } +static void ok_child_intbrk( int line, const char *sect, const char *key, UINT expect, UINT brk ) +{ + UINT result = GetPrivateProfileIntA( sect, key, !expect, resfile ); + ok_(__FILE__, line)( result == expect || broken(result == brk), "%s:%s expected %u, but got %u\n", sect, key, expect, result ); +} + #define okChildString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 1 ) #define okChildIString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 0 ) #define okChildStringWA(sect, key, expect) ok_child_stringWA(__LINE__, (sect), (key), (expect), 1 ) #define okChildInt(sect, key, expect) ok_child_int(__LINE__, (sect), (key), (expect)) +#define okChildIntBroken(sect, key, expect, brk) ok_child_intbrk(__LINE__, (sect), (key), (expect), (brk)) static void test_Startup(void) { @@ -1691,6 +1722,64 @@ static void test_Console(void) release_memory(); DeleteFileA(resfile); + + /* test passing in startupinfo inheritable and non inheritable handles (CreateProcess not inheriting handles) */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0); + startup.hStdOutput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + startup.hStdError = (HANDLE)(DWORD_PTR)0x00585840; + ok(startup.hStdInput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + ok(startup.hStdOutput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + sprintf(buffer, "\"%s\" process dump \"%s\" stdinfo", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); + wait_and_close_child_process(&info); + CloseHandle(startup.hStdInput); + + reload_child_info(resfile); + /* handles values have been zero:ed */ + todo_wine okChildIntBroken("StartupInfoA", "hStdInput", 0, /* Win7 */ (DWORD_PTR)startup.hStdInput); + todo_wine okChildIntBroken("StartupInfoA", "hStdOutput", 0, /* Win7 */ (DWORD_PTR)startup.hStdOutput); + todo_wine okChildIntBroken("StartupInfoA", "hStdError", 0, /* Win7 */ (DWORD_PTR)startup.hStdError); + todo_wine okChildIntBroken("StartupInfoW", "hStdInput", 0, /* Win7 */ (DWORD_PTR)startup.hStdInput); + todo_wine okChildIntBroken("StartupInfoW", "hStdOutput", 0, /* Win7 */ (DWORD_PTR)startup.hStdOutput); + todo_wine okChildIntBroken("StartupInfoW", "hStdError", 0, /* Win7 */ (DWORD_PTR)startup.hStdError); + /* even inheritable objects are not inherited */ + todo_wine ok(!isChildPresent("StdHandleInfo", "hStdInput"), "shouldn't inherit handle\n"); + ok(!isChildPresent("StdHandleInfo", "hStdOutput"), "hStdOutput shouldn't be present\n"); + ok(!isChildPresent("StdHandleInfo", "hStdError"), "hStdError shouldn't be present\n"); + release_memory(); + DeleteFileA(resfile); + + /* test passing in startupinfo inheritable and non inheritable handles (CreateProcess inhering handles)) */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0); + startup.hStdOutput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + startup.hStdError = (HANDLE)(DWORD_PTR)0x00585840; + ok(startup.hStdInput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + ok(startup.hStdOutput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + sprintf(buffer, "\"%s\" process dump \"%s\" stdinfo", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); + wait_and_close_child_process(&info); + CloseHandle(startup.hStdInput); + + reload_child_info(resfile); + /* handles values are available */ + okChildInt("StartupInfoA", "hStdInput", (DWORD_PTR)startup.hStdInput); + okChildInt("StartupInfoA", "hStdOutput", (DWORD_PTR)startup.hStdOutput); + okChildInt("StartupInfoA", "hStdError", (DWORD_PTR)startup.hStdError); + okChildInt("StartupInfoW", "hStdInput", (DWORD_PTR)startup.hStdInput); + okChildInt("StartupInfoW", "hStdOutput", (DWORD_PTR)startup.hStdOutput); + okChildInt("StartupInfoW", "hStdError", (DWORD_PTR)startup.hStdError); + /* only inheritable objects are inherited */ + okChildInt("StdHandleInfo", "hStdInput", HANDLE_FLAG_INHERIT); + ok(!isChildPresent("StdHandleInfo", "hStdOutput"), "hStdOutput shouldn't be present\n"); + ok(!isChildPresent("StdHandleInfo", "hStdError"), "hStdError shouldn't be present\n"); + release_memory(); + DeleteFileA(resfile); } static void test_ExitCode(void)

2 1

[PATCH vkd3d 1/8] include: Move vkd3d_dl*() helpers to vkd3d_common.h.
by Zebediah Figura 20 Apr '22

20 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/private/vkd3d_common.h | 44 +++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 45 ---------------------------------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 52ec6cce4..a85bc6d69 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -250,4 +250,48 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min HRESULT hresult_from_vkd3d_result(int vkd3d_result); +#ifdef HAVE_DLFCN_H +#include <dlfcn.h> + +static inline void *vkd3d_dlopen(const char *name) +{ + return dlopen(name, RTLD_NOW); +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return dlsym(handle, symbol); +} + +static inline int vkd3d_dlclose(void *handle) +{ + return dlclose(handle); +} + +static inline const char *vkd3d_dlerror(void) +{ + return dlerror(); +} +#else +static inline void *vkd3d_dlopen(const char *name) +{ + return NULL; +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return NULL; +} + +static inline int vkd3d_dlclose(void *handle) +{ + return 0; +} + +static inline const char *vkd3d_dlerror(void) +{ + return "Not implemented for this platform.\n"; +} +#endif + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d23062d09..31dcb5d3a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -19,51 +19,6 @@ #include "vkd3d_private.h" #include "vkd3d_version.h" -#ifdef HAVE_DLFCN_H -#include <dlfcn.h> - -static void *vkd3d_dlopen(const char *name) -{ - return dlopen(name, RTLD_NOW); -} - -static void *vkd3d_dlsym(void *handle, const char *symbol) -{ - return dlsym(handle, symbol); -} - -static int vkd3d_dlclose(void *handle) -{ - return dlclose(handle); -} - -static const char *vkd3d_dlerror(void) -{ - return dlerror(); -} -#else -static void *vkd3d_dlopen(const char *name) -{ - FIXME("Not implemented for this platform.\n"); - return NULL; -} - -static void *vkd3d_dlsym(void *handle, const char *symbol) -{ - return NULL; -} - -static int vkd3d_dlclose(void *handle) -{ - return 0; -} - -static const char *vkd3d_dlerror(void) -{ - return "Not implemented for this platform.\n"; -} -#endif - struct vkd3d_struct { enum vkd3d_structure_type type; -- 2.35.1

4 15

[PATCH] dlls/kernel32/tests: test when passing non inheritable handles in CreateProcess
by Eric Pouech 20 Apr '22

20 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 82 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ebadc2e8d12..6d05b18c44f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -512,7 +512,22 @@ static void doChild(const char* file, const char* option) ok(WriteFile(hStdOut, buf, r, &w, NULL) && w == r, "Writing message to output pipe\n"); } } + if (option && strcmp(option, "stdinfo") == 0) + { + DWORD flin, flout, flerr; + BOOL bin = GetHandleInformation(GetStdHandle(STD_INPUT_HANDLE), &flin); + BOOL bout = GetHandleInformation(GetStdHandle(STD_OUTPUT_HANDLE), &flout); + BOOL berr = GetHandleInformation(GetStdHandle(STD_ERROR_HANDLE), &flerr); + if (bin || bout || berr) + { + childPrintf(hFile, "[StdHandleInfo]\n"); + if (bin ) childPrintf(hFile, "hStdInput=%lu", flin); + if (bout) childPrintf(hFile, "hStdOutput=%lu", flout); + if (berr) childPrintf(hFile, "hStdError=%lu", flerr); + childPrintf(hFile, "\n"); + } + } if (option && strcmp(option, "exit_code") == 0) { childPrintf(hFile, "[ExitCode]\nvalue=%d\n\n", 123); @@ -523,6 +538,15 @@ static void doChild(const char* file, const char* option) CloseHandle(hFile); } +static BOOL isChildPresent( const char* sect, const char* key ) +{ + char buf[1024+4*MAX_LISTED_ENV_VAR]; + + GetPrivateProfileStringA(sect, key, "-", buf, sizeof(buf), resfile); + if (buf[0] == '\0' || (buf[0] == '-' && buf[1] == '\0')) return FALSE; + return TRUE; +} + static char* getChildString(const char* sect, const char* key) { char buf[1024+4*MAX_LISTED_ENV_VAR]; @@ -1691,6 +1715,64 @@ static void test_Console(void) release_memory(); DeleteFileA(resfile); + + /* test passing in startupinfo inheritable and non inheritable handles (CreateProcess not inheriting handles) */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0); + startup.hStdOutput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + startup.hStdError = (HANDLE)(DWORD_PTR)0x00585840; + ok(startup.hStdInput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + ok(startup.hStdOutput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + sprintf(buffer, "\"%s\" process dump \"%s\" stdinfo", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); + wait_and_close_child_process(&info); + CloseHandle(startup.hStdInput); + + reload_child_info(resfile); + /* handles values have been zero:ed */ + todo_wine okChildInt("StartupInfoA", "hStdInput", 0); + todo_wine okChildInt("StartupInfoA", "hStdOutput", 0); + todo_wine okChildInt("StartupInfoA", "hStdError", 0); + todo_wine okChildInt("StartupInfoW", "hStdInput", 0); + todo_wine okChildInt("StartupInfoW", "hStdOutput", 0); + todo_wine okChildInt("StartupInfoW", "hStdError", 0); + /* even inheritable objects are not inherited */ + todo_wine ok(!isChildPresent("StdHandleInfo", "hStdInput"), "shouldn't inherit handle\n"); + ok(!isChildPresent("StdHandleInfo", "hStdOutput"), "hStdOutput shouldn't be present\n"); + ok(!isChildPresent("StdHandleInfo", "hStdError"), "hStdError shouldn't be present\n"); + release_memory(); + DeleteFileA(resfile); + + /* test passing in startupinfo inheritable and non inheritable handles (CreateProcess inhering handles)) */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0); + startup.hStdOutput = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + startup.hStdError = (HANDLE)(DWORD_PTR)0x00585840; + ok(startup.hStdInput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + ok(startup.hStdOutput != INVALID_HANDLE_VALUE, "failed to open NUL\n"); + sprintf(buffer, "\"%s\" process dump \"%s\" stdinfo", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); + wait_and_close_child_process(&info); + CloseHandle(startup.hStdInput); + + reload_child_info(resfile); + /* handles values are available */ + okChildInt("StartupInfoA", "hStdInput", (DWORD_PTR)startup.hStdInput); + okChildInt("StartupInfoA", "hStdOutput", (DWORD_PTR)startup.hStdOutput); + okChildInt("StartupInfoA", "hStdError", (DWORD_PTR)startup.hStdError); + okChildInt("StartupInfoW", "hStdInput", (DWORD_PTR)startup.hStdInput); + okChildInt("StartupInfoW", "hStdOutput", (DWORD_PTR)startup.hStdOutput); + okChildInt("StartupInfoW", "hStdError", (DWORD_PTR)startup.hStdError); + /* only inheritable objects are inherited */ + okChildInt("StdHandleInfo", "hStdInput", HANDLE_FLAG_INHERIT); + ok(!isChildPresent("StdHandleInfo", "hStdOutput"), "hStdOutput shouldn't be present\n"); + ok(!isChildPresent("StdHandleInfo", "hStdError"), "hStdError shouldn't be present\n"); + release_memory(); + DeleteFileA(resfile); } static void test_ExitCode(void)

2 1

[PATCH V2 0/2] Fix kernel32:process tests
by Eric Pouech 20 Apr '22

20 Apr '22

This shall let testbot succeed on kernel32:process tests (fixing evolution generated by the shell-no-window type of consoles) Note: the tests had been written at a time where the console in Windows wasn't a kernel object like the others... (the two lower bits of the handle where set). And hadn't been updated ever since, so some test was only run on Win7... This serie also updates those test to focus mainly on Win{>= 8} Supersede: 232632 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (2): dlls/kernel32/tests: let the console tests pass if current console is shell-no-window dlls/kernel32/tests: adapt dup console handle test to non Win7 handles dlls/kernel32/tests/process.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)

2 4

[PATCH 1/3] kernel32/tests: Add some heap block layout tests.
by Rémi Bernon 20 Apr '22

20 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 123 +++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 104eced3bf4..302c0542f90 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -37,6 +37,9 @@ #define HEAP_VALIDATE_ALL 0x20000000 #define HEAP_VALIDATE_PARAMS 0x40000000 +#define BLOCK_ALIGN (2 * sizeof(void *) - 1) +#define ALIGN_BLOCK_SIZE(x) (((x) + BLOCK_ALIGN) & ~BLOCK_ALIGN) + /* use function pointers to avoid warnings for invalid parameter tests */ static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); @@ -1729,6 +1732,125 @@ static void test_LocalAlloc(void) } } +static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ) +{ + DWORD padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS; + SIZE_T expect_size, alloc_size, extra_size, tail_size = 0; + unsigned char *ptr0, *ptr1, *ptr2; + char tail_buf[64]; + BOOL ret; + + if (global_flags & (FLG_HEAP_DISABLE_COALESCING|FLG_HEAP_PAGE_ALLOCS|FLG_POOL_ENABLE_TAGGING| + FLG_HEAP_ENABLE_TAGGING|FLG_HEAP_ENABLE_TAG_BY_DLL)) + { + skip( "skipping not yet implemented block layout tests\n" ); + return; + } + + if (!global_flags) extra_size = 8; + else extra_size = 2 * sizeof(void *); + if (heap_flags & HEAP_TAIL_CHECKING_ENABLED) extra_size += 2 * sizeof(void *); + if (heap_flags & padd_flags) extra_size += 2 * sizeof(void *); + + if ((heap_flags & HEAP_TAIL_CHECKING_ENABLED)) tail_size = 2 * sizeof(void *); + memset( tail_buf, 0xab, sizeof(tail_buf) ); + + for (alloc_size = 0x20000 * sizeof(void *) - 0x3000; alloc_size > 0; alloc_size >>= 1) + { + winetest_push_context( "size %#Ix", alloc_size ); + + ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr1 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr1, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr2 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); + + ok( !((UINT_PTR)ptr0 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + ok( !((UINT_PTR)ptr1 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + ok( !((UINT_PTR)ptr2 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + + expect_size = max( alloc_size, 2 * sizeof(void *) ); + expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); + todo_wine_if( heap_flags & (HEAP_VALIDATE_PARAMS|HEAP_VALIDATE_ALL) || + min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) != expect_size ) + ok( min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) == expect_size, "got diff %#I64x\n", + min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) ); + + ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + ok( !memcmp( ptr2 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + + ret = HeapFree( heap, 0, ptr2 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr1 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr0 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + } + + + /* between the two thesholds, tail may still be set but block position is inconsistent */ + + alloc_size = 0x20000 * sizeof(void *) - 0x2000; + winetest_push_context( "size %#Ix", alloc_size ); + + ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); + ok( !((UINT_PTR)ptr0 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + + ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + + ret = HeapFree( heap, 0, ptr0 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + + + for (alloc_size = 0x20000 * sizeof(void *) - 0x1000; alloc_size < 0x800000; alloc_size <<= 1) + { + winetest_push_context( "size %#Ix", alloc_size ); + + ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr1 = pHeapAlloc( heap, 0, alloc_size ); + ok( !!ptr1, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr2 = pHeapAlloc( heap, 0, alloc_size ); + ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); + + todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + ok( !((UINT_PTR)ptr0 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + ok( !((UINT_PTR)ptr1 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + ok( !((UINT_PTR)ptr2 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + + expect_size = max( alloc_size, 2 * sizeof(void *) ); + expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); + todo_wine_if( alloc_size == 0x7efe9 ) + ok( min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) > expect_size, "got diff %#I64x\n", + min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) ); + + todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) + ok( !ptr0[alloc_size], "got block tail\n" ); + todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) + ok( !ptr1[alloc_size], "got block tail\n" ); + todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) + ok( !ptr2[alloc_size], "got block tail\n" ); + + ret = HeapFree( heap, 0, ptr2 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr1 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr0 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + } +} + static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; @@ -2043,6 +2165,7 @@ static void test_child_heap( const char *arg ) heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); ok( heap != GetProcessHeap(), "got unexpected heap\n" ); test_heap_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); + test_block_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); -- 2.35.1

1 2

[PATCH v2 3/3] webservices: Properly handle max session dictionary size channel property.
by Hans Leidekker 20 Apr '22

20 Apr '22

From: Connor McAdams <cmcadams(a)codeweavers.com> v2: Use a shorter property name. Treat WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE as a read-only property, and only allow it to be set upon channel creation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 21 ++++++++++++++++++++- dlls/webservices/tests/channel.c | 11 ++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index cfb6566921d..4941844afe5 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -40,7 +40,7 @@ static const struct prop_desc channel_props[] = { sizeof(WS_ENCODING), TRUE }, /* WS_CHANNEL_PROPERTY_ENCODING */ { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ + { sizeof(ULONG), TRUE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ { sizeof(WS_CALLBACK_MODEL), FALSE }, /* WS_CHANNEL_PROPERTY_ASYNC_CALLBACK_MODEL */ { sizeof(WS_IP_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_IP_VERSION */ @@ -236,6 +236,7 @@ struct channel char *send_buf; ULONG send_buflen; ULONG send_size; + ULONG dict_size; ULONG prop_count; struct prop prop[ARRAY_SIZE( channel_props )]; }; @@ -483,6 +484,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, case WS_TCP_CHANNEL_BINDING: channel->u.tcp.socket = -1; channel->encoding = WS_ENCODING_XML_BINARY_SESSION_1; + channel->dict_size = 2048; break; case WS_UDP_CHANNEL_BINDING: @@ -534,6 +536,16 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, break; } + case WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE: + if (channel->binding != WS_TCP_CHANNEL_BINDING || !prop->value || prop->valueSize != sizeof(channel->dict_size)) + { + free_channel( channel ); + return E_INVALIDARG; + } + + channel->dict_size = *(ULONG *)prop->value; + break; + default: if ((hr = prop_set( channel->prop, channel->prop_count, prop->id, prop->value, prop->valueSize )) != S_OK) { @@ -712,6 +724,13 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID else *(WS_CHANNEL_STATE *)buf = channel->state; break; + case WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE: + if (channel->binding != WS_TCP_CHANNEL_BINDING || !buf || size != sizeof(channel->dict_size)) + hr = E_INVALIDARG; + else + *(ULONG *)buf = channel->dict_size; + break; + default: hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index f70eafaecc8..d5d35904c1c 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -66,6 +66,10 @@ static void test_WsCreateChannel(void) ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + size = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE, &size, sizeof(size), NULL ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); + /* read-only property */ state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); @@ -112,10 +116,15 @@ static void test_WsCreateChannel(void) ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + /* Read-only, only settable on channel creation. */ + size = 4096; + hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE, &size, sizeof(size), NULL ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); + size = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE, &size, sizeof(size), NULL ); ok( hr == S_OK, "got %#lx\n", hr ); - todo_wine ok( size == 2048, "got %lu\n", size ); + ok( size == 2048, "got %lu\n", size ); WsFreeChannel( channel ); } -- 2.30.2

1 0

[PATCH v2 2/3] webservices: Check for channel state in WsReceiveMessage.
by Hans Leidekker 20 Apr '22

20 Apr '22

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 5 +++++ dlls/webservices/tests/channel.c | 28 +++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 1148744346c..cfb6566921d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2415,6 +2415,11 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } if (!ctx) async_init( &async, &ctx_local ); hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index e3cadc7d344..f70eafaecc8 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -626,6 +626,7 @@ static void server_duplex_session( WS_CHANNEL *channel ) static void client_duplex_session( const struct listener_info *info ) { WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + const WS_MESSAGE_DESCRIPTION *descs[1]; WS_ELEMENT_DESCRIPTION desc_body; WS_MESSAGE_DESCRIPTION desc; WS_ENDPOINT_ADDRESS addr; @@ -645,6 +646,26 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsShutdownSessionChannel( channel, NULL, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + desc_body.elementLocalName = &localname; + desc_body.elementNs = &ns; + desc_body.type = WS_INT32_TYPE; + desc_body.typeDescription = NULL; + desc.action = &action; + desc.bodyElementDescription = &desc_body; + descs[0] = &desc; + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsReceiveMessage( channel, msg, descs, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr); + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + + WsFreeMessage( msg ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; @@ -654,13 +675,6 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); - desc_body.elementLocalName = &localname; - desc_body.elementNs = &ns; - desc_body.type = WS_INT32_TYPE; - desc_body.typeDescription = NULL; - desc.action = &action; - desc.bodyElementDescription = &desc_body; - hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); -- 2.30.2

1 0

[PATCH v2 1/3] webservices: Don't advance binary encoding reader if record type doesn't match.
by Hans Leidekker 20 Apr '22

20 Apr '22

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 18 ++++++++++++------ dlls/webservices/tests/reader.c | 15 ++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7da0c8335ea..b22bcbd51b1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1486,8 +1486,9 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE GUID guid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -1771,9 +1772,10 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret unsigned char type = 0; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; if (!(attr = calloc( 1, sizeof(*attr) ))) return E_OUTOFMEMORY; + read_skip( reader, 1 ); if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) { @@ -2068,8 +2070,9 @@ static HRESULT read_element_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_element_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2480,8 +2483,9 @@ static HRESULT read_text_bin( struct reader *reader ) GUID uuid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -2835,8 +2839,9 @@ static HRESULT read_endelement_bin( struct reader *reader ) if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) { - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2917,8 +2922,9 @@ static HRESULT read_comment_bin( struct reader *reader ) ULONG len; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if ((hr = read_int31( reader, &len )) != S_OK) return hr; if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1a2cd1fe420..f62697b9662 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5764,15 +5764,12 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); - todo_wine ok( hr == S_OK, "got %#lx\n", hr ); - if (SUCCEEDED(hr)) - { - ok( test_struct->a == 1, "got %d\n", test_struct->a ); - ok( !!test_struct->s, "s is not set\n" ); - ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); - ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); - ok( test_struct->b == 1, "got %d\n", test_struct->b ); - } + ok( hr == S_OK, "got %#lx\n", hr ); + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); WsFreeHeap( heap ); WsFreeReader( reader ); -- 2.30.2

1 0

[PATCH 1/5] d2d1/tests: Test output bounds for D2D1Grayscale.
by Ziqing Hui 20 Apr '22

20 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 47 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ca80a8e946b..fd4b806278a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10413,11 +10413,21 @@ static void test_effect_grayscale(BOOL d3d11) ID2D1Factory3 *factory; ID2D1Bitmap1 *bitmap; ID2D1Effect *effect; + D2D1_RECT_F bounds; ID2D1Image *output; unsigned int i; HRESULT hr; const DWORD test_pixels[] = {0xffffffff, 0x12345678, 0x89abcdef, 0x77777777, 0xdeadbeef}; + const D2D_SIZE_U test_size[] = + { + {1, 1}, + {2, 4}, + {100, 100}, + {123, 456}, + {2000, 1000}, + {8888, 9999}, + }; if (!init_test_context(&ctx, d3d11)) return; @@ -10435,18 +10445,43 @@ static void test_effect_grayscale(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Grayscale, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + + /* Test output bounds */ + for (i = 0; i < ARRAY_SIZE(test_size); ++i) + { + input_size = test_size[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_GetImageLocalBounds(context, output, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, input_size.width, input_size.height, 0), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, + 0.0f, 0.0f, (float)input_size.width, (float)input_size.height); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + /* Test output pixel */ for (i = 0; i < ARRAY_SIZE(test_pixels); ++i) { DWORD pixel = test_pixels[i]; winetest_push_context("Test %u", i); set_size_u(&input_size, 1, 1); - bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; - bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; - bitmap_desc.dpiX = 96.0f; - bitmap_desc.dpiY = 96.0f; - bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; - bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmap(context, input_size, &pixel, sizeof(pixel), &bitmap_desc, &bitmap); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); -- 2.25.1

2 5

[PATCH 0/4] Some more console support
by Eric Pouech 20 Apr '22

20 Apr '22

This serie first implements an evolution to programs/wineconsole in order to be able to run a given (CUI) program with a clear status on its console. It allows to pickup between: a newly created (graphical) console, a newly created window-less console (a real console object, but not displayed at all), or detached (no console at all). As a reminder, Wine also provides two other kinds of console: - running a CUI program, from a unix env, without redirecting all the 3 std streams (ie at least one of the three needs to be mapped to the unix console). This uses a bridge with the current Unix tty. (nick name: console-shell) - running a CUI program, from a unix env, with the 3 std streams not being tied to a console. (nick name: console-shell-no-window) Wineconsole doesn't provide those two consoles as they are already available directly from command line. Testing some of the Wine programs revealed some bugs in Wine programs/. Quite a few of them, when outputing, try first to write in Unicode to the console, and fall back (in case output stream has been redirected) to WriteFile, after converting the Unicode string with GetConsoleOutputCP(). This will lead to wrong results when: - program isn't attached to any console - program is attached a console-shell-no-window. Some others programs do the same, but forcing CP_ACP instead. I think it's time to evolve a bit... For the two use cases, I propose to always convert output to UTF8 in case of redirection (done with on example of each). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (4): programs/wineconsole: select console type and/or std handles for child process dlls/kernelbase: fix CreateProcess with CREATE_NO_WINDOW when no std handles are inherited programs/chcp.com: write redirected output in UTF8 programs/attrib: write redirected output in UTF8 dlls/kernelbase/process.c | 2 +- programs/attrib/attrib.c | 9 +- programs/chcp.com/main.c | 9 +- programs/wineconsole/wineconsole.c | 192 ++++++++++++++++++++---- programs/wineconsole/wineconsole.man.in | 40 ++++- programs/wineconsole/wineconsole.rc | 12 ++ programs/wineconsole/wineconsole_res.h | 2 + 7 files changed, 222 insertions(+), 44 deletions(-)

3 8

[PATCH v5] winex11: Prevent the call sequence change between xim preedit callback and event handlers.
by Byeongsik Jeon 20 Apr '22

20 Apr '22

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v1: first implemetation. v2: rework. update merge_events(). v3: delete the incorrect description. v4: MERGE_FLUSH enumeration change. v5: update merge_events() more. fix GenericEvent processing. The current process_events() pseudecode for non-mergeable events may be simplified as follows: process_events() { prev_event.type = 0; while (XCheckIfEvent( &event )) { if (XFilterEvent( &event )) continue; if (prev_event.type) call_event_handler( &prev_event ); prev_event = event; } if (prev_event.type) call_event_handler( &prev_event ); } - "xim preedit callbacks" are called from within the XFilterEvent(). - Depending on the XCheckIfEvent(), XFilterEvent() return value, the call_event_handler() may be called after one or more loop steps. So, call_event_handler() may be delayed after the next "xim preedit callback" call. dlls/winex11.drv/event.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 900f24c4002..bee37f3368b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -263,6 +263,7 @@ enum event_merge_action { MERGE_DISCARD, /* discard the old event */ MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle the old and new event */ MERGE_KEEP, /* keep the old event for future merging */ MERGE_IGNORE /* ignore the new event, keep the old one */ }; @@ -316,6 +317,22 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + if (x11drv_thread_data()->warp_serial) break; + /* fall through */ +#endif + case ConfigureNotify: + case MotionNotify: + return MERGE_DISCARD; + } + return MERGE_KEEP; + case ConfigureNotify: switch (next->type) { @@ -325,7 +342,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,7 +357,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: if (next->xcookie.extension != xinput2_opcode) break; @@ -350,8 +367,6 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; switch (next->type) { case GenericEvent: @@ -363,7 +378,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -409,7 +424,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X XEvent event, prev_event; int count = 0; BOOL queued = FALSE; - enum event_merge_action action = MERGE_DISCARD; + enum event_merge_action action; prev_event.type = 0; while (XCheckIfEvent( display, &event, filter, (char *)arg )) @@ -446,7 +461,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X continue; /* filtered, ignore it */ } get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { case MERGE_HANDLE: /* handle prev, keep new */ @@ -456,6 +471,11 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X free_event_data( &prev_event ); prev_event = event; break; + case MERGE_FLUSH: /* handle prev and new */ + queued |= call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ -- 2.36.0

1 0

[PATCH 5/5] windows.networking: Add stub dll.
by Zhiyi Zhang 20 Apr '22

20 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 1 + dlls/windows.networking/Makefile.in | 1 + dlls/windows.networking/windows.networking.spec | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 dlls/windows.networking/Makefile.in create mode 100644 dlls/windows.networking/windows.networking.spec diff --git a/configure.ac b/configure.ac index 75292210bc4..74c80fd7fa8 100644 --- a/configure.ac +++ b/configure.ac @@ -3098,6 +3098,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.networking) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.networking/Makefile.in b/dlls/windows.networking/Makefile.in new file mode 100644 index 00000000000..8773ecdad06 --- /dev/null +++ b/dlls/windows.networking/Makefile.in @@ -0,0 +1 @@ +MODULE = windows.networking.dll diff --git a/dlls/windows.networking/windows.networking.spec b/dlls/windows.networking/windows.networking.spec new file mode 100644 index 00000000000..1a0cf095fde --- /dev/null +++ b/dlls/windows.networking/windows.networking.spec @@ -0,0 +1,8 @@ +1 stub @ +2 stub DllCanUnloadNow +3 stub DllGetActivationFactory +4 stub DllGetClassObject +5 stub DllMain +6 stub DllRegisterServer +7 stub DllUnregisterServer +8 stub SetSocketMediaStreamingMode -- 2.32.0

1 0

[PATCH 4/5] apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0.
by Zhiyi Zhang 20 Apr '22

20 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..b13d00f8844 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -147,6 +147,7 @@ apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-errorprivate-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-registration-l1-1-0 = combase.dll +apiset api-ms-win-core-winrt-robuffer-l1-1-0 = wintypes.dll apiset api-ms-win-core-winrt-roparameterizediid-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-string-l1-1-1 = combase.dll apiset api-ms-win-core-wow64-l1-1-1 = kernelbase.dll -- 2.32.0

1 0

[PATCH 3/5] wintypes: Implement IApiInformationStatics stubs.
by Zhiyi Zhang 20 Apr '22

20 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wintypes/main.c | 172 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index d85a395d45c..ab48ce667b9 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -28,6 +28,9 @@ #include "activation.h" +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + WINE_DEFAULT_DEBUG_CHANNEL(wintypes); static const char *debugstr_hstring(HSTRING hstr) @@ -43,6 +46,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct wintypes { IActivationFactory IActivationFactory_iface; + IApiInformationStatics IApiInformationStatics_iface; LONG ref; }; @@ -51,9 +55,16 @@ static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory * return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); } +static inline struct wintypes *impl_from_IApiInformationStatics(IApiInformationStatics *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IApiInformationStatics_iface); +} + static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) { + struct wintypes *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) @@ -66,6 +77,13 @@ static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *ifa return S_OK; } + if (IsEqualGUID(iid, &IID_IApiInformationStatics)) + { + IUnknown_AddRef(iface); + *out = &impl->IApiInformationStatics_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -128,9 +146,163 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = wintypes_ActivateInstance, }; +static HRESULT STDMETHODCALLTYPE api_information_statics_QueryInterface( + IApiInformationStatics *iface, REFIID iid, void **out) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_QueryInterface(&impl->IActivationFactory_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_AddRef( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_AddRef(&impl->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_Release( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_Release(&impl->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetIids( + IApiInformationStatics *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetRuntimeClassName( + IApiInformationStatics *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetTrustLevel( + IApiInformationStatics *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsTypePresent( + IApiInformationStatics *iface, HSTRING type_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, value %p stub!\n", iface, debugstr_hstring(type_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(method_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresentWithArity( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, + UINT32 parameter_count, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, parameter_count %u, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(method_name), parameter_count, value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEventPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING event_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, event_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(event_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsReadOnlyPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, + BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsWriteablePropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent( + IApiInformationStatics *iface, HSTRING enum_type_name, HSTRING value_name, BOOLEAN *value) +{ + FIXME("iface %p, enum_type_name %s, value_name %s, value %p stub!\n", iface, + debugstr_hstring(enum_type_name), debugstr_hstring(value_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, value); + + if (value) + { + *value = FALSE; + return S_OK; + } + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajorAndMinor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, + UINT16 minor_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, minor_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, minor_version, value); + return E_NOTIMPL; +} + +static const struct IApiInformationStaticsVtbl api_information_statics_vtbl = +{ + api_information_statics_QueryInterface, + api_information_statics_AddRef, + api_information_statics_Release, + /* IInspectable methods */ + api_information_statics_GetIids, + api_information_statics_GetRuntimeClassName, + api_information_statics_GetTrustLevel, + /* IApiInformationStatics methods */ + api_information_statics_IsTypePresent, + api_information_statics_IsMethodPresent, + api_information_statics_IsMethodPresentWithArity, + api_information_statics_IsEventPresent, + api_information_statics_IsPropertyPresent, + api_information_statics_IsReadOnlyPropertyPresent, + api_information_statics_IsWriteablePropertyPresent, + api_information_statics_IsEnumNamedValuePresent, + api_information_statics_IsApiContractPresentByMajor, + api_information_statics_IsApiContractPresentByMajorAndMinor +}; + static struct wintypes wintypes = { {&activation_factory_vtbl}, + {&api_information_statics_vtbl}, 1 }; -- 2.32.0

1 0

[PATCH 2/5] wintypes: Add stub dll.
by Zhiyi Zhang 20 Apr '22

20 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 1 + dlls/wintypes/Makefile.in | 7 ++ dlls/wintypes/classes.idl | 23 ++++++ dlls/wintypes/main.c | 154 ++++++++++++++++++++++++++++++++++++ dlls/wintypes/wintypes.spec | 11 +++ 5 files changed, 196 insertions(+) create mode 100644 dlls/wintypes/Makefile.in create mode 100644 dlls/wintypes/classes.idl create mode 100644 dlls/wintypes/main.c create mode 100644 dlls/wintypes/wintypes.spec diff --git a/configure.ac b/configure.ac index 6cbc0a61be1..75292210bc4 100644 --- a/configure.ac +++ b/configure.ac @@ -3140,6 +3140,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintab32) WINE_CONFIG_MAKEFILE(dlls/wintab32/tests) WINE_CONFIG_MAKEFILE(dlls/wintrust) WINE_CONFIG_MAKEFILE(dlls/wintrust/tests) +WINE_CONFIG_MAKEFILE(dlls/wintypes) WINE_CONFIG_MAKEFILE(dlls/winusb) WINE_CONFIG_MAKEFILE(dlls/wlanapi) WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) diff --git a/dlls/wintypes/Makefile.in b/dlls/wintypes/Makefile.in new file mode 100644 index 00000000000..aaa954322f7 --- /dev/null +++ b/dlls/wintypes/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wintypes.dll +IMPORTS = combase + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/wintypes/classes.idl b/dlls/wintypes/classes.idl new file mode 100644 index 00000000000..d8ab31e69be --- /dev/null +++ b/dlls/wintypes/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for wintypes.dll + * + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +#include "windows.foundation.metadata.idl" diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c new file mode 100644 index 00000000000..d85a395d45c --- /dev/null +++ b/dlls/wintypes/main.c @@ -0,0 +1,154 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "activation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintypes); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) + return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct wintypes +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, + void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IInspectable) + || IsEqualGUID(iid, &IID_IAgileObject) + || IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE wintypes_AddRef(IActivationFactory *iface) +{ + struct wintypes *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE wintypes_Release(IActivationFactory *iface) +{ + struct wintypes *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetIids(IActivationFactory *iface, ULONG *iid_count, + IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetRuntimeClassName(IActivationFactory *iface, + HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetTrustLevel(IActivationFactory *iface, + TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_ActivateInstance(IActivationFactory *iface, + IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + wintypes_QueryInterface, + wintypes_AddRef, + wintypes_Release, + /* IInspectable methods */ + wintypes_GetIids, + wintypes_GetRuntimeClassName, + wintypes_GetTrustLevel, + /* IActivationFactory methods */ + wintypes_ActivateInstance, +}; + +static struct wintypes wintypes = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &wintypes.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/wintypes/wintypes.spec b/dlls/wintypes/wintypes.spec new file mode 100644 index 00000000000..605934c713b --- /dev/null +++ b/dlls/wintypes/wintypes.spec @@ -0,0 +1,11 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) +4 stub RoCreateNonAgilePropertySet +5 stub RoCreatePropertySetSerializer +6 stub RoGetBufferMarshaler +7 stub RoGetMetaDataFile +8 stub RoIsApiContractMajorVersionPresent +9 stub RoIsApiContractPresent +10 stub RoParseTypeName +11 stub RoResolveNamespace -- 2.32.0

1 0

[PATCH 3/5] wineoss: Add a temporary midi_out_fm_patch syscall.
by Huw Davies 20 Apr '22

20 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- It may be necessary to run "make depend" to pick up the change to midipatch.c dlls/wineoss.drv/midi.c | 34 +++++----------------------- dlls/wineoss.drv/midipatch.c | 4 ++++ dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++++ 5 files changed, 63 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3fcebf2da67..6669f973845 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -723,40 +723,18 @@ typedef struct sFMextra { */ } sFMextra; -extern const unsigned char midiFMInstrumentPatches[16 * 128]; -extern const unsigned char midiFMDrumsPatches [16 * 128]; - /************************************************************************** * modFMLoad [internal] */ -static int modFMLoad(int dev, int fd) +static int modFMLoad(WORD dev, int fd) { - int i; - struct sbi_instrument sbi; - - sbi.device = dev; - sbi.key = FM_PATCH; - - memset(sbi.operators + 16, 0, 16); - for (i = 0; i < 128; i++) { - sbi.channel = i; - memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); + struct midi_out_fm_load_params params; - if (write(fd, &sbi, sizeof(sbi)) == -1) { - WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - return -1; - } - } - for (i = 0; i < 128; i++) { - sbi.channel = 128 + i; - memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); + params.dev_id = dev; + params.fd = fd; + OSS_CALL(midi_out_fm_load, &params); - if (write(fd, &sbi, sizeof(sbi)) == -1) { - WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - return -1; - } - } - return 0; + return params.ret; } /************************************************************************** diff --git a/dlls/wineoss.drv/midipatch.c b/dlls/wineoss.drv/midipatch.c index 41d8e07b99a..4ff48623260 100644 --- a/dlls/wineoss.drv/midipatch.c +++ b/dlls/wineoss.drv/midipatch.c @@ -24,6 +24,10 @@ * Eric POUECH : MIDI FM patches for GM instruments */ +#if 0 +#pragma makedep unix +#endif + #define NOT_DEFINED 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, const unsigned char midiFMInstrumentPatches[128 * 16] = { diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ac8847920b0..2fc6c81e560 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1408,4 +1408,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_init, midi_seq_open, + midi_out_fm_load, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index a0a0b1caad2..ba5dbca7e4f 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -345,3 +345,46 @@ wrapup: return STATUS_SUCCESS; } + +extern const unsigned char midiFMInstrumentPatches[16 * 128]; +extern const unsigned char midiFMDrumsPatches[16 * 128]; + +NTSTATUS midi_out_fm_load(void *args) +{ + struct midi_out_fm_load_params *params = args; + WORD dev_id = params->dev_id; + int fd = params->fd; + struct sbi_instrument sbi; + int i; + + sbi.device = dev_id; + sbi.key = FM_PATCH; + + memset(sbi.operators + 16, 0, 16); + for (i = 0; i < 128; i++) + { + sbi.channel = i; + memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); + + if (write(fd, &sbi, sizeof(sbi)) == -1) + { + WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); + params->ret = -1; + return STATUS_SUCCESS; + } + } + for (i = 0; i < 128; i++) + { + sbi.channel = 128 + i; + memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); + + if (write(fd, &sbi, sizeof(sbi)) == -1) + { + WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); + params->ret = -1; + return STATUS_SUCCESS; + } + } + params->ret = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 68d41e41f74..4dab53f5148 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -252,6 +252,13 @@ struct midi_seq_open_params int fd; }; +struct midi_out_fm_load_params +{ + WORD dev_id; + int fd; + int ret; +}; + enum oss_funcs { oss_test_connect, @@ -280,10 +287,12 @@ enum oss_funcs oss_midi_init, oss_midi_seq_open, /* temporary */ + oss_midi_out_fm_load, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 2

[PATCH 5/5] wineoss: Move MODM_OPEN and MODM_CLOSE to the unixlib.
by Huw Davies 20 Apr '22

20 Apr '22

They are both moved together because of the memory allocated for "lpExtra". Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 180 ++++++---------------------------- dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 191 +++++++++++++++++++++++++++++++++++-- dlls/wineoss.drv/unixlib.h | 28 +++++- 4 files changed, 235 insertions(+), 166 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 040af7e2e0c..9f351b9b630 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -149,6 +149,15 @@ static LRESULT OSS_MidiExit(void) return 0; } +static void notify_client(struct notify_context *notify) +{ + TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", + notify->dev_id, notify->msg, notify->param_1, notify->param_2); + + DriverCallback(notify->callback, notify->flags, notify->device, notify->msg, + notify->instance, notify->param_1, notify->param_2); +} + /************************************************************************** * MIDI_NotifyClient [internal] */ @@ -164,8 +173,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_OPEN: - case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: if (wDevID > MODM_NumDevs) return; @@ -723,20 +730,6 @@ typedef struct sFMextra { */ } sFMextra; -/************************************************************************** - * modFMLoad [internal] - */ -static int modFMLoad(WORD dev, int fd) -{ - struct midi_out_fm_load_params params; - - params.dev_id = dev; - params.fd = fd; - OSS_CALL(midi_out_fm_load, &params); - - return params.ret; -} - #define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) /************************************************************************** @@ -754,132 +747,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modOpen [internal] - */ -static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int fd = -1; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - if (wDevID >= MODM_NumDevs) { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } - if (MidiOutDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if (!MidiOutDev[wDevID].bEnabled) { - WARN("device disabled !\n"); - return MIDIERR_NODEVICE; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - WARN("bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - MidiOutDev[wDevID].lpExtra = 0; - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - { - void* extra; - - extra = HeapAlloc(GetProcessHeap(), 0, - offsetof(struct sFMextra, voice[MidiOutDev[wDevID].caps.wVoices])); - - if (extra == 0) { - WARN("can't alloc extra data !\n"); - return MMSYSERR_NOMEM; - } - MidiOutDev[wDevID].lpExtra = extra; - fd = midiOpenSeq(); - if (fd < 0) { - MidiOutDev[wDevID].lpExtra = 0; - HeapFree(GetProcessHeap(), 0, extra); - return MMSYSERR_ERROR; - } - if (modFMLoad(wDevID, fd) < 0) { - midiCloseSeq(fd); - MidiOutDev[wDevID].lpExtra = 0; - HeapFree(GetProcessHeap(), 0, extra); - return MMSYSERR_ERROR; - } - OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); - } - break; - case MOD_MIDIPORT: - case MOD_SYNTH: - fd = midiOpenSeq(); - if (fd < 0) { - return MMSYSERR_ALLOCATED; - } - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].midiDesc = *lpDesc; - MidiOutDev[wDevID].fd = fd; - - MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); - return MMSYSERR_NOERROR; -} - - -/************************************************************************** - * modClose [internal] - */ -static DWORD modClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (MidiOutDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - /* FIXME: should test that no pending buffer is still in the queue for - * playing */ - - if (MidiOutDev[wDevID].fd == -1) { - WARN("can't close !\n"); - return MMSYSERR_ERROR; - } - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - case MOD_SYNTH: - case MOD_MIDIPORT: - midiCloseSeq(MidiOutDev[wDevID].fd); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); - MidiOutDev[wDevID].lpExtra = 0; - MidiOutDev[wDevID].fd = -1; - - MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); - MidiOutDev[wDevID].midiDesc.hMidi = 0; - return ret; -} - /************************************************************************** * modData [internal] */ @@ -1378,6 +1245,10 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_out_message_params params; + struct notify_context notify; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -1386,14 +1257,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; - case MODM_OPEN: - return modOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MODM_CLOSE: - return modClose(wDevID); case MODM_DATA: return modData(wDevID, dwParam1); case MODM_LONGDATA: @@ -1412,10 +1275,21 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); - default: - TRACE("Unsupported message\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + params.notify = &notify; + + OSS_CALL(midi_out_message, &params); + + if (!err && notify.send_notify) notify_client(&notify); + + return err; } /************************************************************************** diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 902685c11b8..1bd5ddb5762 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,8 +1406,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + midi_out_message, midi_seq_open, - midi_out_fm_load, midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index dcafbe609d9..613b070fde5 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -424,11 +424,8 @@ void seqbuf_dump(void) extern const unsigned char midiFMInstrumentPatches[16 * 128]; extern const unsigned char midiFMDrumsPatches[16 * 128]; -NTSTATUS midi_out_fm_load(void *args) +static int midi_out_fm_load(WORD dev_id, int fd) { - struct midi_out_fm_load_params *params = args; - WORD dev_id = params->dev_id; - int fd = params->fd; struct sbi_instrument sbi; int i; @@ -444,8 +441,7 @@ NTSTATUS midi_out_fm_load(void *args) if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - params->ret = -1; - return STATUS_SUCCESS; + return -1; } } for (i = 0; i < 128; i++) @@ -456,12 +452,10 @@ NTSTATUS midi_out_fm_load(void *args) if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - params->ret = -1; - return STATUS_SUCCESS; + return -1; } } - params->ret = 0; - return STATUS_SUCCESS; + return 0; } NTSTATUS midi_out_fm_reset(void *args) @@ -501,3 +495,180 @@ NTSTATUS midi_out_fm_reset(void *args) return STATUS_SUCCESS; } + +static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = dest->midiDesc.dwCallback; + notify->flags = dest->wFlags; + notify->device = dest->midiDesc.hMidi; + notify->instance = dest->midiDesc.dwInstance; +} + +static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify) +{ + struct midi_dest *dest; + int fd = -1; + + TRACE("(%04X, %p, %08X);\n", dev_id, midi_desc, flags); + if (midi_desc == NULL) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + if (dest->midiDesc.hMidi != 0) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (!dest->bEnabled) + { + WARN("device disabled !\n"); + return MIDIERR_NODEVICE; + } + if ((flags & ~CALLBACK_TYPEMASK) != 0) + { + WARN("bad flags\n"); + return MMSYSERR_INVALFLAG; + } + + dest->lpExtra = NULL; + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + { + void *extra; + + extra = malloc(offsetof(struct sFMextra, voice[dest->caps.wVoices])); + if (!extra) + { + WARN("can't alloc extra data !\n"); + return MMSYSERR_NOMEM; + } + dest->lpExtra = extra; + fd = seq_open(); + if (fd < 0) + { + dest->lpExtra = NULL; + free(extra); + return MMSYSERR_ERROR; + } + if (midi_out_fm_load(dev_id, fd) < 0) + { + seq_close(fd); + dest->lpExtra = NULL; + free(extra); + return MMSYSERR_ERROR; + } + midi_out_fm_reset((void *)(UINT_PTR)dev_id); + break; + } + case MOD_MIDIPORT: + case MOD_SYNTH: + fd = seq_open(); + if (fd < 0) + return MMSYSERR_ALLOCATED; + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + dest->lpQueueHdr= NULL; + dest->midiDesc = *midi_desc; + dest->fd = fd; + + set_out_notify(notify, dest, dev_id, MOM_OPEN, 0, 0); + TRACE("Successful !\n"); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_dest *dest; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + + if (dest->midiDesc.hMidi == 0) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + /* FIXME: should test that no pending buffer is still in the queue for + * playing */ + + if (dest->fd == -1) + { + WARN("can't close !\n"); + return MMSYSERR_ERROR; + } + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + case MOD_SYNTH: + case MOD_MIDIPORT: + seq_close(dest->fd); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + free(dest->lpExtra); + dest->lpExtra = NULL; + dest->fd = -1; + + set_out_notify(notify, dest, dev_id, MOM_CLOSE, 0, 0); + dest->midiDesc.hMidi = 0; + return MMSYSERR_NOERROR; +} + + +NTSTATUS midi_out_message(void *args) +{ + struct midi_out_message_params *params = args; + + params->notify->send_notify = FALSE; + + switch (params->msg) + { + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = MMSYSERR_NOERROR; + break; + case MODM_OPEN: + *params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MODM_CLOSE: + *params->err = midi_out_close(params->dev_id, params->notify); + break; + default: + TRACE("Unsupported message\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + } + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ecca092d540..75506d445bc 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -246,6 +246,30 @@ struct midi_init_params struct midi_src *srcs; }; +struct notify_context +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT_PTR param_1; + UINT_PTR param_2; + UINT_PTR callback; + UINT flags; + HANDLE device; + UINT_PTR instance; +}; + +struct midi_out_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -285,15 +309,15 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + oss_midi_out_message, oss_midi_seq_open, /* temporary */ - oss_midi_out_fm_load, oss_midi_out_fm_reset, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 4/5] wineoss: Add a temporary midi_out_fm_reset syscall.
by Huw Davies 20 Apr '22

20 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 40 +------------ dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 113 +++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 2 + 4 files changed, 118 insertions(+), 38 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 6669f973845..040af7e2e0c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -737,42 +737,6 @@ static int modFMLoad(WORD dev, int fd) return params.ret; } -/************************************************************************** - * modFMReset [internal] - */ -static void modFMReset(WORD wDevID) -{ - sFMextra* extra = MidiOutDev[wDevID].lpExtra; - sVoice* voice = extra->voice; - sChannel* channel = extra->channel; - int i; - - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status != sVS_UNUSED) { - SEQ_STOP_NOTE(wDevID, i, voice[i].note, 64); - } - SEQ_KEY_PRESSURE(wDevID, i, 127, 0); - SEQ_CONTROL(wDevID, i, SEQ_VOLMODE, VOL_METHOD_LINEAR); - voice[i].note = 0; - voice[i].channel = -1; - voice[i].cntMark = 0; - voice[i].status = sVS_UNUSED; - } - for (i = 0; i < 16; i++) { - channel[i].program = 0; - channel[i].bender = 8192; - channel[i].benderRange = 2; - channel[i].bank = 0; - channel[i].volume = 127; - channel[i].balance = 64; - channel[i].expression = 0; - channel[i].sustain = 0; - } - extra->counter = 0; - extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ - SEQ_DUMPBUF(); -} - #define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) /************************************************************************** @@ -846,7 +810,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; } - modFMReset(wDevID); + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); } break; case MOD_MIDIPORT: @@ -1120,7 +1084,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) case MIDI_SYSTEM_PREFIX: switch (evt & 0x0F) { case 0x0F: /* Reset */ - modFMReset(wDevID); + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); break; default: WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2fc6c81e560..902685c11b8 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1409,4 +1409,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_seq_open, midi_out_fm_load, + midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index ba5dbca7e4f..dcafbe609d9 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -52,6 +52,47 @@ static unsigned int num_dests, num_srcs, num_synths, seq_refs; static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; +typedef struct sVoice +{ + int note; /* 0 means not used */ + int channel; + unsigned cntMark : 30, + status : 2; +#define sVS_UNUSED 0 +#define sVS_PLAYING 1 +#define sVS_SUSTAINED 2 +} sVoice; + +typedef struct sChannel +{ + int program; + + int bender; + int benderRange; + /* controllers */ + int bank; /* CTL_BANK_SELECT */ + int volume; /* CTL_MAIN_VOLUME */ + int balance; /* CTL_BALANCE */ + int expression; /* CTL_EXPRESSION */ + int sustain; /* CTL_SUSTAIN */ + + unsigned char nrgPmtMSB; /* Non register Parameters */ + unsigned char nrgPmtLSB; + unsigned char regPmtMSB; /* Non register Parameters */ + unsigned char regPmtLSB; +} sChannel; + +typedef struct sFMextra +{ + unsigned counter; + int drumSetMask; + sChannel channel[16]; /* MIDI has only 16 channels */ + sVoice voice[1]; /* dyn allocated according to sound card */ + /* do not append fields below voice[1] since the size of this structure + * depends on the number of available voices on the FM synth... + */ +} sFMextra; + WINE_DEFAULT_DEBUG_CHANNEL(midi); static int oss_to_win_device_type(int type) @@ -346,6 +387,40 @@ wrapup: return STATUS_SUCCESS; } +/* FIXME: this is a bad idea, it's even not static... */ +SEQ_DEFINEBUF(1024); + +/* FIXME: this is not reentrant, not static - because of global variable + * _seqbuf and al. + */ +/************************************************************************** + * seqbuf_dump [internal] + * + * Used by SEQ_DUMPBUF to flush the buffer. + * + */ +void seqbuf_dump(void) +{ + int fd; + + /* The device is already open, but there's no way to pass the + fd to this function. Rather than rely on a global variable + we pretend to open the seq again. */ + fd = seq_open(); + if (_seqbufptr) + { + if (write(fd, _seqbuf, _seqbufptr) == -1) + { + WARN("Can't write data to sequencer %d, errno %d (%s)!\n", + fd, errno, strerror(errno)); + } + /* FIXME: In any case buffer is lost so that if many errors occur the buffer + * will not overrun */ + _seqbufptr = 0; + } + seq_close(fd); +} + extern const unsigned char midiFMInstrumentPatches[16 * 128]; extern const unsigned char midiFMDrumsPatches[16 * 128]; @@ -388,3 +463,41 @@ NTSTATUS midi_out_fm_load(void *args) params->ret = 0; return STATUS_SUCCESS; } + +NTSTATUS midi_out_fm_reset(void *args) +{ + WORD dev_id = (WORD)(UINT_PTR)args; + struct midi_dest *dest = dests + dev_id; + sFMextra *extra = dest->lpExtra; + sVoice *voice = extra->voice; + sChannel *channel = extra->channel; + int i; + + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status != sVS_UNUSED) + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + SEQ_KEY_PRESSURE(dev_id, i, 127, 0); + SEQ_CONTROL(dev_id, i, SEQ_VOLMODE, VOL_METHOD_LINEAR); + voice[i].note = 0; + voice[i].channel = -1; + voice[i].cntMark = 0; + voice[i].status = sVS_UNUSED; + } + for (i = 0; i < 16; i++) + { + channel[i].program = 0; + channel[i].bender = 8192; + channel[i].benderRange = 2; + channel[i].bank = 0; + channel[i].volume = 127; + channel[i].balance = 64; + channel[i].expression = 0; + channel[i].sustain = 0; + } + extra->counter = 0; + extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ + SEQ_DUMPBUF(); + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 4dab53f5148..ecca092d540 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -288,11 +288,13 @@ enum oss_funcs oss_midi_seq_open, /* temporary */ oss_midi_out_fm_load, + oss_midi_out_fm_reset, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 2/5] wineoss: Add a temporary syscall to open and close the seq fd.
by Huw Davies 20 Apr '22

20 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 53 +++++++++----------------------------- dlls/wineoss.drv/oss.c | 2 ++ dlls/wineoss.drv/ossmidi.c | 12 +++++++++ dlls/wineoss.drv/unixlib.h | 9 +++++++ 4 files changed, 35 insertions(+), 41 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 09de9d468c9..3fcebf2da67 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -75,7 +75,6 @@ static int MODM_NumFMSynthDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffers queues */ @@ -199,49 +198,18 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static int midi_warn = 1; /************************************************************************** * midiOpenSeq [internal] */ static int midiOpenSeq(void) { - static int midiSeqFD = -1; - - if (numOpenMidiSeq == 0) { - const char* device; - device=getenv("MIDIDEV"); - if (!device) device="/dev/sequencer"; - midiSeqFD = open(device, O_RDWR, 0); - if (midiSeqFD == -1) { - if (midi_warn) - { - WARN("Can't open MIDI device '%s' ! (%s). If your " - "program needs this (probably not): %s\n", - device, strerror(errno), - errno == ENOENT ? - "create it ! (\"man MAKEDEV\" ?)" : - errno == ENODEV ? - "load MIDI sequencer kernel driver !" : - errno == EACCES ? - "grant access ! (\"man chmod\")" : "" - ); - } - midi_warn = 0; - return -1; - } -#if 0 - if (fcntl(midiSeqFD, F_SETFL, O_NONBLOCK) < 0) { - WARN("can't set sequencer fd to non-blocking, errno %d (%s)\n", errno, strerror(errno)); - close(midiSeqFD); - midiSeqFD = -1; - return -1; - } -#endif - fcntl(midiSeqFD, F_SETFD, 1); /* set close on exec flag */ - ioctl(midiSeqFD, SNDCTL_SEQ_RESET); - } - numOpenMidiSeq++; - return midiSeqFD; + struct midi_seq_open_params params; + + params.close = 0; + params.fd = -1; + OSS_CALL(midi_seq_open, &params); + + return params.fd; } /************************************************************************** @@ -249,8 +217,11 @@ static int midiOpenSeq(void) */ static int midiCloseSeq(int fd) { - if (--numOpenMidiSeq == 0) - close(fd); + struct midi_seq_open_params params; + + params.close = 1; + params.fd = fd; + OSS_CALL(midi_seq_open, &params); return 0; } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 4f3c0bcb2cf..ac8847920b0 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,4 +1406,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + + midi_seq_open, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 75fbf6d7bee..a0a0b1caad2 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -119,6 +119,18 @@ static int seq_close(int fd) return 0; } +NTSTATUS midi_seq_open(void *args) +{ + struct midi_seq_open_params *params = args; + + if (!params->close) + params->fd = seq_open(); + else + seq_close(params->fd); + + return STATUS_SUCCESS; +} + NTSTATUS midi_init(void *args) { struct midi_init_params *params = args; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 8c131037b76..68d41e41f74 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -246,6 +246,12 @@ struct midi_init_params struct midi_src *srcs; }; +struct midi_seq_open_params +{ + int close; + int fd; +}; + enum oss_funcs { oss_test_connect, @@ -272,9 +278,12 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + + oss_midi_seq_open, /* temporary */ }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

1 0

[PATCH 1/5] wineoss: Store the sequencer fd in the driver struct.
by Huw Davies 20 Apr '22

20 Apr '22

This avoids using a global variable. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 78 ++++++++++++++++++++++++-------------- dlls/wineoss.drv/unixlib.h | 2 + 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 626b3d43d83..09de9d468c9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -75,7 +75,6 @@ static int MODM_NumFMSynthDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static int midiSeqFD = -1; static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; @@ -96,7 +95,7 @@ static HANDLE hThread; *======================================================================*/ static int midiOpenSeq(void); -static int midiCloseSeq(void); +static int midiCloseSeq(int); static int MIDI_loadcount; /************************************************************************** @@ -206,6 +205,8 @@ static int midi_warn = 1; */ static int midiOpenSeq(void) { + static int midiSeqFD = -1; + if (numOpenMidiSeq == 0) { const char* device; device=getenv("MIDIDEV"); @@ -240,18 +241,17 @@ static int midiOpenSeq(void) ioctl(midiSeqFD, SNDCTL_SEQ_RESET); } numOpenMidiSeq++; - return 0; + return midiSeqFD; } /************************************************************************** * midiCloseSeq [internal] */ -static int midiCloseSeq(void) +static int midiCloseSeq(int fd) { - if (--numOpenMidiSeq == 0) { - close(midiSeqFD); - midiSeqFD = -1; - } + if (--numOpenMidiSeq == 0) + close(fd); + return 0; } @@ -269,10 +269,16 @@ SEQ_DEFINEBUF(1024); */ void seqbuf_dump(void) { + int fd; + + /* The device is already open, but there's no way to pass the + fd to this function. Rather than rely on a global variable + we pretend to open the seq again. */ + fd = midiOpenSeq(); if (_seqbufptr) { - if (write(midiSeqFD, _seqbuf, _seqbufptr) == -1) { + if (write(fd, _seqbuf, _seqbufptr) == -1) { WARN("Can't write data to sequencer %d, errno %d (%s)!\n", - midiSeqFD, errno, strerror(errno)); + fd, errno, strerror(errno)); } /* FIXME: * in any case buffer is lost so that if many errors occur the buffer @@ -280,6 +286,7 @@ void seqbuf_dump(void) */ _seqbufptr = 0; } + midiCloseSeq(fd); } /************************************************************************** @@ -392,8 +399,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } -static DWORD WINAPI midRecThread(LPVOID arg) +static DWORD WINAPI midRecThread(void *arg) { + int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; int len, idx; DWORD dwTime; @@ -401,7 +409,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) TRACE("Thread startup\n"); - pfd.fd = midiSeqFD; + pfd.fd = fd; pfd.events = POLLIN; while(!end_thread) { @@ -411,7 +419,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) if (poll(&pfd, 1, 250) <= 0) continue; - len = read(midiSeqFD, buffer, sizeof(buffer)); + len = read(fd, buffer, sizeof(buffer)); TRACE("Received %d bytes\n", len); if (len < 0) continue; @@ -470,6 +478,8 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) */ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { + int fd; + TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -501,17 +511,18 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - if (midiOpenSeq() < 0) { + fd = midiOpenSeq(); + if (fd < 0) { return MMSYSERR_ERROR; } if (numStartedMidiIn++ == 0) { end_thread = 0; - hThread = CreateThread(NULL, 0, midRecThread, NULL, 0, NULL); + hThread = CreateThread(NULL, 0, midRecThread, (void *)(INT_PTR)fd, 0, NULL); if (!hThread) { numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); - midiCloseSeq(); + midiCloseSeq(fd); return MMSYSERR_ERROR; } SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); @@ -525,6 +536,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].state = 0; MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].startTime = 0; + MidiInDev[wDevID].fd = fd; MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; @@ -551,7 +563,7 @@ static DWORD midClose(WORD wDevID) return MIDIERR_STILLPLAYING; } - if (midiSeqFD == -1) { + if (MidiInDev[wDevID].fd == -1) { WARN("ooops !\n"); return MMSYSERR_ERROR; } @@ -564,7 +576,8 @@ static DWORD midClose(WORD wDevID) } TRACE("Stopped thread for midi-in\n"); } - midiCloseSeq(); + midiCloseSeq(MidiInDev[wDevID].fd); + MidiInDev[wDevID].fd = -1; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; @@ -745,7 +758,7 @@ extern const unsigned char midiFMDrumsPatches [16 * 128]; /************************************************************************** * modFMLoad [internal] */ -static int modFMLoad(int dev) +static int modFMLoad(int dev, int fd) { int i; struct sbi_instrument sbi; @@ -758,7 +771,7 @@ static int modFMLoad(int dev) sbi.channel = i; memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); - if (write(midiSeqFD, &sbi, sizeof(sbi)) == -1) { + if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); return -1; } @@ -767,7 +780,7 @@ static int modFMLoad(int dev) sbi.channel = 128 + i; memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); - if (write(midiSeqFD, &sbi, sizeof(sbi)) == -1) { + if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); return -1; } @@ -833,6 +846,8 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) */ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { + int fd = -1; + TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); @@ -870,13 +885,14 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_NOMEM; } MidiOutDev[wDevID].lpExtra = extra; - if (midiOpenSeq() < 0) { + fd = midiOpenSeq(); + if (fd < 0) { MidiOutDev[wDevID].lpExtra = 0; HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; } - if (modFMLoad(wDevID) < 0) { - midiCloseSeq(); + if (modFMLoad(wDevID, fd) < 0) { + midiCloseSeq(fd); MidiOutDev[wDevID].lpExtra = 0; HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; @@ -886,7 +902,8 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) break; case MOD_MIDIPORT: case MOD_SYNTH: - if (midiOpenSeq() < 0) { + fd = midiOpenSeq(); + if (fd < 0) { return MMSYSERR_ALLOCATED; } break; @@ -900,6 +917,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].lpQueueHdr = NULL; MidiOutDev[wDevID].midiDesc = *lpDesc; + MidiOutDev[wDevID].fd = fd; MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); TRACE("Successful !\n"); @@ -923,15 +941,16 @@ static DWORD modClose(WORD wDevID) /* FIXME: should test that no pending buffer is still in the queue for * playing */ - if (midiSeqFD == -1) { + if (MidiOutDev[wDevID].fd == -1) { WARN("can't close !\n"); return MMSYSERR_ERROR; } switch (MidiOutDev[wDevID].caps.wTechnology) { case MOD_FMSYNTH: + case MOD_SYNTH: case MOD_MIDIPORT: - midiCloseSeq(); + midiCloseSeq(MidiOutDev[wDevID].fd); break; default: WARN("Technology not supported (yet) %d !\n", @@ -941,6 +960,7 @@ static DWORD modClose(WORD wDevID) HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); MidiOutDev[wDevID].lpExtra = 0; + MidiOutDev[wDevID].fd = -1; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; @@ -961,7 +981,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - if (midiSeqFD == -1) { + if (MidiOutDev[wDevID].fd == -1) { WARN("can't play !\n"); return MIDIERR_NODEVICE; } @@ -1256,7 +1276,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - if (midiSeqFD == -1) { + if (MidiOutDev[wDevID].fd == -1) { WARN("can't play !\n"); return MIDIERR_NODEVICE; } diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2b30c5992c7..8c131037b76 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -222,6 +222,7 @@ typedef struct midi_src char incLen; UINT startTime; MIDIINCAPSW caps; + int fd; } WINE_MIDIIN; typedef struct midi_dest @@ -232,6 +233,7 @@ typedef struct midi_dest MIDIHDR *lpQueueHdr; void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; + int fd; } WINE_MIDIOUT; struct midi_init_params -- 2.25.1

1 0

[PATCH] ntdll: Implement idle time query for Mac OS.
by Chip Davis 20 Apr '22

20 Apr '22

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/ntdll/unix/system.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 56a31f5e4757..1b92649ba284 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1911,6 +1911,22 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) info->IdleTime.QuadPart = (ULONGLONG)ptimes[CP_IDLE] * 10000000 / clockrate.stathz; } } +#elif defined(__APPLE__) + { + host_name_port_t host = mach_host_self(); + struct host_cpu_load_info load_info; + mach_msg_type_number_t count; + + count = HOST_CPU_LOAD_INFO_COUNT; + if (host_statistics(host, HOST_CPU_LOAD_INFO, (host_info_t)&load_info, &count) == KERN_SUCCESS) + { + /* Believe it or not, based on my reading of XNU source, this is + * already in the units we want (100 ns). + */ + info->IdleTime.QuadPart = load_info.cpu_ticks[CPU_STATE_IDLE]; + } + mach_port_deallocate(mach_task_self(), host); + } #else { static ULONGLONG idle; -- 2.34.1

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel