Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
195ff4bc
Commit
195ff4bc
authored
Aug 23, 2023
by
Piotr Caban
Committed by
Alexandre Julliard
Aug 23, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcr90/tests: Reorder locale refcount tests to workaround leak in _create_locale.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=54718
parent
6245e2f3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
msvcr90.c
dlls/msvcr90/tests/msvcr90.c
+5
-2
locale.c
dlls/msvcrt/locale.c
+1
-1
No files found.
dlls/msvcr90/tests/msvcr90.c
View file @
195ff4bc
...
...
@@ -2380,7 +2380,7 @@ static void test__get_current_locale(void)
ok
(
l
->
locinfo
->
lc_time_curr
->
unk
==
1
,
"unk = %d
\n
"
,
l
->
locinfo
->
lc_time_curr
->
unk
);
ok
(
l
->
locinfo
->
lc_time_curr
->
refcount
==
1
,
"refcount = %d
\n
"
,
l
->
locinfo
->
lc_time_curr
->
refcount
);
ok
(
l2
->
locinfo
->
lc_time_curr
->
unk
==
1
,
"unk = %d
\n
"
,
l2
->
locinfo
->
lc_time_curr
->
unk
);
ok
(
l2
->
locinfo
->
lc_time_curr
->
refcount
==
3
||
broken
(
l2
->
locinfo
->
lc_time_curr
->
refcount
==
2
)
,
ok
(
l2
->
locinfo
->
lc_time_curr
->
refcount
==
2
,
"refcount = %d
\n
"
,
l2
->
locinfo
->
lc_time_curr
->
refcount
);
p__free_locale
(
l2
);
...
...
@@ -2491,6 +2491,10 @@ START_TEST(msvcr90)
if
(
!
init
())
return
;
/* _get_current_locale tests needs to be run first because there's
* a C-locale refcount leak in native _create_locale implementation. */
test__get_current_locale
();
test__initterm_e
();
test__encode_pointer
();
test_error_messages
();
...
...
@@ -2526,7 +2530,6 @@ START_TEST(msvcr90)
test___strncnt
();
test_swscanf
();
test____mb_cur_max_l_func
();
test__get_current_locale
();
test_ioinfo_flags
();
test_strcmp
();
}
dlls/msvcrt/locale.c
View file @
195ff4bc
...
...
@@ -68,7 +68,7 @@ __lc_time_data cloc_time_data =
#if _MSVCR_VER < 110
MAKELCID
(
LANG_ENGLISH
,
SORT_DEFAULT
),
#endif
1
,
0
,
1
,
-
1
,
#if _MSVCR_VER == 0 || _MSVCR_VER >= 100
{{
L"Sun"
,
L"Mon"
,
L"Tue"
,
L"Wed"
,
L"Thu"
,
L"Fri"
,
L"Sat"
,
L"Sunday"
,
L"Monday"
,
L"Tuesday"
,
L"Wednesday"
,
L"Thursday"
,
L"Friday"
,
L"Saturday"
,
...
...
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