Change #getTempPath:buffer: on WinPlatform to use ‘GetTempPathW’ instead of ‘GetTempPath2W’

src/System-OSEnvironments-Tests/OSEnvironmentTest.class.st

@@ -109,9 +109,11 @@ OSEnvironmentTest >> testSettingEnvValueDuringRevertsValueAfterDuringBlock [
 	envName := self envNameForTest.
 	self instance setEnv: envName value: 'Before'.
 	expected := 'After'.
-	self instance setEnv: envName value: expected during: [  ].
+	self instance setEnv: envName value: expected during: [
+		actual := self instance at: envName.
+		self assert: actual equals: expected ].
 	actual := self instance at: envName.
-	self assert: actual equals: expected
+	self assert: actual equals: 'Before'
 ]
 
 { #category : 'tests' }

src/System-OSEnvironments/OSEnvironment.class.st

@@ -262,7 +262,7 @@ OSEnvironment >> setEnv: nameString value: valueString during: aBlock [
 	aBlock value ] ensure: [
 		oldValue
 			ifNil: [ self removeKey: nameString ]
-			ifNotNil: [ self setEnv: nameString value: valueString ] ]
+			ifNotNil: [ self setEnv: nameString value: oldValue ] ]
 ]
 
 { #category : 'accessing' }

src/System-OSEnvironments/Win32Environment.class.st

@@ -121,7 +121,7 @@ Win32Environment >> keysAndValuesDo: aBlock [
 { #category : 'private' }
 Win32Environment >> removeEnvironmentVariable: nameString [
 
-	 ^ self ffiCall: #( int SetEnvironmentVariableW ( Win32WideString nameString, 0 ) )
+	 ^ self ffiCall: #( int SetEnvironmentVariableW ( Win32WideString nameString, Win32WideString 0 ) )
 ]
 
 { #category : 'accessing' }

src/System-Platforms-Tests/WinPlatformTest.class.st

@@ -19,5 +19,7 @@ WinPlatformTest >> testGetTempPathFromTMP [
 	OSEnvironment current at: 'TMP' put: expected.
 	actual := OSPlatform current getTempPath.
 	self assert: actual equals: expected ] ensure: [
-		value ifNotNil: [ OSEnvironment current at: 'TMP' put: value ] ]
+		value
+			ifNil: [ OSEnvironment current removeKey: 'TMP' ]
+			ifNotNil: [ OSEnvironment current at: 'TMP' put: value ] ]
 ]

src/System-Platforms/WinPlatform.class.st

@@ -86,7 +86,7 @@ WinPlatform >> getTempPath [
 { #category : 'file paths' }
 WinPlatform >> getTempPath: bufferLength buffer: buffer [
 
-    self ffiCall: #(long GetTempPath2W(long bufferLength,
+    self ffiCall: #(long GetTempPathW(long bufferLength,
                             void*  buffer))
 ]