wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 975d0632a19efd41338cb73a97f1b0bdbe7bc0cc.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-09-21 09:08:59 +10:00
parent 2771ab8cee
commit a1db1dfc16
31 changed files with 313 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/programs-findstr/0001-findstr-add-basic-functionality-also-support-literal.patch
View File

@@ -1,4 +1,4 @@
From 8913fe5871a9c0d16a44cbcc88af26b318da7ce2 Mon Sep 17 00:00:00 2001
From 2a65304628648472b9c9bd85d2230a020aa5ca1c Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox.xerox2000x@gmail.com>
Date: Wed, 5 Aug 2020 08:39:14 +0200
Subject: [PATCH] findstr: add basic functionality (also support literal search
@@ -15,14 +15,14 @@ Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
create mode 100644 programs/findstr/resources.h
diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in
index 0f29794591..c9d799db6b 100644
index e97ec9c20e3..40142508981 100644
--- a/programs/findstr/Makefile.in
+++ b/programs/findstr/Makefile.in
@@ -1,6 +1,10 @@
MODULE = findstr.exe
+IMPORTS = user32
EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
EXTRADLLFLAGS = -mconsole -municode
C_SRCS = \
main.c
@@ -31,7 +31,7 @@ index 0f29794591..c9d799db6b 100644
+ findstr.rc
diff --git a/programs/findstr/findstr.rc b/programs/findstr/findstr.rc
new file mode 100644
index 0000000000..3a6fad7eb1
index 00000000000..3a6fad7eb1a
--- /dev/null
+++ b/programs/findstr/findstr.rc
@@ -0,0 +1,27 @@
@@ -63,7 +63,7 @@ index 0000000000..3a6fad7eb1
+ IDS_USAGE "Usage: findstr /options string filename\r\n"
+}
diff --git a/programs/findstr/main.c b/programs/findstr/main.c
index d25e1965f6..dc73fbba66 100644
index d25e1965f6e..dc73fbba666 100644
--- a/programs/findstr/main.c
+++ b/programs/findstr/main.c
@@ -1,5 +1,6 @@
@@ -332,7 +332,7 @@ index d25e1965f6..dc73fbba66 100644
}
diff --git a/programs/findstr/resources.h b/programs/findstr/resources.h
new file mode 100644
index 0000000000..e868c7efa4
index 00000000000..e868c7efa4a
--- /dev/null
+++ b/programs/findstr/resources.h
@@ -0,0 +1,29 @@
@@ -366,5 +366,5 @@ index 0000000000..e868c7efa4
+
+#endif /* __WINE_FINDSTR_RESOURCES_H */
--
2.27.0
2.33.0