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
15c322c2
Commit
15c322c2
authored
Feb 17, 2011
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Feb 17, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mlang: GetGlobalFontLinkObject() takes a non-zero number of arguments.
parent
e2d47752
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
4 deletions
+25
-4
mlang.c
dlls/mlang/mlang.c
+5
-2
mlang.spec
dlls/mlang/mlang.spec
+1
-1
mlang.c
dlls/mlang/tests/mlang.c
+18
-0
mlang.idl
include/mlang.idl
+1
-1
No files found.
dlls/mlang/mlang.c
View file @
15c322c2
...
@@ -3608,8 +3608,11 @@ HRESULT WINAPI DllUnregisterServer(void)
...
@@ -3608,8 +3608,11 @@ HRESULT WINAPI DllUnregisterServer(void)
return
__wine_unregister_resources
(
instance
,
NULL
);
return
__wine_unregister_resources
(
instance
,
NULL
);
}
}
HRESULT
WINAPI
GetGlobalFontLinkObject
(
void
)
HRESULT
WINAPI
GetGlobalFontLinkObject
(
void
**
unknown
)
{
{
FIXME
(
"
\n
"
);
if
(
!
unknown
)
return
E_INVALIDARG
;
FIXME
(
"%p: stub
\n
"
,
unknown
);
return
S_FALSE
;
return
S_FALSE
;
}
}
dlls/mlang/mlang.spec
View file @
15c322c2
...
@@ -12,4 +12,4 @@
...
@@ -12,4 +12,4 @@
@ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer()
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()
@ stdcall -private DllUnregisterServer()
@ stdcall GetGlobalFontLinkObject()
@ stdcall GetGlobalFontLinkObject(
ptr
)
dlls/mlang/tests/mlang.c
View file @
15c322c2
...
@@ -1931,6 +1931,23 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2)
...
@@ -1931,6 +1931,23 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2)
}
}
}
}
static
void
test_GetGlobalFontLinkObject
(
void
)
{
HRESULT
ret
;
void
*
unknown
;
ret
=
GetGlobalFontLinkObject
(
NULL
);
ok
(
ret
==
E_INVALIDARG
,
"expected E_INVALIDARG got %#x
\n
"
,
ret
);
unknown
=
(
void
*
)
0xdeadbeef
;
ret
=
GetGlobalFontLinkObject
(
&
unknown
);
todo_wine
{
ok
(
ret
==
S_OK
,
"expected S_OK got %#x
\n
"
,
ret
);
ok
(
unknown
!=
NULL
&&
unknown
!=
(
void
*
)
0xdeadbeef
,
"GetGlobalFontLinkObject() returned %p
\n
"
,
unknown
);
}
}
START_TEST
(
mlang
)
START_TEST
(
mlang
)
{
{
IMultiLanguage
*
iML
=
NULL
;
IMultiLanguage
*
iML
=
NULL
;
...
@@ -1949,6 +1966,7 @@ START_TEST(mlang)
...
@@ -1949,6 +1966,7 @@ START_TEST(mlang)
test_ConvertINetUnicodeToMultiByte
();
test_ConvertINetUnicodeToMultiByte
();
test_JapaneseConversion
();
test_JapaneseConversion
();
test_GetGlobalFontLinkObject
();
trace
(
"IMultiLanguage
\n
"
);
trace
(
"IMultiLanguage
\n
"
);
ret
=
CoCreateInstance
(
&
CLSID_CMultiLanguage
,
NULL
,
CLSCTX_INPROC_SERVER
,
ret
=
CoCreateInstance
(
&
CLSID_CMultiLanguage
,
NULL
,
CLSCTX_INPROC_SERVER
,
...
...
include/mlang.idl
View file @
15c322c2
...
@@ -739,7 +739,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);")
...
@@ -739,7 +739,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);")
cpp_quote
(
"STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);"
)
cpp_quote
(
"STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);"
)
cpp_quote
(
"#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)"
)
cpp_quote
(
"#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)"
)
cpp_quote
(
"STDAPI GetGlobalFontLinkObject(void);"
)
cpp_quote
(
"STDAPI GetGlobalFontLinkObject(void
**unknown
);"
)
cpp_quote
(
"STDAPI IsConvertINetStringAvailable(DWORD, DWORD);"
)
cpp_quote
(
"STDAPI IsConvertINetStringAvailable(DWORD, DWORD);"
)
cpp_quote
(
"STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);"
)
cpp_quote
(
"STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);"
)
cpp_quote
(
"STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);"
)
cpp_quote
(
"STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);"
)
...
...
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