Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
dd016c03
Commit
dd016c03
authored
Dec 14, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e4d34098
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
33 additions
and
33 deletions
+33
-33
msvcr100.spec
dlls/msvcr100/msvcr100.spec
+3
-3
msvcr110.spec
dlls/msvcr110/msvcr110.spec
+3
-3
msvcr120.spec
dlls/msvcr120/msvcr120.spec
+3
-3
msvcr70.spec
dlls/msvcr70/msvcr70.spec
+3
-3
msvcr71.spec
dlls/msvcr71/msvcr71.spec
+3
-3
msvcr80.spec
dlls/msvcr80/msvcr80.spec
+3
-3
msvcr90.spec
dlls/msvcr90/msvcr90.spec
+3
-3
data.c
dlls/msvcrt/data.c
+3
-3
file.c
dlls/msvcrt/file.c
+1
-1
msvcrt.h
dlls/msvcrt/msvcrt.h
+1
-1
msvcrt.spec
dlls/msvcrt/msvcrt.spec
+3
-3
process.c
dlls/msvcrt/process.c
+1
-1
ucrtbase.spec
dlls/ucrtbase/ucrtbase.spec
+3
-3
No files found.
dlls/msvcr100/msvcr100.spec
View file @
dd016c03
...
...
@@ -630,12 +630,12 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -644,7 +644,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
@ cdecl __pctype_func() MSVCRT___pctype_func
...
...
dlls/msvcr110/msvcr110.spec
View file @
dd016c03
...
...
@@ -979,12 +979,12 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -993,7 +993,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
@ cdecl __pctype_func() MSVCRT___pctype_func
...
...
dlls/msvcr120/msvcr120.spec
View file @
dd016c03
...
...
@@ -969,12 +969,12 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -983,7 +983,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
@ cdecl __pctype_func() MSVCRT___pctype_func
...
...
dlls/msvcr70/msvcr70.spec
View file @
dd016c03
...
...
@@ -167,14 +167,14 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__amblksiz()
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ stub __p__fileinfo()
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -184,7 +184,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__winmajor()
@ cdecl __p__winminor()
...
...
dlls/msvcr71/msvcr71.spec
View file @
dd016c03
...
...
@@ -162,14 +162,14 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__amblksiz()
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ stub __p__fileinfo()
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -179,7 +179,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__winmajor()
@ cdecl __p__winminor()
...
...
dlls/msvcr80/msvcr80.spec
View file @
dd016c03
...
...
@@ -273,13 +273,13 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__amblksiz()
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -290,7 +290,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__winmajor()
@ cdecl __p__winminor()
...
...
dlls/msvcr90/msvcr90.spec
View file @
dd016c03
...
...
@@ -262,13 +262,13 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__amblksiz()
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -277,7 +277,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
@ cdecl __pctype_func() MSVCRT___pctype_func
...
...
dlls/msvcrt/data.c
View file @
dd016c03
...
...
@@ -180,7 +180,7 @@ int CDECL _get_wpgmptr(WCHAR** p)
/***********************************************************************
* __p__fmode (MSVCRT.@)
*/
int
*
CDECL
__p__fmode
(
void
)
{
return
&
MSVCRT__fmode
;
}
int
*
CDECL
MSVCRT_
__p__fmode
(
void
)
{
return
&
MSVCRT__fmode
;
}
/***********************************************************************
* _set_fmode (MSVCRT.@)
...
...
@@ -230,12 +230,12 @@ unsigned int* CDECL __p__winver(void) { return &MSVCRT__winver; }
/*********************************************************************
* __p__acmdln (MSVCRT.@)
*/
char
**
CDECL
__p__acmdln
(
void
)
{
return
&
MSVCRT__acmdln
;
}
char
**
CDECL
MSVCRT_
__p__acmdln
(
void
)
{
return
&
MSVCRT__acmdln
;
}
/*********************************************************************
* __p__wcmdln (MSVCRT.@)
*/
MSVCRT_wchar_t
**
CDECL
__p__wcmdln
(
void
)
{
return
&
MSVCRT__wcmdln
;
}
MSVCRT_wchar_t
**
CDECL
MSVCRT_
__p__wcmdln
(
void
)
{
return
&
MSVCRT__wcmdln
;
}
/*********************************************************************
* __p___argv (MSVCRT.@)
...
...
dlls/msvcrt/file.c
View file @
dd016c03
...
...
@@ -2097,7 +2097,7 @@ static unsigned split_oflags(unsigned oflags)
else
if
(
oflags
&
MSVCRT__O_WTEXT
)
wxflags
|=
WX_TEXT
;
else
if
(
oflags
&
MSVCRT__O_U16TEXT
)
wxflags
|=
WX_TEXT
;
else
if
(
oflags
&
MSVCRT__O_U8TEXT
)
wxflags
|=
WX_TEXT
;
else
if
(
*
__p__fmode
()
&
MSVCRT__O_BINARY
)
{
/* Nothing to do */
}
else
if
(
*
MSVCRT_
__p__fmode
()
&
MSVCRT__O_BINARY
)
{
/* Nothing to do */
}
else
wxflags
|=
WX_TEXT
;
/* default to TEXT*/
if
(
oflags
&
MSVCRT__O_NOINHERIT
)
wxflags
|=
WX_DONTINHERIT
;
...
...
dlls/msvcrt/msvcrt.h
View file @
dd016c03
...
...
@@ -1121,7 +1121,7 @@ int WINAPIV _cprintf(const char*,...);
int
WINAPIV
_cwprintf
(
const
MSVCRT_wchar_t
*
,...);
char
***
__cdecl
MSVCRT___p__environ
(
void
);
int
*
__cdecl
__p___mb_cur_max
(
void
);
int
*
__cdecl
__p__fmode
(
void
);
int
*
__cdecl
MSVCRT_
__p__fmode
(
void
);
MSVCRT_wchar_t
*
__cdecl
MSVCRT__wcsdup
(
const
MSVCRT_wchar_t
*
);
MSVCRT_size_t
__cdecl
MSVCRT_strnlen
(
const
char
*
,
MSVCRT_size_t
);
MSVCRT_size_t
__cdecl
MSVCRT_wcsnlen
(
const
MSVCRT_wchar_t
*
,
MSVCRT_size_t
);
...
...
dlls/msvcrt/msvcrt.spec
View file @
dd016c03
...
...
@@ -252,14 +252,14 @@
@ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv()
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__amblksiz()
@ cdecl __p__commode()
@ cdecl __p__daylight() MSVCRT___p__daylight
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ stub __p__fileinfo()
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ cdecl __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
...
...
@@ -269,7 +269,7 @@
@ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname()
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__winmajor()
@ cdecl __p__winminor()
...
...
dlls/msvcrt/process.c
View file @
dd016c03
...
...
@@ -1055,7 +1055,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc
if
(
!
command
||
!
mode
)
return
NULL
;
textmode
=
*
__p__fmode
()
&
(
MSVCRT__O_BINARY
|
MSVCRT__O_TEXT
);
textmode
=
*
MSVCRT_
__p__fmode
()
&
(
MSVCRT__O_BINARY
|
MSVCRT__O_TEXT
);
for
(
p
=
mode
;
*
p
;
p
++
)
{
switch
(
*
p
)
...
...
dlls/ucrtbase/ucrtbase.spec
View file @
dd016c03
...
...
@@ -124,14 +124,14 @@
@ cdecl __p___argc() MSVCRT___p___argc
@ cdecl __p___argv() MSVCRT___p___argv
@ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p__acmdln()
@ cdecl __p__acmdln()
MSVCRT___p__acmdln
@ cdecl __p__commode()
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode()
@ cdecl __p__fmode()
MSVCRT___p__fmode
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__pgmptr() MSVCRT___p__pgmptr
@ cdecl __p__wcmdln()
@ cdecl __p__wcmdln()
MSVCRT___p__wcmdln
@ cdecl __p__wenviron() MSVCRT___p__wenviron
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
@ cdecl __pctype_func() MSVCRT___pctype_func
...
...
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