June 2017 - wine-commits

Nikolay Sivov : d3drm/tests: Some tests for animation object QI behavior.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ae5ec5c597e1434233cd06ae12b3e995fda30a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5ec5c597e1434233cd06ae1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 26 02:16:13 2017 +0300 d3drm/tests: Some tests for animation object QI behavior. 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/tests/d3drm.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7020b5e..ff1aadd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6744,6 +6744,111 @@ static void test_animation(void) IDirect3DRM_Release(d3drm1); } +static void test_animation_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRMAnimation2, &IID_IUnknown, &IID_IDirect3DRMAnimation2, S_OK }, + { &IID_IDirect3DRMAnimation, &IID_IUnknown, &IID_IDirect3DRMAnimation, S_OK }, + { &IID_IDirect3DRM, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObject, &IID_IUnknown, &IID_IDirect3DRMAnimation, S_OK }, + { &IID_IDirect3DRMDevice2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisual, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMesh, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLight, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObjectArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDeviceArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewportArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrameArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisualArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLightArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPickedArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFaceArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMUserVisual, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMInterpolator, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPicked2Array, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMClippedVisual, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawClipper, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface4, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw4, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DLight, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IUnknown, &IID_IUnknown, NULL, S_OK }, + }; + IDirect3DRMAnimation2 *animation2; + IDirect3DRMAnimation *animation; + IDirect3DRM3 *d3drm3; + IDirect3DRM *d3drm1; + IUnknown *unknown; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr); + + hr = IDirect3DRM_CreateAnimation(d3drm1, &animation); + ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr); + IDirect3DRMAnimation_Release(animation); + + test_qi("animation_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr); + + hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2); + ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr); + + hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr); + IDirect3DRMAnimation2_Release(animation2); + + test_qi("animation2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm1); +} + static void test_wrap(void) { IDirect3DRMWrap *wrap; @@ -6885,6 +6990,7 @@ START_TEST(d3drm) test_viewport_clear2(); test_create_texture_from_surface(); test_animation(); + test_animation_qi(); test_wrap(); test_wrap_qi(); }

1 0

Nikolay Sivov : d3drm: Added IDirect3DRMWrap stub.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 56978219170bfaf037acffc93dfe6839365b2ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56978219170bfaf037acffc93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 26 02:16:12 2017 +0300 d3drm: Added IDirect3DRMWrap 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 | 54 +++++++++++-- dlls/d3drm/d3drm_private.h | 7 ++ dlls/d3drm/meshbuilder.c | 189 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/d3drm.c | 115 ++++++++++++++++++++++++++- 4 files changed, 355 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56978219170bfaf037acf…

1 0

Alexandre Julliard : libwine: Fall back to the WINELOADER path for the bin directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 4ee9bbc8891bbc866e0d6e012e09514433393df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee9bbc8891bbc866e0d6e012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 13:38:00 2017 +0200 libwine: Fall back to the WINELOADER path for the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index f85910b..13f016a 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -426,14 +426,15 @@ static int set_dlldir( char *libdir ) /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { - const char *basename; + const char *basename, *wineloader; if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; if (set_bindir( get_runtime_exedir() )) goto done; if (set_dlldir( get_runtime_libdir() )) goto done; - set_bindir( get_runtime_argvdir( argv0 )); + if (set_bindir( get_runtime_argvdir( argv0 ))) goto done; + if ((wineloader = getenv( "WINELOADER" ))) set_bindir( get_runtime_argvdir( wineloader )); done: if (build_dir)

1 0

Alexandre Julliard : libwine: Add a helper function to set the dll directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 56b14d637fdd213e0377526c2b98d2f36384332e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b14d637fdd213e0377526c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 13:37:25 2017 +0200 libwine: Add a helper function to set the dll directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 50 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 129a565..f85910b 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -330,6 +330,16 @@ static int is_valid_bindir( const char *bindir ) return ret; } +/* check if dlldir is valid by checking for ntdll */ +static int is_valid_dlldir( const char *dlldir ) +{ + struct stat st; + char *path = build_path( dlldir, "ntdll.dll.so" ); + int ret = (stat( path, &st ) != -1); + free( path ); + return ret; +} + /* check if basedir is a valid build dir by checking for wineserver and ntdll */ /* helper for running_from_build_dir */ static inline int is_valid_build_dir( char *basedir, int baselen ) @@ -381,6 +391,7 @@ static int set_bindir( char *dir ) if (is_valid_bindir( dir )) { bindir = dir; + dlldir = build_path( bindir, BIN_TO_DLLDIR ); } else { @@ -390,26 +401,39 @@ static int set_bindir( char *dir ) return bindir || build_dir; } +/* try to set the specified directory as dlldir, or set build_dir if it's inside the build directory */ +static int set_dlldir( char *libdir ) +{ + char *path; + + if (!libdir) return 0; + + path = build_path( libdir, LIB_TO_DLLDIR ); + if (is_valid_dlldir( path )) + { + dlldir = path; + bindir = build_path( libdir, LIB_TO_BINDIR ); + } + else + { + build_dir = running_from_build_dir( libdir ); + free( path ); + } + free( libdir ); + return dlldir || build_dir; +} + /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { const char *basename; - char *libdir = NULL; if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; if (set_bindir( get_runtime_exedir() )) goto done; - - libdir = get_runtime_libdir(); - if (libdir && !bindir && !build_dir) - { - build_dir = running_from_build_dir( libdir ); - if (!build_dir) bindir = build_path( libdir, LIB_TO_BINDIR ); - } - - if (!libdir && !bindir && !build_dir) - set_bindir( get_runtime_argvdir( argv0 )); + if (set_dlldir( get_runtime_libdir() )) goto done; + set_bindir( get_runtime_argvdir( argv0 )); done: if (build_dir) @@ -418,13 +442,9 @@ done: } else { - if (libdir) dlldir = build_path( libdir, LIB_TO_DLLDIR ); - else if (bindir) dlldir = build_path( bindir, BIN_TO_DLLDIR ); - if (bindir) datadir = build_path( bindir, BIN_TO_DATADIR ); argv0_name = xstrdup( basename ); } - free( libdir ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */

1 0

Alexandre Julliard : libwine: Add a helper function to set the bin directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 161f3fc417dd397072326c0720de065561531e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161f3fc417dd397072326c072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 13:32:38 2017 +0200 libwine: Add a helper function to set the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 3b5dd68..129a565 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -374,22 +374,32 @@ static char *running_from_build_dir( const char *basedir ) return path; } +/* try to set the specified directory as bindir, or set build_dir if it's inside the build directory */ +static int set_bindir( char *dir ) +{ + if (!dir) return 0; + if (is_valid_bindir( dir )) + { + bindir = dir; + } + else + { + build_dir = running_from_build_dir( dir ); + free( dir ); + } + return bindir || build_dir; +} + /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { const char *basename; - char *libdir; + char *libdir = NULL; if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; - bindir = get_runtime_exedir(); - if (bindir && !is_valid_bindir( bindir )) - { - build_dir = running_from_build_dir( bindir ); - free( bindir ); - bindir = NULL; - } + if (set_bindir( get_runtime_exedir() )) goto done; libdir = get_runtime_libdir(); if (libdir && !bindir && !build_dir) @@ -399,16 +409,9 @@ void wine_init_argv0_path( const char *argv0 ) } if (!libdir && !bindir && !build_dir) - { - bindir = get_runtime_argvdir( argv0 ); - if (bindir && !is_valid_bindir( bindir )) - { - build_dir = running_from_build_dir( bindir ); - free( bindir ); - bindir = NULL; - } - } + set_bindir( get_runtime_argvdir( argv0 )); +done: if (build_dir) { argv0_name = build_path( "loader/", basename );

1 0

Zebediah Figura : comctl32: Don't FIXME on handled cases.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 11c557b66cf0f65e8207e2957f5d7a1981c41535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c557b66cf0f65e8207e2957… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 13 16:04:44 2017 -0500 comctl32: Don't FIXME on handled cases. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 459bb38..8506566 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10756,11 +10756,12 @@ static inline LRESULT LISTVIEW_WMPaint(LISTVIEW_INFO *infoPtr, HDC hdc) */ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) return 0; + if (options & ~(PRF_ERASEBKGND|PRF_CLIENT)) + FIXME("(hdc=%p options=0x%08x) partial stub\n", hdc, options); + if (options & PRF_ERASEBKGND) LISTVIEW_EraseBkgnd(infoPtr, hdc);

1 0

Zebediah Figura : msi/tests: Add another test for MsiProcessMessage.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 20b33b8009f9130e7cb3ab850ab7279ea0512a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b33b8009f9130e7cb3ab850… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 25 21:13:53 2017 -0500 msi/tests: Add another test for MsiProcessMessage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/format.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 8ed4bbb..da586b2 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2777,6 +2777,10 @@ static void test_processmessage(void) r = MsiProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, hrec); ok( r == IDOK, "expected IDOK, got %i\n", r); + r = MsiProcessMessage(package, INSTALLMESSAGE_PROGRESS, hrec); + todo_wine + ok( r == IDOK, "expected IDOK, got %i\n", r); + MsiCloseHandle(hrec); MsiCloseHandle(package);

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetRetransmitParams.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 098ffa244d93002a909723662e12fa83d99e4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098ffa244d93002a909723662… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:18 2017 +0100 wsdapi/tests: Add tests for Get/SetRetransmitParams. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index ba0590f..246cfd6 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -182,6 +182,79 @@ static void RemoteAddress_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void RetransmitParams_tests(void) +{ + WSDUdpRetransmitParams origParams, returnedParams; + IWSDUdpMessageParameters *udpMessageParams = NULL; + HRESULT rc; + int ret; + + ZeroMemory(&origParams, sizeof(WSDUdpRetransmitParams)); + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + + /* Check if the default values are returned */ + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Now try setting some custom parameters */ + origParams.ulSendDelay = 100; + origParams.ulRepeat = 7; + origParams.ulRepeatMinDelay = 125; + origParams.ulRepeatMaxDelay = 175; + origParams.ulRepeatUpperDelay = 500; + + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); + todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Now attempt to set some invalid parameters - these appear to be accepted */ + origParams.ulSendDelay = INFINITE; + origParams.ulRepeat = 500; + origParams.ulRepeatMinDelay = 250; + origParams.ulRepeatMaxDelay = 125; + origParams.ulRepeatUpperDelay = 100; + + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); + todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); @@ -189,6 +262,7 @@ START_TEST(msgparams) CreateUdpMessageParameters_tests(); LocalAddress_tests(); RemoteAddress_tests(); + RetransmitParams_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetRemoteAddress.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: b0fc3197c5cf3599186444e03577c779a744b682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc3197c5cf3599186444e03… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:10 2017 +0100 wsdapi/tests: Add tests for Get/SetRemoteAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index d4a300a..ba0590f 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -124,12 +124,71 @@ static void LocalAddress_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void RemoteAddress_tests(void) +{ + IWSDUdpAddress *origUdpAddress = NULL; + IWSDAddress *returnedAddress = NULL; + IWSDUdpMessageParameters *udpMessageParams = NULL; + WCHAR address[] = {'1','.','2','.','3','.','4',0}; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); + + rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); + + rc = WSDCreateUdpAddress(&origUdpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); + + rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); + todo_wine ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + + /* Check if GetRemoteAddress returns the same object */ + todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + if (returnedAddress != NULL) + { + ret = IWSDAddress_Release(returnedAddress); + ok(ret == 1, "IWSDAddress_Release() has %d references, should have 1\n", ret); + } + + ret = IWSDUdpAddress_Release(origUdpAddress); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); CreateUdpMessageParameters_tests(); LocalAddress_tests(); + RemoteAddress_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetLocalAddress.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: f21d3836a297cafc2f70123b3193d7bb3112a884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21d3836a297cafc2f70123b3… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:05 2017 +0100 wsdapi/tests: Add tests for Get/SetLocalAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 0de1860..d4a300a 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -66,11 +66,70 @@ static void CreateUdpMessageParameters_tests(void) ok(ref == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ref); } +static void LocalAddress_tests(void) +{ + IWSDUdpAddress *origUdpAddress = NULL; + IWSDAddress *returnedAddress = NULL; + IWSDUdpMessageParameters *udpMessageParams = NULL; + WCHAR address[] = {'1','.','2','.','3','.','4',0}; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); + + rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); + + rc = WSDCreateUdpAddress(&origUdpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); + + rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); + todo_wine ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + + /* Check if GetLocalAddress returns the same object */ + todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + if (returnedAddress != NULL) + { + ret = IWSDAddress_Release(returnedAddress); + ok(ret == 1, "IWSDAddress_Release() has %d references, should have 1\n", ret); + } + + ret = IWSDUdpAddress_Release(origUdpAddress); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); CreateUdpMessageParameters_tests(); + LocalAddress_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for CreateUdpMessageParameters.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: d0abe772739ac9642653e3d61a0d29be5a6ffd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0abe772739ac9642653e3d61… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:25:54 2017 +0100 wsdapi/tests: Add tests for CreateUdpMessageParameters. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 1 + dlls/wsdapi/tests/msgparams.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index e2f6642..cd4b418 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -5,4 +5,5 @@ C_SRCS = \ address.c \ discovery.c \ memory.c \ + msgparams.c \ xml.c diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c new file mode 100644 index 0000000..0de1860 --- /dev/null +++ b/dlls/wsdapi/tests/msgparams.c @@ -0,0 +1,76 @@ +/* + * Web Services on Devices + * Message Parameters tests + * + * Copyright 2017 Owen Rudge 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 + */ + +#define COBJMACROS + +#include <winsock2.h> +#include <windows.h> + +#include "wine/test.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateUdpMessageParameters_tests(void) +{ + IWSDUdpMessageParameters *udpMessageParams = NULL, *udpMessageParams2 = NULL; + IWSDMessageParameters *messageParams = NULL; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateUdpMessageParameters(NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUdpMessageParameters(NULL) failed: %08x\n", rc); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + /* Try to query for objects */ + rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDUdpMessageParameters, (LPVOID*)&udpMessageParams2); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IWSDUdpMessageParameters) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDUdpMessageParameters_Release(udpMessageParams2); + + rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDMessageParameters, (LPVOID*)&messageParams); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_WSDMessageParameters) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDMessageParameters_Release(messageParams); + + rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + ref = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ref == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ref); +} + +START_TEST(msgparams) +{ + CoInitialize(NULL); + + CreateUdpMessageParameters_tests(); + + CoUninitialize(); +}

1 0

