January 2006 - Wine-Commits

Mike McCormack : winecfg: Tidy up included headers.
by Alexandre Julliard Jan. 19, 2006

Jan. 19, 2006

Module: wine Branch: refs/heads/master Commit: 55303936b690714ecd3c71b6ec98f6d0bfa6df6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55303936b690714ecd3c71b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 19 11:55:01 2006 +0100 winecfg: Tidy up included headers. Get rid of the barely used properties.c. --- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 21 +++++++++--- programs/winecfg/driveui.c | 13 +++----- programs/winecfg/main.c | 13 +------- programs/winecfg/properties.c | 71 ----------------------------------------- programs/winecfg/properties.h | 3 -- programs/winecfg/theme.c | 5 +-- programs/winecfg/winecfg.c | 2 + programs/winecfg/x11drvdlg.c | 6 ++- 9 files changed, 28 insertions(+), 107 deletions(-) delete mode 100644 programs/winecfg/properties.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 7f79b38..7aa1136 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ driveui.c \ libraries.c \ main.c \ - properties.c \ theme.c \ winecfg.c \ x11drvdlg.c diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 3d78e92..07a4baf 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -19,6 +19,7 @@ * */ +#define WIN32_LEAN_AND_MEAN #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -26,14 +27,11 @@ #include "wine/port.h" #include <assert.h> -#include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <wine/debug.h> #include <shellapi.h> #include <objbase.h> @@ -43,7 +41,6 @@ #include <windowsx.h> #include <mmsystem.h> #include <mmreg.h> -#include <mmsystem.h> #include <mmddk.h> #include "winecfg.h" @@ -64,6 +61,18 @@ static const char* DSound_HW_Accels[] = NULL }; +static const AUDIO_DRIVER sAudioDrivers[] = { + {"ALSA", "alsa"}, + {"aRts", "arts"}, + {"EsounD", "esd"}, + {"OSS", "oss"}, + {"JACK", "jack"}, + {"NAS", "nas"}, + {"Audio IO(Solaris)", "audioio"}, + {"Disable sound", ""}, + {"", ""} +}; + /* list of available drivers */ static AUDIO_DRIVER * loadedAudioDrv; @@ -467,7 +476,7 @@ static void findAudioDrivers(void) */ old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); - for (pAudioDrv = getAudioDrivers(); *pAudioDrv->szName; pAudioDrv++) + for (pAudioDrv = sAudioDrivers; *pAudioDrv->szName; pAudioDrv++) { if (strlen(pAudioDrv->szDriver)) { diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 993cec9..5f407b5 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -21,20 +21,15 @@ * */ -#include <stdarg.h> -#include <stdio.h> - +#define WIN32_LEAN_AND_MEAN #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <shellapi.h> #include <objbase.h> #include <shlguid.h> #include <shlwapi.h> #include <shlobj.h> -#include <winuser.h> #include <wine/debug.h> @@ -279,7 +274,9 @@ static int fill_drives_list(HWND dialog) if (drives[i].letter == 'C') drivec_present = TRUE; - snprintf(letter, sizeof(letter), "%c:", 'A' + i); + letter[0] = 'A' + i; + letter[1] = ':'; + letter[2] = 0; memset(&item, 0, sizeof(item)); item.mask = LVIF_TEXT | LVIF_PARAM; diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index a49d939..b77d02b 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -21,21 +21,12 @@ * */ -#include "config.h" - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif +#define WIN32_LEAN_AND_MEAN #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#include <winuser.h> +#include <windows.h> #include <commctrl.h> #include <objbase.h> #include <wine/debug.h> diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c deleted file mode 100644 index 482448c..0000000 --- a/programs/winecfg/properties.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * WineCfg properties management - * - * Copyright 2002 Jaco Greeff - * Copyright 2003 Dimitrie O. Paun - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#define WIN32_LEAN_AND_MEAN - -#include <windows.h> - -#include "properties.h" - -static const DLL_DESC sDLLType[] = { - {"oleaut32", DLL_BUILTIN}, - {"ole32", DLL_BUILTIN}, - {"commdlg", DLL_BUILTIN}, - {"comdlg32", DLL_BUILTIN}, - {"shell", DLL_BUILTIN}, - {"shell32", DLL_BUILTIN}, - {"shfolder", DLL_BUILTIN}, - {"shlwapi", DLL_BUILTIN}, - {"shdocvw", DLL_BUILTIN}, - {"advapi32", DLL_BUILTIN}, - {"msvcrt", DLL_NATIVE}, - {"mciavi32.dll", DLL_NATIVE}, - {"*", DLL_NATIVE}, - {"", -1} -}; - -static const AUDIO_DRIVER sAudioDrivers[] = { - {"ALSA", "alsa"}, - {"aRts", "arts"}, - {"EsounD", "esd"}, - {"OSS", "oss"}, - {"JACK", "jack"}, - {"NAS", "nas"}, - {"Audio IO(Solaris)", "audioio"}, - {"Disable sound", ""}, - {"", ""} -}; - - -/***************************************************************************** - */ -const DLL_DESC* getDLLDefaults(void) -{ - return sDLLType; -} - -/***************************************************************************** - */ -const AUDIO_DRIVER* getAudioDrivers(void) -{ - return sAudioDrivers; -} diff --git a/programs/winecfg/properties.h b/programs/winecfg/properties.h index 57a1019..b890c2a 100644 --- a/programs/winecfg/properties.h +++ b/programs/winecfg/properties.h @@ -87,7 +87,4 @@ typedef struct int nType; } DEV_NODES; -const DLL_DESC *getDLLDefaults(void); -const AUDIO_DRIVER *getAudioDrivers(void); - #endif diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 37541cc..3cb0e39 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -23,10 +23,7 @@ #include <stdlib.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> +#include <windows.h> #include <uxtheme.h> #include <tmschema.h> #include <shlobj.h> diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 96d8f7a..df2b05f 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -27,6 +27,8 @@ * */ +#define WIN32_LEAN_AND_MEAN + #include <assert.h> #include <stdio.h> #include <limits.h> diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index ed0ab5c..fe1a503 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -21,13 +21,13 @@ * */ +#define WIN32_LEAN_AND_MEAN + #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <wine/debug.h> #include "resource.h"

