January 2010 - Wine-Commits

Nikolay Sivov : msxml3: In IXMLElementCollection store pointer to node instead of pointer to children .
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 20e63dcfd1634352ae8d94b8f985749dc34f65f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e63dcfd1634352ae8d94b8f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:16:03 2010 +0300 msxml3: In IXMLElementCollection store pointer to node instead of pointer to children. Collection should be able to track node removal from children list. --- dlls/msxml3/tests/xmlelem.c | 2 +- dlls/msxml3/xmlelem.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index dec1464..bcbae94 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -483,7 +483,7 @@ static void test_xmlelem_children(void) length = -1; hr = IXMLElementCollection_get_length(collection, &length); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine ok(length == 0, "Expected 0, got %08x\n", length); + ok(length == 0, "Expected 0, got %08x\n", length); IXMLElementCollection_Release(collection); hr = IXMLElement_AddRef(child); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 8fe24eb..b96df3a 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -316,7 +316,7 @@ static HRESULT WINAPI xmlelem_get_children(IXMLElement *iface, IXMLElementCollec if (!p) return E_INVALIDARG; - return XMLElementCollection_create((IUnknown *)iface, This->node->children, (LPVOID *)p); + return XMLElementCollection_create((IUnknown *)iface, This->node, (LPVOID *)p); } static LONG type_libxml_to_msxml(xmlElementType type) @@ -492,6 +492,19 @@ typedef struct _xmlelem_collection xmlNodePtr current; } xmlelem_collection; +static inline LONG xmlelem_collection_updatelength(xmlelem_collection *collection) +{ + xmlNodePtr ptr = collection->node->children; + + collection->length = 0; + while (ptr) + { + collection->length++; + ptr = ptr->next; + } + return collection->length; +} + static inline xmlelem_collection *impl_from_IXMLElementCollection(IXMLElementCollection *iface) { return (xmlelem_collection *)((char*)iface - FIELD_OFFSET(xmlelem_collection, lpVtbl)); @@ -596,7 +609,7 @@ static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface if (!p) return E_INVALIDARG; - *p = This->length; + *p = xmlelem_collection_updatelength(This); return S_OK; } @@ -618,7 +631,7 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI VARIANT var2, IDispatch **ppDisp) { xmlelem_collection *This = impl_from_IXMLElementCollection(iface); - xmlNodePtr ptr = This->node; + xmlNodePtr ptr = This->node->children; int index, i; TRACE("(%p, %p)\n", iface, ppDisp); @@ -631,6 +644,8 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI index = V_I4(&var1); if (index < 0) return E_INVALIDARG; + + xmlelem_collection_updatelength(This); if (index >= This->length) return E_FAIL; @@ -711,7 +726,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Reset( IEnumVARIANT *iface) { xmlelem_collection *This = impl_from_IEnumVARIANT(iface); - This->current = This->node; + This->current = This->node->children; return S_OK; } @@ -736,13 +751,12 @@ static const struct IEnumVARIANTVtbl xmlelem_collection_IEnumVARIANTvtbl = static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) { xmlelem_collection *collection; - xmlNodePtr ptr; TRACE("(%p,%p)\n", pUnkOuter, ppObj); *ppObj = NULL; - if (!node) + if (!node->children) return S_FALSE; collection = HeapAlloc(GetProcessHeap(), 0, sizeof (*collection)); @@ -754,14 +768,8 @@ static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, collection->ref = 1; collection->length = 0; collection->node = node; - collection->current = node; - - ptr = node; - while (ptr) - { - collection->length++; - ptr = ptr->next; - } + collection->current = node->children; + xmlelem_collection_updatelength(collection); *ppObj = &collection->lpVtbl;

1 0

Nikolay Sivov : msxml3: Implement IXMLElement::removeChild() with some tests.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 7f5cedf70aa01f23ee7a6a92c63e62405c9adc88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5cedf70aa01f23ee7a6a92c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:13:50 2010 +0300 msxml3: Implement IXMLElement::removeChild() with some tests. --- dlls/msxml3/tests/xmlelem.c | 26 +++++++++++++++++++++++--- dlls/msxml3/xmlelem.c | 17 +++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 38b621f..dec1464 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -478,7 +478,7 @@ static void test_xmlelem_children(void) /* remove/add child and check what happens with collection */ hr = IXMLElement_removeChild(element, child); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); length = -1; hr = IXMLElementCollection_get_length(collection, &length); @@ -522,14 +522,34 @@ static void test_xmlelem_children(void) hr = IXMLElementCollection_item(collection, vIndex, vName, (IDispatch **)&child2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(child2 != NULL, "Expected not NULL child\n"); + IXMLElementCollection_Release(collection); + + /* add element->child->child2 structure, then remove child2 from node */ + V_VT(&vType) = VT_I4; + V_I4(&vType) = XMLELEMTYPE_TEXT; + V_VT(&vName) = VT_NULL; + hr = IXMLDocument_createElement(doc, vType, vName, &child2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(child2 != NULL, "Expected non-NULL child\n"); + + hr = IXMLElement_addChild(child, child2, 0, -1); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLElement_removeChild(element, child2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXMLElement_removeChild(child, child2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLElement_removeChild(child, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); IXMLElement_Release(element); IXMLElement_Release(child); - IXMLElementCollection_Release(collection); + IXMLElement_Release(child2); IXMLDocument_Release(doc); } - static BOOL test_try_xmldoc(void) { IXMLDocument *doc = NULL; diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index b91722c..8fe24eb 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -412,8 +412,21 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl static HRESULT WINAPI xmlelem_removeChild(IXMLElement *iface, IXMLElement *pChildElem) { - FIXME("(%p, %p): stub\n", iface, pChildElem); - return E_NOTIMPL; + xmlelem *This = impl_from_IXMLElement(iface); + xmlelem *childElem = impl_from_IXMLElement(pChildElem); + + TRACE("(%p, %p)\n", This, childElem); + + if (!pChildElem) + return E_INVALIDARG; + + /* only supported for This is childElem parent case */ + if (This->node != childElem->node->parent) + return E_INVALIDARG; + + xmlUnlinkNode(childElem->node); + + return S_OK; } static const struct IXMLElementVtbl xmlelem_vtbl =

1 0

Alexandre Julliard : winebuild: Rename __wine_call_from_32_regs for consistency with 64-bit.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 102dd9e92feaae767c84111d60298551715c87b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102dd9e92feaae767c84111d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 15:41:48 2010 +0100 winebuild: Rename __wine_call_from_32_regs for consistency with 64-bit. --- dlls/krnl386.exe16/kernel16_private.h | 2 +- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_i386.c | 6 +++--- tools/winebuild/relay.c | 11 ++++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 2f68c57..8ab4c89 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -287,7 +287,7 @@ static inline struct kernel_thread_data *kernel_get_thread_data(void) ".byte 0x68\n\t" /* pushl $__regs_func */ \ ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ ".byte 0x6a," #args "\n\t" /* pushl $args */ \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + "call " __ASM_NAME("__wine_call_from_regs") "\n\t" \ "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ #endif /* __WINE_KERNEL16_PRIVATE_H */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 32966b7..586250d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -237,7 +237,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) ".byte 0x68\n\t" /* pushl $__regs_func */ \ ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ ".byte 0x6a," #args "\n\t" /* pushl $args */ \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + "call " __ASM_NAME("__wine_call_from_regs") "\n\t" \ "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ #elif defined(__x86_64__) #define DEFINE_REGS_ENTRYPOINT( name, args ) \ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5a919b3..4eccb61 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -423,7 +423,7 @@ static wine_signal_handler handlers[256]; static int fpux_support; /* whether the CPU support extended fpu context */ -extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context ); +extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); enum i386_trap_code { @@ -1173,7 +1173,7 @@ void set_cpu_context( const CONTEXT *context ) if (!(flags & CONTEXT_CONTROL)) FIXME( "setting partial context (%x) not supported\n", flags ); else if (flags & CONTEXT_SEGMENTS) - __wine_call_from_32_restore_regs( context ); + __wine_restore_regs( context ); else { CONTEXT newcontext = *context; @@ -1181,7 +1181,7 @@ void set_cpu_context( const CONTEXT *context ) newcontext.SegEs = wine_get_es(); newcontext.SegFs = wine_get_fs(); newcontext.SegGs = wine_get_gs(); - __wine_call_from_32_restore_regs( &newcontext ); + __wine_restore_regs( &newcontext ); } } } diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 3f95545..64bb2d5 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -752,7 +752,8 @@ static void BuildCallFrom32Regs(void) /* Function header */ - function_header( "__wine_call_from_32_regs" ); + output( "\t.text\n" ); + function_header( "__wine_call_from_regs" ); /* Allocate some buffer space on the stack */ @@ -845,12 +846,12 @@ static void BuildCallFrom32Regs(void) output( "\tpopl %%ds\n" ); output( "\tiret\n" ); - output_function_size( "__wine_call_from_32_regs" ); + output_function_size( "__wine_call_from_regs" ); - function_header( "__wine_call_from_32_restore_regs" ); + function_header( "__wine_restore_regs" ); output( "\tmovl 4(%%esp),%%ecx\n" ); output( "\tjmp 2b\n" ); - output_function_size( "__wine_call_from_32_restore_regs" ); + output_function_size( "__wine_restore_regs" ); } @@ -991,6 +992,7 @@ static void build_call_from_regs_x86_64(void) /* Function header */ + output( "\t.text\n" ); function_header( "__wine_call_from_regs" ); output( "\t.cfi_startproc\n" ); @@ -1170,7 +1172,6 @@ void BuildRelays32(void) case CPU_x86_64: output( "/* File generated automatically. Do not edit! */\n\n" ); - output( "\t.text\n" ); build_call_from_regs_x86_64(); output_gnu_stack_note(); break;

1 0

Alexandre Julliard : winebuild: Output the asm relay functions as needed and get rid of --relay32 mode.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 10e4a55b6c87793fc424870b77a30cb8b4dc73bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e4a55b6c87793fc424870b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 15:50:27 2010 +0100 winebuild: Output the asm relay functions as needed and get rid of --relay32 mode. --- dlls/ntdll/Makefile.in | 5 ----- tools/winebuild/build.h | 4 +++- tools/winebuild/import.c | 8 ++++++-- tools/winebuild/main.c | 11 ----------- tools/winebuild/relay.c | 29 ++++++++--------------------- tools/winebuild/spec32.c | 1 + tools/winebuild/winebuild.man.in | 4 ---- 7 files changed, 18 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index a372044..41bc5d3 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -56,11 +56,6 @@ C_SRCS = \ RC_SRCS = version.rc -EXTRA_OBJS = relay32.o - @MAKE_DLL_RULES@ -relay32.o: $(WINEBUILD) - $(WINEBUILD) $(WINEBUILDFLAGS) -o $@ --relay32 - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 06e2887..23b9bd1 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -244,7 +244,8 @@ extern void add_delayed_import( const char *name ); extern void add_ignore_symbol( const char *name ); extern void add_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); -extern int resolve_imports( DLLSPEC *spec ); +extern void resolve_imports( DLLSPEC *spec ); +extern int is_undefined( const char *name ); extern int has_imports(void); extern int has_relays( DLLSPEC *spec ); extern void output_get_pc_thunk(void); @@ -266,6 +267,7 @@ extern void output_bin_res16_directory( DLLSPEC *spec, unsigned int data_offset extern void output_spec16_file( DLLSPEC *spec ); extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); +extern void output_asm_relays(void); extern void BuildRelays16(void); extern void BuildRelays32(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e5e87d3..dc703f1 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -585,7 +585,7 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) } /* resolve the imports for a Win32 module */ -int resolve_imports( DLLSPEC *spec ) +void resolve_imports( DLLSPEC *spec ) { int i; unsigned int j, removed; @@ -628,8 +628,12 @@ int resolve_imports( DLLSPEC *spec ) sort_names( &undef_symbols ); check_undefined_exports( spec ); +} - return 1; +/* check if symbol is still undefined */ +int is_undefined( const char *name ) +{ + return find_name( name, &undef_symbols ) != NULL; } /* output the get_pc thunk if needed */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index aa487ef..2563d53 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -102,7 +102,6 @@ enum exec_mode_values MODE_DEF, MODE_IMPLIB, MODE_RELAY16, - MODE_RELAY32, MODE_RESOURCES }; @@ -271,7 +270,6 @@ static const char usage_str[] = " --exe Build a .c file for an executable\n" " --implib Build an import library\n" " --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n" " --resources Build a .o file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; @@ -289,7 +287,6 @@ enum long_options_values LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, LONG_OPT_RELAY16, - LONG_OPT_RELAY32, LONG_OPT_RESOURCES, LONG_OPT_SAVE_TEMPS, LONG_OPT_SUBSYSTEM, @@ -312,7 +309,6 @@ static const struct option long_options[] = { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, { "relay16", 0, 0, LONG_OPT_RELAY16 }, - { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "resources", 0, 0, LONG_OPT_RESOURCES }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, @@ -507,9 +503,6 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_RELAY16: set_exec_mode( MODE_RELAY16 ); break; - case LONG_OPT_RELAY32: - set_exec_mode( MODE_RELAY32 ); - break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; @@ -671,10 +664,6 @@ int main(int argc, char **argv) if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); BuildRelays16(); break; - case MODE_RELAY32: - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays32(); - break; case MODE_RESOURCES: load_resources( argv, spec ); output_res_o_file( spec ); diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 64bb2d5..221fc5a 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -721,7 +721,7 @@ static void BuildCallTo32CBClient( int isEx ) /******************************************************************* - * BuildCallFrom32Regs + * build_call_from_regs_x86 * * Build a 32-bit-to-Wine call-back function for a 'register' function. * 'args' is the number of dword arguments. @@ -746,7 +746,7 @@ static void BuildCallTo32CBClient( int isEx ) * pointer on return (with the return address and arguments already * removed). */ -static void BuildCallFrom32Regs(void) +static void build_call_from_regs_x86(void) { static const int STACK_SPACE = 128 + 0x2cc /* sizeof(CONTEXT86) */; @@ -962,7 +962,7 @@ void BuildRelays16(void) output( "\t.text\n" ); output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); - BuildCallFrom32Regs(); + build_call_from_regs_x86(); output_function_size( "__wine_spec_thunk_text_32" ); output_gnu_stack_note(); @@ -1150,34 +1150,21 @@ static void build_call_from_regs_x86_64(void) /******************************************************************* - * BuildRelays32 + * output_asm_relays * - * Build all the 32-bit relay callbacks + * Build all the assembly relay callbacks */ -void BuildRelays32(void) +void output_asm_relays(void) { switch (target_cpu) { case CPU_x86: - output( "/* File generated automatically. Do not edit! */\n\n" ); - output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); - - /* 32-bit register entry point */ - BuildCallFrom32Regs(); - - output_function_size( "__wine_spec_thunk_text_32" ); - output_gnu_stack_note(); + build_call_from_regs_x86(); break; - case CPU_x86_64: - output( "/* File generated automatically. Do not edit! */\n\n" ); build_call_from_regs_x86_64(); - output_gnu_stack_note(); break; - default: - output( "/* File not used with this architecture. Do not edit! */\n\n" ); - return; + break; } } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index a594deb..3152660 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -554,6 +554,7 @@ void BuildSpec32File( DLLSPEC *spec ) output_stubs( spec ); output_exports( spec ); output_imports( spec ); + if (is_undefined( "__wine_call_from_regs" )) output_asm_relays(); output_resources( spec ); output_gnu_stack_note(); } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 7ca151c..4897290 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -54,10 +54,6 @@ specified via the -E option. Generate the assembly code for the 16-bit relay routines. This is for Wine internal usage only, you should never need to use this option. .TP -.B \--relay32 -Generate the assembly code for the 32-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.TP .B \--resources Generate a .o file containing all the input resources. This is useful when building with a PE compiler, since the PE binutils cannot handle

1 0

Alexandre Julliard : winebuild: Output the 16-bit asm relay functions as needed and get rid of --relay16 mode .
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 539da1b073be3a0c74f82d6b9a0fb00c1f214c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539da1b073be3a0c74f82d6b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 15:58:48 2010 +0100 winebuild: Output the 16-bit asm relay functions as needed and get rid of --relay16 mode. --- dlls/krnl386.exe16/Makefile.in | 5 ----- tools/winebuild/build.h | 3 +-- tools/winebuild/main.c | 11 ----------- tools/winebuild/relay.c | 17 +++-------------- tools/winebuild/spec16.c | 1 + tools/winebuild/winebuild.man.in | 4 ---- 6 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in index be18b05..1e25735 100644 --- a/dlls/krnl386.exe16/Makefile.in +++ b/dlls/krnl386.exe16/Makefile.in @@ -59,11 +59,6 @@ C_SRCS = \ RC_SRCS = version.rc -EXTRA_OBJS = relay16asm.o - @MAKE_DLL_RULES@ -relay16asm.o: $(WINEBUILD) - $(WINEBUILD) $(WINEBUILDFLAGS) -o $@ --relay16 - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 23b9bd1..5620763 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -268,9 +268,8 @@ extern void output_spec16_file( DLLSPEC *spec ); extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); extern void output_asm_relays(void); +extern void output_asm_relays16(void); -extern void BuildRelays16(void); -extern void BuildRelays32(void); extern void BuildSpec32File( DLLSPEC *spec ); extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 2563d53..4a11519 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -101,7 +101,6 @@ enum exec_mode_values MODE_EXE, MODE_DEF, MODE_IMPLIB, - MODE_RELAY16, MODE_RESOURCES }; @@ -269,7 +268,6 @@ static const char usage_str[] = " --def Build a .def file from a .spec file\n" " --exe Build a .c file for an executable\n" " --implib Build an import library\n" -" --relay16 Build the 16-bit relay assembly routines\n" " --resources Build a .o file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; @@ -286,7 +284,6 @@ enum long_options_values LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, - LONG_OPT_RELAY16, LONG_OPT_RESOURCES, LONG_OPT_SAVE_TEMPS, LONG_OPT_SUBSYSTEM, @@ -308,7 +305,6 @@ static const struct option long_options[] = { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, - { "relay16", 0, 0, LONG_OPT_RELAY16 }, { "resources", 0, 0, LONG_OPT_RESOURCES }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, @@ -500,9 +496,6 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (optarg[0] == 'n' || optarg[0] == 'N') spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_NX_COMPAT; break; - case LONG_OPT_RELAY16: - set_exec_mode( MODE_RELAY16 ); - break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; @@ -660,10 +653,6 @@ int main(int argc, char **argv) if (!parse_input_file( spec )) break; output_import_lib( spec, argv ); break; - case MODE_RELAY16: - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays16(); - break; case MODE_RESOURCES: load_resources( argv, spec ); output_res_o_file( spec ); diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 221fc5a..7073d74 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -903,23 +903,15 @@ static void BuildPendingEventCheck(void) /******************************************************************* - * BuildRelays16 + * output_asm_relays16 * * Build all the 16-bit relay callbacks */ -void BuildRelays16(void) +void output_asm_relays16(void) { - if (target_cpu != CPU_x86) - { - output( "/* File not used with this architecture. Do not edit! */\n\n" ); - return; - } - /* File header */ - output( "/* File generated automatically. Do not edit! */\n\n" ); output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_16") ); output( "%s\n", asm_globl("__wine_call16_start") ); @@ -958,14 +950,11 @@ void BuildRelays16(void) output( "\n\t.data\n\t.align %d\n", get_alignment(4) ); output( "%s\n\t.long 0\n", asm_globl("CallTo16_DataSelector") ); output( "%s\n\t.long 0\n", asm_globl("CallTo16_TebSelector") ); - if (UsePIC) output( "wine_ldt_copy_ptr:\t.long %s\n", asm_name("wine_ldt_copy") ); output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); + output( "%s:\n", asm_name("__wine_spec_thunk_text_32") ); build_call_from_regs_x86(); output_function_size( "__wine_spec_thunk_text_32" ); - - output_gnu_stack_note(); } diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index a9e67ad..e60b4bc 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -773,6 +773,7 @@ void output_spec16_file( DLLSPEC *spec16 ) output_stubs( spec16 ); output_exports( spec32 ); output_imports( spec16 ); + if (is_undefined( "__wine_call_from_16" )) output_asm_relays16(); if (spec16->main_module) { output( "\n\t%s\n", get_asm_string_section() ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 4897290..88452d3 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -50,10 +50,6 @@ Build a .def file from a spec file. The .spec file is specified via the Build a PE import library from a spec file. The .spec file is specified via the -E option. .TP -.B \--relay16 -Generate the assembly code for the 16-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.TP .B \--resources Generate a .o file containing all the input resources. This is useful when building with a PE compiler, since the PE binutils cannot handle

1 0

James Hawkins : Revert "advapi32: Free descriptor if it isn' t returned from GetSecurityInfo().".
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 72158ac286dfbf5908c2bc281678422469d0653b URL: http://source.winehq.org/git/wine.git/?a=commit;h=72158ac286dfbf5908c2bc281… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 14 11:35:09 2010 -0800 Revert "advapi32: Free descriptor if it isn't returned from GetSecurityInfo().". This reverts commit dbd76575ef8353484afa0b0d2da95760c26f34fe. According to MSDN, ppSecurityDescriptor must not be NULL if any of the SID or ACL parameters are non-NULL. This is wrong, and native GetSecurityInfo will happily return those pointers, leaving one unable to free the original security descriptor. --- dlls/advapi32/security.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index babe468..821fb86 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3118,8 +3118,11 @@ DWORD WINAPI GetSecurityInfo( } if (ppSecurityDescriptor) *ppSecurityDescriptor = sd; - else - LocalFree(sd); + + /* The security descriptor (sd) cannot be freed if ppSecurityDescriptor is + * NULL, because native happily returns the SIDs and ACLs that are requested + * in this case. + */ return ERROR_SUCCESS; }

1 0

Kusanagi Kouichi : user32: Make DefWindowProc handle Shift+F10.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: 529b1833978e2cc3d2477395eababaf038d8fe4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=529b1833978e2cc3d2477395e… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Jan 13 22:55:25 2010 +0900 user32: Make DefWindowProc handle Shift+F10. --- dlls/user32/defwnd.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index ae104e2..e3736fc 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -561,7 +561,11 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } } else if( wParam == VK_F10 ) + { + if (GetKeyState(VK_SHIFT) & 0x8000) + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); iF10Key = 1; + } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break;

