March 2008 - Wine-commits - list.winehq.org

James Hawkins : fusion: Add a few fusion stubs.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 87b970cedcaa6e0403a651c9afff3a883a3188db URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b970cedcaa6e0403a651c9a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Mar 23 18:48:48 2008 -0700 fusion: Add a few fusion stubs. --- dlls/fusion/Makefile.in | 1 + dlls/fusion/fusion.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/fusion/fusion.spec | 12 ++-- 3 files changed, 128 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 2d1a37f..e33712c 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -6,6 +6,7 @@ MODULE = fusion.dll IMPORTS = kernel32 C_SRCS = \ + fusion.c \ fusion_main.c @MAKE_DLL_RULES@ diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c new file mode 100644 index 0000000..43f0d15 --- /dev/null +++ b/dlls/fusion/fusion.c @@ -0,0 +1,121 @@ +/* + * Implementation of the Fusion API + * + * Copyright 2008 James Hawkins + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "fusion.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fusion); + +/****************************************************************** + * ClearDownloadCache (FUSION.@) + */ +HRESULT WINAPI ClearDownloadCache(void) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} + +/****************************************************************** + * CompareAssemblyIdentity (FUSION.@) + */ +HRESULT WINAPI CompareAssemblyIdentity(LPCWSTR pwzAssemblyIdentity1, BOOL fUnified1, + LPCWSTR pwzAssemblyIdentity2, BOOL fUnified2, + BOOL *pfEquivalent, AssemblyComparisonResult *pResult) +{ + FIXME("(%s, %d, %s, %d, %p, %p) stub!\n", debugstr_w(pwzAssemblyIdentity1), + fUnified1, debugstr_w(pwzAssemblyIdentity2), fUnified2, pfEquivalent, pResult); + + return E_NOTIMPL; +} + +/****************************************************************** + * CreateAssemblyCache (FUSION.@) + */ +HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved) +{ + FIXME("(%p, %d) stub!\n", ppAsmCache, dwReserved); + return E_NOTIMPL; +} + +/****************************************************************** + * CreateAssemblyEnum (FUSION.@) + */ +HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, + IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved) +{ + FIXME("(%p, %p, %p, %08x, %p) stub!\n", pEnum, pUnkReserved, + pName, dwFlags, pvReserved); + + return E_NOTIMPL; +} + +/****************************************************************** + * CreateAssemblyNameObject (FUSION.@) + */ +HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, + LPCWSTR szAssemblyName, DWORD dwFlags, + LPVOID pvReserved) +{ + FIXME("(%p, %s, %08x, %p) stub!\n", ppAssemblyNameObj, + debugstr_w(szAssemblyName), dwFlags, pvReserved); + + return E_NOTIMPL; +} + +/****************************************************************** + * CreateInstallReferenceEnum (FUSION.@) + */ +HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum **ppRefEnum, + IAssemblyName *pName, DWORD dwFlags, + LPVOID pvReserved) +{ + FIXME("(%p, %p, %08x, %p) stub!\n", ppRefEnum, pName, dwFlags, pvReserved); + return E_NOTIMPL; +} + +/****************************************************************** + * GetAssemblyIdentityFromFile (FUSION.@) + */ +HRESULT WINAPI GetAssemblyIdentityFromFile(LPCWSTR pwzFilePath, REFIID riid, + IUnknown **ppIdentity) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_w(pwzFilePath), debugstr_guid(riid), + ppIdentity); + + return E_NOTIMPL; +} + +/****************************************************************** + * GetCachePath (FUSION.@) + */ +HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, + PDWORD pcchPath) +{ + FIXME("(%08x, %s, %p) stub!\n", dwCacheFlags, debugstr_w(pwzCachePath), pcchPath); + return E_NOTIMPL; +} diff --git a/dlls/fusion/fusion.spec b/dlls/fusion/fusion.spec index 210dd09..e589ad1 100644 --- a/dlls/fusion/fusion.spec +++ b/dlls/fusion/fusion.spec @@ -1,12 +1,12 @@ @ stub CopyPDBs -@ stub ClearDownloadCache +@ stdcall ClearDownloadCache() @ stub CreateApplicationContext -@ stub CreateAssemblyCache -@ stub CreateAssemblyEnum -@ stub CreateAssemblyNameObject +@ stdcall CreateAssemblyCache(ptr long) +@ stdcall CreateAssemblyEnum(ptr ptr ptr long ptr) +@ stdcall CreateAssemblyNameObject(ptr wstr long ptr) @ stub CreateHistoryReader -@ stub CreateInstallReferenceEnum -@ stub GetCachePath +@ stdcall CreateInstallReferenceEnum(ptr ptr long ptr) +@ stdcall GetCachePath(long wstr ptr) @ stub GetHistoryFileDirectory @ stub InitializeFusion @ stub InstallCustomAssembly

