January 2008 - Wine-commits

Alistair Leslie-Hughes : msxml3: Corrected getAttribute to return current value and assign output var.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 83300893a2372b01c70b9034b28deda5f783602c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83300893a2372b01c70b9034b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 14 21:13:01 2008 +1100 msxml3: Corrected getAttribute to return current value and assign output var. --- dlls/msxml3/element.c | 9 +++++++-- dlls/msxml3/tests/domdoc.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e7f03d6..814a987 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -459,15 +459,20 @@ static HRESULT WINAPI domelem_getAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value; - HRESULT hr = E_FAIL; + HRESULT hr = S_FALSE; TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value); + if(!value || !name) + return E_INVALIDARG; + element = get_element( This ); if ( !element ) return E_FAIL; - VariantInit(value); + V_BSTR(value) = NULL; + V_VT(value) = VT_NULL; + xml_name = xmlChar_from_wchar( name ); xml_value = xmlGetNsProp(element, xml_name, NULL); HeapFree(GetProcessHeap(), 0, xml_name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dcd2168..75adc64 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -697,8 +697,8 @@ static void test_domnode( void ) V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); - ok( r == E_FAIL, "getAttribute ret %08x\n", r ); - ok( V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); + ok( r == S_FALSE, "getAttribute ret %08x\n", r ); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); VariantClear(&var); SysFreeString( str ); @@ -710,6 +710,13 @@ static void test_domnode( void ) ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n"); VariantClear( &var ); + + r = IXMLDOMElement_getAttribute( element, NULL, &var ); + ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r ); + + r = IXMLDOMElement_getAttribute( element, str, NULL ); + ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r ); + SysFreeString( str ); r = IXMLDOMElement_get_attributes( element, &map );

1 0