1 0

Erich Hoover : ntoskrnl: Forward ExSystemTimeToLocalTime and ExLocalTimeToSystemTime to ntdll.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: c7ccf24020b9e995aade36038f6cbf84da2caf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ccf24020b9e995aade36038… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 14 10:16:50 2010 -0700 ntoskrnl: Forward ExSystemTimeToLocalTime and ExLocalTimeToSystemTime to ntdll. --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6fc72c1..5e11bf9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -157,7 +157,7 @@ @ stub ExIsProcessorFeaturePresent @ stub ExIsResourceAcquiredExclusiveLite @ stub ExIsResourceAcquiredSharedLite -@ stub ExLocalTimeToSystemTime +@ stdcall ExLocalTimeToSystemTime(ptr ptr) ntdll.RtlLocalTimeToSystemTime @ stub ExNotifyCallback @ stub ExQueryPoolBlockSize @ stub ExQueueWorkItem @@ -173,7 +173,7 @@ @ stub ExSetResourceOwnerPointer @ stub ExSetTimerResolution @ stub ExSystemExceptionFilter -@ stub ExSystemTimeToLocalTime +@ stdcall ExSystemTimeToLocalTime(ptr ptr) ntdll.RtlSystemTimeToLocalTime @ stub ExUnregisterCallback @ stub ExUuidCreate @ stub ExVerifySuite

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement IDispatchEx support.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: b5caee220d86bd7465bca0a7ef2e55340f235fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5caee220d86bd7465bca0a7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 14 09:48:18 2010 -0600 mshtml: Added IHTMLIFrameElement IDispatchEx support. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c77ebb9..be44748 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -133,6 +133,7 @@ static REFIID tid_ids[] = { &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IHTMLGenericElement, + &IID_IHTMLIFrameElement, &IID_IHTMLImageElementFactory, &IID_IHTMLImgElement, &IID_IHTMLInputElement, diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 689b432..b776077 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -262,6 +262,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { IHTMLElement3_tid, IHTMLFrameBase_tid, IHTMLFrameBase2_tid, + IHTMLIFrameElement_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 68b3393..4529231 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -109,6 +109,7 @@ typedef enum { IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLGenericElement_tid, + IHTMLIFrameElement_tid, IHTMLImageElementFactory_tid, IHTMLImgElement_tid, IHTMLInputElement_tid,

1 0

Kusanagi Kouichi : user32/tests: Add test for Shift+F10.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: 95676b50f8b7b77034aef6acd745af4d8322cafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=95676b50f8b7b77034aef6acd… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Jan 13 22:55:05 2010 +0900 user32/tests: Add test for Shift+F10. --- dlls/user32/tests/msg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7be49ed..96b9ccc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6903,6 +6903,32 @@ static const struct message WmVkF10Seq[] = { { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, { 0 } }; +static const struct message WmShiftF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 1 }, /* XP */ + { WM_KEYDOWN, wparam|lparam, VK_SHIFT, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_SHIFT, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ + { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0xc0000001 }, /* XP */ + { WM_KEYUP, wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7123,6 +7149,16 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); + trace("testing SHIFT+F10 press/release\n"); + keybd_event(VK_SHIFT, 0, 0, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmShiftF10Seq, "SHIFT+F10 press/release", TRUE); + trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ GetClientRect(hwnd, &rc);

1 0