March 2014 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : netcfgx: Implement DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: d2733579ae1dada7b4e362f41ba92784baa26e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2733579ae1dada7b4e362f41… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 10:10:14 2014 +1100 netcfgx: Implement DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer. --- dlls/netcfgx/main.c | 28 ++++++++++++++++++++++++++++ dlls/netcfgx/netcfgx.spec | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index 6cd1894..dd3394c 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -21,14 +21,20 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netcfgx); +static HINSTANCE NETCFGX_hInstance; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + NETCFGX_hInstance = hinstDLL; + switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -42,3 +48,25 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( NETCFGX_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( NETCFGX_hInstance ); +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/netcfgx/netcfgx.spec b/dlls/netcfgx/netcfgx.spec index 38ce927..cb48a6d 100644 --- a/dlls/netcfgx/netcfgx.spec +++ b/dlls/netcfgx/netcfgx.spec @@ -1,7 +1,7 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub HrDiAddComponentToINetCfg @ stub LanaCfgFromCommandArgs @ stub ModemClassCoInstaller

1 0

Alistair Leslie-Hughes : netcfgx: Register interfaces.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 06cbe44c45bd9c0fa4f1ad1713df478c828928f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cbe44c45bd9c0fa4f1ad171… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 10:19:14 2014 +1100 netcfgx: Register interfaces. --- configure | 2 +- configure.ac | 2 +- dlls/netcfgx/Makefile.in | 2 ++ dlls/netcfgx/netcfgx_classes.idl | 21 +++++++++++++++++++++ include/netcfgx.idl | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 847dbee..0c83270 100755 --- a/configure +++ b/configure @@ -17023,7 +17023,7 @@ wine_fn_config_dll msxml6 enable_msxml6 clean wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test -wine_fn_config_dll netcfgx enable_netcfgx +wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 4a7bca2..09c7e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -3027,7 +3027,7 @@ WINE_CONFIG_DLL(msxml6,,[clean]) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) -WINE_CONFIG_DLL(netcfgx) +WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 22b10ae..29277db 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -2,3 +2,5 @@ MODULE = netcfgx.dll C_SRCS = \ main.c + +IDL_SRCS = netcfgx_classes.idl diff --git a/dlls/netcfgx/netcfgx_classes.idl b/dlls/netcfgx/netcfgx_classes.idl new file mode 100644 index 0000000..3dd64bb --- /dev/null +++ b/dlls/netcfgx/netcfgx_classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 + */ + +#pragma makedep register + +#include "netcfgx.idl" diff --git a/include/netcfgx.idl b/include/netcfgx.idl index c465410..75c0a94 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -106,6 +106,7 @@ interface INetCfg : IUnknown }; [ + helpstring("Network Configuration Component Object"), threading(both), uuid(5b035261-40f9-11d1-aaec-00805fc1270e) ]

1 0

