wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Markus Stockhausen : ddraw: Avoid memory overwrite in GetDeviceIdentifier() .
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: f222a1654ea8f84bc678c9043ad3265b97207dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=f222a1654ea8f84bc678c9043… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Mon Oct 26 15:17:40 2009 +0100 ddraw: Avoid memory overwrite in GetDeviceIdentifier(). --- dlls/ddraw/ddraw.c | 6 ++++-- dlls/ddraw/tests/ddrawmodes.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 726ce7b..351ebda 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1543,10 +1543,12 @@ IDirectDrawImpl_GetDeviceIdentifier(IDirectDraw7 *iface, /* The DDGDI_GETHOSTIDENTIFIER returns the information about the 2D * host adapter, if there's a secondary 3D adapter. This doesn't apply - * to any modern hardware, nor is it interesting for Wine, so ignore it + * to any modern hardware, nor is it interesting for Wine, so ignore it. + * Size of DDDEVICEIDENTIFIER2 may be aligned to 8 bytes and thus 4 + * bytes too long. So only copy the relevant part of the structure */ - *DDDI = deviceidentifier; + memcpy(DDDI, &deviceidentifier, FIELD_OFFSET(DDDEVICEIDENTIFIER2, dwWHQLLevel) + sizeof(DWORD)); return DD_OK; } diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index bd8bec7..d8026ef 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -645,6 +645,42 @@ static void testddraw3(void) if(SUCCEEDED(hr) && dd3) IDirectDraw3_Release(dd3); } +static void testddraw7(void) +{ + IDirectDraw7 *dd7; + HRESULT hr; + DDDEVICEIDENTIFIER2 *pdddi2; + DWORD dddi2Bytes; + DWORD *pend; + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(hr==DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", hr); + + if (hr==DD_OK) + { + dddi2Bytes = FIELD_OFFSET(DDDEVICEIDENTIFIER2, dwWHQLLevel) + sizeof(DWORD); + + pdddi2 = HeapAlloc( GetProcessHeap(), 0, dddi2Bytes + sizeof(DWORD) ); + pend = (DWORD *)((char *)pdddi2 + dddi2Bytes); + *pend = 0xdeadbeef; + + hr = IDirectDraw7_GetDeviceIdentifier(dd7, pdddi2, 0); + ok(hr==DD_OK, "get device identifier failed with %08x\n", hr); + + if (hr==DD_OK) + { + /* check how strings are copied into the structure */ + ok(pdddi2->szDriver[MAX_DDDEVICEID_STRING - 1]==0, "szDriver not cleared\n"); + ok(pdddi2->szDescription[MAX_DDDEVICEID_STRING - 1]==0, "szDescription not cleared\n"); + /* verify that 8 byte structure size alignment will not overwrite memory */ + ok(*pend==0xdeadbeef, "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); + } + + IDirectDraw_Release(dd7); + HeapFree( GetProcessHeap(), 0, pdddi2 ); + } +} + START_TEST(ddrawmodes) { init_function_pointers(); @@ -663,6 +699,7 @@ START_TEST(ddrawmodes) testdisplaymodes(); flushdisplaymodes(); testddraw3(); + testddraw7(); releasedirectdraw(); createdirectdraw();

1 0

Austin English : mshta: Add a stub program.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: e64f7525b5279e93a3ac2334b430b11f2e4cd72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64f7525b5279e93a3ac2334b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 20:55:12 2009 -0500 mshta: Add a stub program. --- configure | 10 ++++++++++ configure.ac | 1 + programs/mshta/Makefile.in | 15 +++++++++++++++ programs/mshta/main.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2b45c31..4cba951 100755 --- a/configure +++ b/configure @@ -17633,6 +17633,15 @@ programs/lodctr/Makefile: programs/lodctr/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/lodctr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/mshta/Makefile" +test "x$enable_mshta" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + mshta" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + mshta" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/mshta/Makefile: programs/mshta/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/mshta/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/msiexec/Makefile" test "x$enable_msiexec" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ msiexec" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ @@ -19245,6 +19254,7 @@ do "programs/icinfo/Makefile") CONFIG_FILES="$CONFIG_FILES programs/icinfo/Makefile" ;; "programs/iexplore/Makefile") CONFIG_FILES="$CONFIG_FILES programs/iexplore/Makefile" ;; "programs/lodctr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/lodctr/Makefile" ;; + "programs/mshta/Makefile") CONFIG_FILES="$CONFIG_FILES programs/mshta/Makefile" ;; "programs/msiexec/Makefile") CONFIG_FILES="$CONFIG_FILES programs/msiexec/Makefile" ;; "programs/net/Makefile") CONFIG_FILES="$CONFIG_FILES programs/net/Makefile" ;; "programs/notepad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/notepad/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0974b27..58b0d75 100644 --- a/configure.ac +++ b/configure.ac @@ -2589,6 +2589,7 @@ WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules],[programs] WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/lodctr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/mshta/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in new file mode 100644 index 0000000..2e5ee54 --- /dev/null +++ b/programs/mshta/Makefile.in @@ -0,0 +1,15 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mshta.exe +APPMODE = -mwindows -municode +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +@MAKE_PROG_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/mshta/main.c b/programs/mshta/main.c new file mode 100644 index 0000000..53baa7e --- /dev/null +++ b/programs/mshta/main.c @@ -0,0 +1,29 @@ +/* + * MSHTA Implementation + * + * Copyright 2009 Austin English + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> +#include <windows.h> + +int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +{ + printf("mshta.exe is a stub!\n"); + return 0; +}

1 0

Damjan Jovanovic : wiaservc: Add wiaservc. dll and implement its svchost entrypoint.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 32233377461bcf78b509b51c3b3a9a6a1684e67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32233377461bcf78b509b51c3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 29 21:58:42 2009 +0200 wiaservc: Add wiaservc.dll and implement its svchost entrypoint. --- configure | 9 +++ configure.ac | 1 + dlls/wiaservc/Makefile.in | 14 ++++ dlls/wiaservc/service.c | 142 +++++++++++++++++++++++++++++++++++++++++ dlls/wiaservc/wiaservc.spec | 57 ++++++++++++++++ dlls/wiaservc/wiaservc_main.c | 56 ++++++++++++++++ 6 files changed, 279 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32233377461bcf78b509b…

1 0

Damjan Jovanovic : sti: Marshal WIA COM interfaces.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: c6c25a442f0b9e2c9c0f3c0751f4f4a559271a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c25a442f0b9e2c9c0f3c075… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 29 20:55:52 2009 +0200 sti: Marshal WIA COM interfaces. --- .gitignore | 2 ++ dlls/sti/Makefile.in | 8 +++++++- dlls/sti/regsvr.c | 15 +++++++++++---- dlls/sti/sti_main.c | 21 +++++++++------------ dlls/sti/sti_wia.idl | 19 +++++++++++++++++++ 5 files changed, 48 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 50aa0b3..79499d8 100644 --- a/.gitignore +++ b/.gitignore @@ -117,6 +117,8 @@ dlls/rpcrt4/tests/server_s.c dlls/shdocvw/shdocvw_v1.tlb dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb +dlls/sti/sti_wia.h +dlls/sti/sti_wia_p.c dlls/user.exe16 dlls/wprocs.dll16 include/activaut.h diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 5bc46bc..247c1e1 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -4,13 +4,19 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sti.dll IMPORTLIB = sti -IMPORTS = uuid ole32 advapi32 kernel32 +IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 kernel32 +EXTRADEFS = -DENTRY_PREFIX=STI_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL C_SRCS = \ regsvr.c \ sti.c \ sti_main.c +IDL_P_SRCS = \ + sti_wia.idl + +EXTRA_OBJS = dlldata.o + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/sti/regsvr.c b/dlls/sti/regsvr.c index 018c178..3e582ec 100644 --- a/dlls/sti/regsvr.c +++ b/dlls/sti/regsvr.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include <stdarg.h> #include <string.h> @@ -31,6 +30,7 @@ #include "objbase.h" #include "initguid.h" #include "sti.h" +#include "wia_lh.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -395,8 +395,11 @@ static struct regsvr_interface const interface_list[] = { { NULL } /* list terminator */ }; +extern HRESULT WINAPI STI_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI STI_DllUnregisterServer(void) DECLSPEC_HIDDEN; + /*********************************************************************** - * DllRegisterServer (INETCOMM.@) + * DllRegisterServer (STI.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -404,14 +407,16 @@ HRESULT WINAPI DllRegisterServer(void) TRACE("\n"); - hr = register_coclasses(coclass_list); + hr = STI_DllRegisterServer(); + if (SUCCEEDED(hr)) + hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); return hr; } /*********************************************************************** - * DllUnregisterServer (INETCOMM.@) + * DllUnregisterServer (STI.@) */ HRESULT WINAPI DllUnregisterServer(void) { @@ -422,5 +427,7 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = STI_DllUnregisterServer(); return hr; } diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 4e91698..7568589 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -32,6 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(sti); +extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; +extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; + typedef HRESULT (*fnCreateInstance)(REFIID riid, IUnknown *pUnkOuter, LPVOID *ppObj); typedef struct @@ -130,16 +133,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); - switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; + if (fdwReason == DLL_WINE_PREATTACH) + return FALSE; + return STI_DllMain(hInstDLL, fdwReason, lpvReserved); } /****************************************************************************** @@ -156,8 +152,9 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) cf = (IClassFactory *)&the_sti_cf.vtbl; } - if (!cf) return CLASS_E_CLASSNOTAVAILABLE; - return IClassFactory_QueryInterface( cf, iid, ppv ); + if (cf) + return IClassFactory_QueryInterface( cf, iid, ppv ); + return STI_DllGetClassObject( rclsid, iid, ppv ); } /****************************************************************************** diff --git a/dlls/sti/sti_wia.idl b/dlls/sti/sti_wia.idl new file mode 100644 index 0000000..aaac943 --- /dev/null +++ b/dlls/sti/sti_wia.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Damjan Jovanovic + * + * 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 "wia_lh.idl"

1 0

Alexandre Julliard : kernel32: Make sure the codepage registry keys are set correctly on wineprefix creation .
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: cf8fa5459abe7a56c156c884882bb337ef3bcec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8fa5459abe7a56c156c8848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 15:14:49 2009 +0100 kernel32: Make sure the codepage registry keys are set correctly on wineprefix creation. --- dlls/kernel32/locale.c | 22 +++++++++++++--------- tools/wine.inf.in | 4 ---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c1888ac..fb9b517 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,8 +62,6 @@ static const union cptable *oem_cptable; static const union cptable *mac_cptable; static const union cptable *unix_cptable; /* NULL if UTF8 */ -static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName); - static const WCHAR szNlsKeyName[] = { 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -769,16 +767,22 @@ void LOCALE_InitRegistry(void) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { - HKEY nls_key = NLS_RegOpenKey( 0, szCodepageKeyName ); + OBJECT_ATTRIBUTES attr; + HANDLE nls_key; - for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++) + RtlInitUnicodeString( &nameW, szCodepageKeyName ); + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + if (!NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) { - count = GetLocaleInfoW( lcid, update_cp_values[i].value | LOCALE_NOUSEROVERRIDE, - bufferW, sizeof(bufferW)/sizeof(WCHAR) ); - RtlInitUnicodeString( &nameW, update_cp_values[i].name ); - NtSetValueKey( nls_key, &nameW, 0, REG_SZ, bufferW, count * sizeof(WCHAR) ); + for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++) + { + count = GetLocaleInfoW( lcid, update_cp_values[i].value | LOCALE_NOUSEROVERRIDE, + bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + RtlInitUnicodeString( &nameW, update_cp_values[i].name ); + NtSetValueKey( nls_key, &nameW, 0, REG_SZ, bufferW, count * sizeof(WCHAR) ); + } + NtClose( nls_key ); } - NtClose( nls_key ); } NtClose( hkey ); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index bb2bd45..ac8742b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -584,10 +584,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" -HKLM,System\CurrentControlSet\Control\Nls\Codepage,"ACP",,"1252" -HKLM,System\CurrentControlSet\Control\Nls\Codepage,"MACCP",,"10000" -HKLM,System\CurrentControlSet\Control\Nls\Codepage,"OEMCP",,"437" - HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0403",,""