1 0

James Hawkins : fusion: Add initial fusion.idl.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: ea3be467ae1efa7fdd933a264486ff8ad1d6b7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3be467ae1efa7fdd933a264… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Mar 23 18:48:08 2008 -0700 fusion: Add initial fusion.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/fusion.idl | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 069b592..a11719f 100644 --- a/.gitignore +++ b/.gitignore @@ -489,6 +489,7 @@ include/downloadmgr.h include/dxgi.h include/dxgitype.h include/exdisp.h +include/fusion.h include/hlink.h include/htiframe.h include/iads.h diff --git a/include/Makefile.in b/include/Makefile.in index 0f9416a..18c0c02 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -23,6 +23,7 @@ IDL_H_SRCS = \ dxgi.idl \ dxgitype.idl \ exdisp.idl \ + fusion.idl \ hlink.idl \ htiframe.idl \ iads.idl \ diff --git a/include/fusion.idl b/include/fusion.idl new file mode 100644 index 0000000..00ec98c --- /dev/null +++ b/include/fusion.idl @@ -0,0 +1,133 @@ +/* + * Copyright 2008 James Hawkins + * + * 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 "objidl.idl"; + +interface IAssemblyCache; +interface IAssemblyCacheItem; +interface IAssemblyEnum; +interface IAssemblyName; + +typedef enum +{ + ASM_CACHE_ZAP = 0x1, + ASM_CACHE_GAC = 0x2, + ASM_CACHE_DOWNLOAD = 0x4, + ASM_CACHE_ROOT = 0x8 +} ASM_CACHE_FLAGS; + +typedef enum +{ + peNone = 0x00000000, + peMSIL = 0x00000001, + peI386 = 0x00000002, + peIA64 = 0x00000003, + peAMD64 = 0x00000004, + peInvalid = 0xffffffff +} PEKIND; + +typedef enum _tagAssemblyComparisonResult +{ + ACR_Unknown, + ACR_EquivalentFullMatch, + ACR_EquivalentWeakNamed, + ACR_EquivalentFXUnified, + ACR_EquivalentUnified, + ACR_NonEquivalentVersion, + ACR_NonEquivalent, + ACR_EquivalentPartialMatch, + ACR_EquivalentPartialWeakNamed, + ACR_EquivalentPartialUnified, + ACR_EquivalentPartialFXUnified, + ACR_NonEquivalentPartialVersion +} AssemblyComparisonResult; + +[ + local, + object, + uuid(e707dcde-d1cd-11d2-bab9-00c04f8eceae), + pointer_default(unique) +] +interface IAssemblyCache : IUnknown +{ + +} + +[ + local, + object, + uuid(9e3aaeb4-d1cd-11d2-bab9-00c04f8eceae), + pointer_default(unique) +] +interface IAssemblyCacheItem : IUnknown +{ + +} + +[ + local, + object, + uuid(CD193BC0-B4BC-11d2-9833-00C04FC31D2E), + pointer_default(unique) +] +interface IAssemblyName: IUnknown +{ + typedef [unique] IAssemblyName *LPASSEMBLYNAME; +} + +[ + local, + object, + uuid(21b8916c-f28e-11d2-a473-00c04f8ef448), + pointer_default(unique) +] +interface IAssemblyEnum : IUnknown +{ + +} + +[ + local, + object, + uuid(582dac66-e678-449f-aba6-6faaec8a9394), + pointer_default(unique) +] +interface IInstallReferenceItem : IUnknown +{ + +} + +[ + local, + object, + uuid(56b1a988-7c0c-4aa2-8639-c3eb5a90226f), + pointer_default(unique) +] +interface IInstallReferenceEnum : IUnknown +{ + +} + +cpp_quote("HRESULT WINAPI ClearDownloadCache(void);") +cpp_quote("HRESULT WINAPI CompareAssemblyIdentity(LPCWSTR,BOOL,LPCWSTR,BOOL,BOOL*,AssemblyComparisonResult*);") +cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);") +cpp_quote("HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum**,IUnknown*,IAssemblyName*,DWORD,LPVOID);") +cpp_quote("HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME*,LPCWSTR,DWORD,LPVOID);") +cpp_quote("HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum**,IAssemblyName*,DWORD,LPVOID);") +cpp_quote("HRESULT WINAPI GetAssemblyIdentityFromFile(LPCWSTR,REFIID,IUnknown**);") +cpp_quote("HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS,LPWSTR,PDWORD);")

1 0

Markus Amsler : opengl: Allocate DisabledExtensions buffer.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: f34efcb83902e9e0cc0cbc548a99464cd5d9bc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34efcb83902e9e0cc0cbc548… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Mar 24 01:15:31 2008 +0100 opengl: Allocate DisabledExtensions buffer. --- dlls/opengl32/wgl.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d157488..df15b5b 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -77,7 +77,7 @@ void (*wine_tsx11_unlock_ptr)(void) = NULL; static HMODULE opengl32_handle; -static char internal_gl_disabled_extensions[512]; +static char* internal_gl_disabled_extensions = NULL; static char* internal_gl_extensions = NULL; typedef struct wine_glcontext { @@ -609,7 +609,7 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) TRACE("- %s:", ThisExtn); /* test if supported API is disabled by config */ - if (NULL == strstr(internal_gl_disabled_extensions, ThisExtn)) { + if (!internal_gl_disabled_extensions || !strstr(internal_gl_disabled_extensions, ThisExtn)) { strcat(internal_gl_extensions, " "); strcat(internal_gl_extensions, ThisExtn); TRACE(" active\n"); @@ -639,7 +639,7 @@ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) static BOOL process_attach(void) { HMODULE mod_x11, mod_gdi32; - DWORD size = sizeof(internal_gl_disabled_extensions); + DWORD size; HKEY hkey = 0; GetDesktopWindow(); /* make sure winex11 is loaded (FIXME) */ @@ -662,10 +662,11 @@ static BOOL process_attach(void) wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); - internal_gl_disabled_extensions[0] = 0; if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { - if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size)) { - TRACE("found DisabledExtensions=\"%s\"\n", internal_gl_disabled_extensions); + if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, NULL, &size)) { + internal_gl_disabled_extensions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size); + TRACE("found DisabledExtensions=%s\n", debugstr_a(internal_gl_disabled_extensions)); } RegCloseKey(hkey); } @@ -679,6 +680,7 @@ static BOOL process_attach(void) static void process_detach(void) { HeapFree(GetProcessHeap(), 0, internal_gl_extensions); + HeapFree(GetProcessHeap(), 0, internal_gl_disabled_extensions); } /***********************************************************************

1 0

Eric Pouech : richedit: For setting word wrapping, native only uses a null vs non null value.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 91d57af637511ac0ad8c1ec7613b5d447023ca96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d57af637511ac0ad8c1ec76… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 23 09:22:41 2008 +0100 richedit: For setting word wrapping, native only uses a null vs non null value. --- dlls/riched20/editor.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 091cdac..39827bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3207,12 +3207,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - switch (lParam) - { - case 0: editor->bWordWrap = TRUE; break; - case 1: editor->bWordWrap = FALSE; break; - default: FIXME("Unknown option to EM_SETTARGETDEVICE(NULL,%ld)\n", lParam); - } + editor->bWordWrap = (lParam == 0); } else FIXME("Unsupported yet non NULL device in EM_SETTARGETDEVICE\n"); break;

1 0

Eric Pouech : wordpad: Don't try to use information that hasn' t been initialized yet.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 704de609e63944cd88a62fcf0a3aecfa51073b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704de609e63944cd88a62fcf0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 23 09:22:51 2008 +0100 wordpad: Don't try to use information that hasn't been initialized yet. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7ef5548..2df6ea7 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -350,7 +350,7 @@ static void update_font_list(void) fmt.cbSize = sizeof(fmt); SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); - SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontName); + if (!SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontName)) return; if(lstrcmpW(fontName, fmt.szFaceName)) {

1 0

Eric Pouech : richedit: Fixed a bogus computation of paragraph indentation.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: df7ab004ce1be5887006766d83ffc114f46c600a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df7ab004ce1be5887006766d8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 23 09:22:30 2008 +0100 richedit: Fixed a bogus computation of paragraph indentation. --- dlls/riched20/wrap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cd052a7..a657b03 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -377,7 +377,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino /* wc.para_style = tp->member.para.style; */ wc.style = NULL; wc.nFirstMargin = ME_twips2pointsX(c, tp->member.para.pFmt->dxStartIndent) + beginofs; - wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, tp->member.para.pFmt->dxOffset) + beginofs; + wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, tp->member.para.pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, tp->member.para.pFmt->dxRightIndent); wc.nRow = 0; wc.pt.x = 0;

