April 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : oleaut32: Don't use 16-bit headers.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 0ed1041c63be8bf443da1947185baee931e05df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed1041c63be8bf443da19471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:20:21 2009 +0200 oleaut32: Don't use 16-bit headers. --- dlls/oleaut32/olepicture.c | 3 +-- dlls/oleaut32/typelib.c | 21 ++++++++++++++++++++- dlls/oleaut32/typelib.h | 1 - 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 03119f2..adaad97 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -81,8 +81,7 @@ #include "urlmon.h" #include "wine/debug.h" #include "wine/unicode.h" - -#include "wine/wingdi16.h" +#include "wine/library.h" #include "ungif.h" diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d1a719b..75a30d2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -66,7 +66,6 @@ #include "winuser.h" #include "lzexpand.h" -#include "wine/winbase16.h" #include "wine/unicode.h" #include "objbase.h" #include "typelib.h" @@ -77,6 +76,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; /* Type identifier */ + WORD count; /* Number of resources of this type */ + DWORD resloader; /* SetResourceHandler() */ + /* + * Name info array. + */ +} NE_TYPEINFO; + static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 821981f..1fe8ecf 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "oleauto.h" -#include "wine/windef16.h" #define HELPDLLFLAG (0x0100) #define DO_NOT_SEEK (-1)

1 0

Alexandre Julliard : libwine: Don' t export mmap functions for the Windows build.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: f41b2396457cd133eee0666538ecbf03691b0675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41b2396457cd133eee066653… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 20:27:59 2009 +0200 libwine: Don't export mmap functions for the Windows build. --- libs/wine/mmap.c | 29 ++++++++++------------------- libs/wine/wine.def | 5 ----- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index d107fc7..fc5b1d9 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -41,6 +41,8 @@ #include "wine/library.h" #include "wine/list.h" +#ifdef HAVE_MMAP + struct reserved_area { struct list entry; @@ -51,8 +53,6 @@ struct reserved_area static struct list reserved_areas = LIST_INIT(reserved_areas); static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k granularity */ -#ifdef HAVE_MMAP - #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif @@ -390,23 +390,6 @@ void mmap_init(void) reserve_dos_area(); } -#else /* HAVE_MMAP */ - -void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) -{ - return (void *)-1; -} - -static inline int munmap( void *ptr, size_t size ) -{ - return 0; -} - -void mmap_init(void) -{ -} - -#endif /*********************************************************************** * wine_mmap_add_reserved_area @@ -602,3 +585,11 @@ int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, voi } return ret; } + +#else /* HAVE_MMAP */ + +void mmap_init(void) +{ +} + +#endif diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 318db78..a99c170 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -49,7 +49,6 @@ EXPORTS toupperW vsnprintfW vsprintfW - wine_anon_mmap wine_call_on_stack wine_casemap_lower wine_casemap_upper @@ -96,10 +95,6 @@ EXPORTS wine_ldt_is_system wine_ldt_realloc_entries wine_ldt_set_entry - wine_mmap_add_reserved_area - wine_mmap_enum_reserved_areas - wine_mmap_is_in_reserved_area - wine_mmap_remove_reserved_area wine_pthread_get_functions wine_pthread_set_functions wine_switch_to_stack

1 0

Alexandre Julliard : kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 7b7f35aee566021f7ec276fec15ee57262780b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7f35aee566021f7ec276fec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:00:33 2009 +0200 kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too. --- dlls/kernel32/process.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0dd7f67..286f0ab 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -58,9 +58,9 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ extern char **__wine_get_main_environment(void); -#define environ __wine_get_main_environment() #else -extern char **environ; +extern char **__wine_main_environ; +static char **__wine_get_main_environment(void) { return __wine_main_environ; } #endif typedef struct @@ -280,9 +280,10 @@ static BOOL build_initial_environment(void) char **e; WCHAR *p, *endptr; void *ptr; + char **env = __wine_get_main_environment(); /* Compute the total size of the Unix environment */ - for (e = environ; *e; e++) + for (e = env; *e; e++) { if (is_special_env_var( *e )) continue; size += MultiByteToWideChar( CP_UNIXCP, 0, *e, -1, NULL, 0 ); @@ -299,7 +300,7 @@ static BOOL build_initial_environment(void) endptr = p + size / sizeof(WCHAR); /* And fill it with the Unix environment */ - for (e = environ; *e; e++) + for (e = env; *e; e++) { char *str = *e;

