December 2011 - Wine-Commits

Francois Gouget : include: Add a few missing include directives to shlguid. h.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: a603e9871e21888216672003e2455dfac4a31716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a603e9871e21888216672003e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 20 09:17:27 2011 +0100 include: Add a few missing include directives to shlguid.h. --- dlls/ole32/tests/moniker.c | 1 + dlls/shell32/shellpath.c | 2 +- dlls/shell32/tests/shellpath.c | 3 +- include/shlguid.h | 44 +++++++++++++++++++++++++++------------ 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index aa57b9b..a407a37 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "ocidl.h" #include "initguid.h" #include "comcat.h" #include "olectl.h" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9612687..f3490c1 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -51,8 +51,8 @@ #include "shlwapi.h" #include "xdg.h" #include "sddl.h" -#define INITGUID #include "knownfolders.h" +#include "initguid.h" #include "shobjidl.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0db72df..91e9f35 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -30,10 +30,11 @@ #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" -#include "initguid.h" #include "knownfolders.h" #include "wine/test.h" +#include "initguid.h" + /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want * here is its original value. */ diff --git a/include/shlguid.h b/include/shlguid.h index ebae98d..2279def 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -48,12 +48,6 @@ DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FC, 0, 0); DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FE, 0, 0); DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500, 0, 0); -DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); -DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); -DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); - -DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); - /* avoid duplicate definitions with shobjidl.h (FIXME) */ /* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9, 0, 0); */ @@ -75,22 +69,46 @@ DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x /* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1, 0, 0); */ /* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7, 0, 0); */ +#ifndef NO_INTSHCUT_GUIDS +#include <isguids.h> +#endif + +#ifndef NO_SHDOCVW_GUIDS +# ifndef GUID_DEFS_ONLY +# include <exdisp.h> +# include <shldisp.h> +# endif + +DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); +DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); + +DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); +#define SID_SProgressUI CLSID_ProgressDialog + DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); + +DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); + +#define SID_SInternetExplorer IID_IWebBrowserApp +#define SID_SWebBrowserApp IID_IWebBrowserApp +#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService + +#endif /* NO_SHDOCVW_GUIDS */ + DEFINE_GUID(SID_STopWindow, 0x49e1b500, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); #define SID_LinkSite IID_IShellLinkW #define SID_SShellBrowser IID_IShellBrowser #define SID_SShellDesktop CLSID_ShellDesktop -#define SID_SInternetExplorer IID_IWebBrowserApp -#define SID_SWebBrowserApp IID_IWebBrowserApp -#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService - #define IID_IFileViewer WINELIB_NAME_AW(IID_IFileViewer) #define IID_IShellLink WINELIB_NAME_AW(IID_IShellLink) #define IID_IExtractIcon WINELIB_NAME_AW(IID_IExtractIcon) @@ -124,10 +142,6 @@ DEFINE_GUID(CLSID_QueryAssociations, 0xa07034fd, 0x6caa, 0x4954, 0xac, 0x3f, 0x9 DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); -DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); - DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); @@ -162,6 +176,8 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +#include <knownfolders.h> + /* FOLDERTYPEID */ DEFINE_GUID(FOLDERTYPEID_Communications, 0x91475fe5, 0x586b, 0x4eba, 0x8d, 0x75, 0xd1, 0x74, 0x34, 0xb8, 0xcd, 0xf6); DEFINE_GUID(FOLDERTYPEID_CompressedFolder, 0x80213e82, 0xbcfd, 0x4c4f, 0x88, 0x17, 0xbb, 0x27, 0x60, 0x12, 0x67, 0xa9);

1 0

Alexandre Julliard : configure: Add a check for libdbus independent from the libhal check.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: e45d124c5245c39ce4671dc58d4d0aa7140e86b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45d124c5245c39ce4671dc58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 10:36:35 2011 +0100 configure: Add a check for libdbus independent from the libhal check. --- configure | 114 +++++++++++++++++++++++++++++++++----------------- configure.ac | 38 ++++++++++++----- include/config.h.in | 9 +--- 3 files changed, 105 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e45d124c5245c39ce4671…

