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
26ad119d
Commit
26ad119d
authored
Feb 26, 2008
by
Rob Shearman
Committed by
Alexandre Julliard
Feb 27, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't use typeof as it's not portable.
parent
e658b799
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
install.c
dlls/mshtml/install.c
+2
-2
main.c
dlls/mshtml/main.c
+2
-2
nsembed.c
dlls/mshtml/nsembed.c
+1
-1
No files found.
dlls/mshtml/install.c
View file @
26ad119d
...
@@ -133,7 +133,7 @@ static BOOL install_cab(LPCWSTR file_name)
...
@@ -133,7 +133,7 @@ static BOOL install_cab(LPCWSTR file_name)
{
{
HMODULE
advpack
;
HMODULE
advpack
;
char
install_dir
[
MAX_PATH
];
char
install_dir
[
MAX_PATH
];
typeof
(
ExtractFilesA
)
*
pExtractFilesA
;
HRESULT
(
WINAPI
*
pExtractFilesA
)(
LPCSTR
,
LPCSTR
,
DWORD
,
LPCSTR
,
LPVOID
,
DWORD
)
;
LPSTR
file_name_a
;
LPSTR
file_name_a
;
DWORD
res
,
len
;
DWORD
res
,
len
;
HRESULT
hres
;
HRESULT
hres
;
...
@@ -158,7 +158,7 @@ static BOOL install_cab(LPCWSTR file_name)
...
@@ -158,7 +158,7 @@ static BOOL install_cab(LPCWSTR file_name)
}
}
advpack
=
LoadLibraryW
(
wszAdvpack
);
advpack
=
LoadLibraryW
(
wszAdvpack
);
pExtractFilesA
=
(
typeof
(
ExtractFilesA
)
*
)
GetProcAddress
(
advpack
,
"ExtractFiles"
);
pExtractFilesA
=
(
void
*
)
GetProcAddress
(
advpack
,
"ExtractFiles"
);
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
file_name
,
-
1
,
NULL
,
0
,
NULL
,
NULL
);
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
file_name
,
-
1
,
NULL
,
0
,
NULL
,
NULL
);
file_name_a
=
heap_alloc
(
len
);
file_name_a
=
heap_alloc
(
len
);
...
...
dlls/mshtml/main.c
View file @
26ad119d
...
@@ -369,7 +369,7 @@ static HRESULT register_server(BOOL do_register)
...
@@ -369,7 +369,7 @@ static HRESULT register_server(BOOL do_register)
{
{
HRESULT
hres
;
HRESULT
hres
;
HMODULE
hAdvpack
;
HMODULE
hAdvpack
;
typeof
(
RegInstallA
)
*
pRegInstall
;
HRESULT
(
WINAPI
*
pRegInstall
)(
HMODULE
hm
,
LPCSTR
pszSection
,
const
STRTABLEA
*
pstTable
)
;
STRTABLEA
strtable
;
STRTABLEA
strtable
;
STRENTRYA
pse
[
35
];
STRENTRYA
pse
[
35
];
static
CLSID
const
*
clsids
[
35
];
static
CLSID
const
*
clsids
[
35
];
...
@@ -427,7 +427,7 @@ static HRESULT register_server(BOOL do_register)
...
@@ -427,7 +427,7 @@ static HRESULT register_server(BOOL do_register)
strtable
.
pse
=
pse
;
strtable
.
pse
=
pse
;
hAdvpack
=
LoadLibraryW
(
wszAdvpack
);
hAdvpack
=
LoadLibraryW
(
wszAdvpack
);
pRegInstall
=
(
typeof
(
RegInstallA
)
*
)
GetProcAddress
(
hAdvpack
,
"RegInstall"
);
pRegInstall
=
(
void
*
)
GetProcAddress
(
hAdvpack
,
"RegInstall"
);
hres
=
pRegInstall
(
hInst
,
do_register
?
"RegisterDll"
:
"UnregisterDll"
,
&
strtable
);
hres
=
pRegInstall
(
hInst
,
do_register
?
"RegisterDll"
:
"UnregisterDll"
,
&
strtable
);
...
...
dlls/mshtml/nsembed.c
View file @
26ad119d
...
@@ -166,7 +166,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path)
...
@@ -166,7 +166,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path)
}
}
#define NS_DLSYM(func) \
#define NS_DLSYM(func) \
func = (
typeof(func)
)GetProcAddress(hXPCOM, #func); \
func = (
void *
)GetProcAddress(hXPCOM, #func); \
if(!func) \
if(!func) \
ERR("Could not GetProcAddress(" #func ") failed\n")
ERR("Could not GetProcAddress(" #func ") failed\n")
...
...
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