[PATCH 0/5] MR6033: include: Fix another 5 typoed GUIDs
Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/5559 because The Process™ -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
From: Alfred Agrell <floating(a)muncher.se> --- include/dxgidebug.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 686637321f0..f1c40af2c2b 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -25,7 +25,7 @@ typedef GUID DXGI_DEBUG_ID; cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") -cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") +cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x09, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") typedef enum DXGI_DEBUG_RLO_FLAGS { DXGI_DEBUG_RLO_SUMMARY = 0x0001, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
From: Alfred Agrell <floating(a)muncher.se> --- include/dwrite_3.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index e67c8ab6364..7412c3f5857 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -174,7 +174,7 @@ interface IDWriteRenderingParams3 : IDWriteRenderingParams2 [ local, object, - uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) + uuid(cfee3140-1157-47ca-8b85-31bfcf3f2d0e) ] interface IDWriteStringList : IUnknown { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
From: Alfred Agrell <floating(a)muncher.se> --- include/devicetopology.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 7e89d541ad6..1b4b87bd6c3 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -296,7 +296,7 @@ interface IAudioChannelConfig : IUnknown [ pointer_default(unique), nonextensible, - uuid(7d8b1437-dd53-4350-9c1b-1ee2890bf938), + uuid(7d8b1437-dd53-4350-9c1b-1ee2890bd938), local, object ] -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
From: Alfred Agrell <floating(a)muncher.se> --- include/devguid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devguid.h b/include/devguid.h index 7a99ba0e6f7..b309bcaafa5 100644 --- a/include/devguid.h +++ b/include/devguid.h @@ -21,7 +21,7 @@ DEFINE_GUID( GUID_DEVCLASS_1394, 0x6BDD1FC1, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F ); DEFINE_GUID( GUID_DEVCLASS_1394DEBUG, - 0x66F250D6, 0x7810, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); + 0x66F250D6, 0x7801, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); DEFINE_GUID( GUID_DEVCLASS_61883, 0x7EBEFBC0, 0x3200, 0x11D2, 0xB4, 0xC2, 0x00, 0xA0, 0xC9, 0x69, 0x7D, 0x07 ); DEFINE_GUID( GUID_DEVCLASS_ADAPTER, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
From: Alfred Agrell <floating(a)muncher.se> --- include/activdbg.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/activdbg.idl b/include/activdbg.idl index e10066c1f26..475469ebb05 100644 --- a/include/activdbg.idl +++ b/include/activdbg.idl @@ -295,7 +295,7 @@ interface IRemoteDebugApplicationThread : IUnknown */ [ object, - uuid(51973c30-cb0c-11d0-b5c9-00a0244Aae7a), + uuid(51973c30-cb0c-11d0-b5c9-00a0244a0e7a), pointer_default(unique) ] interface IRemoteDebugApplication : IUnknown -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=146943 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000007200E8, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032 wininet: http.c:6882: Test failed: lpszIssuerInfo = US
because The Process™
The problem is more that without an explicit reviewer, you can only hope that someone will voluntarily spend some time to have a look and double check that these are correct, or that julliard will either check it himself or trust that you did. Double checking against the SDK headers is a bit tedious, so unlikely to happen without you shaking the tree. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6033#note_75632
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6033
participants (4)
-
Alfred Agrell -
Alfred Agrell (＠Alcaro)
-
Marvin -
Rémi Bernon