November 2011 - Wine-commits

Andrew Talbot : sane.ds: Remove unneeded address-of operators from array name.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 8c41a3bd01428b649a77b1661834bc3d1f56c854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c41a3bd01428b649a77b1661… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 2 22:29:07 2011 +0000 sane.ds: Remove unneeded address-of operators from array name. --- dlls/sane.ds/ui.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index d57376e..8ff3b70 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -528,7 +528,7 @@ BOOL DoScannerUI(void) hdc = GetDC(0); - memset(&psp,0,sizeof(psp)); + memset(psp,0,sizeof(psp)); rc = psane_control_option(activeDS.deviceHandle, 0, SANE_ACTION_GET_VALUE, &optcount, NULL); if (rc != SANE_STATUS_GOOD) @@ -585,7 +585,7 @@ BOOL DoScannerUI(void) psh.pszCaption = szCaption; psh.nPages = page_count; psh.u2.nStartPage = 0; - psh.u3.ppsp = (LPCPROPSHEETPAGEW) &psp; + psh.u3.ppsp = (LPCPROPSHEETPAGEW)psp; psh.pfnCallback = PropSheetProc; psrc = PropertySheetW(&psh);

1 0

Octavian Voicu : ddraw/tests: Move surface attachment tests from refcount. c to dsurface.c.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 6e7bb6495002421c4fd21b265ebe1f12b04f75d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7bb6495002421c4fd21b265… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Nov 3 13:32:09 2011 +0200 ddraw/tests: Move surface attachment tests from refcount.c to dsurface.c. --- dlls/ddraw/tests/dsurface.c | 131 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/refcount.c | 106 +--------------------------------- 2 files changed, 133 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e7bb6495002421c4fd21…

1 0

Dmitry Timoshkov : kernel32: Use PAGE_READWRITE access when enabling write access to resource data.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 3daa153b297440ca9fe9503430f7ad2188687cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3daa153b297440ca9fe950343… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 31 13:48:08 2011 +0800 kernel32: Use PAGE_READWRITE access when enabling write access to resource data. --- dlls/kernel32/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 6b68057..54be105 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -412,7 +412,7 @@ static inline BOOL check_resource_write( void *addr ) return FALSE; if (addr < rsrc || (char *)addr >= (char *)rsrc + size) return FALSE; TRACE( "Broken app is writing to the resource data, enabling work-around\n" ); - VirtualProtect( rsrc, size, PAGE_WRITECOPY, NULL ); + VirtualProtect( rsrc, size, PAGE_READWRITE, NULL ); return TRUE; }

1 0

