issue #358: rename ole32-error -> check-ole32-error

diff --git a/basis/io/files/temp/windows/windows.factor b/basis/io/files/temp/windows/windows.factor
index 3d1a66a824ac690370e332fa6fb1ebd126d6c2b8..cb092feba765254bc3e763a742ae8aa96bfa1324 100644 (file)
--- a/basis/io/files/temp/windows/windows.factor
+++ b/basis/io/files/temp/windows/windows.factor
@@ -21,8 +21,8 @@ IN: io.files.temp.windows
     0
     MAX_PATH 1 + WCHAR <c-array>
     [ SHGetFolderPath ] keep
-    swap ole32-error
-    alien>native-string ;
+    swap check-ole32-error
+    utf16n alien>native-string ;
 
 PRIVATE>
 

diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor
index 41059c5669313fead4bfcbf4c9a11d2ffcdefad3..7b30c71e512ce5236ffd2f3d3def6da4287bb4ff 100644 (file)
--- a/basis/windows/com/com.factor
+++ b/basis/windows/com/com.factor
@@ -86,7 +86,7 @@ FUNCTION: void ReleaseStgMedium ( LPSTGMEDIUM pmedium ) ;
 
 : com-query-interface ( interface iid -- interface' )
     { void* }
-    [ IUnknown::QueryInterface ole32-error ]
+    [ IUnknown::QueryInterface check-ole32-error ]
     with-out-parameters ;
 
 : com-add-ref ( interface -- interface )

diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor
index 5603a1cc23534000250195adff50839450616673..abf255d4d0ff03c2ea90c8ac661edb51459b7a11 100644 (file)
--- a/basis/windows/ole32/ole32.factor
+++ b/basis/windows/ole32/ole32.factor
@@ -122,11 +122,11 @@ TUPLE: ole32-error code message ;
 : <ole32-error> ( code -- error )
     dup n>win32-error-string \ ole32-error boa ;
 
-: ole32-error ( hresult -- )
+: check-ole32-error ( hresult -- )
     dup succeeded? [ drop ] [ <ole32-error> throw ] if ;
 
 : ole-initialize ( -- )
-    f OleInitialize ole32-error ;
+    f OleInitialize check-ole32-error ;
 
 : guid= ( a b -- ? )
     [ 16 memory>byte-array ] bi@ = ;

diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor
index 4c6593f92187709c2ba229e5f94f3c5630ce1a94..f1b75832c1f053f41d337fea68c4b66d9b2e5223 100755 (executable)
--- a/basis/windows/uniscribe/uniscribe.factor
+++ b/basis/windows/uniscribe/uniscribe.factor
@@ -20,12 +20,12 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
         swap ! icp
         FALSE ! fTrailing
     ] if
-    { int } [ ScriptStringCPtoX ole32-error ] with-out-parameters ;
+    { int } [ ScriptStringCPtoX check-ole32-error ] with-out-parameters ;
 
 : x>line-offset ( x script-string -- n trailing )
     ssa>> ! ssa
     swap ! iX
-    { int int } [ ScriptStringXtoCP ole32-error ] with-out-parameters ;
+    { int int } [ ScriptStringXtoCP check-ole32-error ] with-out-parameters ;
 
 <PRIVATE
 
@@ -44,7 +44,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
     f ! pbInClass
     f void* <ref> ! pssa
     [ ScriptStringAnalyse ] keep
-    [ ole32-error ] [ |ScriptStringFree void* deref ] bi* ;
+    [ check-ole32-error ] [ |ScriptStringFree void* deref ] bi* ;
 
 : set-dc-colors ( dc font -- )
     [ background>> color>RGB SetBkColor drop ]
@@ -65,7 +65,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
     ! iMinSel
     ! iMaxSel
     FALSE ! fDisabled
-    ScriptStringOut ole32-error ;
+    ScriptStringOut check-ole32-error ;
 
 : draw-script-string ( dc script-string -- )
     [ font>> set-dc-colors ] keep (draw-script-string) ;
@@ -103,7 +103,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ;
 PRIVATE>
 
 M: script-string dispose*
-    ssa>> void* <ref> ScriptStringFree ole32-error ;
+    ssa>> void* <ref> ScriptStringFree check-ole32-error ;
 
 SYMBOL: cached-script-strings