July 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Reduce the cursor height if it also includes the mask.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: d0e8170c90ef63363f8389be2619c9332ae2c371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e8170c90ef63363f8389be2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 13:12:50 2017 +0200 user32: Reduce the cursor height if it also includes the mask. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f408c22..1fbec2a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -633,6 +633,7 @@ static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, DWORD size, int n, *width = cursor->wWidth; *height = cursor->wHeight; *bits = resdir->idEntries[n].wBitCount; + if (*height == *width * 2) *height /= 2; return TRUE; }

1 0

Alexandre Julliard : krnl386: Simplify a couple of register functions.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 92d5ce3c76f0ae9cb070b39626c3e2f4bcd53243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d5ce3c76f0ae9cb070b3962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 11:15:14 2017 +0200 krnl386: Simplify a couple of register functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/krnl386.exe16/krnl386.exe16.spec | 6 +++--- dlls/krnl386.exe16/thunk.c | 18 +++--------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index dedbb93..15cb998 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -49,12 +49,12 @@ 39 stdcall -noname -i386 -private -register FreeMappedBuffer() krnl386.exe16.FreeMappedBuffer 40 stdcall -noname -i386 -private -register OT_32ThkLSF() krnl386.exe16.OT_32ThkLSF 41 stdcall -noname -i386 -private ThunkInitLSF(long str long str str) krnl386.exe16.ThunkInitLSF - 42 stdcall -noname -i386 -private -register LogApiThkLSF(str) krnl386.exe16.LogApiThkLSF + 42 stdcall -noname -i386 -private -norelay LogApiThkLSF(str) krnl386.exe16.LogApiThkLSF 43 stdcall -noname -i386 -private ThunkInitLS(long str long str str) krnl386.exe16.ThunkInitLS - 44 stdcall -noname -i386 -private -register LogApiThkSL(str) krnl386.exe16.LogApiThkSL + 44 stdcall -noname -i386 -private -norelay LogApiThkSL(str) krnl386.exe16.LogApiThkSL 45 stdcall -noname -i386 -private -register Common32ThkLS() krnl386.exe16.Common32ThkLS 46 stdcall -noname -i386 -private ThunkInitSL(long str long str str) krnl386.exe16.ThunkInitSL - 47 stdcall -noname -i386 -private -register LogCBThkSL(str) krnl386.exe16.LogCBThkSL + 47 stdcall -noname -i386 -private -norelay LogCBThkSL(str) krnl386.exe16.LogCBThkSL 48 stdcall -noname -i386 -private ReleaseThunkLock(ptr) krnl386.exe16.ReleaseThunkLock 49 stdcall -noname -i386 -private RestoreThunkLock(long) krnl386.exe16.RestoreThunkLock diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 8d40f0f..66d33dd 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -588,12 +588,12 @@ @ stdcall -arch=win32 -register FreeMappedBuffer() @ stdcall -arch=win32 -register OT_32ThkLSF() @ stdcall -arch=win32 ThunkInitLSF(ptr str long str str) -@ stdcall -arch=win32 -register LogApiThkLSF(str) +@ stdcall -arch=win32 -norelay LogApiThkLSF(str) @ stdcall -arch=win32 ThunkInitLS(ptr str long str str) -@ stdcall -arch=win32 -register LogApiThkSL(str) +@ stdcall -arch=win32 -norelay LogApiThkSL(str) @ stdcall -arch=win32 -register Common32ThkLS() @ stdcall -arch=win32 ThunkInitSL(ptr str long str str) -@ stdcall -arch=win32 -register LogCBThkSL(str) +@ stdcall -arch=win32 -norelay LogCBThkSL(str) @ stdcall -arch=win32 ReleaseThunkLock(ptr) @ stdcall -arch=win32 RestoreThunkLock(long) @ stdcall -arch=win32 -register W32S_BackTo32() diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 9e12d27..8940605 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -187,33 +187,21 @@ void WINAPI LogApiThk( LPSTR func ) * * NOTE: needs to preserve all registers! */ -void WINAPI __regs_LogApiThkLSF( LPSTR func, CONTEXT *context ) -{ - TRACE( "%s\n", debugstr_a(func) ); -} -DEFINE_REGS_ENTRYPOINT( LogApiThkLSF, 1 ) +__ASM_STDCALL_FUNC( LogApiThkLSF, 4, "ret $4" ) /*********************************************************************** * LogApiThkSL (KERNEL32.44) * * NOTE: needs to preserve all registers! */ -void WINAPI __regs_LogApiThkSL( LPSTR func, CONTEXT *context ) -{ - TRACE( "%s\n", debugstr_a(func) ); -} -DEFINE_REGS_ENTRYPOINT( LogApiThkSL, 1 ) +__ASM_STDCALL_FUNC( LogApiThkSL, 4, "ret $4" ) /*********************************************************************** * LogCBThkSL (KERNEL32.47) * * NOTE: needs to preserve all registers! */ -void WINAPI __regs_LogCBThkSL( LPSTR func, CONTEXT *context ) -{ - TRACE( "%s\n", debugstr_a(func) ); -} -DEFINE_REGS_ENTRYPOINT( LogCBThkSL, 1 ) +__ASM_STDCALL_FUNC( LogCBThkSL, 4, "ret $4" ) /*********************************************************************** * Generates a FT_Prolog call.

1 0

Tim Worthington : user32: Fix rendering of tabs in edit control.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 4f96439ebfb007fdf121f0a6fd889bddff3c8c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f96439ebfb007fdf121f0a6f… Author: Tim Worthington <tim(a)pcbelegance.org> Date: Sat Jul 22 01:34:37 2017 +1000 user32: Fix rendering of tabs in edit control. Signed-off-by: Tim Worthington <tim(a)pcbelegance.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- dlls/usp10/usp10.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 78d78ea..00a7fba 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -411,7 +411,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD old_font = SelectObject(udc, es->font); tabdef.cTabStops = es->tabs_count; - tabdef.iScale = 0; + tabdef.iScale = GdiGetCharDimensions(udc, NULL, NULL); tabdef.pTabStops = es->tabs; tabdef.iTabOrigin = 0; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c1d9c1c..a6309ed 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1828,7 +1828,12 @@ static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int cTabStops = 0; } else - defWidth = 8 * psc->tm.tmAveCharWidth; + { + if (pTabdef->iScale) + defWidth = (32 * pTabdef->iScale) / 4; + else + defWidth = 8 * psc->tm.tmAveCharWidth; + } for (; cTabStops>0 ; lpTabPos++, cTabStops--) { @@ -1842,10 +1847,10 @@ static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int if( nTabOrg + position > current_x) { - if( *lpTabPos >= 0) + if( position >= 0) { /* a left aligned tab */ - x = (nTabOrg + *lpTabPos) - current_x; + x = (nTabOrg + position) - current_x; break; } else

