From 4a2fffe2f3d5cf40386d11d52aff37d71d915b7b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 26 Aug 2017 15:09:00 -0500 Subject: [PATCH] windows: GUID: to guid: --- basis/game/input/xinput/xinput.factor | 4 +-- basis/windows/com/com-tests.factor | 8 ++--- basis/windows/com/com.factor | 2 +- .../com/prettyprint/prettyprint.factor | 2 +- basis/windows/com/syntax/syntax-docs.factor | 4 +-- basis/windows/com/syntax/syntax.factor | 2 +- basis/windows/directx/dinput/dinput.factor | 36 +++++++++---------- basis/windows/gdiplus/gdiplus.factor | 28 +++++++-------- basis/windows/ole32/ole32-tests.factor | 2 +- basis/windows/winsock/winsock.factor | 2 +- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/basis/game/input/xinput/xinput.factor b/basis/game/input/xinput/xinput.factor index 6a38f96e2f..a927eab56f 100644 --- a/basis/game/input/xinput/xinput.factor +++ b/basis/game/input/xinput/xinput.factor @@ -103,13 +103,13 @@ M: xinput-game-input-backend product-string M: xinput-game-input-backend product-id dup number? - [ drop GUID: {02a1045e-0000-0000-0000-504944564944} ] + [ drop guid: {02a1045e-0000-0000-0000-504944564944} ] [ handle>> device-info guidProduct>> ] if ; M: xinput-game-input-backend instance-id dup number? - [ drop GUID: {c6075b30-fbca-11de-8001-444553540000} ] + [ drop guid: {c6075b30-fbca-11de-8001-444553540000} ] [ handle>> device-guid ] if ; diff --git a/basis/windows/com/com-tests.factor b/basis/windows/com/com-tests.factor index adfbb832b2..1d1a2c0879 100644 --- a/basis/windows/com/com-tests.factor +++ b/basis/windows/com/com-tests.factor @@ -20,10 +20,10 @@ COM-INTERFACE: IUnrelated IUnknown {b06ac3f4-30e4-406b-a7cd-c29cead4552c} COM-INTERFACE: ISelfReferential IUnknown {d4f45bf8-f720-4701-a09d-e8e341981121} ISelfReferential* selfReference ( ) ; -{ GUID: {216fb341-0eb2-44b1-8edb-60b76e353abc} } [ ISimple-iid ] unit-test -{ GUID: {9620ecec-8438-423b-bb14-86f835aa40dd} } [ IInherited-iid ] unit-test -{ GUID: {00000000-0000-0000-C000-000000000046} } [ IUnknown-iid ] unit-test -{ GUID: {b06ac3f4-30e4-406b-a7cd-c29cead4552c} } [ IUnrelated-iid ] unit-test +{ guid: {216fb341-0eb2-44b1-8edb-60b76e353abc} } [ ISimple-iid ] unit-test +{ guid: {9620ecec-8438-423b-bb14-86f835aa40dd} } [ IInherited-iid ] unit-test +{ guid: {00000000-0000-0000-C000-000000000046} } [ IUnknown-iid ] unit-test +{ guid: {b06ac3f4-30e4-406b-a7cd-c29cead4552c} } [ IUnrelated-iid ] unit-test { ( -- iid ) } [ \ ISimple-iid stack-effect ] unit-test { ( this -- HRESULT ) } [ \ ISimple::returnOK stack-effect ] unit-test diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor index 15abd924d8..a176c904a2 100644 --- a/basis/windows/com/com.factor +++ b/basis/windows/com/com.factor @@ -67,7 +67,7 @@ CONSTANT: LOCK_WRITE 1 CONSTANT: LOCK_EXCLUSIVE 2 CONSTANT: LOCK_ONLYONCE 4 -CONSTANT: GUID_NULL GUID: {00000000-0000-0000-0000-000000000000} +CONSTANT: GUID_NULL guid: {00000000-0000-0000-0000-000000000000} COM-INTERFACE: IStream ISequentialStream {0000000C-0000-0000-C000-000000000046} HRESULT Seek ( LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition ) diff --git a/basis/windows/com/prettyprint/prettyprint.factor b/basis/windows/com/prettyprint/prettyprint.factor index ef79a58600..c917db68d3 100644 --- a/basis/windows/com/prettyprint/prettyprint.factor +++ b/basis/windows/com/prettyprint/prettyprint.factor @@ -4,4 +4,4 @@ USING: windows.kernel32 windows.ole32 prettyprint.custom prettyprint.sections sequences ; IN: windows.com.prettyprint -M: GUID pprint* guid>string "GUID: " prepend text ; +M: GUID pprint* guid>string "guid: " prepend text ; diff --git a/basis/windows/com/syntax/syntax-docs.factor b/basis/windows/com/syntax/syntax-docs.factor index 91e8b4be88..ac7baa28c4 100644 --- a/basis/windows/com/syntax/syntax-docs.factor +++ b/basis/windows/com/syntax/syntax-docs.factor @@ -1,8 +1,8 @@ USING: help.markup help.syntax io kernel math quotations ; IN: windows.com.syntax -HELP: GUID: -{ $syntax "GUID: {01234567-89ab-cdef-0123-456789abcdef}" } +HELP: guid: +{ $syntax "guid: {01234567-89ab-cdef-0123-456789abcdef}" } { $description "\nCreate a COM globally-unique identifier (GUID) literal at parse time, and push it onto the data stack." } ; HELP: COM-INTERFACE: diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor index 86b5bdf328..a69c88806a 100755 --- a/basis/windows/com/syntax/syntax.factor +++ b/basis/windows/com/syntax/syntax.factor @@ -92,7 +92,7 @@ SYNTAX: \COM-INTERFACE: dup save-com-interface-definition define-words-for-com-interface ; -SYNTAX: \GUID: scan-token string>guid suffix! ; +SYNTAX: \guid: scan-token string>guid suffix! ; USE: vocabs.loader diff --git a/basis/windows/directx/dinput/dinput.factor b/basis/windows/directx/dinput/dinput.factor index a8ed13ba1b..e33c02a1b3 100644 --- a/basis/windows/directx/dinput/dinput.factor +++ b/basis/windows/directx/dinput/dinput.factor @@ -691,21 +691,21 @@ CONSTANT: DIPROPCALIBRATIONMODE_RAW 1 : DIPROP_USERNAME ( -- alien ) 25 ; inline : DIPROP_TYPENAME ( -- alien ) 26 ; inline -CONSTANT: GUID_XAxis GUID: {A36D02E0-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_YAxis GUID: {A36D02E1-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_ZAxis GUID: {A36D02E2-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_RxAxis GUID: {A36D02F4-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_RyAxis GUID: {A36D02F5-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_RzAxis GUID: {A36D02E3-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_Slider GUID: {A36D02E4-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_Button GUID: {A36D02F0-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_Key GUID: {55728220-D33C-11CF-BFC7-444553540000} -CONSTANT: GUID_POV GUID: {A36D02F2-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_Unknown GUID: {A36D02F3-C9F3-11CF-BFC7-444553540000} -CONSTANT: GUID_SysMouse GUID: {6F1D2B60-D5A0-11CF-BFC7-444553540000} -CONSTANT: GUID_SysKeyboard GUID: {6F1D2B61-D5A0-11CF-BFC7-444553540000} -CONSTANT: GUID_Joystick GUID: {6F1D2B70-D5A0-11CF-BFC7-444553540000} -CONSTANT: GUID_SysMouseEm GUID: {6F1D2B80-D5A0-11CF-BFC7-444553540000} -CONSTANT: GUID_SysMouseEm2 GUID: {6F1D2B81-D5A0-11CF-BFC7-444553540000} -CONSTANT: GUID_SysKeyboardEm GUID: {6F1D2B82-D5A0-11CF-BFC7-444553540000} -CONSTANT: GUID_SysKeyboardEm2 GUID: {6F1D2B83-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_XAxis guid: {A36D02E0-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_YAxis guid: {A36D02E1-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_ZAxis guid: {A36D02E2-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_RxAxis guid: {A36D02F4-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_RyAxis guid: {A36D02F5-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_RzAxis guid: {A36D02E3-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_Slider guid: {A36D02E4-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_Button guid: {A36D02F0-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_Key guid: {55728220-D33C-11CF-BFC7-444553540000} +CONSTANT: GUID_POV guid: {A36D02F2-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_Unknown guid: {A36D02F3-C9F3-11CF-BFC7-444553540000} +CONSTANT: GUID_SysMouse guid: {6F1D2B60-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_SysKeyboard guid: {6F1D2B61-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_Joystick guid: {6F1D2B70-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_SysMouseEm guid: {6F1D2B80-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_SysMouseEm2 guid: {6F1D2B81-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_SysKeyboardEm guid: {6F1D2B82-D5A0-11CF-BFC7-444553540000} +CONSTANT: GUID_SysKeyboardEm2 guid: {6F1D2B83-D5A0-11CF-BFC7-444553540000} diff --git a/basis/windows/gdiplus/gdiplus.factor b/basis/windows/gdiplus/gdiplus.factor index a43ce235ba..fe18bdaad6 100644 --- a/basis/windows/gdiplus/gdiplus.factor +++ b/basis/windows/gdiplus/gdiplus.factor @@ -548,21 +548,21 @@ STRUCT: MetafileHeader { LogicalDpiX INT } { LogicalDpiY INT } ; -CONSTANT: ImageFormatUndefined GUID: {b96b3ca9-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatMemoryBMP GUID: {b96b3caa-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatBMP GUID: {b96b3cab-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatEMF GUID: {b96b3cac-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatWMF GUID: {b96b3cad-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatJPEG GUID: {b96b3cae-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatPNG GUID: {b96b3caf-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatGIF GUID: {b96b3cb0-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatTIFF GUID: {b96b3cb1-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatEXIF GUID: {b96b3cb2-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: ImageFormatIcon GUID: {b96b3cb5-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatUndefined guid: {b96b3ca9-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatMemoryBMP guid: {b96b3caa-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatBMP guid: {b96b3cab-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatEMF guid: {b96b3cac-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatWMF guid: {b96b3cad-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatJPEG guid: {b96b3cae-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatPNG guid: {b96b3caf-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatGIF guid: {b96b3cb0-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatTIFF guid: {b96b3cb1-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatEXIF guid: {b96b3cb2-0728-11d3-9d7b-0000f81ef32e} +CONSTANT: ImageFormatIcon guid: {b96b3cb5-0728-11d3-9d7b-0000f81ef32e} -CONSTANT: FrameDimensionTime GUID: {6aedbd6d-3fb5-418a-83a6-7f45229dc872} -CONSTANT: FrameDimensionPage GUID: {7462dc86-6180-4c7e-8e3f-ee7333a7a483} -CONSTANT: FrameDimensionResolution GUID: {84236f7b-3bd3-428f-8dab-4ea1439ca315} +CONSTANT: FrameDimensionTime guid: {6aedbd6d-3fb5-418a-83a6-7f45229dc872} +CONSTANT: FrameDimensionPage guid: {7462dc86-6180-4c7e-8e3f-ee7333a7a483} +CONSTANT: FrameDimensionResolution guid: {84236f7b-3bd3-428f-8dab-4ea1439ca315} ENUM: ImageLockMode { ImageLockModeRead 1 } diff --git a/basis/windows/ole32/ole32-tests.factor b/basis/windows/ole32/ole32-tests.factor index 83314efce9..9f78f524c5 100644 --- a/basis/windows/ole32/ole32-tests.factor +++ b/basis/windows/ole32/ole32-tests.factor @@ -23,7 +23,7 @@ IN: windows.ole32.tests ] unit-test [ - GUID: 01234567-89ab-cdef-0123-456789abcdef} + guid: 01234567-89ab-cdef-0123-456789abcdef} ] [ "{01234567-89ab-cdef-0123-456789abcdef}" string>guid ] unit-test [ "{01234567-89ab-cdef-0123-456789abcdef}" ] diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor index 234d4b1c5b..d7355626a7 100644 --- a/basis/windows/winsock/winsock.factor +++ b/basis/windows/winsock/winsock.factor @@ -430,7 +430,7 @@ FUNCTION: void GetAcceptExSockaddrs ( CONSTANT: SIO_GET_EXTENSION_FUNCTION_POINTER -939524090 -CONSTANT: WSAID_CONNECTEX GUID: {25a207b9-ddf3-4660-8ee9-76e58c74063e} +CONSTANT: WSAID_CONNECTEX guid: {25a207b9-ddf3-4660-8ee9-76e58c74063e} ERROR: winsock-exception n string ;