Alistair Leslie-Hughes : msxml3: Correct get_attributes for CDATA Section.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: bf4a43e1e03e341aa454dfa53e9bf0eef118de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4a43e1e03e341aa454dfa53… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 14 13:15:58 2008 +1100 msxml3: Correct get_attributes for CDATA Section. --- dlls/msxml3/node.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index c0d9076..72be7a8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -417,6 +417,7 @@ static HRESULT WINAPI xmlnode_get_attributes( /* Attribute, CDataSection, Comment, Documents, Documents Fragments, Entity and Text Nodes does not support get_attributes */ case XML_ATTRIBUTE_NODE: + case XML_CDATA_SECTION_NODE: case XML_COMMENT_NODE: case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE:

1 0

Alistair Leslie-Hughes : msxml3: Implemented IXMLDOMCDATASection COM Object .
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: b9e9e041e8f0b5d15a834a91557d9a5ac83261c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e9e041e8f0b5d15a834a915… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 14 13:25:13 2008 +1100 msxml3: Implemented IXMLDOMCDATASection COM Object. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/cdata.c | 594 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/domdoc.c | 25 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 60 +++++ 5 files changed, 679 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9e9e041e8f0b5d15a834…

1 0

Alistair Leslie-Hughes : msxml3: Implement get_dataType.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: e989d48f43a43a2ff6ffdb911ed24d196eef932d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e989d48f43a43a2ff6ffdb911… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 14 12:44:56 2008 +1100 msxml3: Implement get_dataType. --- dlls/msxml3/node.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2a93ab8..c0d9076 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -736,8 +736,48 @@ static HRESULT WINAPI xmlnode_get_dataType( IXMLDOMNode *iface, VARIANT* dataTypeName) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlChar *pVal; + + TRACE("iface %p\n", iface); + + if(!dataTypeName) + return E_INVALIDARG; + + /* CDATA Section, Comment, Document, Document Fragment, + Entity, Notation, PI, and Text Node are non-typed. */ + V_BSTR(dataTypeName) = NULL; + V_VT(dataTypeName) = VT_NULL; + + switch ( This->node->type ) + { + case XML_ATTRIBUTE_NODE: + FIXME("NODE_ATTRIBUTE_NODE should return a valid value.\n"); + break; + case XML_ELEMENT_NODE: + pVal = xmlGetNsProp(This->node, (xmlChar*)"dt", + (xmlChar*)"urn:schemas-microsoft-com:datatypes"); + if (pVal) + { + V_VT(dataTypeName) = VT_BSTR; + V_BSTR(dataTypeName) = bstr_from_xmlChar( pVal ); + xmlFree(pVal); + } + break; + case XML_ENTITY_REF_NODE: + FIXME("XML_ENTITY_REF_NODE should return a valid value.\n"); + break; + default: + TRACE("Type %d returning NULL\n", This->node->type); + } + + /* non-typed nodes return S_FALSE */ + if(V_VT(dataTypeName) == VT_NULL) + { + return S_FALSE; + } + + return S_OK; } static HRESULT WINAPI xmlnode_put_dataType( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 19a3dc1..5535bed 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -531,6 +531,13 @@ static void test_domdoc( void ) r = IXMLDOMText_get_attributes( nodetext, &pAttribs); ok(r == S_FALSE, "ret %08x\n", r ); ok( pAttribs == NULL, "pAttribs not NULL\n"); + + /* test get_dataType */ + r = IXMLDOMText_get_dataType(nodetext, &var); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n"); + VariantClear(&var); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); @@ -582,6 +589,12 @@ static void test_domdoc( void ) r = IXMLDOMProcessingInstruction_get_lastChild(nodePI, &nodeChild); ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "nodeChild not NULL\n"); + + r = IXMLDOMProcessingInstruction_get_dataType(nodePI, &var); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n"); + VariantClear(&var); + IXMLDOMProcessingInstruction_Release(nodePI); } @@ -1828,6 +1841,7 @@ static void test_xmlTypes(void) IXMLDOMNamedNodeMap *pAttribs; BSTR str; IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; /* Used for testing Siblings */ + VARIANT v; hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); if( hr != S_OK ) @@ -1858,6 +1872,12 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok( pAttribs == NULL, "pAttribs not NULL\n"); + /* test get_dataType */ + hr = IXMLDOMDocument_get_dataType(doc, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); + VariantClear(&v); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1893,6 +1913,11 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, szCommentXML ), "incorrect comment xml\n"); SysFreeString(str); + hr = IXMLDOMComment_get_dataType(pComment, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); + VariantClear(&v); + IXMLDOMComment_Release(pComment); } @@ -1914,6 +1939,11 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, szElementXML ), "incorrect element xml\n"); SysFreeString(str); + hr = IXMLDOMElement_get_dataType(pElement, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); + VariantClear(&v); + /* Attribute */ hr = IXMLDOMDocument_createAttribute(doc, szAttribute, &pAttrubute); ok(hr == S_OK, "ret %08x\n", hr ); @@ -1971,6 +2001,11 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n"); SysFreeString(str); + hr = IXMLDOMAttribute_get_dataType(pAttrubute, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); + VariantClear(&v); + IXMLDOMAttribute_Release(pAttrubute); /* Check Element again with the Add Attribute*/

1 0

