June 2006 - Wine-Commits - list.winehq.org

Jan Zerebecki : wined3d: Enable two sided stencil in the caps.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: cf8833c46789d4ff4d10eb1e204b93f328964c69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf8833c46789d4ff4d10eb1… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Jun 9 17:30:20 2006 +0200 wined3d: Enable two sided stencil in the caps. --- dlls/wined3d/directx.c | 5 +++++ include/d3d9caps.h | 1 + include/d3dcaps.h | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eae3a13..f7f461c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1635,6 +1635,11 @@ static HRESULT WINAPI IWineD3DImpl_GetDe *pCaps->StencilCaps |= D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_INCR; } + if ( This->dxVersion > 8 && + ( GL_SUPPORT(EXT_STENCIL_TWO_SIDE) || + GL_SUPPORT(ATI_SEPARATE_STENCIL) ) ) { + *pCaps->StencilCaps |= D3DSTENCILCAPS_TWOSIDED; + } *pCaps->FVFCaps = D3DFVFCAPS_PSIZE | 0x0008; /* 8 texture coords */ diff --git a/include/d3d9caps.h b/include/d3d9caps.h index ba05e79..573d459 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -187,6 +187,7 @@ #define D3DSTENCILCAPS_DECRSAT #define D3DSTENCILCAPS_INVERT 0x20 #define D3DSTENCILCAPS_INCR 0x40 #define D3DSTENCILCAPS_DECR 0x80 +#define D3DSTENCILCAPS_TWOSIDED 0x100 #define D3DTEXOPCAPS_DISABLE 0x0000001 #define D3DTEXOPCAPS_SELECTARG1 0x0000002 diff --git a/include/d3dcaps.h b/include/d3dcaps.h index b44c49d..f96ca5d 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -311,6 +311,7 @@ #define D3DSTENCILCAPS_DECRSAT 0x000000 #define D3DSTENCILCAPS_INVERT 0x00000020 #define D3DSTENCILCAPS_INCR 0x00000040 #define D3DSTENCILCAPS_DECR 0x00000080 +#define D3DSTENCILCAPS_TWOSIDED 0x00000100 #define D3DTEXOPCAPS_DISABLE 0x00000001 #define D3DTEXOPCAPS_SELECTARG1 0x00000002

1 0

Jan Zerebecki : wined3d: Also print the format like a fourcc if unknown in debug_d3dformat.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: df3e078b2088d51c6a404329012d8e990deab841 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df3e078b2088d51c6a40432… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Jun 9 17:29:57 2006 +0200 wined3d: Also print the format like a fourcc if unknown in debug_d3dformat. --- dlls/wined3d/utils.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 97f5b4f..43beebd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -95,7 +95,18 @@ #define FMT_TO_STR(fmt) case fmt: return FMT_TO_STR(WINED3DFMT_CxV8U8); #undef FMT_TO_STR default: - FIXME("Unrecognized %u D3DFORMAT!\n", fmt); + { + char fourcc[5]; + fourcc[0] = (char)(fmt); + fourcc[1] = (char)(fmt >> 8); + fourcc[2] = (char)(fmt >> 16); + fourcc[3] = (char)(fmt >> 24); + fourcc[4] = 0; + if( isprint(fourcc[0]) && isprint(fourcc[1]) && isprint(fourcc[2]) && isprint(fourcc[3]) ) + FIXME("Unrecognized %u (as fourcc: %s) D3DFORMAT!\n", fmt, fourcc); + else + FIXME("Unrecognized %u D3DFORMAT!\n", fmt); + } return "unrecognized"; } }

1 0