Vincent Povirk : tapi32: Stub lineOpenW.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: b56102e998943c2f4f5e3bbb5f1381e9b3483435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56102e998943c2f4f5e3bbb5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 20 11:46:51 2014 -0500 tapi32: Stub lineOpenW. --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 2a13fad..c0e25ba 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1268,6 +1268,15 @@ DWORD WINAPI lineNegotiateExtVersion(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD } /*********************************************************************** + * lineOpenW (TAPI32.@) + */ +DWORD WINAPI lineOpenW(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams) +{ + FIXME("stub.\n"); + return 0; +} + +/*********************************************************************** * lineOpen (TAPI32.@) */ DWORD WINAPI lineOpenA(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index d4f2ae7..c2aa868 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -83,6 +83,7 @@ @ stdcall lineNegotiateExtVersion(long long long long long ptr) @ stdcall lineOpen(long long ptr long long long long long ptr) lineOpenA @ stdcall lineOpenA(long long ptr long long long long long ptr) +@ stdcall lineOpenW(long long ptr long long long long long ptr) @ stdcall linePark(long long str ptr) lineParkA @ stdcall lineParkA(long long str ptr) @ stdcall linePickup(long long ptr str str) linePickupA

1 0

Nikolay Sivov : msi: Update MsiServerMessage registration version to match module version.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 20e4705192dda4d7d127b20d9989052bb31611d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e4705192dda4d7d127b20d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 14:09:35 2014 +0400 msi: Update MsiServerMessage registration version to match module version. --- dlls/msi/msiserver.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs index c77ad2b..1313bd9 100644 --- a/dlls/msi/msiserver.rgs +++ b/dlls/msi/msiserver.rgs @@ -2,7 +2,7 @@ HKCR { NoRemove CLSID { - '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } + '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '4.5.6001' } '{000C1090-0000-0000-C000-000000000046}' { TypeLib = s '{000C1092-0000-0000-C000-000000000046}'

1 0

Nikolay Sivov : user32: Added ChangeWindowMessageFilterEx() stub.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: d3c9e8a7e65c121c2f36641dd67711526c5896d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c9e8a7e65c121c2f36641dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 20:24:58 2014 +0400 user32: Added ChangeWindowMessageFilterEx() stub. --- dlls/user32/message.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1aee670..e5dfa3e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4578,3 +4578,12 @@ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) FIXME( "%x %08x\n", message, flag ); return TRUE; } + +/****************************************************************** + * ChangeWindowMessageFilterEx (USER32.@) + */ +BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, CHANGEFILTERSTRUCT *changefilter ) +{ + FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter ); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 052f7ff..fe3906f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -39,6 +39,7 @@ @ stdcall ChangeMenuA(long long ptr long long) @ stdcall ChangeMenuW(long long ptr long long) @ stdcall ChangeWindowMessageFilter(long long) +@ stdcall ChangeWindowMessageFilterEx(long long long ptr) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long) diff --git a/include/winuser.h b/include/winuser.h index e28bb13..0f3d0b1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3219,6 +3219,27 @@ typedef struct #define AnsiToOemBuffW CharToOemBuffW #define AnsiToOemBuff WINELIB_NAME_AW(AnsiToOemBuff) +/* ChangeWindowMessageFilter flags */ +#define MSGFLT_ADD 1 +#define MSGFLT_REMOVE 2 + +/* ChangeWindowMessageFilterEx defines */ +#define MSGFLTINFO_NONE 0 +#define MSGFLTINFO_ALREADYALLOWED_FORWND 1 +#define MSGFLTINFO_ALREADYDISALLOWED_FORWND 2 +#define MSGFLTINFO_ALLOWED_HIGHER 3 + +typedef struct tagCHANGEFILTERSTRUCT +{ + DWORD cbSize; + DWORD ExtStatus; +} CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT; + +/* Actions for ChangeWindowMessageFilterEx */ +#define MSGFLT_RESET 0 +#define MSGFLT_ALLOW 1 +#define MSGFLT_DISALLOW 2 + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3293,6 +3314,8 @@ WINUSERAPI BOOL WINAPI ChangeClipboardChain(HWND,HWND); WINUSERAPI BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT); WINUSERAPI BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT); #define ChangeMenu WINELIB_NAME_AW(ChangeMenu) +WINUSERAPI BOOL WINAPI ChangeWindowMessageFilter(UINT,DWORD); +WINUSERAPI BOOL WINAPI ChangeWindowMessageFilterEx(HWND,UINT,DWORD,CHANGEFILTERSTRUCT*); WINUSERAPI LPSTR WINAPI CharLowerA(LPSTR); WINUSERAPI LPWSTR WINAPI CharLowerW(LPWSTR); #define CharLower WINELIB_NAME_AW(CharLower)

1 0