Michael Stefaniuc : winedump: Use a switch in the generated DllMain().
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: c3eda248a555472bdc6042446034298adbf02f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3eda248a555472bdc6042446… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 13 17:53:02 2008 +0100 winedump: Use a switch in the generated DllMain(). --- tools/winedump/output.c | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 178fb48..66c5e4d 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -238,35 +238,30 @@ void output_c_preamble (void) fprintf (cfile, "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " - "lpvReserved)\n{\n\tTRACE(\"(0x%%p, %%d, %%p)\\n\",hinstDLL," - "fdwReason,lpvReserved);\n\n\t" - "if (fdwReason == DLL_WINE_PREATTACH) return FALSE;\t" - "/* prefer native version */\n\n\t" - "if (fdwReason == DLL_PROCESS_ATTACH)\n\t{\n\t\t"); + "lpvReserved)\n{\n" + "\tTRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n" + "\n\tswitch (fdwReason)\n\t{\n" + "\t\tcase DLL_WINE_PREATTACH:\n" + "\t\t\treturn FALSE; /* prefer native version */\n" + "\t\tcase DLL_PROCESS_ATTACH:\n"); if (globals.forward_dll) - { - fprintf (cfile, - "hDLL = LoadLibraryA( \"%s\" );\n\t\t" - "TRACE(\":Forwarding DLL (%s) loaded (%%ld)\\n\",(LONG)hDLL);", + fprintf (cfile, "\t\t\thDLL = LoadLibraryA(\"%s\");\n" + "\t\t\tTRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", globals.forward_dll, globals.forward_dll); - } else - fputs ("/* FIXME: Initialisation */", cfile); + fprintf (cfile, "\t\t\t/* FIXME: Initialisation */\n" + "\t\t\tDisableThreadLibraryCalls(hinstDLL);\n\t\t\tbreak;\n"); - fputs ("\n\t}\n\telse if (fdwReason == DLL_PROCESS_DETACH)\n\t{\n\t\t", - cfile); + fprintf (cfile, "\t\t\tbreak;\n\t\tcase DLL_PROCESS_DETACH:\n"); if (globals.forward_dll) - { - fprintf (cfile, - "FreeLibrary( hDLL );\n\t\tTRACE(\":Forwarding DLL (%s)" - " freed\\n\");", globals.forward_dll); - } - else - fputs ("/* FIXME: Cleanup */", cfile); + fprintf (cfile, "\t\t\tFreeLibrary(hDLL);\n" + "\t\t\tTRACE(\"Forwarding DLL (%s) freed\\n\");\n", + globals.forward_dll); - fputs ("\n\t}\n\n\treturn TRUE;\n}\n\n\n", cfile); + fprintf (cfile, "\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n\n" + "\treturn TRUE;\n}\n\n\n"); }

1 0

