August 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : qcap: Basic COM cleanup for IPin iface of VfwCapture.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 22848359737ad9c37519a78d43ba87e0e169b5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22848359737ad9c37519a78d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 3 23:24:18 2015 +0200 qcap: Basic COM cleanup for IPin iface of VfwCapture. --- dlls/qcap/vfwcapture.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index f9530a0..c34ab28 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -670,9 +670,14 @@ static const IKsPropertySetVtbl KSP_VTable = KSP_QuerySupported }; -static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static inline VfwPinImpl *impl_from_BasePin(BasePin *pin) { - VfwPinImpl *This = (VfwPinImpl *)iface; + return CONTAINING_RECORD(pin, VfwPinImpl, pin.pin); +} + +static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_TYPE *pmt) +{ + VfwPinImpl *This = impl_from_BasePin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; @@ -748,9 +753,14 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, return hr; } +static inline VfwPinImpl *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface); +} + static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - VfwPinImpl *This = (VfwPinImpl *)iface; + VfwPinImpl *This = impl_from_IPin(iface); TRACE("%s %p\n", debugstr_guid(riid), ppv); @@ -775,7 +785,7 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * static ULONG WINAPI VfwPin_Release(IPin * iface) { - VfwPinImpl *This = (VfwPinImpl *)iface; + VfwPinImpl *This = impl_from_IPin(iface); ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); TRACE("() -> new refcount: %u\n", refCount); @@ -791,10 +801,10 @@ VfwPin_Release(IPin * iface) static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { + VfwPinImpl *This = impl_from_IPin(iface); AM_MEDIA_TYPE *pmt; HRESULT hr; - VfwPinImpl *This = (VfwPinImpl *)iface; hr = qcap_driver_get_format(This->parent->driver_info, &pmt); if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum);

1 0

Sebastian Lackner : wine.inf: Add timezone information for Chile.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 6cc3d8a7074df3a907af6cb414d0419f30eaa93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc3d8a7074df3a907af6cb41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 02:05:13 2015 +0200 wine.inf: Add timezone information for Chile. --- loader/wine.inf.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 315ef29..9214acd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2708,6 +2708,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"Am HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Display",,"Chile/Continental" +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Dlt",,"Chile Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Std",,"Chile Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" @@ -2733,6 +2738,11 @@ HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2034",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Chile/EasterIsland" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Dlt",,"Easter Island Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Std",,"Easter Island Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,06,00,19,00,17,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Display",,"America/New_York" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Dlt",,"Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time"

1 0

Nikolay Sivov : dwrite: Advances and offsets are optional for IDWriteGlyphRunAnalysis.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 720c430594a895ce43ffe7a00b930b49d64e63f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720c430594a895ce43ffe7a00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 11:16:10 2015 +0300 dwrite: Advances and offsets are optional for IDWriteGlyphRunAnalysis. --- dlls/dwrite/analyzer.c | 5 ---- dlls/dwrite/dwrite_private.h | 7 ++++- dlls/dwrite/font.c | 70 ++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 69 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 133 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=720c430594a895ce43ffe…

1 0

Henri Verbeet : d3d9: Don' t assert on invalid IDirect3DBaseTexture9 interfaces.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 0c8e78f80dc3bfeb72deeb51274ce42adb623b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8e78f80dc3bfeb72deeb512… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 10:47:57 2015 +0200 d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces. --- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++-- dlls/d3d9/texture.c | 12 +++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb4a6e8..e58d1df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6627,8 +6627,9 @@ static void test_filter(void) DestroyWindow(window); } -static void test_get_texture(void) +static void test_get_set_texture(void) { + const IDirect3DBaseTexture9Vtbl *texture_vtbl; IDirect3DBaseTexture9 *texture; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -6655,6 +6656,23 @@ static void test_get_texture(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!texture, "Got unexpected texture %p.\n", texture); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_MANAGED, (IDirect3DTexture9 **)&texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + texture_vtbl = texture->lpVtbl; + texture->lpVtbl = (IDirect3DBaseTexture9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = NULL; + hr = IDirect3DDevice9_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = texture_vtbl; + IDirect3DBaseTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); @@ -10231,7 +10249,7 @@ START_TEST(device) test_cube_textures(); test_mipmap_gen(); test_filter(); - test_get_texture(); + test_get_set_texture(); test_lod(); test_surface_get_container(); test_surface_alignment(); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c1a0277..1f8f0f2 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1252,9 +1252,15 @@ struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture { if (!iface) return NULL; - assert(iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl); + + if (iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl) + { + WARN("%p is not a valid IDirect3DBaseTexture9 interface.\n", iface); + return NULL; + } + return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); }

1 0