1 0

Alexandre Julliard : kernel32: Set argv[0] to the full path of the binary when starting from Unix.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: fc87182d191a2b3daabf260d1ad4b12b157e3cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc87182d191a2b3daabf260d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:59:32 2009 +0200 kernel32: Set argv[0] to the full path of the binary when starting from Unix. --- dlls/kernel32/process.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 286f0ab..624d4de 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -599,6 +599,30 @@ static void set_library_wargv( char **argv ) /*********************************************************************** + * update_library_argv0 + * + * Update the argv[0] global variable with the binary we have found. + */ +static void update_library_argv0( const WCHAR *argv0 ) +{ + DWORD len = strlenW( argv0 ); + + if (len > strlenW( __wine_main_wargv[0] )) + { + __wine_main_wargv[0] = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); + } + strcpyW( __wine_main_wargv[0], argv0 ); + + len = WideCharToMultiByte( CP_ACP, 0, argv0, -1, NULL, 0, NULL, NULL ); + if (len > strlen( __wine_main_argv[0] ) + 1) + { + __wine_main_argv[0] = RtlAllocateHeap( GetProcessHeap(), 0, len ); + } + WideCharToMultiByte( CP_ACP, 0, argv0, -1, __wine_main_argv[0], len, NULL, NULL ); +} + + +/*********************************************************************** * build_command_line * * Build the command line of a process from the argv array. @@ -1024,6 +1048,7 @@ void CDECL __wine_kernel_init(void) MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); ExitProcess( GetLastError() ); } + update_library_argv0( main_exe_name ); if (!build_command_line( __wine_main_wargv )) goto error; boot_event = start_wineboot(); }

1 0

Alexandre Julliard : configure: Disable all 16-bit code on Cygwin.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 391fce6e53eb93cee4fbd889802d457c86cd829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=391fce6e53eb93cee4fbd8898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:59:52 2009 +0200 configure: Disable all 16-bit code on Cygwin. --- configure | 4 +--- configure.ac | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 5468a78..3e4d8d6 100755 --- a/configure +++ b/configure @@ -3883,7 +3883,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi ;; - *-mingw32*) + *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} ;; i[3456789]86*) @@ -7503,8 +7503,6 @@ fi LIBEXT="dll" fi IMPLIBEXT="a" - WIN16_FILES="" - WIN16_INSTALL="" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_msvcrt=${enable_msvcrt:-no} diff --git a/configure.ac b/configure.ac index e3d4b63..e6d9688 100644 --- a/configure.ac +++ b/configure.ac @@ -121,7 +121,7 @@ case $host in AC_SUBST(TARGETFLAGS,"-m64") fi ;; - *-mingw32*) + *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} ;; i[[3456789]]86*) @@ -522,9 +522,6 @@ case $host_os in LIBEXT="dll" fi IMPLIBEXT="a" - dnl We can't build 16-bit NE dlls - WIN16_FILES="" - WIN16_INSTALL="" dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no}

1 0

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: de4e8cf0f9770a24cfcf0ba9170f212daadd2de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4e8cf0f9770a24cfcf0ba91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:01 2009 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/wined3d_private.h | 144 ++++++++++++++++++++-------------------- 1 files changed, 73 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abd37e9..779df72 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -295,7 +295,20 @@ typedef struct wined3d_settings_s { extern wined3d_settings_t wined3d_settings; /* Shader backends */ -struct SHADER_OPCODE_ARG; + +/* TODO: Make this dynamic, based on shader limits ? */ +#define MAX_ATTRIBS 16 +#define MAX_REG_ADDR 1 +#define MAX_REG_TEMP 32 +#define MAX_REG_TEXCRD 8 +#define MAX_REG_INPUT 12 +#define MAX_REG_OUTPUT 12 +#define MAX_CONST_I 16 +#define MAX_CONST_B 16 + +/* FIXME: This needs to go up to 2048 for + * Shader model 3 according to msdn (and for software shaders) */ +#define MAX_LABELS 16 #define SHADER_PGMSIZE 65535 typedef struct SHADER_BUFFER { @@ -393,6 +406,65 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TABLE_SIZE }; +typedef struct semantic +{ + DWORD usage; + DWORD reg; +} semantic; + +typedef struct shader_reg_maps +{ + DWORD shader_version; + char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ + char temporary[MAX_REG_TEMP]; /* pixel, vertex */ + char address[MAX_REG_ADDR]; /* vertex */ + char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ + char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ + char attributes[MAX_ATTRIBS]; /* vertex */ + char labels[MAX_LABELS]; /* pixel, vertex */ + DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ + + /* Sampler usage tokens + * Use 0 as default (bit 31 is always 1 on a valid token) */ + DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; + char usesnrm, vpos, usesdsy; + char usesrelconstF; + + /* Whether or not loops are used in this shader, and nesting depth */ + unsigned loop_depth; + + /* Whether or not this shader uses fog */ + char fog; + +} shader_reg_maps; + +typedef struct SHADER_OPCODE +{ + unsigned int opcode; + const char *name; + char dst_token; + CONST UINT num_params; + enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; + DWORD min_version; + DWORD max_version; +} SHADER_OPCODE; + +typedef struct SHADER_OPCODE_ARG +{ + IWineD3DBaseShader *shader; + const shader_reg_maps *reg_maps; + CONST SHADER_OPCODE *opcode; + DWORD flags; + BOOL coissue; + DWORD dst; + DWORD dst_addr; + DWORD predicate; + DWORD src[4]; + DWORD src_addr[4]; + SHADER_BUFFER *buffer; +} SHADER_OPCODE_ARG; + typedef void (*SHADER_HANDLER)(const struct SHADER_OPCODE_ARG *); struct shader_caps { @@ -457,8 +529,6 @@ struct ps_compile_args { in D3D10 (unconditional NP2 support mandatory). */ }; -#define MAX_ATTRIBS 16 - enum fog_src_type { VS_FOG_Z = 0, VS_FOG_COORD = 1 @@ -2166,56 +2236,12 @@ BOOL getDepthStencilBits(const struct GlPixelFormatDesc *format_desc, short *dep void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); UINT wined3d_log2i(UINT32 x); -/* TODO: Make this dynamic, based on shader limits ? */ -#define MAX_REG_ADDR 1 -#define MAX_REG_TEMP 32 -#define MAX_REG_TEXCRD 8 -#define MAX_REG_INPUT 12 -#define MAX_REG_OUTPUT 12 -#define MAX_CONST_I 16 -#define MAX_CONST_B 16 - -/* FIXME: This needs to go up to 2048 for - * Shader model 3 according to msdn (and for software shaders) */ -#define MAX_LABELS 16 - -typedef struct semantic { - DWORD usage; - DWORD reg; -} semantic; - typedef struct local_constant { struct list entry; unsigned int idx; DWORD value[4]; } local_constant; -typedef struct shader_reg_maps { - DWORD shader_version; - char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ - char temporary[MAX_REG_TEMP]; /* pixel, vertex */ - char address[MAX_REG_ADDR]; /* vertex */ - char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ - char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ - char attributes[MAX_ATTRIBS]; /* vertex */ - char labels[MAX_LABELS]; /* pixel, vertex */ - DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - - /* Sampler usage tokens - * Use 0 as default (bit 31 is always 1 on a valid token) */ - DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; - BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy; - char usesrelconstF; - - /* Whether or not loops are used in this shader, and nesting depth */ - unsigned loop_depth; - - /* Whether or not this shader uses fog */ - char fog; - -} shader_reg_maps; - /* Undocumented opcode controls */ #define INST_CONTROLS_SHIFT 16 #define INST_CONTROLS_MASK 0x00ff0000 @@ -2229,30 +2255,6 @@ typedef enum COMPARISON_TYPE { COMPARISON_LE = 6 } COMPARISON_TYPE; -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - char dst_token; - CONST UINT num_params; - enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; - -typedef struct SHADER_OPCODE_ARG { - IWineD3DBaseShader* shader; - const shader_reg_maps *reg_maps; - CONST SHADER_OPCODE* opcode; - DWORD flags; - BOOL coissue; - DWORD dst; - DWORD dst_addr; - DWORD predicate; - DWORD src[4]; - DWORD src_addr[4]; - SHADER_BUFFER* buffer; -} SHADER_OPCODE_ARG; - typedef struct SHADER_LIMITS { unsigned int temporary; unsigned int texcoord;