Michael Stefaniuc : winedump: Use the DEFINE_THISCALL_WRAPPER macro instead of the GET_THIS macro for functions with __thiscall calling convention .
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 8c6dbc7a3e0b18b673489fbbe3d1b78adff279bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6dbc7a3e0b18b673489fbbe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 13 17:49:51 2008 +0100 winedump: Use the DEFINE_THISCALL_WRAPPER macro instead of the GET_THIS macro for functions with __thiscall calling convention. Wine doesn't use GET_THIS but DEFINE_THISCALL_WRAPPER. --- tools/winedump/output.c | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index f12b99a..178fb48 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -108,10 +108,11 @@ void output_spec_symbol (const parsed_symbol *sym) if (sym->argc) fputc (' ', specfile); - fprintf (specfile, ") %s_%s", OUTPUT_UC_DLL_NAME, sym->function_name); + fputs (") ", specfile); if (sym->flags & SYM_THISCALL) - fputs (" # __thiscall", specfile); + fputs ("__thiscall_", specfile); + fprintf (specfile, "%s_%s", OUTPUT_UC_DLL_NAME, sym->function_name); fputc ('\n',specfile); } @@ -235,9 +236,6 @@ void output_c_preamble (void) fputs ("\nHMODULE hDLL=0;\t/* DLL to call */\n\n", cfile); } - fputs ("#ifdef __i386__\n#define GET_THIS(t,p) t p;\\\n__asm__ __volatile__" - " (\"movl %%ecx, %0\" : \"=m\" (p))\n#endif\n\n\n", cfile); - fprintf (cfile, "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " "lpvReserved)\n{\n\tTRACE(\"(0x%%p, %%d, %%p)\\n\",hinstDLL," @@ -272,11 +270,6 @@ void output_c_preamble (void) } -#define CPP_END if (sym->flags & SYM_THISCALL) \ - fputs ("#endif\n", cfile); fputs ("\n\n", cfile) -#define GET_THIS if (sym->flags & SYM_THISCALL) \ - fprintf (cfile, "\tGET_THIS(%s,%s);\n", sym->arg_text[0],sym->arg_name[0]) - /******************************************************************* * output_c_symbol * @@ -286,6 +279,7 @@ void output_c_symbol (const parsed_symbol *sym) { unsigned int i, start = sym->flags & SYM_THISCALL ? 1 : 0; int is_void; + static int has_thiscall = 0; assert (cfile); assert (sym && sym->symbol); @@ -300,18 +294,37 @@ void output_c_symbol (const parsed_symbol *sym) return; } - if (sym->flags & SYM_THISCALL) - fputs ("#ifdef __i386__\n", cfile); + if (sym->flags & SYM_THISCALL && !has_thiscall) + { + fputs ("#ifdef __i386__ /* thiscall functions are i386-specific */\n\n" + "#define THISCALL(func) __thiscall_ ## func\n" + "#define THISCALL_NAME(func) __ASM_NAME(\"__thiscall_\" #func)\n" + "#define DEFINE_THISCALL_WRAPPER(func) \\\n" + "\textern void THISCALL(func)(); \\\n" + "\t__ASM_GLOBAL_FUNC(__thiscall_ ## func, \\\n" + "\t\t\t\"popl %eax\\n\\t\" \\\n" + "\t\t\t\"pushl %ecx\\n\\t\" \\\n" + "\t\t\t\"pushl %eax\\n\\t\" \\\n" + "\t\t\t\"jmp \" __ASM_NAME(#func) )\n" + "#else /* __i386__ */\n\n" + "#define THISCALL(func) func\n" + "#define THISCALL_NAME(func) __ASM_NAME(#func)\n" + "#define DEFINE_THISCALL_WRAPPER(func) /* nothing */\n\n" + "#endif /* __i386__ */\n\n", cfile); + has_thiscall = 1; + } output_c_banner(sym); + if (sym->flags & SYM_THISCALL) + fprintf(cfile, "DEFINE_THISCALL_WRAPPER(%s)\n", sym->function_name); + if (!sym->function_name) { /* #ifdef'd dummy */ fprintf (cfile, "#if 0\n__%s %s_%s()\n{\n\t/* %s in .spec */\n}\n#endif\n", symbol_get_call_convention(sym), OUTPUT_UC_DLL_NAME, sym->symbol, globals.forward_dll ? "@forward" : "@stub"); - CPP_END; return; } @@ -322,12 +335,10 @@ void output_c_symbol (const parsed_symbol *sym) if (!globals.do_trace) { - GET_THIS; fputs ("\tFIXME(\":stub\\n\");\n", cfile); if (!is_void) fprintf (cfile, "\treturn (%s) 0;\n", sym->return_text); fputs ("}\n", cfile); - CPP_END; return; } @@ -350,8 +361,6 @@ void output_c_symbol (const parsed_symbol *sym) if (!is_void) fprintf (cfile, "\t%s retVal;\n", sym->return_text); - GET_THIS; - fprintf (cfile, "\tpFunc=(void*)GetProcAddress(hDLL,\"%s\");\n", sym->symbol); } @@ -380,7 +389,6 @@ void output_c_symbol (const parsed_symbol *sym) if (!is_void) fprintf (cfile, "\treturn (%s) 0;\n", sym->return_text); fputs ("}\n", cfile); - CPP_END; return; } @@ -412,7 +420,6 @@ void output_c_symbol (const parsed_symbol *sym) fputs (");\n", cfile); fputs ("}\n", cfile); - CPP_END; }

1 0

