fix(oserr): windows: raiseExcWithPath used wrong error code

... didn't cast winerror code to errno before exc map

Author: litlighilit

src/pylib/pyerrors/oserr.nim

@@ -70,7 +70,10 @@ template noWeirdTarget*(def) =
 
 proc raiseExcWithPath*(p: PathLike, errCode: OSErrorCode){.sideEffect.} =
   ## raises OSError or its one of SubError type
-  raise OSError_new[oserrors_types.PyOSError](true, errCode.cint, p.fspath)
+  raise when defined(windows):
+    OSError_new[oserrors_types.PyOSError](0, p.fspath, winerror=errCode.cint)
+  else:
+    OSError_new[oserrors_types.PyOSError](errCode.cint, p.fspath)
 
 proc raiseExcWithPath*(p: PathLike){.sideEffect.} =
   let oserr = osLastError()
@@ -119,7 +122,7 @@ elif not weirdTarget:
   func errnoMsg*(errno: cint): string = $c_strerror(errno)
 
 proc newErrnoErrT[E: PyOSError](errno=getErrno(), strerr: string): owned(ref PyOSError) =
-  OSError_new[E](false, errno, strerr)
+  OSError_new[E](errno, strerr)
 proc newErrnoErrT[E: PyOSError](errno=getErrno()): owned(ref PyOSError) =
   newErrnoErrT[E](errno, errnoMsg(errno))
 
@@ -136,11 +139,11 @@ proc raiseErrnoT*[T: PyOSError](errno=getErrno()) =
 proc raiseErrnoWithPath*[T](p: PathLike[T]; errno = getErrno()) =
   ## raises OSError or its SubError.
   ## refer to errno even under Windows.
-  raise OSError_new[oserrors_types.PyOSError](false, errno, errnoMsg(errno), p.fspath)
+  raise OSError_new[oserrors_types.PyOSError](errno, errnoMsg(errno), p.fspath)
 
 when InJs:
   proc raiseErrnoWithMsg*(errno: cint, errMsg: string) =
-    raise OSError_new[oserrors_types.PyOSError](false, errno, errMsg, fillMsg=false)
+    raise OSError_new[oserrors_types.PyOSError](errno, errMsg, fillMsg=false)
 
   template catchJsErrAndDo(doSth; doErr) =
       var errMsg = ""

src/pylib/pyerrors/oserr/init.nim

@@ -5,7 +5,7 @@ import ./oserror_new
 template gen(name, typ, thirdDefVal){.dirty.} =
   proc name*(myerrno: cint, strerr: string,
       filename = thirdDefVal, winerror: cint = 0, filename2 = ""): ref PyOSError =
-    OSError_new[types.typ](true, myerrno, strerr, filename, winerror, filename2)
+    OSError_new[types.typ](myerrno, strerr, filename, winerror, filename2)
   proc name*(strerr: string = ""): ref PyOSError =
     new result
     result.strerror = strerr

src/pylib/pyerrors/oserr/oserror_new.nim

@@ -28,13 +28,13 @@ type
 template PyNumber_Check(x): bool = x is int
 template PyNumber_AsSsize_t(x, _): int = x
 
-template parseOSErrorArgs(args: var OSErrorArgs) =
+template parseOSErrorArgs(args: var OSErrorArgs, useWinError) =
   ## Parses arguments for OSError construction
   ## Returns tuple containing errno, strerror, filename, filename2, and winerror (on Windows)
   ## Note: This function doesn't cleanup on error, the caller should
   when defined(windows):
     args.winerror = winerror
-    if args.winerror != 0:
+    if useWinError:
       args.errno = winerror_to_errno(args.winerror)
 
 template oserror_use_init*[E: PyOSError](self): bool =
@@ -64,16 +64,17 @@ proc init*[E: PyOSError](self: ref E, args: OSErrorArgs) =
   when defined(windows):
     self.winerror = args.winerror
 
-proc OSError_new*[E: PyOSError](useWinError: bool, myerrno: cint, strerr: string,
+proc OSError_new*[E: PyOSError](myerrno: cint, strerr: string,
     filename: string|int = "", winerror: cint = 0, filename2 = "", fillMsg: static[bool] = true): ref PyOSError =
   ## may returns a subclass of OSError
   type Third = typeof(filename)
   var args: OSErrorArgs[Third] = (myerrno, strerr, filename, winerror, filename2)
   var newtype = proc (): ref PyOSError = new E
   let use_init = oserror_use_init[E](result)
   if not use_init:
+    let useWinError = winerror != 0
     if useWinError:
-      parseOSErrorArgs(args)
+      parseOSErrorArgs(args, useWinError)
     when E is PyOSError:
       newtype = errnomap.getOrDefault(args.errno, default_oserror)
   result = newtype()