July 2016 - Wine-commits - list.winehq.org

Francois Gouget : mshtml: Nswindow_to_window() is not used anymore, remove it.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 3998a7aa54e028bbab8b0961597370b793f0ad8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998a7aa54e028bbab8b09615… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:59:50 2016 +0200 mshtml: Nswindow_to_window() is not used anymore, remove it. It has been superseded by mozwindow_to_window(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 12 ------------ dlls/mshtml/mshtml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d9f1346..bd15cb3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3171,18 +3171,6 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return hres; } -HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow *nswindow) -{ - HTMLOuterWindow *iter; - - LIST_FOR_EACH_ENTRY(iter, &window_list, HTMLOuterWindow, entry) { - if(iter->nswindow == nswindow) - return iter; - } - - return NULL; -} - HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) { HTMLOuterWindow *iter; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a25315c..7401634 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -807,7 +807,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWind HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN; -HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN;

1 0

Francois Gouget : mshtml: Fix a typo in a TRACE() message.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: c242e00b8cd31758ce1e550de0baaf346f9e8e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c242e00b8cd31758ce1e550de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 12:00:09 2016 +0200 mshtml: Fix a typo in a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 352b757..c341820 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -827,7 +827,7 @@ static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) nsAString_GetData(&nsstr, &str); if(!*str) { - TRACE("Gecko returned emptry string, fallback to loaded URL.\n"); + TRACE("Gecko returned empty string, fallback to loaded URL.\n"); nsAString_Finish(&nsstr); hres = IUri_GetHost(This->window->uri, p); return FAILED(hres) ? hres : S_OK;

1 0

Detlef Riekenberg : dsound: Mark a multiplication factor as float.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 443130c4cf198a4b63d5f9a15b83059cb3ec5bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=443130c4cf198a4b63d5f9a15… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 3 22:33:21 2016 +0200 dsound: Mark a multiplication factor as float. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index d9ed637..0c9a34b 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -224,7 +224,7 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c break; case 0: /* front left */ - value *= 0.503; /* 1 / (sum of left volumes) */ + value *= 0.503f; /* 1 / (sum of left volumes) */ dsb->put_aux(dsb, pos, 0, value); break;

1 0

Francois Gouget : mmdevapi/tests: Fix typos in a few ok() messages.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 847868fc873387e0f873836086426d5d2fdc6ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847868fc873387e0f87383608… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:20 2016 +0200 mmdevapi/tests: Fix typos in a few ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 2bb1e5a..e68c38d 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -414,7 +414,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) sum += frames; } else if(hr == AUDCLNT_S_BUFFER_EMPTY){ - ok(!pad, "resetted GCP %u\n", pad); + ok(!pad, "reset GCP %u\n", pad); Sleep(180); } @@ -590,7 +590,7 @@ static void test_audioclient(void) ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 5497681..9393f7b 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -361,7 +361,7 @@ static void test_audioclient(void) ok(hr == S_OK, "Reset on an initialized stream returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); @@ -1090,7 +1090,7 @@ static void test_clock(int share) slept = sum = 0; hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); @@ -1164,7 +1164,7 @@ static void test_clock(int share) ok(QueryPerformanceCounter(&hpctime0), "PerfCounter unavailable\n"); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr);

1 0

Aaryaman Vasishta : d3drm: Fix device not assigning width and height after creation.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 9729d15a1a8de61030b68436a1c2239290af90f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9729d15a1a8de61030b68436a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jun 30 17:41:54 2016 +0530 d3drm: Fix device not assigning width and height after creation. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 31 ++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 54 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 75 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9729d15a1a8de61030b68…

1 0

Nikolay Sivov : dwrite: Implement HasVerticalGlyphVariants().
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: e30607fdb085d62125c716bd7678085f38b45aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30607fdb085d62125c716bd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:54 2016 +0300 dwrite: Implement HasVerticalGlyphVariants(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 38 +++++--- dlls/dwrite/opentype.c | 116 +++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 203 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 346 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e30607fdb085d62125c71…

1 0

Nikolay Sivov : dwrite: Implement another CreateFontFace() variant.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: bf211623fd39b8d15b97611637a53d61487b05e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf211623fd39b8d15b9761163… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:55 2016 +0300 dwrite: Implement another CreateFontFace() variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 24 ++++++++++++------------ dlls/dwrite/tests/font.c | 9 +++++---- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d635c15..d477ac0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1496,18 +1496,11 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont3 *iface, UINT32 value, return S_OK; } -static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **face) +static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - HRESULT hr; - - TRACE("(%p)->(%p)\n", This, face); - - hr = get_fontface_from_font(This, (IDWriteFontFace3**)face); - if (hr == S_OK) - IDWriteFontFace_AddRef(*face); - - return hr; + TRACE("(%p)->(%p)\n", This, fontface); + return IDWriteFont3_CreateFontFace(iface, (IDWriteFontFace3**)fontface); } static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -1572,8 +1565,15 @@ static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont3 *iface) static HRESULT WINAPI dwritefont3_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace3 **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(%p): stub\n", This, fontface); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, fontface); + + hr = get_fontface_from_font(This, fontface); + if (hr == S_OK) + IDWriteFontFace3_AddRef(*fontface); + + return hr; } static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4fe494a..a1ef3d4 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6177,17 +6177,19 @@ todo_wine /* references returned from IDWriteFontFace3 */ hr = IDWriteFont3_CreateFontFace(font3, &fontface); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) ok(ref == ref1, "got %p, %p\n", ref1, ref); +if (hr == S_OK) { hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); @@ -6195,9 +6197,8 @@ if (hr == S_OK) { IDWriteFontFaceReference_Release(ref); IDWriteFontFaceReference_Release(ref1); - - IDWriteFontFace3_Release(fontface); } + IDWriteFontFace3_Release(fontface); IDWriteFont3_Release(font3); IDWriteFactory3_Release(factory3);