Owen Rudge : wsdapi: Add stub implementation of IWSDUdpMessageParameters and WSDCreateUdpMessageParameters.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 240c703896dfcf2fba4267ca8d8e779195bc4caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=240c703896dfcf2fba4267ca8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:25:50 2017 +0100 wsdapi: Add stub implementation of IWSDUdpMessageParameters and WSDCreateUdpMessageParameters. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/msgparams.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 2 +- 3 files changed, 230 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 30862cc..0f28ce5 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -7,4 +7,5 @@ C_SRCS = \ discovery.c \ main.c \ memory.c \ + msgparams.c \ xml.c diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c new file mode 100644 index 0000000..a7a2f0a --- /dev/null +++ b/dlls/wsdapi/msgparams.c @@ -0,0 +1,228 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +typedef struct IWSDMessageParametersImpl { + IWSDMessageParameters IWSDMessageParameters_iface; + LONG ref; +} IWSDMessageParametersImpl; + +typedef struct IWSDUdpMessageParametersImpl { + IWSDMessageParametersImpl base; +} IWSDUdpMessageParametersImpl; + +static inline IWSDMessageParametersImpl *impl_from_IWSDMessageParameters(IWSDMessageParameters *iface) +{ + return CONTAINING_RECORD(iface, IWSDMessageParametersImpl, IWSDMessageParameters_iface); +} + +static inline IWSDUdpMessageParametersImpl *impl_from_IWSDUdpMessageParameters(IWSDUdpMessageParameters *iface) +{ + return CONTAINING_RECORD(iface, IWSDUdpMessageParametersImpl, base.IWSDMessageParameters_iface); +} + +/* IWSDMessageParameters implementation */ + +static ULONG WINAPI IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) +{ + IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) +{ + IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +{ + FIXME("(%p, %p)\n", This, ppAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +{ + FIXME("(%p, %p)\n", This, pAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +{ + FIXME("(%p, %p)\n", This, ppAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +{ + FIXME("(%p, %p)\n", This, pAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) +{ + FIXME("(%p, %p)\n", This, ppTxParams); + return E_NOTIMPL; +} + +/* IWSDUdpMessageParameters implementation */ +static HRESULT WINAPI IWSDUdpMessageParametersImpl_QueryInterface(IWSDUdpMessageParameters *iface, REFIID riid, void **ppv) +{ + IWSDUdpMessageParametersImpl *This = impl_from_IWSDUdpMessageParameters(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDMessageParameters) || + IsEqualIID(riid, &IID_IWSDUdpMessageParameters)) + { + *ppv = &This->base.IWSDMessageParameters_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDUdpMessageParametersImpl_AddRef(IWSDUdpMessageParameters *iface) +{ + return IWSDMessageParametersImpl_AddRef((IWSDMessageParameters *)iface); +} + +static ULONG WINAPI IWSDUdpMessageParametersImpl_Release(IWSDUdpMessageParameters *iface) +{ + return IWSDMessageParametersImpl_Release((IWSDMessageParameters *)iface); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetLocalAddress(IWSDUdpMessageParameters *This, IWSDAddress **ppAddress) +{ + return IWSDMessageParametersImpl_GetLocalAddress((IWSDMessageParameters *)This, ppAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetLocalAddress(IWSDUdpMessageParameters *This, IWSDAddress *pAddress) +{ + return IWSDMessageParametersImpl_SetLocalAddress((IWSDMessageParameters *)This, pAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetRemoteAddress(IWSDUdpMessageParameters *This, IWSDAddress **ppAddress) +{ + return IWSDMessageParametersImpl_GetRemoteAddress((IWSDMessageParameters *)This, ppAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetRemoteAddress(IWSDUdpMessageParameters *This, IWSDAddress *pAddress) +{ + return IWSDMessageParametersImpl_SetRemoteAddress((IWSDMessageParameters *)This, pAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetLowerParameters(IWSDUdpMessageParameters *This, IWSDMessageParameters **ppTxParams) +{ + return IWSDMessageParametersImpl_GetLowerParameters((IWSDMessageParameters *)This, ppTxParams); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetRetransmitParams(IWSDUdpMessageParameters *This, const WSDUdpRetransmitParams *pParams) +{ + FIXME("(%p, %p)\n", This, pParams); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetRetransmitParams(IWSDUdpMessageParameters *This, WSDUdpRetransmitParams *pParams) +{ + FIXME("(%p, %p)\n", This, pParams); + return E_NOTIMPL; +} + +static const IWSDUdpMessageParametersVtbl udpMsgParamsVtbl = +{ + /* IUnknown */ + IWSDUdpMessageParametersImpl_QueryInterface, + IWSDUdpMessageParametersImpl_AddRef, + IWSDUdpMessageParametersImpl_Release, + + /* IWSDMessageParameters */ + IWSDUdpMessageParametersImpl_GetLocalAddress, + IWSDUdpMessageParametersImpl_SetLocalAddress, + IWSDUdpMessageParametersImpl_GetRemoteAddress, + IWSDUdpMessageParametersImpl_SetRemoteAddress, + IWSDUdpMessageParametersImpl_GetLowerParameters, + + /* IWSDUdpMessageParameters */ + IWSDUdpMessageParametersImpl_SetRetransmitParams, + IWSDUdpMessageParametersImpl_GetRetransmitParams +}; + +HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxParams) +{ + IWSDUdpMessageParametersImpl *obj; + + TRACE("(%p)\n", ppTxParams); + + if (ppTxParams == NULL) + { + WARN("Invalid parameter: ppTxParams == NULL\n"); + return E_POINTER; + } + + *ppTxParams = NULL; + + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + if (!obj) return E_OUTOFMEMORY; + + obj->base.IWSDMessageParameters_iface.lpVtbl = (IWSDMessageParametersVtbl *)&udpMsgParamsVtbl; + obj->base.ref = 1; + + *ppTxParams = (IWSDUdpMessageParameters *)&obj->base.IWSDMessageParameters_iface; + TRACE("Returning iface %p\n", *ppTxParams); + + return S_OK; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index a8f1aaa..41d62bb 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -24,7 +24,7 @@ @ stub WSDCreateMetadataAgent @ stub WSDCreateOutboundAttachment @ stdcall WSDCreateUdpAddress(ptr) -@ stub WSDCreateUdpMessageParameters +@ stdcall WSDCreateUdpMessageParameters(ptr) @ stub WSDCreateUdpTransport @ stdcall WSDDetachLinkedMemory(ptr) @ stdcall WSDFreeLinkedMemory(ptr)

1 0

Clemens Tamme : gdiplus: Write API documentation for GdipAddPathArc and GdipAddPathArcI.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: c95877da42c2eb03085edf54a114cd0c766ad184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95877da42c2eb03085edf54a… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Thu Jun 22 18:47:42 2017 +0200 gdiplus: Write API documentation for GdipAddPathArc and GdipAddPathArcI. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 815ce34..5fedd07 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -166,6 +166,32 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R return TRUE; } +/******************************************************************************* + * GdipAddPathArc [GDIPLUS.1] + * + * Add an elliptical arc to the given path. + * + * PARAMS + * path [I/O] Path that the arc is appended to + * x1 [I] X coordinate of the boundary box + * y1 [I] Y coordinate of the boundary box + * x2 [I] Width of the boundary box + * y2 [I] Height of the boundary box + * startAngle [I] Starting angle of the arc, clockwise + * sweepAngle [I] Angle of the arc, clockwise + * + * RETURNS + * InvalidParameter If the given path is invalid + * OutOfMemory If memory allocation fails, i.e. the path cannot be lengthened + * Ok If everything works out as expected + * + * NOTES + * This functions takes the newfigure value of the given path into account, + * i.e. the arc is connected to the end of the given path if it was set to + * FALSE, otherwise the arc's first point gets the the PathPointTypeStart + * value. In both cases, the value of newfigure of the given path is FALSE + * afterwards. + */ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle) { @@ -200,6 +226,11 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, return Ok; } +/******************************************************************************* + * GdipAddPathArcI [GDUPLUS.2] + * + * See GdipAddPathArc + */ GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, INT y2, REAL startAngle, REAL sweepAngle) {

1 0

Clemens Tamme : gdiplus: Write API for GdipClonePath.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: f1123f35788effc9ceea462210189600191d9966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1123f35788effc9ceea46221… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Wed Jun 21 21:40:35 2017 +0200 gdiplus: Write API for GdipClonePath. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 90d15bb..815ce34 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1087,6 +1087,20 @@ GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, IN return InvalidParameter; } +/************************************************************************* + * GdipClonePath [GDIPLUS.53] + * + * Duplicate the given path in memory. + * + * PARAMS + * path [I] The path to be duplicated + * clone [O] Pointer to the new path + * + * RETURNS + * InvalidParameter If the input path is invalid + * OutOfMemory If allocation of needed memory fails + * Ok If everything works out as expected + */ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { TRACE("(%p, %p)\n", path, clone);

1 0

Clemens Tamme : gdiplus: Write API for GdipAddPathLine and GdipAddPathLineI.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: f96e319ab5b890e0d174d617ee93c7b3ecc9dec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96e319ab5b890e0d174d617e… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Wed Jun 21 19:50:41 2017 +0200 gdiplus: Write API for GdipAddPathLine and GdipAddPathLineI. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index e34f4ed..90d15bb 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -646,6 +646,30 @@ GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, I return stat; } +/************************************************************************* + * GdipAddPathLine [GDIPLUS.21] + * + * Add two points to the given path. + * + * PARAMS + * path [I/O] Path that the line is appended to + * x1 [I] X coordinate of the first point of the line + * y1 [I] Y coordinate of the first point of the line + * x2 [I] X coordinate of the second point of the line + * y2 [I] Y coordinate of the second point of the line + * + * RETURNS + * InvalidParameter If the first parameter is not a valid path + * OutOfMemory If the path cannot be lengthened, i.e. memory allocation fails + * Ok If everything works out as expected + * + * NOTES + * This functions takes the newfigure value of the given path into account, + * i.e. the two new points are connected to the end of the given path if it + * was set to FALSE, otherwise the first point is given the PathPointTypeStart + * value. In both cases, the value of newfigure of the given path is FALSE + * afterwards. + */ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2) { INT old_count; @@ -675,6 +699,11 @@ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REA return Ok; } +/************************************************************************* + * GdipAddPathLineI [GDIPLUS.21] + * + * See GdipAddPathLine + */ GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) { TRACE("(%p, %d, %d, %d, %d)\n", path, x1, y1, x2, y2);

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the GIF decoder.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: d3280c867bc7b7e36657aa0f50db26d7258a15b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3280c867bc7b7e36657aa0f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:59 2017 +0800 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the GIF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 01ef089..f63a7f3 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1247,8 +1247,13 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { + GifDecoder *This = impl_from_IWICBitmapDecoder(iface); + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetLocation.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: c94bf3cf277969ed61170234b9d48ea7e86645d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94bf3cf277969ed61170234b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:56 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetLocation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/imgfactory.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/metadataquery.c | 35 +++++++++++++++++++++++++++------- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 15 ++++++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index d24db25..01ef089 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -821,7 +821,7 @@ static HRESULT WINAPI GifFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecod if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index bf63494..e1bcc89 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1101,7 +1101,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryReaderFromBlockReader(IWICComp if (!block_reader || !query_reader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(block_reader, query_reader); + return MetadataQueryReader_CreateInstance(block_reader, NULL, query_reader); } static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index b7998be..acc262e 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -695,7 +695,7 @@ static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDe if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 29df42e..0b7eb6c 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -35,10 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { IWICMetadataQueryReader IWICMetadataQueryReader_iface; - LONG ref; - IWICMetadataBlockReader *block; + WCHAR *root; } QueryReader; static inline QueryReader *impl_from_IWICMetadataQueryReader(IWICMetadataQueryReader *iface) @@ -84,6 +83,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) if (!ref) { IWICMetadataBlockReader_Release(This->block); + HeapFree(GetProcessHeap(), 0, This->root); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -98,12 +98,31 @@ static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUI return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } -static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, - UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength) +static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, UINT len, WCHAR *location, UINT *ret_len) { + static const WCHAR rootW[] = { '/',0 }; QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%u,%p,%p)\n", This, cchMaxLength, wzNamespace, pcchActualLength); - return E_NOTIMPL; + const WCHAR *root; + UINT actual_len; + + TRACE("(%p,%u,%p,%p)\n", This, len, location, ret_len); + + if (!ret_len) return E_INVALIDARG; + + root = This->root ? This->root : rootW; + actual_len = lstrlenW(root) + 1; + + if (location) + { + if (len < actual_len) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + + memcpy(location, root, actual_len * sizeof(WCHAR)); + } + + *ret_len = actual_len; + + return S_OK; } static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, @@ -132,7 +151,7 @@ static IWICMetadataQueryReaderVtbl mqr_vtbl = { mqr_GetEnumerator }; -HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) +HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const WCHAR *root, IWICMetadataQueryReader **out) { QueryReader *obj; @@ -146,6 +165,8 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMet IWICMetadataBlockReader_AddRef(mbr); obj->block = mbr; + obj->root = root ? heap_strdupW(root) : NULL; + *out = &obj->IWICMetadataQueryReader_iface; return S_OK; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c98a6a7..e8325c7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDec if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b39bcac..b613409 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1172,7 +1172,7 @@ static HRESULT WINAPI TiffFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDeco if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index a8af0d6..2249c13 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -21,6 +21,7 @@ #include "wincodec.h" #include "wincodecsdk.h" +#include "wine/unicode.h" DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); @@ -162,9 +163,17 @@ extern HRESULT IMDReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GCEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT APEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; - -extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) DECLSPEC_HIDDEN; - +extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, const WCHAR *, IWICMetadataQueryReader **) DECLSPEC_HIDDEN; extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + SIZE_T len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len))) memcpy(dst, src, len); + return dst; +} + #endif /* WINCODECS_PRIVATE_H */

1 0

Dmitry Timoshkov : windowscodecs: Use PropVariantCompareEx to compare metadata items.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 3059668de3ded265ab8919702cd2b8eb1e42049d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3059668de3ded265ab8919702… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:51 2017 +0800 windowscodecs: Use PropVariantCompareEx to compare metadata items. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/metadatahandler.c | 67 +++--------------------------------- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 78e2059..3505e80 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,6 +1,6 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) EXTRALIBS = $(APPLICATIONSERVICES_LIBS) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 10f9f06..cdd7420 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winternl.h" #include "objbase.h" +#include "propvarutil.h" #include "wincodecs_private.h" @@ -211,66 +212,6 @@ static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface, return hr; } -static BOOL get_int_value(const PROPVARIANT *pv, LONGLONG *value) -{ - switch (pv->vt) - { - case VT_NULL: - case VT_EMPTY: - *value = 0; - break; - case VT_I1: - *value = pv->u.cVal; - break; - case VT_UI1: - *value = pv->u.bVal; - break; - case VT_I2: - *value = pv->u.iVal; - break; - case VT_UI2: - *value = pv->u.uiVal; - break; - case VT_I4: - *value = pv->u.lVal; - break; - case VT_UI4: - *value = pv->u.ulVal; - break; - case VT_I8: - case VT_UI8: - *value = pv->u.hVal.QuadPart; - break; - default: - FIXME("not supported variant type %d\n", pv->vt); - return FALSE; - } - return TRUE; -} - -/* FiXME: Use propsys.PropVariantCompareEx once it's implemented */ -static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) -{ - LONGLONG value1, value2; - - if (v1->vt == VT_LPSTR && v2->vt == VT_LPSTR) - { - return lstrcmpA(v1->u.pszVal, v2->u.pszVal); - } - - if (v1->vt == VT_LPWSTR && v2->vt == VT_LPWSTR) - { - return lstrcmpiW(v1->u.pwszVal, v2->u.pwszVal); - } - - if (!get_int_value(v1, &value1)) return -1; - if (!get_int_value(v2, &value2)) return -1; - - value1 -= value2; - if (value1) return value1 < 0 ? -1 : 1; - return 0; -} - static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value) { @@ -278,7 +219,7 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, HRESULT hr = WINCODEC_ERR_PROPERTYNOTFOUND; MetadataHandler *This = impl_from_IWICMetadataWriter(iface); - TRACE("(%p,%p,%p,%p)\n", iface, schema, id, value); + TRACE("(%p,%s,%s,%p)\n", iface, wine_dbgstr_variant((const VARIANT *)schema), wine_dbgstr_variant((const VARIANT *)id), value); if (!id) return E_INVALIDARG; @@ -288,10 +229,10 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, { if (schema && This->items[i].schema.vt != VT_EMPTY) { - if (propvar_cmp(schema, &This->items[i].schema) != 0) continue; + if (PropVariantCompareEx(schema, &This->items[i].schema, 0, PVCF_USESTRCMPI) != 0) continue; } - if (propvar_cmp(id, &This->items[i].id) != 0) continue; + if (PropVariantCompareEx(id, &This->items[i].id, 0, PVCF_USESTRCMPI) != 0) continue; hr = value ? PropVariantCopy(value, &This->items[i].value) : S_OK; break;

1 0

Rosanne DiMesio : Add Keywords filter to Browse Apps page
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: 6dacbd9dd79d0a5428d038def8269bb90f586764 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6dacbd9dd79d0a5428d038de… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 13:50:40 2017 -0500 Add Keywords filter to Browse Apps page Fixes bug 38168. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/application.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/application.php b/include/application.php index 75d13ee..8962915 100644 --- a/include/application.php +++ b/include/application.php @@ -1122,7 +1122,9 @@ EOT; $oFilter->AddFilterInfo('appCategory', 'Category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); + $oFilter->AddFilterInfo('appFamily.keywords', 'Keywords', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); $oFilter->AddFilterInfo('onlyDownloadable', 'Only show downloadable apps', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; }

1 0

Rosanne DiMesio : Revise bug link message
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: 9e07aab1b18a63c497de0bfbf251eacdba239a7a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9e07aab1b18a63c497de0bfb… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 12:53:31 2017 -0500 Revise bug link message Changes the message to match the way the process actually works. Fixes bug 36179. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index f8c3f41..331600e 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -271,7 +271,7 @@ class Bug { $sSubject = "Link between Bug ".$this->iBug_id." and ".$sAppName." submitted by ".$_SESSION['current']->sRealname; $sMsg .= "This Bug Link has been queued.\n"; - addmsg("The Bug Link you submitted will be added to the database after being reviewed.", "green"); + addmsg("The Bug Link you submitted has been added to the database and queued for review by the maintainer or an administrator.", "green"); } } else // Bug Link deleted. {

1 0

Rosanne DiMesio : viewbugs.php: order display by appName
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: 6d372a8c42520994968639645b56dd930b826731 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6d372a8c4252099496863964… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 12:18:08 2017 -0500 viewbugs.php: order display by appName Fixes bug 27807. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- viewbugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewbugs.php b/viewbugs.php index f9646da..a75ef30 100644 --- a/viewbugs.php +++ b/viewbugs.php @@ -26,7 +26,7 @@ $hResult = query_parameters("SELECT appFamily.description as appDescription, WHERE appFamily.appId = appVersion.appId and buglinks.versionId = appVersion.versionId AND buglinks.bug_id = '?' - ORDER BY versionName", $aClean['iBugId']); + ORDER BY appName, versionName", $aClean['iBugId']); if(query_num_rows($hResult)) {

1 0

Francois Gouget : testbot/TestLauncher: Report the exit code as a signed integer.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: tools Branch: master Commit: 441990cc867ce10d44da52944aa2c5efeca980b1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=441990cc867ce10d44da5294… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 21 16:27:36 2017 +0200 testbot/TestLauncher: Report the exit code as a signed integer. This is for consistency with WineTest. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index fb48484..3052198 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -451,7 +451,7 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s:%04lx done (%lu) in %lds\n", TestName, Subtest, + printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, ProcessInformation.dwProcessId, ExitCode, (GetTickCount() - Start) / 1000);

1 0

Francois Gouget : testbot/TestLauncher: Print the process pid on the 'done ' lines.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: tools Branch: master Commit: e8249b696d96edd61010d4971db282bb65d0a313 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e8249b696d96edd61010d497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 21 16:27:02 2017 +0200 testbot/TestLauncher: Print the process pid on the 'done' lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 9a7dce2..fb48484 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -380,8 +380,8 @@ int main(int argc, char *argv[]) if (! AllImportedDllsPresent(TestExeFullName, Subtest)) { - printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); - printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, + printf("0000:%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); + printf("%s:%s:0000 done (%u) in %lds\n", TestName, Subtest, Failures, (GetTickCount() - Start) / 1000); exit(0); } @@ -451,7 +451,8 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%lu) in %lds\n", TestName, Subtest, ExitCode, + printf("%s:%s:%04lx done (%lu) in %lds\n", TestName, Subtest, + ProcessInformation.dwProcessId, ExitCode, (GetTickCount() - Start) / 1000); return 0;

1 0

Francois Gouget : testbot/TestLauncher: Fix the 'missing dll' messages.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: tools Branch: master Commit: 913cfde454e888c8a1a036f0a33faddd79000e97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=913cfde454e888c8a1a036f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 21 16:26:51 2017 +0200 testbot/TestLauncher: Fix the 'missing dll' messages. The messages issued when skipping a test due to a missing dll must match those issued by WineTest. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 1d0abac..9a7dce2 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -26,7 +26,6 @@ static unsigned Failures = 0; static unsigned Skips = 0; -static char TestName[_MAX_PATH]; #define ReportError (_SetErrorLocation(__FILE__, __LINE__), 0) ? (void)0 : _ReportError @@ -91,7 +90,7 @@ static BOOL DllPresent(const char *DllName) * So instead we just dive into the executable's import table, determine which modules are being * imported and check if they are present. */ -static BOOL AllImportedDllsPresent(const char *TestExeName) +static BOOL AllImportedDllsPresent(const char *TestExeName, const char *Subtest) { HANDLE TestExe; IMAGE_DOS_HEADER DosHeader; @@ -259,7 +258,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) { if (AllPresent) { - printf("%s:0 Test skipped: required DLL %s", TestName, ModuleName); + printf("%s.c:0: Tests skipped: required DLL %s", Subtest, ModuleName); AllPresent = FALSE; } else @@ -288,6 +287,7 @@ int main(int argc, char *argv[]) char TestExeFullName[_MAX_PATH]; char *TestExeFileName; const char *Suffix; + char TestName[_MAX_PATH]; const char *Subtest; int TestArg; char *CommandLine; @@ -378,9 +378,9 @@ int main(int argc, char *argv[]) Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); - if (! AllImportedDllsPresent(TestExeFullName)) + if (! AllImportedDllsPresent(TestExeFullName, Subtest)) { - printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); + printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, (GetTickCount() - Start) / 1000); exit(0);

1 0

Rosanne DiMesio : Control Center: add 3 functions
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: 09a6f1ff2c70b1a46ecb5f0d0bd1b65b42f1a472 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=09a6f1ff2c70b1a46ecb5f0d… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 10:08:13 2017 -0500 Control Center: add 3 functions Adds purgeRejectedDistributions, purgeRejectedVendors, and viewAppdbAdmins to the admin Control Center. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/admin.php b/admin.php index 79fbd58..f82fc2b 100644 --- a/admin.php +++ b/admin.php @@ -220,6 +220,22 @@ function deleteOrphanVersions() echo "Deleted ".query_affected_rows()." orphan versions. "; } +function purgeRejectedDistributions() +{ + $sQuery = "DELETE FROM distributions WHERE state = 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Removed " .query_affected_rows()." rejected distributions from database. "; +} + +function purgeRejectedVendors() +{ + $sQuery = "DELETE FROM vendor WHERE state = 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Removed " .query_affected_rows()." rejected vendors from database. "; +} + function updateVersionRatings() { $hResult = version::objectGetEntries('accepted'); @@ -235,6 +251,36 @@ function updateVersionRatings() echo "Updated $i entries"; } +function viewAppdbAdmins() +{ + echo html_frame_start("AppDB Admins","90%","",0); + echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; + echo "<tr class=color1>\n"; + echo "<td>Real name</td>\n"; + echo "<td>Email</td>\n"; + echo "<td>Last connected</td>\n"; + echo "</tr>\n\n"; + + $sQuery = "SELECT user_list.userid, realname, email, stamp FROM user_list, user_privs WHERE user_list.userid = user_privs.userid AND user_privs.priv = 'admin' ORDER BY realname"; + + $hResult = query_parameters($sQuery); + + $i = 0; + while($oRow = query_fetch_object($hResult)) + { + $oUser = new User($oRow->userid); + echo "<tr class=color0>"; + echo "<td>".$oUser->objectMakeLink()."</td>\n"; + echo "<td>".$oUser->sEmail."</td>\n"; + echo "<td>".$oUser->sStamp."</td>\n"; + $i++; + } + echo "</table>"; + echo html_frame_end(); + + echo "Found $i entries. "; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a> '; @@ -242,7 +288,10 @@ function showChoices() echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a> '; echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a> '; echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a> '; + echo '<a href="admin.php?sAction=purgeRejectedDistributions">Purge Rejected Distributions</a> '; + echo '<a href="admin.php?sAction=purgeRejectedVendors">Purge Rejected Vendors</a> '; echo '<a href="admin.php?sAction=updateVersionRatings">Update Version Ratings</a> '; + echo '<a href="admin.php?sAction=viewAppdbAdmins">View AppDB Admins</a> '; } switch(getInput('sAction', $aClean)) @@ -267,9 +316,23 @@ switch(getInput('sAction', $aClean)) deleteOrphanVersions(); break; + case 'purgeRejectedDistributions': + purgeRejectedDistributions(); + break; + + case 'purgeRejectedVendors': + purgeRejectedVendors(); + break; + case 'updateVersionRatings': updateVersionRatings(); break; + + case 'viewAppdbAdmins': + viewAppdbAdmins(); + break; + + default: showChoices();

1 0

Rosanne DiMesio : Fix delete button in adminUsers
by Jeremy Newman 26 Jun '17

26 Jun '17

Module: appdb Branch: master Commit: e23200864d25497bc10d2625f464a0026d8cf401 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e23200864d25497bc10d2625… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 23 12:49:07 2017 -0500 Fix delete button in adminUsers Fixes bug 31859. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin/adminUsers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/adminUsers.php b/admin/adminUsers.php index f7861ca..581bf34 100644 --- a/admin/adminUsers.php +++ b/admin/adminUsers.php @@ -134,7 +134,7 @@ if(isset($aClean['sSubmit'])) if($oUser->hasPriv("admin")) echo "A"; if($oUser->isMaintainer()) echo "M"; echo " </td>\n"; - echo " <td align=\"center\">[<a href=\"../preferences.php?iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."\">edit</a>] [<a onclick=\"if(!confirm('".$sAreYouSure."'))return false;\" \"href=\"".$_SERVER['PHP_SELF']."?sAction=delete&iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true\">delete</a>]</td>\n"; + echo " <td align=\"center\">[<a href=\"../preferences.php?iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."\">edit</a>] [<a onclick=\"if(!confirm('".$sAreYouSure."'))return false;\" \"<a href=\"".$_SERVER['PHP_SELF']."?sAction=delete&iUserId=".$oRow->userid."&sSearch=".$sSearch."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true\">delete</a>]</td>\n"; echo "</tr>\n\n"; } }

1 0

Alexandre Julliard : Wine release 2.11
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: website Branch: master Commit: 3d98781bd8b4ec3dc546335c61f85000f6ba3b96 URL: http://source.winehq.org/git/website.git/?a=commit;h=3d98781bd8b4ec3dc54633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 20:08:11 2017 +0200 Wine release 2.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017062301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017062301.xml b/news/en/2017062301.xml new file mode 100644 index 0000000..2f5ed35 --- /dev/null +++ b/news/en/2017062301.xml @@ -0,0 +1,17 @@ +<news> +<date>June 23, 2017</date> +<title>Wine 2.11 Released</title> +<body> + The Wine development release 2.11 is now available. + <a href="{$root}/announce/2.11">What's new</a> in this release: +<ul> + <li>OpenGL support in the Android driver.</li> + <li>Support for security labels.</li> + <li>Relay debugging on ARM64.</li> + <li>More dictionary support in WebServices.</li> + <li>New registry file parser in RegEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.11 : Alexandre Julliard : Release 2.11
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: refs/tags/wine-2.11 Tag: c21b7a342d6208b7bc109366206ff63c5d5e2278 URL: http://source.winehq.org/git/wine.git/?a=tag;h=c21b7a342d6208b7bc109366206f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 20:05:30 2017 +0200 Release 2.11

1 0

Alexandre Julliard : Release 2.11.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 4005e6e659107c29f93e7a35a3bb933b22416598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4005e6e659107c29f93e7a35a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 20:05:30 2017 +0200 Release 2.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 668 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 289 insertions(+), 400 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4005e6e659107c29f93e7…

1 0

Zebediah Figura : msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 993faf576d7c7ea954491c66b5ca406d4b2c52b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993faf576d7c7ea954491c66b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 23 10:53:53 2017 -0500 msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT. 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 | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 24d6ea5..b3d2900 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -62,8 +62,16 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_FINDSTRINGEXACT, -1, (LPARAM)paftd->szFormatTag) == CB_ERR) - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + { + int index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == affd->afc->pwfx->wFormatTag)) || + (!(affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == WAVE_FORMAT_PCM))) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_SETCURSEL, index, 0); + } } break; case WINE_ACMFF_FORMAT: @@ -87,7 +95,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, for (i = 0; i < paftd->cStandardFormats; i++) { static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; - int j; + int j, index; afd.dwFormatIndex = i; afd.fdwSupport = 0; @@ -99,14 +107,17 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); - SendDlgItemMessageW(affd->hWnd, + index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); + if ((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + affd->afc->cbwfx >= paftd->cbFormatSize && + !memcmp(afd.pwfx, affd->afc->pwfx, paftd->cbFormatSize)) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, + CB_SETCURSEL, index, 0); } } acmDriverClose(had, 0); - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, - CB_SETCURSEL, 0, 0); HeapFree(MSACM_hHeap, 0, afd.pwfx); } } @@ -138,7 +149,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, return TRUE; } -static BOOL MSACM_FillFormatTags(HWND hWnd) +static BOOL MSACM_FillFormatTags(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -148,13 +159,15 @@ static BOOL MSACM_FillFormatTags(HWND hWnd) affd.hWnd = hWnd; affd.mode = WINE_ACMFF_TAG; + affd.afc = afc; acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); return TRUE; } -static BOOL MSACM_FillFormat(HWND hWnd) +static BOOL MSACM_FillFormat(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -166,6 +179,7 @@ static BOOL MSACM_FillFormat(HWND hWnd) affd.hWnd = hWnd; affd.mode = WINE_ACMFF_FORMAT; + affd.afc = afc; SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETLBTEXT, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, @@ -173,7 +187,8 @@ static BOOL MSACM_FillFormat(HWND hWnd) (LPARAM)affd.szFormatTag); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); return TRUE; } @@ -212,10 +227,11 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; SetPropW(hWnd, fmt_prop, (HANDLE)afc); - MSACM_FillFormatTags(hWnd); - MSACM_FillFormat(hWnd); + MSACM_FillFormatTags(hWnd, afc); + MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) FIXME("Unsupported style %08x\n", afc->fdwStyle); @@ -234,7 +250,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, case IDD_ACMFORMATCHOOSE_CMB_FORMATTAG: switch (HIWORD(wParam)) { case CBN_SELCHANGE: - MSACM_FillFormat(hWnd); + MSACM_FillFormat(hWnd, afc); break; default: TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n",

1 0

Zebediah Figura : msacm32: Add invalid parameter checks for acmFormatChoose().
by Alexandre Julliard 23 Jun '17

23 Jun '17

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 23 Jun '17

23 Jun '17

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 23 Jun '17

23 Jun '17

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

Pierre Schweitzer : mpr: Properly handle the count set to -1 when enumerating connections.
by Alexandre Julliard 23 Jun '17

23 Jun '17

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 : regedit/tests: Add tests to determine the effects of backslashes in hex data.
by Alexandre Julliard 23 Jun '17

23 Jun '17

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 23 Jun '17

23 Jun '17

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

Hugh McMaster : reg/tests: Add the final comma to the comma-placement test.
by Alexandre Julliard 23 Jun '17

23 Jun '17

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

Daniel Lehman : opengl32: Don' t fail with both PFD_DOUBLEBUFFER_DONTCARE and PFD_STEREO_DONTCARE.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 079463828c35400e4761642dfa02c99d59761f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079463828c35400e4761642df… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 21 16:00:22 2017 -0700 opengl32: Don't fail with both PFD_DOUBLEBUFFER_DONTCARE and PFD_STEREO_DONTCARE. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3366cb2..5d3a245 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -277,7 +277,7 @@ static void test_choosepixelformat(void) 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" ); + 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; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 73be013..dafafb6 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -517,6 +517,8 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) if (bestDBuffer != -1 && (format.dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) continue; } + else if (!best_format) + goto found; /* Stereo, see the comments above. */ if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) @@ -527,6 +529,8 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) if (bestStereo != -1 && (format.dwFlags & PFD_STEREO) != bestStereo) continue; } + else if (!best_format) + goto found; /* Below we will do a number of checks to select the 'best' pixelformat. * We assume the precedence cColorBits > cAlphaBits > cDepthBits > cStencilBits -> cAuxBuffers.

1 0

Daniel Lehman : opengl32/tests: Add tests for ChoosePixelFormat.
by Alexandre Julliard 23 Jun '17

23 Jun '17

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 23 Jun '17

23 Jun '17

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

Andrey Gusev : api-ms-win-core-crt-l2-1-0: Add dll.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 4dc61a2ca6b77294c082d876b689d9a54cd18d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc61a2ca6b77294c082d876b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 22 16:32:57 2017 +0300 api-ms-win-core-crt-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-crt-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-crt-l2-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index 512862b..114f302 100755 --- a/configure +++ b/configure @@ -890,6 +890,7 @@ enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_crt_l1_1_0 +enable_api_ms_win_core_crt_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 @@ -17890,6 +17891,7 @@ wine_fn_config_dll api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_dll api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 +wine_fn_config_dll api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 diff --git a/configure.ac b/configure.ac index 401ec62..06ab763 100644 --- a/configure.ac +++ b/configure.ac @@ -2726,6 +2726,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-crt-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-crt-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) diff --git a/dlls/api-ms-win-core-crt-l2-1-0/Makefile.in b/dlls/api-ms-win-core-crt-l2-1-0/Makefile.in new file mode 100644 index 0000000..2ac004c --- /dev/null +++ b/dlls/api-ms-win-core-crt-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-crt-l2-1-0.dll diff --git a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec new file mode 100644 index 0000000..69f2629 --- /dev/null +++ b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec @@ -0,0 +1,18 @@ +@ stub __dllonexit3 +@ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs +@ cdecl _amsg_exit(long) msvcrt._amsg_exit +@ cdecl _c_exit() msvcrt._c_exit +@ cdecl _cexit() msvcrt._cexit +@ cdecl _exit(long) msvcrt._exit +@ cdecl _initterm(ptr ptr) msvcrt._initterm +@ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e +@ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter +@ cdecl _onexit(ptr) msvcrt._onexit +@ cdecl _purecall() msvcrt._purecall +@ cdecl _time64(ptr) msvcrt._time64 +@ cdecl -private atexit(ptr) msvcrt.atexit +@ cdecl exit(long) msvcrt.exit +@ stub hgets +@ stub hwprintf +@ cdecl time(ptr) msvcrt.time +@ varargs wprintf(wstr) msvcrt.wprintf diff --git a/tools/make_specfiles b/tools/make_specfiles index 0c8ac00..7feb1b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -332,6 +332,7 @@ my @dll_groups = "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", "api-ms-win-core-crt-l1-1-0", + "api-ms-win-core-crt-l2-1-0", ], [ "gdi32",

1 0

Andrey Gusev : api-ms-win-core-crt-l1-1-0: Add dll.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 001e4ffe356a25fc964d8e737fa72ed37d53fadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=001e4ffe356a25fc964d8e737… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 22 16:32:56 2017 +0300 api-ms-win-core-crt-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-crt-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-crt-l1-1-0.spec | 98 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 103 insertions(+) diff --git a/configure b/configure index c1e3c2a..512862b 100755 --- a/configure +++ b/configure @@ -889,6 +889,7 @@ enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 +enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 @@ -17888,6 +17889,7 @@ wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 +wine_fn_config_dll api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 diff --git a/configure.ac b/configure.ac index 687d546..401ec62 100644 --- a/configure.ac +++ b/configure.ac @@ -2725,6 +2725,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l2-1-0) +WINE_CONFIG_DLL(api-ms-win-core-crt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) diff --git a/dlls/api-ms-win-core-crt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-crt-l1-1-0/Makefile.in new file mode 100644 index 0000000..e0b0fd6 --- /dev/null +++ b/dlls/api-ms-win-core-crt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-crt-l1-1-0.dll diff --git a/dlls/api-ms-win-core-crt-l1-1-0/api-ms-win-core-crt-l1-1-0.spec b/dlls/api-ms-win-core-crt-l1-1-0/api-ms-win-core-crt-l1-1-0.spec new file mode 100644 index 0000000..177a541 --- /dev/null +++ b/dlls/api-ms-win-core-crt-l1-1-0/api-ms-win-core-crt-l1-1-0.spec @@ -0,0 +1,98 @@ +@ cdecl __isascii(long) msvcrt.__isascii +@ cdecl -ret64 _atoi64(str) msvcrt._atoi64 +@ cdecl _errno() msvcrt._errno +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) msvcrt._except_handler4_common +@ stub _fltused +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol2() msvcrt._ftol2 +@ cdecl -arch=i386 -ret64 _ftol2_sse() msvcrt._ftol2_sse +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s +@ cdecl _stricmp(str str) msvcrt._stricmp +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s +@ cdecl _strnicmp(str str long) msvcrt._strnicmp +@ cdecl _strupr_s(str long) msvcrt._strupr_s +@ cdecl _ui64tow_s(int64 ptr long long) msvcrt._ui64tow_s +@ cdecl _ultow(long ptr long) msvcrt._ultow +@ cdecl _ultow_s(long ptr long long) msvcrt._ultow_s +@ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s +@ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s +@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s +@ cdecl _wtoi(wstr) msvcrt._wtoi +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl _wtol(wstr) msvcrt._wtol +@ cdecl atoi(str) msvcrt.atoi +@ cdecl atol(str) msvcrt.atol +@ cdecl isalnum(long) msvcrt.isalnum +@ cdecl isdigit(long) msvcrt.isdigit +@ cdecl isgraph(long) msvcrt.isgraph +@ cdecl islower(long) msvcrt.islower +@ cdecl isprint(long) msvcrt.isprint +@ cdecl isspace(long) msvcrt.isspace +@ cdecl isupper(long) msvcrt.isupper +@ cdecl iswalnum(long) msvcrt.iswalnum +@ cdecl iswascii(long) msvcrt.iswascii +@ cdecl iswctype(long long) msvcrt.iswctype +@ cdecl iswdigit(long) msvcrt.iswdigit +@ cdecl iswgraph(long) msvcrt.iswgraph +@ cdecl iswprint(long) msvcrt.iswprint +@ cdecl iswspace(long) msvcrt.iswspace +@ cdecl memcmp(ptr ptr long) msvcrt.memcmp +@ cdecl memcpy(ptr ptr long) msvcrt.memcpy +@ cdecl memcpy_s(ptr long ptr long) msvcrt.memcpy_s +@ cdecl memmove(ptr ptr long) msvcrt.memmove +@ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s +@ cdecl memset(ptr long long) msvcrt.memset +@ cdecl qsort_s(ptr long long ptr ptr) msvcrt.qsort_s +@ varargs sprintf_s(ptr long str) msvcrt.sprintf_s +@ varargs sscanf_s(str str) msvcrt.sscanf_s +@ cdecl strcat_s(str long str) msvcrt.strcat_s +@ cdecl strchr(str long) msvcrt.strchr +@ cdecl strcmp(str str) msvcrt.strcmp +@ cdecl strcpy_s(ptr long str) msvcrt.strcpy_s +@ cdecl strcspn(str str) msvcrt.strcspn +@ cdecl strlen(str) msvcrt.strlen +@ cdecl strncat_s(str long str long) msvcrt.strncat_s +@ cdecl strncmp(str str long) msvcrt.strncmp +@ cdecl strncpy_s(ptr long str long) msvcrt.strncpy_s +@ cdecl strnlen(str long) msvcrt.strnlen +@ cdecl strpbrk(str str) msvcrt.strpbrk +@ cdecl strrchr(str long) msvcrt.strrchr +@ cdecl strstr(str str) msvcrt.strstr +@ cdecl strtok_s(ptr str ptr) msvcrt.strtok_s +@ cdecl strtol(str ptr long) msvcrt.strtol +@ cdecl strtoul(str ptr long) msvcrt.strtoul +@ varargs swprintf_s(ptr long wstr) msvcrt.swprintf_s +@ cdecl tolower(long) msvcrt.tolower +@ cdecl toupper(long) msvcrt.toupper +@ cdecl towlower(long) msvcrt.towlower +@ cdecl towupper(long) msvcrt.towupper +@ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s +@ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s +@ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s +@ cdecl wcschr(wstr long) msvcrt.wcschr +@ cdecl wcscmp(wstr wstr) msvcrt.wcscmp +@ cdecl wcscpy_s(ptr long wstr) msvcrt.wcscpy_s +@ cdecl wcscspn(wstr wstr) msvcrt.wcscspn +@ cdecl wcslen(wstr) msvcrt.wcslen +@ cdecl wcsncat_s(wstr long wstr long) msvcrt.wcsncat_s +@ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp +@ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen +@ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk +@ cdecl wcsrchr(wstr long) msvcrt.wcsrchr +@ cdecl wcsstr(wstr wstr) msvcrt.wcsstr +@ cdecl wcstok_s(ptr wstr ptr) msvcrt.wcstok_s +@ cdecl wcstol(wstr ptr long) msvcrt.wcstol +@ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul diff --git a/tools/make_specfiles b/tools/make_specfiles index ca620da..0c8ac00 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -331,6 +331,7 @@ my @dll_groups = "api-ms-win-core-apiquery-l1-1-0", "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", + "api-ms-win-core-crt-l1-1-0", ], [ "gdi32",

1 0

Alexandre Julliard : wineandroid: Implement wglSwapIntervalEXT.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 75cb584e28af55fadd13c6cbf2ed8e38e92aa4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cb584e28af55fadd13c6cbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 09:19:15 2017 +0200 wineandroid: Implement wglSwapIntervalEXT. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index c3d4e57..ec26000 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -97,6 +97,7 @@ static void *opengl_handle; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static EGLDisplay display; +static int swap_interval; static char wgl_extensions[4096]; static struct opengl_funcs egl_funcs; @@ -376,6 +377,39 @@ done: } /*********************************************************************** + * android_wglSwapIntervalEXT + */ +static BOOL android_wglSwapIntervalEXT( int interval ) +{ + BOOL ret = TRUE; + + TRACE("(%d)\n", interval); + + if (interval < 0) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + ret = p_eglSwapInterval( display, interval ); + + if (ret) + swap_interval = interval; + else + SetLastError( ERROR_DC_NOT_FOUND ); + + return ret; +} + +/*********************************************************************** + * android_wglGetSwapIntervalEXT + */ +static int android_wglGetSwapIntervalEXT(void) +{ + return swap_interval; +} + +/*********************************************************************** * android_wglSetPixelFormatWINE */ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) @@ -608,6 +642,10 @@ static void init_extensions(void) register_extension("WGL_EXT_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringEXT = android_wglGetExtensionsStringEXT; + register_extension("WGL_EXT_swap_control"); + egl_funcs.ext.p_wglSwapIntervalEXT = android_wglSwapIntervalEXT; + egl_funcs.ext.p_wglGetSwapIntervalEXT = android_wglGetSwapIntervalEXT; + register_extension("WGL_EXT_framebuffer_sRGB"); /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset).

1 0

Alexandre Julliard : wineandroid: Implement wglCreateContextAttribsARB.
by Alexandre Julliard 23 Jun '17

23 Jun '17

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

Alexandre Julliard : wineandroid: Implement wglMakeContextCurrentARB.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: f5a512498b0486ce65ed82c0349b3029d16e63e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a512498b0486ce65ed82c03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 09:19:05 2017 +0200 wineandroid: Implement wglMakeContextCurrentARB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index e55b253..c3d4e57 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -331,6 +331,51 @@ static struct wgl_context *android_wglCreateContextAttribsARB( HDC hdc, struct w } /*********************************************************************** + * android_wglMakeContextCurrentARB + */ +static BOOL android_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct wgl_context *ctx ) +{ + BOOL ret = FALSE; + struct gl_drawable *draw_gl, *read_gl = NULL; + EGLSurface draw_surface, read_surface; + HWND draw_hwnd; + + TRACE( "%p %p %p\n", draw_hdc, read_hdc, ctx ); + + if (!ctx) + { + p_eglMakeCurrent( display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT ); + NtCurrentTeb()->glContext = NULL; + return TRUE; + } + + draw_hwnd = WindowFromDC( draw_hdc ); + if ((draw_gl = get_gl_drawable( draw_hwnd, draw_hdc ))) + { + read_gl = get_gl_drawable( WindowFromDC( read_hdc ), read_hdc ); + draw_surface = draw_gl->surface ? draw_gl->surface : draw_gl->pbuffer; + read_surface = read_gl->surface ? read_gl->surface : read_gl->pbuffer; + TRACE( "%p/%p context %p surface %p/%p\n", + draw_hdc, read_hdc, ctx->context, draw_surface, read_surface ); + ret = p_eglMakeCurrent( display, draw_surface, read_surface, ctx->context ); + if (ret) + { + ctx->surface = draw_gl->surface; + ctx->hwnd = draw_hwnd; + ctx->refresh = FALSE; + NtCurrentTeb()->glContext = ctx; + goto done; + } + } + SetLastError( ERROR_INVALID_HANDLE ); + +done: + release_gl_drawable( read_gl ); + release_gl_drawable( draw_gl ); + return ret; +} + +/*********************************************************************** * android_wglSetPixelFormatWINE */ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) @@ -556,6 +601,10 @@ static void init_extensions(void) register_extension("WGL_ARB_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringARB = android_wglGetExtensionsStringARB; + register_extension("WGL_ARB_make_current_read"); + egl_funcs.ext.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ + egl_funcs.ext.p_wglMakeContextCurrentARB = android_wglMakeContextCurrentARB; + register_extension("WGL_EXT_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringEXT = android_wglGetExtensionsStringEXT;

1 0

Hans Leidekker : winhttp: Reset content length when a redirect creates a new connection.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f2bb2064bfdf0e7b369f22c34d680dec6c12493c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2bb2064bfdf0e7b369f22c34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 22 14:16:58 2017 +0200 winhttp: Reset content length when a redirect creates a new connection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f35d73b..bcfc7b1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2355,9 +2355,9 @@ static BOOL handle_redirect( request_t *request, DWORD status ) netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn ))) goto end; + request->content_length = request->content_read = 0; request->read_pos = request->read_size = 0; - request->read_chunked = FALSE; - request->read_chunked_eof = FALSE; + request->read_chunked = request->read_chunked_eof = FALSE; } else heap_free( hostname );

