February 2013 - Wine-Commits

Hans Leidekker : wbemprox: Implement more properties of Win32_CDROMDrive.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 8b27b1d0da31e3bac0a7c6b2ea3b812ca382e498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b27b1d0da31e3bac0a7c6b2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 11:03:56 2013 +0100 wbemprox: Implement more properties of Win32_CDROMDrive. --- dlls/wbemprox/builtin.c | 65 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d97ca67..92f3030 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -107,6 +107,8 @@ static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR prop_driveW[] = + {'D','r','i','v','e',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = @@ -215,7 +217,10 @@ static const struct column col_bios[] = }; static const struct column col_cdromdrive[] = { - { prop_nameW, CIM_STRING } + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driveW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, + { prop_pnpdeviceidW, CIM_STRING } }; static const struct column col_compsys[] = { @@ -364,6 +369,11 @@ static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR cdromdrive_nameW[] = {'W','i','n','e',' ','C','D','-','R','O','M',' ','A','T','A',' ','D','e','v','i','c','e',0}; +static const WCHAR cdromdrive_pnpdeviceidW[]= + {'I','D','E','\\','C','D','R','O','M','W','I','N','E','_','C','D','-','R','O','M', + '_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_', + '_','_','_','_','_','_','_','1','.','0','_','_','_','_','_','\\','5','&','3','A','2', + 'A','5','8','5','4','&','0','&','1','.','0','.','0',0}; static const WCHAR compsys_descriptionW[] = {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; static const WCHAR compsys_domainW[] = @@ -413,7 +423,10 @@ struct record_bios }; struct record_cdromdrive { + const WCHAR *device_id; + const WCHAR *drive; const WCHAR *name; + const WCHAR *pnpdevice_id; }; struct record_computersystem { @@ -553,10 +566,6 @@ static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } }; -static const struct record_cdromdrive data_cdromdrive[] = -{ - { cdromdrive_nameW } -}; static const struct record_diskdrive data_diskdrive[] = { { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } @@ -603,6 +612,45 @@ static const struct record_stdregprov data_stdregprov[] = { reg_enum_key, reg_enum_values, reg_get_stringvalue } }; +static void fill_cdromdrive( struct table *table ) +{ + static const WCHAR fmtW[] = {'%','c',':',0}; + WCHAR drive[3], root[] = {'A',':','\\',0}; + struct record_cdromdrive *rec; + UINT i, num_rows = 0, offset = 0, count = 1; + DWORD drives = GetLogicalDrives(); + + if (!(table->data = heap_alloc( count * sizeof(*rec) ))) return; + + for (i = 0; i < sizeof(drives); i++) + { + if (drives & (1 << i)) + { + root[0] = 'A' + i; + if (GetDriveTypeW( root ) != DRIVE_CDROM) + continue; + + if (num_rows > count) + { + BYTE *data; + count *= 2; + if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) return; + table->data = data; + } + rec = (struct record_cdromdrive *)(table->data + offset); + rec->device_id = cdromdrive_pnpdeviceidW; + sprintfW( drive, fmtW, 'A' + i ); + rec->drive = heap_strdupW( drive ); + rec->name = cdromdrive_nameW; + rec->pnpdevice_id = cdromdrive_pnpdeviceidW; + offset += sizeof(*rec); + num_rows++; + } + } + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; +} + static UINT get_processor_count(void) { SYSTEM_BASIC_INFORMATION info; @@ -1263,7 +1311,7 @@ static struct table builtin_classes[] = { { class_baseboardW, SIZEOF(col_baseboard), col_baseboard, SIZEOF(data_baseboard), (BYTE *)data_baseboard }, { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios }, - { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, SIZEOF(data_cdromdrive), (BYTE *)data_cdromdrive }, + { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, @@ -1284,9 +1332,6 @@ void init_table_list( void ) static struct list tables = LIST_INIT( tables ); UINT i; - for (i = 0; i < SIZEOF(builtin_classes); i++) - { - list_add_tail( &tables, &builtin_classes[i].entry ); - } + for (i = 0; i < SIZEOF(builtin_classes); i++) list_add_tail( &tables, &builtin_classes[i].entry ); table_list = &tables; }

1 0

Hans Leidekker : wbemprox: Avoid a crash in destroy_view.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: a247c7cf2326ee95f83c5e17d3e716554d55aa12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247c7cf2326ee95f83c5e17d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 11:03:33 2013 +0100 wbemprox: Avoid a crash in destroy_view. --- dlls/wbemprox/query.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 2d416ef..028b334 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -47,6 +47,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, void destroy_view( struct view *view ) { + if (!view) return; if (view->table) release_table( view->table ); heap_free( view->result ); heap_free( view );

1 0

Alessandro Pignotti : quartz: IEnumFiltersImpl needs to access data from IGraphFilterImpl.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: ea16925d8c531828090084ae8aa05b80581e00e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea16925d8c531828090084ae8… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 19 15:56:17 2013 +0100 quartz: IEnumFiltersImpl needs to access data from IGraphFilterImpl. --- dlls/quartz/enumfilters.c | 51 ++++++++++++++++++++++++++-------------- dlls/quartz/filtergraph.c | 53 +++++++++++++++++++++++++++++++++++++++-- dlls/quartz/quartz_private.h | 2 +- 3 files changed, 84 insertions(+), 22 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index 2b9dc53..735fd79 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -28,8 +28,10 @@ typedef struct IEnumFiltersImpl { IEnumFilters IEnumFilters_iface; LONG refCount; - IBaseFilter ** ppFilters; - int nFilters; + IGraphVersion * pVersionSource; + LONG Version; + IBaseFilter *** pppFilters; + ULONG * pNumFilters; ULONG uIndex; } IEnumFiltersImpl; @@ -40,13 +42,15 @@ static inline IEnumFiltersImpl *impl_from_IEnumFilters(IEnumFilters *iface) return CONTAINING_RECORD(iface, IEnumFiltersImpl, IEnumFilters_iface); } -HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum) +HRESULT IEnumFiltersImpl_Construct(IGraphVersion * pVersionSource, IBaseFilter *** pppFilters, ULONG * pNumFilters, IEnumFilters ** ppEnum) { /* Note: The incoming IBaseFilter interfaces are not AddRef'd here as in Windows, * they should have been previously AddRef'd. */ IEnumFiltersImpl * pEnumFilters = CoTaskMemAlloc(sizeof(IEnumFiltersImpl)); + HRESULT hr; + LONG currentVersion; - TRACE("(%p, %d, %p)\n", ppFilters, nFilters, ppEnum); + TRACE("(%p, %p, %p)\n", pppFilters, pNumFilters, ppEnum); *ppEnum = NULL; @@ -58,15 +62,14 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn pEnumFilters->IEnumFilters_iface.lpVtbl = &IEnumFiltersImpl_Vtbl; pEnumFilters->refCount = 1; pEnumFilters->uIndex = 0; - pEnumFilters->nFilters = nFilters; - pEnumFilters->ppFilters = CoTaskMemAlloc(sizeof(IBaseFilter*) * nFilters); - if (!pEnumFilters->ppFilters) - { - CoTaskMemFree(pEnumFilters); - return E_OUTOFMEMORY; - } + pEnumFilters->pNumFilters = pNumFilters; + pEnumFilters->pppFilters = pppFilters; + IGraphVersion_AddRef(pVersionSource); + pEnumFilters->pVersionSource = pVersionSource; - memcpy(pEnumFilters->ppFilters, ppFilters, nFilters * sizeof(IBaseFilter*)); + /* Store the current version of the graph */ + hr = IGraphVersion_QueryVersion(pVersionSource, &currentVersion); + pEnumFilters->Version = (hr==S_OK) ? currentVersion : 0; *ppEnum = &pEnumFilters->IEnumFilters_iface; return S_OK; @@ -113,8 +116,7 @@ static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) if (!refCount) { - CoTaskMemFree(This->ppFilters); - CoTaskMemFree(This); + IGraphVersion_Release(This->pVersionSource); return 0; } else @@ -125,18 +127,26 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters { ULONG cFetched; ULONG i; + LONG currentVersion; IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); + HRESULT hr; - cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex; + cFetched = min(*This->pNumFilters, This->uIndex + cFilters) - This->uIndex; TRACE("(%p)->(%u, %p, %p)\n", iface, cFilters, ppFilters, pcFetched); + /* First of all check if the graph has changed */ + hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); + if (hr==S_OK && This->Version != currentVersion) + return VFW_E_ENUM_OUT_OF_SYNC; + + if (!ppFilters) return E_POINTER; for (i = 0; i < cFetched; i++) { - ppFilters[i] = This->ppFilters[This->uIndex + i]; + ppFilters[i] = (*This->pppFilters)[This->uIndex + i]; IBaseFilter_AddRef(ppFilters[i]); } @@ -156,7 +166,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters TRACE("(%p)->(%u)\n", iface, cFilters); - if (This->uIndex + cFilters < This->nFilters) + if (This->uIndex + cFilters < *This->pNumFilters) { This->uIndex += cFilters; return S_OK; @@ -167,10 +177,15 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) { IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); + HRESULT hr; + LONG currentVersion; TRACE("(%p)->()\n", iface); This->uIndex = 0; + hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); + if (!hr) + This->Version = currentVersion; return S_OK; } @@ -181,7 +196,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Clone(IEnumFilters * iface, IEnumFilters TRACE("(%p)->(%p)\n", iface, ppEnum); - hr = IEnumFiltersImpl_Construct(This->ppFilters, This->nFilters, ppEnum); + hr = IEnumFiltersImpl_Construct(This->pVersionSource, This->pppFilters, This->pNumFilters, ppEnum); if (FAILED(hr)) return hr; return IEnumFilters_Skip(*ppEnum, This->uIndex); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c31de59..fb0f977 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -162,11 +162,11 @@ typedef struct _IFilterGraphImpl { IGraphConfig IGraphConfig_iface; IMediaPosition IMediaPosition_iface; IObjectWithSite IObjectWithSite_iface; + IGraphVersion IGraphVersion_iface; /* IAMGraphStreams */ /* IAMStats */ /* IFilterChain */ /* IFilterMapper2 */ - /* IGraphVersion */ /* IQueueCommand */ /* IRegisterServiceProvider */ /* IResourceMananger */ @@ -179,7 +179,7 @@ typedef struct _IFilterGraphImpl { IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; - int nFilters; + ULONG nFilters; int filterCapacity; LONG nameIndex; IReferenceClock *refClock; @@ -269,6 +269,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { + *ppvObj = &This->IGraphConfig_iface; + TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -562,7 +565,7 @@ static HRESULT WINAPI FilterGraph2_EnumFilters(IFilterGraph2 *iface, IEnumFilter TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); - return IEnumFiltersImpl_Construct(This->ppFiltersInGraph, This->nFilters, ppEnum); + return IEnumFiltersImpl_Construct(&This->IGraphVersion_iface, &This->ppFiltersInGraph, &This->nFilters, ppEnum); } static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, LPCWSTR pName, @@ -5547,6 +5550,49 @@ static const IGraphConfigVtbl IGraphConfig_VTable = GraphConfig_RemoveFilterEx }; +static inline IFilterGraphImpl *impl_from_IGraphVersion(IGraphVersion *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IGraphVersion_iface); +} + +static HRESULT WINAPI GraphVersion_QueryInterface(IGraphVersion *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI GraphVersion_AddRef(IGraphVersion *iface) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI GraphVersion_Release(IGraphVersion *iface) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *pVersion) +{ + IFilterGraphImpl *This = impl_from_IGraphVersion(iface); + + FIXME("(%p)->(%p): stub!\n", This, pVersion); + + return E_NOTIMPL; +} + +static const IGraphVersionVtbl IGraphVersion_VTable = +{ + GraphVersion_QueryInterface, + GraphVersion_AddRef, + GraphVersion_Release, + GraphVersion_QueryVersion, +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5579,6 +5625,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; + fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7498ea9..d8bcdbf 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -59,7 +59,7 @@ HRESULT VMR9Impl_create(IUnknown *pUnkOuter, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum) DECLSPEC_HIDDEN; HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG size, IEnumRegFilters ** ppEnum) DECLSPEC_HIDDEN; -HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum) DECLSPEC_HIDDEN; +HRESULT IEnumFiltersImpl_Construct(IGraphVersion * pVersionSource, IBaseFilter *** pppFilters, ULONG * pNumFilters, IEnumFilters ** ppEnum) DECLSPEC_HIDDEN; extern const char * qzdebugstr_guid(const GUID * id) DECLSPEC_HIDDEN; extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : gdiplus: Round up when converting from 32-bit ARGB to PARGB.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: d23bfd8dfc74a1955a0270feaf07ccd7a23a723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23bfd8dfc74a1955a0270fea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:30:32 2013 +0800 gdiplus: Round up when converting from 32-bit ARGB to PARGB. --- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 1c016be..f199055 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -442,9 +442,9 @@ void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, for (x=0; x<width; x++) { BYTE alpha=src[3]; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; *dst++ = *src++; } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a075b42..feab70b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4129,7 +4129,6 @@ static void test_ARGB_conversion(void) ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); ok(data.PixelFormat == PixelFormat32bppPARGB, "expected PixelFormat32bppPARGB, got %d\n", data.PixelFormat); match = !memcmp(data.Scan0, pargb, sizeof(pargb)); -todo_wine ok(match, "bits don't match\n"); if (!match) {

1 0

Ken Thomases : winemac: Implement GetCursorPos().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 38f7a4d518c66537d0919ac07904332cb8f4e208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f7a4d518c66537d0919ac07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:29 2013 -0600 winemac: Implement GetCursorPos(). --- dlls/winemac.drv/cocoa_app.m | 17 +++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 19 +++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 44fa282..d22596e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -815,3 +815,20 @@ void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) } } } + +/*********************************************************************** + * macdrv_get_cursor_position + * + * Obtains the current cursor position. Returns zero on failure, + * non-zero on success. + */ +int macdrv_get_cursor_position(CGPoint *pos) +{ + OnMainThread(^{ + NSPoint location = [NSEvent mouseLocation]; + location = [NSApp flippedMouseLocation:location]; + *pos = NSPointToCGPoint(location); + }); + + return TRUE; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 269dbea..c3ad6ba 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -120,6 +120,7 @@ extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* cursor */ extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) DECLSPEC_HIDDEN; +extern int macdrv_get_cursor_position(CGPoint *pos) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 8e16388..b0288f6 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -736,6 +736,25 @@ void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor) /*********************************************************************** + * GetCursorPos (MACDRV.@) + */ +BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) +{ + CGPoint pt; + BOOL ret; + + ret = macdrv_get_cursor_position(&pt); + if (ret) + { + TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); + pos->x = pt.x; + pos->y = pt.y; + } + return ret; +} + + +/*********************************************************************** * SetCursor (MACDRV.@) */ void CDECL macdrv_SetCursor(HCURSOR cursor) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 6fd4bef..99746b4 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -13,6 +13,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx +@ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText

1 0

Dmitry Timoshkov : gdiplus: If a device doesn't support AlphaBlend don' t convert image to PARGB.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 1896e5575ef63919fefbe3bfc587f41be086b211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1896e5575ef63919fefbe3bfc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:31:12 2013 +0800 gdiplus: If a device doesn't support AlphaBlend don't convert image to PARGB. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 01e127c..853027c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -398,8 +398,11 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + memcpy(temp_bits, src, src_width * src_height * 4); + else + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height,

1 0

André Hentschel : winedbg: There is no hardware single stepping support on ARM.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 371bbf8db4089999166d5b9ceccc148cc1b867b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371bbf8db4089999166d5b9ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 23 17:34:26 2013 +0100 winedbg: There is no hardware single stepping support on ARM. --- programs/winedbg/be_arm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 00b6f5c..5d14a37 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1686,7 +1686,6 @@ static unsigned be_arm_get_register_info(int regno, enum be_cpu_addr* kind) static void be_arm_single_step(CONTEXT* ctx, unsigned enable) { - dbg_printf("be_arm_single_step: not done\n"); } static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs)

1 0

Ken Thomases : winemac: Implement ClipCursor().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 9b0fdc645f1a27085a6ca94d8e2160519e79f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0fdc645f1a27085a6ca94d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:51 2013 -0600 winemac: Implement ClipCursor(). --- dlls/winemac.drv/cocoa_app.h | 8 + dlls/winemac.drv/cocoa_app.m | 408 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 15 +- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 26 +++ dlls/winemac.drv/winemac.drv.spec | 1 + 6 files changed, 442 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b0fdc645f1a27085a6ca…

