Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5a1e897d
Commit
5a1e897d
authored
Feb 05, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libport: Move wine_compare_string implementation back to libwine and make it obsolete.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
afd681eb
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
11 deletions
+17
-11
unicode.h
include/wine/unicode.h
+0
-3
Makefile.in
libs/port/Makefile.in
+0
-1
Makefile.in
libs/wine/Makefile.in
+2
-1
port.c
libs/wine/port.c
+0
-1
sortkey.c
libs/wine/sortkey.c
+13
-3
wine.map
libs/wine/wine.map
+2
-2
No files found.
include/wine/unicode.h
View file @
5a1e897d
...
...
@@ -93,9 +93,6 @@ extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int
extern
int
wine_utf8_mbstowcs
(
int
flags
,
const
char
*
src
,
int
srclen
,
WCHAR
*
dst
,
int
dstlen
);
extern
int
wine_utf8_wcstombs
(
int
flags
,
const
WCHAR
*
src
,
int
srclen
,
char
*
dst
,
int
dstlen
);
extern
int
wine_compare_string
(
int
flags
,
const
WCHAR
*
str1
,
int
len1
,
const
WCHAR
*
str2
,
int
len2
);
extern
int
wine_get_sortkey
(
int
flags
,
const
WCHAR
*
src
,
int
srclen
,
char
*
dst
,
int
dstlen
);
extern
int
strcmpiW
(
const
WCHAR
*
str1
,
const
WCHAR
*
str2
);
extern
int
strncmpiW
(
const
WCHAR
*
str1
,
const
WCHAR
*
str2
,
int
n
);
extern
int
memicmpW
(
const
WCHAR
*
str1
,
const
WCHAR
*
str2
,
int
n
);
...
...
libs/port/Makefile.in
View file @
5a1e897d
...
...
@@ -96,7 +96,6 @@ C_SRCS = \
pwrite.c
\
readlink.c
\
rint.c
\
sortkey.c
\
spawn.c
\
statvfs.c
\
string.c
\
...
...
libs/wine/Makefile.in
View file @
5a1e897d
...
...
@@ -8,7 +8,8 @@ C_SRCS = \
ldt.c
\
loader.c
\
mmap.c
\
port.c
port.c
\
sortkey.c
EXTRA_OBJS
=
version.o
...
...
libs/wine/port.c
View file @
5a1e897d
...
...
@@ -38,7 +38,6 @@ const void *libwine_port_functions[] =
{
strtolW
,
vsnprintfW
,
wine_compare_string
,
wine_cp_enum_table
,
wine_cp_get_table
,
wine_cp_mbstowcs
,
...
...
libs/
port
/sortkey.c
→
libs/
wine
/sortkey.c
View file @
5a1e897d
...
...
@@ -17,6 +17,11 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "wine/asm.h"
#ifdef __ASM_OBSOLETE
#include "wine/unicode.h"
extern
const
unsigned
int
collation_table
[];
...
...
@@ -38,7 +43,7 @@ static const WCHAR *get_decomposition( WCHAR ch, unsigned int *len )
*
* FIXME: 'variable' flag not handled
*/
int
wine_get_sortkey
(
int
flags
,
const
WCHAR
*
src
,
int
srclen
,
char
*
dst
,
int
dstlen
)
int
wine_get_sortkey
_obsolete
(
int
flags
,
const
WCHAR
*
src
,
int
srclen
,
char
*
dst
,
int
dstlen
)
{
WCHAR
dummy
[
4
];
/* no decomposition is larger than 4 chars */
int
key_len
[
4
];
...
...
@@ -289,8 +294,8 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1,
return
len1
-
len2
;
}
int
wine_compare_string
(
int
flags
,
const
WCHAR
*
str1
,
int
len1
,
const
WCHAR
*
str2
,
int
len2
)
int
wine_compare_string
_obsolete
(
int
flags
,
const
WCHAR
*
str1
,
int
len1
,
const
WCHAR
*
str2
,
int
len2
)
{
int
ret
;
...
...
@@ -304,3 +309,8 @@ int wine_compare_string(int flags, const WCHAR *str1, int len1,
}
return
ret
;
}
__ASM_OBSOLETE
(
wine_get_sortkey
);
__ASM_OBSOLETE
(
wine_compare_string
);
#endif
/* __ASM_OBSOLETE */
libs/wine/wine.map
View file @
5a1e897d
...
...
@@ -9,7 +9,6 @@ WINE_1.0
wine_anon_mmap;
wine_casemap_lower;
wine_casemap_upper;
wine_compare_string;
wine_cp_enum_table;
wine_cp_get_table;
wine_cp_mbstowcs;
...
...
@@ -32,7 +31,6 @@ WINE_1.0
wine_get_fs;
wine_get_gs;
wine_get_server_dir;
wine_get_sortkey;
wine_get_ss;
wine_get_user_name;
wine_get_version;
...
...
@@ -107,6 +105,7 @@ WINE_1.0
vsnprintfW;
vsprintfW;
wine_call_on_stack;
wine_compare_string;
wine_dbg_log;
wine_dbg_printf;
wine_dbg_sprintf;
...
...
@@ -117,6 +116,7 @@ WINE_1.0
wine_dll_load_main_exe;
wine_dll_unload;
wine_fold_string;
wine_get_sortkey;
wine_pthread_get_functions;
wine_pthread_set_functions;
wine_switch_to_stack;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment