- Wine-Devel - list.winehq.org

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech April 5, 2022

April 5, 2022

--- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[v4 PATCH] dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Nikolay Sivov April 5, 2022

April 5, 2022

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: removed parts that are not relevant for tested functionality, fixed compilation warnings. dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping(); -- 2.35.1

1 0

[PATCH 1/2] winex11: Invoke Key event handlers immediately, keeping pace with the XFilterEvent().
by Byeongsik Jeon April 5, 2022

April 5, 2022

1. GCS_COMPSTR: XFilterEvent() True case, XIMPreeditDrawCallCallback() is invoked by XFilterEvent() internally. immediately processing. GCS_RESULTSTR: XFilterEvent() False case. X11DRV_XIMLookupChars() is invoked by KeyPress event handler. delayed processing. So, delayed event handler processing causes GCS_COMPSTR, GCS_RESULTSTR pair sequence inverting. In Hangul IME, one key often generates GCS_COMPSTR, GCS_RESULTSTR pairs. The XIM server sends the correct order pair, but the message order inverted through the process_events(). Japanese input system can also produce similar situation. 2. Copying event variable does not guarantee complete state preservation. At the time of delayed processing, the global information that the event handler must refer to may be changed. Ex. XFilterEvent(), KeyPress event handler confirmed. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/winex11.drv/event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..149069b0d29 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -445,6 +445,19 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + if (event.type == KeyPress || event.type == KeyRelease) + { + if (prev_event.type) + { + queued |= call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); + prev_event.type = 0; + action = MERGE_DISCARD; + } + queued |= call_event_handler( display, &event ); + continue; + } + get_event_data( &event ); if (prev_event.type) action = merge_events( &prev_event, &event ); switch( action ) -- 2.35.1

1 2

[PATCH 1/6] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura April 5, 2022

April 5, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 170 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..f18afa05ae9 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,16 @@ static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) #define DESKTOP_ALL_ACCESS 0x01ff +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +static void check_unicode_string_( int line, const UNICODE_STRING *string, const WCHAR *expect ) +{ + size_t len = wcslen( expect ) * sizeof(WCHAR); + + ok_(__FILE__, line)( !wcscmp( string->Buffer, expect ), "got string %s\n", debugstr_w( string->Buffer )); + ok_(__FILE__, line)( string->Length == len, "got length %u\n", string->Length ); + ok_(__FILE__, line)( string->MaximumLength == len + sizeof(WCHAR), "got max length %u\n", string->MaximumLength ); +} + static void test_case_sensitive (void) { NTSTATUS status; @@ -2500,6 +2510,165 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + char buffer[200]; + DIRECTORY_BASIC_INFORMATION *info = (void *)buffer; + ULONG context, size, needed_size; + HANDLE dir, child1, child2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); + InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); + status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( !status, "got %#x\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( !size, "got size %u\n", size ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#x\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#x\n", status ); + + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#x\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + ok( size && size < sizeof(buffer), "got size %u\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + { + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + ok( !info[1].ObjectName.Length, "got length %u\n", info[1].ObjectName.Length ); + ok( !info[1].ObjectName.MaximumLength, "got max length %u\n", info[1].ObjectName.MaximumLength ); + ok( !info[1].ObjectTypeName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + ok( !info[1].ObjectTypeName.Length, "got length %u\n", info[1].ObjectTypeName.Length ); + ok( !info[1].ObjectTypeName.MaximumLength, "got max length %u\n", info[1].ObjectTypeName.MaximumLength ); + } + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#x\n", status ); + ok( context == 2, "got context %#x\n", context ); + todo_wine ok( !size, "got size %u\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + needed_size = size; + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + ok( info[0].ObjectName.Length == 0xcccc, "got length %u\n", info[0].ObjectName.Length ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#x\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#x\n", status ); + if (!status) + { + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, L"Telamon" ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !info[2].ObjectName.Buffer, "got string %p\n", info[2].ObjectName.Buffer ); + } + + needed_size = size; + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#x\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#x\n", context ); + ok( size > 0 && size < needed_size, "got size %u\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + ok( info[0].ObjectName.Length == 0xcccc, "got length %u\n", info[0].ObjectName.Length ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#x\n", status ); + if (!status) + { + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2730,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.35.1

2 11

[PATCH 1/2] mscoree/tests: Build loadpaths.exe as GUI instead of CUI.
by Esme Povirk April 4, 2022

April 4, 2022

