January 2008 - Wine-commits

Alistair Leslie-Hughes : msxml3: Implement get_nodeTypeString.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 055b5e44fe616a83f46e8503286870ba34d4fe77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055b5e44fe616a83f46e85032… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 16 16:47:19 2008 +1100 msxml3: Implement get_nodeTypeString. --- dlls/msxml3/node.c | 59 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index e354081..2fb6f86 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -646,8 +646,63 @@ static HRESULT WINAPI xmlnode_get_nodeTypeString( IXMLDOMNode *iface, BSTR* xmlnodeType) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + const xmlChar *str; + + TRACE("%p\n", This ); + + if (!xmlnodeType) + return E_INVALIDARG; + + if ( !This->node ) + return E_FAIL; + + switch( This->node->type ) + { + case XML_ATTRIBUTE_NODE: + str = (const xmlChar*) "attribute"; + break; + case XML_CDATA_SECTION_NODE: + str = (const xmlChar*) "cdatasection"; + break; + case XML_COMMENT_NODE: + str = (const xmlChar*) "comment"; + break; + case XML_DOCUMENT_NODE: + str = (const xmlChar*) "document"; + break; + case XML_DOCUMENT_FRAG_NODE: + str = (const xmlChar*) "documentfragment"; + break; + case XML_ELEMENT_NODE: + str = (const xmlChar*) "element"; + break; + case XML_ENTITY_NODE: + str = (const xmlChar*) "entity"; + break; + case XML_ENTITY_REF_NODE: + str = (const xmlChar*) "entityreference"; + break; + case XML_NOTATION_NODE: + str = (const xmlChar*) "notation"; + break; + case XML_PI_NODE: + str = (const xmlChar*) "processinginstruction"; + break; + case XML_TEXT_NODE: + str = (const xmlChar*) "text"; + break; + default: + FIXME("nodeName not mapped correctly (%d)\n", This->node->type); + str = This->node->name; + break; + } + + *xmlnodeType = bstr_from_xmlChar( str ); + if (!*xmlnodeType) + return S_FALSE; + + return S_OK; } static HRESULT WINAPI xmlnode_get_text( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1637e7c..ca913cb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -550,6 +550,12 @@ static void test_domdoc( void ) ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n"); VariantClear(&var); + /* test nodeTypeString */ + r = IXMLDOMText_get_nodeTypeString(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("text") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); @@ -569,7 +575,8 @@ static void test_domdoc( void ) r = IXMLDOMComment_get_lastChild(node_comment, &nodeChild); ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "pLastChild not NULL\n"); - IXMLDOMText_Release( node_comment ); + + IXMLDOMComment_Release( node_comment ); } /* test Create Attribute */ @@ -607,6 +614,12 @@ static void test_domdoc( void ) ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n"); VariantClear(&var); + /* test nodeTypeString */ + r = IXMLDOMProcessingInstruction_get_nodeTypeString(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("processinginstruction") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + IXMLDOMProcessingInstruction_Release(nodePI); } @@ -1898,6 +1911,12 @@ static void test_xmlTypes(void) ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); VariantClear(&v); + /* test nodeTypeString */ + hr = IXMLDOMDocument_get_nodeTypeString(doc, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("document") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1920,6 +1939,12 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok( pAttribs == NULL, "pAttribs not NULL\n"); + /* test nodeTypeString */ + hr = IXMLDOMComment_get_nodeTypeString(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("comment") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pComment, NULL); ok(hr == S_OK, "ret %08x\n", hr ); @@ -1949,6 +1974,12 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL); ok(hr == S_OK, "ret %08x\n", hr ); + /* test nodeTypeString */ + hr = IXMLDOMDocument_get_nodeTypeString(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("element") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + hr = IXMLDOMElement_get_nodeName(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szElement ), "incorrect element node Name\n"); @@ -2016,6 +2047,12 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, szAttribute ), "incorrect attribute node Name\n"); SysFreeString(str); + /* test nodeTypeString */ + hr = IXMLDOMAttribute_get_nodeTypeString(pAttrubute, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("attribute") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + hr = IXMLDOMAttribute_get_xml(pAttrubute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n"); @@ -2092,6 +2129,12 @@ static void test_xmlTypes(void) ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); VariantClear(&v); + /* test nodeTypeString */ + hr = IXMLDOMCDATASection_get_nodeTypeString(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("cdatasection") ), "incorrect nodeTypeString string\n"); + SysFreeString(str); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Andrew Talbot : oleaut32: Remove unneeded casts.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 5ea25c62b89bbb5cb1fa9f87e511c93a1bbe2ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea25c62b89bbb5cb1fa9f87e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 21:49:14 2008 +0000 oleaut32: Remove unneeded casts. --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/safearray.c | 2 +- dlls/oleaut32/typelib.c | 4 ++-- dlls/oleaut32/typelib16.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index a677408..9fdac76 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -837,7 +837,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDll); - OLEAUT32_hModule = (HMODULE)hInstDll; + OLEAUT32_hModule = hInstDll; break; case DLL_PROCESS_DETACH: break; diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 8a1c99b..d0c5f63 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1277,7 +1277,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x jd.err = pjpeg_std_error(&jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); jd.src = &xjsm; ret=pjpeg_read_header(&jd,TRUE); jd.out_color_space = JCS_RGB; diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 8b8072c..5a16716 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -805,7 +805,7 @@ HRESULT WINAPI SafeArrayUnlock(SAFEARRAY *psa) if (!psa) return E_INVALIDARG; - if ((LONG)InterlockedDecrement( (LONG*) &psa->cLocks) < 0) + if (InterlockedDecrement( (LONG*) &psa->cLocks) < 0) { WARN("Unlocked but no lock held!\n"); InterlockedIncrement( (LONG*) &psa->cLocks); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ae4df69..df886a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2587,7 +2587,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) ITypeInfoImpl **ppTI = &(pTypeLibImpl->pTypeInfo); int i; - for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++) + for(i = 0; i < tlbHeader.nrtypeinfos; i++) { *ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl); @@ -6249,7 +6249,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if(ref_type->pImpTLInfo->pImpTypeLib) { TRACE("typeinfo in imported typelib that is already loaded\n"); pTLib = (ITypeLib*)ref_type->pImpTLInfo->pImpTypeLib; - ITypeLib2_AddRef((ITypeLib*) pTLib); + ITypeLib2_AddRef(pTLib); result = S_OK; } else { TRACE("typeinfo in imported typelib that isn't already loaded\n"); diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c index 31bbf93..a7b2639 100644 --- a/dlls/oleaut32/typelib16.c +++ b/dlls/oleaut32/typelib16.c @@ -91,7 +91,7 @@ QueryPathOfRegTypeLib16( wMaj,wMin,lcid); } else { sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path); + FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname);

1 0

Andrew Talbot : qcap: Remove unneeded casts.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 69c984b9f2a6a58f8593a82181113cb813e94392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c984b9f2a6a58f8593a8218… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 21:49:21 2008 +0000 qcap: Remove unneeded casts. --- dlls/qcap/capturegraph.c | 6 +++--- dlls/qcap/v4l.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index c25dfe3..c5631b1 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -165,7 +165,7 @@ fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface) This->lpVtbl = NULL; This->lpVtbl2 = NULL; if (This->mygraph != NULL) - IGraphBuilder_Release((IGraphBuilder *)This->mygraph); + IGraphBuilder_Release(This->mygraph); CoTaskMemFree(This); ObjectRefCount(FALSE); } @@ -191,7 +191,7 @@ fnCaptureGraphBuilder2_SetFilterGraph(ICaptureGraphBuilder2 * iface, return E_POINTER; This->mygraph = pfg; - IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + IGraphBuilder_AddRef(This->mygraph); if (SUCCEEDED(IUnknown_QueryInterface(This->mygraph, &IID_IMediaEvent, (LPVOID *)&pmev))) { @@ -219,7 +219,7 @@ fnCaptureGraphBuilder2_GetFilterGraph(ICaptureGraphBuilder2 * iface, return E_UNEXPECTED; } - IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph); + IGraphBuilder_AddRef(This->mygraph); TRACE("(%p) return filtergraph %p\n", iface, *pfg); return S_OK; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0742968..4ad2d9c 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -893,11 +893,11 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) TRACE("format: %d bits - %d x %d\n", capBox->bitDepth, capBox->width, capBox->height); - return (Capture*) capBox; + return capBox; error: if (capBox) - qcap_driver_destroy( (Capture*) capBox ); + qcap_driver_destroy( capBox ); return NULL; }

1 0

Andrew Talbot : psapi: Remove unneeded cast.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: ed82acd15de20ba8916da9c14487bf09050a9fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed82acd15de20ba8916da9c14… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 21:49:17 2008 +0000 psapi: Remove unneeded cast. --- dlls/psapi/psapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 7b1588b..9fe8281 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -66,7 +66,7 @@ static BOOL PSAPI_ModuleIteratorInit(MODULE_ITERATOR *iter, HANDLE hProcess) } /* Read address of LdrData from PEB */ - if (!ReadProcessMemory(hProcess, &((PPEB)pbi.PebBaseAddress)->LdrData, + if (!ReadProcessMemory(hProcess, &pbi.PebBaseAddress->LdrData, &pLdrData, sizeof(pLdrData), NULL)) return FALSE;

1 0

Andrey Esin : wordpad: Corrections in Russian translation.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: cec519c7536feb878d2ea19dfd208d417cf51d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec519c7536feb878d2ea19df… Author: Andrey Esin <andrey(a)esin.name> Date: Tue Jan 15 22:08:04 2008 +0300 wordpad: Corrections in Russian translation. --- programs/wordpad/Ru.rc | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 754ccf1..dddcdd7 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -27,11 +27,11 @@ BEGIN MENUITEM "&��\tCtrl+S", ID_FILE_SAVE MENUITEM "�� &��...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&�� . . .\tCtrl+P", ID_PRINT + MENUITEM "&�� . . .\tCtrl+P", ID_PRINT MENUITEM "��&�� . . .", ID_PREVIEW - MENUITEM "&�� . . .", ID_PRINTSETUP + MENUITEM "&�� . . .", ID_PRINTSETUP MENUITEM SEPARATOR - MENUITEM "�&��", ID_FILE_EXIT + MENUITEM "�&��", ID_FILE_EXIT END POPUP "&��" BEGIN @@ -41,11 +41,11 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&��\tCtrl+X", ID_EDIT_CUT MENUITEM "&��\tCtrl+C", ID_EDIT_COPY - MENUITEM "&��\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&��\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&�� . . .\tCrtl+F", ID_FIND - MENUITEM "��&�� \tF3", ID_FIND_NEXT - MENUITEM "&�� . . .\tCtrl+H", ID_REPLACE + MENUITEM "&�� . . .\tCrtl+F", ID_FIND + MENUITEM "��&�� \tF3", ID_FIND_NEXT + MENUITEM "&�� . . .\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "&�� ", ID_EDIT_READONLY MENUITEM "&��", ID_EDIT_MODIFIED @@ -59,25 +59,25 @@ BEGIN MENUITEM "�&�� ", ID_EDIT_GETTEXT END END - POPUP "&View" + POPUP "&��" BEGIN - MENUITEM "�� &��", ID_TOGGLE_TOOLBAR - MENUITEM "�&�� ", ID_TOGGLE_FORMATBAR - MENUITEM "&��", ID_TOGGLE_RULER - MENUITEM "&�� ", ID_TOGGLE_STATUSBAR + MENUITEM "�� &��", ID_TOGGLE_TOOLBAR + MENUITEM "�&�� ", ID_TOGGLE_FORMATBAR + MENUITEM "&��", ID_TOGGLE_RULER + MENUITEM "&�� ", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&�� . . .", ID_VIEWPROPERTIES + MENUITEM "&�� . . .", ID_VIEWPROPERTIES END POPUP "��&��" BEGIN - MENUITEM "&�� . . .", ID_DATETIME + MENUITEM "&�� . . .", ID_DATETIME END POPUP "��&��" BEGIN - MENUITEM "&�� . . .", ID_FONTSETTINGS - MENUITEM "&��" ID_BULLET - MENUITEM "&�� . . ." ID_PARAFORMAT - MENUITEM "&�� . . ." ID_TABSTOPS + MENUITEM "&�� . . .", ID_FONTSETTINGS + MENUITEM "&��" ID_BULLET + MENUITEM "&�� . . ." ID_PARAFORMAT + MENUITEM "&�� . . ." ID_TABSTOPS POPUP "&��" BEGIN MENUITEM "&��\tCtrl+1", ID_BACK_1 @@ -96,10 +96,10 @@ BEGIN BEGIN MENUITEM "&��\tCtrl+X", ID_EDIT_CUT MENUITEM "&��\tCtrl+C", ID_EDIT_COPY - MENUITEM "��&��", ID_EDIT_PASTE + MENUITEM "��&��", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&��" ID_BULLET - MENUITEM "&�� . . ." ID_PARAFORMAT + MENUITEM "&��" ID_BULLET + MENUITEM "&�� . . ." ID_PARAFORMAT END END @@ -178,7 +178,7 @@ BEGIN STRING_RICHTEXT_FILES_RTF, "�� RTF (*.rtf)" STRING_TEXT_FILES_TXT, "�� (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "�� Unicode (*.txt)" - STRING_ALL_FILES, "�� (*.*)" + STRING_ALL_FILES, "�� (*.*)" END STRINGTABLE DISCARDABLE

1 0

Andrey Esin : regedit: Update Russian translation.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 38f1733ce34c419ab9a0e0cc2bb970735218234b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f1733ce34c419ab9a0e0cc2… Author: Andrey Esin <andrey(a)esin.name> Date: Tue Jan 15 22:36:36 2008 +0300 regedit: Update Russian translation. --- programs/regedit/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index edd2a21..2308516 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -127,7 +127,7 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_EDIT_MODIFY "Modifies the value's data" + ID_EDIT_MODIFY "�� " ID_EDIT_NEW_KEY "�� " ID_EDIT_NEW_STRINGVALUE "�� " ID_EDIT_NEW_BINARYVALUE "�� "

1 0

Alexandre Julliard : ntdll: Mac OS support for saving and restoring the extended FPU context on exceptions .
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 992de9f487abf009e027ce51c51f94961573bf34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992de9f487abf009e027ce51c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 20:27:14 2008 +0100 ntdll: Mac OS support for saving and restoring the extended FPU context on exceptions. --- dlls/ntdll/signal_i386.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b07715c..03729ed 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -304,6 +304,8 @@ typedef ucontext_t SIGCONTEXT; #define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__esp)) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) +#define FPU_sig(context) NULL +#define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw) #else #define EAX_sig(context) ((context)->uc_mcontext->ss.eax) #define EBX_sig(context) ((context)->uc_mcontext->ss.ebx) @@ -323,11 +325,10 @@ typedef ucontext_t SIGCONTEXT; #define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.esp)) #define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) #define ERROR_sig(context) ((context)->uc_mcontext->es.err) +#define FPU_sig(context) NULL +#define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->fs.fpu_fcw) #endif -#define FPU_sig(context) NULL /* FIXME */ -#define FPUX_sig(context) NULL /* FIXME */ - #endif /* __APPLE__ */ WINE_DEFAULT_DEBUG_CHANNEL(seh); @@ -703,6 +704,52 @@ static inline void restore_fpux( const CONTEXT *context ) /*********************************************************************** + * fpux_to_fpu + * + * Build a standard FPU context from an extended one. + */ +static void fpux_to_fpu( FLOATING_SAVE_AREA *fpu, const XMM_SAVE_AREA32 *fpux ) +{ + unsigned int i, tag, stack_top; + + fpu->ControlWord = fpux->ControlWord | 0xffff0000; + fpu->StatusWord = fpux->StatusWord | 0xffff0000; + fpu->ErrorOffset = fpux->ErrorOffset; + fpu->ErrorSelector = fpux->ErrorSelector | (fpux->ErrorOpcode << 16); + fpu->DataOffset = fpux->DataOffset; + fpu->DataSelector = fpux->DataSelector; + fpu->Cr0NpxState = fpux->StatusWord | 0xffff0000; + + stack_top = (fpux->StatusWord >> 11) & 7; + fpu->TagWord = 0xffff0000; + for (i = 0; i < 8; i++) + { + memcpy( &fpu->RegisterArea[10 * i], &fpux->FloatRegisters[i], 10 ); + if (!(fpux->TagWord & (1 << i))) tag = 3; /* empty */ + else + { + const M128A *reg = &fpux->FloatRegisters[(i - stack_top) & 7]; + if ((reg->High & 0x7fff) == 0x7fff) /* exponent all ones */ + { + tag = 2; /* special */ + } + else if (!(reg->High & 0x7fff)) /* exponent all zeroes */ + { + if (reg->Low) tag = 2; /* special */ + else tag = 1; /* zero */ + } + else + { + if (reg->Low >> 63) tag = 0; /* valid */ + else tag = 2; /* special */ + } + } + fpu->TagWord |= tag << (2 * i); + } +} + + +/*********************************************************************** * save_context * * Build a context structure from the signal info. @@ -746,10 +793,10 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, if (fpux) { save_fpux( context ); - context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); fpux_support = 1; - /* FIXME: convert fpux to fpu */ + if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); } if (!fpu && !fpux) save_fpu( context ); }

1 0

Alexandre Julliard : ntdll: Restore typecast that is really needed.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 0a2fda702017901024f09e812857c84235375543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2fda702017901024f09e812… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 20:36:48 2008 +0100 ntdll: Restore typecast that is really needed. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 2ca604d..ed8239d 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -264,7 +264,7 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case CS6: slc->WordLength = 6; break; case CS7: slc->WordLength = 7; break; case CS8: slc->WordLength = 8; break; - default: ERR("unknown size %x\n", port.c_cflag & CSIZE); + default: ERR("unknown size %x\n", (UINT)(port.c_cflag & CSIZE)); } if (port.c_cflag & CSTOPB)

1 0

Juan Lang : hhctrl.ocx: Don't return uninitialized stream.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 018117e6a3d11dd5c38671c5bbc61babebb585ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=018117e6a3d11dd5c38671c5b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 15 07:58:49 2008 -0800 hhctrl.ocx: Don't return uninitialized stream. --- dlls/hhctrl.ocx/chm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 013cb7d..2a4bfa8 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -304,7 +304,7 @@ void SetChmPath(ChmPath *file, LPCWSTR base_file, LPCWSTR path) IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) { IStorage *storage; - IStream *stream; + IStream *stream = NULL; HRESULT hres; TRACE("%s (%s :: %s)\n", debugstr_w(parent_chm), debugstr_w(chm_file->chm_file),

1 0

Rob Shearman : rpcrt4: Move the setting of retval_ptr outside of any particular stub phase in stub_do_args and stub_do_old_args .
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: ffffcfa239c10da92160fa2991b1dcfdbca77753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffffcfa239c10da92160fa299… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 15 20:55:40 2008 +0000 rpcrt4: Move the setting of retval_ptr outside of any particular stub phase in stub_do_args and stub_do_old_args. After the change in order of phases it was no longer being set in the last phase and so caused all stubless functions to appear to have no return value. --- dlls/rpcrt4/ndr_stubless.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 8a99286..2a16601 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -902,6 +902,10 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, TRACE("\tbase type: 0x%02x\n", *pTypeFormat); + /* make a note of the address of the return value parameter for later */ + if (pParam->param_attributes.IsReturn) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -931,11 +935,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, else call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); } - - /* make a note of the address of the return value parameter for later */ - if (pParam->param_attributes.IsReturn) - retval_ptr = (LONG_PTR *)pArg; - break; case STUBLESS_CALCSIZE: if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) @@ -1082,6 +1081,9 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, TRACE("\tbase type 0x%02x\n", *pTypeFormat); + if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -1095,9 +1097,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) - retval_ptr = (LONG_PTR *)pArg; - break; + break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) call_buffer_sizer(pStubMsg, pArg, pTypeFormat); @@ -1119,6 +1119,9 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); + if (pParam->param_direction == RPC_FC_RETURN_PARAM) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -1150,8 +1153,6 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM) - retval_ptr = (LONG_PTR *)pArg; break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM ||

1 0