1 0

Alexandre Julliard : mountmgr: Rename hal.c to dbus.c.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 55f5209631253d6361fc05399059423c3aa04390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f5209631253d6361fc05399… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 11:04:18 2011 +0100 mountmgr: Rename hal.c to dbus.c. --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/{hal.c => dbus.c} | 36 ++++++++++++++++++---------------- dlls/mountmgr.sys/mountmgr.c | 2 +- dlls/mountmgr.sys/mountmgr.h | 2 +- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 91203e1..6bdb5c4 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -6,9 +6,9 @@ EXTRADEFS = @HALINCL@ EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \ + dbus.c \ device.c \ diskarb.c \ - hal.c \ mountmgr.c @MAKE_DLL_RULES@ diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/dbus.c similarity index 88% rename from dlls/mountmgr.sys/hal.c rename to dlls/mountmgr.sys/dbus.c index d369879..42974b2 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/dbus.c @@ -1,5 +1,5 @@ /* - * HAL devices support + * DBus devices support * * Copyright 2006 Alexandre Julliard * @@ -26,8 +26,10 @@ #include <stdarg.h> #include <stdio.h> #include <sys/time.h> -#ifdef SONAME_LIBHAL +#ifdef SONAME_LIBDBUS_1 # include <dbus/dbus.h> +#endif +#ifdef SONAME_LIBHAL # include <hal/libhal.h> #endif @@ -135,7 +137,7 @@ static GUID *parse_uuid( GUID *guid, const char *str ) } /* HAL callback for new device */ -static void new_device( LibHalContext *ctx, const char *udi ) +static void hal_new_device( LibHalContext *ctx, const char *udi ) { DBusError error; char *parent = NULL; @@ -187,7 +189,7 @@ done: } /* HAL callback for removed device */ -static void removed_device( LibHalContext *ctx, const char *udi ) +static void hal_removed_device( LibHalContext *ctx, const char *udi ) { DBusError error; @@ -203,17 +205,17 @@ static void removed_device( LibHalContext *ctx, const char *udi ) } /* HAL callback for property changes */ -static void property_modified (LibHalContext *ctx, const char *udi, - const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) +static void hal_property_modified (LibHalContext *ctx, const char *udi, + const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) { TRACE( "udi %s key %s %s\n", wine_dbgstr_a(udi), wine_dbgstr_a(key), - is_added ? "added" : is_removed ? "removed" : "modified" ); + is_added ? "added" : is_removed ? "removed" : "modified" ); - if (!strcmp( key, "volume.mount_point" )) new_device( ctx, udi ); + if (!strcmp( key, "volume.mount_point" )) hal_new_device( ctx, udi ); } -static DWORD WINAPI hal_thread( void *arg ) +static DWORD WINAPI dbus_thread( void *arg ) { DBusError error; DBusConnection *dbc; @@ -232,9 +234,9 @@ static DWORD WINAPI hal_thread( void *arg ) } p_libhal_ctx_set_dbus_connection( ctx, dbc ); - p_libhal_ctx_set_device_added( ctx, new_device ); - p_libhal_ctx_set_device_removed( ctx, removed_device ); - p_libhal_ctx_set_device_property_modified( ctx, property_modified ); + p_libhal_ctx_set_device_added( ctx, hal_new_device ); + p_libhal_ctx_set_device_removed( ctx, hal_removed_device ); + p_libhal_ctx_set_device_property_modified( ctx, hal_property_modified ); if (!p_libhal_ctx_init( ctx, &error )) { @@ -247,7 +249,7 @@ static DWORD WINAPI hal_thread( void *arg ) if (!(list = p_libhal_get_all_devices( ctx, &num, &error ))) p_dbus_error_free( &error ); else { - for (i = 0; i < num; i++) new_device( ctx, list[i] ); + for (i = 0; i < num; i++) hal_new_device( ctx, list[i] ); p_libhal_free_string_array( list ); } @@ -269,20 +271,20 @@ static DWORD WINAPI hal_thread( void *arg ) return 0; } -void initialize_hal(void) +void initialize_dbus(void) { HANDLE handle; if (!load_functions()) return; - if (!(handle = CreateThread( NULL, 0, hal_thread, NULL, 0, NULL ))) return; + if (!(handle = CreateThread( NULL, 0, dbus_thread, NULL, 0, NULL ))) return; CloseHandle( handle ); } #else /* SONAME_LIBHAL */ -void initialize_hal(void) +void initialize_dbus(void) { - TRACE( "Skipping, HAL support not compiled in\n" ); + TRACE( "Skipping, DBUS support not compiled in\n" ); } #endif /* SONAME_LIBHAL */ diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 5cf1017..927e6e8 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -461,7 +461,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); - initialize_hal(); + initialize_dbus(); initialize_diskarbitration(); return status; diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index a47a3e3..d1e814f 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -35,7 +35,7 @@ #define WINE_MOUNTMGR_EXTENSIONS #include "ddk/mountmgr.h" -extern void initialize_hal(void) DECLSPEC_HIDDEN; +extern void initialize_dbus(void) DECLSPEC_HIDDEN; extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN; /* device functions */

