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

Zebediah Figura : msacm32: Add invalid parameter checks for acmFormatChoose().
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 84e61e6a07b4dd93a04d74a88cff3b8f5da835a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e61e6a07b4dd93a04d74a88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 22 18:02:40 2017 -0500 msacm32: Add invalid parameter checks for acmFormatChoose(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 9 +++++++++ dlls/msacm32/tests/msacm.c | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 19a5ceb..24d6ea5 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -288,6 +288,9 @@ MMRESULT WINAPI acmFormatChooseA(PACMFORMATCHOOSEA pafmtc) LPWSTR templ = NULL; DWORD sz; + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEA)) + return MMSYSERR_INVALPARAM; + afcw.cbStruct = sizeof(afcw); afcw.fdwStyle = pafmtc->fdwStyle; afcw.hwndOwner = pafmtc->hwndOwner; @@ -359,6 +362,12 @@ done: */ MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) { + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEW)) + return MMSYSERR_INVALPARAM; + + if (!pafmtc->pwfx) + return MMSYSERR_INVALPARAM; + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index a485f9a..337e20c 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1249,6 +1249,31 @@ static void test_acmFormatTagDetails(void) ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); } +static void test_acmFormatChoose(void) +{ + ACMFORMATCHOOSEW afc = {0}; + WAVEFORMATEX *pwfx; + DWORD sizeMax; + MMRESULT rc; + + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &sizeMax); + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeMax); + + afc.cbStruct = sizeof(afc); + afc.pwfx = pwfx; + + /* test invalid struct size */ + afc.cbStruct = sizeof(afc)-1; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.cbStruct = sizeof(afc); + + afc.pwfx = NULL; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.pwfx = pwfx; +} + static struct { struct @@ -1418,6 +1443,7 @@ START_TEST(msacm) test_convert(); test_acmFormatSuggest(); test_acmFormatTagDetails(); + test_acmFormatChoose(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd();

1 0

Nikolay Sivov : d3drm: Added IDirect3DRMAnimation stub.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 7fd7f6557ee1d3def8ffc033ee91008fc6f6f302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd7f6557ee1d3def8ffc033e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 23 16:15:00 2017 +0300 d3drm: Added IDirect3DRMAnimation stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 48 ++++- dlls/d3drm/d3drm_private.h | 11 ++ dlls/d3drm/frame.c | 460 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/d3drm.c | 102 ++++++---- 4 files changed, 583 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fd7f6557ee1d3def8ffc…

1 0

Pierre Schweitzer : mpr: Don' t stop enumeration on the first failing network provider.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 8d461c1f42b0b667b2aa6a235d007eea1dd6f561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d461c1f42b0b667b2aa6a235… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Jun 23 18:58:13 2017 +0200 mpr: Don't stop enumeration on the first failing network provider. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index abade95..bfe6275 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1345,15 +1345,13 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, ++curr; } - if (*user_count != -1) - count = *user_count - total_count; - else - count = *user_count; size = left; } - if (ret != WN_SUCCESS || total_count == 0) - break; + if (*user_count != -1) + count = *user_count - total_count; + else + count = *user_count; } }

1 0