Michael Stefaniuc : winedump: Do not create a header file when not generating skeleton code.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 6db84ae4c603e92ce78d3c5254e938fd102bcee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db84ae4c603e92ce78d3c525… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 13 17:48:11 2008 +0100 winedump: Do not create a header file when not generating skeleton code. The header file generated with "winedump spec" without the "-c" option just includes other headers. --- tools/winedump/output.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 1b325ff..f12b99a 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -138,6 +138,9 @@ static void output_spec_postamble (void) */ void output_header_preamble (void) { + if (!globals.do_code) + return; + hfile = open_file (OUTPUT_DLL_NAME, "_dll.h", "w"); atexit (output_header_postamble); @@ -160,6 +163,9 @@ void output_header_preamble (void) */ void output_header_symbol (const parsed_symbol *sym) { + if (!globals.do_code) + return; + assert (hfile); assert (sym && sym->symbol); @@ -210,10 +216,15 @@ void output_c_preamble (void) fprintf (cfile, "/*\n * %s.dll\n *\n * Generated from %s by winedump.\n *\n" - " * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE!\n * \n */" - "\n\n#include \"config.h\"\n#include \"%s_dll.h\"\n\n" - "WINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n", - OUTPUT_DLL_NAME, globals.input_name, OUTPUT_DLL_NAME, + " * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE!\n *\n */" + "\n\n#include \"config.h\"\n\n#include <stdarg.h>\n\n" + "#include \"windef.h\"\n#include \"winbase.h\"\n", + OUTPUT_DLL_NAME, globals.input_name); + + if (globals.do_code) + fprintf (cfile, "#include \"%s_dll.h\"\n", OUTPUT_DLL_NAME); + + fprintf (cfile,"#include \"wine/debug.h\"\n\nWINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n", OUTPUT_DLL_NAME); if (globals.forward_dll)

1 0

Alexandre Julliard : user32: Don't inherit stdin/stdout handles in explorer .
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 7687f78f7133fc0891e0b76f097415f77dc10411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7687f78f7133fc0891e0b76f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:50:06 2008 +0100 user32: Don't inherit stdin/stdout handles in explorer. --- dlls/user32/win.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e55fe20..b1dec05 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1519,6 +1519,11 @@ HWND WINAPI GetDesktopWindow(void) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = 0; + si.hStdOutput = 0; + si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + GetSystemDirectoryW( cmdline, MAX_PATH ); lstrcatW( cmdline, command_line ); if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS,

1 0

Alexander Nicolaysen Sørnes : wordpad: Add basic ruler.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 9a1b626481df1933957d1938eb675d08a3a31e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1b626481df1933957d1938e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jan 14 00:36:23 2008 +0100 wordpad: Add basic ruler. --- programs/wordpad/De.rc | 4 +- programs/wordpad/En.rc | 4 +- programs/wordpad/Fr.rc | 4 +- programs/wordpad/Hu.rc | 4 +- programs/wordpad/Ko.rc | 4 +- programs/wordpad/Nl.rc | 4 +- programs/wordpad/No.rc | 6 +- programs/wordpad/Pl.rc | 4 +- programs/wordpad/Ru.rc | 4 +- programs/wordpad/Tr.rc | 4 +- programs/wordpad/print.c | 170 ++++++++++++++++++++++++++++++++++++++++++-- programs/wordpad/wordpad.c | 49 +++++++++++-- programs/wordpad/wordpad.h | 17 +++-- 13 files changed, 251 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a1b626481df1933957d1…

1 0

Alexandre Julliard : kernel32: Close the stdio handles when creating a detached process.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 5a3132343d9c6f1b87f79034d80ef6595e4a1bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3132343d9c6f1b87f79034d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:49:12 2008 +0100 kernel32: Close the stdio handles when creating a detached process. --- dlls/kernel32/process.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 39e3665..7a25f39 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1189,7 +1189,23 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, char **envp = build_envp( env ); close( fd[0] ); - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) setsid(); + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + { + int pid; + if (!(pid = fork())) + { + int fd = open( "/dev/null", O_RDWR ); + setsid(); + /* close stdin and stdout */ + if (fd != -1) + { + dup2( fd, 0 ); + dup2( fd, 1 ); + close( fd ); + } + } + else if (pid != -1) _exit(0); /* parent */ + } /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); @@ -1410,7 +1426,22 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW char preloader_reserve[64], socket_env[64]; char **argv = build_argv( cmd_line, 1 ); - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) setsid(); + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + { + if (!(pid = fork())) + { + int fd = open( "/dev/null", O_RDWR ); + setsid(); + /* close stdin and stdout */ + if (fd != -1) + { + dup2( fd, 0 ); + dup2( fd, 1 ); + close( fd ); + } + } + else if (pid != -1) _exit(0); /* parent */ + } /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL );

1 0