August 2011 - Wine-commits - list.winehq.org

Francois Gouget : kernel32: Fix writing to a pipe in WriteConsoleW().
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 66395882f8b6f8f8b9ebf9b48ab36ac39da04dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=66395882f8b6f8f8b9ebf9b48… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 18:07:09 2011 +0200 kernel32: Fix writing to a pipe in WriteConsoleW(). --- dlls/kernel32/console.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d28c153..bab2322 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -45,6 +45,7 @@ # include <sys/poll.h> #endif +#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -2361,7 +2362,9 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber { char* ptr; unsigned len; - BOOL ret; + HANDLE hFile; + NTSTATUS status; + IO_STATUS_BLOCK iosb; close(fd); /* FIXME: mode ENABLED_OUTPUT is not processed (or actually we rely on underlying Unix/TTY fd @@ -2372,17 +2375,28 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber return FALSE; WideCharToMultiByte(CP_UNIXCP, 0, lpBuffer, nNumberOfCharsToWrite, ptr, len, NULL, NULL); - ret = WriteFile(wine_server_ptr_handle(console_handle_unmap(hConsoleOutput)), - ptr, len, lpNumberOfCharsWritten, NULL); - if (ret && lpNumberOfCharsWritten) + hFile = wine_server_ptr_handle(console_handle_unmap(hConsoleOutput)); + status = NtWriteFile(hFile, NULL, NULL, NULL, &iosb, ptr, len, 0, NULL); + if (status == STATUS_PENDING) { - if (*lpNumberOfCharsWritten == len) + WaitForSingleObject(hFile, INFINITE); + status = iosb.u.Status; + } + + if (status != STATUS_PENDING && lpNumberOfCharsWritten) + { + if (iosb.Information == len) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; else FIXME("Conversion not supported yet\n"); } HeapFree(GetProcessHeap(), 0, ptr); - return ret; + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } if (!GetConsoleMode(hConsoleOutput, &mode) || !GetConsoleScreenBufferInfo(hConsoleOutput, &csbi))

1 0

André Hentschel : fusion/tests: Skip tests when file creation fails.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: efaa80136194a11d1953297bcc232f101d3c2628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaa80136194a11d1953297bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 3 20:35:22 2011 +0200 fusion/tests: Skip tests when file creation fails. --- dlls/fusion/tests/asmenum.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index cb6ea3d..a060529 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -147,13 +147,15 @@ static BOOL create_full_path(LPCSTR path) return ret; } -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) +static BOOL create_file_data(LPCSTR name, LPCSTR data, DWORD size) { HANDLE file; DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + WriteFile(file, data, strlen(data), &written, NULL); if (size) @@ -163,10 +165,9 @@ static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) } CloseHandle(file); + return TRUE; } -#define create_file(name, size) create_file_data(name, name, size) - static void test_CreateAssemblyEnum(void) { HRESULT hr; @@ -409,19 +410,31 @@ static void test_enumerate_name(void) CreateDirectoryA(path, NULL); lstrcatA(path, "\\Wine.dll"); - create_file(path, 100); + if (!create_file_data(path, path, 100)) + { + win_skip("Failed to open file %s, skipping name enumeration tests\n", path); + goto done; + } sprintf(path, "%s\\Wine\\1.0.1.2__16a3fcd171e93a8d", gac); CreateDirectoryA(path, NULL); lstrcatA(path, "\\Wine.dll"); - create_file(path, 100); + if (!create_file_data(path, path, 100)) + { + win_skip("Failed to open file %s, skipping name enumeration tests\n", path); + goto done; + } sprintf(path, "%s\\Wine\\1.0.1.2__123456789abcdef0", gac); CreateDirectoryA(path, NULL); lstrcatA(path, "\\Wine.dll"); - create_file(path, 100); + if (!create_file_data(path, path, 100)) + { + win_skip("Failed to open file %s, skipping name enumeration tests\n", path); + goto done; + } /* test case sensitivity */ to_widechar(namestr, "wine"); @@ -650,6 +663,7 @@ static void test_enumerate_name(void) IAssemblyEnum_Release(asmenum); IAssemblyName_Release(asmname); +done: sprintf(path, "%s\\Wine\\1.0.0.0__16a3fcd171e93a8d\\Wine.dll", gac); DeleteFileA(path); sprintf(path, "%s\\Wine\\1.0.1.2__16a3fcd171e93a8d\\Wine.dll", gac);

