January 2014 - Wine-Commits

Jacek Caban : wmp: Added IProvideClassInfo2 stub implementation.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: cc01eb8f2142b6e034ee2cdbb9989ffe473c1bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc01eb8f2142b6e034ee2cdbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 13:10:44 2014 +0100 wmp: Added IProvideClassInfo2 stub implementation. --- dlls/wmp/oleobj.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index de50c48..bab6c62 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); struct WindowsMediaPlayer { IOleObject IOleObject_iface; + IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; }; @@ -42,6 +43,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IOleObject)) { TRACE("(%p)->(IID_IOleObject %p)\n", This, ppv); *ppv = &This->IOleObject_iface; + }else if(IsEqualGUID(riid, &IID_IProvideClassInfo)) { + TRACE("(%p)->(IID_IProvideClassInfo %p)\n", This, ppv); + *ppv = &This->IProvideClassInfo2_iface; + }else if(IsEqualGUID(riid, &IID_IProvideClassInfo2)) { + TRACE("(%p)->(IID_IProvideClassInfo2 %p)\n", This, ppv); + *ppv = &This->IProvideClassInfo2_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -251,6 +258,51 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static inline WindowsMediaPlayer *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IProvideClassInfo2_iface); +} + +static HRESULT WINAPI ProvideClassInfo2_QueryInterface(IProvideClassInfo2 *iface, REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo2_AddRef(IProvideClassInfo2 *iface) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%p)\n", This, ppTI); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo2_QueryInterface, + ProvideClassInfo2_AddRef, + ProvideClassInfo2_Release, + ProvideClassInfo2_GetClassInfo, + ProvideClassInfo2_GetGUID +}; + HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -264,6 +316,8 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, return E_OUTOFMEMORY; wmp->IOleObject_iface.lpVtbl = &OleObjectVtbl; + wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; + wmp->ref = 1; hres = IOleObject_QueryInterface(&wmp->IOleObject_iface, riid, ppv);

1 0

Jacek Caban : atl90: Share registrar.c with atl100.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: bd82d6446727a8beaa5d57d035596c495d1ef0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd82d6446727a8beaa5d57d03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 12:48:47 2014 +0100 atl90: Share registrar.c with atl100. --- dlls/atl90/Makefile.in | 5 +++-- dlls/atl90/atl90.spec | 4 ++-- tools/make_specfiles | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 88f441b..3e5114b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,10 +1,11 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl100 C_SRCS = \ atl.c \ - atl_ax.c + atl_ax.c \ + registrar.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index a8fcf46..0d41c1e 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -7,7 +7,7 @@ 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) 20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) @@ -42,7 +42,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) diff --git a/tools/make_specfiles b/tools/make_specfiles index 31449b8..f587f39 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,7 +123,6 @@ my @dll_groups = "atl110", "atl", "atl80", - "atl90", ], [ "advapi32",

1 0

Vincent Povirk : user32/tests: Add tests for MonitorFromRect.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: ef5341b4d72db206b7baa7cf2b5251a543c32b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5341b4d72db206b7baa7cf2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 15:16:38 2014 -0600 user32/tests: Add tests for MonitorFromRect. --- dlls/user32/tests/monitor.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f442338..a2df20e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -31,6 +31,7 @@ static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD) static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); static void init_function_pointers(void) @@ -48,6 +49,7 @@ static void init_function_pointers(void) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) GET_PROC(MonitorFromPoint) + GET_PROC(MonitorFromRect) GET_PROC(MonitorFromWindow) #undef GET_PROC @@ -291,12 +293,13 @@ static void test_ChangeDisplaySettingsEx(void) static void test_monitors(void) { - HMONITOR monitor, primary; + HMONITOR monitor, primary, nearest; POINT pt; + RECT rc; - if (!pMonitorFromPoint || !pMonitorFromWindow) + if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) { - win_skip("MonitorFromPoint or MonitorFromWindow are not available\n"); + win_skip("MonitorFromPoint, MonitorFromWindow, or MonitorFromRect is not available\n"); return; } @@ -310,6 +313,65 @@ static void test_monitors(void) ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary ); monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); + + SetRect( &rc, 0, 0, 1, 1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* Empty rect at 0,0 is considered inside the primary monitor */ + SetRect( &rc, 0, 0, -1, -1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* Even if there is a monitor left of the primary, the primary will have the most overlapping area */ + SetRect( &rc, -1, 0, 2, 1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* But the width of the rect doesn't matter if it's empty. */ + SetRect( &rc, -1, 0, 2, -1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor != primary, "got primary %p\n", monitor ); + + if (!pGetMonitorInfoA) + { + win_skip("GetMonitorInfoA is not available\n"); + return; + } + + /* Search for a monitor that has no others equally near to (left, top-1) */ + SetRect( &rc, -1, -2, 2, 0 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + nearest = primary; + while (monitor != NULL) + { + MONITORINFO mi; + BOOL ret; + ok( monitor != primary, "got primary %p\n", monitor ); + nearest = monitor; + mi.cbSize = sizeof(mi); + ret = pGetMonitorInfoA( monitor, &mi ); + ok( ret, "GetMonitorInfo failed\n" ); + SetRect( &rc, mi.rcMonitor.left-1, mi.rcMonitor.top-2, mi.rcMonitor.left+2, mi.rcMonitor.top ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + } + + SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == NULL, "got %p\n", monitor ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + ok( monitor == nearest, "got %p, should get nearest %p\n", monitor, nearest ); } static BOOL CALLBACK find_primary_mon(HMONITOR hmon, HDC hdc, LPRECT rc, LPARAM lp)