1 0

appdb/include user.php
by WineHQ Jan. 18, 2006

Jan. 18, 2006

ChangeSet ID: 22395 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/18 23:25:52 Modified files: include : user.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Users don't have permission to modify application versions if they aren't logged in. Patch: http://cvs.winehq.org/patch.py?id=22395 Old revision New revision Changes Path 1.62 1.63 +3 -0 appdb/include/user.php Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.62 appdb/include/user.php:1.63 --- appdb/include/user.php:1.62 19 Jan 2006 5:25:52 -0000 +++ appdb/include/user.php 19 Jan 2006 5:25:52 -0000 @@ -863,6 +863,9 @@ class User { */ function hasAppVersionModifyPermission($oVersion) { + if(!$this->isLoggedIn()) + return false; + if($this->hasPriv("admin")) return true;

1 0

Hans Leidekker : winedump: Fix compilation of generated source.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 1017bcc4486e8079bda94c0c5930c37607ca82d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1017bcc4486e8079bda94c0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 18 17:33:10 2006 +0100 winedump: Fix compilation of generated source. Include config.h in the .c file, not in the .h file. --- tools/winedump/output.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 22185e1..ea11de4 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -145,8 +145,8 @@ void output_header_preamble (void) fprintf (hfile, "/*\n * %s.dll\n *\n * Generated from %s.dll by winedump.\n *\n" " * DO NOT SEND GENERATED DLLS FOR INCLUSION INTO WINE !\n * \n */" - "\n#ifndef __WINE_%s_DLL_H\n#define __WINE_%s_DLL_H\n\n#include " - "\"config.h\"\n#include \"windef.h\"\n#include \"wine/debug.h\"\n" + "\n#ifndef __WINE_%s_DLL_H\n#define __WINE_%s_DLL_H\n\n" + "#include \"windef.h\"\n#include \"wine/debug.h\"\n" "#include \"winbase.h\"\n#include \"winnt.h\"\n\n\n", OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_UC_DLL_NAME, OUTPUT_UC_DLL_NAME); @@ -211,7 +211,8 @@ void output_c_preamble (void) fprintf (cfile, "/*\n * %s.dll\n *\n * Generated from %s by winedump.\n *\n" " * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE!\n * \n */" - "\n\n#include \"%s_dll.h\"\n\nWINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n", + "\n\n#include \"config.h\"\n#include \"%s_dll.h\"\n\n" + "WINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n", OUTPUT_DLL_NAME, globals.input_name, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME);

