0.5.7.3-alt1

.gear/rules

-tar: wine-grdwine name=@name@-@version@
+tar: wine-grdwine name=@name@-@version@ base=@name@-@version@/grdwine
 copy?: *.rules
 copy?: *.patch

wine-grdwine.spec

@@ -4,7 +4,7 @@
 %define _lto_cflags %{nil}
 
 Name: wine-etersoft-grdwine
-Version: 0.5.7.2
+Version: 0.5.7.3
 Release: alt1
 
 Summary: Guardant usb dongle helper library for Wine
@@ -19,28 +19,48 @@ Source: %name-%version.tar
 
 Source1: 90-grdnt.rules
 
-Patch1: 0001-build-both-ELF-and-PE-parts.patch
-Patch2: 0001-don-t-use-DLL_WINE_PREATTACH.patch
+ExclusiveArch: %ix86 x86_64
+
+%define libwinedir %_libdir/wine-etersoft
 
-BuildRequires: libwine-devel >= 6.23
+# TODO: use mingw detection from wine or just wait for total PE using
+%def_with pebuild
+
+# check if we need wow64 build also
+%if "%(test -d %libwinedir/i386-windows && echo 1)" == "1"
+%def_with wow64
+%endif
 
-ExclusiveArch: %ix86 x86_64
 
 %ifarch x86_64 aarch64
-  %def_with build64
-  %define winepkgname wine-etersoft-grdwine
-  %define opkgname wine-grdwine
-%else
-  %def_without build64
-  %define winepkgname wine32-etersoft-grdwine
-  %define opkgname wine32-grdwine
+    %def_with build64
+    %define winearch wine64
+    %define winepkgname wine-etersoft-grdwine
+    %define winedevpkgname wine-etersoft-devel-tools
+    %define opkgname wine-grdwine
 %endif
 
-Provides: %opkgname = %EVR
-Obsoletes: %opkgname < %EVR
+# workaround for https://bugzilla.altlinux.org/38130
+# buildwow64 = _arch = x86_64  && with wow64
+%if "%_arch" == "x86_64" && %{expand:%%{?_with_wow64:1}%%{!?_with_wow64:0}}
+    %def_with buildwow64
+    %undefine _with_build64
+%endif
 
+%ifarch %ix86
+    %def_without build64
+    %define winepkgname wine32-etersoft-grdwine
+    %define winedevpkgname wine32-etersoft-devel-tools
+    %define opkgname wine32-grdwine
+%endif
 
-%define libwinedir %_libdir/wine-etersoft
+BuildRequires: %winedevpkgname >= 9
+
+# lib.req: ERROR: /tmp/.private/lav/wine-cpcsp_proxy-buildroot/usr/lib64/wine/x86_64-unix/cpcsp_proxy.so: library ntdll.so not found
+AutoReq: no
+
+Provides: %opkgname = %EVR
+Obsoletes: %opkgname < %EVR
 
 # TODO: move to rpm-macros-wine
 # set arch dependent dirs
@@ -60,8 +80,10 @@ Obsoletes: %opkgname < %EVR
 %define winepedir aarch64-windows
 %define winesodir aarch64-unix
 %endif
+%define winepe32dir i386-windows
 
 %add_verify_elf_skiplist %libwinedir/%winesodir/grdwine.dll.so
+%add_verify_elf_skiplist %libwinedir/%winesodir/grdwine.so
 
 %description
 Guardant usb dongle helper library for Wine.
@@ -89,39 +111,64 @@ Old keys Stealth II and Stealth III are not supported here
 
 %prep
 %setup
-%patch1 -p1
-%patch2 -p1
+%if_with buildwow64
+cp -a grdwine grdwine_wow64
+%endif
 
 %build
-#autoreconf
-./bootstrap.sh
-
-%if_with build64
-%configure \
-	--enable-win64 \
+%make_build -C grdwine \
+    LIBDIR=%_libdir \
+%if_with pebuild
+    TARGETDLL=grdwine.dll \
 %else
-%configure \
+    TARGETDLL="grdwine.dll grdwine.dll.so" \
+%endif
+    %nil
+
+%if_with buildwow64
+%make_build -C grdwine_wow64 \
+    LIBDIR=%_libdir \
+    WOW64BUILD=yes \
+    TARGETDLL=grdwine.dll \
+    grdwine.dll
+    %nil
 %endif
-	--with-wineincs=%_includedir \
-	--with-wineso=%buildroot/%libwinedir/%winesodir \
-	--with-winepe=%buildroot/%libwinedir/%winepedir
-
-%make_build
 
 %install
