October 2012 - Wine-commits

Francois Gouget : testbot/VMs: Add a function for filtering out offline VMs .
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: a29506610abcef2d5c6eab0dac1cf3a993b10e4c URL: http://source.winehq.org/git/tools.git/?a=commit;h=a29506610abcef2d5c6eab0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:21 2012 +0100 testbot/VMs: Add a function for filtering out offline VMs. --- testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/bin/Engine.pl | 11 ++++------- testbot/lib/WineTestBot/Patches.pm | 3 +-- testbot/lib/WineTestBot/VMs.pm | 7 +++++++ testbot/web/Submit.pl | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5ca5aa9..f8a9128 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -86,8 +86,7 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - # Don't schedule the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + $VMs->FilterNotOffline(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $VM = $VMs->GetItem($VMKey); diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index b3cfbee..f188212 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -490,14 +490,11 @@ sub InitVMs() # On startup we don't know what state the VMs are in. So consider them all # to be dirty. my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) + $VMs->FilterNotOffline(); + foreach my $VM (@{$VMs->GetItems()}) { - my $VM = $VMs->GetItem($VMKey); - if ($VM->Status ne "offline") - { - $VM->Status("dirty"); - $VM->Save(); - } + $VM->Status('dirty'); + $VM->Save(); } } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index c9e0145..d7dca4e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -238,8 +238,7 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - # Don't schedule the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + $VMs->FilterNotOffline(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c616b09..ad6d1b0 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -618,6 +618,13 @@ sub SortKeysBySortOrder return \@SortedKeys; } +sub FilterNotOffline($) +{ + my ($self) = @_; + # All but the offline ones + $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); +} + sub FilterHypervisor { my $self = shift; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d8b222d..233583c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -238,8 +238,8 @@ sub GenerateFields { $VMs->AddFilter("Type", ["win32", "win64"]); } - # Don't even show the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + # Scheduling jobs on offline VMs is not allowed + $VMs->FilterNotOffline(); if ($self->{ShowAll}) { # All but the retired and deleted ones

1 0

Frédéric Delanoy : cmd: Avoid handle leaks ( coverity).
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 1d3f679ef1bdff2f811a57bb8e8e7be173f342fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3f679ef1bdff2f811a57bb8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 30 17:31:28 2012 +0100 cmd: Avoid handle leaks (coverity). --- programs/cmd/builtins.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e567bb6..b3fd422 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -394,6 +394,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) SetFilePointer (h, 0, NULL, FILE_END); if (!WriteFile(h, &eof, 1, NULL, NULL)) { WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + CloseHandle(h); return FALSE; } CloseHandle(h); @@ -430,6 +431,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (out == NULL) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); + CloseHandle(in); return FALSE; }

1 0