1 0

Francois Gouget : include: Add the missing guiddef.h include directives.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 785d7a8841ec1ebe1da080d718621198b7be3ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785d7a8841ec1ebe1da080d71… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 20 09:18:07 2011 +0100 include: Add the missing guiddef.h include directives. --- include/cfgmgr32.h | 4 ++++ include/dbt.h | 4 ++++ include/ntddndis.h | 12 ++++++++---- include/ntsecapi.h | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index cd26df8..64f0881 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -21,6 +21,10 @@ /* FIXME: #include <cfg.h> */ +#ifndef GUID_DEFINED +# include <guiddef.h> +#endif + /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ diff --git a/include/dbt.h b/include/dbt.h index 88a1df4..b326dc2 100644 --- a/include/dbt.h +++ b/include/dbt.h @@ -19,6 +19,10 @@ #ifndef __WINE_DBT_H #define __WINE_DBT_H +#ifndef GUID_DEFINED +# include <guiddef.h> +#endif + /* dbt.h doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_DBT_TYPE_AW(type) /* nothing */ diff --git a/include/ntddndis.h b/include/ntddndis.h index 5085f25..1715628 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -19,14 +19,18 @@ #ifndef _NTDDNDIS_ #define _NTDDNDIS_ -#ifdef __cplusplus -extern "C" { -#endif - #include <ifdef.h> #include <devpkey.h> /* #include <pciprop.h> */ +#ifndef GUID_DEFINED +# include <guiddef.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + #define _NDIS_CONTROL_CODE(request, method) \ CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, request, method, FILE_ANY_ACCESS) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index adfd930..2bb3d31 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -19,6 +19,10 @@ #ifndef __WINE_NTSECAPI_H #define __WINE_NTSECAPI_H +#ifndef GUID_DEFINED +# include <guiddef.h> +#endif + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */

1 0

Francois Gouget : dlls: Standardize on 'static const WCHAR' for our Unicode string literals.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 5f88f362ea74f3355fb497cd1c228119281f9f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f88f362ea74f3355fb497cd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 20 09:12:07 2011 +0100 dlls: Standardize on 'static const WCHAR' for our Unicode string literals. Do the same for the corresponding Ansi strings. --- dlls/qedit/samplegrabber.c | 6 ++-- dlls/quartz/filesource.c | 4 +- dlls/quartz/regsvr.c | 34 +++++++++++++++--------------- dlls/strmbase/dllfunc.c | 8 +++--- dlls/windowscodecs/info.c | 8 +++--- dlls/windowscodecs/regsvr.c | 46 +++++++++++++++++++++--------------------- 6 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f88f362ea74f3355fb49…