1 0

Zebediah Figura : msacm32: Don't add a format entry if it is decode-only.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 5e2c243a140c17f3bcd919a18d8b7bc6f52b903e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2c243a140c17f3bcd919a18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 9 13:49:36 2017 -0500 msacm32: Don't add a format entry if it is decode-only. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index e7eab56..19a5ceb 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -57,11 +57,14 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, switch (affd->mode) { case WINE_ACMFF_TAG: - if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, - CB_FINDSTRINGEXACT, -1, - (LPARAM)paftd->szFormatTag) == CB_ERR) - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, - CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (paftd->cStandardFormats > 0) + { + if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_FINDSTRINGEXACT, -1, + (LPARAM)paftd->szFormatTag) == CB_ERR) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + } break; case WINE_ACMFF_FORMAT: if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) {

1 0

Zebediah Figura : winemp3.acm: Disallow operations encoding to MPEG.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: ae34a0f5407ffac492e9bfb5ce5b4267183ea4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae34a0f5407ffac492e9bfb5c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 9 18:08:28 2017 -0500 winemp3.acm: Disallow operations encoding to MPEG. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 80 ++++++++++------------------------------------- 1 file changed, 17 insertions(+), 63 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 13a6109..0e419bd 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -258,10 +258,13 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); #endif } - /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) - */ + (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) + { + WARN("Encoding to MPEG is not supported\n"); + goto theEnd; + } else goto theEnd; MPEG3_Reset(adsi, aad); @@ -736,54 +739,19 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 1: aftd->dwFormatTag = WAVE_FORMAT_MPEGLAYER3; aftd->cbFormatSize = sizeof(MPEGLAYER3WAVEFORMAT); - aftd->cStandardFormats = NUM_MPEG3_FORMATS; + aftd->cStandardFormats = 0; lstrcpyW(aftd->szFormatTag, szMpeg3); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MPEG; aftd->cbFormatSize = sizeof(MPEG1WAVEFORMAT); - aftd->cStandardFormats = NUM_MPEG3_FORMATS; + aftd->cStandardFormats = 0; lstrcpyW(aftd->szFormatTag, szMpeg); break; } return MMSYSERR_NOERROR; } -static void fill_in_mp3(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) -{ - MPEGLAYER3WAVEFORMAT* mp3wfx = (MPEGLAYER3WAVEFORMAT*)wfx; - - wfx->nAvgBytesPerSec = bit_rate / 8; - if (cbwfx >= sizeof(WAVEFORMATEX)) - wfx->cbSize = sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX); - if (cbwfx >= sizeof(MPEGLAYER3WAVEFORMAT)) - { - mp3wfx->wID = MPEGLAYER3_ID_MPEG; - mp3wfx->fdwFlags = MPEGLAYER3_FLAG_PADDING_OFF; - mp3wfx->nBlockSize = (bit_rate * 144) / wfx->nSamplesPerSec; - mp3wfx->nFramesPerBlock = 1; - mp3wfx->nCodecDelay = 0x0571; - } -} - -static void fill_in_mpeg(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) -{ - MPEG1WAVEFORMAT* mp3wfx = (MPEG1WAVEFORMAT*)wfx; - - wfx->nAvgBytesPerSec = bit_rate / 8; - if (cbwfx >= sizeof(WAVEFORMATEX)) - wfx->cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX); - if (cbwfx >= sizeof(MPEG1WAVEFORMAT)) - { - mp3wfx->fwHeadLayer = ACM_MPEG_LAYER3; - mp3wfx->dwHeadBitrate = wfx->nAvgBytesPerSec * 8; - mp3wfx->fwHeadMode = ACM_MPEG_JOINTSTEREO; - mp3wfx->fwHeadModeExt = 0xf; - mp3wfx->wHeadEmphasis = 1; - mp3wfx->fwHeadFlags = ACM_MPEG_ID_MPEG1; - } -} - /*********************************************************************** * MPEG3_FormatDetails * @@ -814,16 +782,8 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) break; case WAVE_FORMAT_MPEGLAYER3: case WAVE_FORMAT_MPEG: - if (afd->dwFormatIndex >= NUM_MPEG3_FORMATS) return ACMERR_NOTPOSSIBLE; - afd->pwfx->nChannels = MPEG3_Formats[afd->dwFormatIndex].nChannels; - afd->pwfx->nSamplesPerSec = MPEG3_Formats[afd->dwFormatIndex].rate; - afd->pwfx->wBitsPerSample = MPEG3_Formats[afd->dwFormatIndex].nBits; - afd->pwfx->nBlockAlign = 1; - if (afd->dwFormatTag == WAVE_FORMAT_MPEGLAYER3) - fill_in_mp3(afd->cbwfx, afd->pwfx, 192000); - else - fill_in_mpeg(afd->cbwfx, afd->pwfx, 192000); - break; + WARN("Encoding to MPEG is not supported\n"); + return ACMERR_NOTPOSSIBLE; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; @@ -856,18 +816,15 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->nChannels = adfs->pwfxSrc->nChannels; if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NSAMPLESPERSEC)) adfs->pwfxDst->nSamplesPerSec = adfs->pwfxSrc->nSamplesPerSec; - if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WBITSPERSAMPLE)) - { - if (adfs->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) - adfs->pwfxDst->wBitsPerSample = 4; - else - adfs->pwfxDst->wBitsPerSample = 16; - } + adfs->pwfxDst->wBitsPerSample = 16; if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) { if (adfs->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) - adfs->pwfxDst->wFormatTag = WAVE_FORMAT_MPEGLAYER3; + { + WARN("Encoding to MPEG is not supported\n"); + return ACMERR_NOTPOSSIBLE; + } else adfs->pwfxDst->wFormatTag = WAVE_FORMAT_PCM; } @@ -883,12 +840,9 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; break; case WAVE_FORMAT_MPEG: - adfs->pwfxDst->nBlockAlign = 1; - fill_in_mpeg(adfs->cbwfxDst, adfs->pwfxDst, 192000); - break; case WAVE_FORMAT_MPEGLAYER3: - adfs->pwfxDst->nBlockAlign = 1; - fill_in_mp3(adfs->cbwfxDst, adfs->pwfxDst, 192000); + WARN("Encoding to MPEG is not supported\n"); + return ACMERR_NOTPOSSIBLE; break; default: FIXME("\n");