Alexandre Julliard : ntdll: Remove futimes implementation from libport, it' s only needed in ntdll.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 487c50c1e73e3c64ce35ed52e48f6e1c9dc50ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487c50c1e73e3c64ce35ed52e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 11:50:42 2012 +0100 ntdll: Remove futimes implementation from libport, it's only needed in ntdll. --- dlls/ntdll/file.c | 16 +++++++++++- include/wine/port.h | 6 ----- libs/port/Makefile.in | 1 - libs/port/futimes.c | 58 ------------------------------------------------- 4 files changed, 14 insertions(+), 67 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5f5e7fe..61ed576 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1560,6 +1560,9 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) { + NTSTATUS status = STATUS_SUCCESS; + +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) struct timeval tv[2]; struct stat st; @@ -1590,8 +1593,17 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ tv[1].tv_sec = mtime->QuadPart / 10000000 - SECS_1601_TO_1970; tv[1].tv_usec = (mtime->QuadPart % 10000000) / 10; } - if (!futimes( fd, tv )) return STATUS_SUCCESS; - return FILE_GetNtStatus(); +#ifdef HAVE_FUTIMES + if (futimes( fd, tv ) == -1) status = FILE_GetNtStatus(); +#elif defined(HAVE_FUTIMESAT) + if (futimesat( fd, NULL, tv ) == -1) status = FILE_GetNtStatus(); +#endif + +#else /* HAVE_FUTIMES || HAVE_FUTIMESAT */ + FIXME( "setting file times not supported\n" ); + status = STATUS_NOT_IMPLEMENTED; +#endif + return status; } static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, LARGE_INTEGER *ctime, diff --git a/include/wine/port.h b/include/wine/port.h index 9030aab..9a9bb88 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -257,11 +257,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif -#ifndef HAVE_FUTIMES -struct timeval; -int futimes(int fd, const struct timeval *tv); -#endif - #ifndef HAVE_GETPAGESIZE size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ @@ -456,7 +451,6 @@ extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, #define ffs __WINE_NOT_PORTABLE(ffs) #define fstatvfs __WINE_NOT_PORTABLE(fstatvfs) -#define futimes __WINE_NOT_PORTABLE(futimes) #define getopt_long __WINE_NOT_PORTABLE(getopt_long) #define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) #define getpagesize __WINE_NOT_PORTABLE(getpagesize) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index f2f6db0..71074b2 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -5,7 +5,6 @@ MODULE = libwine_port.a C_SRCS = \ ffs.c \ fstatvfs.c \ - futimes.c \ getopt.c \ getopt1.c \ getpagesize.c \ diff --git a/libs/port/futimes.c b/libs/port/futimes.c deleted file mode 100644 index f842d67..0000000 --- a/libs/port/futimes.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * futimes function - * - * Copyright 2004 Alexandre Julliard - * - * 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 "config.h" -#include "wine/port.h" - -#ifndef HAVE_FUTIMES - -#include <sys/types.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_UTIME_H -# include <utime.h> -#endif -#include <stdio.h> -#include <errno.h> - -int futimes(int fd, const struct timeval tv[2]) -{ -#ifdef linux - char buffer[sizeof("/proc/self/fd/") + 3*sizeof(int)]; - - sprintf( buffer, "/proc/self/fd/%u", fd ); - if (tv) - { - struct utimbuf ut; - ut.actime = tv[0].tv_sec + (tv[0].tv_usec + 500000) / 1000000; - ut.modtime = tv[1].tv_sec + (tv[1].tv_usec + 500000) / 1000000; - return utime( buffer, &ut ); - } - else return utime( buffer, NULL ); -#elif defined(HAVE_FUTIMESAT) - return futimesat( fd, NULL, tv ); -#else - errno = ENOSYS; - return -1; -#endif -} - -#endif /* HAVE_FUTIMES */

1 0