1 0

Henri Verbeet : wined3d: Use a more reasonable name for "SHADER_OPCODE_ARG" .
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: c3a01b315ee165181cb51a7e461e0b200993c151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a01b315ee165181cb51a7e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:01 2009 +0200 wined3d: Use a more reasonable name for "SHADER_OPCODE_ARG". --- dlls/wined3d/arb_program_shader.c | 452 ++++++++++---------- dlls/wined3d/baseshader.c | 28 +- dlls/wined3d/glsl_shader.c | 857 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 8 +- 4 files changed, 688 insertions(+), 657 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3a01b315ee165181cb51…

1 0

Alexandre Julliard : libwine: Export __wine_get_main_environment on Mac OS to make sure it' s reevaluated when used.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 8edf353bd2b03994357f7e3e1191a8c8ff71c12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edf353bd2b03994357f7e3e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 14:36:49 2009 +0200 libwine: Export __wine_get_main_environment on Mac OS to make sure it's reevaluated when used. --- dlls/kernel32/process.c | 11 +++++++++-- include/wine/library.h | 1 - libs/wine/loader.c | 14 +++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f2d8567..0dd7f67 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -56,6 +56,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); +#ifdef __APPLE__ +extern char **__wine_get_main_environment(void); +#define environ __wine_get_main_environment() +#else +extern char **environ; +#endif + typedef struct { LPSTR lpEnvAddress; @@ -267,7 +274,7 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE * * Build the Win32 environment from the Unix environment */ -static BOOL build_initial_environment( char **environ ) +static BOOL build_initial_environment(void) { SIZE_T size = 1; char **e; @@ -989,7 +996,7 @@ void CDECL __wine_kernel_init(void) if (!params->Environment) { /* Copy the parent environment */ - if (!build_initial_environment( __wine_main_environ )) exit(1); + if (!build_initial_environment()) exit(1); /* convert old configuration to new format */ convert_old_config(); diff --git a/include/wine/library.h b/include/wine/library.h index 1102390..474cfb2 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -65,7 +65,6 @@ extern int wine_dll_get_owner( const char *name, char *buffer, int size, int *fi extern int __wine_main_argc; extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; -extern char **__wine_main_environ; extern void __wine_dll_register( const IMAGE_NT_HEADERS *header, const char *filename ); extern void wine_init( int argc, char *argv[], char *error, int error_size ); diff --git a/libs/wine/loader.c b/libs/wine/loader.c index b7dd8b3..d10a6e0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -441,6 +441,18 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) /*********************************************************************** + * __wine_get_main_environment + * + * Return an environment pointer to work around lack of environ variable. + * Only exported on Mac OS. + */ +char **__wine_get_main_environment(void) +{ + return environ; +} + + +/*********************************************************************** * __wine_dll_register * * Register a built-in DLL descriptor. @@ -638,7 +650,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) build_dll_path(); __wine_main_argc = argc; __wine_main_argv = argv; - __wine_main_environ = environ; + __wine_main_environ = __wine_get_main_environment(); mmap_init(); for (path = first_dll_path( "ntdll.dll", 0, &context ); path; path = next_dll_path( &context ))