1 0

Dmitry Timoshkov : dsound: Fix a memory leak.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: c39121fc97a0f8441ef0a9fb8e4103631574c504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39121fc97a0f8441ef0a9fb8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:23:52 2017 +0800 dsound: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/dsound_private.h | 15 ++++++++++++++- dlls/dsound/propset.c | 12 +++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 796fe1e..8dd86e4 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -89,7 +89,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index b15189e..c045b38 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -31,6 +31,7 @@ #include "uuids.h" #include "wine/list.h" +#include "wine/unicode.h" #define DS_MAX_CHANNELS 6 @@ -254,7 +255,7 @@ extern struct list DSOUND_renderers DECLSPEC_HIDDEN; extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; -extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; +extern const WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; void setup_dsound_options(void) DECLSPEC_HIDDEN; @@ -264,3 +265,15 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels) DECLSPEC_HIDDEN; HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN; + +static inline WCHAR *strdupW( const WCHAR *str ) +{ + size_t size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index b89c45a..9ef4ac9 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -200,7 +200,6 @@ static HRESULT DSPROPERTY_DescriptionW( IMMDevice *mmdevice; IPropertyStore *ps; PROPVARIANT pv; - DWORD desclen; HRESULT hr; TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", @@ -248,12 +247,9 @@ static HRESULT DSPROPERTY_DescriptionW( return hr; } - desclen = lstrlenW(pv.u.pwszVal) + 1; - /* FIXME: Still a memory leak.. */ - ppd->Description = HeapAlloc(GetProcessHeap(), 0, desclen * sizeof(WCHAR)); - memcpy(ppd->Description, pv.u.pwszVal, desclen * sizeof(WCHAR)); - ppd->Module = wine_vxd_drv; - ppd->Interface = wInterface; + ppd->Description = strdupW(pv.u.pwszVal); + ppd->Module = strdupW(wine_vxd_drv); + ppd->Interface = strdupW(wInterface); ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; PropVariantClear(&pv); @@ -463,6 +459,7 @@ static HRESULT DSPROPERTY_DescriptionA( return hr; if (!DSPROPERTY_descWtoA(&data, ppd)) hr = E_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, data.Description); HeapFree(GetProcessHeap(), 0, data.Module); HeapFree(GetProcessHeap(), 0, data.Interface); return hr; @@ -488,6 +485,7 @@ static HRESULT DSPROPERTY_Description1( if (FAILED(hr)) return hr; DSPROPERTY_descWto1(&data, ppd); + HeapFree(GetProcessHeap(), 0, data.Description); HeapFree(GetProcessHeap(), 0, data.Module); HeapFree(GetProcessHeap(), 0, data.Interface); return hr;

1 0

Alexandre Julliard : wineandroid: Create a proper EGL window surface once we receive a surface from Java.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 01439ef590a0915bc29199786c23270146396842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01439ef590a0915bc29199786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 22:50:32 2017 +0200 wineandroid: Create a proper EGL window surface once we receive a surface from Java. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/device.c | 4 +- dlls/wineandroid.drv/opengl.c | 86 +++++++++++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 6 ++- 4 files changed, 92 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 2cd167f..29daefe 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -52,6 +52,7 @@ DECL_FUNCPTR( ANativeWindow_release ); * OpenGL driver */ +extern void update_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_wgl_driver( UINT version ) DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 54c409b..472f4ba 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -461,7 +461,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (!data || data->parent == win) { if (win) pANativeWindow_release( win ); - if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, 0, 0 ); + if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); return; } @@ -475,7 +475,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); win->setSwapInterval( win, data->swap_interval ); unwrap_java_call(); - PostMessageW( hwnd, WM_ANDROID_REFRESH, 0, 0 ); + PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); } diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 60f14b4..910652b 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -76,7 +76,9 @@ struct wgl_context struct list entry; EGLConfig config; EGLContext context; + EGLSurface surface; HWND hwnd; + BOOL refresh; }; struct gl_drawable @@ -86,6 +88,7 @@ struct gl_drawable HDC hdc; int format; ANativeWindow *window; + EGLSurface surface; EGLSurface pbuffer; }; @@ -100,6 +103,9 @@ static struct opengl_funcs egl_funcs; static struct list gl_contexts = LIST_INIT( gl_contexts ); static struct list gl_drawables = LIST_INIT( gl_drawables ); +static void (*pglFinish)(void); +static void (*pglFlush)(void); + static CRITICAL_SECTION drawable_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -123,6 +129,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, HDC hdc, int format ) gl->hdc = hdc; gl->format = format; gl->window = create_ioctl_window( hwnd, TRUE ); + gl->surface = 0; gl->pbuffer = p_eglCreatePbufferSurface( display, pixel_formats[gl->format - 1].config, attribs ); EnterCriticalSection( &drawable_section ); list_add_head( &gl_drawables, &gl->entry ); @@ -157,6 +164,7 @@ void destroy_gl_drawable( HWND hwnd ) { if (gl->hwnd != hwnd) continue; list_remove( &gl->entry ); + if (gl->surface) p_eglDestroySurface( display, gl->surface ); if (gl->pbuffer) p_eglDestroySurface( display, gl->pbuffer ); release_ioctl_window( gl->window ); HeapFree( GetProcessHeap(), 0, gl ); @@ -165,6 +173,45 @@ void destroy_gl_drawable( HWND hwnd ) LeaveCriticalSection( &drawable_section ); } +static BOOL refresh_context( struct wgl_context *ctx ) +{ + BOOL ret = InterlockedExchange( &ctx->refresh, FALSE ); + + if (ret) + { + TRACE( "refreshing hwnd %p context %p surface %p\n", ctx->hwnd, ctx->context, ctx->surface ); + p_eglMakeCurrent( display, ctx->surface, ctx->surface, ctx->context ); + RedrawWindow( ctx->hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE ); + } + return ret; +} + +void update_gl_drawable( HWND hwnd ) +{ + struct gl_drawable *gl; + struct wgl_context *ctx; + + if ((gl = get_gl_drawable( hwnd, 0 ))) + { + if (!gl->surface && + (gl->surface = p_eglCreateWindowSurface( display, pixel_formats[gl->format - 1].config, gl->window, NULL ))) + { + LIST_FOR_EACH_ENTRY( ctx, &gl_contexts, struct wgl_context, entry ) + { + if (ctx->hwnd != hwnd) continue; + TRACE( "hwnd %p refreshing %p %scurrent\n", hwnd, ctx, NtCurrentTeb()->glContext == ctx ? "" : "not " ); + ctx->surface = gl->surface; + if (NtCurrentTeb()->glContext == ctx) + p_eglMakeCurrent( display, ctx->surface, ctx->surface, ctx->context ); + else + InterlockedExchange( &ctx->refresh, TRUE ); + } + } + release_gl_drawable( gl ); + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE ); + } +} + static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) { struct gl_drawable *gl; @@ -214,6 +261,8 @@ static struct wgl_context *create_context( HDC hdc, struct wgl_context *share, c ctx = HeapAlloc( GetProcessHeap(), 0, sizeof(*ctx) ); ctx->config = pixel_formats[gl->format - 1].config; + ctx->surface = 0; + ctx->refresh = FALSE; ctx->context = p_eglCreateContext( display, ctx->config, share ? share->context : EGL_NO_CONTEXT, attribs ); TRACE( "%p fmt %d ctx %p\n", hdc, gl->format, ctx->context ); @@ -376,12 +425,14 @@ static BOOL android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx ) hwnd = WindowFromDC( hdc ); if ((gl = get_gl_drawable( hwnd, hdc ))) { - EGLSurface surface = gl->pbuffer; + EGLSurface surface = gl->surface ? gl->surface : gl->pbuffer; TRACE( "%p hwnd %p context %p surface %p\n", hdc, gl->hwnd, ctx->context, surface ); ret = p_eglMakeCurrent( display, surface, surface, ctx->context ); if (ret) { + ctx->surface = gl->surface; ctx->hwnd = hwnd; + ctx->refresh = FALSE; NtCurrentTeb()->glContext = ctx; goto done; } @@ -419,10 +470,33 @@ static BOOL android_wglSwapBuffers( HDC hdc ) if (!ctx) return FALSE; - TRACE( "%p hwnd %p context %p\n", hdc, ctx->hwnd, ctx->context ); + TRACE( "%p hwnd %p context %p surface %p\n", hdc, ctx->hwnd, ctx->context, ctx->surface ); + + if (refresh_context( ctx )) return TRUE; + if (ctx->surface) p_eglSwapBuffers( display, ctx->surface ); return TRUE; } +static void wglFinish(void) +{ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + + if (!ctx) return; + TRACE( "hwnd %p context %p\n", ctx->hwnd, ctx->context ); + refresh_context( ctx ); + pglFinish(); +} + +static void wglFlush(void) +{ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + + if (!ctx) return; + TRACE( "hwnd %p context %p\n", ctx->hwnd, ctx->context ); + refresh_context( ctx ); + pglFlush(); +} + static void register_extension( const char *ext ) { if (wgl_extensions[0]) strcat( wgl_extensions, " " ); @@ -729,6 +803,14 @@ static void init_extensions(void) LOAD_FUNCPTR( glVertexBindingDivisor ); LOAD_FUNCPTR( glWaitSync ); #undef LOAD_FUNCPTR + + /* redirect some standard OpenGL functions */ + +#define REDIRECT(func) \ + do { p##func = egl_funcs.gl.p_##func; egl_funcs.gl.p_##func = w##func; } while(0) + REDIRECT(glFinish); + REDIRECT(glFlush); +#undef REDIRECT } static BOOL egl_init(void) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 0e94115..f7a13df 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1330,7 +1330,11 @@ LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) switch (msg) { case WM_ANDROID_REFRESH: - if ((data = get_win_data( hwnd ))) + if (wp) /* opengl client window */ + { + update_gl_drawable( hwnd ); + } + else if ((data = get_win_data( hwnd ))) { struct window_surface *surface = data->surface; if (surface)

1 0

Alexandre Julliard : wineandroid: Initial version of the OpenGL driver.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 1f736b5f7c0ab298a3535cac6b099c7b6dad61ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f736b5f7c0ab298a3535cac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 21:39:08 2017 +0200 wineandroid: Initial version of the OpenGL driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/android.h | 8 + dlls/wineandroid.drv/init.c | 18 +- dlls/wineandroid.drv/opengl.c | 865 +++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 5 files changed, 892 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f736b5f7c0ab298a3535…

1 0

Alexandre Julliard : configure: Add check for OpenGL ES libraries.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: ad9fbf8e0aaeb56f50a0dcd8d6aa572796736af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9fbf8e0aaeb56f50a0dcd8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 20:07:29 2017 +0200 configure: Add check for OpenGL ES libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++ include/config.h.in | 9 +++++ 3 files changed, 121 insertions(+) diff --git a/configure b/configure index 02de880..c1e3c2a 100755 --- a/configure +++ b/configure @@ -6830,6 +6830,7 @@ for ac_header in \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ + EGL/egl.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ OpenAL/al.h \ @@ -8489,6 +8490,113 @@ fi LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lEGL" >&5 +$as_echo_n "checking for -lEGL... " >&6; } +if ${ac_cv_lib_soname_EGL+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lEGL $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char eglGetProcAddress (); +int +main () +{ +return eglGetProcAddress (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_EGL=`$ac_cv_path_LDD conftest.exe | grep "EGL" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_EGL=`$OTOOL -L conftest$ac_exeext | grep "libEGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libEGL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_EGL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libEGL\\.$LIBEXT" | sed -e "s/^.*\\[\$libEGL\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_EGL:+false} :; then : + ac_cv_lib_soname_EGL=`$LDD conftest$ac_exeext | grep "libEGL\\.$LIBEXT" | sed -e "s/^.*$libEGL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_EGL:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_EGL" >&5 +$as_echo "$ac_cv_lib_soname_EGL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBEGL "$ac_cv_lib_soname_EGL" +_ACEOF + + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGLESv2" >&5 +$as_echo_n "checking for -lGLESv2... " >&6; } +if ${ac_cv_lib_soname_GLESv2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lGLESv2 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glFlush (); +int +main () +{ +return glFlush (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_GLESv2=`$ac_cv_path_LDD conftest.exe | grep "GLESv2" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_GLESv2=`$OTOOL -L conftest$ac_exeext | grep "libGLESv2\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libGLESv2\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_GLESv2=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libGLESv2\\.$LIBEXT" | sed -e "s/^.*\\[\$libGLESv2\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_GLESv2:+false} :; then : + ac_cv_lib_soname_GLESv2=`$LDD conftest$ac_exeext | grep "libGLESv2\\.$LIBEXT" | sed -e "s/^.*$libGLESv2\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_GLESv2:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GLESv2" >&5 +$as_echo "$ac_cv_lib_soname_GLESv2" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBGLESV2 "$ac_cv_lib_soname_GLESv2" +_ACEOF + + +fi + if test "x$exec_prefix" = xNONE then case $host_cpu in diff --git a/configure.ac b/configure.ac index 7ae29f7..687d546 100644 --- a/configure.ac +++ b/configure.ac @@ -394,6 +394,7 @@ AC_CHECK_HEADERS(\ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ + EGL/egl.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ OpenAL/al.h \ @@ -869,6 +870,9 @@ case $host_os in AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) + WINE_CHECK_SONAME(EGL,eglGetProcAddress) + WINE_CHECK_SONAME(GLESv2,glFlush) + if test "x$exec_prefix" = xNONE then case $host_cpu in diff --git a/include/config.h.in b/include/config.h.in index 18cacd5..c287559 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -117,6 +117,9 @@ /* Define to 1 if you have the `dlopen' function. */ #undef HAVE_DLOPEN +/* Define to 1 if you have the <EGL/egl.h> header file. */ +#undef HAVE_EGL_EGL_H + /* Define to 1 if you have the <elf.h> header file. */ #undef HAVE_ELF_H @@ -1415,6 +1418,9 @@ /* Define to the soname of the libdbus-1 library. */ #undef SONAME_LIBDBUS_1 +/* Define to the soname of the libEGL library. */ +#undef SONAME_LIBEGL + /* Define to the soname of the libfontconfig library. */ #undef SONAME_LIBFONTCONFIG @@ -1424,6 +1430,9 @@ /* Define to the soname of the libGL library. */ #undef SONAME_LIBGL +/* Define to the soname of the libGLESv2 library. */ +#undef SONAME_LIBGLESV2 + /* Define to the soname of the libGLU library. */ #undef SONAME_LIBGLU

1 0

Alexandre Julliard : wineandroid: Also create HWND_MESSAGE windows on the Java side.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f39e021006fe4131618f26138c7e7ddc6223ad92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39e021006fe4131618f26138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 20:04:43 2017 +0200 wineandroid: Also create HWND_MESSAGE windows on the Java side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 5 +++++ dlls/wineandroid.drv/device.c | 12 +++++++++--- dlls/wineandroid.drv/window.c | 27 ++------------------------- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 742fabc..295ecc4 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -62,6 +62,7 @@ public class WineActivity extends Activity private ProgressDialog progress_dialog; protected WineWindow desktop_window; + protected WineWindow message_window; @Override public void onCreate(Bundle savedInstanceState) @@ -290,6 +291,7 @@ public class WineActivity extends Activity protected class WineWindow extends Object { + static protected final int HWND_MESSAGE = 0xfffffffd; static protected final int WS_VISIBLE = 0x10000000; protected int hwnd; @@ -617,6 +619,9 @@ public class WineActivity extends Activity desktop_window = new WineWindow( hwnd, null ); addView( desktop_window.create_whole_view() ); desktop_window.client_group.bringToFront(); + + message_window = new WineWindow( WineWindow.HWND_MESSAGE, null ); + message_window.create_window_groups(); } @Override diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index d17b7c5..54c409b 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -251,6 +251,13 @@ static struct native_win_data *get_ioctl_native_win_data( const struct ioctl_hea return get_native_win_data( LongToHandle(hdr->hwnd), hdr->opengl ); } +static int get_ioctl_win_parent( HWND parent ) +{ + if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) + return HandleToLong( HWND_MESSAGE ); + return HandleToLong( parent ); +} + static void wait_fence_and_close( int fence ) { __s32 timeout = 1000; /* FIXME: should be -1 for infinite timeout */ @@ -1353,7 +1360,6 @@ struct ANativeWindow *create_ioctl_window( HWND hwnd, BOOL opengl ) { struct ioctl_android_create_window req; struct native_win_wrapper *win = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*win) ); - HWND parent = GetAncestor( hwnd, GA_PARENT ); if (!win) return NULL; @@ -1378,7 +1384,7 @@ struct ANativeWindow *create_ioctl_window( HWND hwnd, BOOL opengl ) req.hdr.hwnd = HandleToLong( win->hwnd ); req.hdr.opengl = win->opengl; - req.parent = HandleToLong( parent ); + req.parent = get_ioctl_win_parent( GetAncestor( hwnd, GA_PARENT )); android_ioctl( IOCTL_CREATE_WINDOW, &req, sizeof(req), NULL, NULL ); return &win->win; @@ -1438,7 +1444,7 @@ int ioctl_set_window_parent( HWND hwnd, HWND parent ) req.hdr.hwnd = HandleToLong( hwnd ); req.hdr.opengl = FALSE; - req.parent = HandleToLong( parent ); + req.parent = get_ioctl_win_parent( parent ); return android_ioctl( IOCTL_SET_WINDOW_PARENT, &req, sizeof(req), NULL, NULL ); } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 3bfd0a8..5def81e 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1018,34 +1018,11 @@ static struct android_win_data *create_win_data( HWND hwnd, const RECT *window_r if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop or HWND_MESSAGE */ - if (parent != GetDesktopWindow()) - { - if (!(data = get_win_data( parent )) && - !(data = create_win_data( parent, NULL, NULL ))) - return NULL; - release_win_data( data ); - } - if (!(data = alloc_win_data( hwnd ))) return NULL; data->parent = (parent == GetDesktopWindow()) ? 0 : parent; - - if (window_rect) - { - data->whole_rect = data->window_rect = *window_rect; - data->client_rect = *client_rect; - } - else - { - GetWindowRect( hwnd, &data->window_rect ); - MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); - data->whole_rect = data->window_rect; - GetClientRect( hwnd, &data->client_rect ); - MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); - ioctl_window_pos_changed( hwnd, &data->window_rect, &data->client_rect, &data->whole_rect, - GetWindowLongW( hwnd, GWL_STYLE ), SWP_NOACTIVATE, - GetWindow( hwnd, GW_HWNDPREV ), GetWindow( hwnd, GW_OWNER )); - } + data->whole_rect = data->window_rect = *window_rect; + data->client_rect = *client_rect; return data; }