1 0

Jacek Caban : atl90: Share atl.c with atl100.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 52c9b51ca88ade36ead5bdb54a78a8d3ff2c71bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c9b51ca88ade36ead5bdb54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 12:48:34 2014 +0100 atl90: Share atl.c with atl100. --- dlls/atl90/Makefile.in | 4 ++-- dlls/atl90/atl90.c | 42 ----------------------------------- dlls/atl90/atl90.spec | 58 ++++++++++++++++++++++++------------------------ 3 files changed, 31 insertions(+), 73 deletions(-) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 677aaae..88f441b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,10 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 uuid +IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl100 C_SRCS = \ - atl90.c \ + atl.c \ atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c deleted file mode 100644 index 9dd0b70..0000000 --- a/dlls/atl90/atl90.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2013 Zhenbo Li - * - * 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> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "atlbase.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/*********************************************************************** - * AtlGetVersion [atl90.@] - */ -DWORD WINAPI AtlGetVersion(void *reserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, reserved); - return _ATL_VER; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 35facf8..a8fcf46 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -1,22 +1,22 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -26,27 +26,27 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration -68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) +68 stdcall AtlGetPerUserRegistration(ptr)

1 0

Hans Leidekker : dwmapi: Silence a fixme.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 7d696911b2496eba4a84c0ab2334219926adf3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d696911b2496eba4a84c0ab2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:24:47 2014 +0100 dwmapi: Silence a fixme. --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index e6154ba..8cc46f0 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -112,7 +112,9 @@ HRESULT WINAPI DwmFlush(void) */ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) { - FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); + static BOOL once; + + if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); return E_NOTIMPL; }

1 0