Michael Stefaniuc : qcap: COM cleanup for the IKsPropertySet iface.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 487472b3f67ceeacca336cc899f7c29cd38d3336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487472b3f67ceeacca336cc89… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 3 23:28:41 2015 +0200 qcap: COM cleanup for the IKsPropertySet iface. --- dlls/qcap/vfwcapture.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index c34ab28..372e2ee 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -44,9 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); -#define ICOM_THIS_MULTI(impl,field,iface) \ - impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - static const IBaseFilterVtbl VfwCapture_Vtbl; static const IAMStreamConfigVtbl IAMStreamConfig_VTable; static const IAMVideoProcAmpVtbl IAMVideoProcAmp_VTable; @@ -103,8 +100,8 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa typedef struct VfwPinImpl { BaseOutputPin pin; + IKsPropertySet IKsPropertySet_iface; VfwCapture *parent; - const IKsPropertySetVtbl * KSP_VT; } VfwPinImpl; @@ -585,37 +582,30 @@ static const IPersistPropertyBagVtbl IPersistPropertyBag_VTable = }; /* IKsPropertySet interface */ -static HRESULT WINAPI -KSP_QueryInterface( IKsPropertySet * iface, REFIID riid, LPVOID * ppv ) +static inline VfwPinImpl *impl_from_IKsPropertySet(IKsPropertySet *iface) { - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IKsPropertySet)) - { - *ppv = iface; - IKsPropertySet_AddRef( iface ); - return S_OK; - } + return CONTAINING_RECORD(iface, VfwPinImpl, IKsPropertySet_iface); +} - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; +static HRESULT WINAPI KSP_QueryInterface(IKsPropertySet * iface, REFIID riid, void **ret_iface) +{ + VfwPinImpl *This = impl_from_IKsPropertySet(iface); + + return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ret_iface); } static ULONG WINAPI KSP_AddRef(IKsPropertySet * iface) { - ICOM_THIS_MULTI(VfwPinImpl, KSP_VT, iface); + VfwPinImpl *This = impl_from_IKsPropertySet(iface); - TRACE("%p --> Forwarding to VfwPin (%p)\n", iface, This); - - return IUnknown_AddRef((IUnknown *)This); + return IPin_AddRef(&This->pin.pin.IPin_iface); } static ULONG WINAPI KSP_Release(IKsPropertySet * iface) { - ICOM_THIS_MULTI(VfwPinImpl, KSP_VT, iface); - - TRACE("%p --> Forwarding to VfwPin (%p)\n", iface, This); + VfwPinImpl *This = impl_from_IKsPropertySet(iface); - return IUnknown_Release((IUnknown *)This); + return IPin_Release(&This->pin.pin.IPin_iface); } static HRESULT WINAPI @@ -660,7 +650,7 @@ KSP_QuerySupported( IKsPropertySet * iface, REFGUID guidPropSet, return E_NOTIMPL; } -static const IKsPropertySetVtbl KSP_VTable = +static const IKsPropertySetVtbl IKsPropertySet_VTable = { KSP_QueryInterface, KSP_AddRef, @@ -746,7 +736,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, if (SUCCEEDED(hr)) { VfwPinImpl *pPinImpl = (VfwPinImpl*)*ppPin; - pPinImpl->KSP_VT = &KSP_VTable; + pPinImpl->IKsPropertySet_iface.lpVtbl = &IKsPropertySet_VTable; ObjectRefCount(TRUE); } @@ -768,7 +758,7 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) *ppv = This; else if (IsEqualIID(riid, &IID_IKsPropertySet)) - *ppv = &(This->KSP_VT); + *ppv = &This->IKsPropertySet_iface; else if (IsEqualIID(riid, &IID_IAMStreamConfig)) return IUnknown_QueryInterface((IUnknown *)This->parent, riid, ppv);

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetFactory().
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: da47b214cdcb2237d71e43a9a3758a335b6ba648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da47b214cdcb2237d71e43a9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:25 2015 +0200 d2d1: Implement d2d_bitmap_GetFactory(). --- dlls/d2d1/bitmap.c | 8 ++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 00359cb..2627501 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -67,6 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) if (!refcount) { ID3D10ShaderResourceView_Release(bitmap->view); + ID2D1Factory_Release(bitmap->factory); HeapFree(GetProcessHeap(), 0, bitmap); } @@ -75,9 +76,11 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = bitmap->factory); } static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) @@ -212,6 +215,7 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; + ID2D1Factory_AddRef(bitmap->factory = render_target->factory); texture_desc.Width = size.width; texture_desc.Height = size.height; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3f2ac3e..d3c0117 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -188,6 +188,7 @@ struct d2d_bitmap ID2D1Bitmap ID2D1Bitmap_iface; LONG refcount; + ID2D1Factory *factory; ID3D10ShaderResourceView *view; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format;

1 0

Mark Harmstone : user32: Specify size for default window icon in NC_IconForWindow.
by Alexandre Julliard Aug. 3, 2015

Aug. 3, 2015

Module: wine Branch: master Commit: 27bffea1486b134b58cc30d69be97f7f496010b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bffea1486b134b58cc30d69… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Aug 1 15:03:13 2015 +0100 user32: Specify size for default window icon in NC_IconForWindow. --- dlls/user32/nonclient.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 11b8d08..1267ab6 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -172,7 +172,8 @@ static HICON NC_IconForWindow( HWND hwnd ) * get the default one. */ if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME)) - hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); return hIcon; }