1 0

Alexandre Julliard : wineandroid: Create window groups inside every window to support a client area.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: cd2b41a2b4fc64efcef168d1f833f0adc62ef1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2b41a2b4fc64efcef168d1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 19:38:36 2017 +0200 wineandroid: Create window groups inside every window to support a client area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 189 +++++++++++++++++++++++++++------ dlls/wineandroid.drv/device.c | 4 +- 2 files changed, 160 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd2b41a2b4fc64efcef16…

1 0

Alexandre Julliard : wineandroid: Add infrastructure to support a separate TextureView for the window client area.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f77bbd45d6b475dbed23a66ba4f5495f8ea12932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77bbd45d6b475dbed23a66ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 19:36:54 2017 +0200 wineandroid: Add infrastructure to support a separate TextureView for the window client area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 50 ++++++++++++++++++++++------------ dlls/wineandroid.drv/android.h | 4 ++- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/window.c | 14 ++++++---- 4 files changed, 45 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f77bbd45d6b475dbed23a…

1 0

Alexandre Julliard : wineandroid: Support creating a separate native window for OpenGL rendering in the client area.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 95c4516b653f93fcd2f2d5e89de210a444a3ee0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c4516b653f93fcd2f2d5e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 19:28:57 2017 +0200 wineandroid: Support creating a separate native window for OpenGL rendering in the client area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 6 ++-- dlls/wineandroid.drv/android.h | 6 ++-- dlls/wineandroid.drv/device.c | 66 +++++++++++++++++++++------------- dlls/wineandroid.drv/window.c | 6 ++-- 4 files changed, 51 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95c4516b653f93fcd2f2d…

1 0

