wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Alexandre Julliard : ntdll: Add support for jump instructions in function epilogs.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: b663a6dea47661fbd31c6a0d5a96517020d5628e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b663a6dea47661fbd31c6a0d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 19:18:37 2012 +0100 ntdll: Add support for jump instructions in function epilogs. --- dlls/ntdll/signal_x86_64.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 19d91a0..bea7ae0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2586,7 +2586,7 @@ static int get_opcode_size( struct opcode op ) } } -static BOOL is_inside_epilog( BYTE *pc ) +static BOOL is_inside_epilog( BYTE *pc, ULONG64 base, const RUNTIME_FUNCTION *function ) { /* add or lea must be the first instruction, and it must have a rex.W prefix */ if ((pc[0] & 0xf8) == 0x48) @@ -2629,9 +2629,9 @@ static BOOL is_inside_epilog( BYTE *pc ) for (;;) { - BYTE rex = 0; + DWORD offset; - if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + if ((*pc & 0xf0) == 0x40) pc++; /* rex prefix */ switch (*pc) { @@ -2648,9 +2648,14 @@ static BOOL is_inside_epilog( BYTE *pc ) case 0xc2: /* ret $nn */ case 0xc3: /* ret */ return TRUE; + case 0xe9: /* jmp nnnn */ + offset = pc + 5 + *(LONG *)(pc + 1) - (BYTE *)base; + return (offset >= function->BeginAddress && offset < function->EndAddress); + case 0xeb: /* jmp n */ + offset = pc + 2 + (signed char)pc[1] - (BYTE *)base; + return (offset >= function->BeginAddress && offset < function->EndAddress); case 0xf3: /* rep; ret (for amd64 prediction bug) */ return pc[1] == 0xc3; - /* FIXME: add various jump instructions */ } return FALSE; } @@ -2708,7 +2713,12 @@ static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_P context->Rip = *(ULONG64 *)context->Rsp; context->Rsp += sizeof(ULONG64); return; - /* FIXME: add various jump instructions */ + case 0xe9: /* jmp nnnn */ + pc += 5 + *(LONG *)(pc + 1); + continue; + case 0xeb: /* jmp n */ + pc += 2 + (signed char)pc[1]; + continue; } return; } @@ -2753,7 +2763,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, else { prolog_offset = ~0; - if (is_inside_epilog( (BYTE *)pc )) + if (is_inside_epilog( (BYTE *)pc, base, function )) { interpret_epilog( (BYTE *)pc, context, ctx_ptr ); *frame_ret = frame;

1 0

Alexandre Julliard : ntdll: Add support for rep; ret instruction in function epilogs.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 34c875bf8bd3861f69dedbd7faada1a5c7748d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c875bf8bd3861f69dedbd7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 18:59:45 2012 +0100 ntdll: Add support for rep;ret instruction in function epilogs. --- dlls/ntdll/signal_x86_64.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 12acf94..19d91a0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2648,6 +2648,8 @@ static BOOL is_inside_epilog( BYTE *pc ) case 0xc2: /* ret $nn */ case 0xc3: /* ret */ return TRUE; + case 0xf3: /* rep; ret (for amd64 prediction bug) */ + return pc[1] == 0xc3; /* FIXME: add various jump instructions */ } return FALSE; @@ -2702,6 +2704,7 @@ static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_P context->Rsp += sizeof(ULONG64) + *(WORD *)(pc + 1); return; case 0xc3: /* ret */ + case 0xf3: /* rep; ret */ context->Rip = *(ULONG64 *)context->Rsp; context->Rsp += sizeof(ULONG64); return;

1 0

Jacek Caban : msident: Added IUserIdentityManager:: EnumIdentities implementation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 7b6498314c4216723b43d8d8542c021f1e2ed12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b6498314c4216723b43d8d85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 13:02:32 2012 +0100 msident: Added IUserIdentityManager::EnumIdentities implementation. --- dlls/msident/msident.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 125 insertions(+), 2 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 4c688b8..c12c19b 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -27,8 +27,120 @@ WINE_DEFAULT_DEBUG_CHANNEL(msident); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + static HINSTANCE msident_instance; +typedef struct { + IEnumUserIdentity IEnumUserIdentity_iface; + LONG ref; +} EnumUserIdentity; + +static inline EnumUserIdentity *impl_from_IEnumUserIdentity(IEnumUserIdentity *iface) +{ + return CONTAINING_RECORD(iface, EnumUserIdentity, IEnumUserIdentity_iface); +} + +static HRESULT WINAPI EnumUserIdentity_QueryInterface(IEnumUserIdentity *iface, REFIID riid, void **ppv) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = &This->IEnumUserIdentity_iface; + }else if(IsEqualGUID(&IID_IEnumUserIdentity, riid)) { + TRACE("(IID_IEnumUserIdentity %p)\n", ppv); + *ppv = &This->IEnumUserIdentity_iface; + }else { + WARN("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumUserIdentity_AddRef(IEnumUserIdentity *iface) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumUserIdentity_Release(IEnumUserIdentity *iface) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI EnumUserIdentity_Next(IEnumUserIdentity *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUserIdentity_Skip(IEnumUserIdentity *iface, ULONG celt) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUserIdentity_Reset(IEnumUserIdentity *iface) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUserIdentity_Clone(IEnumUserIdentity *iface, IEnumUserIdentity **ppenum) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUserIdentity_GetCount(IEnumUserIdentity *iface, ULONG *pnCount) +{ + EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); + + FIXME("(%p)->(%p)\n", This, pnCount); + + *pnCount = 0; + return S_OK; +} + +static const IEnumUserIdentityVtbl EnumUserIdentityVtbl = { + EnumUserIdentity_QueryInterface, + EnumUserIdentity_AddRef, + EnumUserIdentity_Release, + EnumUserIdentity_Next, + EnumUserIdentity_Skip, + EnumUserIdentity_Reset, + EnumUserIdentity_Clone, + EnumUserIdentity_GetCount +}; + static HRESULT WINAPI UserIdentityManager_QueryInterface(IUserIdentityManager *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -61,8 +173,19 @@ static ULONG WINAPI UserIdentityManager_Release(IUserIdentityManager *iface) static HRESULT WINAPI UserIdentityManager_EnumIdentities(IUserIdentityManager *iface, IEnumUserIdentity **ppEnumUser) { - FIXME("(%p)\n", ppEnumUser); - return E_NOTIMPL; + EnumUserIdentity *ret; + + TRACE("(%p)\n", ppEnumUser); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumUserIdentity_iface.lpVtbl = &EnumUserIdentityVtbl; + ret->ref = 1; + + *ppEnumUser = &ret->IEnumUserIdentity_iface; + return S_OK; } static HRESULT WINAPI UserIdentityManager_ManageIdentities(IUserIdentityManager *iface, HWND hwndParent, DWORD dwFlags)

1 0

Jacek Caban : msident: Added CLSID_UserIdentityManager object stub implementation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 06a9f864e8f1a0fdc2a3d02cab2953911d31921e URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a9f864e8f1a0fdc2a3d02ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 13:02:17 2012 +0100 msident: Added CLSID_UserIdentityManager object stub implementation. --- dlls/msident/msident.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 69ef459..4c688b8 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "windows.h" +#include "initguid.h" #include "msident.h" #include "rpcproxy.h" @@ -28,6 +29,137 @@ WINE_DEFAULT_DEBUG_CHANNEL(msident); static HINSTANCE msident_instance; +static HRESULT WINAPI UserIdentityManager_QueryInterface(IUserIdentityManager *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IUserIdentityManager, riid)) { + TRACE("(IID_IUserIdentityManager %p)\n", ppv); + *ppv = iface; + }else { + WARN("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI UserIdentityManager_AddRef(IUserIdentityManager *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI UserIdentityManager_Release(IUserIdentityManager *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI UserIdentityManager_EnumIdentities(IUserIdentityManager *iface, IEnumUserIdentity **ppEnumUser) +{ + FIXME("(%p)\n", ppEnumUser); + return E_NOTIMPL; +} + +static HRESULT WINAPI UserIdentityManager_ManageIdentities(IUserIdentityManager *iface, HWND hwndParent, DWORD dwFlags) +{ + FIXME("(%p %x)\n", hwndParent, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI UserIdentityManager_Logon(IUserIdentityManager *iface, HWND hwndParent, + DWORD dwFlags, IUserIdentity **ppIdentity) +{ + FIXME("(%p %x %p)\n", hwndParent, dwFlags, ppIdentity); + return E_USER_CANCELLED; +} + +static HRESULT WINAPI UserIdentityManager_Logoff(IUserIdentityManager *iface, HWND hwndParent) +{ + FIXME("(%p)\n", hwndParent); + return E_NOTIMPL; +} + +static HRESULT WINAPI UserIdentityManager_GetIdentityByCookie(IUserIdentityManager *iface, GUID *uidCookie, + IUserIdentity **ppIdentity) +{ + FIXME("(%p %p)\n", uidCookie, ppIdentity); + return E_NOTIMPL; +} + +static const IUserIdentityManagerVtbl UserIdentityManagerVtbl = { + UserIdentityManager_QueryInterface, + UserIdentityManager_AddRef, + UserIdentityManager_Release, + UserIdentityManager_EnumIdentities, + UserIdentityManager_ManageIdentities, + UserIdentityManager_Logon, + UserIdentityManager_Logoff, + UserIdentityManager_GetIdentityByCookie +}; + +static IUserIdentityManager UserIdentityManager = { &UserIdentityManagerVtbl }; + +static HRESULT WINAPI UserIdentityManager_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + TRACE("\n"); + + return IUserIdentityManager_QueryInterface(&UserIdentityManager, riid, ppv); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl UserIdentityManagerCFVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + UserIdentityManager_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory UserIdentityManagerCF = { &UserIdentityManagerCFVtbl }; + /****************************************************************** * DllMain (msident.@) */ @@ -53,6 +185,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_UserIdentityManager, rclsid)) { + TRACE("CLSID_UserIdentityManager\n"); + return IClassFactory_QueryInterface(&UserIdentityManagerCF, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Jacek Caban : msident: Added DLL registration implementation.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 064a5918df9ec21b3724e18fe3f03781876b3007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064a5918df9ec21b3724e18fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 13:02:03 2012 +0100 msident: Added DLL registration implementation. --- dlls/msident/Makefile.in | 2 ++ dlls/msident/msident.c | 23 +++++++++++++++++++++++ dlls/msident/msident.spec | 2 ++ dlls/msident/msident_classes.idl | 25 +++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in index e52a4c8..29ebb8e 100644 --- a/dlls/msident/Makefile.in +++ b/dlls/msident/Makefile.in @@ -3,4 +3,6 @@ MODULE = msident.dll C_SRCS = \ msident.c +IDL_R_SRCS = msident_classes.idl + @MAKE_DLL_RULES@ diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index d6c9935..69ef459 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -19,11 +19,15 @@ #define COBJMACROS #include "windows.h" +#include "msident.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); +static HINSTANCE msident_instance; + /****************************************************************** * DllMain (msident.@) */ @@ -36,6 +40,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + msident_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; } @@ -59,3 +64,21 @@ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (msident.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(msident_instance); +} + +/*********************************************************************** + * DllUnregisterServer (msident.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(msident_instance); +} diff --git a/dlls/msident/msident.spec b/dlls/msident/msident.spec index 079117d..f36e160 100644 --- a/dlls/msident/msident.spec +++ b/dlls/msident/msident.spec @@ -1,2 +1,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() # not exported by native +@ stdcall -private DllUnregisterServer() # not exported by native diff --git a/dlls/msident/msident_classes.idl b/dlls/msident/msident_classes.idl new file mode 100644 index 0000000..b3707a9 --- /dev/null +++ b/dlls/msident/msident_classes.idl @@ -0,0 +1,25 @@ +/* + * Copyright 2012 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 + */ + + +[ + helpstring("LW Identities"), + threading(both), + uuid(a9ae6c91-1d1b-11d2-b21a-00c04fa357fa) +] +coclass UserIdentityManager {}

1 0

Dmitry Timoshkov : gdiplus: Implement GdipCreateMetafileFromEmf.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 5fd16ddedc7259010655e4a8c41cbb92bab23df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd16ddedc7259010655e4a8c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 12 17:02:51 2012 +0800 gdiplus: Implement GdipCreateMetafileFromEmf. --- dlls/gdiplus/graphics.c | 93 ++++++++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 41 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index fee6935..6cf0a68 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2000,47 +2000,19 @@ GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND hwnd, GpGraphics **graphics) GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { - static int calls; - - TRACE("(%p,%i,%p)\n", hemf, delete, metafile); - - if(!hemf || !metafile) - return InvalidParameter; - - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; -} - -GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, - GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) -{ IStream *stream = NULL; UINT read; - BYTE* copy; - HENHMETAFILE hemf; + ENHMETAHEADER *copy; GpStatus retval = Ok; - TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); + TRACE("(%p,%i,%p)\n", hemf, delete, metafile); - if(!hwmf || !metafile || !placeable) + if(!hemf || !metafile) return InvalidParameter; - *metafile = NULL; - read = GetMetaFileBitsEx(hwmf, 0, NULL); - if(!read) - return GenericError; - copy = GdipAlloc(read); - GetMetaFileBitsEx(hwmf, read, copy); - - hemf = SetWinMetaFileBits(read, copy, NULL, NULL); - GdipFree(copy); - read = GetEnhMetaFileBits(hemf, 0, NULL); copy = GdipAlloc(read); - GetEnhMetaFileBits(hemf, read, copy); - DeleteEnhMetaFile(hemf); + GetEnhMetaFileBits(hemf, read, (BYTE *)copy); if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ ERR("could not make stream\n"); @@ -2069,18 +2041,16 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.palette_count = 0; (*metafile)->image.palette_size = 0; (*metafile)->image.palette_entries = NULL; - (*metafile)->image.xres = (REAL)placeable->Inch; - (*metafile)->image.yres = (REAL)placeable->Inch; - (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); - (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Top) / ((REAL) placeable->Inch); - (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right - - placeable->BoundingBox.Left)); - (*metafile)->bounds.Height = ((REAL) (placeable->BoundingBox.Bottom - - placeable->BoundingBox.Top)); + (*metafile)->image.xres = (REAL)copy->szlDevice.cx; + (*metafile)->image.yres = (REAL)copy->szlDevice.cy; + (*metafile)->bounds.X = (REAL)copy->rclBounds.left; + (*metafile)->bounds.Y = (REAL)copy->rclBounds.top; + (*metafile)->bounds.Width = (REAL)(copy->rclBounds.right - copy->rclBounds.left); + (*metafile)->bounds.Height = (REAL)(copy->rclBounds.bottom - copy->rclBounds.top); (*metafile)->unit = UnitPixel; if(delete) - DeleteMetaFile(hwmf); + DeleteEnhMetaFile(hemf); TRACE("<-- %p\n", *metafile); @@ -2091,6 +2061,47 @@ err: return retval; } +GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, + GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) +{ + UINT read; + BYTE *copy; + HENHMETAFILE hemf; + GpStatus retval = Ok; + + TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); + + if(!hwmf || !metafile || !placeable) + return InvalidParameter; + + *metafile = NULL; + read = GetMetaFileBitsEx(hwmf, 0, NULL); + if(!read) + return GenericError; + copy = GdipAlloc(read); + GetMetaFileBitsEx(hwmf, read, copy); + + hemf = SetWinMetaFileBits(read, copy, NULL, NULL); + GdipFree(copy); + + retval = GdipCreateMetafileFromEmf(hemf, FALSE, metafile); + + if (retval == Ok) + { + (*metafile)->image.xres = (REAL)placeable->Inch; + (*metafile)->image.yres = (REAL)placeable->Inch; + (*metafile)->bounds.X = ((REAL)placeable->BoundingBox.Left) / ((REAL)placeable->Inch); + (*metafile)->bounds.Y = ((REAL)placeable->BoundingBox.Top) / ((REAL)placeable->Inch); + (*metafile)->bounds.Width = (REAL)(placeable->BoundingBox.Right - + placeable->BoundingBox.Left); + (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - + placeable->BoundingBox.Top); + + if (delete) DeleteMetaFile(hwmf); + } + return retval; +} + GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) {

1 0

Dmitry Timoshkov : server: OpenMutex should perform a real access check instead of validating access flags .
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 4b058e6e7979ab724bd609f5886e352cd4323db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b058e6e7979ab724bd609f58… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 12 13:40:43 2012 +0800 server: OpenMutex should perform a real access check instead of validating access flags. This reverts 7b63fa658ac28e715f98876f790cb0de2bc9ac17. --- dlls/kernel32/tests/sync.c | 20 ++++++++++++++++++++ server/mutex.c | 8 -------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 3965458..d4f6cf7 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -133,12 +133,23 @@ static void test_mutex(void) int i; DWORD failed = 0; + SetLastError(0xdeadbeef); + hOpened = OpenMutex(0, FALSE, "WineTestMutex"); + ok(hOpened == NULL, "OpenMutex succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); hCreated = CreateMutex(NULL, FALSE, "WineTestMutex"); ok(hCreated != NULL, "CreateMutex failed with error %d\n", GetLastError()); + SetLastError(0xdeadbeef); hOpened = OpenMutex(0, FALSE, "WineTestMutex"); +todo_wine ok(hOpened == NULL, "OpenMutex succeeded\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); @@ -151,6 +162,7 @@ static void test_mutex(void) ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error 0x%08x\n", wait_ret); } + SetLastError(0xdeadbeef); hOpened = OpenMutex(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); @@ -159,22 +171,30 @@ static void test_mutex(void) for (i = 0; i < 32; i++) { + SetLastError(0xdeadbeef); hOpened = OpenMutex(0x1 << i, FALSE, "WineTestMutex"); if(hOpened != NULL) { + SetLastError(0xdeadbeef); ret = ReleaseMutex(hOpened); ok(ret, "ReleaseMutex failed with error %d, access %x\n", GetLastError(), 1 << i); CloseHandle(hOpened); } else { + if ((1 << i) == ACCESS_SYSTEM_SECURITY) + todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "wrong error %u, access %x\n", GetLastError(), 1 << i); + else + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u, , access %x\n", GetLastError(), 1 << i); ReleaseMutex(hCreated); failed |=0x1 << i; } } +todo_wine ok( failed == 0x0de0fffe, "open succeeded when it shouldn't: %x\n", failed); + SetLastError(0xdeadbeef); ret = ReleaseMutex(hCreated); ok(!ret && (GetLastError() == ERROR_NOT_OWNER), "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %d\n", GetLastError()); diff --git a/server/mutex.c b/server/mutex.c index 7c9700d..7514275 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -238,14 +238,6 @@ DECL_HANDLER(open_mutex) struct directory *root = NULL; struct mutex *mutex; - if ((req->access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL | - MUTEX_ALL_ACCESS | STANDARD_RIGHTS_ALL | MAXIMUM_ALLOWED)) || - !req->access) - { - set_error(STATUS_INVALID_PARAMETER); - return; - } - get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return;