1 0

Ge van Geldorp : mshtml/tests: Fix tests on Windows.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: af5ce0d24956be1c6026189a75749fe685303bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5ce0d24956be1c6026189a7… Author: Ge van Geldorp <ge(a)gse.nl> Date: Wed Apr 1 12:31:18 2009 +0200 mshtml/tests: Fix tests on Windows. --- dlls/mshtml/tests/htmldoc.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 642087d..45fc00c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -103,6 +103,7 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); DEFINE_EXPECT(Exec_ShellDocView_37); DEFINE_EXPECT(Exec_ShellDocView_84); DEFINE_EXPECT(Exec_ShellDocView_103); +DEFINE_EXPECT(Exec_ShellDocView_105); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); @@ -149,7 +150,7 @@ static BOOL expect_LockContainer_fLock; static BOOL expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; -static BOOL readystate_set_loading = FALSE, load_from_stream; +static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; static int stream_read, protocol_read; static enum load_state_t { @@ -648,9 +649,15 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D switch(dispID) { case DISPID_READYSTATE: CHECK_EXPECT2(OnChanged_READYSTATE); - test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED - | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) - ? OLECMDF_ENABLED : 0)); + + if(readystate_set_interactive) { + readystate_set_interactive = FALSE; + load_state = LD_INTERACTIVE; + } + else + test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED + | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) + ? OLECMDF_ENABLED : 0)); if(readystate_set_loading) { readystate_set_loading = FALSE; @@ -663,7 +670,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D CHECK_EXPECT(OnChanged_1005); if(!editmode) test_readyState(NULL); - load_state = LD_INTERACTIVE; + readystate_set_interactive = (load_state != LD_INTERACTIVE); return S_OK; } @@ -2138,6 +2145,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID break; case 1: CHECK_EXPECT(Exec_SETDOWNLOADSTATE_1); + readystate_set_interactive = (load_state != LD_INTERACTIVE); break; default: ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); @@ -2206,6 +2214,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 105: + CHECK_EXPECT2(Exec_ShellDocView_105); + + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); + + return E_NOTIMPL; + default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2750,6 +2766,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(Exec_SETPROGRESSPOS); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Exec_ShellDocView_103); + SET_EXPECT(Exec_ShellDocView_105); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); SET_EXPECT(SetStatusText); @@ -2802,6 +2819,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) CHECK_CALLED(Exec_SETPROGRESSPOS); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); SET_CALLED(Exec_ShellDocView_103); + SET_CALLED(Exec_ShellDocView_105); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText);

1 0

Huw Davies : ole32/tests: Set tymed in GetData and AddRef the interfaces ( ReleaseStgMedium releases them even if pUnkForRelease is non-NULL).
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 126ec0181f0f2c4232317562a5eae5b7c401f3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126ec0181f0f2c4232317562a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 14:41:11 2009 +0100 ole32/tests: Set tymed in GetData and AddRef the interfaces (ReleaseStgMedium releases them even if pUnkForRelease is non-NULL). --- dlls/ole32/tests/clipboard.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1918b2c..88b3ba6 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -245,11 +245,22 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor IUnknown_AddRef(pmedium->pUnkForRelease); if(pformatetc->cfFormat == CF_TEXT || pformatetc->cfFormat == cf_global) + { + pmedium->tymed = TYMED_HGLOBAL; U(*pmedium).hGlobal = This->text; + } else if(pformatetc->cfFormat == cf_stream) + { + pmedium->tymed = TYMED_ISTREAM; + IStream_AddRef(This->stm); U(*pmedium).pstm = This->stm; + } else if(pformatetc->cfFormat == cf_storage) + { + pmedium->tymed = TYMED_ISTORAGE; + IStorage_AddRef(This->stg); U(*pmedium).pstg = This->stg; + } return S_OK; } }

1 0