Hugh McMaster : reg/tests: Add tests for parsing hex data.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 116f8d2efe928af25e3c88289db0cc3c9d648308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116f8d2efe928af25e3c88289… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 22 09:34:38 2017 +0000 reg/tests: Add tests for parsing 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 | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2c1cc67..c821bec 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1761,6 +1761,43 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg_nonexist(hkey, "Wine47i"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine48a\"=hex(7):4c,69,6e,65,20, \\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine48b\"=hex(7):4c,69,6e,65,20,\t\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,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, "Wine48a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine48b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine49\"=hex(2):25,50,41,54,48,25,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); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine50a\"=hex(2):25,50,41,54,48,25,00 ;comment\n" + "\"Wine50b\"=hex(2):25,50,41,54,48,25,00\t;comment\n" + "\"Wine50c\"=hex(2):25,50,41,54,48,25,00 #comment\n" + "\"Wine50d\"=hex(2):25,50,41,54,48,25,00\t#comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine50a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine50b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine50c"); + todo_wine verify_reg_nonexist(hkey, "Wine50d"); + + /* Test support for characters greater than 0xff */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine51a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine51b\"=hex(0):25,1a4,100,164,124,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, "Wine51a"); + todo_wine verify_reg_nonexist(hkey, "Wine51b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2690,6 +2727,45 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg_nonexist(hkey, "Wine47i"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine48a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00, \\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00, \\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine48b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\t\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\t \t \\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,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, "Wine48a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine48b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + 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); + 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); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine50a\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00 ;comment\n" + "\"Wine50b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\t;comment\n" + "\"Wine50c\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00 #comment\n" + "\"Wine50d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\t#comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine50a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine50b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine50c"); + todo_wine verify_reg_nonexist(hkey, "Wine50d"); + + /* Test support for characters greater than 0xff */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine51a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine51b\"=hex(0):25,1a4,100,164,124,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, "Wine51a"); + todo_wine verify_reg_nonexist(hkey, "Wine51b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Add tests for parsing hex data.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: a1b35b3bc4322b80441a9d60d1cb55b34dad88dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b35b3bc4322b80441a9d60d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 22 09:34:29 2017 +0000 regedit/tests: Add tests for parsing 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79f7571..c70cccc 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -466,6 +466,20 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg_nonexist(hkey, "Wine13i"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14a\"=hex(7):4c,69,6e,65,20, \\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine14b\"=hex(7):4c,69,6e,65,20,\t\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine14a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine14b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine15\"=hex(2):25,50,41,54,48,25,00,\n\n"); + verify_reg(hkey, "Wine15", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -801,6 +815,14 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test21e"); verify_reg_nonexist(hkey, "Test21f"); + /* Test support for characters greater than 0xff */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine22b\"=hex(0):25,1a4,100,164,124,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine22a"); + verify_reg_nonexist(hkey, "Wine22b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1023,6 +1045,17 @@ static void test_comments(void) " 61,74,69,6f,6e,00,00\n\n"); todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine27a\"=hex(2):25,50,41,54,48,25,00 ;comment\n" + "\"Wine27b\"=hex(2):25,50,41,54,48,25,00\t;comment\n" + "\"Wine27c\"=hex(2):25,50,41,54,48,25,00 #comment\n" + "\"Wine27d\"=hex(2):25,50,41,54,48,25,00\t#comment\n\n"); + todo_wine verify_reg(hkey, "Wine27a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine27b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine27c"); + verify_reg_nonexist(hkey, "Wine27d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Nikolay Sivov : d3drm: Make it possible to create meshes with CreateObject ().
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: d72c858693c22e7103f670548de8ed90903c2420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72c858693c22e7103f670548… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 15:39:32 2017 +0300 d3drm: Make it possible to create meshes with CreateObject(). 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 | 25 +++++++++++++++++++++++- dlls/d3drm/d3drm_private.h | 26 ++++++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 47 ++++++++++++++++------------------------------ dlls/d3drm/tests/d3drm.c | 4 +++- 4 files changed, 68 insertions(+), 34 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8ee3d56..b475844 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -149,6 +149,19 @@ static HRESULT d3drm_create_material_object(void **object, IDirect3DRM *d3drm) return hr; } +static HRESULT d3drm_create_mesh_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_mesh *mesh; + HRESULT hr; + + if (FAILED(hr = d3drm_mesh_create(&mesh, d3drm))) + return hr; + + *object = &mesh->IDirect3DRMMesh_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1299,6 +1312,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, {&CLSID_CDirect3DRMLight, d3drm_create_light_object}, {&CLSID_CDirect3DRMMaterial, d3drm_create_material_object}, + {&CLSID_CDirect3DRMMesh, d3drm_create_mesh_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", @@ -1365,9 +1379,18 @@ static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateMesh(IDirect3DRM3 *iface, IDirect3DRMMesh **mesh) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_mesh *object; + HRESULT hr; + TRACE("iface %p, mesh %p.\n", iface, mesh); - return Direct3DRMMesh_create(mesh); + if (FAILED(hr = d3drm_mesh_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *mesh = &object->IDirect3DRMMesh_iface; + + return S_OK; } static HRESULT WINAPI d3drm3_CreateMeshBuilder(IDirect3DRM3 *iface, IDirect3DRMMeshBuilder3 **mesh_builder) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 1b00e1a..af79b43 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -147,6 +147,30 @@ struct d3drm_mesh_builder DWORD *material_indices; }; +struct mesh_group +{ + unsigned nb_vertices; + D3DRMVERTEX* vertices; + unsigned nb_faces; + unsigned vertex_per_face; + DWORD face_data_size; + unsigned* face_data; + D3DCOLOR color; + IDirect3DRMMaterial2* material; + IDirect3DRMTexture3* texture; +}; + +struct d3drm_mesh +{ + struct d3drm_object obj; + IDirect3DRMMesh IDirect3DRMMesh_iface; + LONG ref; + IDirect3DRM *d3drm; + DWORD groups_capacity; + DWORD nb_groups; + struct mesh_group *groups; +}; + struct d3drm_light { struct d3drm_object obj; @@ -207,7 +231,7 @@ HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3d HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; +HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2afff7a..4f6c760 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -26,29 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct mesh_group -{ - unsigned nb_vertices; - D3DRMVERTEX* vertices; - unsigned nb_faces; - unsigned vertex_per_face; - DWORD face_data_size; - unsigned* face_data; - D3DCOLOR color; - IDirect3DRMMaterial2* material; - IDirect3DRMTexture3* texture; -}; - -struct d3drm_mesh -{ - struct d3drm_object obj; - IDirect3DRMMesh IDirect3DRMMesh_iface; - LONG ref; - DWORD groups_capacity; - DWORD nb_groups; - struct mesh_group *groups; -}; - struct coords_2d { D3DVALUE u; @@ -1977,7 +1954,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if if (!mesh) return E_POINTER; - hr = Direct3DRMMesh_create(mesh); + hr = IDirect3DRM_CreateMesh(mesh_builder->d3drm, mesh); if (FAILED(hr)) return hr; @@ -2422,6 +2399,8 @@ static ULONG WINAPI d3drm_mesh_Release(IDirect3DRMMesh *iface) { DWORD i; + d3drm_object_cleanup((IDirect3DRMObject *)iface, &mesh->obj); + IDirect3DRM_Release(mesh->d3drm); for (i = 0; i < mesh->nb_groups; ++i) { HeapFree(GetProcessHeap(), 0, mesh->groups[i].vertices); @@ -2449,17 +2428,21 @@ static HRESULT WINAPI d3drm_mesh_Clone(IDirect3DRMMesh *iface, static HRESULT WINAPI d3drm_mesh_AddDestroyCallback(IDirect3DRMMesh *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&mesh->obj, cb, ctx); } static HRESULT WINAPI d3drm_mesh_DeleteDestroyCallback(IDirect3DRMMesh *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&mesh->obj, cb, ctx); } static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data) @@ -2874,22 +2857,24 @@ static const struct IDirect3DRMMeshVtbl d3drm_mesh_vtbl = d3drm_mesh_GetGroupTexture, }; -HRESULT Direct3DRMMesh_create(IDirect3DRMMesh **mesh) +HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) { static const char classname[] = "Mesh"; struct d3drm_mesh *object; - TRACE("mesh %p.\n", mesh); + TRACE("mesh %p, d3drm %p.\n", mesh, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMMesh_iface.lpVtbl = &d3drm_mesh_vtbl; object->ref = 1; + object->d3drm = d3drm; + IDirect3DRM_AddRef(object->d3drm); d3drm_object_init(&object->obj, classname); - *mesh = &object->IDirect3DRMMesh_iface; + *mesh = object; return S_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 82e0166..a432816 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1487,6 +1487,7 @@ static void test_object(void) { &CLSID_CDirect3DRMLight, &IID_IDirect3DRMLight }, { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial }, { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial2 }, + { &CLSID_CDirect3DRMMesh, &IID_IDirect3DRMMesh }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1513,7 +1514,8 @@ static void test_object(void) BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) || IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight) || - IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial); + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMesh); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);

1 0

Nikolay Sivov : d3drm: Implement appdata property for the rest of objects.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 4e258f2985b076036f09c2fd5d490883fd0f79fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e258f2985b076036f09c2fd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 15:39:31 2017 +0300 d3drm: Implement appdata property for the rest of objects. 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/device.c | 14 +++++++---- dlls/d3drm/face.c | 46 ++++++++++++++++++++++--------------- dlls/d3drm/frame.c | 38 ++++++++++++++++++++---------- dlls/d3drm/light.c | 14 +++++++---- dlls/d3drm/material.c | 14 +++++++---- dlls/d3drm/meshbuilder.c | 60 ++++++++++++++++++++++++++++++------------------ 6 files changed, 122 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e258f2985b076036f09c…

1 0

Nikolay Sivov : d3drm: Implement object name property.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: e2090c5c6d422461cb8470e482af50d557e4c091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2090c5c6d422461cb8470e48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 15:39:30 2017 +0300 d3drm: Implement object name property. 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_main.c | 46 ++++++++++++++++++++++++ dlls/d3drm/d3drm_private.h | 4 ++- dlls/d3drm/device.c | 12 ++++--- dlls/d3drm/face.c | 44 +++++++++++++---------- dlls/d3drm/frame.c | 36 ++++++++++++------- dlls/d3drm/light.c | 12 ++++--- dlls/d3drm/material.c | 12 ++++--- dlls/d3drm/meshbuilder.c | 54 +++++++++------------------- dlls/d3drm/tests/d3drm.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/texture.c | 12 ++++--- dlls/d3drm/viewport.c | 24 ++++++++----- 11 files changed, 253 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2090c5c6d422461cb847…

1 0

Nikolay Sivov : d3drm: Make it possible to create material objects with CreateObject().
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 48a047027bc644d898c4ef5db5bf5b465b3dfc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a047027bc644d898c4ef5db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 15:39:29 2017 +0300 d3drm: Make it possible to create material objects with CreateObject(). 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 | 22 ++++++++++++++++++++-- dlls/d3drm/d3drm_private.h | 21 ++++++++++++++++++++- dlls/d3drm/material.c | 43 ++++++++++++++++++------------------------- dlls/d3drm/meshbuilder.c | 4 +++- dlls/d3drm/tests/d3drm.c | 5 ++++- 5 files changed, 65 insertions(+), 30 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index bf5721c..8ee3d56 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -136,6 +136,19 @@ static HRESULT d3drm_create_light_object(void **object, IDirect3DRM *d3drm) return hr; } +static HRESULT d3drm_create_material_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_material *material; + HRESULT hr; + + if (FAILED(hr = d3drm_material_create(&material, d3drm))) + return hr; + + *object = &material->IDirect3DRMMaterial2_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1285,6 +1298,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMMeshBuilder, d3drm_create_mesh_builder_object}, {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, {&CLSID_CDirect3DRMLight, d3drm_create_light_object}, + {&CLSID_CDirect3DRMMaterial, d3drm_create_material_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", @@ -1474,12 +1488,16 @@ static HRESULT WINAPI d3drm3_CreateLightRGB(IDirect3DRM3 *iface, D3DRMLIGHTTYPE static HRESULT WINAPI d3drm3_CreateMaterial(IDirect3DRM3 *iface, D3DVALUE power, IDirect3DRMMaterial2 **material) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_material *object; HRESULT hr; TRACE("iface %p, power %.8e, material %p.\n", iface, power, material); - if (SUCCEEDED(hr = Direct3DRMMaterial_create(material))) - IDirect3DRMMaterial2_SetPower(*material, power); + if (SUCCEEDED(hr = d3drm_material_create(&object, &d3drm->IDirect3DRM_iface))) + IDirect3DRMMaterial2_SetPower(&object->IDirect3DRMMaterial2_iface, power); + + *material = &object->IDirect3DRMMaterial2_iface; return hr; } diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 41f0c50..d6b884f 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -163,6 +163,25 @@ struct d3drm_light D3DVALUE penumbra; }; +struct color_rgb +{ + D3DVALUE r; + D3DVALUE g; + D3DVALUE b; +}; + +struct d3drm_material +{ + struct d3drm_object obj; + IDirect3DRMMaterial2 IDirect3DRMMaterial2_iface; + LONG ref; + IDirect3DRM *d3drm; + struct color_rgb emissive; + struct color_rgb specular; + D3DVALUE power; + struct color_rgb ambient; +}; + HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, IDirectDraw *ddraw, IDirectDrawClipper *clipper, int width, int height, IDirectDrawSurface **surface) DECLSPEC_HIDDEN; @@ -185,8 +204,8 @@ HRESULT d3drm_face_create(struct d3drm_face **face) DECLSPEC_HIDDEN; HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; +HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; -HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 6020600..699fedd 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -25,24 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct color_rgb -{ - D3DVALUE r; - D3DVALUE g; - D3DVALUE b; -}; - -struct d3drm_material -{ - struct d3drm_object obj; - IDirect3DRMMaterial2 IDirect3DRMMaterial2_iface; - LONG ref; - struct color_rgb emissive; - struct color_rgb specular; - D3DVALUE power; - struct color_rgb ambient; -}; - static inline struct d3drm_material *impl_from_IDirect3DRMMaterial2(IDirect3DRMMaterial2 *iface) { return CONTAINING_RECORD(iface, struct d3drm_material, IDirect3DRMMaterial2_iface); @@ -54,6 +36,7 @@ static HRESULT WINAPI d3drm_material_QueryInterface(IDirect3DRMMaterial2 *iface, if (IsEqualGUID(riid, &IID_IDirect3DRMMaterial2) || IsEqualGUID(riid, &IID_IDirect3DRMMaterial) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DRMMaterial2_AddRef(iface); @@ -85,7 +68,11 @@ static ULONG WINAPI d3drm_material_Release(IDirect3DRMMaterial2 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + d3drm_object_cleanup((IDirect3DRMObject *)iface, &material->obj); + IDirect3DRM_Release(material->d3drm); HeapFree(GetProcessHeap(), 0, material); + } return refcount; } @@ -101,17 +88,21 @@ static HRESULT WINAPI d3drm_material_Clone(IDirect3DRMMaterial2 *iface, static HRESULT WINAPI d3drm_material_AddDestroyCallback(IDirect3DRMMaterial2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&material->obj, cb, ctx); } static HRESULT WINAPI d3drm_material_DeleteDestroyCallback(IDirect3DRMMaterial2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&material->obj, cb, ctx); } static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, DWORD data) @@ -278,18 +269,20 @@ static const struct IDirect3DRMMaterial2Vtbl d3drm_material_vtbl = d3drm_material_SetAmbient, }; -HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2 **out) +HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3drm) { static const char classname[] = "Material"; struct d3drm_material *object; - TRACE("out %p.\n", out); + TRACE("material %p, d3drm %p.\n", material, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMMaterial2_iface.lpVtbl = &d3drm_material_vtbl; object->ref = 1; + object->d3drm = d3drm; + IDirect3DRM_AddRef(object->d3drm); object->specular.r = 1.0f; object->specular.g = 1.0f; @@ -297,7 +290,7 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2 **out) d3drm_object_init(&object->obj, classname); - *out = &object->IDirect3DRMMaterial2_iface; + *material = object; return S_OK; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index eda068c..377d751 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1232,6 +1232,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, IDirectXFileData *data; IDirectXFileDataReference *reference; IDirectXFileObject *material_child; + struct d3drm_material *object; hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) @@ -1251,12 +1252,13 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, IDirectXFileObject_Release(child); } - hr = Direct3DRMMaterial_create(&mesh_builder->materials[i].material); + hr = d3drm_material_create(&object, mesh_builder->d3drm); if (FAILED(hr)) { IDirectXFileData_Release(data); goto end; } + mesh_builder->materials[i].material = &object->IDirect3DRMMaterial2_iface; hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index fc19b97..6c29032 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1404,6 +1404,8 @@ static void test_object(void) { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame2 }, { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame3 }, { &CLSID_CDirect3DRMLight, &IID_IDirect3DRMLight }, + { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial }, + { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial2 }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1429,7 +1431,8 @@ static void test_object(void) { BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) || - IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight); + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);

1 0

Hans Leidekker : webservices: Add support for dynamic string callbacks.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 4019682855e269814dd3ada346d2996779483fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4019682855e269814dd3ada34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 22 10:43:11 2017 +0200 webservices: Add support for dynamic string callbacks. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 81 ++++++++++++++++++++++++++++++++++++++++- dlls/webservices/writer.c | 55 ++++++++++++++++++++-------- 2 files changed, 118 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4019682855e269814dd3a…

1 0

Hans Leidekker : webservices: Allow the dictionary functions to be used with any dictionary.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f7488ac67d36e525bdf9b5616299dd83a8722308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7488ac67d36e525bdf9b5616… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 22 10:43:10 2017 +0200 webservices: Allow the dictionary functions to be used with any dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 4 +- dlls/webservices/string.c | 98 +++++++++++++++++----------------- dlls/webservices/webservices_private.h | 10 +++- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 798bd4f..787f75b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5870,8 +5870,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * WS_XML_READER_BINARY_ENCODING *bin = (WS_XML_READER_BINARY_ENCODING *)encoding; reader->input_enc = WS_XML_READER_ENCODING_TYPE_BINARY; reader->input_charset = 0; - reader->dict_static = bin->staticDictionary ? bin->staticDictionary : &dict_builtin_static; - reader->dict = bin->dynamicDictionary ? bin->dynamicDictionary : &dict_builtin; + reader->dict_static = bin->staticDictionary ? bin->staticDictionary : &dict_builtin_static.dict; + reader->dict = bin->dynamicDictionary ? bin->dynamicDictionary : &dict_builtin.dict; break; } default: diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index a2e8685..f9df48f 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -44,10 +44,9 @@ static CRITICAL_SECTION_DEBUG dict_cs_debug = }; static CRITICAL_SECTION dict_cs = { &dict_cs_debug, -1, 0, 0, 0, 0 }; -static ULONG dict_size, *dict_sorted; -WS_XML_DICTIONARY dict_builtin = +struct dictionary dict_builtin = { - {0x82704485,0x222a,0x4f7c,{0xb9,0x7b,0xe9,0xa4,0x62,0xa9,0x66,0x2b}} + {{0x82704485,0x222a,0x4f7c,{0xb9,0x7b,0xe9,0xa4,0x62,0xa9,0x66,0x2b}}} }; static inline int cmp_string( const unsigned char *str, ULONG len, const unsigned char *str2, ULONG len2 ) @@ -63,22 +62,21 @@ static inline int cmp_string( const unsigned char *str, ULONG len, const unsigne } /* return -1 and string id if found, sort index if not found */ -static int find_string( const unsigned char *data, ULONG len, ULONG *id ) +static int find_string( const WS_XML_DICTIONARY *dict, const ULONG *sorted, const unsigned char *data, + ULONG len, ULONG *ret_id ) { - int i, c, min = 0, max = dict_builtin.stringCount - 1; + int i, c, min = 0, max = dict->stringCount - 1; while (min <= max) { i = (min + max) / 2; - c = cmp_string( data, len, - dict_builtin.strings[dict_sorted[i]].bytes, - dict_builtin.strings[dict_sorted[i]].length ); + c = cmp_string( data, len, dict->strings[sorted[i]].bytes, dict->strings[sorted[i]].length ); if (c < 0) max = i - 1; else if (c > 0) min = i + 1; else { - *id = dict_builtin.strings[dict_sorted[i]].id; + *ret_id = dict->strings[sorted[i]].id; return -1; } } @@ -88,50 +86,50 @@ static int find_string( const unsigned char *data, ULONG len, ULONG *id ) #define MIN_DICTIONARY_SIZE 256 #define MAX_DICTIONARY_SIZE 2048 -static BOOL grow_dict( ULONG size ) +static BOOL grow_dict( struct dictionary *dict, ULONG size ) { WS_XML_STRING *tmp; ULONG new_size, *tmp_sorted; - if (dict_size >= dict_builtin.stringCount + size) return TRUE; - if (dict_size + size > MAX_DICTIONARY_SIZE) return FALSE; + if (dict->size >= dict->dict.stringCount + size) return TRUE; + if (dict->size + size > MAX_DICTIONARY_SIZE) return FALSE; - if (!dict_builtin.strings) + if (!dict->dict.strings) { new_size = max( MIN_DICTIONARY_SIZE, size ); - if (!(dict_builtin.strings = heap_alloc( new_size * sizeof(WS_XML_STRING) ))) return FALSE; - if (!(dict_sorted = heap_alloc( new_size * sizeof(ULONG) ))) + if (!(dict->dict.strings = heap_alloc( new_size * sizeof(*dict->dict.strings) ))) return FALSE; + if (!(dict->sorted = heap_alloc( new_size * sizeof(*dict->sorted) ))) { - heap_free( dict_builtin.strings ); - dict_builtin.strings = NULL; + heap_free( dict->dict.strings ); + dict->dict.strings = NULL; return FALSE; } - dict_size = new_size; + dict->size = new_size; return TRUE; } - new_size = max( dict_size * 2, size ); - if (!(tmp = heap_realloc( dict_builtin.strings, new_size * sizeof(*tmp) ))) return FALSE; - dict_builtin.strings = tmp; - if (!(tmp_sorted = heap_realloc( dict_sorted, new_size * sizeof(*tmp_sorted) ))) return FALSE; - dict_sorted = tmp_sorted; + new_size = max( dict->size * 2, size ); + if (!(tmp = heap_realloc( dict->dict.strings, new_size * sizeof(*tmp) ))) return FALSE; + dict->dict.strings = tmp; + if (!(tmp_sorted = heap_realloc( dict->sorted, new_size * sizeof(*tmp_sorted) ))) return FALSE; + dict->sorted = tmp_sorted; - dict_size = new_size; + dict->size = new_size; return TRUE; } -static BOOL insert_string( unsigned char *data, ULONG len, int i, ULONG *ret_id ) +static BOOL insert_string( struct dictionary *dict, unsigned char *data, ULONG len, int i, ULONG *ret_id ) { - ULONG id = dict_builtin.stringCount; - if (!grow_dict( 1 )) return FALSE; - memmove( &dict_sorted[i] + 1, &dict_sorted[i], (dict_builtin.stringCount - i) * sizeof(WS_XML_STRING *) ); - dict_sorted[i] = id; - - dict_builtin.strings[id].length = len; - dict_builtin.strings[id].bytes = data; - dict_builtin.strings[id].dictionary = &dict_builtin; - dict_builtin.strings[id].id = id; - dict_builtin.stringCount++; + ULONG id = dict->dict.stringCount; + if (!grow_dict( dict, 1 )) return FALSE; + memmove( &dict->sorted[i] + 1, &dict->sorted[i], (dict->dict.stringCount - i) * sizeof(*dict->sorted) ); + dict->sorted[i] = id; + + dict->dict.strings[id].length = len; + dict->dict.strings[id].bytes = data; + dict->dict.strings[id].dictionary = &dict->dict; + dict->dict.strings[id].id = id; + dict->dict.stringCount++; *ret_id = id; return TRUE; } @@ -144,16 +142,16 @@ HRESULT add_xml_string( WS_XML_STRING *str ) if (str->dictionary) return S_OK; EnterCriticalSection( &dict_cs ); - if ((index = find_string( str->bytes, str->length, &id )) == -1) + if ((index = find_string( &dict_builtin.dict, dict_builtin.sorted, str->bytes, str->length, &id )) == -1) { heap_free( str->bytes ); - *str = dict_builtin.strings[id]; + *str = dict_builtin.dict.strings[id]; LeaveCriticalSection( &dict_cs ); return S_OK; } - if (insert_string( str->bytes, str->length, index, &id )) + if (insert_string( &dict_builtin, str->bytes, str->length, index, &id )) { - *str = dict_builtin.strings[id]; + *str = dict_builtin.dict.strings[id]; LeaveCriticalSection( &dict_cs ); return S_OK; } @@ -201,9 +199,9 @@ WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) } EnterCriticalSection( &dict_cs ); - if ((index = find_string( src->bytes, src->length, &id )) == -1) + if ((index = find_string( &dict_builtin.dict, dict_builtin.sorted, src->bytes, src->length, &id )) == -1) { - *ret = dict_builtin.strings[id]; + *ret = dict_builtin.dict.strings[id]; LeaveCriticalSection( &dict_cs ); return ret; } @@ -214,9 +212,9 @@ WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) return NULL; } memcpy( data, src->bytes, src->length ); - if (insert_string( data, src->length, index, &id )) + if (insert_string( &dict_builtin, data, src->length, index, &id )) { - *ret = dict_builtin.strings[id]; + *ret = dict_builtin.dict.strings[id]; LeaveCriticalSection( &dict_cs ); return ret; } @@ -230,10 +228,10 @@ WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) return ret; } -const WS_XML_DICTIONARY dict_builtin_static; +const struct dictionary dict_builtin_static; static const WS_XML_STRING dict_strings[] = { -#define X(str, id) { sizeof(str) - 1, (BYTE *)(str), (WS_XML_DICTIONARY *)&dict_builtin_static, id }, +#define X(str, id) { sizeof(str) - 1, (BYTE *)(str), (WS_XML_DICTIONARY *)&dict_builtin_static.dict, id }, X("mustUnderstand", 0) X("Envelope", 1) X("http://www.w3.org/2003/05/soap-envelope", 2) @@ -725,12 +723,12 @@ static const WS_XML_STRING dict_strings[] = #undef X }; -const WS_XML_DICTIONARY dict_builtin_static = +const struct dictionary dict_builtin_static = { - {0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}, - (WS_XML_STRING *)dict_strings, - sizeof(dict_strings) / sizeof(dict_strings[0]), - TRUE + {{0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}, + (WS_XML_STRING *)dict_strings, + sizeof(dict_strings) / sizeof(dict_strings[0]), + TRUE} }; /************************************************************************** diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 28bc6fb..cf6e1c4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -35,8 +35,14 @@ void ws_free( WS_HEAP *, void *, SIZE_T ) DECLSPEC_HIDDEN; struct xmlbuf *alloc_xmlbuf( WS_HEAP *, WS_XML_WRITER_ENCODING_TYPE, WS_CHARSET ) DECLSPEC_HIDDEN; void free_xmlbuf( struct xmlbuf * ) DECLSPEC_HIDDEN; -WS_XML_DICTIONARY dict_builtin DECLSPEC_HIDDEN; -const WS_XML_DICTIONARY dict_builtin_static DECLSPEC_HIDDEN; +struct dictionary +{ + WS_XML_DICTIONARY dict; + ULONG size; + ULONG *sorted; +}; +struct dictionary dict_builtin DECLSPEC_HIDDEN; +const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; ULONG format_bool( const BOOL *, unsigned char * ) DECLSPEC_HIDDEN; ULONG format_int8( const INT8 *, unsigned char * ) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : oledb32: Add FIXME for DBTYPE_NUMERIC type.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 6e148790f4ae852be437f4cb40d4ef63fa6c0c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e148790f4ae852be437f4cb4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:58 2017 +0000 oledb32: Add FIXME for DBTYPE_NUMERIC type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 59b2ecd..d959f65 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1081,7 +1081,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } - break; + + case DBTYPE_NUMERIC: + FIXME("Unimplemented conversion %04x -> DBTYPE_NUMERIC\n", src_type); + return E_NOTIMPL; default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type);

1 0

Alistair Leslie-Hughes : oledb32: Add support for converting to W/ STR types in GetConversionSize.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 23b5640b3286e71b9f9ea78aaa131298281469f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b5640b3286e71b9f9ea78aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:50 2017 +0000 oledb32: Add support for converting to W/STR types in GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 24 ++++++++++++ dlls/oledb32/tests/convert.c | 88 ++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23b5640b3286e71b9f9ea…

1 0

Alistair Leslie-Hughes : oledb32: Supply a default dst len in GetConversionSize.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: b257f29473c2315a2573bf759146afde8a3c4a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b257f29473c2315a2573bf759… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:39 2017 +0000 oledb32: Supply a default dst len in GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 + dlls/oledb32/tests/convert.c | 94 ++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b257f29473c2315a2573b…

1 0

Piotr Caban : gdi32: Don' t write EMR_EXTSELECTCLIPRGN to emf file on SelectClipPath call.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f629e9797dae61fd60ce3a727477caa02fdee22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f629e9797dae61fd60ce3a727… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 21 10:34:17 2017 +0200 gdi32: Don't write EMR_EXTSELECTCLIPRGN to emf file on SelectClipPath call. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 10 +++++++++- dlls/gdi32/tests/metafile.c | 31 ++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 91fde55..531392b 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -479,13 +479,21 @@ BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectClipPath ); EMRSELECTCLIPPATH emr; + BOOL ret = FALSE; + HRGN hrgn; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); emr.iMode = iMode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - return next->funcs->pSelectClipPath( next, iMode ); + hrgn = PathToRegion( dev->hdc ); + if (hrgn) + { + ret = next->funcs->pExtSelectClipRgn( next, hrgn, iMode ); + DeleteObject( hrgn ); + } + return ret; } BOOL EMFDRV_WidenPath( PHYSDEV dev ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 514e2b4..eeec79c 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2432,16 +2432,16 @@ static const unsigned char EMF_CLIPPING[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, + 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xd0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x01, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, - 0x7c, 0x01, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x60, 0xcc, 0x05, 0x00, - 0xe0, 0x93, 0x04, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x30, 0xda, 0x04, 0x00, 0x36, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, @@ -2451,9 +2451,16 @@ static const unsigned char EMF_CLIPPING[] = 0x64, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x00, 0x04, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, + 0xff, 0x03, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static void translate( POINT *pt, UINT count, const XFORM *xform ) @@ -2605,6 +2612,12 @@ static void test_emf_clipping(void) ret = SelectClipRgn(hdc, hrgn); ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + BeginPath(hdc); + Rectangle(hdc, rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); + EndPath(hdc); + ret = SelectClipPath(hdc, RGN_AND); + ok(ret, "SelectClipPath error %d\n", GetLastError()); + SetLastError(0xdeadbeef); hemf = CloseEnhMetaFile(hdc); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Dmitry Timoshkov : user.exe16: Remove redundant HeapReAlloc.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: a628412f2b21a003b4b43832cc5fb899ff393aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a628412f2b21a003b4b43832c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 15:56:27 2017 +0800 user.exe16: Remove redundant HeapReAlloc. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 4a00d58..267714a 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3288,9 +3288,6 @@ DWORD WINAPI FormatMessage16( *t='\0'; } talloced = strlen(target)+1; - if (nSize && talloced<nSize) { - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); - } TRACE("-- %s\n",debugstr_a(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */

1 0

Dmitry Timoshkov : user.exe16: Fix memory leak in case when HeapReAlloc fails.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 8c3ed829279cb7951688392801e3210abd19d27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3ed829279cb795168839280… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 15:56:24 2017 +0800 user.exe16: Fix memory leak in case when HeapReAlloc fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index aba797d..4a00d58 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3245,8 +3245,11 @@ DWORD WINAPI FormatMessage16( /* CMF - This makes a BIG assumption about va_list */ while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart)) < 0 || ret >= sz) { + LPSTR new_b; sz = (ret == -1 ? sz + 100 : ret + 1); - b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + new_b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + if (!new_b) break; + b = new_b; } for (x=b; *x; x++) ADD_TO_T(*x); HeapFree(GetProcessHeap(), 0, b);

1 0

Dmitry Timoshkov : rsaenh: Avoid double 'va_end(args)' in case of a premature loop termination.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f7fd2c2be10eee71d037cd038eb2d530d9a8f80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fd2c2be10eee71d037cd038… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:54:07 2017 +0800 rsaenh: Avoid double 'va_end(args)' in case of a premature loop termination. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/mpi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 03e3102..e05fa59 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -2365,11 +2365,8 @@ int mp_init_multi(mp_int *mp, ...) succeeded in init-ing, then return error. */ va_list clean_args; - - /* end the current list */ - va_end(args); - - /* now start cleaning up */ + + /* now start cleaning up */ cur_arg = mp; va_start(clean_args, mp); while (n--) {

1 0

Dmitry Timoshkov : propsys: Add support for VT_LPSTR and VT_LPWSTR to PropVariantCompareEx.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: ff9601147d88b04c99cd99629187d169d2111921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9601147d88b04c99cd99629… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:46 2017 +0800 propsys: Add support for VT_LPSTR and VT_LPWSTR to PropVariantCompareEx. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/propsys/tests/propsys.c | 4 ++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8a8698f..90e20e3 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -18,8 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #define NONAMELESSUNION @@ -112,6 +116,25 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, src_signed = FALSE; *res = 0; break; + case VT_LPSTR: + { + char *end; + *res = strtoll(pv->u.pszVal, &end, 0); + if (pv->u.pszVal == end) + return DISP_E_TYPEMISMATCH; + src_signed = *res < 0; + break; + } + case VT_LPWSTR: + case VT_BSTR: + { + WCHAR *end; + *res = strtolW(pv->u.pwszVal, &end, 0); + if (pv->u.pwszVal == end) + return DISP_E_TYPEMISMATCH; + src_signed = *res < 0; + break; + } default: FIXME("unhandled vt %d\n", pv->vt); return E_NOTIMPL; @@ -698,8 +721,19 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 CMP_INT_VALUE(uhVal.QuadPart); break; case VT_BSTR: - /* FIXME: Use string flags. */ - res = lstrcmpW(propvar1->u.bstrVal, propvar2->u.bstrVal); + case VT_LPWSTR: + /* FIXME: Use other string flags. */ + if (flags & (PVCF_USESTRCMPI | PVCF_USESTRCMPIC)) + res = lstrcmpiW(propvar1->u.bstrVal, propvar2_converted->u.bstrVal); + else + res = lstrcmpW(propvar1->u.bstrVal, propvar2_converted->u.bstrVal); + break; + case VT_LPSTR: + /* FIXME: Use other string flags. */ + if (flags & (PVCF_USESTRCMPI | PVCF_USESTRCMPIC)) + res = lstrcmpiA(propvar1->u.pszVal, propvar2_converted->u.pszVal); + else + res = lstrcmpA(propvar1->u.pszVal, propvar2_converted->u.pszVal); break; default: FIXME("vartype %d not handled\n", propvar1->vt); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 71b6a93..54b45ac 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -735,10 +735,10 @@ static void test_PropVariantCompare(void) ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &str_2, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &str_02, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&str_2, &i2_2, 0, 0); todo_wine ok(res == 0, "res=%i\n", res);

1 0

Paul Gofman : d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 5cbc84e51eca1a8ce35916ddeebe79b4ccbd761d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc84e51eca1a8ce35916dde… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 19 12:24:22 2017 +0300 d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d75c5ce..2a78074 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3230,7 +3230,7 @@ PS_OUTPUT RenderScenePS( VS_OUTPUT In, uniform bool2x3 mb) Output.RGBColor.xy += mul(Output.RGBColor, m3x2column); Output.RGBColor.xy += mul(Output.RGBColor, m3x2row); } - if (mb2x3column[0][1]) + if (mb2x3column[0][0]) { Output.RGBColor += sin(Output.RGBColor); Output.RGBColor += cos(Output.RGBColor); @@ -3486,7 +3486,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x00000002, 0x00000118, 0x00000128, 0x00000148, 0x00060002, 0x00000002, 0x00000150, 0x00000160, 0x00000180, 0x00000002, 0x00000003, 0x0000018c, 0x0000019c, 0x000001cc, 0x000a0002, 0x00000002, 0x000001d4, 0x000001e4, 0x00000204, 0x000c0002, 0x00000002, 0x00000210, 0x00000220, 0x00000240, - 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000002, 0x00000294, + 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000001, 0x00000294, 0x000002a4, 0x000002bc, 0x00000000, 0x00000005, 0x000002c8, 0x000002a4, 0x000002d8, 0x00000003, 0x00000001, 0x000002e4, 0x00000000, 0x56695f67, 0x00746365, 0x00020001, 0x00040001, 0x00000001, 0x00000000, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x3278326d, 0x756c6f63, 0xab006e6d, @@ -3543,7 +3543,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x80e40003, 0xa0e4000d, 0x03000002, 0x80030000, 0x80e40000, 0x80e40003, 0x03000005, 0x800c0000, 0x80550000, 0xa0440004, 0x04000004, 0x800c0000, 0x80000000, 0xa0440003, 0x80e40000, 0x04000004, 0x800c0000, 0x80aa0003, 0xa0440005, 0x80e40000, 0x03000002, 0x80030003, 0x80ee0000, 0x80e40000, - 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40806, 0x04000004, + 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40805, 0x04000004, 0x800f0000, 0x80e40003, 0xa0550010, 0xa0aa0010, 0x02000013, 0x800f0000, 0x80e40000, 0x04000004, 0x800f0000, 0x80e40000, 0xa000000f, 0xa055000f, 0x03000005, 0x800f0000, 0x80e40000, 0x80e40000, 0x04000004, 0x800f0002, 0x80e40000, 0xa0aa000f, 0xa0ff000f, 0x04000004, 0x800f0002, 0x80e40000, @@ -4317,7 +4317,7 @@ got (%g, %g, %g, %g), parameter %s.\n", static const BOOL test_effect_preshader_bconsts[] = { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE }; static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) @@ -6057,7 +6057,7 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) {14, 0, 0}, {15, 0, 14}, {16, 0, 1}, - {17, 0, 7}, + {17, 0, 6}, }; static D3DLIGHT9 light_filler = {D3DLIGHT_DIRECTIONAL, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}};

1 0

Matteo Bruni : d3dx9: Make the assert() in regstore_set_values() a bit more strict.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: bd7a12b23c51f19ee67beefa2512e4516d1a9850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7a12b23c51f19ee67beefa2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 21 21:54:21 2017 +0200 d3dx9: Make the assert() in regstore_set_values() a bit more strict. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2785ca3..7ca0c8f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -372,14 +372,17 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { - void *out; + BYTE *dst = rs->tables[table]; + const BYTE *src = data; + unsigned int size; if (!count) return; - out = (BYTE *)rs->tables[table] + start_offset * table_info[table].component_size; - assert(data != out); - memcpy(out, data, count * table_info[table].component_size); + dst += start_offset * table_info[table].component_size; + size = count * table_info[table].component_size; + assert((src < dst && size <= dst - src) || (src > dst && size <= src - dst)); + memcpy(dst, src, size); regstore_set_modified(rs, table, start_offset, count); }

1 0

Austin English : ntoskrnl.exe: Add KeReleaseSpinLock stub.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 362ceb2e5625c2a2162c6c5b432a36fc45b7ca1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=362ceb2e5625c2a2162c6c5b4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 21 13:29:37 2017 -0500 ntoskrnl.exe: Add KeReleaseSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 414e49b..ae706e0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -76,7 +76,7 @@ @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stub KeReleaseSpinLock +@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6287967..105bb7d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3251,3 +3251,11 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) FIXME( "stub: %p\n", spinlock ); return 0; } + +/*********************************************************************** + * KeReleaseSpinLock (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +{ + FIXME( "stub: %p %u\n", spinlock, irql ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index aba5cb5..339e7c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -592,6 +592,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) +@ stdcall KeReleaseSpinLock(ptr long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetContainerFormat.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: f25890357b8d897f67ceae7a43419f1a1c44c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25890357b8d897f67ceae7a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:22 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetContainerFormat. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 8e58684..29df42e 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -89,12 +89,13 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) return ref; } -static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUID *format) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%p)\n", This, pguidContainerFormat); - return E_NOTIMPL; + + TRACE("(%p,%p)\n", This, format); + + return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapSchemaToName.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 714175e1448c5b615b1658275c86296445e6c0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714175e1448c5b615b1658275… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:18 2017 +0800 windowscodecs: Implement WICMapSchemaToName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 127 ++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 196 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 325 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=714175e1448c5b615b165…

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapShortNameToGuid.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e1eed88401befee456852b6df3f213123c79c2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1eed88401befee456852b6df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:15 2017 +0800 windowscodecs: Implement WICMapShortNameToGuid. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 20 +++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 36 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 6d8efa0..a7eedc0 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -277,3 +277,23 @@ HRESULT WINAPI WICMapGuidToShortName(REFGUID guid, UINT len, WCHAR *name, UINT * return WINCODEC_ERR_PROPERTYNOTFOUND; } + +HRESULT WINAPI WICMapShortNameToGuid(PCWSTR name, GUID *guid) +{ + UINT i; + + TRACE("%s,%p\n", debugstr_w(name), guid); + + if (!name || !guid) return E_INVALIDARG; + + for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + { + if (!lstrcmpiW(name, guid2name[i].name)) + { + *guid = *guid2name[i].guid; + return S_OK; + } + } + + return WINCODEC_ERR_PROPERTYNOTFOUND; +} diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 4e9d691..f70ddad 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2017,11 +2017,47 @@ static void test_WICMapGuidToShortName(void) ok(hr == E_INVALIDARG, "got %#x\n", hr); } +static void test_WICMapShortNameToGuid(void) +{ + static const WCHAR unkW[] = { 'u','n','k',0 }; + static const WCHAR xmpW[] = { 'x','m','p',0 }; + static const WCHAR XmPW[] = { 'X','m','P',0 }; + static const WCHAR unknownW[] = { 'u','n','k','n','o','w','n',0 }; + HRESULT hr; + GUID guid; + + hr = WICMapShortNameToGuid(NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(NULL, &guid); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unknownW, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unkW, &guid); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unknownW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatUnknown), "got %s\n", wine_dbgstr_guid(&guid)); + + hr = WICMapShortNameToGuid(xmpW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatXMP), "got %s\n", wine_dbgstr_guid(&guid)); + + guid = GUID_NULL; + hr = WICMapShortNameToGuid(XmPW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatXMP), "got %s\n", wine_dbgstr_guid(&guid)); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_WICMapGuidToShortName(); + test_WICMapShortNameToGuid(); test_metadata_unknown(); test_metadata_tEXt(); test_metadata_gAMA(); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 0972aed..ace3b33 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -111,7 +111,7 @@ @ stub WICGetMetadataContentSize @ stdcall WICMapGuidToShortName(ptr long ptr ptr) @ stub WICMapSchemaToName -@ stub WICMapShortNameToGuid +@ stdcall WICMapShortNameToGuid(wstr ptr) @ stub WICMatchMetadataContent @ stub WICSerializeMetadataContent @ stdcall WICSetEncoderFormat_Proxy(ptr ptr ptr ptr) diff --git a/include/wincodec.idl b/include/wincodec.idl index 5c46aed..55f22d5 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1052,6 +1052,7 @@ interface IWICEnumMetadataItem : IUnknown cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") cpp_quote("HRESULT WINAPI WICMapGuidToShortName(REFGUID,UINT,WCHAR *,UINT *);") +cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(PCWSTR,GUID *);") cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") cpp_quote("DEFINE_GUID(CLSID_WICPngDecoder, 0x389ea17b,0x5078,0x4cde,0xb6,0xef,0x25,0xc1,0x51,0x75,0xc7,0x51);")

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapGuidToShortName.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 37ae4f24c05dac31523e770e58aff749ecbec2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ae4f24c05dac31523e770e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:10 2017 +0800 windowscodecs: Implement WICMapGuidToShortName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 129 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 60 +++++++++++++++- dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 2 + include/wincodecsdk.idl | 23 ++++++ 5 files changed, 214 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37ae4f24c05dac31523e7…

1 0

Ken Thomases : winemac: Break out of the window-dragging message loop if the window is hidden or destroyed.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 6250eb54fe7d6d8091768cab535b46493c78da6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6250eb54fe7d6d8091768cab5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 21 10:15:50 2017 -0500 winemac: Break out of the window-dragging message loop if the window is hidden or destroyed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 12 +++++++++++ dlls/winemac.drv/cocoa_window.m | 3 +++ dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/window.c | 45 +++++++++++++++++++++++++---------------- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e76a47c..c88b894 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -121,6 +121,7 @@ enum { - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed; - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged; + - (void) windowWillOrderOut:(WineWindow*)window; - (void) flipRect:(NSRect*)rect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 77be095..2cf67f1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1553,6 +1553,18 @@ static NSString* WineLocalizedString(unsigned int stringID) [self updateCursorClippingState]; } + - (void) windowWillOrderOut:(WineWindow*)window + { + if ([windowsBeingDragged containsObject:window]) + { + [self window:window isBeingDragged:NO]; + + macdrv_event* event = macdrv_create_event(WINDOW_DRAG_END, window); + [window.queue postEvent:event]; + macdrv_release_event(event); + } + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2333c1f..65dc392 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1653,6 +1653,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL wasVisible = [self isVisible]; BOOL wasOnActiveSpace = [self isOnActiveSpace]; + [self endWindowDragging]; + [controller windowWillOrderOut:self]; + if (enteringFullScreen || exitingFullScreen) { pendingOrderOut = TRUE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 53dcd87..bb0e8ed 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -136,13 +136,13 @@ struct macdrv_win_data RECT client_rect; /* client area relative to parent */ int pixel_format; /* pixel format for GL */ COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ + HANDLE drag_event; /* event to signal that Cocoa-driven window dragging has ended */ unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ unsigned int shaped : 1; /* is window using a custom region shape? */ unsigned int layered : 1; /* is window layered and with valid attributes? */ unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ unsigned int minimized : 1; /* is window minimized? */ - unsigned int being_dragged : 1; /* is window being dragged under Cocoa's control? */ unsigned int swap_interval : 1; /* GL swap interval for window */ struct window_surface *surface; struct window_surface *unminimized_surface; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e2de40d..bdd623d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1573,6 +1573,7 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); + if (data->drag_event) SetEvent(data->drag_event); destroy_cocoa_window(data); destroy_cocoa_view(data); @@ -2268,7 +2269,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, width, height); - being_dragged = data->being_dragged; + being_dragged = data->drag_event != NULL; release_win_data(data); if (event->window_frame_changed.fullscreen) @@ -2486,6 +2487,8 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) { DWORD style = GetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; + HANDLE drag_event = NULL; + BOOL loop = TRUE; MSG msg; TRACE("win %p\n", hwnd); @@ -2494,9 +2497,12 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) if (!(style & WS_VISIBLE)) return; if (!(data = get_win_data(hwnd))) return; - if (data->being_dragged) goto done; + if (data->drag_event) goto done; - data->being_dragged = TRUE; + drag_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!drag_event) goto done; + + data->drag_event = drag_event; release_win_data(data); if (!event->window_drag_begin.no_activate && can_activate_window(hwnd) && GetForegroundWindow() != hwnd) @@ -2515,13 +2521,22 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); ReleaseCapture(); - while (GetMessageW(&msg, 0, 0, 0)) + while (loop) { - if (msg.message == WM_EXITSIZEMOVE) + while (!PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { - SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - break; + DWORD result = MsgWaitForMultipleObjectsEx(1, &drag_event, INFINITE, QS_ALLINPUT, MWMO_INPUTAVAILABLE); + if (result == WAIT_OBJECT_0) + { + loop = FALSE; + break; + } } + if (!loop) + break; + + if (msg.message == WM_QUIT) + break; if (!CallMsgFilterW(&msg, MSGF_SIZE) && msg.message != WM_KEYDOWN && msg.message != WM_MOUSEMOVE && msg.message != WM_LBUTTONDOWN && msg.message != WM_LBUTTONUP) @@ -2531,13 +2546,16 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) } } + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + TRACE("done\n"); if ((data = get_win_data(hwnd))) - data->being_dragged = FALSE; + data->drag_event = NULL; done: release_win_data(data); + if (drag_event) CloseHandle(drag_event); } @@ -2549,20 +2567,13 @@ done: void macdrv_window_drag_end(HWND hwnd) { struct macdrv_win_data *data; - BOOL being_dragged; TRACE("win %p\n", hwnd); if (!(data = get_win_data(hwnd))) return; - being_dragged = data->being_dragged; + if (data->drag_event) + SetEvent(data->drag_event); release_win_data(data); - - if (being_dragged) - { - /* Post this rather than sending it, so that the message loop in - macdrv_window_drag_begin() will see it. */ - PostMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - } }

1 0

Jacek Caban : mshtml: Moved EvaluateNewWindow call to navigate_new_window.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 63205bf01d6c1ecb87f7a5b8100ad23d80b45585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63205bf01d6c1ecb87f7a5b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 21 17:05:31 2017 +0200 mshtml: Moved EvaluateNewWindow call to navigate_new_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 26 ++++---------------------- dlls/mshtml/navigate.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2914073..5853220 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -971,8 +971,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, { HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLOuterWindow *window = This->outer_window; - INewWindowManager *new_window_mgr; - BSTR uri_str; IUri *uri; HRESULT hres; @@ -980,6 +978,10 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); + if(features) + FIXME("unsupported features argument %s\n", debugstr_w(features)); + if(replace) + FIXME("unsupported relace argument\n"); if(!window->doc_obj || !window->uri_nofrag) return E_UNEXPECTED; @@ -1006,26 +1008,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return E_NOTIMPL; } - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, - (void**)&new_window_mgr); - if(FAILED(hres)) { - FIXME("No INewWindowManager\n"); - return E_NOTIMPL; - } - - hres = IUri_GetDisplayUri(window->uri_nofrag, &uri_str); - if(SUCCEEDED(hres)) { - hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, uri_str, - features, !!replace, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); - window->doc_obj->has_popup = TRUE; - SysFreeString(uri_str); - } - INewWindowManager_Release(new_window_mgr); - if(FAILED(hres)) { - *pomWindowResult = NULL; - return S_OK; - } - hres = create_relative_uri(window, url, &uri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9dec64d..423d650 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2238,12 +2238,44 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, request_data_t *request_data, IHTMLWindow2 **ret) { + INewWindowManager *new_window_mgr; + BSTR display_uri, context_url; IWebBrowser2 *web_browser; IHTMLWindow2 *new_window; IBindCtx *bind_ctx; nsChannelBSC *bsc; HRESULT hres; + hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, + (void**)&new_window_mgr); + if(SUCCEEDED(hres)) { + hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url); + if(FAILED(hres)) + return hres; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) { + SysFreeString(context_url); + return hres; + } + + hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url, + NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + window->doc_obj->has_popup = TRUE; + SysFreeString(display_uri); + SysFreeString(context_url); + INewWindowManager_Release(new_window_mgr); + if(FAILED(hres)) { + if(ret) + *ret = NULL; + return S_OK; + } + }else { + FIXME("No INewWindowManager\n"); + return E_NOTIMPL; + } + + if(request_data) hres = create_channelbsc(NULL, request_data->headers, request_data->post_data, request_data->post_data_len, FALSE,

1 0

Hugh McMaster : regedit: Display data for all values in the GUI.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 4a70d335528e390c50206478eba16052c17b566c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70d335528e390c50206478e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:27 2017 +0000 regedit: Display data for all values in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index a3bc72f..b758564 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -129,8 +129,13 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz ListView_SetItemTextW(hwndLV, index, 2, buf); break; } + case REG_MULTI_SZ: + MakeMULTISZDisplayable(data); + ListView_SetItemTextW(hwndLV, index, 2, data); + break; case REG_BINARY: case REG_NONE: + default: { unsigned int i; BYTE *pData = data; @@ -143,17 +148,6 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz HeapFree(GetProcessHeap(), 0, strBinary); break; } - case REG_MULTI_SZ: - MakeMULTISZDisplayable(data); - ListView_SetItemTextW(hwndLV, index, 2, data); - break; - default: - { - WCHAR szText[128]; - LoadStringW(hInst, IDS_REGISTRY_VALUE_CANT_DISPLAY, szText, COUNT_OF(szText)); - ListView_SetItemTextW(hwndLV, index, 2, szText); - break; - } } }

1 0

Hugh McMaster : regedit: Display all registry data types in the GUI.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 878a0a4e14b8e38f0d6909c4d522f8d2a1d54a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878a0a4e14b8e38f0d6909c4d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:06 2017 +0000 regedit: Display all registry data types in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 1365259..a3bc72f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -281,7 +281,10 @@ static void OnGetDispInfo(NMLVDISPINFOW* plvdi) plvdi->item.pszText = g_pszDefaultValueName; break; case 1: - switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { + { + DWORD data_type = ((LINE_INFO *)plvdi->item.lParam)->dwValType; + + switch (data_type) { case REG_SZ: plvdi->item.pszText = reg_szT; break; @@ -311,14 +314,14 @@ static void OnGetDispInfo(NMLVDISPINFOW* plvdi) break; default: { - WCHAR szUnknownFmt[64]; - LoadStringW(hInst, IDS_REGISTRY_UNKNOWN_TYPE, szUnknownFmt, COUNT_OF(szUnknownFmt)); - wsprintfW(buffer, szUnknownFmt, plvdi->item.lParam); + WCHAR fmt[] = {'0','x','%','x',0}; + wsprintfW(buffer, fmt, data_type); plvdi->item.pszText = buffer; break; } } break; + } case 2: plvdi->item.pszText = g_szValueNotSet; break;

1 0

Hugh McMaster : regedit: Fail when parsing any hex data type that is greater than ULONG_MAX on Windows.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 8803b9616bce64066a7a087148d49caa1adb8f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8803b9616bce64066a7a08714… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:18:53 2017 +0000 regedit: Fail when parsing any hex data type that is greater than ULONG_MAX on Windows. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 +++-- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e75ebec..bc488d3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -319,8 +320,8 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) DWORD val; /* "hex(xx):" is special */ - val = strtoulW(*line, &end, 16); - if (!**line || *end != ')' || *(end + 1) != ':') + val = wcstoul(*line, &end, 16); + if (!**line || *end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) return FALSE; parser->data_type = val; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 96091f8..79f7571 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -464,7 +464,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); - todo_wine verify_reg_nonexist(hkey, "Wine13i"); + verify_reg_nonexist(hkey, "Wine13i"); RegCloseKey(hkey);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: c0312bf79e6558ed5cfca114751a65e0040d8adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0312bf79e6558ed5cfca1147… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 14:13:56 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 101e986..bb93b02 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-08 13:21+0300\n" +"PO-Revision-Date: 2017-06-21 14:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12064,10 +12064,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: тип данных [%1] не поддерживается\n" +msgstr "regedit: тип данных [0x%1!x!] не поддерживается\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12257,7 +12255,7 @@ msgstr "Вы точно хотите удалить ключ реестра «%1 #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Разворачивает или сворачивает выбранный раздел" #: regedit.rc:231 msgid "Collapse"

1 0

Zebediah Figura : quartz: Use nAvgBytesPerSec to calculate length.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e994c62e3e66aebe137a3f2b15bdf3246fdaa08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e994c62e3e66aebe137a3f2b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:32 2017 -0500 quartz: Use nAvgBytesPerSec to calculate length. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/quartz/waveparser.c | 18 +++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9e8f69c..7902955 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -115,9 +115,9 @@ static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { static DWORD pos_from_time(DSoundRenderImpl *This, REFERENCE_TIME time) { WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->renderer.pInputPin->pin.mtCurrent.pbFormat; REFERENCE_TIME ret = time; - ret *= wfx->nSamplesPerSec; + ret *= wfx->nAvgBytesPerSec; ret /= 10000000; - ret *= wfx->nBlockAlign; + ret -= ret % wfx->nBlockAlign; return ret; } @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ TRACE("Format = %p\n", format); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec); + TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec); TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec); TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 6e8c664..f6bea2c 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -43,9 +43,8 @@ typedef struct WAVEParserImpl ParserImpl Parser; LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; - DWORD dwSampleSize; - DWORD nSamplesPerSec; - DWORD dwLength; + DWORD nAvgBytesPerSec; + DWORD nBlockAlign; } WAVEParserImpl; static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) @@ -62,7 +61,7 @@ static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) { LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); duration *= 10000000; - duration /= (This->dwSampleSize * This->nSamplesPerSec); + duration /= This->nAvgBytesPerSec; return duration; } @@ -71,11 +70,11 @@ static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration) { LONGLONG bytepos; - bytepos = (This->dwSampleSize * This->nSamplesPerSec); + bytepos = This->nAvgBytesPerSec; bytepos *= duration; bytepos /= 10000000; + bytepos -= bytepos % This->nBlockAlign; bytepos += BYTES_FROM_MEDIATIME(This->StartOfFile); - bytepos -= bytepos % This->dwSampleSize; return MEDIATIME_FROM_BYTES(bytepos); } @@ -252,7 +251,6 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, PIN_INFO piOutput; AM_MEDIA_TYPE amt; WAVEParserImpl * pWAVEParser = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - LONGLONG length, avail; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; @@ -321,10 +319,8 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, props->cbPrefix = 0; props->cbBuffer = 4096; props->cBuffers = 3; - pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; - IAsyncReader_Length(This->pReader, &length, &avail); - pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; - pWAVEParser->nSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nSamplesPerSec; + pWAVEParser->nBlockAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pWAVEParser->nAvgBytesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nAvgBytesPerSec; hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, props, &amt); CoTaskMemFree(amt.pbFormat);

1 0