1 0

Sean Huckins : gdiplus: Implementation of GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 3266420a1e39ddd7f7b1fd3db5b6f6e416936846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3266420a1e39ddd7f7b1fd3db… Author: Sean Huckins <bhuckins(a)ucla.edu> Date: Fri Mar 21 16:39:22 2008 -0700 gdiplus: Implementation of GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 46 ++++++++++++++++++++++ dlls/gdiplus/tests/Makefile.in | 2 +- dlls/gdiplus/tests/image.c | 83 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4aac0df..3b3ec41 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -75,7 +75,7 @@ @ stdcall GdipCreateBitmapFromFileICM(wstr ptr) @ stub GdipCreateBitmapFromGdiDib @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) -@ stub GdipCreateBitmapFromHBITMAP +@ stdcall GdipCreateBitmapFromHBITMAP(ptr ptr ptr) @ stub GdipCreateBitmapFromHICON @ stub GdipCreateBitmapFromResource @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f0cc822..2e5ef56 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1051,3 +1051,49 @@ GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodec return Ok; } +GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBitmap** bitmap) +{ + BITMAP bm; + GpStatus retval; + PixelFormat format; + + if(!hbm || !bitmap) + return InvalidParameter; + + /* TODO: Support for device-dependent bitmaps */ + if(hpal){ + FIXME("no support for device-dependent bitmaps\n"); + return NotImplemented; + } + + if (GetObjectA(hbm, sizeof(bm), &bm) != sizeof(bm)) + return InvalidParameter; + + /* TODO: Figure out the correct format for 16, 32, 64 bpp */ + switch(bm.bmBitsPixel) { + case 1: + format = PixelFormat1bppIndexed; + break; + case 4: + format = PixelFormat4bppIndexed; + break; + case 8: + format = PixelFormat8bppIndexed; + break; + case 24: + format = PixelFormat24bppRGB; + break; + case 48: + format = PixelFormat48bppRGB; + break; + default: + FIXME("don't know how to handle %d bpp\n", bm.bmBitsPixel); + return InvalidParameter; + break; + } + + retval = GdipCreateBitmapFromScan0(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, + format, bm.bmBits, bitmap); + + return retval; +} diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 3102f17..28b2959 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = gdiplus.dll -IMPORTS = gdiplus user32 kernel32 +IMPORTS = gdiplus user32 gdi32 kernel32 CTESTS = \ brush.c \ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9faa090..dcb86fc 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -22,6 +22,7 @@ #include "gdiplus.h" #include "wine/test.h" #include <math.h> +#include "wingdi.h" #define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) @@ -335,6 +336,87 @@ static void test_LockBits(void) expect(Ok, stat); } +static void test_GdipCreateBitmapFromHBITMAP(void) +{ + GpBitmap* gpbm = NULL; + HBITMAP hbm = NULL; + HPALETTE hpal = NULL; + GpStatus stat; + BYTE buff[1000]; + LOGPALETTE* LogPal = NULL; + REAL width, height; + const REAL WIDTH1 = 5; + const REAL HEIGHT1 = 15; + const REAL WIDTH2 = 10; + const REAL HEIGHT2 = 20; + HDC hdc; + BITMAPINFO bmi; + + stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); + expect(InvalidParameter, stat); + + hbm = CreateBitmap(WIDTH1, HEIGHT1, 1, 1, NULL); + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + expect(Ok, stat); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); + ok(fabs(WIDTH1 - width) < .0001, "width wrong\n"); + ok(fabs(HEIGHT1 - height) < .0001, "height wrong\n"); + if (stat == Ok) + GdipDisposeImage((GpImage*)gpbm); + GlobalFree(hbm); + + hbm = CreateBitmap(WIDTH2, HEIGHT2, 1, 1, &buff); + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + expect(Ok, stat); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); + ok(fabs(WIDTH2 - width) < .0001, "width wrong\n"); + ok(fabs(HEIGHT2 - height) < .0001, "height wrong\n"); + if (stat == Ok) + GdipDisposeImage((GpImage*)gpbm); + GlobalFree(hbm); + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = HEIGHT1; + bmi.bmiHeader.biWidth = WIDTH1; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + expect(Ok, stat); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); + ok(fabs(WIDTH1 - width) < .0001, "width wrong\n"); + ok(fabs(HEIGHT1 - height) < .0001, "height wrong\n"); + if (stat == Ok) + GdipDisposeImage((GpImage*)gpbm); + + LogPal = GdipAlloc(sizeof(LOGPALETTE)); + ok(LogPal != NULL, "unable to allocate LOGPALETTE\n"); + LogPal->palVersion = 0x300; + hpal = CreatePalette((const LOGPALETTE*) LogPal); + ok(hpal != NULL, "CreatePalette failed\n"); + GdipFree(LogPal); + + stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); + todo_wine + { + expect(Ok, stat); + } + if (stat == Ok) + GdipDisposeImage((GpImage*)gpbm); + + GlobalFree(hpal); + GlobalFree(hbm); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -353,6 +435,7 @@ START_TEST(image) test_SavingImages(); test_encoders(); test_LockBits(); + test_GdipCreateBitmapFromHBITMAP(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index fe7bdbb..e92c646 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -261,6 +261,7 @@ GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size); GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders); +GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**); GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**);