1 0

Alexandre Julliard : ntdll: Cleaned up the ioctl functions.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 4202824e9eb698c92b1a475cd0b289a0bc8289d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4202824e9eb698c92b1a475… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 17:18:22 2006 +0100 ntdll: Cleaned up the ioctl functions. Renamed function parameters to something usable. Fixed potential event leaks. --- dlls/ntdll/file.c | 247 +++++++++++++++++++++++++++-------------------------- 1 files changed, 128 insertions(+), 119 deletions(-)

1 0

Mike McCormack : programs: Use WIN32_LEAN_AND_MEAN.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 002e143981d97f3bb0f9d7a3a6b44e779b23b7a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=002e143981d97f3bb0f9d7a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 18 14:23:11 2006 +0100 programs: Use WIN32_LEAN_AND_MEAN. --- programs/notepad/license.c | 1 + programs/regsvr32/regsvr32.c | 6 ++++-- programs/winebrowser/main.c | 2 ++ programs/winhelp/callback.c | 2 ++ programs/winhelp/macro.c | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/notepad/license.c b/programs/notepad/license.c index 1fcef23..3c90ca3 100644 --- a/programs/notepad/license.c +++ b/programs/notepad/license.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include "license.h" diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 184e00a..866c285 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -45,6 +45,8 @@ * support. */ +#define WIN32_LEAN_AND_MEAN + #include "config.h" #include "wine/port.h" @@ -88,7 +90,7 @@ static VOID *LoadProc(const char* strDll if(!Silent) printf("Failed to load DLL %s\n", strDll); - exit(-1); + ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, procName); if(!proc) @@ -96,7 +98,7 @@ static VOID *LoadProc(const char* strDll if(!Silent) printf("%s not implemented in DLL %s\n", procName, strDll); FreeLibrary(*DllHandle); - exit(-1); + ExitProcess(1); } return proc; } diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 38648de..6835d47 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -35,6 +35,8 @@ * mailto:[E-MAIL]?subject=[TOPIC]&cc=[E-MAIL]&bcc=[E-MAIL]&body=[TEXT] */ +#define WIN32_LEAN_AND_MEAN + #include "config.h" #include "wine/port.h" diff --git a/programs/winhelp/callback.c b/programs/winhelp/callback.c index 3627547..aaa4eae 100644 --- a/programs/winhelp/callback.c +++ b/programs/winhelp/callback.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include "windows.h" diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index e34a4dc..8727378 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include "windows.h"

1 0

