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
cefcadcc
Commit
cefcadcc
authored
May 02, 2011
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 02, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32: Ignore size field when creating with -W calls.
parent
bf3f848d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
19 deletions
+17
-19
comctl32undoc.c
dlls/comctl32/comctl32undoc.c
+11
-13
mru.c
dlls/comctl32/tests/mru.c
+6
-6
No files found.
dlls/comctl32/comctl32undoc.c
View file @
cefcadcc
...
...
@@ -649,9 +649,9 @@ INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum)
}
/*************************************************************************
*
CreateMRUListLazy_common
(internal)
*
create_mru_list
(internal)
*/
static
HANDLE
CreateMRUListLazy_common
(
LPWINEMRULIST
mp
)
static
HANDLE
create_mru_list
(
LPWINEMRULIST
mp
)
{
UINT
i
,
err
;
HKEY
newkey
;
...
...
@@ -737,24 +737,22 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
*
* See CreateMRUListLazyA.
*/
HANDLE
WINAPI
CreateMRUListLazyW
(
const
MRUINFOW
*
lpcml
,
DWORD
dwParam2
,
HANDLE
WINAPI
CreateMRUListLazyW
(
const
MRUINFOW
*
infoW
,
DWORD
dwParam2
,
DWORD
dwParam3
,
DWORD
dwParam4
)
{
LPWINEMRULIST
mp
;
/* Native does not check for a NULL lpcml */
if
(
lpcml
->
cbSize
!=
sizeof
(
MRUINFOW
)
||
!
lpcml
->
hKey
||
IsBadStringPtrW
(
lpcml
->
lpszSubKey
,
-
1
))
if
(
!
infoW
->
hKey
||
IsBadStringPtrW
(
infoW
->
lpszSubKey
,
-
1
))
return
NULL
;
mp
=
Alloc
(
sizeof
(
WINEMRULIST
));
memcpy
(
&
mp
->
extview
,
lpcml
,
sizeof
(
MRUINFOW
));
mp
->
extview
.
lpszSubKey
=
Alloc
((
strlenW
(
lpcml
->
lpszSubKey
)
+
1
)
*
sizeof
(
WCHAR
));
strcpyW
(
mp
->
extview
.
lpszSubKey
,
lpcml
->
lpszSubKey
);
memcpy
(
&
mp
->
extview
,
infoW
,
sizeof
(
MRUINFOW
));
mp
->
extview
.
lpszSubKey
=
Alloc
((
strlenW
(
infoW
->
lpszSubKey
)
+
1
)
*
sizeof
(
WCHAR
));
strcpyW
(
mp
->
extview
.
lpszSubKey
,
infoW
->
lpszSubKey
);
mp
->
isUnicode
=
TRUE
;
return
CreateMRUListLazy_common
(
mp
);
return
create_mru_list
(
mp
);
}
/**************************************************************************
...
...
@@ -790,7 +788,7 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2,
MultiByteToWideChar
(
CP_ACP
,
0
,
lpcml
->
lpszSubKey
,
-
1
,
mp
->
extview
.
lpszSubKey
,
len
);
mp
->
isUnicode
=
FALSE
;
return
CreateMRUListLazy_common
(
mp
);
return
create_mru_list
(
mp
);
}
/**************************************************************************
...
...
@@ -798,9 +796,9 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2,
*
* See CreateMRUListA.
*/
HANDLE
WINAPI
CreateMRUListW
(
const
MRUINFOW
*
lpcml
)
HANDLE
WINAPI
CreateMRUListW
(
const
MRUINFOW
*
infoW
)
{
return
CreateMRUListLazyW
(
lpcml
,
0
,
0
,
0
);
return
CreateMRUListLazyW
(
infoW
,
0
,
0
,
0
);
}
/**************************************************************************
...
...
dlls/comctl32/tests/mru.c
View file @
cefcadcc
...
...
@@ -573,7 +573,7 @@ static void test_CreateMRUListW(void)
infoW
.
lpfnCompare
=
NULL
;
hMru
=
pCreateMRUListW
(
&
infoW
);
todo_wine
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
pFreeMRUList
(
hMru
);
/* increased size */
...
...
@@ -585,7 +585,7 @@ static void test_CreateMRUListW(void)
infoW
.
lpfnCompare
=
NULL
;
hMru
=
pCreateMRUListW
(
&
infoW
);
todo_wine
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
pFreeMRUList
(
hMru
);
/* zero size */
...
...
@@ -597,7 +597,7 @@ static void test_CreateMRUListW(void)
infoW
.
lpfnCompare
=
NULL
;
hMru
=
pCreateMRUListW
(
&
infoW
);
todo_wine
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
pFreeMRUList
(
hMru
);
/* NULL hKey */
...
...
@@ -655,7 +655,7 @@ static void test_CreateMRUListLazyW(void)
infoW
.
lpfnCompare
=
NULL
;
hMru
=
pCreateMRUListLazyW
(
&
infoW
,
0
,
0
,
0
);
todo_wine
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
pFreeMRUList
(
hMru
);
/* increased size */
...
...
@@ -667,7 +667,7 @@ static void test_CreateMRUListLazyW(void)
infoW
.
lpfnCompare
=
NULL
;
hMru
=
pCreateMRUListLazyW
(
&
infoW
,
0
,
0
,
0
);
todo_wine
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
pFreeMRUList
(
hMru
);
/* zero size */
...
...
@@ -679,7 +679,7 @@ static void test_CreateMRUListLazyW(void)
infoW
.
lpfnCompare
=
NULL
;
hMru
=
pCreateMRUListLazyW
(
&
infoW
,
0
,
0
,
0
);
todo_wine
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
ok
(
hMru
!=
NULL
,
"got %p
\n
"
,
hMru
);
pFreeMRUList
(
hMru
);
/* NULL hKey */
...
...
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