Zebediah Figura : quartz: Restore a comment explaining mediatime.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e1d14d2665be5615cad7db519ef3cc2dd067cc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d14d2665be5615cad7db519… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:31 2017 -0500 quartz: Restore a comment explaining mediatime. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7cad3a7..a9855e9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -33,6 +33,7 @@ #include "wine/strmbase.h" #include "wine/list.h" +/* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) #define BYTES_FROM_MEDIATIME(time) SEC_FROM_MEDIATIME(time)

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of EnumDisplaySettingsEx.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 1aa8cf05000cfc7f560835dc01ab3afb2f2a2fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa8cf05000cfc7f560835dc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:58 2017 +0200 wineandroid: Add a stub implementation of EnumDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 39 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 75905a4..54be12a 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -268,6 +268,45 @@ BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC pr } +/*********************************************************************** + * ANDROID_EnumDisplaySettingsEx + */ +BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) +{ + static const WCHAR dev_name[CCHDEVICENAME] = + { 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 }; + + devmode->dmSize = offsetof( DEVMODEW, dmICMMethod ); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + memcpy( devmode->dmDeviceName, dev_name, sizeof(dev_name) ); + devmode->dmDriverExtra = 0; + devmode->u2.dmDisplayFlags = 0; + devmode->dmDisplayFrequency = 0; + devmode->u1.s2.dmPosition.x = 0; + devmode->u1.s2.dmPosition.y = 0; + devmode->u1.s2.dmDisplayOrientation = 0; + devmode->u1.s2.dmDisplayFixedOutput = 0; + + if (n == ENUM_CURRENT_SETTINGS || n == ENUM_REGISTRY_SETTINGS) n = 0; + if (n == 0) + { + devmode->dmPelsWidth = screen_width; + devmode->dmPelsHeight = screen_height; + devmode->dmBitsPerPel = screen_bpp; + devmode->dmDisplayFrequency = 60; + devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + TRACE( "mode %d -- %dx%d %d bpp @%d Hz\n", n, + devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); + return TRUE; + } + TRACE( "mode %d -- not present\n", n ); + SetLastError( ERROR_NO_MORE_FILES ); + return FALSE; +} + + static const struct gdi_dc_funcs android_drv_funcs = { NULL, /* pAbortDoc */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 8e98baa..3439ff6 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -11,6 +11,7 @@ @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors +@ cdecl EnumDisplaySettingsEx(ptr long ptr long) ANDROID_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of ChangeDisplaySettingsEx.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 508d7a33e38ab5faf524327b7680132accc83e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508d7a33e38ab5faf524327b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:40 2017 +0200 wineandroid: Add a stub implementation of ChangeDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 11 +++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 871e41d..75905a4 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -207,6 +207,17 @@ static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) /*********************************************************************** + * ANDROID_ChangeDisplaySettingsEx + */ +LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, + HWND hwnd, DWORD flags, LPVOID lpvoid ) +{ + FIXME( "(%s,%p,%p,0x%08x,%p)\n", debugstr_w( devname ), devmode, hwnd, flags, lpvoid ); + return DISP_CHANGE_SUCCESSFUL; +} + + +/*********************************************************************** * ANDROID_GetMonitorInfo */ BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 918140f..8e98baa 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx +@ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Dmitry Timoshkov : cmd: '$E' in the prompt should be interpreted as an escape code (0x1b).
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 586e171d6fc81db670d290ebcc84fc467db7c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e171d6fc81db670d290ebc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:24:11 2017 +0800 cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1aa3c1c..102e485 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -379,7 +379,7 @@ static void WCMD_show_prompt (void) { while (*q) q++; break; case 'E': - *q++ = '\E'; + *q++ = '\x1b'; break; case 'F': *q++ = ')';

1 0

Hans Leidekker : winhttp: Only read as much data as advertized when draining content.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 09238973e82bdb9e17637319c02389f7d0db0b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09238973e82bdb9e17637319c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:39:10 2017 +0200 winhttp: Only read as much data as advertized when draining content. Fixes a regression caused by 2fa86fd6616e1671dd3ecfa3d2d6eaccf10be994. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index db6d12d..f35d73b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1302,13 +1302,20 @@ done: /* read any content returned by the server so that the connection can be reused */ static void drain_content( request_t *request ) { - DWORD bytes_read; + DWORD size, bytes_read, bytes_total = 0, bytes_left = request->content_length - request->content_read; char buffer[2048]; refill_buffer( request, FALSE ); for (;;) { - if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; + if (request->read_chunked) size = sizeof(buffer); + else + { + if (bytes_total >= bytes_left) return; + size = min( sizeof(buffer), bytes_left - bytes_total ); + } + if (!read_data( request, buffer, size, &bytes_read, FALSE ) || !bytes_read) return; + bytes_total += bytes_read; } }

1 0

Hans Leidekker : webservices: Add support for reading WS_XML_QNAME values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 7fef84e3c5400d01373eeca3999f7959ad92a660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fef84e3c5400d01373eeca39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:42 2017 +0200 webservices: Add support for reading WS_XML_QNAME values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 336 ++++++++++++++++++++++------------------ dlls/webservices/tests/reader.c | 27 ++++ 2 files changed, 216 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fef84e3c5400d01373ee…

1 0

Hans Leidekker : webservices: Add support for reading WS_XML_STRING values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: db6476f0aea58973fa9f8fc7aaefc1eeb14d296e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6476f0aea58973fa9f8fc7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:41 2017 +0200 webservices: Add support for reading WS_XML_STRING values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 69 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 11 +++++-- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4b2706b..dbe993b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3663,6 +3663,18 @@ static HRESULT str_to_bytes( const unsigned char *str, ULONG len, WS_HEAP *heap, return S_OK; } +static HRESULT str_to_xml_string( const unsigned char *str, ULONG len, WS_HEAP *heap, WS_XML_STRING *ret ) +{ + const unsigned char *p = str; + + if (!(ret->bytes = ws_alloc( heap, len ))) return WS_E_QUOTA_EXCEEDED; + memcpy( ret->bytes, p, len ); + ret->length = len; + ret->dictionary = NULL; + ret->id = 0; + return S_OK; +} + static const int month_offsets[2][12] = { {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}, @@ -4882,6 +4894,58 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_XML_STRING_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + WS_XML_STRING val = {0}; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_xml_string( utf8->value.bytes, utf8->value.length, heap, &val )) != S_OK) + return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_NILLABLE_VALUE: + if (size != sizeof(val)) return E_INVALIDARG; + *(WS_XML_STRING *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + { + WS_XML_STRING *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(WS_XML_STRING **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static BOOL is_empty_text_node( const struct node *node ) { const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; @@ -5468,6 +5532,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_XML_STRING_TYPE: + if ((hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + case WS_STRUCT_TYPE: if ((hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index bbb899e..d528eca 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1379,8 +1379,7 @@ static void test_WsReadType(void) WS_XML_READER *reader; WS_HEAP *heap; enum { ONE = 1, TWO = 2 }; - WS_XML_STRING one = { 3, (BYTE *)"ONE" }; - WS_XML_STRING two = { 3, (BYTE *)"TWO" }; + WS_XML_STRING one = { 3, (BYTE *)"ONE" }, two = { 3, (BYTE *)"TWO" }, val_xmlstr; WS_ENUM_VALUE enum_values[] = { { ONE, &one }, { TWO, &two } }; WS_ENUM_DESCRIPTION enum_desc; int val_enum; @@ -1696,6 +1695,14 @@ static void test_WsReadType(void) ok( val_str != NULL, "pointer not set\n" ); if (val_str) ok( !lstrcmpW( val_str, utf8W ), "wrong data %s\n", wine_dbgstr_w(val_str) ); + memset( &val_xmlstr, 0, sizeof(val_xmlstr) ); + prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_xmlstr, sizeof(val_xmlstr), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_xmlstr.length == 6, "got %u\n", val_xmlstr.length ); + ok( !memcmp( val_xmlstr.bytes, " test ", 6 ), "wrong data\n" ); + memset( &val_string, 0, sizeof(val_string) ); prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL,

1 0

Hans Leidekker : webservices: Add support for reading WS_UNIQUE_ID values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 164024eaa9692c0e9718318d6929581bbd2ef067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164024eaa9692c0e9718318d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:40 2017 +0200 webservices: Add support for reading WS_UNIQUE_ID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 36 +++++++++++++++------ 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7a0064e..4b2706b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3578,6 +3578,19 @@ static HRESULT str_to_string( const unsigned char *str, ULONG len, WS_HEAP *heap return S_OK; } +static HRESULT str_to_unique_id( const unsigned char *str, ULONG len, WS_HEAP *heap, WS_UNIQUE_ID *ret ) +{ + if (len == 45 && !memcmp( str, "urn:uuid:", 9 )) + { + ret->uri.length = 0; + ret->uri.chars = NULL; + return str_to_guid( str + 9, len - 9, &ret->guid ); + } + + memset( &ret->guid, 0, sizeof(ret->guid) ); + return str_to_string( str, len, heap, &ret->uri ); +} + static inline unsigned char decode_char( unsigned char c ) { if (c >= 'A' && c <= 'Z') return c - 'A'; @@ -4714,6 +4727,57 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_UNIQUE_ID_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + WS_UNIQUE_ID val = {{0}}; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_unique_id( utf8->value.bytes, utf8->value.length, heap, &val )) != S_OK) return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_NILLABLE_VALUE: + if (size != sizeof(val)) return E_INVALIDARG; + *(WS_UNIQUE_ID *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + { + WS_UNIQUE_ID *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(WS_UNIQUE_ID **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, @@ -4976,6 +5040,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) case WS_DOUBLE_TYPE: case WS_DATETIME_TYPE: case WS_GUID_TYPE: + case WS_UNIQUE_ID_TYPE: case WS_STRING_TYPE: case WS_BYTES_TYPE: case WS_XML_STRING_TYPE: @@ -5383,6 +5448,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_UNIQUE_ID_TYPE: + if ((hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + case WS_STRING_TYPE: if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index c5809db..bbb899e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -22,6 +22,8 @@ #include "webservices.h" #include "wine/test.h" +static const GUID guid_null; + static const char data1[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; @@ -1360,9 +1362,6 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si hr = set_input( reader, data, size ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsFillReader( reader, size, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1373,8 +1372,7 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {' ','t','e','s','t',' '}; - static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; - static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; + static const GUID guid = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; static const WCHAR utf8W[] = {0x2019,0}; HRESULT hr; @@ -1399,6 +1397,7 @@ static void test_WsReadType(void) GUID val_guid; WS_BYTES val_bytes; WS_STRING val_string; + WS_UNIQUE_ID val_id; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1650,7 +1649,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( IsEqualGUID( &val_guid, &guid1 ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid_null ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000a1</t>", @@ -1658,7 +1657,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( IsEqualGUID( &val_guid, &guid2 ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000A1</t>", @@ -1666,7 +1665,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( IsEqualGUID( &val_guid, &guid2 ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid ), "wrong guid\n" ); memset( &val_bytes, 0, sizeof(val_bytes) ); prepare_type_test( reader, "<t>dGVzdA==</t>", sizeof("<t>dGVzdA==</t>") - 1 ); @@ -1705,6 +1704,26 @@ static void test_WsReadType(void) ok( val_string.length == 6, "got %u\n", val_string.length ); ok( !memcmp( val_string.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + memset( &val_id, 0, sizeof(val_id) ); + val_id.guid.Data1 = 0xdeadbeef; + prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_id.uri.length == 6, "got %u\n", val_string.length ); + ok( !memcmp( val_id.uri.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + ok( IsEqualGUID( &val_id.guid, &guid_null ), "wrong guid\n" ); + + memset( &val_id, 0, sizeof(val_id) ); + prepare_type_test( reader, "<t>urn:uuid:00000000-0000-0000-0000-0000000000a1</t>", + sizeof("<t>urn:uuid:00000000-0000-0000-0000-0000000000a1</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !val_id.uri.length, "got %u\n", val_string.length ); + ok( val_id.uri.chars == NULL, "chars set %s\n", wine_dbgstr_wn(val_id.uri.chars, val_id.uri.length) ); + ok( IsEqualGUID( &val_id.guid, &guid ), "wrong guid\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); } @@ -3842,7 +3861,6 @@ static void test_field_options(void) static const char xml[] = "<t xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"><wsz i:nil=\"true\"/>" "<s i:nil=\"true\"/></t>"; - static const GUID guid_null = {0}; HRESULT hr; WS_HEAP *heap; WS_XML_READER *reader;

1 0

Hans Leidekker : webservices: Add support for reading WS_STRING values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 9fa4ed7860a1ac52352b5281a07bf80c07bfe4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa4ed7860a1ac52352b5281a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:39 2017 +0200 webservices: Add support for reading WS_STRING values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 86 +++++++++++++++++++++++++++++++++++++---- dlls/webservices/tests/reader.c | 11 +++++- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 2dad976..7a0064e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3565,6 +3565,19 @@ static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) return S_OK; } +static HRESULT str_to_string( const unsigned char *str, ULONG len, WS_HEAP *heap, WS_STRING *ret ) +{ + const unsigned char *p = str; + int len_utf16; + + len_utf16 = MultiByteToWideChar( CP_UTF8, 0, (const char *)p, len, NULL, 0 ); + if (!(ret->chars = ws_alloc( heap, len_utf16 * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; + MultiByteToWideChar( CP_UTF8, 0, (const char *)p, len, ret->chars, len_utf16 ); + ret->length = len_utf16; + + return S_OK; +} + static inline unsigned char decode_char( unsigned char c ) { if (c >= 'A' && c <= 'Z') return c - 'A'; @@ -3976,7 +3989,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(BOOL)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(BOOL *)ret = val; break; @@ -4196,7 +4209,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(INT64)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(INT64 *)ret = val; break; @@ -4416,7 +4429,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(UINT64)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(UINT64 *)ret = val; break; @@ -4467,7 +4480,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(double)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(double *)ret = val; break; @@ -4570,7 +4583,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(int)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(int *)ret = val; break; @@ -4621,7 +4634,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(WS_DATETIME)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(WS_DATETIME *)ret = val; break; @@ -4672,7 +4685,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(GUID)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(GUID *)ret = val; break; @@ -4701,6 +4714,58 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + WS_STRING val = {0}; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_string( utf8->value.bytes, utf8->value.length, heap, &val )) != S_OK) + return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_NILLABLE_VALUE: + if (size != sizeof(val)) return E_INVALIDARG; + *(WS_STRING *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + { + WS_STRING *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(WS_STRING **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BYTES_DESCRIPTION *desc, WS_READ_OPTION option, @@ -4724,7 +4789,7 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(WS_BYTES)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(WS_BYTES *)ret = val; break; @@ -5318,6 +5383,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_STRING_TYPE: + if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + case WS_WSZ_TYPE: if ((hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 466ba78..c5809db 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1372,7 +1372,7 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {' ','t','e','s','t',' '}; static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; @@ -1398,6 +1398,7 @@ static void test_WsReadType(void) UINT64 val_uint64; GUID val_guid; WS_BYTES val_bytes; + WS_STRING val_string; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1696,6 +1697,14 @@ static void test_WsReadType(void) ok( val_str != NULL, "pointer not set\n" ); if (val_str) ok( !lstrcmpW( val_str, utf8W ), "wrong data %s\n", wine_dbgstr_w(val_str) ); + memset( &val_string, 0, sizeof(val_string) ); + prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_string, sizeof(val_string), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_string.length == 6, "got %u\n", val_string.length ); + ok( !memcmp( val_string.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Hans Leidekker : webservices: Add support for writing WS_XML_QNAME values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: f07f21cafe2f24dc98e7453882bcf253559ff7d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07f21cafe2f24dc98e745388… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:38 2017 +0200 webservices: Add support for writing WS_XML_QNAME values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 22 +++++++- dlls/webservices/writer.c | 120 +++++++++++++++++++++++++++++----------- include/webservices.h | 19 +++++++ 3 files changed, 128 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f07f21cafe2f24dc98e74…

1 0

Hans Leidekker : webservices: Add support for writing WS_UNIQUE_ID values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 1746d162e748508624217bf661cb167affdcd6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1746d162e748508624217bf66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:37 2017 +0200 webservices: Add support for writing WS_UNIQUE_ID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 20 ++++++++++++++++++++ dlls/webservices/writer.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 03a9788..9cb6c7d 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -679,6 +679,7 @@ static void test_basic_type(void) WCHAR *str; WS_STRING string; WS_BYTES bytes; + WS_UNIQUE_ID id; ULONG i; static const struct { @@ -830,6 +831,25 @@ static void test_basic_type(void) check_output( writer, "<t a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/>", __LINE__ ); + prepare_basic_type_test( writer ); + memset( &id, 0, sizeof(id) ); + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &id, sizeof(id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>urn:uuid:00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + + prepare_basic_type_test( writer ); + id.uri.length = 4; + id.uri.chars = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &id, sizeof(id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>test</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 2f2cd5d..9272b59 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2615,6 +2615,40 @@ static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_UNIQUE_ID_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size ) +{ + WS_XML_UTF8_TEXT utf8; + WS_XML_UTF16_TEXT utf16; + unsigned char buf[46]; /* "urn:uuid:00000000-0000-0000-0000-000000000000" */ + const WS_UNIQUE_ID *ptr; + HRESULT hr; + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + + if (!option || option == WS_WRITE_NILLABLE_VALUE) return E_INVALIDARG; + if ((hr = get_value_ptr( option, value, size, sizeof(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); + + if (ptr->uri.length) + { + utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16.bytes = (BYTE *)ptr->uri.chars; + utf16.byteCount = ptr->uri.length * sizeof(WCHAR); + return write_type_text( writer, mapping, &utf16.text ); + } + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = buf; + utf8.value.length = format_urn( &ptr->guid, buf ); + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_STRING_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -2740,6 +2774,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) case WS_DOUBLE_TYPE: case WS_DATETIME_TYPE: case WS_GUID_TYPE: + case WS_UNIQUE_ID_TYPE: case WS_STRING_TYPE: case WS_BYTES_TYPE: case WS_XML_STRING_TYPE: @@ -2956,6 +2991,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_GUID_TYPE: return write_type_guid( writer, mapping, desc, option, value, size ); + case WS_UNIQUE_ID_TYPE: + return write_type_unique_id( writer, mapping, desc, option, value, size ); + case WS_STRING_TYPE: return write_type_string( writer, mapping, desc, option, value, size );

1 0

Zhenbo Li : ole32: Add stub for OleGetIconOfFile.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 13c6d37766b2d327583123be583c026b1ea0ec13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c6d37766b2d327583123be5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Jun 21 00:13:28 2017 -0600 ole32: Add stub for OleGetIconOfFile. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2stubs.c | 9 +++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 90862d0..d7fd58c 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -63,6 +63,15 @@ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseT } /*********************************************************************** + * OleGetIconOfFile [OLE32.@] + */ +HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) +{ + FIXME("(%s, %d), stub!\n", debugstr_w(path), use_file_as_label); + return NULL; +} + +/*********************************************************************** * OleRegEnumFormatEtc [OLE32.@] */ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 58bdd22..d5a71b3 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -207,7 +207,7 @@ @ stdcall OleGetAutoConvert(ptr ptr) @ stdcall OleGetClipboard(ptr) @ stdcall OleGetIconOfClass(ptr ptr long) -@ stub OleGetIconOfFile +@ stdcall OleGetIconOfFile(wstr long) @ stdcall OleInitialize(ptr) @ stdcall OleInitializeWOW(long long) @ stdcall OleIsCurrentClipboard(ptr)

1 0

Daniel Lehman : winedbg: Display movups in disassembly.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 068fc3f2fee16087c1ce953cc1ba8157ded7a1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068fc3f2fee16087c1ce953cc… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jun 20 19:13:17 2017 -0700 winedbg: Display movups in disassembly. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm64.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 4957eeb..3db0b5e 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -270,6 +270,26 @@ static const struct inst db_inst_0f0x[] = { /*0f*/ { "", FALSE, NONE, 0, 0 }, }; +static const struct inst db_inst_0f1x[] = { +/*10*/ { "movups",TRUE, NONE, op2(E, XMM), 0 }, +/*11*/ { "movups",TRUE, NONE, op2(XMM, E), 0 }, +/*12*/ { "", FALSE, NONE, 0, 0 }, +/*13*/ { "", FALSE, NONE, 0, 0 }, +/*14*/ { "", FALSE, NONE, 0, 0 }, +/*15*/ { "", FALSE, NONE, 0, 0 }, +/*16*/ { "", FALSE, NONE, 0, 0 }, +/*17*/ { "", FALSE, NONE, 0, 0 }, + +/*18*/ { "", FALSE, NONE, 0, 0 }, +/*19*/ { "", FALSE, NONE, 0, 0 }, +/*1a*/ { "", FALSE, NONE, 0, 0 }, +/*1b*/ { "", FALSE, NONE, 0, 0 }, +/*1c*/ { "", FALSE, NONE, 0, 0 }, +/*1d*/ { "", FALSE, NONE, 0, 0 }, +/*1e*/ { "", FALSE, NONE, 0, 0 }, +/*1f*/ { "", FALSE, NONE, 0, 0 }, +}; + static const struct inst db_inst_0f2x[] = { /*20*/ { "mov", TRUE, LONG, op2(CR,El), 0 }, /*21*/ { "mov", TRUE, LONG, op2(DR,El), 0 }, @@ -491,7 +511,7 @@ static const struct inst db_inst_0fcx[] = { static const struct inst * const db_inst_0f[] = { db_inst_0f0x, - 0, + db_inst_0f1x, db_inst_0f2x, db_inst_0f3x, db_inst_0f4x,

1 0

Austin English : dbgeng: Sync to windows 10.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 444a7fbf56894d417674b5bb943cb0eb16e9f247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444a7fbf56894d417674b5bb9… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 20 20:03:04 2017 -0500 dbgeng: Sync to windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec index 1ad1099..f2f735c 100644 --- a/dlls/dbgeng/dbgeng.spec +++ b/dlls/dbgeng/dbgeng.spec @@ -1,3 +1,6 @@ -@ stdcall DebugExtensionInitialize(ptr ptr) -@ stdcall DebugCreate(ptr ptr) +327 stub @ @ stdcall DebugConnect(str ptr ptr) +@ stub DebugConnectWide +@ stdcall DebugCreate(ptr ptr) +@ stub DebugCreateEx +@ stdcall DebugExtensionInitialize(ptr ptr)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017