Alexandre Julliard : msvcrtd: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 6444876da26c2d17f284073d6c089afa3d889bf2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6444876da26c2d17f284073… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 21:35:40 2006 +0200 msvcrtd: Explicitly specify CDECL calling convention on exported functions. --- dlls/msvcrtd/debug.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c index c8aab34..0472058 100644 --- a/dlls/msvcrtd/debug.c +++ b/dlls/msvcrtd/debug.c @@ -36,7 +36,7 @@ extern int _callnewh(unsigned long); /********************************************************************* * ??2(a)YAPAXIHPBDH@Z (MSVCRTD.@) */ -void *MSVCRTD_operator_new_dbg( +void * CDECL MSVCRTD_operator_new_dbg( unsigned long nSize, int nBlockUse, const char *szFileName, @@ -75,7 +75,7 @@ void *MSVCRTD_operator_new_dbg( /********************************************************************* * _CrtSetDumpClient (MSVCRTD.@) */ -void *_CrtSetDumpClient(void *dumpClient) +void * CDECL _CrtSetDumpClient(void *dumpClient) { return NULL; } @@ -84,7 +84,7 @@ void *_CrtSetDumpClient(void *dumpClient /********************************************************************* * _CrtSetReportHook (MSVCRTD.@) */ -void *_CrtSetReportHook(void *reportHook) +void * CDECL _CrtSetReportHook(void *reportHook) { return NULL; } @@ -93,7 +93,7 @@ void *_CrtSetReportHook(void *reportHook /********************************************************************* * _CrtSetReportMode (MSVCRTD.@) */ -int _CrtSetReportMode(int reportType, int reportMode) +int CDECL _CrtSetReportMode(int reportType, int reportMode) { return 0; } @@ -102,7 +102,7 @@ int _CrtSetReportMode(int reportType, in /********************************************************************* * _CrtSetBreakAlloc (MSVCRTD.@) */ -int _CrtSetBreakAlloc(int new) +int CDECL _CrtSetBreakAlloc(int new) { int old = _crtBreakAlloc; _crtBreakAlloc = new; @@ -112,7 +112,7 @@ int _CrtSetBreakAlloc(int new) /********************************************************************* * _CrtSetDbgFlag (MSVCRTD.@) */ -int _CrtSetDbgFlag(int new) +int CDECL _CrtSetDbgFlag(int new) { int old = _crtDbgFlag; _crtDbgFlag = new; @@ -123,8 +123,8 @@ int _CrtSetDbgFlag(int new) /********************************************************************* * _CrtDbgReport (MSVCRTD.@) */ -int _CrtDbgReport(int reportType, const char *filename, int linenumber, - const char *moduleName, const char *format, ...) +int CDECL _CrtDbgReport(int reportType, const char *filename, int linenumber, + const char *moduleName, const char *format, ...) { return 0; } @@ -132,7 +132,7 @@ int _CrtDbgReport(int reportType, const /********************************************************************* * _CrtDumpMemoryLeaks (MSVCRTD.@) */ -int _CrtDumpMemoryLeaks(void) +int CDECL _CrtDumpMemoryLeaks(void) { return 0; } @@ -140,7 +140,7 @@ int _CrtDumpMemoryLeaks(void) /********************************************************************* * _CrtCheckMemory (MSVCRTD.@) */ -int _CrtCheckMemory(void) +int CDECL _CrtCheckMemory(void) { /* Note: maybe we could call here our heap validating functions ? */ return TRUE; @@ -150,7 +150,7 @@ int _CrtCheckMemory(void) /********************************************************************* * __p__crtAssertBusy (MSVCRTD.@) */ -int *__p__crtAssertBusy(void) +int * CDECL __p__crtAssertBusy(void) { return &_crtAssertBusy; } @@ -158,7 +158,7 @@ int *__p__crtAssertBusy(void) /********************************************************************* * __p__crtBreakAlloc (MSVCRTD.@) */ -int *__p__crtBreakAlloc(void) +int * CDECL __p__crtBreakAlloc(void) { return &_crtBreakAlloc; } @@ -166,7 +166,7 @@ int *__p__crtBreakAlloc(void) /********************************************************************* * __p__crtDbgFlag (MSVCRTD.@) */ -int *__p__crtDbgFlag(void) +int * CDECL __p__crtDbgFlag(void) { return &_crtDbgFlag; }

1 0

Alexandre Julliard : msvcrt20: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: f278f534c10430c67faa86ece8b46f6141d82eee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f278f534c10430c67faa86e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 21:35:27 2006 +0200 msvcrt20: Explicitly specify CDECL calling convention on exported functions. --- dlls/msvcrt20/msvcrt20.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c index 8b14ed8..8f8b448 100644 --- a/dlls/msvcrt20/msvcrt20.c +++ b/dlls/msvcrt20/msvcrt20.c @@ -23,18 +23,18 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -extern void __getmainargs(int *argc, char** *argv, char** *envp, - int expand_wildcards, int *new_mode); -extern void __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp, - int expand_wildcards, int *new_mode); +extern void CDECL __getmainargs(int *argc, char** *argv, char** *envp, + int expand_wildcards, int *new_mode); +extern void CDECL __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp, + int expand_wildcards, int *new_mode); /********************************************************************* * __getmainargs (MSVCRT20.@) * * new_mode is not a pointer in msvcrt20. */ -void MSVCRT20__getmainargs( int *argc, char** *argv, char** *envp, - int expand_wildcards, int new_mode ) +void CDECL MSVCRT20__getmainargs( int *argc, char** *argv, char** *envp, + int expand_wildcards, int new_mode ) { __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); } @@ -44,8 +44,8 @@ void MSVCRT20__getmainargs( int *argc, c * * new_mode is not a pointer in msvcrt20. */ -void MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, - int expand_wildcards, int new_mode ) +void CDECL MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, + int expand_wildcards, int new_mode ) { __wgetmainargs( argc, wargv, wenvp, expand_wildcards, &new_mode ); }

1 0

Alexandre Julliard : crtdll: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 40cbe19e494d34716d6b3212ccceef99b0617618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40cbe19e494d34716d6b321… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 21:35:20 2006 +0200 crtdll: Explicitly specify CDECL calling convention on exported functions. --- dlls/crtdll/crtdll_main.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index 178e102..c6f4898 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -33,8 +33,8 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crtdll); /* from msvcrt */ -extern void __getmainargs( int *argc, char ***argv, char ***envp, - int expand_wildcards, int *new_mode ); +extern void CDECL __getmainargs( int *argc, char ***argv, char ***envp, + int expand_wildcards, int *new_mode ); /* The following data items are not exported from msvcrt */ unsigned int CRTDLL__basemajor_dll; @@ -110,7 +110,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,D /********************************************************************* * __GetMainArgs (CRTDLL.@) */ -void __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) +void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) { int new_mode = 0; __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); @@ -120,7 +120,7 @@ void __GetMainArgs( int *argc, char ***a /********************************************************************* * _fstat (CRTDLL.@) */ -int CRTDLL__fstat(int fd, struct crtdll_stat* buf) +int CDECL CRTDLL__fstat(int fd, struct crtdll_stat* buf) { extern int _fstat(int,struct _stat*); struct _stat st; @@ -134,7 +134,7 @@ int CRTDLL__fstat(int fd, struct crtdll_ /********************************************************************* * _stat (CRTDLL.@) */ -int CRTDLL__stat(const char* path, struct crtdll_stat * buf) +int CDECL CRTDLL__stat(const char* path, struct crtdll_stat * buf) { extern int _stat(const char*,struct _stat*); struct _stat st; @@ -148,7 +148,7 @@ int CRTDLL__stat(const char* path, struc /********************************************************************* * _strdec (CRTDLL.@) */ -char *_strdec(const char *str1, const char *str2) +char * CDECL _strdec(const char *str1, const char *str2) { return (char *)(str2 - 1); } @@ -157,7 +157,7 @@ char *_strdec(const char *str1, const ch /********************************************************************* * _strinc (CRTDLL.@) */ -char *_strinc(const char *str) +char * CDECL _strinc(const char *str) { return (char *)(str + 1); } @@ -166,7 +166,7 @@ char *_strinc(const char *str) /********************************************************************* * _strncnt (CRTDLL.@) */ -size_t _strncnt(const char *str, size_t maxlen) +size_t CDECL _strncnt(const char *str, size_t maxlen) { size_t len = strlen(str); return (len > maxlen) ? maxlen : len; @@ -176,7 +176,7 @@ size_t _strncnt(const char *str, size_t /********************************************************************* * _strnextc (CRTDLL.@) */ -unsigned int _strnextc(const char *str) +unsigned int CDECL _strnextc(const char *str) { return (unsigned int)str[0]; } @@ -185,7 +185,7 @@ unsigned int _strnextc(const char *str) /********************************************************************* * _strninc (CRTDLL.@) */ -char *_strninc(const char *str, size_t len) +char * CDECL _strninc(const char *str, size_t len) { return (char *)(str + len); } @@ -194,7 +194,7 @@ char *_strninc(const char *str, size_t l /********************************************************************* * _strspnp (CRTDLL.@) */ -char *_strspnp( const char *str1, const char *str2) +char * CDECL _strspnp( const char *str1, const char *str2) { str1 += strspn( str1, str2 ); return *str1 ? (char*)str1 : NULL;

1 0

Alexandre Julliard : ntdll: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 57939d8fa4c3f06077fca39fb73f21a755bb426c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57939d8fa4c3f06077fca39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 21:35:07 2006 +0200 ntdll: Explicitly specify CDECL calling convention on exported functions. --- dlls/ntdll/misc.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 4900ce4..d8f0918 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -54,7 +54,7 @@ LPCSTR debugstr_us( const UNICODE_STRING * [GNUC && i386] */ #if defined(__GNUC__) && defined(__i386__) -LONGLONG __cdecl NTDLL__ftol(void) +LONGLONG CDECL NTDLL__ftol(void) { /* don't just do DO_FPU("fistp",retval), because the rounding * mode must also be set to "round towards zero"... */ @@ -73,7 +73,7 @@ #endif /* defined(__GNUC__) && defined(_ * [!GNUC && i386] */ #if !defined(__GNUC__) && defined(__i386__) -LONGLONG __cdecl NTDLL__ftol(double fl) +LONGLONG CDECL NTDLL__ftol(double fl) { FIXME("should be register function\n"); return (LONGLONG)fl; @@ -86,7 +86,7 @@ #endif /* !defined(__GNUC__) && defined( * [!i386] */ #ifndef __i386__ -LONG __cdecl NTDLL__ftol(double fl) +LONG CDECL NTDLL__ftol(double fl) { return (LONG) fl; } @@ -98,7 +98,7 @@ #endif /* !defined(__i386__) */ * [GNUC && i386] */ #if defined(__GNUC__) && defined(__i386__) -double __cdecl NTDLL__CIpow(void) +double CDECL NTDLL__CIpow(void) { double x,y; POP_FPU(y); @@ -118,7 +118,7 @@ #endif /* defined(__GNUC__) && defined(_ * [!GNUC && i386] */ #if !defined(__GNUC__) && defined(__i386__) -double __cdecl NTDLL__CIpow(double x,double y) +double CDECL NTDLL__CIpow(double x,double y) { FIXME("should be register function\n"); return pow(x,y); @@ -131,7 +131,7 @@ #endif /* !defined(__GNUC__) && defined( * [!i386] */ #ifndef __i386__ -double __cdecl NTDLL__CIpow(double x,double y) +double CDECL NTDLL__CIpow(double x,double y) { return pow(x,y); } @@ -141,7 +141,7 @@ #endif /* !defined(__i386__) */ /********************************************************************* * abs (NTDLL.@) */ -int NTDLL_abs( int i ) +int CDECL NTDLL_abs( int i ) { return abs( i ); } @@ -149,7 +149,7 @@ int NTDLL_abs( int i ) /********************************************************************* * labs (NTDLL.@) */ -long int NTDLL_labs( long int i ) +long int CDECL NTDLL_labs( long int i ) { return labs( i ); } @@ -157,7 +157,7 @@ long int NTDLL_labs( long int i ) /********************************************************************* * atan (NTDLL.@) */ -double NTDLL_atan( double d ) +double CDECL NTDLL_atan( double d ) { return atan( d ); } @@ -165,7 +165,7 @@ double NTDLL_atan( double d ) /********************************************************************* * ceil (NTDLL.@) */ -double NTDLL_ceil( double d ) +double CDECL NTDLL_ceil( double d ) { return ceil( d ); } @@ -173,7 +173,7 @@ double NTDLL_ceil( double d ) /********************************************************************* * cos (NTDLL.@) */ -double NTDLL_cos( double d ) +double CDECL NTDLL_cos( double d ) { return cos( d ); } @@ -181,7 +181,7 @@ double NTDLL_cos( double d ) /********************************************************************* * fabs (NTDLL.@) */ -double NTDLL_fabs( double d ) +double CDECL NTDLL_fabs( double d ) { return fabs( d ); } @@ -189,7 +189,7 @@ double NTDLL_fabs( double d ) /********************************************************************* * floor (NTDLL.@) */ -double NTDLL_floor( double d ) +double CDECL NTDLL_floor( double d ) { return floor( d ); } @@ -197,7 +197,7 @@ double NTDLL_floor( double d ) /********************************************************************* * log (NTDLL.@) */ -double NTDLL_log( double d ) +double CDECL NTDLL_log( double d ) { return log( d ); } @@ -205,7 +205,7 @@ double NTDLL_log( double d ) /********************************************************************* * pow (NTDLL.@) */ -double NTDLL_pow( double x, double y ) +double CDECL NTDLL_pow( double x, double y ) { return pow( x, y ); } @@ -213,7 +213,7 @@ double NTDLL_pow( double x, double y ) /********************************************************************* * sin (NTDLL.@) */ -double NTDLL_sin( double d ) +double CDECL NTDLL_sin( double d ) { return sin( d ); } @@ -221,7 +221,7 @@ double NTDLL_sin( double d ) /********************************************************************* * sqrt (NTDLL.@) */ -double NTDLL_sqrt( double d ) +double CDECL NTDLL_sqrt( double d ) { return sqrt( d ); } @@ -229,7 +229,7 @@ double NTDLL_sqrt( double d ) /********************************************************************* * tan (NTDLL.@) */ -double NTDLL_tan( double d ) +double CDECL NTDLL_tan( double d ) { return tan( d ); }

1 0

Alexandre Julliard : ole32: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 69591d81f977f2aa4763319e25f025d383eb2271 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69591d81f977f2aa4763319… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 21:34:59 2006 +0200 ole32: Explicitly specify CDECL calling convention on exported functions. --- dlls/ole32/memlockbytes16.c | 20 ++++++++++---------- dlls/ole32/ole16.c | 18 +++++++++--------- dlls/ole32/storage.c | 32 ++++++++++++++++---------------- 3 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=69591d81f977f2aa476…

1 0

Alexandre Julliard : wldap32: Explicitly specify CDECL calling convention on exported functions.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: 91e45c62d3c8ee1243710bd482ebdeec665743e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91e45c62d3c8ee1243710bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 21:34:46 2006 +0200 wldap32: Explicitly specify CDECL calling convention on exported functions. --- dlls/wldap32/add.c | 16 +- dlls/wldap32/ber.c | 26 ++- dlls/wldap32/bind.c | 28 ++-- dlls/wldap32/compare.c | 16 +- dlls/wldap32/control.c | 24 ++- dlls/wldap32/delete.c | 16 +- dlls/wldap32/dn.c | 16 +- dlls/wldap32/error.c | 12 +- dlls/wldap32/extended.c | 10 + dlls/wldap32/init.c | 26 ++- dlls/wldap32/misc.c | 46 +++--- dlls/wldap32/modify.c | 16 +- dlls/wldap32/modrdn.c | 16 +- dlls/wldap32/option.c | 8 + dlls/wldap32/page.c | 20 +-- dlls/wldap32/parse.c | 20 +-- dlls/wldap32/rename.c | 8 + dlls/wldap32/search.c | 20 +-- dlls/wldap32/value.c | 20 +-- include/winldap.h | 368 ++++++++++++++++++++++++----------------------- 20 files changed, 366 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=91e45c62d3c8ee12437…

1 0

Alexandre Julliard : include: Added prototype for DllMain.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 1053eccb36298fdf02c7119706ca6f7465932f1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1053eccb36298fdf02c7119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 16:18:17 2006 +0200 include: Added prototype for DllMain. --- dlls/glut32/glut.c | 2 ++ include/winbase.h | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/glut32/glut.c b/dlls/glut32/glut.c index 0d50e6f..93a94ea 100644 --- a/dlls/glut32/glut.c +++ b/dlls/glut32/glut.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> #include "windef.h" +#include "winbase.h" static void (*__glutExitFunc)(int ret) = 0; diff --git a/include/winbase.h b/include/winbase.h index 9ea16d8..f802f35 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2344,6 +2344,11 @@ #endif /* If this is not declared, we cannot compile many sources written with C++. */ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int); +#ifdef __WINESRC__ +/* shouldn't be here, but is nice for type checking */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DECLSPEC_HIDDEN; +#endif + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : include: Make the Dll* entry points hidden.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 9936feef079ef0357a8241d2c53ffb109e110bb8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9936feef079ef0357a8241d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 16:18:01 2006 +0200 include: Make the Dll* entry points hidden. --- dlls/mshtml/main.c | 1 + dlls/wininet/wininet_main.c | 2 ++ include/objbase.h | 8 ++++---- include/shlwapi.h | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index eb53311..d3d533a 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -34,6 +34,7 @@ #include "winnls.h" #include "winreg.h" #include "ole2.h" #include "advpub.h" +#include "shlwapi.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c index 71fe1b8..cf4a6f2 100644 --- a/dlls/wininet/wininet_main.c +++ b/dlls/wininet/wininet_main.c @@ -23,6 +23,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h" diff --git a/include/objbase.h b/include/objbase.h index f2d4d93..129506a 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -426,13 +426,13 @@ INT WINAPI StringFromGUID2(REFGUID id, L /***************************************************************************** * COM Server dll - exports */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv); -HRESULT WINAPI DllCanUnloadNow(void); +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI DllCanUnloadNow(void) DECLSPEC_HIDDEN; /* shouldn't be here, but is nice for type checking */ #ifdef __WINESRC__ -HRESULT WINAPI DllRegisterServer(void); -HRESULT WINAPI DllUnregisterServer(void); +HRESULT WINAPI DllRegisterServer(void) DECLSPEC_HIDDEN; +HRESULT WINAPI DllUnregisterServer(void) DECLSPEC_HIDDEN; #endif diff --git a/include/shlwapi.h b/include/shlwapi.h index 1f3aec4..e1e43f5 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -978,7 +978,7 @@ typedef HRESULT (CALLBACK *DLLGETVERSION #ifdef __WINESRC__ /* shouldn't be here, but is nice for type checking */ -HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *); +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *) DECLSPEC_HIDDEN; #endif typedef struct _DLLVERSIONINFO2 { @@ -995,7 +995,7 @@ #define DLLVER_QFE_MASK 0x000000000000 #define MAKEDLLVERULL(mjr, mnr, bld, qfe) (((ULONGLONG)(mjr)<< 48)| \ ((ULONGLONG)(mnr)<< 32) | ((ULONGLONG)(bld)<< 16) | (ULONGLONG)(qfe)) -HRESULT WINAPI DllInstall(BOOL,LPCWSTR); +HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; /* IsOS definitions */

1 0