add void STDCALL

Author: s-a

scripts/build.ps1

@@ -108,52 +108,59 @@ if (-not $SkipNative) {
 
     Set-Location $ProjectRoot
 
-    # Step 2b: Build wrapper library (FIXED)
+    # Step 2b: Build wrapper library (FINAL FIX)
     Write-Host "🔧 Building wrapper library..." -ForegroundColor Yellow
+    
+    # --- ADD CLEANUP STEP ---
+    Write-Host "🧹 Cleaning up old build artifacts..."
+    Remove-Item -Path "wrapper.c", "wrapper.def", "libpgquery_wrapper.dll" -ErrorAction SilentlyContinue
 
     $WrapperPath = Join-Path $ProjectRoot "wrapper.c"
     $DefPath = Join-Path $ProjectRoot "wrapper.def"
 
-    # Create the wrapper.c file with the same logic as the bash script
-    Write-Host "Creating wrapper.c with explicit wrapper functions..."
+    # Create the wrapper.c file, forcing __stdcall calling convention to match .NET's P/Invoke default
+    Write-Host "Creating wrapper.c with __stdcall calling convention..."
     @"
 #include "libpg_query/pg_query.h"
 
-PgQueryProtobufParseResult pg_query_parse_protobuf_wrapper(const char* input) {
+// Forcing __stdcall is crucial for default .NET P/Invoke on Windows
+#define STDCALL __stdcall
+
+PgQueryProtobufParseResult STDCALL pg_query_parse_protobuf_wrapper(const char* input) {
     return pg_query_parse_protobuf(input);
 }
 
-PgQueryProtobufParseResult pg_query_parse_protobuf_opts_wrapper(const char* input, int parser_options) {
+PgQueryProtobufParseResult STDCALL pg_query_parse_protobuf_opts_wrapper(const char* input, int parser_options) {
     return pg_query_parse_protobuf_opts(input, parser_options);
 }
 
-void pg_query_free_protobuf_parse_result_wrapper(PgQueryProtobufParseResult result) {
+void STDCALL pg_query_free_protobuf_parse_result_wrapper(PgQueryProtobufParseResult result) {
     pg_query_free_protobuf_parse_result(result);
 }
 
-PgQueryDeparseResult pg_query_deparse_protobuf_wrapper(PgQueryProtobuf parse_tree) {
+PgQueryDeparseResult STDCALL pg_query_deparse_protobuf_wrapper(PgQueryProtobuf parse_tree) {
     return pg_query_deparse_protobuf(parse_tree);
 }
 
-PgQueryParseResult pg_query_parse_wrapper(const char* input) {
+PgQueryParseResult STDCALL pg_query_parse_wrapper(const char* input) {
     return pg_query_parse(input);
 }
 
-void pg_query_free_parse_result_wrapper(PgQueryParseResult result) {
+void STDCALL pg_query_free_parse_result_wrapper(PgQueryParseResult result) {
     pg_query_free_parse_result(result);
 }
 
-PgQueryNormalizeResult pg_query_normalize_wrapper(const char* input) {
+PgQueryNormalizeResult STDCALL pg_query_normalize_wrapper(const char* input) {
     return pg_query_normalize(input);
 }
 
-void pg_query_free_normalize_result_wrapper(PgQueryNormalizeResult result) {
+void STDCALL pg_query_free_normalize_result_wrapper(PgQueryNormalizeResult result) {
     pg_query_free_normalize_result(result);
 }
 "@ | Set-Content -Path $WrapperPath -Encoding Ascii
 
-    # Create the .def file to explicitly export the wrapper functions
-    Write-Host "Creating wrapper.def to export wrapper functions..."
+    # Create the .def file to export the wrapper functions with undecorated names
+    Write-Host "Creating wrapper.def to export functions..."
     @"
 EXPORTS
     pg_query_parse_protobuf_wrapper