[PATCH v3 3/3] win32u: Use RtlRestoreLastWin32Error instead of RtlSetLastWin32Error if appropriate

[Alfred Agrell]

From: Alfred Agrell

---
 dlls/ntdll/unix/env.c   | 4 ++++
 dlls/win32u/clipboard.c | 2 +-
 dlls/win32u/spy.c       | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
index ad9ab0dc220..65df38518c0 100644
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -2467,3 +2467,7 @@ void WINAPI RtlSetLastWin32Error( DWORD err )
 #endif
     teb->LastErrorValue = err;
 }
+void WINAPI RtlRestoreLastWin32Error( DWORD err )
+{
+    RtlSetLastWin32Error(err);
+}
diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c
index 6cf484a56ca..8b8c5f0ea2d 100644
--- a/dlls/win32u/clipboard.c
+++ b/dlls/win32u/clipboard.c
@@ -58,7 +58,7 @@ static const char *debugstr_format( UINT id )
     WCHAR buffer[256];
     DWORD le = RtlGetLastWin32Error();
     BOOL r = NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) );
-    RtlSetLastWin32Error(le);
+    RtlRestoreLastWin32Error(le);

if (r)
         return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) );
diff --git a/dlls/win32u/spy.c b/dlls/win32u/spy.c
index 20a57803cb6..a0422d69434 100644
--- a/dlls/win32u/spy.c
+++ b/dlls/win32u/spy.c
@@ -2220,7 +2220,7 @@ const char *debugstr_msg_name( UINT msg, HWND hWnd )
     ext_sp_e.wParam = 0;
     ext_sp_e.wnd_class[0] = 0;
     SPY_GetMsgStuff(&ext_sp_e);
-    RtlSetLastWin32Error( save_error );
+    RtlRestoreLastWin32Error( save_error );
     return wine_dbg_sprintf("%s", ext_sp_e.msg_name);
 }

@@ -2505,7 +2505,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter)
                         /* save and restore error code over the next call */
                         save_error = RtlGetLastWin32Error();
                         NtUserGetClassName( pnmh->hwndFrom, FALSE, &str );
-                        RtlSetLastWin32Error(save_error);
+                        RtlRestoreLastWin32Error(save_error);
                         if (wcscmp(TOOLBARCLASSNAMEW, from_class) == 0)
                             dumplen = sizeof(NMTBCUSTOMDRAW)-sizeof(NMHDR);
                     } else if ( pnmh->code >= HDN_ENDDRAG
@@ -2639,7 +2639,7 @@ void spy_enter_message( INT iFlag, HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP
         break;
     }
     set_indent_level( indent + SPY_INDENT_UNIT );
-    RtlSetLastWin32Error( save_error );
+    RtlRestoreLastWin32Error( save_error );
 }

@@ -2684,5 +2684,5 @@ void spy_exit_message( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn,
         SPY_DumpStructure(&sp_e, FALSE);
         break;
     }
-    RtlSetLastWin32Error( save_error );
+    RtlRestoreLastWin32Error( save_error );
 }