1 0

Nikolay Sivov : dwrite: Fix recently added script properties.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: cedd95e2a8ed449222521fbf8b87f22b2a7a3375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedd95e2a8ed449222521fbf8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:56 2016 +0300 dwrite: Fix recently added script properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 62 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5e53a54..81052f9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -45,7 +45,7 @@ struct dwritescript_properties { static const struct dwritescript_properties dwritescripts_properties[Script_LastId+1] = { { /* Zzzz */ { 0x7a7a7a5a, 999, 15, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, { /* Zyyy */ { 0x7979795a, 998, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Zinh */ { 0x686e695a, 994, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Zinh */ { 0x686e695a, 994, 15, 0x0020, 1, 0, 0, 0, 0, 0, 0 } }, { /* Arab */ { 0x62617241, 160, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 }, _OT('a','r','a','b'), 0, TRUE }, { /* Armn */ { 0x6e6d7241, 230, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','r','m','n') }, { /* Avst */ { 0x74737641, 134, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','v','s','t') }, @@ -139,36 +139,36 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Ugar */ { 0x72616755, 40, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('u','g','a','r') }, { /* Vaii */ { 0x69696156, 470, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('v','a','i',' '), 0, TRUE }, { /* Yiii */ { 0x69696959, 460, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('y','i',' ',' '), 0, TRUE }, - { /* Cakm */ { 0x6d6b6143, 349, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('c','a','k','m') }, - { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('m','e','r','c') }, - { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('m','e','r','o') }, - { /* Plrd */ { 0x64726c50, 282, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Shrd */ { 0x64726853, 319, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('s','h','r','d') }, - { /* Sora */ { 0x61726f53, 398, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('s','o','r','a') }, - { /* Takr */ { 0x726b6154, 321, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('t','a','k','r') }, - { /* Bass */ { 0x73736142, 259, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Aghb */ { 0x62686741, 239, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Dupl */ { 0x6c707544, 755, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Elba */ { 0x61626c45, 226, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Gran */ { 0x6e617247, 343, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Khoj */ { 0x6a6f684b, 322, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Sind */ { 0x646e6953, 318, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mahj */ { 0x6a68614d, 314, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mani */ { 0x696e614d, 139, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Modi */ { 0x69646f4d, 324, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mroo */ { 0x6f6f724d, 199, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Nbat */ { 0x7461624e, 159, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Perm */ { 0x6d726550, 227, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Hmng */ { 0x676e6d48, 450, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Palm */ { 0x6d6c6150, 126, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Pauc */ { 0x63756150, 263, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Phlp */ { 0x706c6850, 132, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Sidd */ { 0x64646953, 302, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Tirh */ { 0x68726954, 326, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Wara */ { 0x61726157, 262, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, + { /* Cakm */ { 0x6d6b6143, 349, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('c','a','k','m') }, + { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','e','r','c') }, + { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 1, 1, 1, 0, 0, 0 }, _OT('m','e','r','o') }, + { /* Plrd */ { 0x64726c50, 282, 8, 0x0020, 1, 0, 1, 0, 0, 0, 0 } }, + { /* Shrd */ { 0x64726853, 319, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','h','r','d') }, + { /* Sora */ { 0x61726f53, 398, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','o','r','a') }, + { /* Takr */ { 0x726b6154, 321, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('t','a','k','r') }, + { /* Bass */ { 0x73736142, 259, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Aghb */ { 0x62686741, 239, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Dupl */ { 0x6c707544, 755, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Elba */ { 0x61626c45, 226, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Gran */ { 0x6e617247, 343, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Khoj */ { 0x6a6f684b, 322, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Sind */ { 0x646e6953, 318, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 } }, + { /* Mahj */ { 0x6a68614d, 314, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Mani */ { 0x696e614d, 139, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Modi */ { 0x69646f4d, 324, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Mroo */ { 0x6f6f724d, 199, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Nbat */ { 0x7461624e, 159, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Perm */ { 0x6d726550, 227, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Hmng */ { 0x676e6d48, 450, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Palm */ { 0x6d6c6150, 126, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Pauc */ { 0x63756150, 263, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Phlp */ { 0x706c6850, 132, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Sidd */ { 0x64646953, 302, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 } }, + { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Wara */ { 0x61726157, 262, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, }; #undef _OT

1 0

Hugh McMaster : reg: Free szValue after deleting all registry values ( Coverity).
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 2885170057aa2a1f5b65aa2d04497c3b1570f985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885170057aa2a1f5b65aa2d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 28 11:35:01 2016 +0000 reg: Free szValue after deleting all registry values (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 38861f8..0d6bec4 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -481,6 +481,7 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else break; } + HeapFree(GetProcessHeap(), 0, szValue); } else if (value_name || value_empty) {

1 0

Thomas Faber : netapi32: Avoid buffer overrun in NetBTNameEncode.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: f53b2588afcba6b435622bbf542be5fe80672d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53b2588afcba6b435622bbf5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 11:02:37 2016 +0200 netapi32: Avoid buffer overrun in NetBTNameEncode. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/nbt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 0f593d5..207bd66 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -171,7 +171,7 @@ static int NetBTNameEncode(const UCHAR *p, UCHAR *buffer) if (!buffer) return 0; buffer[len++] = NCBNAMSZ * 2; - for (i = 0; p[i] && i < NCBNAMSZ; i++) + for (i = 0; i < NCBNAMSZ && p[i]; i++) { buffer[len++] = ((p[i] & 0xf0) >> 4) + 'A'; buffer[len++] = (p[i] & 0x0f) + 'A';

1 0