1 0

Alex Henrie : msvcr120: Declare ret as a float in functions that return a float.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: eca2999113c3224d54f80644becde09d33dcba0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca2999113c3224d54f80644b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 24 00:40:33 2017 -0600 msvcr120: Declare ret as a float in functions that return a float. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b030a63..0249493 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2431,11 +2431,11 @@ double CDECL MSVCR120_expm1(double x) float CDECL MSVCR120_expm1f(float x) { #ifdef HAVE_EXPM1F - double ret = expm1f(x); + float ret = expm1f(x); #else - double ret = exp(x) - 1; + float ret = exp(x) - 1; #endif - if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + if (!finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; return ret; } @@ -3087,7 +3087,7 @@ double CDECL MSVCR120_atanh(double x) float CDECL MSVCR120_atanhf(float x) { #ifdef HAVE_ATANHF - double ret; + float ret; if (x > 1 || x < -1) { MSVCRT_fenv_t env; @@ -3102,7 +3102,7 @@ float CDECL MSVCR120_atanhf(float x) ret = atanhf(x); - if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + if (!finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; return ret; #else return MSVCR120_atanh(x);

1 0

Alexandre Julliard : user32: Always update the visible region for cross-process DCEs.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: e7f30014c307cf69f9c4e7c472ee38338e0b2638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f30014c307cf69f9c4e7c47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 17:04:35 2017 +0200 user32: Always update the visible region for cross-process DCEs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 2130473..6cc9a7e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1111,6 +1111,9 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) dce->hwnd = hwnd; dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); + /* cross-process invalidation is not supported yet, so always update the vis rgn */ + if (!WIN_IsCurrentProcess( hwnd )) bUpdateVisRgn = TRUE; + if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce );

1 0