Grazvydas Ignotas : ntdll: Fix restart size calculation.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: edd4356dba407612fe06483a7a6e54f3d23e8def URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd4356dba407612fe06483a7… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Nov 2 19:27:51 2011 +0200 ntdll: Fix restart size calculation. --- dlls/ntdll/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e62cc82..65c8b8f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1812,7 +1812,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff if (res > 0 && (single_entry || io->Information + max_dir_info_size(class) > length)) { lseek( fd, (unsigned long)restart_pos, SEEK_SET ); - size = (char *)de - data; + size = (char *)de + de->d_reclen - data; io->Information = restart_info_pos; last_info = restart_last_info; goto restart;

1 0

Nikolay Sivov : jscript: Use specified expression length to trace it.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: b4987d095f2ec5dcf75411a9d9a0c130041e380f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4987d095f2ec5dcf75411a9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 21:43:20 2011 +0300 jscript: Use specified expression length to trace it. --- dlls/jscript/regexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e38e6ea..baef45b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3846,7 +3846,7 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, RegExpInstance *regexp; HRESULT hres; - TRACE("%s %x\n", debugstr_w(exp), flags); + TRACE("%s %x\n", debugstr_wn(exp, len), flags); hres = alloc_regexp(ctx, NULL, &regexp); if(FAILED(hres))

1 0

Alexandre Julliard : inetcpl: Convert dialogs to po files.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: fad88bc0c7fc73f1597143227d56ea682cc7ba1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad88bc0c7fc73f1597143227… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 14:55:15 2011 +0100 inetcpl: Convert dialogs to po files. --- dlls/inetcpl.cpl/Makefile.in | 19 +----- dlls/inetcpl.cpl/cpl_De.rc | 103 ----------------------------- dlls/inetcpl.cpl/cpl_En.rc | 101 ----------------------------- dlls/inetcpl.cpl/cpl_Fr.rc | 105 ------------------------------ dlls/inetcpl.cpl/cpl_He.rc | 66 ------------------- dlls/inetcpl.cpl/cpl_It.rc | 104 ------------------------------ dlls/inetcpl.cpl/cpl_Ja.rc | 65 ------------------- dlls/inetcpl.cpl/cpl_Ko.rc | 104 ------------------------------ dlls/inetcpl.cpl/cpl_Lt.rc | 104 ------------------------------ dlls/inetcpl.cpl/cpl_Nl.rc | 61 ----------------- dlls/inetcpl.cpl/cpl_Pl.rc | 83 ------------------------ dlls/inetcpl.cpl/cpl_Pt.rc | 63 ------------------ dlls/inetcpl.cpl/cpl_Ru.rc | 105 ------------------------------ dlls/inetcpl.cpl/cpl_Sr.rc | 103 ----------------------------- dlls/inetcpl.cpl/cpl_Sv.rc | 63 ------------------ dlls/inetcpl.cpl/cpl_Uk.rc | 65 ------------------- dlls/inetcpl.cpl/inetcpl.rc | 77 ++++++++++++++++++++++ po/ar.po | 135 ++++++++++++++++++++++++++++++++++----- po/bg.po | 138 +++++++++++++++++++++++++++++++++++----- po/ca.po | 143 ++++++++++++++++++++++++++++++++++++----- po/cs.po | 137 +++++++++++++++++++++++++++++++++++---- po/da.po | 142 ++++++++++++++++++++++++++++++++++++---- po/de.po | 145 +++++++++++++++++++++++++++++++++++++---- po/el.po | 134 ++++++++++++++++++++++++++++++++++---- po/en.po | 131 +++++++++++++++++++++++++++++++++---- po/en_US.po | 144 +++++++++++++++++++++++++++++++++++++---- po/eo.po | 139 +++++++++++++++++++++++++++++++++++----- po/es.po | 139 +++++++++++++++++++++++++++++++++++---- po/fa.po | 135 ++++++++++++++++++++++++++++++++++----- po/fi.po | 146 +++++++++++++++++++++++++++++++++++++----- po/fr.po | 145 +++++++++++++++++++++++++++++++++++++---- po/he.po | 133 ++++++++++++++++++++++++++++++++++---- po/hi.po | 133 ++++++++++++++++++++++++++++++++++---- po/hu.po | 141 ++++++++++++++++++++++++++++++++++++----- po/it.po | 144 +++++++++++++++++++++++++++++++++++++---- po/ja.po | 133 ++++++++++++++++++++++++++++++++++---- po/ko.po | 142 ++++++++++++++++++++++++++++++++++++---- po/lt.po | 146 +++++++++++++++++++++++++++++++++++++---- po/ml.po | 133 ++++++++++++++++++++++++++++++++++---- po/nb_NO.po | 142 ++++++++++++++++++++++++++++++++++++---- po/nl.po | 135 ++++++++++++++++++++++++++++++++++---- po/or.po | 133 ++++++++++++++++++++++++++++++++++---- po/pa.po | 133 ++++++++++++++++++++++++++++++++++---- po/pl.po | 146 +++++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 135 ++++++++++++++++++++++++++++++++++---- po/pt_PT.po | 142 ++++++++++++++++++++++++++++++++++++---- po/rm.po | 133 ++++++++++++++++++++++++++++++++++---- po/ro.po | 141 ++++++++++++++++++++++++++++++++++++---- po/ru.po | 146 +++++++++++++++++++++++++++++++++++++---- po/sk.po | 135 ++++++++++++++++++++++++++++++++++---- po/sl.po | 142 ++++++++++++++++++++++++++++++++++++---- po/sr_RS(a)cyrillic.po | 144 +++++++++++++++++++++++++++++++++++------ po/sr_RS(a)latin.po | 144 +++++++++++++++++++++++++++++++++++------ po/sv.po | 135 ++++++++++++++++++++++++++++++++++---- po/te.po | 133 ++++++++++++++++++++++++++++++++++---- po/th.po | 138 +++++++++++++++++++++++++++++++++++----- po/tr.po | 137 +++++++++++++++++++++++++++++++++++---- po/uk.po | 135 ++++++++++++++++++++++++++++++++++---- po/wa.po | 136 ++++++++++++++++++++++++++++++++++----- po/wine.pot | 131 +++++++++++++++++++++++++++++++++---- po/zh_CN.po | 143 ++++++++++++++++++++++++++++++++++++----- po/zh_TW.po | 143 ++++++++++++++++++++++++++++++++++++----- 62 files changed, 5618 insertions(+), 2013 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fad88bc0c7fc73f159714…

1 0

Marcus Meissner : kernel32: Make sure we reference stack data still in scope (Coverity).
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: df69fa186f193d227a2dc7a200010be30c2b6f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df69fa186f193d227a2dc7a20… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Nov 2 11:53:40 2011 +0100 kernel32: Make sure we reference stack data still in scope (Coverity). --- dlls/kernel32/volume.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index a937f6b..e2b03a2 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -572,6 +572,8 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE hand static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE handle, enum fs_type type, const BYTE *superblock ) { + BYTE block[BLOCK_SIZE]; + switch(type) { case FS_ERROR: @@ -584,13 +586,9 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha return GETLONG( superblock, 0x33 ); case FS_UDF: { - BYTE block[BLOCK_SIZE]; - if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) break; - superblock = block; - /* fallthrough */ } case FS_ISO9660:

1 0

Alexander Morozov : wincrypt.h: Fix a typo.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: a39e87532b2c8c33ea756cbbe7edccbffa7f76ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39e87532b2c8c33ea756cbbe… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Nov 2 15:16:07 2011 +0400 wincrypt.h: Fix a typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 843e09d..8ebcc4e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -593,7 +593,7 @@ typedef struct _CERT_REQUEST_INFO { typedef struct _CERT_KEYGEN_REQUEST_INFO { DWORD dwVersion; - CERT_PUBLIC_KEY_INFO SubjectPubliceKeyInfo; + CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo; LPWSTR pwszChallengeString; } CERT_KEYGEN_REQUEST_INFO, *PCERT_KEYGEN_REQUEST_INFO;

1 0

André Hentschel : apphelp: New dll stub.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: e14e83837fcf6b30599c19d6e85c5cf50517a8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14e83837fcf6b30599c19d6e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 31 20:05:49 2011 +0100 apphelp: New dll stub. --- configure | 1 + configure.ac | 1 + dlls/apphelp/Makefile.in | 5 ++ dlls/apphelp/apphelp.c | 41 +++++++++++ dlls/apphelp/apphelp.spec | 167 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 215 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e2f43ff..4c3cd84 100755 --- a/configure +++ b/configure @@ -14755,6 +14755,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll apphelp enable_apphelp wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test diff --git a/configure.ac b/configure.ac index 4ca2493..1340757 100644 --- a/configure.ac +++ b/configure.ac @@ -2373,6 +2373,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(apphelp) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in new file mode 100644 index 0000000..ce5de56 --- /dev/null +++ b/dlls/apphelp/Makefile.in @@ -0,0 +1,5 @@ +MODULE = apphelp.dll + +C_SRCS = apphelp.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c new file mode 100644 index 0000000..bed3f5c --- /dev/null +++ b/dlls/apphelp/apphelp.c @@ -0,0 +1,41 @@ +/* + * Copyright 2011 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(apphelp); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec new file mode 100644 index 0000000..a6ecf7f --- /dev/null +++ b/dlls/apphelp/apphelp.spec @@ -0,0 +1,167 @@ +@ stub AllowPermLayer +@ stub ApphelpCheckExe +@ stub ApphelpCheckInstallShieldPackage +@ stub ApphelpCheckMsiPackage +@ stub ApphelpCheckRunApp +@ stub ApphelpCheckRunAppEx +@ stub ApphelpCheckShellObject +@ stub ApphelpCreateAppcompatData +@ stub ApphelpFixMsiPackage +@ stub ApphelpFixMsiPackageExe +@ stub ApphelpFreeFileAttributes +@ stub ApphelpGetFileAttributes +@ stub ApphelpGetMsiProperties +@ stub ApphelpGetNTVDMInfo +@ stub ApphelpParseModuleData +@ stub ApphelpQueryModuleData +@ stub ApphelpQueryModuleDataEx +@ stub ApphelpUpdateCacheEntry +@ stub GetPermLayers +@ stub SdbAddLayerTagRefToQuery +@ stub SdbApphelpNotify +@ stub SdbApphelpNotifyExSdbApphelpNotifyEx +@ stub SdbBuildCompatEnvVariables +@ stub SdbCloseApphelpInformation +@ stub SdbCloseDatabase +@ stub SdbCloseDatabaseWrite +@ stub SdbCloseLocalDatabase +@ stub SdbCommitIndexes +@ stub SdbCreateDatabase +@ stub SdbCreateHelpCenterURL +@ stub SdbCreateMsiTransformFile +@ stub SdbDeclareIndex +@ stub SdbDumpSearchPathPartCaches +@ stub SdbEnumMsiTransforms +@ stub SdbEscapeApphelpURL +@ stub SdbFindFirstDWORDIndexedTag +@ stub SdbFindFirstMsiPackage +@ stub SdbFindFirstMsiPackage_Str +@ stub SdbFindFirstNamedTag +@ stub SdbFindFirstStringIndexedTag +@ stub SdbFindFirstTag +@ stub SdbFindFirstTagRef +@ stub SdbFindNextDWORDIndexedTag +@ stub SdbFindNextMsiPackage +@ stub SdbFindNextStringIndexedTag +@ stub SdbFindNextTag +@ stub SdbFindNextTagRef +@ stub SdbFreeDatabaseInformation +@ stub SdbFreeFileInfo +@ stub SdbFreeFlagInfo +@ stub SdbGetAppCompatDataSize +@ stub SdbGetAppPatchDir +@ stub SdbGetBinaryTagData +@ stub SdbGetDatabaseID +@ stub SdbGetDatabaseInformation +@ stub SdbGetDatabaseInformationByName +@ stub SdbGetDatabaseMatch +@ stub SdbGetDatabaseVersion +@ stub SdbGetDllPath +@ stub SdbGetEntryFlags +@ stub SdbGetFileAttributes +@ stub SdbGetFileImageType +@ stub SdbGetFileImageTypeEx +@ stub SdbGetFileInfo +@ stub SdbGetFirstChild +@ stub SdbGetIndex +@ stub SdbGetItemFromItemRef +@ stub SdbGetLayerName +@ stub SdbGetLayerTagRef +@ stub SdbGetLocalPDB +@ stub SdbGetMatchingExe +@ stub SdbGetMsiPackageInformation +@ stub SdbGetNamedLayer +@ stub SdbGetNextChild +@ stub SdbGetNthUserSdb +@ stub SdbGetPermLayerKeys +@ stub SdbGetShowDebugInfoOption +@ stub SdbGetShowDebugInfoOptionValue +@ stub SdbGetStandardDatabaseGUID +@ stub SdbGetStringTagPtr +@ stub SdbGetTagFromTagID +@ stub SdbGrabMatchingInfo +@ stub SdbGrabMatchingInfoEx +@ stub SdbGUIDFromString +@ stub SdbGUIDToString +@ stub SdbInitDatabase +@ stub SdbInitDatabaseEx +@ stub SdbIsNullGUID +@ stub SdbIsStandardDatabase +@ stub SdbIsTagrefFromLocalDB +@ stub SdbIsTagrefFromMainDB +@ stub SdbLoadString +@ stub SdbMakeIndexKeyFromString +@ stub SdbOpenApphelpDetailsDatabase +@ stub SdbOpenApphelpDetailsDatabaseSP +@ stub SdbOpenApphelpInformation +@ stub SdbOpenApphelpInformationByID +@ stub SdbOpenApphelpResourceFile +@ stub SdbOpenDatabase +@ stub SdbOpenDbFromGuid +@ stub SdbOpenLocalDatabase +@ stub SdbPackAppCompatData +@ stub SdbQueryApphelpInformation +@ stub SdbQueryBlockUpgrade +@ stub SdbQueryContext +@ stub SdbQueryData +@ stub SdbQueryDataEx +@ stub SdbQueryDataExTagID +@ stub SdbQueryFlagInfo +@ stub SdbQueryName +@ stub SdbQueryReinstallUpgrade +@ stub SdbReadApphelpData +@ stub SdbReadApphelpDetailsData +@ stub SdbReadBinaryTag +@ stub SdbReadBYTETag +@ stub SdbReadDWORDTagRef +@ stub SdbReadEntryInformation +@ stub SdbReadMsiTransformInfo +@ stub SdbReadPatchBits +@ stub SdbReadQWORDTag +@ stub SdbReadQWORDTagRef +@ stub SdbReadStringTag +@ stub SdbReadStringTagRef +@ stub SdbReadWORDTagRef +@ stub SdbRegisterDatabase +@ stub SdbReleaseDatabase +@ stub SdbReleaseMatchingExe +@ stub SdbResolveDatabase +@ stub SdbSetApphelpDebugParameters +@ stub SdbSetEntryFlags +@ stub SdbSetImageType +@ stub SdbSetPermLayerKeys +@ stub SdbShowApphelpDialog +@ stub SdbShowApphelpFromQuery +@ stub SdbStartIndexing +@ stub SdbStopIndexing +@ stub SdbStringDuplicate +@ stub SdbStringReplace +@ stub SdbStringReplaceArray +@ stub SdbTagIDToTagRef +@ stub SdbTagToString +@ stub SdbUnregisterDatabase +@ stub SdbWriteBinaryTag +@ stub SdbWriteBinaryTagFromFile +@ stub SdbWriteBYTETag +@ stub SdbWriteDWORDTag +@ stub SdbWriteNULLTag +@ stub SdbWriteQWORDTag +@ stub SdbWriteStringRefTag +@ stub SdbWriteStringTag +@ stub SdbWriteStringTagDirect +@ stub SdbWriteWORDTag +@ stub SE_DllLoaded +@ stub SE_DllUnloaded +@ stub SE_GetHookAPIs +@ stub SE_GetMaxShimCount +@ stub SE_GetProcAddressLoad +@ stub SE_GetShimCount +@ stub SE_InstallAfterInit +@ stub SE_InstallBeforeInit +@ stub SE_IsShimDll +@ stub SE_LdrEntryRemoved +@ stub SE_ProcessDying +@ stub SetPermLayers +@ stub ShimDbgPrint +@ stub ShimDumpCache +@ stub ShimFlushCache

1 0

Louis Lenders : opengl32: Use wrappers for wglCreateContext and wglMakeCurrent instead of directly forwarding to gdi32 .
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 8a2e38cc45aef0d064e3af53b347d7f84aec4ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2e38cc45aef0d064e3af53b… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 30 22:13:34 2011 +0100 opengl32: Use wrappers for wglCreateContext and wglMakeCurrent instead of directly forwarding to gdi32. --- dlls/opengl32/opengl32.spec | 4 ++-- dlls/opengl32/wgl.c | 37 +++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 9bd232f..3fcaa3c 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -336,7 +336,7 @@ @ stdcall glViewport( long long long long ) wine_glViewport @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext -@ stdcall wglCreateContext(long) gdi32.wglCreateContext +@ stdcall wglCreateContext(long) @ stdcall wglCreateLayerContext(long long) @ stdcall wglDeleteContext(long) gdi32.wglDeleteContext @ stdcall wglDescribeLayerPlane(long long long long ptr) @@ -347,7 +347,7 @@ @ stdcall wglGetLayerPaletteEntries(long long long long ptr) @ stdcall wglGetPixelFormat(long) gdi32.GetPixelFormat @ stdcall wglGetProcAddress(str) -@ stdcall wglMakeCurrent(long long) gdi32.wglMakeCurrent +@ stdcall wglMakeCurrent(long long) @ stdcall wglRealizeLayerPalette(long long long) @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cd60eb2..74f3d88 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -45,16 +45,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); -typedef struct wine_wgl_s { - PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); - - void WINAPI (*p_wglGetIntegerv)(GLenum pname, GLint* params); - void WINAPI (*p_wglFinish)(void); - void WINAPI (*p_wglFlush)(void); -} wine_wgl_t; - -/** global wgl object */ -static wine_wgl_t wine_wgl; +static struct +{ + PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); + BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); + HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); + void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); + void (WINAPI *p_wglFinish)(void); + void (WINAPI *p_wglFlush)(void); +} wine_wgl; #ifdef SONAME_LIBGLU #define MAKE_FUNCPTR(f) static typeof(f) * p##f; @@ -117,6 +116,22 @@ void enter_gl(void) const GLubyte * WINAPI wine_glGetString( GLenum name ); /*********************************************************************** + * wglMakeCurrent (OPENGL32.@) + */ +BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) +{ + return wine_wgl.p_wglMakeCurrent(hdc, hglrc); +} + +/*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wine_wgl.p_wglCreateContext(hdc); +} + +/*********************************************************************** * wglCreateLayerContext (OPENGL32.@) */ HGLRC WINAPI wglCreateLayerContext(HDC hdc, @@ -720,6 +735,8 @@ static BOOL process_attach(void) wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod_x11, "wine_tsx11_unlock" ); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); + wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); + wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); /* Interal WGL function */ wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv");

1 0