1 0

Roderick Colenbrander : winex11: Check format in XRender_GetSrcAreaStretch instead of depth.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: f8786eacb7cb886afdd068e8cfd19200459faa9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8786eacb7cb886afdd068e8c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Oct 30 11:21:32 2009 +0100 winex11: Check format in XRender_GetSrcAreaStretch instead of depth. --- dlls/winex11.drv/xrender.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 06b2aa6..005296b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2103,6 +2103,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE int height = visRectDst->bottom - visRectDst->top; int x_src = physDevSrc->dc_rect.left + visRectSrc->left; int y_src = physDevSrc->dc_rect.top + visRectSrc->top; + struct xrender_info *src_info = get_xrender_info(physDevSrc); const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; @@ -2130,8 +2131,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE if((physDevDst->depth == 1) && (physDevSrc->depth > 1)) return FALSE; - /* Just use traditional X copy when the depths match and we don't need stretching */ - if((physDevSrc->depth == physDevDst->depth) && !stretch) + /* Just use traditional X copy when the formats match and we don't need stretching */ + if((src_info->format->format == dst_format->format) && !stretch) { TRACE("Source and destination depth match and no stretching needed falling back to XCopyArea\n"); wine_tsx11_lock();

1 0

Roderick Colenbrander : winex11: Make sure the formats are the same instead of the depths since the bit ordering can be different .
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 00bbab491bb7d74f71d5855a8140f3188f438026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bbab491bb7d74f71d5855a8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Oct 30 11:05:29 2009 +0100 winex11: Make sure the formats are the same instead of the depths since the bit ordering can be different. --- dlls/winex11.drv/xrender.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 90503bf..06b2aa6 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2063,21 +2063,20 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, { /* At depths >1, the depth of physBitmap and physDev might not be the same e.g. the physbitmap might be a 16-bit DIB while the physdev uses 24-bit */ int depth = physBitmap->pixmap_depth == 1 ? 1 : physDev->depth; + const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); wine_tsx11_lock(); physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, depth); - /* Use XCopyArea when the physBitmap and brush.pixmap have the same depth. */ - if(physBitmap->pixmap_depth == 1 || physDev->depth == physBitmap->pixmap_depth) + /* Use XCopyArea when the physBitmap and brush.pixmap have the same format. */ + if(physBitmap->pixmap_depth == 1 || src_format->format == dst_format->format) { XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 ); } - else /* We meed depth conversion */ + else /* We need depth conversion */ { - const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); - const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); - Picture src_pict, dst_pict; XRenderPictureAttributes pa; pa.subwindow_mode = IncludeInferiors;