Sasha Slijepcevic : msvcrt: In _tempnam, if TMP is set, it has a precedence over the
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 736cd60340aa1c53011edbf24e137ec1f7624374 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=736cd60340aa1c53011edbf… Author: Sasha Slijepcevic <sascha93101(a)yahoo.com> Date: Wed Jan 18 14:22:27 2006 +0100 msvcrt: In _tempnam, if TMP is set, it has a precedence over the parameter dir. --- dlls/msvcrt/file.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0b42816..1f751f8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1887,6 +1887,9 @@ __int64 _telli64(int fd) char *_tempnam(const char *dir, const char *prefix) { char tmpbuf[MAX_PATH]; + const char *tmp_dir = MSVCRT_getenv("TMP"); + + if (tmp_dir) dir = tmp_dir; TRACE("dir (%s) prefix (%s)\n",dir,prefix); if (GetTempFileNameA(dir,prefix,0,tmpbuf))

1 0

Huw Davies : msxml: Implement get_nodeTypedValue.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 917a801d80352cb372c8bfec97a253fad6a69f55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=917a801d80352cb372c8bfe… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 14:22:23 2006 +0100 msxml: Implement get_nodeTypedValue. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 08e991a..0725cae 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -557,8 +557,8 @@ static HRESULT WINAPI xmlnode_get_nodeTy IXMLDOMNode *iface, VARIANT* typedValue) { - FIXME("\n"); - return E_NOTIMPL; + FIXME("ignoring data type\n"); + return xmlnode_get_nodeValue(iface, typedValue); } static HRESULT WINAPI xmlnode_put_nodeTypedValue(

1 0

Robert Shearman : ntdll: Loader optimization.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 2d08465b81d90e8cf1389b5abf5abefee7ba6462 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d08465b81d90e8cf1389b5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 14:22:19 2006 +0100 ntdll: Loader optimization. Optimize for the case where a DLL with no path is requested and it is already loaded. --- dlls/ntdll/loader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 47cc1da..5996523 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1487,6 +1487,12 @@ static NTSTATUS find_dll_file( const WCH } nt_name.Buffer = NULL; + + if (!contains_path( libname )) + { + if ((*pwm = find_basename_module( libname )) != NULL) goto found; + } + if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { /* we need to search for it */ @@ -1496,11 +1502,6 @@ static NTSTATUS find_dll_file( const WCH if (len >= *size) goto overflow; if ((*pwm = find_fullname_module( filename )) != NULL) goto found; - /* check for already loaded module in a different path */ - if (!contains_path( libname )) - { - if ((*pwm = find_basename_module( file_part )) != NULL) goto found; - } if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) { RtlFreeHeap( GetProcessHeap(), 0, dllname ); @@ -1525,7 +1526,6 @@ static NTSTATUS find_dll_file( const WCH len = strlenW(libname) * sizeof(WCHAR); if (len >= *size) goto overflow; strcpyW( filename, libname ); - *pwm = find_basename_module( filename ); goto found; } }

1 0

Robert Reif : winealsa: Add critical section names for debugging.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 273470e8ba403ffcd3d827a58c1f7911357d869a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=273470e8ba403ffcd3d827a… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Jan 18 14:03:23 2006 +0100 winealsa: Add critical section names for debugging. --- dlls/winmm/winealsa/audio.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 7beab7b..d0f095f 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -1663,6 +1663,7 @@ static int ALSA_InitRingMessage(ALSA_MSG omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(ALSA_MSG)); InitializeCriticalSection(&omr->msg_crst); + omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)"WINEALSA_msg_crst"; return 0; } @@ -1680,6 +1681,7 @@ static int ALSA_DestroyRingMessage(ALSA_ #endif HeapFree(GetProcessHeap(),0,omr->messages); omr->ring_buffer_size = 0; + omr->msg_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&omr->msg_crst); return 0; } @@ -3178,6 +3180,7 @@ static int DSDB_CreateMMAP(IDsDriverBuff frames, pdbi->mmap_buflen_bytes, pdbi->mmap_buffer); InitializeCriticalSection(&pdbi->mmap_crst); + pdbi->mmap_crst.DebugInfo->Spare[0] = (DWORD_PTR)"WINEALSA_mmap_crst"; err = snd_async_add_pcm_handler(&pdbi->mmap_async_handler, wwo->pcm, DSDB_PCMCallback, pdbi); if ( err < 0 ) @@ -3194,6 +3197,7 @@ static void DSDB_DestroyMMAP(IDsDriverBu TRACE("mmap buffer %p destroyed\n", pdbi->mmap_buffer); pdbi->mmap_areas = NULL; pdbi->mmap_buffer = NULL; + pdbi->mmap_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pdbi->mmap_crst); }

1 0

Alexandre Julliard : gdi: Ignore a few more metafile escapes.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: bde6885161ea6a21cfea5cd2678a02cf3f736267 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bde6885161ea6a21cfea5cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 13:23:20 2006 +0100 gdi: Ignore a few more metafile escapes. --- dlls/gdi/metafile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/metafile.c b/dlls/gdi/metafile.c index 55c8296..80de9c7 100644 --- a/dlls/gdi/metafile.c +++ b/dlls/gdi/metafile.c @@ -865,6 +865,8 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, case META_ESCAPE: switch (mr->rdParm[0]) { case GETSCALINGFACTOR: /* get function ... would just NULL dereference */ + case GETPHYSPAGESIZE: + case GETPRINTINGOFFSET: return FALSE; case SETABORTPROC: FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");

1 0