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
Lorenzo Ferrillo
wine
Commits
43bbce72
Commit
43bbce72
authored
13 years ago
by
Andrew Talbot
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msvcp90: Superfluous semicolons fix.
parent
e0cd19d8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/msvcp90/exception.c
+5
-5
5 additions, 5 deletions
dlls/msvcp90/exception.c
dlls/msvcp90/memory.c
+10
-10
10 additions, 10 deletions
dlls/msvcp90/memory.c
dlls/msvcp90/msvcp90.h
+2
-2
2 additions, 2 deletions
dlls/msvcp90/msvcp90.h
with
17 additions
and
17 deletions
dlls/msvcp90/exception.c
+
5
−
5
View file @
43bbce72
...
...
@@ -688,11 +688,11 @@ static const cxx_exception_type invalid_argument_cxx_type = {
#ifndef __GNUC__
void
__asm_dummy_vtables
(
void
)
{
#endif
__ASM_EXCEPTION_VTABLE
(
bad_alloc
)
__ASM_EXCEPTION_STRING_VTABLE
(
logic_error
)
__ASM_EXCEPTION_STRING_VTABLE
(
length_error
)
__ASM_EXCEPTION_STRING_VTABLE
(
out_of_range
)
__ASM_EXCEPTION_STRING_VTABLE
(
invalid_argument
)
__ASM_EXCEPTION_VTABLE
(
bad_alloc
)
;
__ASM_EXCEPTION_STRING_VTABLE
(
logic_error
)
;
__ASM_EXCEPTION_STRING_VTABLE
(
length_error
)
;
__ASM_EXCEPTION_STRING_VTABLE
(
out_of_range
)
;
__ASM_EXCEPTION_STRING_VTABLE
(
invalid_argument
)
;
#ifndef __GNUC__
}
#endif
...
...
This diff is collapsed.
Click to expand it.
dlls/msvcp90/memory.c
+
10
−
10
View file @
43bbce72
...
...
@@ -61,7 +61,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy)
/* ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z */
/* ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_assign
,
8
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_assign
,
8
)
void
*
__thiscall
MSVCP_allocator_char_assign
(
void
*
this
,
const
void
*
assign
)
{
return
this
;
...
...
@@ -69,7 +69,7 @@ void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign)
/* ?deallocate@?$allocator@D@std@@QAEXPADI@Z */
/* ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_deallocate
,
12
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_deallocate
,
12
)
void
__thiscall
MSVCP_allocator_char_deallocate
(
void
*
this
,
char
*
ptr
,
MSVCP_size_t
size
)
{
MSVCRT_operator_delete
(
ptr
);
...
...
@@ -77,7 +77,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz
/* ?allocate@?$allocator@D@std@@QAEPADI@Z */
/* ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_allocate
,
8
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_allocate
,
8
)
char
*
__thiscall
MSVCP_allocator_char_allocate
(
void
*
this
,
MSVCP_size_t
count
)
{
return
MSVCRT_operator_new
(
sizeof
(
char
[
count
]));
...
...
@@ -85,7 +85,7 @@ char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
/* ?allocate@?$allocator@D@std@@QAEPADIPBX@Z */
/* ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_allocate_hint
,
12
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_allocate_hint
,
12
)
char
*
__thiscall
MSVCP_allocator_char_allocate_hint
(
void
*
this
,
MSVCP_size_t
count
,
const
void
*
hint
)
{
...
...
@@ -95,7 +95,7 @@ char* __thiscall MSVCP_allocator_char_allocate_hint(void *this,
/* ?construct@?$allocator@D@std@@QAEXPADABD@Z */
/* ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_construct
,
12
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_construct
,
12
)
void
__thiscall
MSVCP_allocator_char_construct
(
void
*
this
,
char
*
ptr
,
const
char
*
val
)
{
*
ptr
=
*
val
;
...
...
@@ -103,14 +103,14 @@ void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char
/* ?destroy@?$allocator@D@std@@QAEXPAD@Z */
/* ?destroy@?$allocator@D@std@@QEAAXPEAD@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_destroy
,
8
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_destroy
,
8
)
void
__thiscall
MSVCP_allocator_char_destroy
(
void
*
this
,
char
*
ptr
)
{
}
/* ?max_size@?$allocator@D@std@@QBEIXZ */
/* ?max_size@?$allocator@D@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_max_size
,
4
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_char_max_size
,
4
)
MSVCP_size_t
__thiscall
MSVCP_allocator_char_max_size
(
void
*
this
)
{
return
UINT_MAX
/
sizeof
(
char
);
...
...
@@ -315,7 +315,7 @@ MSVCP_size_t __thiscall MSVCP_allocator_short_max_size(void *this)
/* allocator<void> */
/* ??0?$allocator@X@std@@QAE@XZ */
/* ??0?$allocator@X@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_void_ctor
,
4
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_void_ctor
,
4
)
void
*
__thiscall
MSVCP_allocator_void_ctor
(
void
*
this
)
{
return
this
;
...
...
@@ -323,7 +323,7 @@ void* __thiscall MSVCP_allocator_void_ctor(void *this)
/* ??0?$allocator@X@std@@QAE@ABV01@@Z */
/* ??0?$allocator@X@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_void_copy_ctor
,
8
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_void_copy_ctor
,
8
)
void
*
__thiscall
MSVCP_allocator_void_copy_ctor
(
void
*
this
,
void
*
copy
)
{
return
this
;
...
...
@@ -331,7 +331,7 @@ void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy)
/* ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z */
/* ??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_void_assign
,
8
)
;
DEFINE_THISCALL_WRAPPER
(
MSVCP_allocator_void_assign
,
8
)
void
*
__thiscall
MSVCP_allocator_void_assign
(
void
*
this
,
void
*
assign
)
{
return
this
;
...
...
This diff is collapsed.
Click to expand it.
dlls/msvcp90/msvcp90.h
+
2
−
2
View file @
43bbce72
...
...
@@ -73,7 +73,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
"\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
__ASM_NAME("MSVCP_" #name "_vtable") ":\n" \
"\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \
funcs "\n\t.text")
;
funcs "\n\t.text")
#else
...
...
@@ -84,7 +84,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
"\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
__ASM_NAME("MSVCP_" #name "_vtable") ":\n" \
"\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \
funcs "\n\t.text")
;
funcs "\n\t.text")
#endif
/* _WIN64 */
...
...
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