1 0

Eric Pouech : richedit: Fixed the initialization of the word wrap mode.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 8b6eea0a630014842f36a176a61cdb61b95b1602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6eea0a630014842f36a176a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 23 08:06:33 2008 +0100 richedit: Fixed the initialization of the word wrap mode. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 54fd4a3..091cdac 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1602,7 +1602,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->bRedraw = TRUE; - ed->bWordWrap = FALSE; + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL;

1 0

Roderick Colenbrander : wined3d: CheckTextureCapability returns TRUE for V8U8.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: e74982579322b1805264b17e5221e589e6fbceb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74982579322b1805264b17e5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Mar 22 16:45:59 2008 +0000 wined3d: CheckTextureCapability returns TRUE for V8U8. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index df0cea2..ef9f27e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2090,7 +2090,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) */ case WINED3DFMT_V8U8: if(GL_SUPPORT(NV_TEXTURE_SHADER) || GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { - return WINED3D_OK; + return TRUE; } TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); return FALSE;

1 0

James Hawkins : msi: Implement the StopServices action.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: fb508ff8fa06495c58867ee4a0f5345c52d33191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb508ff8fa06495c58867ee4a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 24 01:31:07 2008 -0500 msi: Implement the StopServices action. --- dlls/msi/action.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 124 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8e753bf..1be4598 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4678,6 +4678,130 @@ static UINT ACTION_StartServices( MSIPACKAGE *package ) return rc; } +static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) +{ + DWORD i, needed, count; + ENUM_SERVICE_STATUSW *dependencies; + SERVICE_STATUS ss; + SC_HANDLE depserv; + + if (EnumDependentServicesW(service, SERVICE_ACTIVE, NULL, + 0, &needed, &count)) + return TRUE; + + if (GetLastError() != ERROR_MORE_DATA) + return FALSE; + + dependencies = msi_alloc(needed); + if (!dependencies) + return FALSE; + + if (!EnumDependentServicesW(service, SERVICE_ACTIVE, dependencies, + needed, &needed, &count)) + goto error; + + for (i = 0; i < count; i++) + { + depserv = OpenServiceW(scm, dependencies[i].lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS); + if (!depserv) + goto error; + + if (!ControlService(depserv, SERVICE_CONTROL_STOP, &ss)) + goto error; + } + + return TRUE; + +error: + msi_free(dependencies); + return FALSE; +} + +static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) +{ + MSIPACKAGE *package = (MSIPACKAGE *)param; + MSICOMPONENT *comp; + SERVICE_STATUS status; + SERVICE_STATUS_PROCESS ssp; + SC_HANDLE scm = NULL, service = NULL; + LPWSTR name, args; + DWORD event, needed; + + event = MSI_RecordGetInteger(rec, 3); + if (!(event & msidbServiceControlEventStop)) + return ERROR_SUCCESS; + + comp = get_loaded_component(package, MSI_RecordGetString(rec, 6)); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + deformat_string(package, MSI_RecordGetString(rec, 2), &name); + deformat_string(package, MSI_RecordGetString(rec, 4), &args); + args = strdupW(MSI_RecordGetString(rec, 4)); + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!scm) + { + WARN("Failed to open the SCM: %d\n", GetLastError()); + goto done; + } + + service = OpenServiceW(scm, name, + SERVICE_STOP | + SERVICE_QUERY_STATUS | + SERVICE_ENUMERATE_DEPENDENTS); + if (!service) + { + WARN("Failed to open service (%s): %d\n", + debugstr_w(name), GetLastError()); + goto done; + } + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp, + sizeof(SERVICE_STATUS_PROCESS), &needed)) + { + WARN("Failed to query service status (%s): %d\n", + debugstr_w(name), GetLastError()); + goto done; + } + + if (ssp.dwCurrentState == SERVICE_STOPPED) + goto done; + + stop_service_dependents(scm, service); + + if (!ControlService(service, SERVICE_STOP, &status)) + WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError()); + +done: + CloseServiceHandle(service); + CloseServiceHandle(scm); + msi_free(name); + msi_free(args); + + return ERROR_SUCCESS; +} + +static UINT ACTION_StopServices( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; + + rc = MSI_DatabaseOpenViewW(package->db, query, &view); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords(view, NULL, ITERATE_StopService, package); + msiobj_release(&view->hdr); + + return rc; +} + static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) { MSIFILE *file; @@ -5510,13 +5634,6 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "SelfUnregModules", table ); } -static UINT ACTION_StopServices( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; - return msi_unimplemented_action_stub( package, "StopServices", table ); -} - static UINT ACTION_DeleteServices( MSIPACKAGE *package ) { static const WCHAR table[] = {

1 0