Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
c08b647c
Commit
c08b647c
authored
13 years ago
by
Piotr Caban
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msvcp90: Added basic_string<char> find implementation.
parent
6bf4541b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msvcp90/msvcp90.spec
+8
-8
8 additions, 8 deletions
dlls/msvcp90/msvcp90.spec
dlls/msvcp90/string.c
+70
-0
70 additions, 0 deletions
dlls/msvcp90/string.c
with
78 additions
and
8 deletions
dlls/msvcp90/msvcp90.spec
+
8
−
8
View file @
c08b647c
...
...
@@ -3819,11 +3819,11 @@
@ stub -arch=win64 ?fill@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QEBA_WXZ
@ stub -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIABV12@I@Z
@ stub -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KAEBV12@_K@Z
@
stub
-arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z
@
stub
-arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z
@
thiscall
-arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z
(ptr long long) MSVCP_basic_string_char_find_ch
@
cdecl
-arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z
(ptr long long) MSVCP_basic_string_char_find_ch
@ stub -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDI@Z
@
stub
-arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K1@Z
@
stub
-arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDII@Z
@
cdecl
-arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K1@Z
(ptr str long long) MSVCP_basic_string_char_find_cstr_substr
@
thiscall
-arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDII@Z
(ptr str long long) MSVCP_basic_string_char_find_cstr_substr
@ stub -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K@Z
@ stub -arch=win32 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIABV12@I@Z
@ stub -arch=win64 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KAEBV12@_K@Z
...
...
@@ -3836,11 +3836,11 @@
@ stub -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIABV12@I@Z
@ stub -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KAEBV12@_K@Z
@ stub -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WI@Z
@
stub
-arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K1@Z
@
stub
-arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@Z
@
cdecl
-arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K1@Z
(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr
@
thiscall
-arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@Z
(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr
@ stub -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K@Z
@
stub
-arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z
@
stub
-arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z
@
thiscall
-arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z
(ptr long long) MSVCP_basic_string_wchar_find_ch
@
cdecl
-arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z
(ptr long long) MSVCP_basic_string_wchar_find_ch
@ cdecl -arch=win32 ?find@?$char_traits@D@std@@SAPBDPBDIABD@Z(ptr long ptr) MSVCP_char_traits_char_find
@ cdecl -arch=win64 ?find@?$char_traits@D@std@@SAPEBDPEBD_KAEBD@Z(ptr long ptr) MSVCP_char_traits_char_find
@ cdecl -arch=win32 ?find@?$char_traits@G@std@@SAPBGPBGIABG@Z(ptr long ptr) MSVCP_char_traits_short_find
...
...
This diff is collapsed.
Click to expand it.
dlls/msvcp90/string.c
+
70
−
0
View file @
c08b647c
...
...
@@ -1025,6 +1025,41 @@ MSVCP_BOOL __cdecl MSVCP_basic_string_char_lower_cstr_bstr(
return
MSVCP_basic_string_char_compare_cstr
(
right
,
left
)
>
0
;
}
/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDII@Z */
/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K1@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_basic_string_char_find_cstr_substr
,
16
)
size_t
__thiscall
MSVCP_basic_string_char_find_cstr_substr
(
const
basic_string_char
*
this
,
const
char
*
find
,
size_t
pos
,
size_t
len
)
{
const
char
*
p
,
*
end
;
TRACE
(
"%p %s %lu %lu
\n
"
,
this
,
find
,
(
unsigned
long
)
pos
,
(
unsigned
long
)
len
);
if
(
len
==
0
&&
pos
<=
this
->
size
)
return
pos
;
end
=
basic_string_char_const_ptr
(
this
)
+
this
->
size
-
len
+
1
;
for
(
p
=
basic_string_char_const_ptr
(
this
)
+
pos
;
p
<
end
;
p
++
)
{
p
=
MSVCP_char_traits_char_find
(
p
,
end
-
p
,
find
);
if
(
!
p
)
break
;
if
(
!
MSVCP_char_traits_char_compare
(
p
,
find
,
len
))
return
p
-
basic_string_char_const_ptr
(
this
);
}
return
MSVCP_basic_string_char_npos
;
}
/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z */
/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_basic_string_char_find_ch
,
12
)
size_t
__thiscall
MSVCP_basic_string_char_find_ch
(
const
basic_string_char
*
this
,
char
ch
,
size_t
pos
)
{
return
MSVCP_basic_string_char_find_cstr_substr
(
this
,
&
ch
,
pos
,
1
);
}
/* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */
/* ?npos@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@2IB */
/* ?npos@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@2_KB */
...
...
@@ -1552,3 +1587,38 @@ MSVCP_BOOL __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr(
{
return
MSVCP_basic_string_wchar_compare_cstr
(
right
,
left
)
>
0
;
}
/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@Z */
/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K1@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_basic_string_wchar_find_cstr_substr
,
16
)
size_t
__thiscall
MSVCP_basic_string_wchar_find_cstr_substr
(
const
basic_string_wchar
*
this
,
const
wchar_t
*
find
,
size_t
pos
,
size_t
len
)
{
const
wchar_t
*
p
,
*
end
;
TRACE
(
"%p %s %lu %lu
\n
"
,
this
,
debugstr_w
(
find
),
(
unsigned
long
)
pos
,
(
unsigned
long
)
len
);
if
(
len
==
0
&&
pos
<=
this
->
size
)
return
pos
;
end
=
basic_string_wchar_const_ptr
(
this
)
+
this
->
size
-
len
+
1
;
for
(
p
=
basic_string_wchar_const_ptr
(
this
)
+
pos
;
p
<
end
;
p
++
)
{
p
=
MSVCP_char_traits_wchar_find
(
p
,
end
-
p
,
find
);
if
(
!
p
)
break
;
if
(
!
MSVCP_char_traits_wchar_compare
(
p
,
find
,
len
))
return
p
-
basic_string_wchar_const_ptr
(
this
);
}
return
MSVCP_basic_string_wchar_npos
;
}
/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z */
/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_basic_string_wchar_find_ch
,
12
)
size_t
__thiscall
MSVCP_basic_string_wchar_find_ch
(
const
basic_string_wchar
*
this
,
wchar_t
ch
,
size_t
pos
)
{
return
MSVCP_basic_string_wchar_find_cstr_substr
(
this
,
&
ch
,
pos
,
1
);
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment