winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
699 discussions
Start a n
N
ew thread
Alistair Leslie-Hughes : msxml3: Implement GetClassID for XMLDocument IPersistStream interface.
by Alexandre Julliard
14 Jan '08
14 Jan '08
Module: wine Branch: master Commit: b57a7e01d6fed42cf767881958c0832390d2da18 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b57a7e01d6fed42cf76788195…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 14 15:35:02 2008 +1100 msxml3: Implement GetClassID for XMLDocument IPersistStream interface. --- dlls/msxml3/domdoc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 15772e5..b294eed 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -246,8 +246,14 @@ static ULONG WINAPI xmldoc_IPersistStream_Release( static HRESULT WINAPI xmldoc_IPersistStream_GetClassID( IPersistStream *iface, CLSID *classid) { - FIXME("(%p,%p): stub!\n", iface, classid); - return E_NOTIMPL; + TRACE("(%p,%p): stub!\n", iface, classid); + + if(!classid) + return E_POINTER; + + *classid = CLSID_DOMDocument2; + + return S_OK; } static HRESULT WINAPI xmldoc_IPersistStream_IsDirty(
1
0
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Alexandre Julliard : kernel32: Don't inherit stdin/ stdout handles in wineboot.
by Alexandre Julliard
14 Jan '08
14 Jan '08
Module: wine Branch: master Commit: 9c00a78da52dc14acdb391ae02ec10a63d3b85ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9c00a78da52dc14acdb391ae0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:49:56 2008 +0100 kernel32: Don't inherit stdin/stdout handles in wineboot. --- dlls/kernel32/process.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7a25f39..691e0a7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -797,6 +797,11 @@ static HANDLE start_wineboot(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, NULL, NULL, &si, &pi ))
1
0
0
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
0
0
← Newer
1
...
27
28
29
30
31
32
33
...
70
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Results per page:
10
25
50
100
200