1 0

Hans Leidekker : msi: Perform a case insensitive match on filenames from cabinets.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: fa2420d6960df77d6073e3666d375936c5999fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2420d6960df77d6073e3666… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 12 12:26:34 2012 +0100 msi: Perform a case insensitive match on filenames from cabinets. --- dlls/msi/files.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 909f71f..e928564 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -247,6 +247,17 @@ static UINT msi_create_directory( MSIPACKAGE *package, const WCHAR *dir ) return ERROR_SUCCESS; } +static MSIFILE *find_file( MSIPACKAGE *package, const WCHAR *filename ) +{ + MSIFILE *file; + + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) + { + if (!strcmpiW( filename, file->File )) return file; + } + return NULL; +} + static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -255,8 +266,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (action == MSICABEXTRACT_BEGINEXTRACT) { - f = msi_get_loaded_file(package, file); - if (!f) + if (!(f = find_file( package, file ))) { TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); return FALSE;

1 0

Hans Leidekker : msi: Reimplement MsiEnumProducts on top of MsiEnumProductsEx.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 0f40d2624d2cef9f6cfb49f30b53529d5dc72be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f40d2624d2cef9f6cfb49f30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 12 12:26:10 2012 +0100 msi: Reimplement MsiEnumProducts on top of MsiEnumProductsEx. --- dlls/msi/registry.c | 92 +------------------------------------------------- 1 files changed, 2 insertions(+), 90 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 53b51f6..0c72648 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1139,101 +1139,13 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) { - static const WCHAR pathW[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0}; - UINT r; - WCHAR szKeyName[SQUISH_GUID_SIZE]; - HKEY key; - REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - DWORD machine_count, managed_count, unmanaged_count; - WCHAR keypath[MAX_PATH]; - LPWSTR usersid = NULL; - - static DWORD last_index; - TRACE("%d %p\n", index, lpguid); if (NULL == lpguid) return ERROR_INVALID_PARAMETER; - if (index && index - last_index != 1) - return ERROR_INVALID_PARAMETER; - - key = 0; - r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, 0, NULL, 0, access, NULL, &key, NULL); - if( r != ERROR_SUCCESS ) goto failed; - - r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &machine_count, NULL, NULL, - NULL, NULL, NULL, NULL, NULL); - if( r != ERROR_SUCCESS ) goto failed; - - if (machine_count && index <= machine_count) - { - r = RegEnumKeyW(key, index, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - { - unsquash_guid(szKeyName, lpguid); - last_index = index; - RegCloseKey(key); - return ERROR_SUCCESS; - } - } - RegCloseKey(key); - - key = 0; - if (!(usersid = get_user_sid())) - { - ERR("Failed to retrieve user SID\n"); - last_index = 0; - return ERROR_FUNCTION_FAILED; - } - sprintfW(keypath, szInstaller_LocalManaged_fmt, usersid); - LocalFree(usersid); - - r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &key, NULL); - if( r != ERROR_SUCCESS ) goto failed; - - r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &managed_count, NULL, NULL, - NULL, NULL, NULL, NULL, NULL); - if( r != ERROR_SUCCESS ) goto failed; - - if (managed_count && index <= machine_count + managed_count) - { - r = RegEnumKeyW(key, index - machine_count, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - { - unsquash_guid(szKeyName, lpguid); - last_index = index; - RegCloseKey(key); - return ERROR_SUCCESS; - } - } - RegCloseKey(key); - - key = 0; - r = RegCreateKeyW(HKEY_CURRENT_USER, pathW, &key); - if( r != ERROR_SUCCESS ) goto failed; - - r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &unmanaged_count, NULL, NULL, - NULL, NULL, NULL, NULL, NULL); - if( r != ERROR_SUCCESS ) goto failed; - - if (unmanaged_count && index <= machine_count + managed_count + unmanaged_count) - { - r = RegEnumKeyW(key, index - machine_count - managed_count, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - { - unsquash_guid(szKeyName, lpguid); - last_index = index; - RegCloseKey(key); - return ERROR_SUCCESS; - } - } -failed: - RegCloseKey(key); - last_index = 0; - return ERROR_NO_MORE_ITEMS; + return MsiEnumProductsExW( NULL, szAllSid, MSIINSTALLCONTEXT_ALL, index, lpguid, + NULL, NULL, NULL ); } UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index,

1 0

Hans Leidekker : msi: Implement MsiEnumProductsEx.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: a4c20dc437bf4dd061e76566fb5472661052381f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c20dc437bf4dd061e76566f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 12 12:25:50 2012 +0100 msi: Implement MsiEnumProductsEx. --- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 254 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msi/tests/msi.c | 162 +++++++++++++++++++++++++++++++- 3 files changed, 403 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4c20dc437bf4dd061e76…

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
71
Older →

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 March 2012