Frédéric Delanoy : d3dxof/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 82889a695002c49fef8e699518115f72178cc92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82889a695002c49fef8e69951… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:27 2014 +0100 d3dxof/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/d3dxof/tests/d3dxof.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 67baac0..0573e4a 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -40,14 +40,6 @@ #define SEMICOLON_5X TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON -static inline void debugstr_guid( char *buf, const GUID *id ) -{ - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); -} - static HMODULE hd3dxof; static HRESULT (WINAPI *pDirectXFileCreate)(LPDIRECTXFILE*); @@ -1120,8 +1112,6 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) char name[100]; GUID clsid; const GUID *clsid_type = NULL; - char str_clsid[40]; - char str_clsid_type[40]; DWORD len = 100; LPDIRECTXFILEOBJECT pChildObj; int i; @@ -1139,9 +1129,8 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); for (i = 0; i < level; i++) printf(" "); - debugstr_guid(str_clsid, &clsid); - debugstr_guid(str_clsid_type, clsid_type); - printf("Found object '%s' - %s - %s - %d\n", len ? name : "", str_clsid, str_clsid_type, size); + printf("Found object '%s' - %s - %s - %d\n", + len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(clsid_type), size); if (EXPAND_STRING && size == 4) {

1 0

Frédéric Delanoy : dmime/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: cd4cd7661469e93adbdc370cb1bf7d4cf1b663df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4cd7661469e93adbdc370cb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:28 2014 +0100 dmime/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/dmime/tests/performance.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 591ae1f..143eeed 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -31,18 +31,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_Bunk,0xFFFFFFFF,0xFFFF,0xFFFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static HRESULT test_InitAudio(void) { IDirectMusicPerformance8 *idmusicperformance; @@ -128,7 +116,7 @@ static void test_createport(void) ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %08x\n", portcaps.dwSize); trace("portcaps(%u).dwFlags: %08x\n", i, portcaps.dwFlags); - trace("portcaps(%u).guidPort: %s\n", i, debugstr_guid(&portcaps.guidPort)); + trace("portcaps(%u).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); trace("portcaps(%u).dwClass: %08x\n", i, portcaps.dwClass); trace("portcaps(%u).dwType: %08x\n", i, portcaps.dwType); trace("portcaps(%u).dwMemorySize: %08x\n", i, portcaps.dwMemorySize);

1 0