1 0

Francois Gouget : include: bits.h should include bits1_5.h.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 109325fb8041f24b61eb1a3681e8c61455a47f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109325fb8041f24b61eb1a368… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 20 09:18:13 2011 +0100 include: bits.h should include bits1_5.h. --- include/bits.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/bits.idl b/include/bits.idl index 89b916d..2eed38d 100644 --- a/include/bits.idl +++ b/include/bits.idl @@ -413,3 +413,5 @@ library BackgroundCopyManager interface IBackgroundCopyCallback; } + +cpp_quote("#include \"bits1_5.h\"")

1 0

Francois Gouget : include: Add missing include directives to cor.idl.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: fc6dd916b3ddbecd2093d5ee118e6a135ff70311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6dd916b3ddbecd2093d5ee1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 20 09:18:27 2011 +0100 include: Add missing include directives to cor.idl. --- include/cor.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/cor.idl b/include/cor.idl index 8d8154b..7c731d6 100644 --- a/include/cor.idl +++ b/include/cor.idl @@ -20,8 +20,8 @@ import "propidl.idl"; cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ -/* FIXME: #include "corerror.h" */ -/* FIXME: #include "corhdr.h" */ +cpp_quote("#include <corerror.h>") +cpp_quote("#include <corhdr.h>") cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenser, 0xe5cb7a31,0x7512,0x11d2,0x89,0xce,0x00,0x80,0xc7,0x92,0xe5,0xd8);") cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenserRuntime, 0x1ec2de53,0x75cc,0x11d2,0x97,0x75,0x00,0xa0,0xc9,0xb4,0xd5,0x0c);")

1 0

Alexandre Julliard : mountmgr: Add dynamic devices support using UDisks.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 2a59f016dbe716aaefec9ab94d47d7b8172d0b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a59f016dbe716aaefec9ab94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 11:42:45 2011 +0100 mountmgr: Add dynamic devices support using UDisks. Inspired by a patch from Detlef Riekenberg. --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/dbus.c | 340 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 311 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a59f016dbe716aaefec9…

1 0