Nikolay Sivov : msi: MsiInstaller coclass is not included in a typelib.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 117ae2576496df1b03b7d8283093d608e94b3d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=117ae2576496df1b03b7d8283… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 14:09:14 2014 +0400 msi: MsiInstaller coclass is not included in a typelib. --- dlls/msi/msiserver.idl | 17 ++++++++--------- dlls/msi/msiserver.rgs | 7 ++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index f351ab1..5052602 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -153,6 +153,14 @@ coclass MsiServerMessage { interface IMsiMessage; } coclass PSFactoryBuffer { interface IPSFactoryBuffer; } [ + helpstring("Microsoft Windows Installer"), + threading(apartment), + progid("WindowsInstaller.Installer"), + uuid(000c1090-0000-0000-c000-000000000046) +] +coclass MsiInstaller { interface Installer; } + +[ uuid(000c1082-0000-0000-c000-000000000046) ] coclass MsiTransform { } @@ -184,7 +192,6 @@ coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } ] coclass WineMsiRemotePackage { interface WineMsiRemotePackage; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller { @@ -551,12 +558,4 @@ library WindowsInstaller properties: methods: } - - [ - helpstring("Microsoft Windows Installer"), - threading(apartment), - progid("WindowsInstaller.Installer"), - uuid(000c1090-0000-0000-c000-000000000046) - ] - coclass MsiInstaller { interface Installer; } } diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs index 9f408db..c77ad2b 100644 --- a/dlls/msi/msiserver.rgs +++ b/dlls/msi/msiserver.rgs @@ -3,6 +3,11 @@ HKCR NoRemove CLSID { '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } - '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' } + '{000C1090-0000-0000-C000-000000000046}' + { + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' + Version = s '1.0' + InProcHandler32 = s 'ole32.dll' + } } }

1 0

Dmitry Timoshkov : widl: Move is_void(), is_declptr() and is_conformant_array() to header.h and make them inline.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: e6d585a6b26c362369a9727896fc547f59e4dfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d585a6b26c362369a972789… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 20 18:32:39 2014 +0900 widl: Move is_void(), is_declptr() and is_conformant_array() to header.h and make them inline. --- tools/widl/header.c | 10 ---------- tools/widl/header.h | 18 +++++++++++++++--- tools/widl/typegen.c | 5 ----- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4ca6ed5..4f2222a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -109,16 +109,6 @@ unsigned int get_attrv(const attr_list_t *list, enum attr_type t) return 0; } -int is_void(const type_t *t) -{ - return type_get_type(t) == TYPE_VOID; -} - -int is_conformant_array(const type_t *t) -{ - return is_array(t) && type_array_has_conformance(t); -} - static void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; diff --git a/tools/widl/header.h b/tools/widl/header.h index 8ca1cf1..10601ff 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -28,9 +28,6 @@ extern int is_aliaschain_attr(const type_t *var, enum attr_type t); extern int is_attr(const attr_list_t *list, enum attr_type t); extern void *get_attrp(const attr_list_t *list, enum attr_type t); extern unsigned int get_attrv(const attr_list_t *list, enum attr_type t); -extern int is_void(const type_t *t); -extern int is_conformant_array(const type_t *t); -extern int is_declptr(const type_t *t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); @@ -68,6 +65,21 @@ static inline int is_array(const type_t *t) return type_get_type(t) == TYPE_ARRAY; } +static inline int is_void(const type_t *t) +{ + return type_get_type(t) == TYPE_VOID; +} + +static inline int is_declptr(const type_t *t) +{ + return is_ptr(t) || (type_get_type(t) == TYPE_ARRAY && type_array_is_decl_as_ptr(t)); +} + +static inline int is_conformant_array(const type_t *t) +{ + return is_array(t) && type_array_has_conformance(t); +} + static inline int last_ptr(const type_t *type) { return is_ptr(type) && !is_declptr(type_pointer_get_ref(type)); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d017521..37d18f5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2774,11 +2774,6 @@ static void write_pointer_description(FILE *file, type_t *type, &offset_in_memory, &offset_in_buffer, typestring_offset); } -int is_declptr(const type_t *t) -{ - return is_ptr(t) || (type_get_type(t) == TYPE_ARRAY && type_array_is_decl_as_ptr(t)); -} - static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, enum type_context context, const char *name, unsigned int *typestring_offset)

1 0

