[PATCH v3 0/10] MR5559: include: Fix another 13 typoed GUIDs
Same bug class as https://gitlab.winehq.org/wine/wine/-/merge_requests/5550. None of them are referenced by anything (not counting mfplat/main.c's debugstr_attr(), which names the two in mfapi.h - better debug output, yay I guess). -- v3: include: Fix a typoed GUID include: Fix a typoed GUID include: Fix two typoed GUIDs include: Fix two typoed GUIDs include: Fix two typoed GUIDs include: Fix a typoed GUID include: Fix a typoed GUID include: Fix a typoed GUID include: Fix a typoed GUID include: Fix a typoed GUID https://gitlab.winehq.org/wine/wine/-/merge_requests/5559
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/5559
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/5559
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/5559
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/5559
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/5559
From: Alfred Agrell <floating(a)muncher.se> --- include/mfapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 0a9f7c6f415..d4e332a9a33 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -266,7 +266,7 @@ DEFINE_GUID(MF_MT_WRAPPED_TYPE, 0x4d3f7b23, 0xd02f, 0x4e6 DEFINE_GUID(MF_MT_FIXED_SIZE_SAMPLES, 0xb8ebefaf, 0xb718, 0x4e04, 0xb0, 0xa9, 0x11, 0x67, 0x75, 0xe3, 0x32, 0x1b); DEFINE_GUID(MF_MT_COMPRESSED, 0x3afd0cee, 0x18f2, 0x4ba5, 0xa1, 0x10, 0x8b, 0xea, 0x50, 0x2e, 0x1f, 0x92); DEFINE_GUID(MF_MT_SAMPLE_SIZE, 0xdad3ab78, 0x1990, 0x408b, 0xbc, 0xe2, 0xeb, 0xa6, 0x73, 0xda, 0xcc, 0x10); -DEFINE_GUID(MF_MT_VIDEO_3D, 0xcb5e88cf, 0x7b5b, 0x47b6, 0x85, 0xaa, 0x1c, 0xa5, 0xae, 0x18, 0x75, 0x55); +DEFINE_GUID(MF_MT_VIDEO_3D, 0xcb5e88cf, 0x7b5b, 0x476b, 0x85, 0xaa, 0x1c, 0xa5, 0xae, 0x18, 0x75, 0x55); DEFINE_GUID(MF_MT_VIDEO_3D_FORMAT, 0x5315d8a0, 0x87c5, 0x4697, 0xb7, 0x93, 0x66, 0x06, 0xc6, 0x7c, 0x04, 0x9b); DEFINE_GUID(MF_MT_VIDEO_3D_NUM_VIEWS, 0xbb077e8a, 0xdcbf, 0x42eb, 0xaf, 0x60, 0x41, 0x8d, 0xf9, 0x8a, 0xa4, 0x95); DEFINE_GUID(MF_MT_VIDEO_3D_LEFT_IS_BASE, 0x6d4b7bff, 0x5629, 0x4404, 0x94, 0x8c, 0xc6, 0x34, 0xf4, 0xce, 0x26, 0xd4); @@ -302,7 +302,7 @@ DEFINE_GUID(MF_MT_AUDIO_BITS_PER_SAMPLE, 0xf2deb57f, 0x40fa, 0x476 DEFINE_GUID(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, 0xd9bf8d6a, 0x9530, 0x4b7c, 0x9d, 0xdf, 0xff, 0x6f, 0xd5, 0x8b, 0xbd, 0x06); DEFINE_GUID(MF_MT_AUDIO_SAMPLES_PER_BLOCK, 0xaab15aac, 0xe13a, 0x4995, 0x92, 0x22, 0x50, 0x1e, 0xa1, 0x5c, 0x68, 0x77); DEFINE_GUID(MF_MT_AUDIO_CHANNEL_MASK, 0x55fb5765, 0x644a, 0x4caf, 0x84, 0x79, 0x93, 0x89, 0x83, 0xbb, 0x15, 0x88); -DEFINE_GUID(MF_MT_AUDIO_FOLDDOWN_MATRIX, 0x9d62927c, 0x36be, 0x4cf1, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); +DEFINE_GUID(MF_MT_AUDIO_FOLDDOWN_MATRIX, 0x9d62927c, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_WMADRC_PEAKREF, 0x9d62927d, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_WMADRC_PEAKTARGET, 0x9d62927e, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_WMADRC_AVGREF, 0x9d62927f, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5559
From: Alfred Agrell <floating(a)muncher.se> --- include/mimeole.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 32e04e00c19..85ced81d405 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -939,7 +939,7 @@ cpp_quote("#endif") } [ - uuid(ee519f11-851a-11d0-8252-00c04fd85ab4), + uuid(ee519f11-851a-11d0-825c-00c04fd85ab4), object ] interface IMimeWebDocument : IUnknown @@ -1340,7 +1340,7 @@ cpp_quote("#endif") } [ - uuid(761aa741-7bda-11d1-8aa9-00c04fb951f3), + uuid(761aa641-7bda-11d1-8aa9-00c04fb951f3), object ] interface IMimeMessageCallback : IUnknown -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5559
From: Alfred Agrell <floating(a)muncher.se> --- include/propsys.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/propsys.idl b/include/propsys.idl index 4df73640f5e..4b9782eec41 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -278,7 +278,7 @@ interface IPropertyEnumType : IUnknown } [ - uuid(9b6e051c-5ddd-4321-9070-fe2acb55e974), + uuid(9b6e051c-5ddd-4321-9070-fe2acb55e794), object, pointer_default(unique) ] @@ -828,7 +828,7 @@ library PropSysObjects { interface IPropertyStore; } - [uuid(b8967f86-58ae-4f96-9fb2-5d7904798f4b)] coclass PropertySystem + [uuid(b8967f85-58ae-4f96-9fb2-5d7904798f4b)] coclass PropertySystem { interface IPropertySystem; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5559
From: Alfred Agrell <floating(a)muncher.se> --- include/uuids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uuids.h b/include/uuids.h index 2ae1ed21139..321dd16d6bf 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -344,7 +344,7 @@ OUR_GUID_ENTRY(MEDIASUBTYPE_P016, 0x36313050, 0x0000, 0x0010, OUR_GUID_ENTRY(MEDIASUBTYPE_P208, 0x38303250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_P210, 0x30313250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_P216, 0x36313250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_P408, 0x38304250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_P408, 0x38303450, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_PCMAudio_Obsolete, 0xe436eb8a, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(MEDIASUBTYPE_Plum, 0x6d756c50, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5559
From: Alfred Agrell <floating(a)muncher.se> --- include/wincodecsdk.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 4fb23716c27..8692eea3067 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -103,7 +103,7 @@ cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90 cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataWriter, 0xb1ebfc28,0xc9bd,0x47a2,0x8d,0x33,0xb9,0x48,0x76,0x97,0x77,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataWriter, 0xc9a14cda,0xc339,0x460b,0x90,0x78,0xd4,0xde,0xbc,0xfa,0xbe,0x91);") -cpp_quote("DEFINE_GUID(CLSID_WICXMPMetadataReader, 0x72b624bf,0xae11,0x4948,0xa6,0x5c,0x35,0x1e,0xb0,0x82,0x94,0x19);") +cpp_quote("DEFINE_GUID(CLSID_WICXMPMetadataReader, 0x72b624df,0xae11,0x4948,0xa6,0x5c,0x35,0x1e,0xb0,0x82,0x94,0x19);") cpp_quote("DEFINE_GUID(CLSID_WICXMPMetadataWriter, 0x1765e14e,0x1bd4,0x462e,0xb6,0xb1,0x59,0x0b,0xf1,0x26,0x2a,0xc6);") cpp_quote("DEFINE_GUID(CLSID_WICXMPAltMetadataReader, 0xaa94dcc2,0xb8b0,0x4898,0xb8,0x35,0x00,0x0a,0xab,0xd7,0x43,0x93);") cpp_quote("DEFINE_GUID(CLSID_WICXMPAltMetadataWriter, 0x076c2a6c,0xf78f,0x4c46,0xa7,0x23,0x35,0x83,0xe7,0x08,0x76,0xea);") -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5559
On Thu May 2 21:57:04 2024 +0000, Nikolay Sivov wrote:
It might be useful to split this a bit. I'm not sure if I'd call that useful, but you know Wine's commit splitting policy better than me.
If you're thinking of a better splitting strategy than one commit per file, do tell. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5559#note_69472
On Thu May 2 21:57:03 2024 +0000, Alfred Agrell wrote:
I'm not sure if I'd call that useful, but you know Wine's commit splitting policy better than me. If you're thinking of a better splitting strategy than one commit per file, do tell. I guess Nikolay means that the MR itself could be split, like 5 patches here, 5 in a followup MR.
Personally I'd prefer if the commit subjects were unique e.g. by mentioning the interface, so that someone looking at the git log or bisect or anything knows what the patch is about at a glance. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5559#note_69664
On Sat May 4 12:27:28 2024 +0000, Matteo Bruni wrote:
I guess Nikolay means that the MR itself could be split, like 5 patches here, 5 in a followup MR. Personally I'd prefer if the commit subjects were unique e.g. by mentioning the interface, so that someone looking at the git log or bisect or anything knows what the patch is about at a glance. None of the style guides I could find cover this kind of stuff.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5559#note_69734
participants (3)
-
Alfred Agrell -
Alfred Agrell (＠Alcaro)
-
Matteo Bruni (＠Mystral)