1 0

Hugh McMaster : kernel32: Restore the original console cursor size on Enter press, if the Insert key toggle is active.
by Alexandre Julliard Aug. 3, 2015

Aug. 3, 2015

Module: wine Branch: master Commit: 0adad1f5730abc1f9c75f7e8fb056f8b47f5abe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adad1f5730abc1f9c75f7e8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 3 17:55:01 2015 +1000 kernel32: Restore the original console cursor size on Enter press, if the Insert key toggle is active. --- dlls/kernel32/editline.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4dfa2cf..f7e42a4 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -61,6 +61,7 @@ typedef struct WCEL_Context { WCHAR* yanked; /* yanked line */ unsigned mark; /* marked point (emacs mode only) */ CONSOLE_SCREEN_BUFFER_INFO csbi; /* current state (initial cursor, window size, attribute) */ + CONSOLE_CURSOR_INFO cinfo; /* original cursor state (size, visibility) */ HANDLE hConIn; HANDLE hConOut; unsigned done : 1, /* to 1 when we're done with editing */ @@ -485,6 +486,8 @@ static void WCEL_Done(WCEL_Context* ctx) ctx->line[ctx->len++] = '\n'; ctx->line[ctx->len] = 0; WriteConsoleW(ctx->hConOut, &nl, 1, NULL, NULL); + if (ctx->insertkey) + SetConsoleCursorInfo(ctx->hConOut, &ctx->cinfo); ctx->done = 1; } @@ -930,6 +933,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0; ctx.can_wrap = (mode & ENABLE_WRAP_AT_EOL_OUTPUT) ? 1 : 0; ctx.can_pos_cursor = can_pos_cursor; + GetConsoleCursorInfo(ctx.hConOut, &ctx.cinfo); if (!WCEL_Grow(&ctx, 1)) {

1 0

Hans Leidekker : advapi32: Add a stub implementation of RegisterWaitChainCOMCallback.
by Alexandre Julliard Aug. 3, 2015

Aug. 3, 2015

Module: wine Branch: master Commit: 09de5cdb38bf41f4530dfd9c8e42ce7c76de3075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09de5cdb38bf41f4530dfd9c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 3 11:26:33 2015 +0200 advapi32: Add a stub implementation of RegisterWaitChainCOMCallback. --- dlls/advapi32/advapi.c | 10 ++++++++++ dlls/advapi32/advapi32.spec | 2 +- include/Makefile.in | 1 + include/wct.h | 27 +++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 646be59..748a5df 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -30,6 +30,7 @@ #include "winternl.h" #include "winerror.h" #include "wincred.h" +#include "wct.h" #include "wine/library.h" #include "wine/unicode.h" @@ -321,3 +322,12 @@ DWORD WINAPI CommandLineFromMsiDescriptor( WCHAR *szDescriptor, FreeLibrary( hmsi ); return r; } + +/*********************************************************************** + * RegisterWaitChainCOMCallback (ole32.@) + */ +void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE call_state_cb, + PCOGETACTIVATIONSTATE activation_state_cb) +{ + FIXME("%p, %p\n", call_state_cb, activation_state_cb); +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ec27440..8b1c0d5 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -609,7 +609,7 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) @ stdcall RegGetValueA(long str str long ptr ptr ptr) @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) -# @ stub RegisterWaitChainCOMCallback +@ stdcall RegisterWaitChainCOMCallback(ptr ptr) # @ stub RegLoadAppKeyA # @ stub RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) diff --git a/include/Makefile.in b/include/Makefile.in index f829712..2431895 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -599,6 +599,7 @@ SRCDIR_INCLUDES = \ vsstyle.h \ vssym32.h \ vswriter.h \ + wct.h \ webservices.h \ werapi.h \ wfext.h \ diff --git a/include/wct.h b/include/wct.h new file mode 100644 index 0000000..0cef59d --- /dev/null +++ b/include/wct.h @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Hans Leidekker 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 + */ + +#ifndef __WINE_WCT_H +#define __WINE_WCT_H + +typedef HRESULT (WINAPI *PCOGETCALLSTATE)(int,PULONG); +typedef HRESULT (WINAPI *PCOGETACTIVATIONSTATE)(GUID,DWORD,DWORD*); + +void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE,PCOGETACTIVATIONSTATE); + +#endif /* __WINE_WCT_H */

1 0

Austin English : winedump: Avoid LPVOID when creating stub dll.
by Alexandre Julliard Aug. 3, 2015

Aug. 3, 2015

Module: wine Branch: master Commit: 62c776a7dd98d72f4018337b1c24edddf8c488dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c776a7dd98d72f4018337b1… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 31 12:15:54 2015 -0500 winedump: Avoid LPVOID when creating stub dll. --- tools/winedump/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index aff7f66..6c2bfae 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -237,8 +237,8 @@ void output_c_preamble (void) } fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID " - "reserved)\n{\n" + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void " + "*reserved)\n{\n" " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" " switch (reason)\n" " {\n"

1 0