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
f1e41255
Commit
f1e41255
authored
Dec 10, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 10, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
atl: Allow version-based differences in struct layouts.
parent
785bdb64
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
39 additions
and
7 deletions
+39
-7
Makefile.in
dlls/atl/Makefile.in
+1
-0
atl_main.c
dlls/atl/atl_main.c
+1
-1
Makefile.in
dlls/atl/tests/Makefile.in
+1
-0
Makefile.in
dlls/atl100/Makefile.in
+3
-2
atl.c
dlls/atl100/atl.c
+1
-1
Makefile.in
dlls/atl80/Makefile.in
+3
-1
atl80.c
dlls/atl80/atl80.c
+2
-1
except.c
dlls/kernel32/except.c
+1
-1
atlbase.h
include/atlbase.h
+26
-0
No files found.
dlls/atl/Makefile.in
View file @
f1e41255
MODULE
=
atl.dll
IMPORTLIB
=
atl
IMPORTS
=
uuid atl100 oleaut32 ole32 user32
EXTRADEFS
=
-D_ATL_VER
=
_ATL_VER_30
C_SRCS
=
\
atl_main.c
\
...
...
dlls/atl/atl_main.c
View file @
f1e41255
...
...
@@ -478,5 +478,5 @@ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM)
*/
DWORD
WINAPI
AtlGetVersion
(
void
*
pReserved
)
{
return
0x0300
;
return
_ATL_VER
;
}
dlls/atl/tests/Makefile.in
View file @
f1e41255
TESTDLL
=
atl.dll
IMPORTS
=
uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
EXTRADEFS
=
-D_ATL_VER
=
_ATL_VER_30
C_SRCS
=
\
atl_ax.c
\
...
...
dlls/atl100/Makefile.in
View file @
f1e41255
MODULE
=
atl100.dll
MODULE
=
atl100.dll
IMPORTLIB
=
atl100
IMPORTS
=
uuid ole32 oleaut32 user32 gdi32 advapi32
IMPORTS
=
uuid ole32 oleaut32 user32 gdi32 advapi32
EXTRADEFS
=
-D_ATL_VER
=
_ATL_VER_100
C_SRCS
=
\
atl.c
\
...
...
dlls/atl100/atl.c
View file @
f1e41255
...
...
@@ -231,5 +231,5 @@ HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty,
*/
DWORD
WINAPI
AtlGetVersion
(
void
*
pReserved
)
{
return
0x0a00
;
return
_ATL_VER
;
}
dlls/atl80/Makefile.in
View file @
f1e41255
MODULE
=
atl80.dll
MODULE
=
atl80.dll
EXTRADEFS
=
-D_ATL_VER
=
_ATL_VER_80
C_SRCS
=
atl80.c
...
...
dlls/atl80/atl80.c
View file @
f1e41255
...
...
@@ -19,11 +19,12 @@
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "atlbase.h"
/***********************************************************************
* AtlGetVersion [atl80.@]
*/
DWORD
WINAPI
AtlGetVersion
(
void
*
pReserved
)
{
return
0x0800
;
return
_ATL_VER
;
}
dlls/kernel32/except.c
View file @
f1e41255
...
...
@@ -154,7 +154,7 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in
len
=
snprintf
(
buffer
,
size
,
"Unhandled PIC return in vm86 mode"
);
break
;
default:
len
=
snprintf
(
buffer
,
size
,
"Unhandled exception 0x%08x
"
,
rec
->
ExceptionCode
);
len
=
snprintf
(
buffer
,
size
,
"Unhandled exception 0x%08x
in thread %x"
,
rec
->
ExceptionCode
,
GetCurrentThreadId
()
);
break
;
}
if
((
len
<
0
)
||
(
len
>=
size
))
...
...
include/atlbase.h
View file @
f1e41255
...
...
@@ -23,6 +23,16 @@
#include <atliface.h>
/* Wine extention: we (ab)use _ATL_VER to handle truct layout differences between ATL versions. */
#define _ATL_VER_30 0x0300
#define _ATL_VER_70 0x0700
#define _ATL_VER_80 0x0800
#define _ATL_VER_100 0x0a00
#ifndef _ATL_VER
#define _ATL_VER _ATL_VER_100
#endif
typedef
HRESULT
(
WINAPI
_ATL_CREATORFUNC
)(
void
*
pv
,
REFIID
riid
,
LPVOID
*
ppv
);
typedef
HRESULT
(
WINAPI
_ATL_CREATORARGFUNC
)(
void
*
pv
,
REFIID
riid
,
LPVOID
*
ppv
,
DWORD
dw
);
typedef
HRESULT
(
WINAPI
_ATL_MODULEFUNC
)(
DWORD
dw
);
...
...
@@ -31,6 +41,8 @@ typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void);
typedef
const
struct
_ATL_CATMAP_ENTRY
*
(
_ATL_CATMAPFUNC
)(
void
);
typedef
void
(
WINAPI
_ATL_TERMFUNC
)(
DWORD
dw
);
typedef
CRITICAL_SECTION
CComCriticalSection
;
typedef
struct
_ATL_OBJMAP_ENTRYA_V1_TAG
{
const
CLSID
*
pclsid
;
...
...
@@ -148,6 +160,20 @@ typedef struct _ATL_MODULEW_TAG
_ATL_TERMFUNC_ELEM
*
m_pTermFuncs
;
}
_ATL_MODULEW
;
typedef
struct
_ATL_MODULE70
{
UINT
cbSize
;
LONG
m_nLockCnt
;
_ATL_TERMFUNC_ELEM
*
m_pTermFuncs
;
CComCriticalSection
m_csStaticDataInitAndTypeInfo
;
}
_ATL_MODULE70
;
#if _ATL_VER >= _ATL_VER_70
typedef
_ATL_MODULE70
_ATL_MODULE
;
#else
typedef
_ATL_MODULEW
_ATL_MODULE
;
#endif
typedef
struct
_ATL_INTMAP_ENTRY_TAG
{
const
IID
*
piid
;
...
...
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