Hugh McMaster : regedit/tests: Add tests to determine the effects of backslashes in hex data.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: a76ce84fce737ef80ed66800ff5078252f41be92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76ce84fce737ef80ed66800f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 23 11:16:58 2017 +0000 regedit/tests: Add tests to determine the effects of backslashes in hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c70cccc..0cb2959 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -480,6 +480,12 @@ static void test_basic_import(void) "\"Wine15\"=hex(2):25,50,41,54,48,25,00,\n\n"); verify_reg(hkey, "Wine15", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine16\"=hex(2):\\\n" + " 25,48,4f,4d,45,25,00\n\n"); + verify_reg(hkey, "Wine16", REG_EXPAND_SZ, "%HOME%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -823,6 +829,35 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine22a"); verify_reg_nonexist(hkey, "Wine22b"); + /* Test the effect of backslashes in hex data */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine23a\"=hex(2):25,48\\,4f,4d,45,25,00\n" + "\"Wine23b\"=hex(2):25,48,\\4f,4d,45,25,00\n" + "\"Wine23c\"=hex(2):25,48\\ ,4f,4d,45,25,00\n" + "\"Wine23d\"=hex(2):25,48,\\ 4f,4d,45,25,00\n" + "\"Wine23e\"=hex(2):\\25,48,4f,4d,45,25,00\n" + "\"Wine23f\"=hex(2):\\ 25,48,4f,4d,45,25,00\n" + "\"Wine23g\"=hex(2):25,48,4\\f,4d,45,25,00\n" + "\"Wine23h\"=hex(2):25,48,4\\\n" + " f,4d,45,25,00\n" + "\"Wine23i\"=hex(2):25,50,\\,41,54,48,25,00\n" + "\"Wine23j\"=hex(2):25,48,4f,4d,45,25,5c,\\\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine23k\"=hex(2):,\\\n" + " 25,48,4f,4d,45,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine23a"); + verify_reg_nonexist(hkey, "Wine23b"); + verify_reg_nonexist(hkey, "Wine23c"); + verify_reg_nonexist(hkey, "Wine23d"); + verify_reg_nonexist(hkey, "Wine23e"); + verify_reg_nonexist(hkey, "Wine23f"); + verify_reg_nonexist(hkey, "Wine23g"); + todo_wine verify_reg_nonexist(hkey, "Wine23h"); + verify_reg_nonexist(hkey, "Wine23i"); + verify_reg_nonexist(hkey, "Wine23j"); + verify_reg_nonexist(hkey, "Wine23k"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Add tests to determine the effects of backslashes in hex data.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: fdb452f8de28af019a6a8920108c028abea9093b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb452f8de28af019a6a89201… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 23 11:16:47 2017 +0000 reg/tests: Add tests to determine the effects of backslashes in hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1556ad2..ba36d54 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1798,6 +1798,39 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine51a"); todo_wine verify_reg_nonexist(hkey, "Wine51b"); + /* Test the effect of backslashes in hex data */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine52a\"=hex(2):25,48\\,4f,4d,45,25,00\n" + "\"Wine52b\"=hex(2):25,48,\\4f,4d,45,25,00\n" + "\"Wine52c\"=hex(2):25,48\\ ,4f,4d,45,25,00\n" + "\"Wine52d\"=hex(2):25,48,\\ 4f,4d,45,25,00\n" + "\"Wine52e\"=hex(2):\\25,48,4f,4d,45,25,00\n" + "\"Wine52f\"=hex(2):\\ 25,48,4f,4d,45,25,00\n" + "\"Wine52g\"=hex(2):25,48,4\\f,4d,45,25,00\n" + "\"Wine52h\"=hex(2):25,48,4\\\n" + " f,4d,45,25,00\n" + "\"Wine52i\"=hex(2):25,50,\\,41,54,48,25,00\n" + "\"Wine52j\"=hex(2):25,48,4f,4d,45,25,5c,\\\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine52k\"=hex(2):,\\\n" + " 25,48,4f,4d,45,25,00\n" + "\"Wine52l\"=hex(2):\\\n" + " 25,48,4f,4d,45,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine52a"); + todo_wine verify_reg_nonexist(hkey, "Wine52b"); + todo_wine verify_reg_nonexist(hkey, "Wine52c"); + todo_wine verify_reg_nonexist(hkey, "Wine52d"); + todo_wine verify_reg_nonexist(hkey, "Wine52e"); + todo_wine verify_reg_nonexist(hkey, "Wine52f"); + todo_wine verify_reg_nonexist(hkey, "Wine52g"); + todo_wine verify_reg_nonexist(hkey, "Wine52h"); + todo_wine verify_reg_nonexist(hkey, "Wine52i"); + todo_wine verify_reg_nonexist(hkey, "Wine52j"); + todo_wine verify_reg_nonexist(hkey, "Wine52k"); + todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2766,6 +2799,39 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine51a"); todo_wine verify_reg_nonexist(hkey, "Wine51b"); + /* Test the effect of backslashes in hex data */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine52a\"=hex(2):25,00,48\\,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52b\"=hex(2):25,00,48,00,\\4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52c\"=hex(2):25,00,48\\ ,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52d\"=hex(2):25,00,48,00,\\ 4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52e\"=hex(2):\\25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52f\"=hex(2):\\ 25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52g\"=hex(2):25,00,48,00,4\\f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52h\"=hex(2):25,00,48,00,4\\\n" + " f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52i\"=hex(2):25,00,50,00,\\,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine52j\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine52k\"=hex(2):,\\\n" + " 25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52l\"=hex(2):\\\n" + " 25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine52a"); + todo_wine verify_reg_nonexist(hkey, "Wine52b"); + todo_wine verify_reg_nonexist(hkey, "Wine52c"); + todo_wine verify_reg_nonexist(hkey, "Wine52d"); + todo_wine verify_reg_nonexist(hkey, "Wine52e"); + todo_wine verify_reg_nonexist(hkey, "Wine52f"); + todo_wine verify_reg_nonexist(hkey, "Wine52g"); + todo_wine verify_reg_nonexist(hkey, "Wine52h"); + todo_wine verify_reg_nonexist(hkey, "Wine52i"); + todo_wine verify_reg_nonexist(hkey, "Wine52j"); + todo_wine verify_reg_nonexist(hkey, "Wine52k"); + todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Daniel Lehman : opengl32/tests: Add tests for ChoosePixelFormat.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 53ac519915e80b8d07cbb509e9741cd1695a7bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ac519915e80b8d07cbb509e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 21 16:00:04 2017 -0700 opengl32/tests: Add tests for ChoosePixelFormat. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 0593465..3366cb2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -232,6 +232,101 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } +static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) +{ + int pf; + HDC hdc; + HWND hwnd; + + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); + if (!hwnd) + return 0; + + hdc = GetDC( hwnd ); + pf = ChoosePixelFormat( hdc, pfd ); + ReleaseDC( hwnd, hdc ); + DestroyWindow( hwnd ); + + return pf; +} + +static void test_choosepixelformat(void) +{ + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_TYPE_RGBA, + 0, /* color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 0, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + todo_wine ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + + pfd.cColorBits = 32; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cColorBits = 0; + + pfd.cAlphaBits = 8; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cAlphaBits = 0; + + pfd.cStencilBits = 8; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cStencilBits = 0; + + pfd.cAuxBuffers = 1; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cAuxBuffers = 0; +} + static void test_setpixelformat(HDC winhdc) { int res = 0; @@ -1689,6 +1784,7 @@ START_TEST(opengl) return; } + test_choosepixelformat(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc);

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderAccelerator in IWMReader.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 94af0276c142b6d9afe2fa37afd78eda00551b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94af0276c142b6d9afe2fa37a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 23 04:12:11 2017 +0000 wmvcore: Support IWMReaderAccelerator 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 | 2 +- dlls/wmvcore/wmvcore_main.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index a190013..4d3a6d7 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -121,7 +121,7 @@ static void test_wmreader_interfaces(void) todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); - 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_IWMReaderTimecode, (void **)&timecode); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index eb5e9e9..4023152 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -66,6 +66,7 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) typedef struct { IWMReader IWMReader_iface; IWMReaderAdvanced6 IWMReaderAdvanced6_iface; + IWMReaderAccelerator IWMReaderAccelerator_iface; LONG ref; } WMReader; @@ -102,6 +103,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { + TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); + *ppv = &This->IWMReaderAccelerator_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -656,6 +660,55 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { WMReaderAdvanced6_SetProtextStreamSamples }; +static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface); +} + +static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, object); +} + +static ULONG WINAPI reader_accl_AddRef(IWMReaderAccelerator *iface) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + + FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + + FIXME("%p, %d, %p\n", This, output, subtype); + + return E_NOTIMPL; +} + +static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = { + reader_accl_QueryInterface, + reader_accl_AddRef, + reader_accl_Release, + reader_accl_GetCodecInterface, + reader_accl_Notify +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -668,6 +721,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; + reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Alexandre Julliard : wineandroid: Implement wglCreateContextAttribsARB.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: a3eda7257cc2812d7e3f6f4b0188d5d084d6b767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3eda7257cc2812d7e3f6f4b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 09:18:55 2017 +0200 wineandroid: Implement wglCreateContextAttribsARB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 910652b..e55b253 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -290,6 +290,47 @@ static const char *android_wglGetExtensionsStringEXT(void) } /*********************************************************************** + * android_wglCreateContextAttribsARB + */ +static struct wgl_context *android_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *share, + const int *attribs ) +{ + int count = 0, egl_attribs[3]; + BOOL opengl_es = FALSE; + + while (attribs && *attribs && count < 2) + { + switch (*attribs) + { + case WGL_CONTEXT_PROFILE_MASK_ARB: + if (attribs[1] == WGL_CONTEXT_ES2_PROFILE_BIT_EXT) + opengl_es = TRUE; + break; + case WGL_CONTEXT_MAJOR_VERSION_ARB: + egl_attribs[count++] = EGL_CONTEXT_CLIENT_VERSION; + egl_attribs[count++] = attribs[1]; + break; + default: + FIXME("Unhandled attributes: %#x %#x\n", attribs[0], attribs[1]); + } + attribs += 2; + } + if (!opengl_es) + { + WARN("Requested creation of an OpenGL (non ES) context, that's not supported.\n"); + return NULL; + } + if (!count) /* FIXME: force version if not specified */ + { + egl_attribs[count++] = EGL_CONTEXT_CLIENT_VERSION; + egl_attribs[count++] = egl_client_version; + } + egl_attribs[count] = EGL_NONE; + + return create_context( hdc, share, egl_attribs ); +} + +/*********************************************************************** * android_wglSetPixelFormatWINE */ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) @@ -508,6 +549,10 @@ static void init_extensions(void) { void *ptr; + register_extension("WGL_ARB_create_context"); + register_extension("WGL_ARB_create_context_profile"); + egl_funcs.ext.p_wglCreateContextAttribsARB = android_wglCreateContextAttribsARB; + register_extension("WGL_ARB_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringARB = android_wglGetExtensionsStringARB;

1 0

Pierre Schweitzer : mpr: Properly handle the count set to -1 when enumerating connections.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 51b4a42969366cc409808aded23d3602a34206e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b4a42969366cc409808aded… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Jun 23 13:53:43 2017 +0200 mpr: Properly handle the count set to -1 when enumerating connections. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index cbbc1bd..abade95 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1266,7 +1266,7 @@ static DWORD _copyStringToEnumW(const WCHAR *source, DWORD* left, void** end) static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, void* user_buffer, DWORD* user_size) { - DWORD ret, index, count, size, i, left; + DWORD ret, index, count, total_count, size, i, left; void* end; NETRESOURCEW* curr, * buffer; HANDLE* handles; @@ -1290,6 +1290,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, curr = user_buffer; end = (char *)user_buffer + size; count = *user_count; + total_count = 0; ret = WN_NO_MORE_ENTRIES; for (index = 0; index < providerTable->numProviders; index++) @@ -1309,6 +1310,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, ret = providerTable->table[index].enumResource(handles[index], &count, buffer, &size); + total_count += count; if (ret == WN_MORE_DATA) break; @@ -1343,19 +1345,22 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, ++curr; } - count = *user_count - count; + if (*user_count != -1) + count = *user_count - total_count; + else + count = *user_count; size = left; } - if (ret != WN_SUCCESS || count == 0) + if (ret != WN_SUCCESS || total_count == 0) break; } } - if (count == 0) + if (total_count == 0) ret = WN_NO_MORE_ENTRIES; - *user_count = *user_count - count; + *user_count = total_count; if (ret != WN_MORE_DATA && ret != WN_NO_MORE_ENTRIES) ret = WN_SUCCESS;

1 0

Hugh McMaster : reg/tests: Add the final comma to the comma-placement test.
by Alexandre Julliard June 23, 2017

June 23, 2017

Module: wine Branch: master Commit: 86400f7236843b1fa3853fa4e252db4d6ddbb014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86400f7236843b1fa3853fa4e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 23 11:16:37 2017 +0000 reg/tests: Add the final comma to the comma-placement test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c821bec..1556ad2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2741,7 +2741,7 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine49\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n\n", &r); + "\"Wine49\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00,\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine49", REG_EXPAND_SZ, "%PATH%", 7, 0);

1 0