[PATCH v6 0/1] MR10900: vbscript: Parse octal numeric literals (&O...).

[Francis De Brabandere (＠francisdb)]

Native cscript accepts &O0, &O17, &O177777, etc. as octal integer literals.
Wine was emitting err 1002 (syntax error) for any &O prefix because the
lexer only recognised &H. Add an oct_to_int helper and parse_oct_literal
mirroring parse_hex_literal, allowing up to 32-bit values; overflow checks
use an ULONGLONG accumulator since 11-digit octal can exceed 32 bits.

--
  v6: vbscript: Parse octal numeric literals (&O...).
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10900

[PATCH v6 1/1] vbscript: Parse octal numeric literals (&O...).

[Francis De Brabandere]

From: Francis De Brabandere <[e-mail]>

Native cscript accepts &O0, &O17, &O177777, etc. as octal integer literals.
Wine was emitting err 1002 (syntax error) for any &O prefix because the
lexer only recognised &H. Add an oct_to_int helper and parse_oct_literal
allowing up to 32-bit values; overflow uses a ULONGLONG accumulator since
11-digit octal can exceed 32 bits.
---
 dlls/vbscript/lex.c          | 31 +++++++++++++++++++++++++++++++
 dlls/vbscript/tests/lang.vbs | 23 +++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c
index 81cc67e037b..b8802a2991e 100644
--- a/dlls/vbscript/lex.c
+++ b/dlls/vbscript/lex.c
@@ -394,6 +394,35 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret)
     return tInt;
 }
 
+static int oct_to_int(WCHAR c)
+{
+    if('0' <= c && c <= '7')
+        return c-'0';
+    return -1;
+}
+
+static int parse_oct_literal(parser_ctx_t *ctx, LONG *ret)
+{
+    ULONGLONG l = 0;
+    int d;
+
+    while((d = oct_to_int(*++ctx->ptr)) != -1) {
+        l = l*8 + d;
+        if(l > UINT_MAX) {
+            WARN("overflow in oct literal\n");
+            return 0;
+        }
+    }
+
+    if(*ctx->ptr == '&') {
+        ctx->ptr++;
+        *ret = (LONG)l;
+    }else {
+        *ret = l == (UINT16)l ? (INT16)l : (LONG)l;
+    }
+    return tInt;
+}
+
 static void skip_spaces(parser_ctx_t *ctx)
 {
     while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\v' || *ctx->ptr == '\f')
@@ -537,6 +566,8 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx)
     case '&':
         if((*++ctx->ptr == 'h' || *ctx->ptr == 'H') && hex_to_int(ctx->ptr[1]) != -1)
             return parse_hex_literal(ctx, lval);
+        if((*ctx->ptr == 'o' || *ctx->ptr == 'O') && oct_to_int(ctx->ptr[1]) != -1)
+            return parse_oct_literal(ctx, lval);
         return '&';
     case '=':
         switch(*++ctx->ptr) {
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index d8d612bd389..89cfdcac836 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -87,6 +87,29 @@ Call ok(&h0& = 0, "&h0& <> 0")
 Call ok(&h00 = 0, "&h00 <> 0")
 Call ok(&h000000000 = 0, "&h000000000 <> 0")
 
+' Octal literals (&O...)
+Call ok(&O0 = 0, "&O0 <> 0")
+Call ok(&O17 = 15, "&O17 <> 15")
+Call ok(&o17 = 15, "&o17 (lowercase) <> 15")
+Call ok(&O77 = 63, "&O77 <> 63")
+Call ok(&O777 = 511, "&O777 <> 511")
+Call ok(&O177777 = -1, "&O177777 <> -1")
+Call ok(&O200000 = 65536, "&O200000 <> 65536")
+Call ok(&O17777777777 = 2147483647, "&O17777777777 <> 2147483647")
+Call ok(&O37777777777 = -1, "&O37777777777 <> -1")
+Call ok(&O17& = 15, "&O17& <> 15")
+Call ok(&O177777& = 65535, "&O177777& <> 65535")
+Call ok(getVT(&O77) = "VT_I2", "getVT(&O77) is not VT_I2")
+Call ok(getVT(&O200000) = "VT_I4", "getVT(&O200000) is not VT_I4")
+Call ok(getVT(&O177777&) = "VT_I4", "getVT(&O177777&) is not VT_I4")
+
+sub testOctalLiteralErrors()
+    Dim oct
+    on error resume next
+    Err.Clear : oct = Eval("&O8") : call ok(Err.number = 1002, "&O8 should be syntax error, got err=" & Err.number)
+end sub
+call testOctalLiteralErrors()
+
 ' Test concat when no space and var begins with h
 hi = "y"
 x = "x" &hi
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10900

[Francis De Brabandere (＠francisdb)]

On Mon May 18 15:12:02 2026 +0000, Francis De Brabandere wrote:
> changed this line in [version 6 of the diff](/wine/wine/-/merge_requests/10900/diffs?diff_id=268358&start_sha=5e61bdd6e9d5c9c45ec4823e7747206baa260001#e19d7f25e61cb09908e1164993ab8330b56e13e3_411_409)
> true, removed

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10900#note_140395

[Francis De Brabandere (＠francisdb)]

On Mon May 18 15:12:02 2026 +0000, Francis De Brabandere wrote:
> changed this line in [version 6 of the diff](/wine/wine/-/merge_requests/10900/diffs?diff_id=268358&start_sha=5e61bdd6e9d5c9c45ec4823e7747206baa260001#e19d7f25e61cb09908e1164993ab8330b56e13e3_415_411)
> applied

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10900#note_140397

[Francis De Brabandere (＠francisdb)]

On Mon May 18 15:13:51 2026 +0000, Jacek Caban wrote:
> If you need to rewrite the previous commit like that in the second one,
> then the split has little value. You could just squash the commits instead.
> squashed

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10900#note_140398

[PATCH v6 0/1] MR10900: vbscript: Parse octal numeric literals (&O...). - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10900