-%makeinstall_std
+mkdir -p %buildroot%libwinedir/{%winesodir,%winepedir}
+
+cp grdwine/grdwine.so %buildroot%libwinedir/%winesodir
+cp grdwine/grdwine.dll %buildroot%libwinedir/%winepedir
+%if_with buildwow64
+mkdir -p %buildroot%libwinedir/%winepe32dir
+cp grdwine_wow64/grdwine.dll %buildroot%libwinedir/%winepe32dir
+%endif
+
+%if_without pebuild
+cp grdwine/grdwine.dll.so %buildroot%libwinedir/%winesodir
+%endif
+
 %if_with build64
 install -D -m0644 %SOURCE1 %buildroot%_udevrulesdir/90-grdnt.rules
 %endif
 
 %files -n %winepkgname
-%libwinedir/%winesodir/grdwine.dll.so
+%libwinedir/%winesodir/grdwine.so
 %libwinedir/%winepedir/grdwine.dll
+%if_with buildwow64
+%libwinedir/%winepe32dir/grdwine.dll
+%endif
+%if_without pebuild
+%libwinedir/%winesodir/grdwine.dll.so
+%endif
 %if_with build64
 %_udevrulesdir/*.rules
 %endif
 
 %changelog
+* Thu Sep 18 2025 Vitaly Lipatov <lav@altlinux.ru> 0.5.7.3-alt1
+- build with wow64 support
+
 * Wed May 22 2024 Vitaly Lipatov <lav@altlinux.ru> 0.5.7.2-alt1
 - added guardant Stealth 2 support (eterbug #17339)
 

wine-grdwine/Makefile

+MODULE   = grdwine.dll
+UNIXLIB  = grdwine.so
+
+CROSSBUILD =
+WOW64BUILD =
+
+LIBDIR = /usr/lib
+#LIBDIR = /usr/lib/x86_64-linux-gnu
+
+ifeq ($(shell echo $(LIBDIR) | grep -q 64 && echo -n x86_64),x86_64)
+WINEARCH = x86_64-windows
+UNIXARCH = x86_64-unix
+else
+WINEARCH = i686-windows
+UNIXARCH = i386-unix
+ifeq ($(shell arch),x86_64)
+CROSSBUILD = -m32
+endif
+endif
+
+ifeq ($(WOW64BUILD),yes)
+WINEARCH = i686-windows
+UNIXARCH =
+ifeq ($(shell arch),x86_64)
+CROSSBUILD = -m32
+endif
+endif
+
+UNIXGCC  = gcc $(CROSSBUILD) -DWINE_UNIX_LIB -fPIC -I/usr/include/wine/windows
+
+WINELIBDIR = $(LIBDIR)/wine-etersoft
+
+#
+ifeq ($(shell test -e $(WINELIBDIR)/$(UNIXARCH)/ntdll.dll.so || ! test "$(TARGETDLL)" = "grdwine.dll" && echo -n yes),yes)
+WINEGCC = winegcc $(CROSSBUILD)
+TARGETDLL=grdwine.dll.so
+else
+WINEGCC  = winegcc -b $(WINEARCH) -D__WINE_PE_BUILD
+TARGETDLL=grdwine.dll
+endif
+
+CFLAGS   = -g -O2 -Wall -D__WINESRC__
+IMPORTS  = ntdll kernel32 crypt32 advapi32
+LIBS     = $(IMPORTS:%=-l%)
+#UNIXLIBS = -ldl
+UNIXLIBS = -ldl $(WINELIBDIR)/$(UNIXARCH)/ntdll.so
+DEPS     = Makefile grdimpl.h
+UNIXDEPS = Makefile grdimpl.h
+OBJ      = grdwine.c grdwine.spec
+UNIXOBJ  = grdimpl_linux.c
+
+all: grdwine.so $(TARGETDLL)
+
+%.cross.o: %.c $(DEPS)
+	$(WINEGCC) -c -o $@ $< $(CFLAGS)
+
+%.o: %.c $(UNIXDEPS)
+	$(UNIXGCC) -c -o $@ $< $(CFLAGS)
+
+grdwine.so: $(UNIXOBJ)
+	$(UNIXGCC) -o $@ $^ -shared $(CFLAGS) $(UNIXLIBS)
+	#strip $@
+
+ifeq ($(TARGETDLL),grdwine.dll)
+grdwine.dll: $(OBJ)
+	$(WINEGCC) -o $@ $^ -shared -Wl,--wine-builtin $(CFLAGS) $(LIBS)
+	#strip $@
+else
+grdwine.dll: grdwine.spec
+	$(WINEGCC) -o $@ -Wb,--fake-module -shared $^ -mno-cygwin
+endif
+
+grdwine.dll.so: $(OBJ)
+	$(WINEGCC) -o $@ $^ -shared -Wl,--wine-builtin $(CFLAGS) $(LIBS)
+	#strip $@
+
+clean:
+	rm -f *.o *.so *.dll *.lib

wine-grdwine/Makefile.in

+MODULE    = grdwine.dll
+UNIXLIB   = grdwine.so
+UNIX_CFLAGS =
+
+SOURCES = \
+	grdimpl_linux.c \
+	grdwine.c

wine-grdwine/wine/unixlib.h

+/*
+ * Definitions for Unix libraries
+ *
+ * Copyright (C) 2021 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_WINE_UNIXLIB_H
+#define __WINE_WINE_UNIXLIB_H
+
+#include "winternl.h"
+
+typedef UINT64 unixlib_handle_t;
+
+#ifdef WINE_UNIX_LIB
+
+typedef NTSTATUS (*unixlib_entry_t)( void *args );
+
+extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_funcs[];
+extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_wow64_funcs[];
+
+/* some useful helpers from ntdll */
+NTSYSAPI const char *ntdll_get_build_dir(void);
+NTSYSAPI const char *ntdll_get_data_dir(void);
+NTSYSAPI DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen );
+NTSYSAPI int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict );
+NTSYSAPI int ntdll_wcsicmp( const WCHAR *str1, const WCHAR *str2 );
+NTSYSAPI int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n );
+
+/* exception handling */
+
+#ifdef __i386__
+typedef struct { int reg[16]; } __wine_jmp_buf;
+#elif defined(__x86_64__)
+typedef struct { DECLSPEC_ALIGN(16) struct { unsigned __int64 Part[2]; } reg[16]; } __wine_jmp_buf;
+#elif defined(__arm__)
+typedef struct { int reg[28]; } __wine_jmp_buf;
+#elif defined(__aarch64__)
+typedef struct { __int64 reg[24]; } __wine_jmp_buf;
+#else
+typedef struct { int reg; } __wine_jmp_buf;
+#endif
+
+NTSYSAPI int __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf,
+                                                                              EXCEPTION_REGISTRATION_RECORD *frame );
+NTSYSAPI void DECLSPEC_NORETURN __wine_longjmp( __wine_jmp_buf *buf, int retval );
+NTSYSAPI void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp );
+
+#define __TRY \
+    do { __wine_jmp_buf __jmp; \
+         int __first = 1; \
+         for (;;) if (!__first) \
+         { \
+             do {
+
+#define __EXCEPT \
+             } while(0); \
+             ntdll_set_exception_jmp_buf( NULL ); \
+             break; \
+         } else { \
+             if (__wine_setjmpex( &__jmp, NULL )) { \
+                 do {
+
+#define __ENDTRY \
+                 } while (0); \
+                 break; \
+             } \
+             ntdll_set_exception_jmp_buf( &__jmp ); \
+             __first = 0; \
+         } \
+    } while (0);
+
+NTSYSAPI BOOLEAN KeAddSystemServiceTable( ULONG_PTR *funcs, ULONG_PTR *counters, ULONG limit,
+                                          BYTE *arguments, ULONG index );
+NTSYSAPI NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len );
+
+/* wide char string functions */
+
+static inline int ntdll_iswspace( WCHAR wc )
+{
+    return ('\t' <= wc && wc <= '\r') || wc == ' ' || wc == 0xa0;
+}
+
+static inline size_t ntdll_wcslen( const WCHAR *str )
+{
+    const WCHAR *s = str;
+    while (*s) s++;
+    return s - str;
+}
+
+static inline WCHAR *ntdll_wcscpy( WCHAR *dst, const WCHAR *src )
+{
+    WCHAR *p = dst;
+    while ((*p++ = *src++));
+    return dst;
+}
+
+static inline WCHAR *ntdll_wcscat( WCHAR *dst, const WCHAR *src )
+{
+    ntdll_wcscpy( dst + ntdll_wcslen(dst), src );
+    return dst;
+}
+
+static inline int ntdll_wcscmp( const WCHAR *str1, const WCHAR *str2 )
+{
+    while (*str1 && (*str1 == *str2)) { str1++; str2++; }
+    return *str1 - *str2;
+}
+
+static inline int ntdll_wcsncmp( const WCHAR *str1, const WCHAR *str2, int n )
+{
+    if (n <= 0) return 0;
+    while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; }
+    return *str1 - *str2;
+}
+
+static inline WCHAR *ntdll_wcschr( const WCHAR *str, WCHAR ch )
+{
+    do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++);
+    return NULL;
+}
+
+static inline WCHAR *ntdll_wcsrchr( const WCHAR *str, WCHAR ch )
+{
+    WCHAR *ret = NULL;
+    do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++);
+    return ret;
+}
+
+static inline WCHAR *ntdll_wcspbrk( const WCHAR *str, const WCHAR *accept )
+{
+    for ( ; *str; str++) if (ntdll_wcschr( accept, *str )) return (WCHAR *)(ULONG_PTR)str;
+    return NULL;
+}
+
+static inline SIZE_T ntdll_wcsspn( const WCHAR *str, const WCHAR *accept )
+{
+    const WCHAR *ptr;
+    for (ptr = str; *ptr; ptr++) if (!ntdll_wcschr( accept, *ptr )) break;
+    return ptr - str;
+}
+
+static inline SIZE_T ntdll_wcscspn( const WCHAR *str, const WCHAR *reject )
+{
+    const WCHAR *ptr;
+    for (ptr = str; *ptr; ptr++) if (ntdll_wcschr( reject, *ptr )) break;
+    return ptr - str;
+}
+
+static inline LONG ntdll_wcstol( const WCHAR *s, WCHAR **end, int base )
+{
+    BOOL negative = FALSE, empty = TRUE;
+    LONG ret = 0;
+
+    if (base < 0 || base == 1 || base > 36) return 0;
+    if (end) *end = (WCHAR *)s;
+    while (ntdll_iswspace(*s)) s++;
+
+    if (*s == '-')
+    {
+        negative = TRUE;
+        s++;
+    }
+    else if (*s == '+') s++;
+
+    if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
+    {
+        base = 16;
+        s += 2;
+    }
+    if (base == 0) base = s[0] != '0' ? 10 : 8;
+
+    while (*s)
+    {
+        int v;
+
+        if ('0' <= *s && *s <= '9') v = *s - '0';
+        else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10;
+        else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10;
+        else break;
+        if (v >= base) break;
+        if (negative) v = -v;
+        s++;
+        empty = FALSE;
+
+        if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v))
+            ret = MAXLONG;
+        else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v)))
+            ret = MINLONG;
+        else
+            ret = ret * base + v;
+    }
+
+    if (end && !empty) *end = (WCHAR *)s;
+    return ret;
+}
+
+static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base )
+{
+    BOOL negative = FALSE, empty = TRUE;
+    ULONG ret = 0;
+
+    if (base < 0 || base == 1 || base > 36) return 0;
+    if (end) *end = (WCHAR *)s;
+    while (ntdll_iswspace(*s)) s++;
+
+    if (*s == '-')
+    {
+        negative = TRUE;
+        s++;
+    }
+    else if (*s == '+') s++;
+
+    if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
+    {
+        base = 16;
+        s += 2;
+    }
+    if (base == 0) base = s[0] != '0' ? 10 : 8;
+
+    while (*s)
+    {
+        int v;
+
+        if ('0' <= *s && *s <= '9') v = *s - '0';
+        else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10;
+        else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10;
+        else break;
+        if (v >= base) break;
+        s++;
+        empty = FALSE;
+
+        if (ret > MAXDWORD / base || ret * base > MAXDWORD - v)
+            ret = MAXDWORD;
+        else
+            ret = ret * base + v;
+    }
+
+    if (end && !empty) *end = (WCHAR *)s;
+    return negative ? -ret : ret;
+}
+
+#define iswspace(ch)       ntdll_iswspace(ch)
+#define wcslen(str)        ntdll_wcslen(str)
+#define wcscpy(dst,src)    ntdll_wcscpy(dst,src)
+#define wcscat(dst,src)    ntdll_wcscat(dst,src)
+#define wcscmp(s1,s2)      ntdll_wcscmp(s1,s2)
+#define wcsncmp(s1,s2,n)   ntdll_wcsncmp(s1,s2,n)
+#define wcschr(str,ch)     ntdll_wcschr(str,ch)
+#define wcsrchr(str,ch)    ntdll_wcsrchr(str,ch)
+#define wcspbrk(str,ac)    ntdll_wcspbrk(str,ac)
+#define wcsspn(str,ac)     ntdll_wcsspn(str,ac)
+#define wcscspn(str,rej)   ntdll_wcscspn(str,rej)
+#define wcsicmp(s1, s2)    ntdll_wcsicmp(s1,s2)
+#define wcsnicmp(s1, s2,n) ntdll_wcsnicmp(s1,s2,n)
+#define wcstol(str,e,b)    ntdll_wcstol(str,e,b)
+#define wcstoul(str,e,b)   ntdll_wcstoul(str,e,b)
+
+#else /* WINE_UNIX_LIB */
+
+NTSYSAPI NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args );
+extern unixlib_handle_t __wine_unixlib_handle;
+extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * );
+extern NTSTATUS WINAPI __wine_init_unix_call(void);
+
+#define WINE_UNIX_CALL(code,args) __wine_unix_call_dispatcher( __wine_unixlib_handle, (code), (args) )
+
+#endif /* WINE_UNIX_LIB */
+
+#endif  /* __WINE_WINE_UNIXLIB_H */