1 0

Paul Vriens : advapi32: Add some input parameter checks to BackupEventLog.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: d2227cb8a493eccb04e35328083973b4f7da4ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2227cb8a493eccb04e353280… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 30 09:51:15 2009 +0100 advapi32: Add some input parameter checks to BackupEventLog. --- dlls/advapi32/eventlog.c | 33 +++++++++++++++++++++++++++++---- dlls/advapi32/tests/eventlog.c | 7 ------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 8ce255a..f72dba9 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -64,8 +64,14 @@ static inline LPWSTR SERV_dup( LPCSTR str ) */ BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) { - FIXME("(%p,%s) stub\n", hEventLog, debugstr_a(lpBackupFileName)); - return TRUE; + LPWSTR backupW; + BOOL ret; + + backupW = SERV_dup(lpBackupFileName); + ret = BackupEventLogW(hEventLog, backupW); + HeapFree(GetProcessHeap(), 0, backupW); + + return ret; } /****************************************************************************** @@ -75,8 +81,27 @@ BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) */ BOOL WINAPI BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) { - FIXME("(%p,%s) stub\n", hEventLog, debugstr_w(lpBackupFileName)); - return TRUE; + FIXME("(%p,%s) stub\n", hEventLog, debugstr_w(lpBackupFileName)); + + if (!lpBackupFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (GetFileAttributesW(lpBackupFileName) != INVALID_FILE_ATTRIBUTES) + { + SetLastError(ERROR_ALREADY_EXISTS); + return FALSE; + } + + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 41319ca..9794f30 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -223,15 +223,11 @@ static void test_backup(void) SetLastError(0xdeadbeef); ret = BackupEventLogA(NULL, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } SetLastError(0xdeadbeef); ret = BackupEventLogA(NULL, backup); - todo_wine ok(!ret, "Expected failure\n"); ok(GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); @@ -239,11 +235,8 @@ static void test_backup(void) SetLastError(0xdeadbeef); ret = BackupEventLogA(handle, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } ret = BackupEventLogA(handle, backup); ok(ret, "Expected succes\n");

1 0

Paul Vriens : advapi32/tests: Add some BackupEventLog tests.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: b90ef8c6d91519f635b08827914ceb5cd4bc2efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90ef8c6d91519f635b088279… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 30 09:49:26 2009 +0100 advapi32/tests: Add some BackupEventLog tests. --- dlls/advapi32/tests/eventlog.c | 49 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 9dc1d97..41319ca 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -215,6 +215,54 @@ static void test_oldest(void) CloseEventLog(handle); } +static void test_backup(void) +{ + HANDLE handle; + BOOL ret; + const char backup[] = "backup.evt"; + + SetLastError(0xdeadbeef); + ret = BackupEventLogA(NULL, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = BackupEventLogA(NULL, backup); + todo_wine + ok(!ret, "Expected failure\n"); + ok(GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); + + handle = OpenEventLogA(NULL, "Application"); + + SetLastError(0xdeadbeef); + ret = BackupEventLogA(handle, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + ret = BackupEventLogA(handle, backup); + ok(ret, "Expected succes\n"); + todo_wine + ok(GetFileAttributesA("backup.evt") != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); + + /* Try to overwrite */ + SetLastError(0xdeadbeef); + ret = BackupEventLogA(handle, backup); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "Expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + } + + CloseEventLog(handle); + DeleteFileA(backup); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -232,4 +280,5 @@ START_TEST(eventlog) test_info(); test_count(); test_oldest(); + test_backup(); }

1 0

Austin English : ntdll: Add support for Windows 7 version.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: f2aa80f71eb935536862164783f7bd381e85c391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aa80f71eb93553686216478… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 20:21:40 2009 -0500 ntdll: Add support for Windows 7 version. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index c1f7cb1..ece1cb5 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -53,6 +53,7 @@ typedef enum WIN2K3, /* Windows 2003 */ WINVISTA,/* Windows Vista */ WIN2K8, /* Windows 2008 */ + WIN7, /* Windows 7 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -148,6 +149,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1771, VER_PLATFORM_WIN32_NT, {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 + }, + /* WIN7 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB0, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 } }; @@ -166,6 +173,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2003,win2k3", /* WIN2K3 */ "vista,winvista", /* WINVISTA*/ "win2008,win2k8", /* WIN2K8 */ + "win7", /* WIN7 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 4df2a4a..5cb0968 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,6 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win7", "Windows 7", 6, 1, 0x1DB0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009