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
b536ff62
Commit
b536ff62
authored
Nov 04, 2014
by
Iván Matellanes
Committed by
Alexandre Julliard
Nov 05, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Added _fputwc_nolock implementation.
parent
975a95a2
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
9 deletions
+23
-9
msvcr100.spec
dlls/msvcr100/msvcr100.spec
+1
-1
msvcr110.spec
dlls/msvcr110/msvcr110.spec
+1
-1
msvcr120.spec
dlls/msvcr120/msvcr120.spec
+1
-1
msvcr80.spec
dlls/msvcr80/msvcr80.spec
+1
-1
msvcr90.spec
dlls/msvcr90/msvcr90.spec
+1
-1
file.c
dlls/msvcrt/file.c
+16
-4
msvcrt.h
dlls/msvcrt/msvcrt.h
+1
-0
stdio.h
include/msvcrt/stdio.h
+1
-0
No files found.
dlls/msvcr100/msvcr100.spec
View file @
b536ff62
...
...
@@ -832,7 +832,7 @@
@ stub _fprintf_s_l
@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
@ cdecl _fputchar(long) MSVCRT__fputchar
@
stub
_fputwc_nolock
@
cdecl _fputwc_nolock(long ptr) MSVCRT_
_fputwc_nolock
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ stub _fread_nolock_s
...
...
dlls/msvcr110/msvcr110.spec
View file @
b536ff62
...
...
@@ -1180,7 +1180,7 @@
@ stub _fprintf_s_l
@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
@ cdecl _fputchar(long) MSVCRT__fputchar
@
stub
_fputwc_nolock
@
cdecl _fputwc_nolock(long ptr) MSVCRT_
_fputwc_nolock
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ stub _fread_nolock_s
...
...
dlls/msvcr120/msvcr120.spec
View file @
b536ff62
...
...
@@ -1178,7 +1178,7 @@
@ stub _fprintf_s_l
@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
@ cdecl _fputchar(long) MSVCRT__fputchar
@
stub
_fputwc_nolock
@
cdecl _fputwc_nolock(long ptr) MSVCRT_
_fputwc_nolock
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ stub _fread_nolock_s
...
...
dlls/msvcr80/msvcr80.spec
View file @
b536ff62
...
...
@@ -499,7 +499,7 @@
@ stub _fprintf_s_l
@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
@ cdecl _fputchar(long) MSVCRT__fputchar
@
stub
_fputwc_nolock
@
cdecl _fputwc_nolock(long ptr) MSVCRT_
_fputwc_nolock
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ stub _fread_nolock_s
...
...
dlls/msvcr90/msvcr90.spec
View file @
b536ff62
...
...
@@ -481,7 +481,7 @@
@ stub _fprintf_s_l
@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
@ cdecl _fputchar(long) MSVCRT__fputchar
@
stub
_fputwc_nolock
@
cdecl _fputwc_nolock(long ptr) MSVCRT_
_fputwc_nolock
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ stub _fread_nolock_s
...
...
dlls/msvcrt/file.c
View file @
b536ff62
...
...
@@ -3829,11 +3829,24 @@ MSVCRT_size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, MSVCRT_size_t size, M
*/
MSVCRT_wint_t
CDECL
MSVCRT_fputwc
(
MSVCRT_wint_t
wc
,
MSVCRT_FILE
*
file
)
{
MSVCRT_wint_t
ret
;
MSVCRT__lock_file
(
file
);
ret
=
MSVCRT__fputwc_nolock
(
wc
,
file
);
MSVCRT__unlock_file
(
file
);
return
ret
;
}
/*********************************************************************
* _fputwc_nolock (MSVCRT.@)
*/
MSVCRT_wint_t
CDECL
MSVCRT__fputwc_nolock
(
MSVCRT_wint_t
wc
,
MSVCRT_FILE
*
file
)
{
MSVCRT_wchar_t
mwc
=
wc
;
ioinfo
*
fdinfo
;
MSVCRT_wint_t
ret
;
MSVCRT__lock_file
(
file
);
fdinfo
=
msvcrt_get_ioinfo
(
file
->
_file
);
if
((
fdinfo
->
wxflag
&
WX_TEXT
)
&&
!
(
fdinfo
->
exflag
&
(
EF_UTF8
|
EF_UTF16
)))
{
...
...
@@ -3841,17 +3854,16 @@ MSVCRT_wint_t CDECL MSVCRT_fputwc(MSVCRT_wint_t wc, MSVCRT_FILE* file)
int
char_len
;
char_len
=
MSVCRT_wctomb
(
buf
,
mwc
);
if
(
char_len
!=-
1
&&
MSVCRT_
fwrite
(
buf
,
char_len
,
1
,
file
)
==
1
)
if
(
char_len
!=-
1
&&
MSVCRT_
_fwrite_nolock
(
buf
,
char_len
,
1
,
file
)
==
1
)
ret
=
wc
;
else
ret
=
MSVCRT_WEOF
;
}
else
if
(
MSVCRT_
fwrite
(
&
mwc
,
sizeof
(
mwc
),
1
,
file
)
==
1
)
{
}
else
if
(
MSVCRT_
_fwrite_nolock
(
&
mwc
,
sizeof
(
mwc
),
1
,
file
)
==
1
)
{
ret
=
wc
;
}
else
{
ret
=
MSVCRT_WEOF
;
}
MSVCRT__unlock_file
(
file
);
return
ret
;
}
...
...
dlls/msvcrt/msvcrt.h
View file @
b536ff62
...
...
@@ -921,6 +921,7 @@ int __cdecl MSVCRT__fputc_nolock(int,MSVCRT_FILE*);
int
__cdecl
MSVCRT_ungetc
(
int
,
MSVCRT_FILE
*
);
MSVCRT_wint_t
__cdecl
MSVCRT_fgetwc
(
MSVCRT_FILE
*
);
MSVCRT_wint_t
__cdecl
MSVCRT__fgetwc_nolock
(
MSVCRT_FILE
*
);
MSVCRT_wint_t
__cdecl
MSVCRT__fputwc_nolock
(
MSVCRT_wint_t
,
MSVCRT_FILE
*
);
MSVCRT_wint_t
__cdecl
MSVCRT_ungetwc
(
MSVCRT_wint_t
,
MSVCRT_FILE
*
);
int
__cdecl
MSVCRT__fseeki64_nolock
(
MSVCRT_FILE
*
,
__int64
,
int
);
__int64
__cdecl
MSVCRT__ftelli64
(
MSVCRT_FILE
*
file
);
...
...
include/msvcrt/stdio.h
View file @
b536ff62
...
...
@@ -199,6 +199,7 @@ unsigned int __cdecl _set_output_format(void);
#define _WSTDIO_DEFINED
wint_t
__cdecl
_fgetwc_nolock
(
FILE
*
);
wint_t
__cdecl
_fgetwchar
(
void
);
wint_t
__cdecl
_fputwc_nolock
(
wint_t
,
FILE
*
);
wint_t
__cdecl
_fputwchar
(
wint_t
);
wchar_t
*
__cdecl
_getws
(
wchar_t
*
);
int
__cdecl
_putws
(
const
wchar_t
*
);
...
...
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