November 2016 - Wine-commits

Henri Verbeet : d3drm: Use the correct alpha value in D3DRMCreateColorRGB( ).
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: cf9ee8493084581ba9227ad5e6463ed1506acf7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9ee8493084581ba9227ad5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:38 2016 +0100 d3drm: Use the correct alpha value in D3DRMCreateColorRGB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 4ccde60..72cb267 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -27,7 +27,7 @@ /* Create a RGB color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) { - return (D3DRMCreateColorRGBA(red, green, blue, 255.0)); + return D3DRMCreateColorRGBA(red, green, blue, 1.0f); } /* Create a RGBA color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE red, D3DVALUE green, D3DVALUE blue, D3DVALUE alpha)

1 0

Henri Verbeet : d3drm: Define COBJMACROS in d3drm_private.h.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 2bdc13efc6618e743506b90c3fb61c1c61ae5799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdc13efc6618e743506b90c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:39 2016 +0100 d3drm: Define COBJMACROS in d3drm_private.h. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 3 --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/device.c | 2 -- dlls/d3drm/face.c | 2 -- dlls/d3drm/frame.c | 2 -- dlls/d3drm/light.c | 2 -- dlls/d3drm/material.c | 2 -- dlls/d3drm/meshbuilder.c | 3 --- dlls/d3drm/texture.c | 2 -- dlls/d3drm/viewport.c | 2 -- 10 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index abeed11..c7c28b9 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -22,11 +22,8 @@ #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" -#include "dxfile.h" #include "rmxfguid.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 49e4af1..1aa0a98 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -21,6 +21,7 @@ #ifndef __D3DRM_PRIVATE_INCLUDED__ #define __D3DRM_PRIVATE_INCLUDED__ +#define COBJMACROS #include <math.h> #include "d3drm.h" #include "dxfile.h" diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index ef83de0..c970244 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -21,8 +21,6 @@ #include <assert.h> #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index e9e7e9a..1fac0ba 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -20,8 +20,6 @@ #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 39b2f87..861002a 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -22,8 +22,6 @@ #include <assert.h> #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 7a7ccd4..8d59984 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -20,8 +20,6 @@ #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 8eb40b5..137ecfe 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -20,8 +20,6 @@ #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0028f12..20c0346 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -21,13 +21,10 @@ #define NONAMELESSUNION -#define COBJMACROS - #include "wine/debug.h" #include "winbase.h" #include "wingdi.h" -#include "dxfile.h" #include "rmxfguid.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 6c622b6..5272223 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -20,8 +20,6 @@ #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 9bb8cfc..2a1d035 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -20,8 +20,6 @@ #include "wine/debug.h" -#define COBJMACROS - #include "winbase.h" #include "wingdi.h"

1 0

Henri Verbeet : d3drm: Define NONAMELESSUNION and NONAMELESSSTRUCT in d3drm_private.h.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 217516ce79f53aa5017c8122be121fd829b445f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217516ce79f53aa5017c8122b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:40 2016 +0100 d3drm: Define NONAMELESSUNION and NONAMELESSSTRUCT in d3drm_private.h. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 5 ++++- dlls/d3drm/device.c | 10 +++------- dlls/d3drm/math.c | 2 -- dlls/d3drm/meshbuilder.c | 10 +++------- dlls/d3drm/viewport.c | 22 ++++++++++------------ 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 1aa0a98..8419046 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -21,12 +21,15 @@ #ifndef __D3DRM_PRIVATE_INCLUDED__ #define __D3DRM_PRIVATE_INCLUDED__ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #define COBJMACROS +#include <assert.h> #include <math.h> #include "d3drm.h" #include "dxfile.h" #include "d3drmwin.h" - +#include "wine/debug.h" #include "wine/list.h" #ifndef ARRAY_SIZE diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c970244..a774ae5 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -18,14 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" -#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); @@ -163,7 +159,7 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - surface_desc.dwZBufferBitDepth = 16; + surface_desc.u2.dwZBufferBitDepth = 16; surface_desc.dwWidth = desc.dwWidth; surface_desc.dwHeight = desc.dwHeight; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &ds, NULL); diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 72cb267..a6c0c85 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "config.h" #include "wine/port.h" diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 20c0346..e873d33 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -19,15 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" -#include "rmxfguid.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" +#include "rmxfguid.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 2a1d035..183588a 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" @@ -39,10 +37,10 @@ static inline struct d3drm_viewport *impl_from_IDirect3DRMViewport2(IDirect3DRMV static inline void d3drm_normalize_d3d_color(D3DCOLORVALUE *color_value, D3DCOLOR color) { - color_value->r = RGBA_GETRED(color) / 255.0f; - color_value->g = RGBA_GETGREEN(color) / 255.0f; - color_value->b = RGBA_GETBLUE(color) / 255.0f; - color_value->a = RGBA_GETALPHA(color) / 255.0f; + color_value->u1.r = RGBA_GETRED(color) / 255.0f; + color_value->u2.g = RGBA_GETGREEN(color) / 255.0f; + color_value->u3.b = RGBA_GETBLUE(color) / 255.0f; + color_value->u4.a = RGBA_GETALPHA(color) / 255.0f; } static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) @@ -58,7 +56,7 @@ static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); - d3drm_normalize_d3d_color(&mat.diffuse, color); + d3drm_normalize_d3d_color(&mat.u.diffuse, color); return IDirect3DMaterial_SetMaterial(viewport->material, &mat); } @@ -427,9 +425,9 @@ static HRESULT WINAPI d3drm_viewport2_Clear(IDirect3DRMViewport2 *iface, DWORD f TRACE("iface %p, flags %#x.\n", iface, flags); - clear_rect.x1 = clear_rect.y1 = 0; - clear_rect.x2 = viewport->device->width; - clear_rect.y2 = viewport->device->height; + clear_rect.u1.x1 = clear_rect.u2.y1 = 0; + clear_rect.u3.x2 = viewport->device->width; + clear_rect.u4.y2 = viewport->device->height; if (flags & D3DRMCLEAR_TARGET) {

1 0

Henri Verbeet : d3drm: Don't import libdxguid and libuuid.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: ca49f8f12016a2511ab109218839d07b6eefcc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca49f8f12016a2511ab109218… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:41 2016 +0100 d3drm: Don't import libdxguid and libuuid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/Makefile.in | 2 +- dlls/d3drm/d3drm.c | 7 ++----- dlls/d3drm/d3drm_main.c | 8 ++------ dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/meshbuilder.c | 1 - 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 5db3494..f75a14b 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3drm.dll IMPORTLIB = d3drm -IMPORTS = dxguid uuid d3dxof ddraw +IMPORTS = d3dxof ddraw C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index c7c28b9..260cc7d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -20,11 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" -#include "rmxfguid.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 67d1ad1..9fbd8d5 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -17,15 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "d3d.h" +#include "config.h" +#include "wine/port.h" -#include "dxfile.h" #include "initguid.h" -#include "d3drm.h" - #include "d3drm_private.h" -#include "wine/list.h" /*********************************************************************** * DllMain (D3DRM.@) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 8419046..666a74c 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -29,6 +29,7 @@ #include "d3drm.h" #include "dxfile.h" #include "d3drmwin.h" +#include "rmxfguid.h" #include "wine/debug.h" #include "wine/list.h" diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e873d33..4d5a2a7 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -23,7 +23,6 @@ #include "wine/port.h" #include "d3drm_private.h" -#include "rmxfguid.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm);

1 0

Henri Verbeet : d3drm: Cleanup the includes.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 601a847a327105a9f1b83758be8c3d029f3ba3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=601a847a327105a9f1b83758b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 10 16:17:42 2016 +0100 d3drm: Cleanup the includes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 - dlls/d3drm/face.c | 6 ++---- dlls/d3drm/frame.c | 7 ++----- dlls/d3drm/light.c | 6 ++---- dlls/d3drm/material.c | 6 ++---- dlls/d3drm/texture.c | 6 ++---- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 666a74c..033fcff 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,7 +26,6 @@ #define COBJMACROS #include <assert.h> #include <math.h> -#include "d3drm.h" #include "dxfile.h" #include "d3drmwin.h" #include "rmxfguid.h" diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 1fac0ba..d47f502 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 861002a..2758ec6 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -19,11 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 8d59984..d0ebdd3 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 137ecfe..11f2a2b 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 5272223..5d621a0 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include "config.h" +#include "wine/port.h" #include "d3drm_private.h"

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 6a5ff1106feaaab4d36f6d8b8b0f2bebe1263e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5ff1106feaaab4d36f6d8b8… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Nov 10 20:32:01 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 8020704..1422b15 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8041,10 +8041,8 @@ msgid "Wine was brought to you by:" msgstr "Wine er laget av:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "Kjø&r..." +msgstr "Kjør" #: shell32.rc:338 msgid "" @@ -14510,10 +14508,8 @@ msgid "Error: Invalid query\n" msgstr "Feil: Ugyldig spørring\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: Ugyldig syntaks. " +msgstr "Feil: Ugyldig syntaks for PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0

Alistair Leslie-Hughes : vbscript: Coerce datatype in StrComp.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 73924a45d6c674ae6eb729fb10207d896a1a8c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73924a45d6c674ae6eb729fb1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 8 07:06:15 2016 +0000 vbscript: Coerce datatype in StrComp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 20 +++++++++++++------- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a1ffa50..7e14776 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1038,11 +1038,6 @@ static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, assert(args_cnt == 2 || args_cnt == 3); - if(V_VT(args) != VT_BSTR || V_VT(args+1) != VT_BSTR) { - FIXME("args[0] = %s, args[1] = %s\n", debugstr_variant(args), debugstr_variant(args+1)); - return E_NOTIMPL; - } - if (args_cnt == 3) { hres = to_int(args+2, &mode); if(FAILED(hres)) @@ -1056,11 +1051,22 @@ static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, else mode = 0; - left = V_BSTR(args); - right = V_BSTR(args+1); + hres = to_string(args, &left); + if(FAILED(hres)) + return hres; + + hres = to_string(args+1, &right); + if(FAILED(hres)) + { + SysFreeString(left); + return hres; + } ret = mode ? strcmpiW(left, right) : strcmpW(left, right); val = ret < 0 ? -1 : (ret > 0 ? 1 : 0); + + SysFreeString(left); + SysFreeString(right); return return_short(res, val); } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 91d34ce..f6b6f69 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -459,6 +459,15 @@ TestStrComp "ABCD", "ABC", 1, 1 TestStrComp "ABC", "ABCD", 1, -1 TestStrComp "ABC", "ABCD", "0", -1 TestStrComp "ABC", "ABCD", "1", -1 +TestStrComp 1, 1, 1, 0 +TestStrComp "1", 1, 1, 0 +TestStrComp "1", 1.0, 1, 0 +TestStrComp Empty, Empty, 1, 0 +TestStrComp Empty, "", 1, 0 +TestStrComp Empty, "ABC", 1, -1 +TestStrComp "ABC", Empty, 1, 1 +TestStrComp vbNull, vbNull, 1, 0 +TestStrComp "", vbNull, 1, -1 Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len(""))

1 0

Nikolay Sivov : ieframe/tests: Fix IShellUIHelper instance leak (Valgrind) .
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: 153c234683d554f2b49f0f5614048e8a0227593c URL: http://source.winehq.org/git/wine.git/?a=commit;h=153c234683d554f2b49f0f561… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 9 22:40:16 2016 +0300 ieframe/tests: Fix IShellUIHelper instance leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index cbd1d6b..763e0b9 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3393,6 +3393,7 @@ static void test_external(IWebBrowser2 *unk) hres = IDispatch_QueryInterface(disp, &IID_IShellUIHelper, (void**)&uihelper); ok(hres == S_OK, "Could not get IShellUIHelper iface: %08x\n", hres); IShellUIHelper_Release(uihelper); + IDispatch_Release(disp); } IDocHostUIHandler2_Release(dochost);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Nov '16

10 Nov '16

Module: wine Branch: master Commit: e8f87f3476ed6b4d1e9915110651f2d3a5013151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f87f3476ed6b4d1e9915110… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 9 23:10:59 2016 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index e931b01..d7242fb 100644 --- a/po/lt.po +++ b/po/lt.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: 2016-10-14 22:22+0300\n" +"PO-Revision-Date: 2016-11-09 23:09+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8041,10 +8041,8 @@ msgid "Wine was brought to you by:" msgstr "Prie „Wine“ kūrimo prisidėjo:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Vykdyti..." +msgstr "Paleidimas" #: shell32.rc:338 msgid ""

1 0

Jared Smudde : shell32: Add caption to Run dialog.
by Alexandre Julliard 09 Nov '16

09 Nov '16

1 0