Jacek Caban : jscript: Use compiler to handle variable statement.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 5c158f1df69a9eb8c5694bef0ae667fa9b6645a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c158f1df69a9eb8c5694bef0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 11:45:37 2011 +0100 jscript: Use compiler to handle variable statement. --- dlls/jscript/compile.c | 25 +++++++++++++++++++++++++ dlls/jscript/engine.c | 17 ++++++++--------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 09384bc..5bfbb09 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -841,6 +841,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_expression_noret(ctx, expr, NULL); } +/* ECMA-262 3rd Edition 12.1 */ static HRESULT compile_block_statement(compiler_ctx_t *ctx, statement_t *iter) { HRESULT hres; @@ -865,6 +866,28 @@ static HRESULT compile_block_statement(compiler_ctx_t *ctx, statement_t *iter) return S_OK; } +/* ECMA-262 3rd Edition 12.2 */ +static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) +{ + variable_declaration_t *iter; + HRESULT hres; + + for(iter = stat->variable_list; iter; iter = iter->next) { + if(!iter->expr) + continue; + + hres = compile_expression(ctx, iter->expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_bstr(ctx, OP_var_set, iter->identifier); + if(FAILED(hres)) + return hres; + } + + return push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; +} + /* ECMA-262 3rd Edition 12.4 */ static HRESULT compile_expression_statement(compiler_ctx_t *ctx, expression_statement_t *stat) { @@ -934,6 +957,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_expression_statement(ctx, (expression_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); + case STAT_VAR: + return compile_var_statement(ctx, (var_statement_t*)stat); default: return compile_interp_fallback(ctx, stat); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2dc1b29..2663833 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -688,19 +688,18 @@ static HRESULT variable_list_eval(script_ctx_t *ctx, variable_declaration_t *var } /* ECMA-262 3rd Edition 12.2 */ -HRESULT var_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) +static HRESULT interp_var_set(exec_ctx_t *ctx) { - var_statement_t *stat = (var_statement_t*)_stat; + const BSTR name = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + VARIANT *v; HRESULT hres; - TRACE("\n"); - - hres = variable_list_eval(ctx, stat->variable_list, &rt->ei); - if(FAILED(hres)) - return hres; + TRACE("%s\n", debugstr_w(name)); - V_VT(ret) = VT_EMPTY; - return S_OK; + v = stack_pop(ctx); + hres = jsdisp_propput_name(ctx->var_disp, name, v, ctx->ei, NULL/*FIXME*/); + VariantClear(v); + return hres; } /* ECMA-262 3rd Edition 12.6.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0fae5fb..ebcfa45 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -104,6 +104,7 @@ typedef struct _func_stack { X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ X(undefined, 1, 0,0) \ + X(var_set, 1, ARG_BSTR, 0) \ X(void, 1, 0,0) \ X(xor, 1, 0,0) @@ -398,7 +399,6 @@ typedef struct { } try_statement_t; HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT var_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT for_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 085b819..3445476 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -849,7 +849,7 @@ static const statement_eval_t stat_eval_table[] = { switch_statement_eval, throw_statement_eval, try_statement_eval, - var_statement_eval, + compiled_statement_eval, while_statement_eval, with_statement_eval };

1 0

Nikolay Sivov : msxml3: Support VT_ARRAY|VT_UI1 as body type.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: ea75ac8406e71f6cdb3ecfa45408bba5aebdd13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea75ac8406e71f6cdb3ecfa45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 19 00:44:18 2011 +0300 msxml3: Support VT_ARRAY|VT_UI1 as body type. --- dlls/msxml3/httprequest.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 5591d2a..6b77d2e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -537,6 +537,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * BindStatusCallback *bsc; IBindCtx *pbc; HRESULT hr; + int size; hr = CreateBindCtx(0, &pbc); if (hr != S_OK) return hr; @@ -562,6 +563,9 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * if (This->verb != BINDVERB_GET) { + void *send_data, *ptr; + SAFEARRAY *sa = NULL; + if (V_VT(body) == (VT_VARIANT|VT_BYREF)) body = V_VARIANTREF(body); @@ -569,9 +573,8 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * { case VT_BSTR: { - int len = SysStringLen(V_BSTR(body)), size; + int len = SysStringLen(V_BSTR(body)); const WCHAR *str = V_BSTR(body); - void *send_data, *ptr; UINT i, cp = CP_ACP; for (i = 0; i < len; i++) @@ -606,10 +609,47 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * heap_free(ptr); break; } + case VT_ARRAY|VT_UI1: + { + sa = V_ARRAY(body); + if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) return hr; + if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) + { + SafeArrayUnaccessData(sa); + return hr; + } + size++; + break; + } + case VT_EMPTY: + ptr = NULL; + size = 0; + break; default: FIXME("unsupported body data type %d\n", V_VT(body)); break; } + + bsc->body = GlobalAlloc(GMEM_FIXED, size); + if (!bsc->body) + { + if (V_VT(body) == VT_BSTR) + heap_free(ptr); + else if (V_VT(body) == (VT_ARRAY|VT_UI1)) + SafeArrayUnaccessData(sa); + + heap_free(bsc); + return E_OUTOFMEMORY; + } + + send_data = GlobalLock(bsc->body); + memcpy(send_data, ptr, size); + GlobalUnlock(bsc->body); + + if (V_VT(body) == VT_BSTR) + heap_free(ptr); + else if (V_VT(body) == (VT_ARRAY|VT_UI1)) + SafeArrayUnaccessData(sa); } hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0);

1 0