Frédéric Delanoy : urlmon/tests: Use BOOL type where appropriate.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: ed9607876c19ebd64e40b08f3367fde9de812ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9607876c19ebd64e40b08f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 20 09:29:36 2014 +0100 urlmon/tests: Use BOOL type where appropriate. --- dlls/urlmon/tests/misc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 78d3448..7071aa9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1740,7 +1740,8 @@ static void test_internet_features_registry(void) { char *name; HKEY feature_control; HKEY feature; - DWORD value, skip_zone; + DWORD value; + BOOL skip_zone; BOOL delete_feature_key = TRUE; static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS"; @@ -1805,11 +1806,11 @@ static void test_internet_features_registry(void) { if (res == ERROR_ACCESS_DENIED) { skip("Not allowed to modify zone elevation\n"); - skip_zone = 1; + skip_zone = TRUE; } else { - skip_zone = 0; + skip_zone = FALSE; ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS);

1 0

Nikolay Sivov : wshom.ocx/tests: Update idl file in tests.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 87f7f88c4fcfd9fae11f39dacae17a742e91f975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f7f88c4fcfd9fae11f39dac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 09:45:11 2014 +0400 wshom.ocx/tests: Update idl file in tests. --- dlls/wshom.ocx/tests/wshom.idl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index a89b3fc..5c263d1 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -105,7 +105,7 @@ library IWshRuntimeLibrary HRESULT Write([in] BSTR Text); [id(0x2718)] - HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + HRESULT WriteLine([in, defaultvalue("")] BSTR Text); [id(0x2719)] HRESULT WriteBlankLines([in] long Lines); @@ -221,20 +221,20 @@ library IWshRuntimeLibrary HRESULT Type([out, retval] BSTR* Type); [id(0x04b0)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x04b2)] HRESULT Copy( [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x04b4)] HRESULT Move([in] BSTR Destination); [id(0x044c)] HRESULT OpenAsTextStream( - [in, optional, defaultvalue(1)] IOMode IOMode, - [in, optional, defaultvalue(0)] Tristate Format, + [in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts); }; @@ -306,12 +306,12 @@ library IWshRuntimeLibrary HRESULT Type([out, retval] BSTR* type); [id(0x04b1)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL force); [id(0x04b3)] HRESULT Copy( [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x04b5)] HRESULT Move([in] BSTR Destination); @@ -331,8 +331,8 @@ library IWshRuntimeLibrary [id(0x044d)] HRESULT CreateTextFile( [in] BSTR FileName, - [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite, - [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, + [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); }; @@ -573,7 +573,7 @@ library IWshRuntimeLibrary HRESULT LogEvent( [in] VARIANT* Type, [in] BSTR Message, - [in, optional, defaultvalue("")] BSTR Target, + [in, defaultvalue("")] BSTR Target, [out, retval] VARIANT_BOOL* out_Success); [id(0x0bc2)]

1 0

Piotr Caban : msvcrt: Don't add 0x prefix while printing 0 with printf.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 2693ce1a253e5fe2f684d5805b7b7c12e6294b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2693ce1a253e5fe2f684d5805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 20 16:20:26 2014 +0100 msvcrt: Don't add 0x prefix while printing 0 with printf. --- dlls/msvcrt/printf.h | 8 +++++--- dlls/msvcrt/tests/printf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 96e7845..a462f3a 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -265,9 +265,11 @@ static inline void FUNC_NAME(pf_integer_conv)(APICHAR *buf, int buf_len, } i = 0; - if(x==0 && flags->Precision) - buf[i++] = '0'; - else { + if(x == 0) { + flags->Alternate = 0; + if(flags->Precision) + buf[i++] = '0'; + } else { while(x != 0) { j = (ULONGLONG)x%base; x = (ULONGLONG)x/base; diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 24bc401..829b2e0 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -329,18 +329,52 @@ static void test_sprintf( void ) format = "%#012x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x0000000001"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"000000000000"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); format = "%#04.8x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x00000001"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==10, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00000000"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); format = "%#-08.2x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x01 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#.0x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x1"), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==3, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,""), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==0, "return count wrong\n"); format = "%#08o"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"00000001"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#o"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"01"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==2, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"0"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==1, "return count wrong\n"); if (sizeof(void *) == 8) {

1 0