Huw Davies : gdi32: Add a helper to fill rectangles with a given pixel.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 46e6ee48f3cd5a6eeec50db2a8c7db17025c606f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e6ee48f3cd5a6eeec50db2a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:03 2017 +0100 gdi32: Add a helper to fill rectangles with a given pixel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 770e89e..adf16c4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -257,6 +257,7 @@ extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; extern void release_cached_font( struct cached_font *font ) DECLSPEC_HIDDEN; +extern BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) DECLSPEC_HIDDEN; static inline void init_clipped_rects( struct clipped_rects *clip_rects ) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index cde20e3..8e55d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1754,6 +1754,20 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) } /********************************************************************** + * fill_with_pixel + * + * Fill a number of rectangles with a given pixel color and rop mode + */ +BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) +{ + rop_mask mask; + + calc_rop_masks( rop, pixel, &mask ); + dib->funcs->solid_rects( dib, num, rects, mask.and, mask.xor ); + return TRUE; +} + +/********************************************************************** * solid_brush * * Fill a number of rectangles with the solid brush @@ -1762,12 +1776,9 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { DC *dc = get_physdev_dc( &pdev->dev ); - rop_mask brush_color; DWORD color = get_pixel_color( dc, &pdev->dib, brush->colorref, TRUE ); - calc_rop_masks( rop, color, &brush_color ); - dib->funcs->solid_rects( dib, num, rects, brush_color.and, brush_color.xor ); - return TRUE; + return fill_with_pixel( dc, dib, color, num, rects, rop ); } static BOOL alloc_brush_mask_bits( dib_brush *brush )

1 0

Alexandre Julliard : ntdll: Add an assembly wrapper to return correct values for the current thread in NtGetContextThread.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 1c4990518269a570476b76c02d11c98808f61b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4990518269a570476b76c02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 10:33:53 2017 +0200 ntdll: Add an assembly wrapper to return correct values for the current thread in NtGetContextThread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_i386.c | 128 ++++++++++++++++++++++--------------------- dlls/ntdll/tests/exception.c | 91 ++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c4990518269a570476b7…

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMPacketSize2 interfaces in IWMReader.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 998fe046b59dd1e8c5458a739763c1c19bd89690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998fe046b59dd1e8c5458a739… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 23 00:52:05 2017 +0000 wmvcore: Support IWMPacketSize2 interfaces in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 4 +-- dlls/wmvcore/wmvcore_main.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index dc41eb3..b11a5bf 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -118,10 +118,10 @@ static void test_wmreader_interfaces(void) ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); ok(hr == S_OK, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5d536ae..be07909 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -76,6 +76,7 @@ typedef struct { IWMLanguageList IWMLanguageList_iface; IReferenceClock IReferenceClock_iface; IWMProfile3 IWMProfile3_iface; + IWMPacketSize2 IWMPacketSize2_iface; LONG ref; } WMReader; @@ -157,6 +158,12 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { TRACE("(%p)->(IWMProfile3 %p)\n", This, ppv); *ppv = &This->IWMProfile3_iface; + }else if(IsEqualGUID(riid, &IID_IWMPacketSize)) { + TRACE("(%p)->(IWMPacketSize %p)\n", This, ppv); + *ppv = &This->IWMPacketSize2_iface; + }else if(IsEqualGUID(riid, &IID_IWMPacketSize2)) { + TRACE("(%p)->(IWMPacketSize2 %p)\n", This, ppv); + *ppv = &This->IWMPacketSize2_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1999,6 +2006,68 @@ static const IWMProfile3Vtbl WMProfile3Vtbl = profile3_GetExpectedPacketCount }; +static inline WMReader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMPacketSize2_iface); +} + +static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %d\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %d\n", This, size); + return E_NOTIMPL; +} + +static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = +{ + packetsize_QueryInterface, + packetsize_AddRef, + packetsize_Release, + packetsize_GetMaxPacketSize, + packetsize_SetMaxPacketSize, + packetsize_GetMinPacketSize, + packetsize_SetMinPacketSize +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -2021,6 +2090,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; + reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Hugh McMaster : regedit: Free the value name buffer from the default value name parser state if necessary (Valgrind).
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: b501b2388da00c7a446e0c587061bc463f96ef29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b501b2388da00c7a446e0c587… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 24 12:47:48 2017 +0000 regedit: Free the value name buffer from the default value name parser state if necessary (Valgrind). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 394023b..7be4605 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -699,6 +699,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { + HeapFree(GetProcessHeap(), 0, parser->value_name); parser->value_name = NULL; set_state(parser, DATA_START);

1 0

Hugh McMaster : po: Fix a typo in the Norwegian translation.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 75e9f670fa3e989a90e9125ecfe3464ca05b1d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e9f670fa3e989a90e9125ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 24 12:47:39 2017 +0000 po: Fix a typo in the Norwegian translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2fa8d89..0ad494b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -12512,7 +12512,7 @@ msgstr "regedit: Registerverdien \"%1\" vil bli eksportert som binære data.\n" #: regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Ugyldig systemnøkkel [%1]\n" +msgstr "regedit: Ugyldig systemnøkkel [%1]\n" #: regedit.rc:428 msgid ""

1 0