1 0

Jay Yang : shell32: Implement SHCreateDefaultContextMenu and CDefFolderMenu_Create2.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 0a7a3be0b168777a190cda8743b6f0c6f238f4bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7a3be0b168777a190cda874… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Wed Aug 3 17:42:17 2011 -0400 shell32: Implement SHCreateDefaultContextMenu and CDefFolderMenu_Create2. --- dlls/shell32/shell32.spec | 2 + dlls/shell32/shfldr.h | 4 + dlls/shell32/shlmenu.c | 307 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 2 +- 4 files changed, 314 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a7a3be0b168777a190cd…

1 0

Jacek Caban : wshom.ocx: Added typelib.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 2d58bca093637253b8e23955fe42ad3a0f11a78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d58bca093637253b8e23955f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 10:30:54 2011 +0200 wshom.ocx: Added typelib. --- dlls/wshom.ocx/Makefile.in | 2 + dlls/wshom.ocx/wshom.idl | 147 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 3692cd9..e87eff5 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -3,4 +3,6 @@ MODULE = wshom.ocx C_SRCS = \ wshom_main.c +IDL_TLB_SRCS = wshom.idl + @MAKE_DLL_RULES@ diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl new file mode 100644 index 0000000..548e3db --- /dev/null +++ b/dlls/wshom.ocx/wshom.idl @@ -0,0 +1,147 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +import "oaidl.idl"; + +[ + helpstring("Windows Script Host Object Model"), + uuid(f935dc20-1cf0-11d0-adb9-00c04fd58a0b), + version(1.0) +] +library IWshRuntimeLibrary +{ + importlib("stdole2.tlb"); + + [ + uuid(f935dc27-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshCollection : IDispatch { + [id(DISPID_VALUE)] + HRESULT Item( + [in] VARIANT *Index, + [out, retval] VARIANT *out_Value); + + [id(1)] + HRESULT Count([out, retval] long *out_Count); + + [id(2), propget] + HRESULT length([out, retval] long *out_Count); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + } + + [ + uuid(f935dc29-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshEnvironment : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] BSTR Name, + [out, retval] BSTR *out_Value); + + [id(DISPID_VALUE), propput] + HRESULT Item( + [in] BSTR Name, + [in] BSTR out_Value); + + [id(1)] + HRESULT Count([out, retval] long *out_Count); + + [id(2), propget] + HRESULT length([out, retval] long *out_Count); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + + [id(0x03e9)] + HRESULT Remove([in] BSTR Name); + } + + [ + uuid(41904400-be18-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshShell3 : IDispatch { + [id(0x0064), propget] + HRESULT SpecialFolders([out, retval] IWshCollection **out_Folders); + + [id(0x00c8), propget] + HRESULT Environment( + [in, optional] VARIANT *Type, + [out, retval] IWshEnvironment **out_Env); + + [id(0x03e8)] + HRESULT Run( + [in] BSTR Command, + [in, optional] VARIANT *WindowStyle, + [in, optional] VARIANT *WaitOnReturn, + [out, retval] int *out_ExitCode); + } + + [ + uuid(24be5a31-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation + ] + interface IWshNetwork2 : IDispatch { + [id(0x60020000), propget] + HRESULT UserDomain([out, retval] BSTR *out_UserDomain); + } + + [ + helpstring("Windows Script Host Shell Object"), + uuid(f935dc22-1cf0-11d0-adb9-00c04fd58a0b) + ] + coclass IWshShell_Class { + [default] interface IWshShell3; + } + + [ + helpstring("Windows Script Host Shell Object"), + uuid(72c24dd5-d70a-438b-8a42-98424b88afb8) + ] + coclass WshShell { + [default] interface IWshShell3; + } + + [ + helpstring("Windows Script Host Network Object"), + uuid(f935dc26-1cf0-11d0-adb9-00c04fd58a0b) + ] + coclass IWshNetwork_Class { + [default] interface IWshNetwork2; + } + + [ + helpstring("Windows Script Host Network Object"), + uuid(093ff999-1ea0-4079-9525-9614c3504b74) + ] + coclass WshNetwork { + [default] interface IWshNetwork2; + } +}

1 0

Jacek Caban : wshom.ocx: Added Dll[Un]RegisterServer implementation.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: a1e8bc65e7b769994b714a2afa8f43e4fe8471e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e8bc65e7b769994b714a2af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 10:31:29 2011 +0200 wshom.ocx: Added Dll[Un]RegisterServer implementation. --- dlls/wshom.ocx/Makefile.in | 2 ++ dlls/wshom.ocx/wshom.idl | 20 ++++++++++++++++---- dlls/wshom.ocx/wshom.rc | 24 ++++++++++++++++++++++++ dlls/wshom.ocx/wshom.rgs | 34 ++++++++++++++++++++++++++++++++++ dlls/wshom.ocx/wshom_main.c | 15 ++++++++++----- 5 files changed, 86 insertions(+), 9 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index e87eff5..5fb73d5 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -3,6 +3,8 @@ MODULE = wshom.ocx C_SRCS = \ wshom_main.c +RC_SRCS = wshom.rc + IDL_TLB_SRCS = wshom.idl @MAKE_DLL_RULES@ diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 548e3db..a7dcb3a 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -115,7 +115,10 @@ library IWshRuntimeLibrary [ helpstring("Windows Script Host Shell Object"), - uuid(f935dc22-1cf0-11d0-adb9-00c04fd58a0b) + uuid(f935dc22-1cf0-11d0-adb9-00c04fd58a0b), + threading(apartment), + progid("WScript.Shell.1"), + vi_progid("WScript.Shell") ] coclass IWshShell_Class { [default] interface IWshShell3; @@ -123,7 +126,10 @@ library IWshRuntimeLibrary [ helpstring("Windows Script Host Shell Object"), - uuid(72c24dd5-d70a-438b-8a42-98424b88afb8) + uuid(72c24dd5-d70a-438b-8a42-98424b88afb8), + threading(apartment), + progid("WScript.Shell.1"), + vi_progid("WScript.Shell") ] coclass WshShell { [default] interface IWshShell3; @@ -131,7 +137,10 @@ library IWshRuntimeLibrary [ helpstring("Windows Script Host Network Object"), - uuid(f935dc26-1cf0-11d0-adb9-00c04fd58a0b) + uuid(f935dc26-1cf0-11d0-adb9-00c04fd58a0b), + threading(apartment), + progid("WScript.Network.1"), + vi_progid("WScript.Network") ] coclass IWshNetwork_Class { [default] interface IWshNetwork2; @@ -139,7 +148,10 @@ library IWshRuntimeLibrary [ helpstring("Windows Script Host Network Object"), - uuid(093ff999-1ea0-4079-9525-9614c3504b74) + uuid(093ff999-1ea0-4079-9525-9614c3504b74), + threading(apartment), + progid("WScript.Network.1"), + vi_progid("WScript.Network") ] coclass WshNetwork { [default] interface IWshNetwork2; diff --git a/dlls/wshom.ocx/wshom.rc b/dlls/wshom.ocx/wshom.rc new file mode 100644 index 0000000..17fb45f --- /dev/null +++ b/dlls/wshom.ocx/wshom.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 "windef.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: wshom.rgs */ +1 WINE_REGISTRY wshom.rgs diff --git a/dlls/wshom.ocx/wshom.rgs b/dlls/wshom.ocx/wshom.rgs new file mode 100644 index 0000000..ce0ec77 --- /dev/null +++ b/dlls/wshom.ocx/wshom.rgs @@ -0,0 +1,34 @@ +HKCR +{ + NoRemove CLSID + { + '{f935dc22-1cf0-11d0-adb9-00c04fd58a0b}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + '{72c24dd5-d70a-438b-8a42-98424b88afb8}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + '{f935dc26-1cf0-11d0-adb9-00c04fd58a0b}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + '{093ff999-1ea0-4079-9525-9614c3504b74}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + } +} diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index e9951ec..0266822 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -24,11 +24,15 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static HINSTANCE wshom_instance; + /****************************************************************** * DllMain (wshom.ocx.@) */ @@ -41,7 +45,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + wshom_instance = hInstDLL; + DisableThreadLibraryCalls(wshom_instance); break; } @@ -71,8 +76,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return __wine_register_resources(wshom_instance); } /*********************************************************************** @@ -80,6 +85,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return __wine_unregister_resources(wshom_instance); }

1 0

Michael Stefaniuc : dpnet: COM cleanup for the IDirectPlay8Peer iface.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: e21eebb2ab4031aa1fe82c62cf6376fc64498764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21eebb2ab4031aa1fe82c62c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 11:05:08 2011 +0200 dpnet: COM cleanup for the IDirectPlay8Peer iface. --- dlls/dpnet/dpnet_private.h | 5 +- dlls/dpnet/peer.c | 195 +++++++++++++++++--------------------------- 2 files changed, 78 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e21eebb2ab4031aa1fe82…

1 0

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFO in CreateDIBSection and pass that to the driver .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 7deda051852d5e7faf3d10744d90e9fa8d4c2fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7deda051852d5e7faf3d10744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 18:21:37 2011 +0200 gdi32: Create a sanitized BITMAPINFO in CreateDIBSection and pass that to the driver. --- dlls/gdi32/dib.c | 138 +++++++++++++++--------------------------------- dlls/winex11.drv/dib.c | 6 +-- 2 files changed, 43 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7deda051852d5e7faf3d1…

1 0

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFO in StretchDIBits and pass that to the drivers .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: d0d98046c61b5d97d0947179bfd3088f89095347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d98046c61b5d97d0947179b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 13:09:34 2011 +0200 gdi32: Create a sanitized BITMAPINFO in StretchDIBits and pass that to the drivers. --- dlls/gdi32/dib.c | 21 +++++++++---------- dlls/gdi32/enhmfdrv/bitblt.c | 9 +++---- dlls/gdi32/mfdrv/bitblt.c | 5 +-- dlls/wineps.drv/bitmap.c | 45 ++++------------------------------------- 4 files changed, 21 insertions(+), 59 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3e23547..c05e8e3 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -389,9 +389,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he { DC *dc = get_nulldrv_dc( dev ); INT ret; - LONG width, height; - WORD planes, bpp; - DWORD compr, size; + LONG height; HBITMAP hBitmap; HDC hdcMem; @@ -399,10 +397,8 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (GET_DC_PHYSDEV( dc, pStretchBlt ) == dev || GET_DC_PHYSDEV( dc, pPutImage ) == dev) return 0; - if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ) == -1) - return 0; - - if (width < 0) return 0; + if (info->bmiHeader.biWidth < 0) return 0; + height = info->bmiHeader.biHeight; if (xSrc == 0 && ySrc == 0 && widthDst == widthSrc && heightDst == heightSrc && info->bmiHeader.biCompression == BI_RGB) @@ -417,7 +413,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he hBitmap = GetCurrentObject( dev->hdc, OBJ_BITMAP ); if (GetObjectW( hBitmap, sizeof(bm), &bm ) && bm.bmWidth == widthSrc && bm.bmHeight == heightSrc && - bm.bmBitsPixel == bpp && bm.bmPlanes == planes) + bm.bmBitsPixel == info->bmiHeader.biBitCount && bm.bmPlanes == 1) { /* fast path */ return SetDIBits( dev->hdc, hBitmap, 0, abs( height ), bits, info, coloruse ); @@ -426,7 +422,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he } hdcMem = CreateCompatibleDC( dev->hdc ); - hBitmap = CreateCompatibleBitmap( dev->hdc, width, height ); + hBitmap = CreateCompatibleBitmap( dev->hdc, info->bmiHeader.biWidth, height ); SelectObject( hdcMem, hBitmap ); if (coloruse == DIB_PAL_COLORS) SelectPalette( hdcMem, GetCurrentObject( dev->hdc, OBJ_PAL ), FALSE ); @@ -457,12 +453,15 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he */ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, - const BITMAPINFO *info, UINT coloruse, DWORD rop ) + const BITMAPINFO *bmi, UINT coloruse, DWORD rop ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; DC *dc; INT ret = 0; - if (!bits || !info) return 0; + if (!bits) return 0; + if (!bitmapinfo_from_user_bitmapinfo( info, bmi, coloruse )) return 0; if ((dc = get_dc_ptr( hdc ))) { diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 6d88a3c..feb1016 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -175,13 +175,12 @@ INT EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT hei { EMRSTRETCHDIBITS *emr; BOOL ret; - UINT bmi_size=0, emr_size; - UINT bits_size = get_dib_image_size(info); + UINT bmi_size, emr_size; /* calculate the size of the colour table */ bmi_size = bitmap_info_size(info, wUsage); - emr_size = sizeof (EMRSTRETCHDIBITS) + bmi_size + bits_size; + emr_size = sizeof (EMRSTRETCHDIBITS) + bmi_size + info->bmiHeader.biSizeImage; emr = HeapAlloc(GetProcessHeap(), 0, emr_size ); if (!emr) return 0; @@ -189,7 +188,7 @@ INT EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT hei memcpy( &emr[1], info, bmi_size); /* write bitmap bits to the record */ - memcpy ( ( (BYTE *) (&emr[1]) ) + bmi_size, bits, bits_size); + memcpy ( ( (BYTE *) (&emr[1]) ) + bmi_size, bits, info->bmiHeader.biSizeImage); /* fill in the EMR header at the front of our piece of memory */ emr->emr.iType = EMR_STRETCHDIBITS; @@ -207,7 +206,7 @@ INT EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT hei emr->offBmiSrc = sizeof (EMRSTRETCHDIBITS); emr->cbBmiSrc = bmi_size; emr->offBitsSrc = emr->offBmiSrc + bmi_size; - emr->cbBitsSrc = bits_size; + emr->cbBitsSrc = info->bmiHeader.biSizeImage; emr->cxSrc = widthSrc; emr->cySrc = heightSrc; diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index bd589de..aabf9f5 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -136,8 +136,7 @@ INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) { DWORD infosize = bitmap_info_size(info, wUsage); - DWORD imagesize = get_dib_image_size( info ); - DWORD len = sizeof(METARECORD) + 10 * sizeof(WORD) + infosize + imagesize; + DWORD len = sizeof(METARECORD) + 10 * sizeof(WORD) + infosize + info->bmiHeader.biSizeImage; METARECORD *mr = HeapAlloc( GetProcessHeap(), 0, len ); if(!mr) return 0; @@ -155,7 +154,7 @@ INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, mr->rdParm[9] = (INT16)yDst; mr->rdParm[10] = (INT16)xDst; memcpy(mr->rdParm + 11, info, infosize); - memcpy(mr->rdParm + 11 + infosize / 2, bits, imagesize); + memcpy(mr->rdParm + 11 + infosize / 2, bits, info->bmiHeader.biSizeImage); MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 ); HeapFree( GetProcessHeap(), 0, mr ); return heightSrc; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 4897b4e..7f2d507 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -49,37 +49,6 @@ static inline int get_dib_width_bytes( int width, int depth ) return 4 * words; } -/* get the bitmap info from either an INFOHEADER or COREHEADER bitmap */ -static BOOL get_bitmap_info( const void *ptr, LONG *width, LONG *height, WORD *bpp, WORD *compr ) -{ - const BITMAPINFOHEADER *header = ptr; - - switch(header->biSize) - { - case sizeof(BITMAPCOREHEADER): - { - const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *bpp = core->bcBitCount; - *compr = 0; - } - return TRUE; - case sizeof(BITMAPINFOHEADER): - case sizeof(BITMAPV4HEADER): - case sizeof(BITMAPV5HEADER): - /* V4 and V5 structures are a superset of the INFOHEADER structure */ - *width = header->biWidth; - *height = header->biHeight; - *bpp = header->biBitCount; - *compr = header->biCompression; - return TRUE; - default: - ERR("(%d): unknown/wrong size for header\n", header->biSize ); - return FALSE; - } -} - /*************************************************************************** * PSDRV_WriteImageHeader @@ -336,9 +305,7 @@ INT PSDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) { - LONG fullSrcWidth, fullSrcHeight; INT stride; - WORD bpp, compression; INT line; POINT pt[2]; const BYTE *src_ptr; @@ -348,15 +315,13 @@ INT PSDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, TRACE("%p (%d,%d %dx%d) -> (%d,%d %dx%d)\n", dev->hdc, xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst); - if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; - - stride = get_dib_width_bytes(fullSrcWidth, bpp); + stride = get_dib_width_bytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, - fullSrcHeight, bpp, compression, dwRop); + TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", info->bmiHeader.biWidth, + info->bmiHeader.biHeight, info->bmiHeader.biBitCount, info->bmiHeader.biCompression, dwRop); - if(compression != BI_RGB) { + if(info->bmiHeader.biCompression != BI_RGB) { FIXME("Compression not supported\n"); return FALSE; } @@ -371,7 +336,7 @@ INT PSDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, widthDst = pt[1].x - pt[0].x; heightDst = pt[1].y - pt[0].y; - switch(bpp) { + switch (info->bmiHeader.biBitCount) { case 1: src_ptr = bits;

1 0

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFO in SetDIBitsToDevice and pass that to the drivers .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: f825f5db8c3bfc7709dfe30b73f92d5f21470950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f825f5db8c3bfc7709dfe30b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 13:22:53 2011 +0200 gdi32: Create a sanitized BITMAPINFO in SetDIBitsToDevice and pass that to the drivers. --- dlls/gdi32/dib.c | 5 +- dlls/gdi32/enhmfdrv/bitblt.c | 7 +- dlls/gdi32/mfdrv/bitblt.c | 5 +- dlls/winex11.drv/dib.c | 159 ++++++++---------------------------------- 4 files changed, 39 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f825f5db8c3bfc7709dfe…

1 0

Alexandre Julliard : gdi32: Move initialization of a correct BITMAPINFOHEADER to a separate function.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: f234ce9dccbb47cf69ab1eb0c45f11205d407a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f234ce9dccbb47cf69ab1eb0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 14:37:20 2011 +0200 gdi32: Move initialization of a correct BITMAPINFOHEADER to a separate function. --- dlls/gdi32/dib.c | 102 +++++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 6676762..5f3dd93 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -135,77 +135,77 @@ int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, } /******************************************************************************************* - * Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO. + * Fill out a true BITMAPINFOHEADER from a variable sized BITMAPINFOHEADER / BITMAPCOREHEADER. */ -static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *info, UINT coloruse ) +static BOOL bitmapinfoheader_from_user_bitmapinfo( BITMAPINFOHEADER *dst, const BITMAPINFOHEADER *info ) { LONG width, height; WORD planes, bpp; DWORD compr, size; - void *src_colors; - unsigned int colors; - int bitmap_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ); + int bitmap_type = DIB_GetBitmapInfo( info, &width, &height, &planes, &bpp, &compr, &size ); if (bitmap_type == -1) return FALSE; - src_colors = (char *)info + info->bmiHeader.biSize; if (bitmap_type == 1) { - dst->bmiHeader = info->bmiHeader; - dst->bmiHeader.biSize = sizeof(dst->bmiHeader); + *dst = *info; + } + else + { + dst->biWidth = width; + dst->biHeight = height; + dst->biPlanes = planes; + dst->biBitCount = bpp; + dst->biCompression = compr; + dst->biXPelsPerMeter = 0; + dst->biYPelsPerMeter = 0; + dst->biClrUsed = 0; + dst->biClrImportant = 0; + } - colors = get_dib_num_of_colors( dst ); + dst->biSize = sizeof(*dst); + if (dst->biCompression == BI_RGB || dst->biCompression == BI_BITFIELDS) + dst->biSizeImage = get_dib_image_size( (BITMAPINFO *)dst ); + return TRUE; +} - if (info->bmiHeader.biCompression == BI_BITFIELDS) - /* bitfields are always at bmiColors even in larger structures */ - memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); - else if (colors) - { - unsigned int size; +/******************************************************************************************* + * Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO. + */ +static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *info, UINT coloruse ) +{ + void *src_colors; + unsigned int colors; - if (coloruse == DIB_PAL_COLORS) - size = colors * sizeof(WORD); - else - size = colors * sizeof(RGBQUAD); - memcpy( dst->bmiColors, src_colors, size ); - } + if (!bitmapinfoheader_from_user_bitmapinfo( &dst->bmiHeader, &info->bmiHeader )) return FALSE; + + src_colors = (char *)info + info->bmiHeader.biSize; + colors = get_dib_num_of_colors( dst ); + + if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + /* bitfields are always at bmiColors even in larger structures */ + memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); } - else + else if (colors) { - dst->bmiHeader.biSize = sizeof(dst->bmiHeader); - dst->bmiHeader.biWidth = width; - dst->bmiHeader.biHeight = height; - dst->bmiHeader.biPlanes = planes; - dst->bmiHeader.biBitCount = bpp; - dst->bmiHeader.biCompression = compr; - dst->bmiHeader.biXPelsPerMeter = 0; - dst->bmiHeader.biYPelsPerMeter = 0; - dst->bmiHeader.biClrUsed = 0; - dst->bmiHeader.biClrImportant = 0; - - colors = get_dib_num_of_colors( dst ); - - if (colors) + if (coloruse == DIB_PAL_COLORS) + memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); + else if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + memcpy( dst->bmiColors, src_colors, colors * sizeof(RGBQUAD) ); + else { - if (coloruse == DIB_PAL_COLORS) - memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); - else + unsigned int i; + RGBTRIPLE *triple = (RGBTRIPLE *)src_colors; + for (i = 0; i < colors; i++) { - unsigned int i; - RGBTRIPLE *triple = (RGBTRIPLE *)src_colors; - for (i = 0; i < colors; i++) - { - dst->bmiColors[i].rgbRed = triple[i].rgbtRed; - dst->bmiColors[i].rgbGreen = triple[i].rgbtGreen; - dst->bmiColors[i].rgbBlue = triple[i].rgbtBlue; - dst->bmiColors[i].rgbReserved = 0; - } + dst->bmiColors[i].rgbRed = triple[i].rgbtRed; + dst->bmiColors[i].rgbGreen = triple[i].rgbtGreen; + dst->bmiColors[i].rgbBlue = triple[i].rgbtBlue; + dst->bmiColors[i].rgbReserved = 0; } } } - - if (dst->bmiHeader.biCompression == BI_RGB || dst->bmiHeader.biCompression == BI_BITFIELDS) - dst->bmiHeader.biSizeImage = get_dib_image_size( dst ); return TRUE; }

1 0