January 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Implement put_text.
by Alexandre Julliard Jan. 16, 2008

Jan. 16, 2008

Module: wine Branch: master Commit: b2101b81774f3ee14e1dcec32efbe0aaaa948c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2101b81774f3ee14e1dcec32… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 16 13:44:51 2008 +1100 msxml3: Implement put_text. --- dlls/msxml3/node.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 72be7a8..e354081 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -697,8 +697,29 @@ static HRESULT WINAPI xmlnode_put_text( IXMLDOMNode *iface, BSTR text) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlChar *str = NULL; + + TRACE("%p\n", This); + + switch(This->node->type) + { + case XML_DOCUMENT_NODE: + return E_FAIL; + default: + break; + } + + str = xmlChar_from_wchar((WCHAR*)text); + + /* Escape the string. */ + str = xmlEncodeEntitiesReentrant(This->node->doc, str); + str = xmlEncodeSpecialChars(This->node->doc, str); + + xmlNodeSetContent(This->node, str); + xmlFree(str); + + return S_OK; } static HRESULT WINAPI xmlnode_get_specified( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 75adc64..1637e7c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -142,6 +142,8 @@ static WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 }; static WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; +static WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', + 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; static WCHAR szAttribute[] = {'A','t','t','r',0 }; static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; @@ -444,6 +446,9 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, szDocument ), "incorrect nodeName\n"); SysFreeString( str ); + /* test put_text */ + r = IXMLDOMDocument_put_text( doc, _bstr_("Should Fail") ); + ok( r == E_FAIL, "ret %08x\n", r ); /* check that there's a document element */ element = NULL; @@ -2030,6 +2035,13 @@ static void test_xmlTypes(void) SysFreeString(str); } + hr = IXMLDOMElement_put_text(pElement, _bstr_("TestingNode")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMElement_get_xml(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n"); + IXMLDOMElement_Release(pElement); }

1 0

Andrey Esin : regedit: Update Russian translation.
by Alexandre Julliard Jan. 16, 2008

Jan. 16, 2008

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

Andrew Talbot : psapi: Remove unneeded cast.
by Alexandre Julliard Jan. 16, 2008

Jan. 16, 2008

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 Jan. 16, 2008

Jan. 16, 2008

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

Andrew Talbot : oleaut32: Remove unneeded casts.
by Alexandre Julliard Jan. 16, 2008

Jan. 16, 2008

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 Jan. 16, 2008

Jan. 16, 2008

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

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

Jan. 16, 2008

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

Alistair Leslie-Hughes : mscoree: Fix memory leak.
by Alexandre Julliard Jan. 16, 2008

Jan. 16, 2008

Module: wine Branch: master Commit: 74a468d01bd2519b6e300788070c9e104134f538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a468d01bd2519b6e3007880… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 16 07:10:25 2008 +1100 mscoree: Fix memory leak. --- dlls/mscoree/mscoree_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index ecefc27..35564ac 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -99,6 +99,8 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor return E_FAIL; } + HeapFree(GetProcessHeap(), 0, mono_exe); + return S_OK; }

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 Jan. 16, 2008

Jan. 16, 2008

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

Alexandre Julliard : ntdll: Restore typecast that is really needed.
by Alexandre Julliard Jan. 16, 2008

Jan. 16, 2008

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