Erich Hoover : ntdll: Implement nanosecond precision file time storage.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 5c95bec8478fe64611d86ed8f376e906329588bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c95bec8478fe64611d86ed8f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 25 17:52:25 2012 -0600 ntdll: Implement nanosecond precision file time storage. --- configure | 1 + configure.ac | 1 + dlls/ntdll/file.c | 19 ++++++++++++++++++- include/config.h.in | 3 +++ 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/configure b/configure index a736a5f..65c18a5 100755 --- a/configure +++ b/configure @@ -13012,6 +13012,7 @@ for ac_func in \ fstatfs \ fstatvfs \ ftruncate \ + futimens \ futimes \ futimesat \ getattrlist \ diff --git a/configure.ac b/configure.ac index d5d99f0..10e2fda 100644 --- a/configure.ac +++ b/configure.ac @@ -2014,6 +2014,7 @@ AC_CHECK_FUNCS(\ fstatfs \ fstatvfs \ ftruncate \ + futimens \ futimes \ futimesat \ getattrlist \ diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 61ed576..234ed7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1562,7 +1562,24 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ { NTSTATUS status = STATUS_SUCCESS; -#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) +#ifdef HAVE_FUTIMENS + struct timespec tv[2]; + + tv[0].tv_sec = tv[1].tv_sec = 0; + tv[0].tv_nsec = tv[1].tv_nsec = UTIME_OMIT; + if (atime->QuadPart) + { + tv[0].tv_sec = atime->QuadPart / 10000000 - SECS_1601_TO_1970; + tv[0].tv_nsec = (atime->QuadPart % 10000000) * 100; + } + if (mtime->QuadPart) + { + tv[1].tv_sec = mtime->QuadPart / 10000000 - SECS_1601_TO_1970; + tv[1].tv_nsec = (mtime->QuadPart % 10000000) * 100; + } + if (futimens( fd, tv ) == -1) status = FILE_GetNtStatus(); + +#elif defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) struct timeval tv[2]; struct stat st; diff --git a/include/config.h.in b/include/config.h.in index 39f1ec2..8dc812b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -179,6 +179,9 @@ /* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ #undef HAVE_FT_TRUETYPEENGINETYPE +/* Define to 1 if you have the `futimens' function. */ +#undef HAVE_FUTIMENS + /* Define to 1 if you have the `futimes' function. */ #undef HAVE_FUTIMES

1 0

André Hentschel : comdlg32: Fix usage of constants.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: a07d1da9247f9d4bac3bdc3410a994b6040908a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07d1da9247f9d4bac3bdc341… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 00:30:12 2012 +0100 comdlg32: Fix usage of constants. --- dlls/comdlg32/itemdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index e5c8927..0fdfe0d 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1214,17 +1214,17 @@ static SIZE update_layout(FileDialogImpl *This) } /* The custom controls */ - customctrls_rc.left = dialog_rc.left + vspacing; - customctrls_rc.right = dialog_rc.right - vspacing; - customctrls_rc.bottom = filename_rc.top - hspacing; + customctrls_rc.left = dialog_rc.left + hspacing; + customctrls_rc.right = dialog_rc.right - hspacing; + customctrls_rc.bottom = filename_rc.top - vspacing; customctrls_rc.top = customctrls_rc.bottom - ctrl_container_resize(This, customctrls_rc.right - customctrls_rc.left); /* The ExplorerBrowser control. */ - ebrowser_rc.left = dialog_rc.left + vspacing; + ebrowser_rc.left = dialog_rc.left + hspacing; ebrowser_rc.top = toolbar_rc.bottom + vspacing; ebrowser_rc.right = dialog_rc.right - hspacing; - ebrowser_rc.bottom = customctrls_rc.top - hspacing; + ebrowser_rc.bottom = customctrls_rc.top - vspacing; /**** * Move everything to the right place.

1 0

Rafał Mużyło : gdiplus: Fix logic of treating the region of a string as unclipped.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 48a2b48e16d751e0ddb72cb4e6729b943e018001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a2b48e16d751e0ddb72cb4e… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Mon Oct 29 23:42:39 2012 +0100 gdiplus: Fix logic of treating the region of a string as unclipped. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 726885b..1cea50b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5357,7 +5357,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); if (!(format_flags & StringFormatFlagsNoClip) && - gdip_round(scaled_rect.Width) != 0 && gdip_round(scaled_rect.Height) != 0) + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Rafał Mużyło : gdiplus: Mark regions as unclipped correctly.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: fc2bb3bdc148f3071414cc9f1622fa1f0bc38518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2bb3bdc148f3071414cc9f1… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Mon Oct 29 23:52:51 2012 +0100 gdiplus: Mark regions as unclipped correctly. --- dlls/gdiplus/graphics.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1cea50b..c428b6b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5164,9 +5164,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Height = rect->Height * args.rel_height; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; if (scaled_rect.Width >= 0.5) { @@ -5174,8 +5174,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); - if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; get_font_hfont(graphics, font, format, &gdifont); oldfont = SelectObject(hdc, gdifont); @@ -5343,9 +5343,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Height = rel_height * rect->Height; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; if (scaled_rect.Width >= 0.5) { @@ -5353,8 +5353,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); - if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23)

1 0

Alistair Leslie-Hughes : iads.idl: Add missing interfaces.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 63e0bb52f3f597003c66036661c8b4a85ee0f087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e0bb52f3f597003c6603666… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 30 19:47:34 2012 +1100 iads.idl: Add missing interfaces. --- include/iads.idl | 406 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 406 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63e0bb52f3f597003c660…

1 0

Jacek Caban : vbscript: Added support for more builtin constants.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 7f50df4e434b0bbf4ff2dfdf9697b77d119a07d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f50df4e434b0bbf4ff2dfdf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 10:32:01 2012 +0100 vbscript: Added support for more builtin constants. --- dlls/vbscript/global.c | 136 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 22 +++++++ 2 files changed, 39 insertions(+), 119 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa2d64f..900242b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1680,108 +1680,6 @@ static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return return_short(res, IDNO); } -static HRESULT Global_vbEmpty(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbInteger(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLong(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbSingle(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDouble(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCurrency(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbString(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbError(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBoolean(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbVariant(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDataObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDecimal(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbArray(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -2016,23 +1914,23 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBIGNORE, Global_vbIgnore, BP_GET}, {DISPID_GLOBAL_VBYES, Global_vbYes, BP_GET}, {DISPID_GLOBAL_VBNO, Global_vbNo, BP_GET}, - {DISPID_GLOBAL_VBEMPTY, Global_vbEmpty, BP_GET}, - {DISPID_GLOBAL_VBNULL, Global_vbNull, BP_GET}, - {DISPID_GLOBAL_VBINTEGER, Global_vbInteger, BP_GET}, - {DISPID_GLOBAL_VBLONG, Global_vbLong, BP_GET}, - {DISPID_GLOBAL_VBSINGLE, Global_vbSingle, BP_GET}, - {DISPID_GLOBAL_VBDOUBLE, Global_vbDouble, BP_GET}, - {DISPID_GLOBAL_VBCURRENCY, Global_vbCurrency, BP_GET}, - {DISPID_GLOBAL_VBDATE, Global_vbDate, BP_GET}, - {DISPID_GLOBAL_VBSTRING, Global_vbString, BP_GET}, - {DISPID_GLOBAL_VBOBJECT, Global_vbObject, BP_GET}, - {DISPID_GLOBAL_VBERROR, Global_vbError, BP_GET}, - {DISPID_GLOBAL_VBBOOLEAN, Global_vbBoolean, BP_GET}, - {DISPID_GLOBAL_VBVARIANT, Global_vbVariant, BP_GET}, - {DISPID_GLOBAL_VBDATAOBJECT, Global_vbDataObject, BP_GET}, - {DISPID_GLOBAL_VBDECIMAL, Global_vbDecimal, BP_GET}, - {DISPID_GLOBAL_VBBYTE, Global_vbByte, BP_GET}, - {DISPID_GLOBAL_VBARRAY, Global_vbArray, BP_GET}, + {DISPID_GLOBAL_VBEMPTY, NULL, BP_GET, VT_EMPTY}, + {DISPID_GLOBAL_VBNULL, NULL, BP_GET, VT_NULL}, + {DISPID_GLOBAL_VBINTEGER, NULL, BP_GET, VT_I2}, + {DISPID_GLOBAL_VBLONG, NULL, BP_GET, VT_I4}, + {DISPID_GLOBAL_VBSINGLE, NULL, BP_GET, VT_R4}, + {DISPID_GLOBAL_VBDOUBLE, NULL, BP_GET, VT_R8}, + {DISPID_GLOBAL_VBCURRENCY, NULL, BP_GET, VT_CY}, + {DISPID_GLOBAL_VBDATE, NULL, BP_GET, VT_DATE}, + {DISPID_GLOBAL_VBSTRING, NULL, BP_GET, VT_BSTR}, + {DISPID_GLOBAL_VBOBJECT, NULL, BP_GET, VT_DISPATCH}, + {DISPID_GLOBAL_VBERROR, NULL, BP_GET, VT_ERROR}, + {DISPID_GLOBAL_VBBOOLEAN, NULL, BP_GET, VT_BOOL}, + {DISPID_GLOBAL_VBVARIANT, NULL, BP_GET, VT_VARIANT}, + {DISPID_GLOBAL_VBDATAOBJECT, NULL, BP_GET, VT_UNKNOWN}, + {DISPID_GLOBAL_VBDECIMAL, NULL, BP_GET, VT_DECIMAL}, + {DISPID_GLOBAL_VBBYTE, NULL, BP_GET, VT_UI1}, + {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, {DISPID_GLOBAL_VBTRUE, Global_vbTrue, BP_GET}, {DISPID_GLOBAL_VBFALSE, Global_vbFalse, BP_GET}, {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index e986362..2cb7fe0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -38,6 +38,28 @@ Call ok(getVT(vbFriday) = "VT_I2", "getVT(vbFriday) = " & getVT(vbFriday)) Call ok(vbSaturday = 7, "vbSaturday = " & vbSaturday) Call ok(getVT(vbSaturday) = "VT_I2", "getVT(vbSaturday) = " & getVT(vbSaturday)) +Sub TestConstant(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_I2*", "getVT(" & name & ") = " & getVT(val)) +End Sub + +TestConstant "vbEmpty", vbEmpty, 0 +TestConstant "vbNull", vbNull, 1 +TestConstant "vbLong", vbLong, 3 +TestConstant "vbSingle", vbSingle, 4 +TestConstant "vbDouble", vbDouble, 5 +TestConstant "vbCurrency", vbCurrency, 6 +TestConstant "vbDate", vbDate, 7 +TestConstant "vbString", vbString, 8 +TestConstant "vbObject", vbObject, 9 +TestConstant "vbError", vbError, 10 +TestConstant "vbBoolean", vbBoolean, 11 +TestConstant "vbVariant", vbVariant, 12 +TestConstant "vbDataObject", vbDataObject, 13 +TestConstant "vbDecimal", vbDecimal, 14 +TestConstant "vbByte", vbByte, 17 +TestConstant "vbArray", vbArray, 8192 + Sub TestCStr(arg, exval) dim x x = CStr(arg)

1 0

Huw Davies : gdi32: Implement sub-pixel glyph smoothing.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 9247328371661524296e817e791c5563536283bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9247328371661524296e817e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 30 13:22:16 2012 +0000 gdi32: Implement sub-pixel glyph smoothing. --- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 36 ++++++++-- dlls/gdi32/dibdrv/primitives.c | 153 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/font.c | 113 ++++++++++++++++++++++++++++- 4 files changed, 295 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9247328371661524296e8…

1 0