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
a074d0c3
Commit
a074d0c3
authored
Apr 05, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernelbase: Reimplement GetCalendarInfoEx/W using the locale.nls data.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
65fc470d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
lcformat.c
dlls/kernel32/lcformat.c
+4
-6
locale.c
dlls/kernelbase/locale.c
+0
-0
winnls.h
include/winnls.h
+1
-0
No files found.
dlls/kernel32/lcformat.c
View file @
a074d0c3
...
...
@@ -1763,12 +1763,10 @@ int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int
int
ret
,
sizeW
=
size
;
LPWSTR
dataW
=
NULL
;
if
(
NLS_IsUnicodeOnlyLcid
(
lcid
))
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
0
;
}
if
(
!
size
&&
!
(
type
&
CAL_RETURN_NUMBER
))
sizeW
=
GetCalendarInfoW
(
lcid
,
id
,
type
,
NULL
,
0
,
NULL
);
if
(
type
&
CAL_RETURN_NUMBER
)
return
GetCalendarInfoW
(
lcid
,
id
,
type
,
(
WCHAR
*
)
data
,
size
,
val
)
*
sizeof
(
WCHAR
);
if
(
!
size
)
sizeW
=
GetCalendarInfoW
(
lcid
,
id
,
type
,
NULL
,
0
,
NULL
);
if
(
!
(
dataW
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeW
*
sizeof
(
WCHAR
))))
return
0
;
ret
=
GetCalendarInfoW
(
lcid
,
id
,
type
,
dataW
,
sizeW
,
val
);
...
...
dlls/kernelbase/locale.c
View file @
a074d0c3
This diff is collapsed.
Click to expand it.
include/winnls.h
View file @
a074d0c3
...
...
@@ -908,6 +908,7 @@ WINBASEAPI BOOL WINAPI GetCPInfoExA(UINT,DWORD,LPCPINFOEXA);
WINBASEAPI
BOOL
WINAPI
GetCPInfoExW
(
UINT
,
DWORD
,
LPCPINFOEXW
);
#define GetCPInfoEx WINELIB_NAME_AW(GetCPInfoEx)
WINBASEAPI
INT
WINAPI
GetCalendarInfoA
(
LCID
,
DWORD
,
DWORD
,
LPSTR
,
INT
,
LPDWORD
);
WINBASEAPI
INT
WINAPI
GetCalendarInfoEx
(
const
WCHAR
*
,
CALID
,
const
WCHAR
*
,
CALTYPE
,
WCHAR
*
,
INT
,
DWORD
*
);
WINBASEAPI
INT
WINAPI
GetCalendarInfoW
(
LCID
,
DWORD
,
DWORD
,
LPWSTR
,
INT
,
LPDWORD
);
#define GetCalendarInfo WINELIB_NAME_AW(GetCalendarInfo)
WINBASEAPI
INT
WINAPI
GetCurrencyFormatA
(
LCID
,
DWORD
,
LPCSTR
,
const
CURRENCYFMTA
*
,
LPSTR
,
INT
);
...
...
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