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
3588e5ab
Commit
3588e5ab
authored
Mar 26, 2019
by
Piotr Caban
Committed by
Alexandre Julliard
Mar 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Use _stricmp instead of strcasecmp.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9b52a967
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
nt.c
dlls/ntdll/nt.c
+7
-7
ntdll_misc.h
dlls/ntdll/ntdll_misc.h
+2
-0
relay.c
dlls/ntdll/relay.c
+2
-2
No files found.
dlls/ntdll/nt.c
View file @
3588e5ab
...
@@ -1200,19 +1200,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
...
@@ -1200,19 +1200,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
while
(
isspace
(
*
value
))
value
++
;
while
(
isspace
(
*
value
))
value
++
;
if
((
s
=
strchr
(
value
,
'\n'
)))
if
((
s
=
strchr
(
value
,
'\n'
)))
*
s
=
'\0'
;
*
s
=
'\0'
;
if
(
!
strcase
cmp
(
line
,
"CPU architecture"
))
if
(
!
_stri
cmp
(
line
,
"CPU architecture"
))
{
{
if
(
isdigit
(
value
[
0
]))
if
(
isdigit
(
value
[
0
]))
info
->
Level
=
atoi
(
value
);
info
->
Level
=
atoi
(
value
);
continue
;
continue
;
}
}
if
(
!
strcase
cmp
(
line
,
"CPU revision"
))
if
(
!
_stri
cmp
(
line
,
"CPU revision"
))
{
{
if
(
isdigit
(
value
[
0
]))
if
(
isdigit
(
value
[
0
]))
info
->
Revision
=
atoi
(
value
);
info
->
Revision
=
atoi
(
value
);
continue
;
continue
;
}
}
if
(
!
strcase
cmp
(
line
,
"features"
))
if
(
!
_stri
cmp
(
line
,
"features"
))
{
{
if
(
strstr
(
value
,
"vfpv3"
))
if
(
strstr
(
value
,
"vfpv3"
))
user_shared_data
->
ProcessorFeatures
[
PF_ARM_VFP_32_REGISTERS_AVAILABLE
]
=
TRUE
;
user_shared_data
->
ProcessorFeatures
[
PF_ARM_VFP_32_REGISTERS_AVAILABLE
]
=
TRUE
;
...
@@ -1268,19 +1268,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
...
@@ -1268,19 +1268,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
while
(
isspace
(
*
value
))
value
++
;
while
(
isspace
(
*
value
))
value
++
;
if
((
s
=
strchr
(
value
,
'\n'
)))
if
((
s
=
strchr
(
value
,
'\n'
)))
*
s
=
'\0'
;
*
s
=
'\0'
;
if
(
!
strcase
cmp
(
line
,
"CPU architecture"
))
if
(
!
_stri
cmp
(
line
,
"CPU architecture"
))
{
{
if
(
isdigit
(
value
[
0
]))
if
(
isdigit
(
value
[
0
]))
info
->
Level
=
atoi
(
value
);
info
->
Level
=
atoi
(
value
);
continue
;
continue
;
}
}
if
(
!
strcase
cmp
(
line
,
"CPU revision"
))
if
(
!
_stri
cmp
(
line
,
"CPU revision"
))
{
{
if
(
isdigit
(
value
[
0
]))
if
(
isdigit
(
value
[
0
]))
info
->
Revision
=
atoi
(
value
);
info
->
Revision
=
atoi
(
value
);
continue
;
continue
;
}
}
if
(
!
strcase
cmp
(
line
,
"Features"
))
if
(
!
_stri
cmp
(
line
,
"Features"
))
{
{
if
(
strstr
(
value
,
"crc32"
))
if
(
strstr
(
value
,
"crc32"
))
user_shared_data
->
ProcessorFeatures
[
PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE
]
=
TRUE
;
user_shared_data
->
ProcessorFeatures
[
PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE
]
=
TRUE
;
...
@@ -2927,7 +2927,7 @@ static ULONG mhz_from_cpuinfo(void)
...
@@ -2927,7 +2927,7 @@ static ULONG mhz_from_cpuinfo(void)
while
((
s
>=
line
)
&&
isspace
(
*
s
))
s
--
;
while
((
s
>=
line
)
&&
isspace
(
*
s
))
s
--
;
*
(
s
+
1
)
=
'\0'
;
*
(
s
+
1
)
=
'\0'
;
value
++
;
value
++
;
if
(
!
strcase
cmp
(
line
,
"cpu MHz"
))
{
if
(
!
_stri
cmp
(
line
,
"cpu MHz"
))
{
sscanf
(
value
,
" %lf"
,
&
cmz
);
sscanf
(
value
,
" %lf"
,
&
cmz
);
break
;
break
;
}
}
...
...
dlls/ntdll/ntdll_misc.h
View file @
3588e5ab
...
@@ -257,4 +257,6 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
...
@@ -257,4 +257,6 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
NTSTATUS
WINAPI
RtlHashUnicodeString
(
PCUNICODE_STRING
,
BOOLEAN
,
ULONG
,
ULONG
*
);
NTSTATUS
WINAPI
RtlHashUnicodeString
(
PCUNICODE_STRING
,
BOOLEAN
,
ULONG
,
ULONG
*
);
void
WINAPI
LdrInitializeThunk
(
CONTEXT
*
,
void
**
,
ULONG_PTR
,
ULONG_PTR
);
void
WINAPI
LdrInitializeThunk
(
CONTEXT
*
,
void
**
,
ULONG_PTR
,
ULONG_PTR
);
/* string functions */
int
__cdecl
_stricmp
(
LPCSTR
str1
,
LPCSTR
str2
);
#endif
#endif
dlls/ntdll/relay.c
View file @
3588e5ab
...
@@ -889,7 +889,7 @@ void RELAY_SetupDLL( HMODULE module )
...
@@ -889,7 +889,7 @@ void RELAY_SetupDLL( HMODULE module )
data
->
module
=
module
;
data
->
module
=
module
;
data
->
base
=
exports
->
Base
;
data
->
base
=
exports
->
Base
;
len
=
strlen
(
(
char
*
)
module
+
exports
->
Name
);
len
=
strlen
(
(
char
*
)
module
+
exports
->
Name
);
if
(
len
>
4
&&
!
strcase
cmp
(
(
char
*
)
module
+
exports
->
Name
+
len
-
4
,
".dll"
))
len
-=
4
;
if
(
len
>
4
&&
!
_stri
cmp
(
(
char
*
)
module
+
exports
->
Name
+
len
-
4
,
".dll"
))
len
-=
4
;
len
=
min
(
len
,
sizeof
(
data
->
dllname
)
-
1
);
len
=
min
(
len
,
sizeof
(
data
->
dllname
)
-
1
);
memcpy
(
data
->
dllname
,
(
char
*
)
module
+
exports
->
Name
,
len
);
memcpy
(
data
->
dllname
,
(
char
*
)
module
+
exports
->
Name
,
len
);
data
->
dllname
[
len
]
=
0
;
data
->
dllname
[
len
]
=
0
;
...
@@ -1054,7 +1054,7 @@ void SNOOP_SetupDLL(HMODULE hmod)
...
@@ -1054,7 +1054,7 @@ void SNOOP_SetupDLL(HMODULE hmod)
(
*
dll
)
->
nrofordinals
=
exports
->
NumberOfFunctions
;
(
*
dll
)
->
nrofordinals
=
exports
->
NumberOfFunctions
;
strcpy
(
(
*
dll
)
->
name
,
name
);
strcpy
(
(
*
dll
)
->
name
,
name
);
p
=
(
*
dll
)
->
name
+
strlen
((
*
dll
)
->
name
)
-
4
;
p
=
(
*
dll
)
->
name
+
strlen
((
*
dll
)
->
name
)
-
4
;
if
(
p
>
(
*
dll
)
->
name
&&
!
strcase
cmp
(
p
,
".dll"
))
*
p
=
0
;
if
(
p
>
(
*
dll
)
->
name
&&
!
_stri
cmp
(
p
,
".dll"
))
*
p
=
0
;
size
=
exports
->
NumberOfFunctions
*
sizeof
(
SNOOP_FUN
);
size
=
exports
->
NumberOfFunctions
*
sizeof
(
SNOOP_FUN
);
addr
=
NULL
;
addr
=
NULL
;
...
...
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