This prevents unnecessary console windows from being created for it if mscoree_test.exe does not have a console. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b49465fb16f..a2bb3449839 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -709,7 +709,7 @@ static void test_loadpaths(BOOL neutral) ret = write_resource(exe_source, exe_source); ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); - ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + ret = compile_cs(exe_source, exe_name, L"winexe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); -- 2.32.0

1 1

[PATCH 1/4] winegstreamer: Disconnect source pins before calling wg_parser_disconnect().
by Zebediah Figura April 4, 2022

April 4, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index bb7a71283c3..f38a0c16215 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1629,6 +1629,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) if (!This->sink_connected) return S_OK; + /* Disconnecting source pins triggers a call to wg_parser_stream_disable(). + * The stream pointers are no longer valid after wg_parser_disconnect(), so + * make sure we disable the streams first. */ + for (i = 0; i < This->source_count; ++i) + { + if (This->sources[i]) + free_source_pin(This->sources[i]); + } + wg_parser_disconnect(This->wg_parser); /* read_thread() needs to stay alive to service any read requests GStreamer @@ -1637,12 +1646,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); - for (i = 0; i < This->source_count; ++i) - { - if (This->sources[i]) - free_source_pin(This->sources[i]); - } - This->source_count = 0; free(This->sources); This->sources = NULL; -- 2.35.1

1 3

[PATCH] mscoree: Update Wine Mono to 7.2.0.
by Esme Povirk April 4, 2022

April 4, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 1d87eac5b1a..73f44a80f79 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.1.1" +#define MONO_VERSION "7.2.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea" +#define MONO_SHA "5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8f3441cd84e..44b2fd88d2a 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.1.1" +#define WINE_MONO_VERSION "7.2.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.32.0

2 1

[PATCH 1/4] include: Add IDebugControl4 definition.
by Nikolay Sivov April 4, 2022

April 4, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Unreal Engine crash handler is using this. include/dbgeng.h | 361 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) diff --git a/include/dbgeng.h b/include/dbgeng.h index d916d2433a3..e417704915a 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -44,6 +44,8 @@ DEFINE_GUID(IID_IDebugSymbols2, 0x3a707211, 0xafdd, 0x4495, 0xad, 0x4f DEFINE_GUID(IID_IDebugSymbols3, 0xf02fbecc, 0x50ac, 0x4f36, 0x9a, 0xd9, 0xc9, 0x75, 0xe8, 0xf3, 0x2f, 0xf8); DEFINE_GUID(IID_IDebugControl, 0x5182e668, 0x105e, 0x416e, 0xad, 0x92, 0x24, 0xef, 0x80, 0x04, 0x24, 0xba); DEFINE_GUID(IID_IDebugControl2, 0xd4366723, 0x44df, 0x4bed, 0x8c, 0x7e, 0x4c, 0x05, 0x42, 0x4f, 0x45, 0x88); +DEFINE_GUID(IID_IDebugControl3, 0x7df74a86, 0xb03f, 0x407f, 0x90, 0xab, 0xa2, 0x0d, 0xad, 0xce, 0xad, 0x08); +DEFINE_GUID(IID_IDebugControl4, 0x94e60ce9, 0x9b41, 0x4b19, 0x9f, 0xc0, 0x6d, 0x9e, 0xb3, 0x52, 0x72, 0xb3); DEFINE_GUID(IID_IDebugAdvanced, 0xf2df5f53, 0x071f, 0x47bd, 0x9d, 0xe6, 0x57, 0x34, 0xc3, 0xfe, 0xd6, 0x89); DEFINE_GUID(IID_IDebugSystemObjects, 0x6b86fe2c, 0x2c4f, 0x4f0c, 0x9d, 0xa2, 0x17, 0x43, 0x11, 0xac, 0xc3, 0x27); DEFINE_GUID(IID_IDebugSystemObjects2, 0x0ae9f5ff, 0x1852, 0x4679, 0xb0, 0x55, 0x49, 0x4b, 0xee, 0x64, 0x07, 0xee); @@ -501,6 +503,7 @@ DECLARE_INTERFACE_(IDebugSymbolGroup2, IUnknown) #undef INTERFACE typedef IDebugBreakpoint *PDEBUG_BREAKPOINT; +typedef IDebugBreakpoint2 *PDEBUG_BREAKPOINT2; typedef IDebugSymbolGroup2 *PDEBUG_SYMBOL_GROUP2; #define INTERFACE IDebugInputCallbacks @@ -1973,6 +1976,364 @@ DECLARE_INTERFACE_(IDebugControl2, IUnknown) }; #undef INTERFACE +#define INTERFACE IDebugControl3 +DECLARE_INTERFACE_(IDebugControl3, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugControl */ + STDMETHOD(GetInterrupt)(THIS) PURE; + STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; + STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; + STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; + STDMETHOD(CloseLogFile)(THIS) PURE; + STDMETHOD(GetLogMask)(THIS_ ULONG *mask) PURE; + STDMETHOD(SetLogMask)(THIS_ ULONG mask) PURE; + STDMETHOD(Input)(THIS_ char *buffer, ULONG buffer_size, ULONG *input_size) PURE; + STDMETHOD(ReturnInput)(THIS_ const char *buffer) PURE; + STDMETHODV(Output)(THIS_ ULONG mask, const char *format, ...) PURE; + STDMETHOD(OutputVaList)(THIS_ ULONG mask, const char *format, __ms_va_list args) PURE; + STDMETHODV(ControlledOutput)(THIS_ ULONG output_control, ULONG mask, const char *format, ...) PURE; + STDMETHOD(ControlledOutputVaList)(THIS_ ULONG output_control, ULONG mask, const char *format, + __ms_va_list args) PURE; + STDMETHODV(OutputPrompt)(THIS_ ULONG output_control, const char *format, ...) PURE; + STDMETHOD(OutputPromptVaList)(THIS_ ULONG output_control, const char *format, __ms_va_list args) PURE; + STDMETHOD(GetPromptText)(THIS_ char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(OutputCurrentState)(THIS_ ULONG output_control, ULONG flags) PURE; + STDMETHOD(OutputVersionInformation)(THIS_ ULONG output_control) PURE; + STDMETHOD(GetNotifyEventHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(SetNotifyEventHandle)(THIS_ ULONG64 handle) PURE; + STDMETHOD(Assemble)(THIS_ ULONG64 offset, const char *code, ULONG64 *end_offset) PURE; + STDMETHOD(Disassemble)(THIS_ ULONG64 offset, ULONG flags, char *buffer, ULONG buffer_size, ULONG *disassm_size, + ULONG64 *end_offset) PURE; + STDMETHOD(GetDisassembleEffectiveOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputDisassembly)(THIS_ ULONG output_control, ULONG64 offset, ULONG flags, ULONG64 *end_offset) PURE; + STDMETHOD(OutputDisassemblyLines)(THIS_ ULONG output_control, ULONG prev_lines, ULONG total_lines, ULONG64 offset, + ULONG flags, ULONG *offset_line, ULONG64 *start_offset, ULONG64 *end_offset, ULONG64 *line_offsets) PURE; + STDMETHOD(GetNearInstruction)(THIS_ ULONG64 offset, LONG delta, ULONG64 *instr_offset) PURE; + STDMETHOD(GetStackTrace)(THIS_ ULONG64 frame_offset, ULONG64 stack_offset, ULONG64 instr_offset, + DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled) PURE; + STDMETHOD(GetReturnOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputStackTrace)(THIS_ ULONG output_control, DEBUG_STACK_FRAME *frames, ULONG frames_size, + ULONG flags) PURE; + STDMETHOD(GetDebuggeeType)(THIS_ ULONG *_class, ULONG *qualifier) PURE; + STDMETHOD(GetActualProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetExecutingProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetPossibleExecutingProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetNumberProcessors)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSystemVersion)(THIS_ ULONG *platform_id, ULONG *major, ULONG *minor, char *sp_string, + ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number, char *build_string, ULONG build_string_size, + ULONG *build_string_used) PURE; + STDMETHOD(GetPageSize)(THIS_ ULONG *size) PURE; + STDMETHOD(IsPointer64Bit)(THIS) PURE; + STDMETHOD(ReadBugCheckData)(THIS_ ULONG *code, ULONG64 *arg1, ULONG64 *arg2, ULONG64 *arg3, ULONG64 *arg4) PURE; + STDMETHOD(GetNumberSupportedProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSupportedProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetProcessorTypeNames)(THIS_ ULONG type, char *full_name, ULONG full_name_buffer_size, + ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size, ULONG *abbrev_name_size) PURE; + STDMETHOD(GetEffectiveProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(SetEffectiveProcessorType)(THIS_ ULONG type) PURE; + STDMETHOD(GetExecutionStatus)(THIS_ ULONG *status) PURE; + STDMETHOD(SetExecutionStatus)(THIS_ ULONG status) PURE; + STDMETHOD(GetCodeLevel)(THIS_ ULONG *level) PURE; + STDMETHOD(SetCodeLevel)(THIS_ ULONG level) PURE; + STDMETHOD(GetEngineOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetSystemErrorControl)(THIS_ ULONG *output_level, ULONG *break_level) PURE; + STDMETHOD(SetSystemErrorControl)(THIS_ ULONG output_level, ULONG break_level) PURE; + STDMETHOD(GetTextMacro)(THIS_ ULONG slot, char *buffer, ULONG buffer_size, ULONG *macro_size) PURE; + STDMETHOD(SetTextMacro)(THIS_ ULONG slot, const char *macro) PURE; + STDMETHOD(GetRadix)(THIS_ ULONG *radix) PURE; + STDMETHOD(SetRadix)(THIS_ ULONG radix) PURE; + STDMETHOD(Evaluate)(THIS_ const char *expression, ULONG desired_type, DEBUG_VALUE *value, + ULONG *remainder_index) PURE; + STDMETHOD(CoerceValue)(THIS_ DEBUG_VALUE input, ULONG output_type, DEBUG_VALUE *output) PURE; + STDMETHOD(CoerceValues)(THIS_ ULONG count, DEBUG_VALUE *input, ULONG *output_types, DEBUG_VALUE *output) PURE; + STDMETHOD(Execute)(THIS_ ULONG output_control, const char *command, ULONG flags) PURE; + STDMETHOD(ExecuteCommandFile)(THIS_ ULONG output_control, const char *command_file, ULONG flags) PURE; + STDMETHOD(GetNumberBreakpoints)(THIS_ ULONG *count) PURE; + STDMETHOD(GetBreakpointByIndex)(THIS_ ULONG index, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointById)(THIS_ ULONG id, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointParameters)(THIS_ ULONG count, ULONG *ids, ULONG start, + DEBUG_BREAKPOINT_PARAMETERS *parameters) PURE; + STDMETHOD(AddBreakpoint)(THIS_ ULONG type, ULONG desired_id, IDebugBreakpoint **bp) PURE; + STDMETHOD(RemoveBreakpoint)(THIS_ IDebugBreakpoint *bp) PURE; + STDMETHOD(AddExtension)(THIS_ const char *path, ULONG flags, ULONG64 *handle) PURE; + STDMETHOD(RemoveExtension)(THIS_ ULONG64 handle) PURE; + STDMETHOD(GetExtensionByPath)(THIS_ const char *path, ULONG64 *handle) PURE; + STDMETHOD(CallExtension)(THIS_ ULONG64 handle, const char *function, const char *args) PURE; + STDMETHOD(GetExtensionFunction)(THIS_ ULONG64 handle, const char *name, void *function) PURE; + STDMETHOD(GetWindbgExtensionApis32)(THIS_ PWINDBG_EXTENSION_APIS32 api) PURE; + STDMETHOD(GetWindbgExtensionApis64)(THIS_ PWINDBG_EXTENSION_APIS64 api) PURE; + STDMETHOD(GetNumberEventFilters)(THIS_ ULONG *specific_events, ULONG *specific_exceptions, + ULONG *arbitrary_exceptions) PURE; + STDMETHOD(GetEventFilterText)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(GetEventFilterCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetEventFilterCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(GetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetSpecificFilterArgument)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *argument_size) PURE; + STDMETHOD(SetSpecificFilterArgument)(THIS_ ULONG index, const char *argument) PURE; + STDMETHOD(GetExceptionFilterParameters)(THIS_ ULONG count, ULONG *codes, ULONG start, + DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetExceptionFilterParameters)(THIS_ ULONG count, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetExceptionFilterSecondCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *command_size) PURE; + STDMETHOD(SetExceptionFilterSecondCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(WaitForEvent)(THIS_ ULONG flags, ULONG timeout) PURE; + STDMETHOD(GetLastEventInformation)(THIS_ ULONG *type, ULONG *pid, ULONG *tid, void *extra_info, + ULONG extra_info_size, ULONG *extra_info_used, char *description, ULONG desc_size, ULONG *desc_used) PURE; + /* IDebugControl2 */ + STDMETHOD(GetCurrentTimeDate)(THIS_ ULONG timedate) PURE; + STDMETHOD(GetCurrentSystemUpTime)(THIS_ ULONG uptime) PURE; + STDMETHOD(GetDumpFormatFlags)(THIS_ ULONG *flags) PURE; + STDMETHOD(GetNumberTextPlacements)(THIS_ ULONG *count) PURE; + STDMETHOD(GetNumberTextReplacement)(THIS_ const char *src_text, ULONG index, char *src_buffer, + ULONG src_buffer_size, ULONG *src_size, char *dst_buffer, ULONG dst_buffer_size, ULONG *dst_size) PURE; + STDMETHOD(SetTextReplacement)(THIS_ const char *src_text, const char *dst_text) PURE; + STDMETHOD(RemoveTextReplacements)(THIS) PURE; + STDMETHOD(OutputTextReplacements)(THIS_ ULONG output_control, ULONG flags) PURE; + /* IDebugControl3 */ + STDMETHOD(GetAssemblyOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetExpressionSyntax)(THIS_ ULONG *flags) PURE; + STDMETHOD(SetExpressionSyntax)(THIS_ ULONG flags) PURE; + STDMETHOD(SetExpressionSyntaxByName)(THIS_ const char *name) PURE; + STDMETHOD(GetNumberExpressionSyntaxes)(THIS_ ULONG *number) PURE; + STDMETHOD(GetExpressionSyntaxNames)(THIS_ ULONG index, char *fullname, ULONG fullname_buffer_size, + ULONG *fullname_size, char *abbrevname, ULONG abbrevname_buffer_size, ULONG *abbrevname_size) PURE; + STDMETHOD(GetNumberEvents)(THIS_ ULONG *events) PURE; + STDMETHOD(GetEventIndexDescription)(THIS_ ULONG index, ULONG which, char *buffer, ULONG buffer_size, + ULONG *desc_size) PURE; + STDMETHOD(GetCurrentEventIndex)(THIS_ ULONG *index) PURE; + STDMETHOD(SetNextEventIndex)(THIS_ ULONG relation, ULONG value, ULONG *next_index) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugControl4 +DECLARE_INTERFACE_(IDebugControl4, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugControl */ + STDMETHOD(GetInterrupt)(THIS) PURE; + STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; + STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; + STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; + STDMETHOD(CloseLogFile)(THIS) PURE; + STDMETHOD(GetLogMask)(THIS_ ULONG *mask) PURE; + STDMETHOD(SetLogMask)(THIS_ ULONG mask) PURE; + STDMETHOD(Input)(THIS_ char *buffer, ULONG buffer_size, ULONG *input_size) PURE; + STDMETHOD(ReturnInput)(THIS_ const char *buffer) PURE; + STDMETHODV(Output)(THIS_ ULONG mask, const char *format, ...) PURE; + STDMETHOD(OutputVaList)(THIS_ ULONG mask, const char *format, __ms_va_list args) PURE; + STDMETHODV(ControlledOutput)(THIS_ ULONG output_control, ULONG mask, const char *format, ...) PURE; + STDMETHOD(ControlledOutputVaList)(THIS_ ULONG output_control, ULONG mask, const char *format, + __ms_va_list args) PURE; + STDMETHODV(OutputPrompt)(THIS_ ULONG output_control, const char *format, ...) PURE; + STDMETHOD(OutputPromptVaList)(THIS_ ULONG output_control, const char *format, __ms_va_list args) PURE; + STDMETHOD(GetPromptText)(THIS_ char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(OutputCurrentState)(THIS_ ULONG output_control, ULONG flags) PURE; + STDMETHOD(OutputVersionInformation)(THIS_ ULONG output_control) PURE; + STDMETHOD(GetNotifyEventHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(SetNotifyEventHandle)(THIS_ ULONG64 handle) PURE; + STDMETHOD(Assemble)(THIS_ ULONG64 offset, const char *code, ULONG64 *end_offset) PURE; + STDMETHOD(Disassemble)(THIS_ ULONG64 offset, ULONG flags, char *buffer, ULONG buffer_size, ULONG *disassm_size, + ULONG64 *end_offset) PURE; + STDMETHOD(GetDisassembleEffectiveOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputDisassembly)(THIS_ ULONG output_control, ULONG64 offset, ULONG flags, ULONG64 *end_offset) PURE; + STDMETHOD(OutputDisassemblyLines)(THIS_ ULONG output_control, ULONG prev_lines, ULONG total_lines, ULONG64 offset, + ULONG flags, ULONG *offset_line, ULONG64 *start_offset, ULONG64 *end_offset, ULONG64 *line_offsets) PURE; + STDMETHOD(GetNearInstruction)(THIS_ ULONG64 offset, LONG delta, ULONG64 *instr_offset) PURE; + STDMETHOD(GetStackTrace)(THIS_ ULONG64 frame_offset, ULONG64 stack_offset, ULONG64 instr_offset, + DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled) PURE; + STDMETHOD(GetReturnOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputStackTrace)(THIS_ ULONG output_control, DEBUG_STACK_FRAME *frames, ULONG frames_size, + ULONG flags) PURE; + STDMETHOD(GetDebuggeeType)(THIS_ ULONG *_class, ULONG *qualifier) PURE; + STDMETHOD(GetActualProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetExecutingProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetPossibleExecutingProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetNumberProcessors)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSystemVersion)(THIS_ ULONG *platform_id, ULONG *major, ULONG *minor, char *sp_string, + ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number, char *build_string, ULONG build_string_size, + ULONG *build_string_used) PURE; + STDMETHOD(GetPageSize)(THIS_ ULONG *size) PURE; + STDMETHOD(IsPointer64Bit)(THIS) PURE; + STDMETHOD(ReadBugCheckData)(THIS_ ULONG *code, ULONG64 *arg1, ULONG64 *arg2, ULONG64 *arg3, ULONG64 *arg4) PURE; + STDMETHOD(GetNumberSupportedProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSupportedProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetProcessorTypeNames)(THIS_ ULONG type, char *full_name, ULONG full_name_buffer_size, + ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size, ULONG *abbrev_name_size) PURE; + STDMETHOD(GetEffectiveProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(SetEffectiveProcessorType)(THIS_ ULONG type) PURE; + STDMETHOD(GetExecutionStatus)(THIS_ ULONG *status) PURE; + STDMETHOD(SetExecutionStatus)(THIS_ ULONG status) PURE; + STDMETHOD(GetCodeLevel)(THIS_ ULONG *level) PURE; + STDMETHOD(SetCodeLevel)(THIS_ ULONG level) PURE; + STDMETHOD(GetEngineOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetSystemErrorControl)(THIS_ ULONG *output_level, ULONG *break_level) PURE; + STDMETHOD(SetSystemErrorControl)(THIS_ ULONG output_level, ULONG break_level) PURE; + STDMETHOD(GetTextMacro)(THIS_ ULONG slot, char *buffer, ULONG buffer_size, ULONG *macro_size) PURE; + STDMETHOD(SetTextMacro)(THIS_ ULONG slot, const char *macro) PURE; + STDMETHOD(GetRadix)(THIS_ ULONG *radix) PURE; + STDMETHOD(SetRadix)(THIS_ ULONG radix) PURE; + STDMETHOD(Evaluate)(THIS_ const char *expression, ULONG desired_type, DEBUG_VALUE *value, + ULONG *remainder_index) PURE; + STDMETHOD(CoerceValue)(THIS_ DEBUG_VALUE input, ULONG output_type, DEBUG_VALUE *output) PURE; + STDMETHOD(CoerceValues)(THIS_ ULONG count, DEBUG_VALUE *input, ULONG *output_types, DEBUG_VALUE *output) PURE; + STDMETHOD(Execute)(THIS_ ULONG output_control, const char *command, ULONG flags) PURE; + STDMETHOD(ExecuteCommandFile)(THIS_ ULONG output_control, const char *command_file, ULONG flags) PURE; + STDMETHOD(GetNumberBreakpoints)(THIS_ ULONG *count) PURE; + STDMETHOD(GetBreakpointByIndex)(THIS_ ULONG index, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointById)(THIS_ ULONG id, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointParameters)(THIS_ ULONG count, ULONG *ids, ULONG start, + DEBUG_BREAKPOINT_PARAMETERS *parameters) PURE; + STDMETHOD(AddBreakpoint)(THIS_ ULONG type, ULONG desired_id, IDebugBreakpoint **bp) PURE; + STDMETHOD(RemoveBreakpoint)(THIS_ IDebugBreakpoint *bp) PURE; + STDMETHOD(AddExtension)(THIS_ const char *path, ULONG flags, ULONG64 *handle) PURE; + STDMETHOD(RemoveExtension)(THIS_ ULONG64 handle) PURE; + STDMETHOD(GetExtensionByPath)(THIS_ const char *path, ULONG64 *handle) PURE; + STDMETHOD(CallExtension)(THIS_ ULONG64 handle, const char *function, const char *args) PURE; + STDMETHOD(GetExtensionFunction)(THIS_ ULONG64 handle, const char *name, void *function) PURE; + STDMETHOD(GetWindbgExtensionApis32)(THIS_ PWINDBG_EXTENSION_APIS32 api) PURE; + STDMETHOD(GetWindbgExtensionApis64)(THIS_ PWINDBG_EXTENSION_APIS64 api) PURE; + STDMETHOD(GetNumberEventFilters)(THIS_ ULONG *specific_events, ULONG *specific_exceptions, + ULONG *arbitrary_exceptions) PURE; + STDMETHOD(GetEventFilterText)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(GetEventFilterCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetEventFilterCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(GetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetSpecificFilterArgument)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *argument_size) PURE; + STDMETHOD(SetSpecificFilterArgument)(THIS_ ULONG index, const char *argument) PURE; + STDMETHOD(GetExceptionFilterParameters)(THIS_ ULONG count, ULONG *codes, ULONG start, + DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetExceptionFilterParameters)(THIS_ ULONG count, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetExceptionFilterSecondCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *command_size) PURE; + STDMETHOD(SetExceptionFilterSecondCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(WaitForEvent)(THIS_ ULONG flags, ULONG timeout) PURE; + STDMETHOD(GetLastEventInformation)(THIS_ ULONG *type, ULONG *pid, ULONG *tid, void *extra_info, + ULONG extra_info_size, ULONG *extra_info_used, char *description, ULONG desc_size, ULONG *desc_used) PURE; + /* IDebugControl2 */ + STDMETHOD(GetCurrentTimeDate)(THIS_ ULONG timedate) PURE; + STDMETHOD(GetCurrentSystemUpTime)(THIS_ ULONG uptime) PURE; + STDMETHOD(GetDumpFormatFlags)(THIS_ ULONG *flags) PURE; + STDMETHOD(GetNumberTextPlacements)(THIS_ ULONG *count) PURE; + STDMETHOD(GetNumberTextReplacement)(THIS_ const char *src_text, ULONG index, char *src_buffer, + ULONG src_buffer_size, ULONG *src_size, char *dst_buffer, ULONG dst_buffer_size, ULONG *dst_size) PURE; + STDMETHOD(SetTextReplacement)(THIS_ const char *src_text, const char *dst_text) PURE; + STDMETHOD(RemoveTextReplacements)(THIS) PURE; + STDMETHOD(OutputTextReplacements)(THIS_ ULONG output_control, ULONG flags) PURE; + /* IDebugControl3 */ + STDMETHOD(GetAssemblyOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetExpressionSyntax)(THIS_ ULONG *flags) PURE; + STDMETHOD(SetExpressionSyntax)(THIS_ ULONG flags) PURE; + STDMETHOD(SetExpressionSyntaxByName)(THIS_ const char *name) PURE; + STDMETHOD(GetNumberExpressionSyntaxes)(THIS_ ULONG *number) PURE; + STDMETHOD(GetExpressionSyntaxNames)(THIS_ ULONG index, char *fullname, ULONG fullname_buffer_size, + ULONG *fullname_size, char *abbrevname, ULONG abbrevname_buffer_size, ULONG *abbrevname_size) PURE; + STDMETHOD(GetNumberEvents)(THIS_ ULONG *events) PURE; + STDMETHOD(GetEventIndexDescription)(THIS_ ULONG index, ULONG which, char *buffer, ULONG buffer_size, + ULONG *desc_size) PURE; + STDMETHOD(GetCurrentEventIndex)(THIS_ ULONG *index) PURE; + STDMETHOD(SetNextEventIndex)(THIS_ ULONG relation, ULONG value, ULONG *next_index) PURE; + /* IDebugControl4 */ + STDMETHOD(GetLogFileWide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; + STDMETHOD(OpenLogFileWide)(THIS_ const WCHAR *filename, BOOL append) PURE; + STDMETHOD(InputWide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *input_size) PURE; + STDMETHOD(ReturnInputWide)(THIS_ const WCHAR *buffer) PURE; + STDMETHODV(OutputWide)(THIS_ ULONG mask, const WCHAR *format, ...) PURE; + STDMETHOD(OutputVaListWide)(THIS_ ULONG mask, const WCHAR *format, __ms_va_list args) PURE; + STDMETHODV(ControlledOutputWide)(THIS_ ULONG output_control, ULONG mask, const WCHAR *format, ...) PURE; + STDMETHOD(ControlledOutputVaListWide)(THIS_ ULONG output_control, ULONG mask, const WCHAR *format, __ms_va_list args) PURE; + STDMETHODV(OutputPromptWide)(THIS_ ULONG output_control, const WCHAR *format, ...) PURE; + STDMETHOD(OutputPromptVaListWide)(THIS_ ULONG output_control, const WCHAR *format, __ms_va_list args) PURE; + STDMETHOD(GetPromptTextWide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(AssembleWide)(THIS_ ULONG64 offset, const WCHAR *instr, ULONG64 *end_offset) PURE; + STDMETHOD(DisassembleWide)(THIS_ ULONG64 offset, ULONG flags, WCHAR *buffer, ULONG buffer_size, ULONG *size, + ULONG64 *end_offset) PURE; + STDMETHOD(GetProcessorTypeNamesWide)(THIS_ ULONG type, WCHAR *fullename, ULONG fullname_buffer_size, + ULONG *fullname_size, WCHAR *abbrevname, ULONG abbrevname_buffer_size, ULONG *abbrevname_size) PURE; + STDMETHOD(GetTextMacroWide)(THIS_ ULONG slot, WCHAR *buffer, ULONG buffer_size, ULONG *macro_size) PURE; + STDMETHOD(SetTextMacroWide)(THIS_ ULONG slot, const WCHAR *macro) PURE; + STDMETHOD(EvaluateWide)(THIS_ const WCHAR *expression, ULONG desired_type, DEBUG_VALUE *value, ULONG *remainder_index) PURE; + STDMETHOD(ExecuteWide)(THIS_ ULONG output_control, const WCHAR *command, ULONG flags) PURE; + STDMETHOD(ExecuteCommandFileWide)(THIS_ ULONG output_control, const WCHAR *commandfile, ULONG flags) PURE; + STDMETHOD(GetBreakpointByIndex2)(THIS_ ULONG index, PDEBUG_BREAKPOINT2 *bp) PURE; + STDMETHOD(GetBreakpointById2)(THIS_ ULONG id, PDEBUG_BREAKPOINT2 *bp) PURE; + STDMETHOD(AddBreakpoint2)(THIS_ ULONG type, ULONG desired_id, PDEBUG_BREAKPOINT2 *bp) PURE; + STDMETHOD(RemoveBreakpoint2)(THIS_ PDEBUG_BREAKPOINT2 bp) PURE; + STDMETHOD(AddExtensionWide)(THIS_ const WCHAR *path, ULONG flags, ULONG64 *handle) PURE; + STDMETHOD(GetExtensionByPathWide)(THIS_ const WCHAR *path, ULONG64 *handle) PURE; + STDMETHOD(CallExtensionWide)(THIS_ ULONG64 handle, const WCHAR *function, const WCHAR *arguments) PURE; + STDMETHOD(GetExtensionFunctionWide)(THIS_ ULONG64 handle, const WCHAR *function, FARPROC *func) PURE; + STDMETHOD(GetEventFilterTextWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(GetEventFilterCommandWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetEventFilterCommandWide)(THIS_ ULONG index, const WCHAR *command) PURE; + STDMETHOD(GetSpecificFilterArgumentWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *argument_size) PURE; + STDMETHOD(SetSpecificFilterArgumentWide)(THIS_ ULONG index, const WCHAR *argument) PURE; + STDMETHOD(GetSpecificFilterSecondCommandWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetSpecificFilterSecondCommandWide)(THIS_ ULONG index, const WCHAR *command) PURE; + STDMETHOD(GetLastEventInformationWide)(THIS_ ULONG *type, ULONG *processid, ULONG *threadid, void *extra_info, + ULONG extra_info_size, ULONG *extra_info_used, WCHAR *desc, ULONG desc_size, ULONG *desc_used) PURE; + STDMETHOD(GetTextReplacementWide)(THIS_ const WCHAR *src_text, ULONG index, WCHAR *src_buffer, ULONG src_buffer_size, + ULONG *src_size, WCHAR *dst_buffer, ULONG dest_buffer_size, ULONG *dst_size) PURE; + STDMETHOD(SetTextReplacementWide)(THIS_ const WCHAR *src_text, const WCHAR *dst_text) PURE; + STDMETHOD(SetExpressionSyntaxByNameWide)(THIS_ const WCHAR *abbrevname) PURE; + STDMETHOD(GetExpressionSyntaxNamesWide)(THIS_ ULONG index, WCHAR *fullname_buffer, ULONG fullname_buffer_size, + ULONG *fullname_size, WCHAR *abbrevname_buffer, ULONG abbrevname_buffer_size, ULONG *abbrev_size) PURE; + STDMETHOD(GetEventIndexDescriptionWide)(THIS_ ULONG index, ULONG which, WCHAR *buffer, ULONG buffer_size, + ULONG *desc_size) PURE; + STDMETHOD(GetLogFile2)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, ULONG *flags) PURE; + STDMETHOD(OpenLogFile2)(THIS_ const char *filename, ULONG flags) PURE; + STDMETHOD(GetLogFile2Wide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *file_size, ULONG *flags) PURE; + STDMETHOD(OpenLogFile2Wide)(THIS_ const WCHAR *filename, ULONG flags) PURE; + STDMETHOD(GetSystemVersionValues)(THIS_ ULONG *platformid, ULONG *win32major, ULONG *win32minor, + ULONG *kdmajor, ULONG *kdminor) PURE; + STDMETHOD(GetSystemVersionString)(THIS_ ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) PURE; + STDMETHOD(GetSystemVersionStringWide)(THIS_ ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) PURE; + STDMETHOD(GetContextStackTrace)(THIS_ void *start_context, ULONG start_context_size, PDEBUG_STACK_FRAME frames, + ULONG frames_size, void *frame_contexts, ULONG frame_contexts_size, ULONG frame_contexts_entry_size, + ULONG *frames_filled) PURE; + STDMETHOD(OutputContextStackTrace)(THIS_ ULONG output_control, PDEBUG_STACK_FRAME frames, ULONG frames_size, + void *frame_contexts, ULONG frame_contexts_size, ULONG frame_contexts_entry_size, ULONG flags) PURE; + STDMETHOD(GetStoredEventInformation)(THIS_ ULONG *type, ULONG *processid, ULONG *threadid, void *context, + ULONG context_size, ULONG *context_used, void *extra_info, ULONG extra_info_size, ULONG *extra_info_used) PURE; + STDMETHOD(GetManagedStatus)(THIS_ ULONG *flags, ULONG which_string, char *string, ULONG string_size, ULONG string_needed) PURE; + STDMETHOD(GetManagedStatusWide)(THIS_ ULONG *flags, ULONG which_string, WCHAR *string, ULONG string_size, + ULONG string_needed) PURE; + STDMETHOD(ResetManagedStatus)(THIS_ ULONG flags) PURE; +}; +#undef INTERFACE + #define INTERFACE IDebugAdvanced DECLARE_INTERFACE_(IDebugAdvanced, IUnknown) { -- 2.35.1

1 3

[PATCH] uianimation: Use CRT allocation functions.
by Nikolay Sivov April 4, 2022

April 4, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uianimation/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c338d836978..22bb58ddbe2 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -31,7 +31,6 @@ #include "initguid.h" #include "uianimation.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uianimation); @@ -151,7 +150,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -308,7 +307,7 @@ const struct IUIAnimationStoryboardVtbl animation_storyboard_vtbl = static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj ) { - struct animation_storyboard *This = heap_alloc( sizeof(*This) ); + struct animation_storyboard *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl; @@ -371,7 +370,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -498,7 +497,7 @@ const struct IUIAnimationVariableVtbl animation_var_vtbl = static HRESULT animation_var_create(DOUBLE initial, IUIAnimationVariable **obj ) { - struct animation_var *This = heap_alloc( sizeof(*This) ); + struct animation_var *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl; @@ -561,7 +560,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) if (!ref) { - heap_free( This ); + free( This ); } return ref; @@ -730,7 +729,7 @@ const struct IUIAnimationManagerVtbl manager_vtbl = static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) { - struct manager *This = heap_alloc( sizeof(*This) ); + struct manager *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -793,7 +792,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -866,7 +865,7 @@ const struct IUIAnimationTimerVtbl timer_vtbl = static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) { - struct timer *This = heap_alloc( sizeof(*This) ); + struct timer *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) @@ -930,7 +929,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -953,7 +952,7 @@ const struct IUIAnimationTransitionFactoryVtbl tr_factory_vtbl = static HRESULT transition_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_factory *This = heap_alloc( sizeof(*This) ); + struct tr_factory *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -1017,7 +1016,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -1141,7 +1140,7 @@ const struct IUIAnimationTransitionLibraryVtbl tr_library_vtbl = static HRESULT library_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_library *This = heap_alloc( sizeof(*This) ); + struct tr_library *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; -- 2.35.1

1 0

[PATCH] explorerframe/tests: Use CRT memory allocation functions.
by Nikolay Sivov April 4, 2022

April 4, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/tests/msg.h | 9 ++++----- dlls/explorerframe/tests/nstc.c | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h index 857278e4ef2..2a1752fda9f 100644 --- a/dlls/explorerframe/tests/msg.h +++ b/dlls/explorerframe/tests/msg.h @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -67,13 +66,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); + msg_seq->sequence = malloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); + msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -90,7 +89,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - heap_free(msg_seq->sequence); + free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -110,5 +109,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index f11ae0b1923..e8c771f7eec 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -364,7 +364,7 @@ static INameSpaceTreeControlEventsImpl *create_nstc_events(void) { INameSpaceTreeControlEventsImpl *This; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->ref = 1; @@ -2351,8 +2351,8 @@ static void test_events(void) if(!res) { /* Freeing these prematurely causes a crash. */ - heap_free(pnstceimpl); - heap_free(pnstceimpl2); + free(pnstceimpl); + free(pnstceimpl2); } IShellItem_Release(psi); -- 2.35.1

1 0