Vincent Povirk : winsta: Stub WinStationVirtualOpen.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 1be9e3fe10a7c9a1ea0a575df4ec573129d003f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be9e3fe10a7c9a1ea0a575df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 13:57:16 2014 -0600 winsta: Stub WinStationVirtualOpen. --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 71e1dda..46a4ce7 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -83,3 +83,10 @@ BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, P SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) +{ + FIXME( "%p %p %p\n", a, b, c ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 9505615..5854d83 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -70,7 +70,7 @@ @ stub WinStationShutdownSystem @ stub WinStationTerminateProcess @ stub WinStationUnRegisterConsoleNotification -@ stub WinStationVirtualOpen +@ stdcall WinStationVirtualOpen(ptr ptr ptr) @ stub WinStationWaitSystemEvent @ stub _NWLogonQueryAdmin @ stub _NWLogonSetAdmin

1 0

Vincent Povirk : user32: Treat empty rects as 1x1 in MonitorFromRect.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 2fef984ed5e85cd04ddcaf7b5a6ddefdbf50a627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fef984ed5e85cd04ddcaf7b5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 8 16:02:23 2014 -0600 user32: Treat empty rects as 1x1 in MonitorFromRect. --- dlls/user32/misc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index eb2631f..41b2b16 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -359,6 +359,13 @@ HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) info.primary = 0; info.nearest = 0; info.ret = 0; + + if (IsRectEmpty(&info.rect)) + { + info.rect.right = info.rect.left + 1; + info.rect.bottom = info.rect.top + 1; + } + if (!EnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; if (!info.ret) {

1 0

Martin Storsjo : api-ms-win-core-synch-l1-2-0: Add stub dll.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 81425436543c79a6c1018df0b575d8f7c261eb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81425436543c79a6c1018df0b… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 27 12:34:18 2014 +0200 api-ms-win-core-synch-l1-2-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-synch-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-synch-l1-2-0.spec | 58 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 63 insertions(+) diff --git a/configure b/configure index 312c19f..9939a69 100755 --- a/configure +++ b/configure @@ -859,6 +859,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 @@ -16517,6 +16518,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 diff --git a/configure.ac b/configure.ac index fbfbb5c..81bdb81 100644 --- a/configure.ac +++ b/configure.ac @@ -2640,6 +2640,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) diff --git a/dlls/api-ms-win-core-synch-l1-2-0/Makefile.in b/dlls/api-ms-win-core-synch-l1-2-0/Makefile.in new file mode 100644 index 0000000..ac092b6 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-l1-2-0.dll diff --git a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec new file mode 100644 index 0000000..43be0c8 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec @@ -0,0 +1,58 @@ +@ stdcall AcquireSRWLockExclusive(ptr) kernel32.AcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) kernel32.AcquireSRWLockShared +@ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer +@ stdcall CreateEventA(ptr long long str) kernel32.CreateEventA +@ stdcall CreateEventExA(ptr str long long) kernel32.CreateEventExA +@ stdcall CreateEventExW(ptr wstr long long) kernel32.CreateEventExW +@ stdcall CreateEventW(ptr long long wstr) kernel32.CreateEventW +@ stdcall CreateMutexA(ptr long str) kernel32.CreateMutexA +@ stdcall CreateMutexExA(ptr str long long) kernel32.CreateMutexExA +@ stdcall CreateMutexExW(ptr wstr long long) kernel32.CreateMutexExW +@ stdcall CreateMutexW(ptr long wstr) kernel32.CreateMutexW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW +@ stdcall CreateWaitableTimerExW(ptr wstr long long) kernel32.CreateWaitableTimerExW +@ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection +@ stub DeleteSynchronizationBarrier +@ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection +@ stub EnterSynchronizationBarrier +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernel32.InitOnceBeginInitialize +@ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernel32.InitOnceExecuteOnce +@ stdcall InitOnceInitialize(ptr) kernel32.InitOnceInitialize +@ stdcall InitializeConditionVariable(ptr) kernel32.InitializeConditionVariable +@ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount +@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeSRWLock(ptr) kernel32.InitializeSRWLock +@ stub InitializeSynchronizationBarrier +@ stdcall LeaveCriticalSection(ptr) kernel32.LeaveCriticalSection +@ stdcall OpenEventA(long long str) kernel32.OpenEventA +@ stdcall OpenEventW(long long wstr) kernel32.OpenEventW +@ stdcall OpenMutexW(long long wstr) kernel32.OpenMutexW +@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenWaitableTimerW(long long wstr) kernel32.OpenWaitableTimerW +@ stdcall ReleaseMutex(long) kernel32.ReleaseMutex +@ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared +@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ResetEvent(long) kernel32.ResetEvent +@ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount +@ stdcall SetEvent(long) kernel32.SetEvent +@ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer +@ stub SetWaitableTimerEx +@ stdcall SignalObjectAndWait(long long long long) kernel32.SignalObjectAndWait +@ stdcall Sleep(long) kernel32.Sleep +@ stdcall SleepConditionVariableCS(ptr ptr long) kernel32.SleepConditionVariableCS +@ stdcall SleepConditionVariableSRW(ptr ptr long long) kernel32.SleepConditionVariableSRW +@ stdcall SleepEx(long long) kernel32.SleepEx +@ stdcall TryAcquireSRWLockExclusive(ptr) kernel32.TryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) kernel32.TryAcquireSRWLockShared +@ stdcall TryEnterCriticalSection(ptr) kernel32.TryEnterCriticalSection +@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject +@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx +@ stub WaitOnAddress +@ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable +@ stub WakeByAddressAll +@ stub WakeByAddressSingle +@ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/tools/make_specfiles b/tools/make_specfiles index 38917eb..31449b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -144,6 +144,7 @@ my @dll_groups = "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-core-synch-l1-2-0", ], [ "ole32",

1 0