1 0

Ken Thomases : winemac: Implement SetCursorPos().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 5c933c89ad1bddf44768085c0d3b22a2a936db3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c933c89ad1bddf44768085c0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:47 2013 -0600 winemac: Implement SetCursorPos(). --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 53 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 14 ++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 5 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 32e4180..3567595 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -58,6 +58,8 @@ int cursorFrame; NSTimer* cursorTimer; BOOL cursorHidden; + + NSTimeInterval lastSetCursorPositionTime; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3744498..f1ad0bc 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -548,6 +548,31 @@ int macdrv_err_on; } } + - (BOOL) setCursorPosition:(CGPoint)pos + { + BOOL ret; + + ret = (CGWarpMouseCursorPosition(pos) == kCGErrorSuccess); + if (ret) + { + WineEventQueue* queue; + + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + + // Discard all pending mouse move events. + [eventQueuesLock lock]; + for (queue in eventQueues) + { + [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) | + event_mask_for_type(MOUSE_MOVED_ABSOLUTE) + forWindow:nil]; + } + [eventQueuesLock unlock]; + } + + return ret; + } + /* * ---------- NSApplication method overrides ---------- @@ -587,6 +612,17 @@ int macdrv_err_on; BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); forceNextMouseMoveAbsolute = FALSE; + // If we recently warped the cursor, discard mouse move events until + // we see an event which is later than that time. + if (lastSetCursorPositionTime) + { + if ([anEvent timestamp] <= lastSetCursorPositionTime) + return; + + lastSetCursorPositionTime = 0; + absolute = TRUE; + } + [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; lastTargetWindow = targetWindow; } @@ -893,3 +929,20 @@ int macdrv_get_cursor_position(CGPoint *pos) return TRUE; } + +/*********************************************************************** + * macdrv_set_cursor_position + * + * Sets the cursor position without generating events. Returns zero on + * failure, non-zero on success. + */ +int macdrv_set_cursor_position(CGPoint pos) +{ + __block int ret; + + OnMainThread(^{ + ret = [NSApp setCursorPosition:pos]; + }); + + return ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index c3ad6ba..16f5595 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -121,6 +121,7 @@ extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* cursor */ extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) DECLSPEC_HIDDEN; extern int macdrv_get_cursor_position(CGPoint *pos) DECLSPEC_HIDDEN; +extern int macdrv_set_cursor_position(CGPoint pos) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index b0288f6..d38a316 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -848,6 +848,20 @@ done: /*********************************************************************** + * SetCursorPos (MACDRV.@) + */ +BOOL CDECL macdrv_SetCursorPos(INT x, INT y) +{ + BOOL ret = macdrv_set_cursor_position(CGPointMake(x, y)); + if (ret) + TRACE("warped to %d,%d\n", x, y); + else + ERR("failed to warp to %d,%d\n", x, y); + return ret; +} + + +/*********************************************************************** * macdrv_mouse_button * * Handler for MOUSE_BUTTON events. diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 99746b4..87cd0ee 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -22,6 +22,7 @@ @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC @ cdecl SetCursor(long) macdrv_SetCursor +@ cdecl SetCursorPos(long long) macdrv_SetCursorPos @ cdecl SetFocus(long) macdrv_SetFocus @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes @ cdecl SetParent(long long long) macdrv_SetParent

1 0

Ken Thomases : winemac: Reset the cursor to the normal Mac arrow when it' s outside all Wine windows.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: de079223bf6ac1b5695c125267fb8bece3cb8c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de079223bf6ac1b5695c12526… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:42 2013 -0600 winemac: Reset the cursor to the normal Mac arrow when it's outside all Wine windows. --- dlls/winemac.drv/cocoa_app.m | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 47ec05c..3744498 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -590,8 +590,12 @@ int macdrv_err_on; [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; lastTargetWindow = targetWindow; } - else + else if (lastTargetWindow) + { + [[NSCursor arrowCursor] set]; + [self unhideCursor]; lastTargetWindow = nil; + } } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp ||

1 0