wine-commits November 2005

4 participants
575 discussions

by Alexandre Julliard

ChangeSet ID: 21520 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:04:58 Modified files: dlls/rpcrt4 : cpsf.c Log message: Robert Shearman <rob(a)codeweavers.com> The CLSID can be substituted by an IID present in one of the proxy file infos in NdrDllGetClassObject. Patch: http://cvs.winehq.org/patch.py?id=21520 Old revision New revision Changes Path 1.14 1.15 +15 -1 wine/dlls/rpcrt4/cpsf.c Index: wine/dlls/rpcrt4/cpsf.c diff -u -p wine/dlls/rpcrt4/cpsf.c:1.14 wine/dlls/rpcrt4/cpsf.c:1.15 --- wine/dlls/rpcrt4/cpsf.c:1.14 29 Nov 2005 11: 4:58 -0000 +++ wine/dlls/rpcrt4/cpsf.c 29 Nov 2005 11: 4:58 -0000 @@ -133,6 +133,10 @@ HRESULT WINAPI NdrDllGetClassObject(REFC const CLSID *pclsid, CStdPSFactoryBuffer *pPSFactoryBuffer) { + TRACE("(%s, %s, %p, %p, %s, %p)\n", debugstr_guid(rclsid), + debugstr_guid(iid), ppv, pProxyFileList, debugstr_guid(pclsid), + pPSFactoryBuffer); + *ppv = NULL; if (!pPSFactoryBuffer->lpVtbl) { pPSFactoryBuffer->lpVtbl = &CStdPSFactory_Vtbl; @@ -141,7 +145,17 @@ HRESULT WINAPI NdrDllGetClassObject(REFC } if (IsEqualGUID(rclsid, pclsid)) return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); - return CLASS_E_CLASSNOTAVAILABLE; + else { + const ProxyFileInfo *info; + int index; + /* otherwise, the dll may be using the iid as the clsid, so + * search for it in the proxy file list */ + if (FindProxyInfo(pProxyFileList, rclsid, &info, &index)) + return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); + + WARN("class %s not available\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } } /***********************************************************************

18 years, 5 months

wine/dlls/rpcrt4 ndr_midl.c

by Alexandre Julliard

ChangeSet ID: 21519 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:04:54 Modified files: dlls/rpcrt4 : ndr_midl.c Log message: Robert Shearman <rob(a)codeweavers.com> Return the correct error code from NdrProxyErrorHandler. Patch: http://cvs.winehq.org/patch.py?id=21519 Old revision New revision Changes Path 1.24 1.25 +6 -2 wine/dlls/rpcrt4/ndr_midl.c Index: wine/dlls/rpcrt4/ndr_midl.c diff -u -p wine/dlls/rpcrt4/ndr_midl.c:1.24 wine/dlls/rpcrt4/ndr_midl.c:1.25 --- wine/dlls/rpcrt4/ndr_midl.c:1.24 29 Nov 2005 11: 4:54 -0000 +++ wine/dlls/rpcrt4/ndr_midl.c 29 Nov 2005 11: 4:54 -0000 @@ -140,8 +140,12 @@ void WINAPI NdrProxyFreeBuffer(void *Thi */ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) { - FIXME("(0x%08lx): semi-stub\n", dwExceptionCode); - return MAKE_HRESULT(SEVERITY_ERROR, FACILITY_RPC, RPC_S_CALL_FAILED); + WARN("(0x%08lx): a proxy call failed\n", dwExceptionCode); + + if (FAILED(dwExceptionCode)) + return dwExceptionCode; + else + return HRESULT_FROM_WIN32(dwExceptionCode); } /***********************************************************************

18 years, 5 months

wine/dlls/rpcrt4 ndr_ole.c

by Alexandre Julliard

ChangeSet ID: 21518 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:04:49 Modified files: dlls/rpcrt4 : ndr_ole.c Log message: Robert Shearman <rob(a)codeweavers.com> Raise exceptions on failures. Replace references of pStubMsg->BufferEnd with RpcMsg->Buffer + pStubMsg->BufferLength. Fix buffer calculation when no interface data is marshaled to the stream. Patch: http://cvs.winehq.org/patch.py?id=21518 Old revision New revision Changes Path 1.16 1.17 +9 -3 wine/dlls/rpcrt4/ndr_ole.c Index: wine/dlls/rpcrt4/ndr_ole.c diff -u -p wine/dlls/rpcrt4/ndr_ole.c:1.16 wine/dlls/rpcrt4/ndr_ole.c:1.17 --- wine/dlls/rpcrt4/ndr_ole.c:1.16 29 Nov 2005 11: 4:49 -0000 +++ wine/dlls/rpcrt4/ndr_ole.c 29 Nov 2005 11: 4:49 -0000 @@ -254,13 +254,17 @@ unsigned char * WINAPI NdrInterfacePoint TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; - if (pStubMsg->Buffer + sizeof(DWORD) < pStubMsg->BufferEnd) { + if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, TRUE); if (stream) { hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); IStream_Release(stream); + if (FAILED(hr)) { + IUnknown_Release((LPUNKNOWN)pMemory); + RpcRaiseException(hr); + } } } return NULL; @@ -280,11 +284,13 @@ unsigned char * WINAPI NdrInterfacePoint TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; - if (pStubMsg->Buffer + sizeof(DWORD) < pStubMsg->BufferEnd) { + if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, FALSE); if (stream) { hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); IStream_Release(stream); + if (FAILED(hr)) + RpcRaiseException(hr); } } return NULL; @@ -307,7 +313,7 @@ void WINAPI NdrInterfacePointerBufferSiz pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); TRACE("size=%ld\n", size); - if (size) pStubMsg->BufferLength += sizeof(DWORD) + size; + pStubMsg->BufferLength += sizeof(DWORD) + size; } /***********************************************************************

18 years, 5 months

wine/dlls/rpcrt4 ndr_marshall.c

by Alexandre Julliard

ChangeSet ID: 21517 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:04:45 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> Fix the overflow check to not depend on pStubMsg->BufferStart and pStubMsg->BufferEnd being valid, because they aren't filled in when using MIDL-generated server stubs. Don't set the pointer to NULL on unmarshaling because we may want to unmarshal the value to an existing pointer instead of allocating a new one. Patch: http://cvs.winehq.org/patch.py?id=21517 Old revision New revision Changes Path 1.37 1.38 +3 -4 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.37 wine/dlls/rpcrt4/ndr_marshall.c:1.38 --- wine/dlls/rpcrt4/ndr_marshall.c:1.37 29 Nov 2005 11: 4:45 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 29 Nov 2005 11: 4:45 -0000 @@ -97,8 +97,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%d/%ld\n", _Msg->Buffer - _Msg->BufferStart, _Msg->BufferLength); \ - if (_Msg->Buffer > _Msg->BufferEnd) ERR("buffer overflow %d bytes\n", _Msg->Buffer - _Msg->BufferEnd); \ + TRACE("buffer=%d/%ld\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer, _Msg->BufferLength); \ + if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ + ERR("buffer overflow %d bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ } while (0) #define NDR_TABLE_SIZE 128 @@ -752,8 +753,6 @@ void WINAPI PointerUnmarshall(PMIDL_STUB RpcRaiseException(RPC_X_BAD_STUB_DATA); } - *pPointer = NULL; - if (pointer_id) { m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, pPointer, desc, fMustAlloc);

18 years, 5 months

wine/dlls/user tests/win.c win.c

by Alexandre Julliard

ChangeSet ID: 21516 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:04:33 Modified files: dlls/user/tests: win.c dlls/user : win.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> EnumChildWindows should return result from the callback. Patch: http://cvs.winehq.org/patch.py?id=21516 Old revision New revision Changes Path 1.73 1.74 +35 -0 wine/dlls/user/tests/win.c 1.22 1.23 +3 -2 wine/dlls/user/win.c Index: wine/dlls/user/tests/win.c diff -u -p wine/dlls/user/tests/win.c:1.73 wine/dlls/user/tests/win.c:1.74 --- wine/dlls/user/tests/win.c:1.73 29 Nov 2005 11: 4:33 -0000 +++ wine/dlls/user/tests/win.c 29 Nov 2005 11: 4:33 -0000 @@ -86,6 +86,13 @@ static void check_parents( HWND hwnd, HW } } +BOOL CALLBACK EnumChildProc( HWND hwndChild, LPARAM lParam) +{ + (*(LPINT)lParam)++; + trace("EnumChildProc on %p\n", hwndChild); + if (*(LPINT)lParam > 1) return FALSE; + return TRUE; +} static HWND create_tool_window( LONG style, HWND parent ) { @@ -102,6 +109,7 @@ static void test_parent_owner(void) HWND test, owner, ret; HWND desktop = GetDesktopWindow(); HWND child = create_tool_window( WS_CHILD, hwndMain ); + INT numChildren; trace( "main window %p main2 %p desktop %p child %p\n", hwndMain, hwndMain2, desktop, child ); @@ -440,6 +448,33 @@ static void test_parent_owner(void) /* final cleanup */ DestroyWindow(child); + + + owner = create_tool_window( WS_OVERLAPPED, 0 ); + test = create_tool_window( WS_POPUP, NULL ); + numChildren = 0; + ok( !EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), + "EnumChildWindows should have returned FALSE\n" ); + ok( numChildren == 0, "numChildren should be 0 got %d\n", numChildren ); + + SetWindowLongA( test, GWL_STYLE, (GetWindowLongA( test, GWL_STYLE ) & ~WS_POPUP) | WS_CHILD ); + ret = SetParent( test, owner ); + ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); + + numChildren = 0; + ok( EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), + "EnumChildWindows should have returned TRUE\n" ); + ok( numChildren == 1, "numChildren should be 1 got %d\n", numChildren ); + + child = create_tool_window( WS_CHILD, owner ); + numChildren = 0; + ok( !EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), + "EnumChildWindows should have returned FALSE\n" ); + ok( numChildren == 2, "numChildren should be 2 got %d\n", numChildren ); + + DestroyWindow( child ); + DestroyWindow( test ); + DestroyWindow( owner ); } Index: wine/dlls/user/win.c diff -u -p wine/dlls/user/win.c:1.22 wine/dlls/user/win.c:1.23 --- wine/dlls/user/win.c:1.22 29 Nov 2005 11: 4:33 -0000 +++ wine/dlls/user/win.c 29 Nov 2005 11: 4:33 -0000 @@ -2836,13 +2836,14 @@ static BOOL WIN_EnumChildWindows( HWND * BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func, LPARAM lParam ) { HWND *list; + BOOL ret; USER_CheckNotLock(); if (!(list = WIN_ListChildren( parent ))) return FALSE; - WIN_EnumChildWindows( list, func, lParam ); + ret = WIN_EnumChildWindows( list, func, lParam ); HeapFree( GetProcessHeap(), 0, list ); - return TRUE; + return ret; }

18 years, 5 months

lostwages/ include/winehq.conf templates/en/do ...

by WineHQ

ChangeSet ID: 21515 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/11/28 16:32:11 Modified files: include : winehq.conf templates/en : download-rh.template download.template Log message: Vincent Beron Update the RH download page for 0.9.2. Add a reference to FC4 on the main download page. (Fixes bug #3830) Patch: http://cvs.winehq.org/patch.py?id=21515 Old revision New revision Changes Path 1.25 1.26 +1 -1 lostwages/include/winehq.conf 1.6 1.7 +1 -1 lostwages/templates/en/download-rh.template 1.68 1.69 +1 -1 lostwages/templates/en/download.template Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.25 lostwages/include/winehq.conf:1.26 --- lostwages/include/winehq.conf:1.25 28 Nov 2005 22:32:11 -0000 +++ lostwages/include/winehq.conf 28 Nov 2005 22:32:11 -0000 @@ -32,4 +32,4 @@ wwn_xml_path: wwn snapshot_date: 0.9.2 # Current RH Packages Snapshot Date -snapshot_date_rh: 0.9.1 +snapshot_date_rh: 0.9.2 Index: lostwages/templates/en/download-rh.template diff -u -p lostwages/templates/en/download-rh.template:1.6 lostwages/templates/en/download-rh.template:1.7 --- lostwages/templates/en/download-rh.template:1.6 28 Nov 2005 22:32:11 -0000 +++ lostwages/templates/en/download-rh.template 28 Nov 2005 22:32:11 -0000 @@ -152,7 +152,7 @@ CentOS updates. </tr> <tr> - <td align=center colspan=2 bgcolor=black><a name="centos4"></a>CentOS 4 (RHEL 4.0 compatible) (NOT AVAILABLE YET!)</td> + <td align=center colspan=2 bgcolor=black><a name="centos4"></a>CentOS 4 (RHEL 4.0 compatible)</td> </tr> <tr bgcolor="#7f7f7f"> Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.68 lostwages/templates/en/download.template:1.69 --- lostwages/templates/en/download.template:1.68 28 Nov 2005 22:32:11 -0000 +++ lostwages/templates/en/download.template 28 Nov 2005 22:32:11 -0000 @@ -25,7 +25,7 @@ for post-installation instructions.< <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="{$root}/site/download-rh">Red Hat</a> - binary and source .rpms for RedHat 7.3, 8, 9, Fedora Core 1, 2 and 3, White Box Enterprise Linux 3.0 (RHEL 3.0 compatible), CentOS 4 (RHEL 4.0 compatible)</td> + binary and source .rpms for RedHat 7.3, 8, 9, Fedora Core 1, 2, 3 and 4, White Box Enterprise Linux 3.0 (RHEL 3.0 compatible), CentOS 4 (RHEL 4.0 compatible)</td> <td><a href="mailto:[email protected]">Vincent Béron</a></td> </tr>

18 years, 5 months

wine/dlls/shdocvw dochost.c shdocvw.h webbrowser.c

by Alexandre Julliard

ChangeSet ID: 21514 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:12:49 Modified files: dlls/shdocvw : dochost.c shdocvw.h webbrowser.c Log message: Jacek Caban <jacek(a)codeweavers.com> Activate document object. Patch: http://cvs.winehq.org/patch.py?id=21514 Old revision New revision Changes Path 1.4 1.5 +77 -0 wine/dlls/shdocvw/dochost.c 1.35 1.36 +4 -0 wine/dlls/shdocvw/shdocvw.h 1.29 1.30 +6 -0 wine/dlls/shdocvw/webbrowser.c Index: wine/dlls/shdocvw/dochost.c diff -u -p wine/dlls/shdocvw/dochost.c:1.4 wine/dlls/shdocvw/dochost.c:1.5 --- wine/dlls/shdocvw/dochost.c:1.4 28 Nov 2005 20:12:49 -0000 +++ wine/dlls/shdocvw/dochost.c 28 Nov 2005 20:12:49 -0000 @@ -18,11 +18,83 @@ #include "wine/debug.h" #include "shdocvw.h" +#include "hlink.h" +#include "exdispid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static ATOM doc_view_atom = 0; +static void navigate_complete(WebBrowser *This) +{ + IDispatch *disp, *docdisp = NULL; + DISPPARAMS dispparams; + VARIANTARG params[2]; + VARIANT url; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&docdisp); + if(FAILED(hres)) + FIXME("Could not get IDispatch interface\n"); + + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = docdisp; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = This->url; + + IDispatch_Invoke(disp, DISPID_NAVIGATECOMPLETE2, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + IDispatch_Invoke(disp, DISPID_DOCUMENTCOMPLETE, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + + IDispatch_Release(disp); + if(docdisp) + IDispatch_Release(docdisp); +} + +static LRESULT navigate2(WebBrowser *This) +{ + IHlinkTarget *hlink; + HRESULT hres; + + TRACE("(%p)\n", This); + + if(!This->document) { + WARN("document == NULL\n"); + return 0; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); + if(FAILED(hres)) { + FIXME("Could not get IHlinkTarget interface\n"); + return 0; + } + + hres = IHlinkTarget_Navigate(hlink, 0, NULL); + IHlinkTarget_Release(hlink); + if(FAILED(hres)) { + FIXME("Navigate failed\n"); + return 0; + } + + navigate_complete(This); + + return 0; +} + static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { WebBrowser *This; @@ -37,6 +109,11 @@ static LRESULT WINAPI doc_view_proc(HWND This = GetPropW(hwnd, wszTHIS); } + switch(msg) { + case WB_WM_NAVIGATE2: + return navigate2(This); + } + return DefWindowProcA(hwnd, msg, wParam, lParam); } Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.35 wine/dlls/shdocvw/shdocvw.h:1.36 --- wine/dlls/shdocvw/shdocvw.h:1.35 28 Nov 2005 20:12:50 -0000 +++ wine/dlls/shdocvw/shdocvw.h 28 Nov 2005 20:12:50 -0000 @@ -91,6 +91,8 @@ typedef struct { IOleContainer *container; IOleDocumentView *view; + LPOLESTR url; + /* window context */ HWND iphwnd; @@ -152,6 +154,8 @@ HRESULT WebBrowser_Create(IUnknown*,REFI void create_doc_view_hwnd(WebBrowser *This); +#define WB_WM_NAVIGATE2 (WM_USER+100) + #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) /********************************************************************** Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.29 wine/dlls/shdocvw/webbrowser.c:1.30 --- wine/dlls/shdocvw/webbrowser.c:1.29 28 Nov 2005 20:12:50 -0000 +++ wine/dlls/shdocvw/webbrowser.c 28 Nov 2005 20:12:50 -0000 @@ -128,6 +128,7 @@ static ULONG WINAPI WebBrowser_Release(I WebBrowser_Events_Destroy(This); WebBrowser_ClientSite_Destroy(This); + SysFreeString(This->url); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); } @@ -551,6 +552,8 @@ static HRESULT WINAPI WebBrowser_Navigat return hres; } + This->url = SysAllocString(V_BSTR(URL)); + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); if(FAILED(hres)) return hres; @@ -558,6 +561,8 @@ static HRESULT WINAPI WebBrowser_Navigat hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); IOleObject_Release(oleobj); + PostMessageW(This->doc_view_hwnd, WB_WM_NAVIGATE2, 0, 0); + return hres; } @@ -783,6 +788,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->ref = 0; ret->document = NULL; + ret->url = NULL; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

18 years, 5 months

wine/include shlobj.h

by Alexandre Julliard

ChangeSet ID: 21513 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:12:42 Modified files: include : shlobj.h Log message: Remove unnecessary external variable declarations. Patch: http://cvs.winehq.org/patch.py?id=21513 Old revision New revision Changes Path 1.104 1.105 +0 -4 wine/include/shlobj.h Index: wine/include/shlobj.h diff -u -p wine/include/shlobj.h:1.104 wine/include/shlobj.h:1.105 --- wine/include/shlobj.h:1.104 28 Nov 2005 20:12:42 -0000 +++ wine/include/shlobj.h 28 Nov 2005 20:12:42 -0000 @@ -91,8 +91,6 @@ int WINAPI PathCleanupSpec(LPCWSTR,LPWST /* DATAOBJECT_InitShellIDList*/ #define CFSTR_SHELLIDLIST "Shell IDList Array" /* CF_IDLIST */ -extern UINT cfShellIDList; - typedef struct { UINT cidl; UINT aoffset[1]; @@ -103,13 +101,11 @@ typedef struct /* DATAOBJECT_InitFileGroupDesc */ #define CFSTR_FILEDESCRIPTORA "FileGroupDescriptor" /* CF_FILEGROUPDESCRIPTORA */ -extern UINT cfFileGroupDesc; #define CFSTR_FILEDESCRIPTORW "FileGroupDescriptorW" /* CF_FILEGROUPDESCRIPTORW */ /* DATAOBJECT_InitFileContents*/ #define CFSTR_FILECONTENTS "FileContents" /* CF_FILECONTENTS */ -extern UINT cfFileContents; #define CFSTR_FILENAMEA "FileName" /* CF_FILENAMEA */ #define CFSTR_FILENAMEW "FileNameW" /* CF_FILENAMEW */

18 years, 5 months

wine/dlls iccvid/iccvid.c iccvid/iccvid.spec m ...

by Alexandre Julliard

ChangeSet ID: 21512 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:12:34 Modified files: dlls/iccvid : iccvid.c iccvid.spec dlls/mciavi32 : mciavi.c dlls/mcicda : mcicda.c dlls/mciseq : mcimidi.c dlls/midimap : midimap.c dlls/msacm/imaadp32: imaadp32.c dlls/msacm/msadp32: msadp32.c dlls/msacm/msg711: msg711.c dlls/msacm : pcmconverter.c dlls/msacm/winemp3: mpegl3.c dlls/msrle32 : msrle32.c dlls/msvidc32 : msvidc32.spec msvideo1.c dlls/winmm/joystick: joystick.c dlls/winmm/mciwave: mciwave.c dlls/winmm/wavemap: wavemap.c dlls/winmm/winealsa: alsa.c dlls/winmm/winearts: arts.c dlls/winmm/wineaudioio: audioio.c dlls/winmm/wineesd: esound.c dlls/winmm/winejack: jack.c dlls/winmm : winemm.h dlls/winmm/winenas: nas.c dlls/winmm/wineoss: oss.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Fix all drivers DriverProc to conform to the DRIVERPROC definition. Patch: http://cvs.winehq.org/patch.py?id=21512 Old revision New revision Changes Path 1.9 1.10 +1 -1 wine/dlls/iccvid/iccvid.c 1.2 1.3 +1 -1 wine/dlls/iccvid/iccvid.spec 1.1 1.2 +5 -5 wine/dlls/mciavi32/mciavi.c 1.3 1.4 +4 -4 wine/dlls/mcicda/mcicda.c 1.3 1.4 +5 -5 wine/dlls/mciseq/mcimidi.c 1.1 1.2 +4 -4 wine/dlls/midimap/midimap.c 1.14 1.15 +5 -5 wine/dlls/msacm/imaadp32/imaadp32.c 1.10 1.11 +3 -3 wine/dlls/msacm/msadp32/msadp32.c 1.13 1.14 +3 -3 wine/dlls/msacm/msg711/msg711.c 1.24 1.25 +1 -1 wine/dlls/msacm/pcmconverter.c 1.9 1.10 +5 -5 wine/dlls/msacm/winemp3/mpegl3.c 1.16 1.17 +1 -1 wine/dlls/msrle32/msrle32.c 1.2 1.3 +1 -1 wine/dlls/msvidc32/msvidc32.spec 1.7 1.8 +1 -1 wine/dlls/msvidc32/msvideo1.c 1.20 1.21 +13 -13 wine/dlls/winmm/joystick/joystick.c 1.38 1.39 +27 -27 wine/dlls/winmm/mciwave/mciwave.c 1.46 1.47 +7 -7 wine/dlls/winmm/wavemap/wavemap.c 1.4 1.5 +4 -4 wine/dlls/winmm/winealsa/alsa.c 1.5 1.6 +4 -4 wine/dlls/winmm/winearts/arts.c 1.3 1.4 +4 -4 wine/dlls/winmm/wineaudioio/audioio.c 1.1 1.2 +4 -4 wine/dlls/winmm/wineesd/esound.c 1.4 1.5 +6 -6 wine/dlls/winmm/winejack/jack.c 1.68 1.69 +1 -4 wine/dlls/winmm/winemm.h 1.2 1.3 +4 -4 wine/dlls/winmm/winenas/nas.c 1.14 1.15 +4 -4 wine/dlls/winmm/wineoss/oss.c

18 years, 5 months

wine/dlls/crypt32 cert.c crypt32.spec main.c

by Alexandre Julliard

ChangeSet ID: 21511 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:11:46 Modified files: dlls/crypt32 : cert.c crypt32.spec main.c Log message: Juan Lang <juan_lang(a)yahoo.com> Fix parameter count on some stubs (thanks to Marcus Meissner for spotting that.) Add a few more stubs. Patch: http://cvs.winehq.org/patch.py?id=21511 Old revision New revision Changes Path 1.22 1.23 +1 -1 wine/dlls/crypt32/cert.c 1.32 1.33 +7 -7 wine/dlls/crypt32/crypt32.spec 1.26 1.27 +51 -13 wine/dlls/crypt32/main.c Index: wine/dlls/crypt32/cert.c diff -u -p wine/dlls/crypt32/cert.c:1.22 wine/dlls/crypt32/cert.c:1.23 --- wine/dlls/crypt32/cert.c:1.22 28 Nov 2005 20:11:46 -0000 +++ wine/dlls/crypt32/cert.c 28 Nov 2005 20:11:46 -0000 @@ -3288,7 +3288,7 @@ BOOL WINAPI CryptVerifyCertificateSignat HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, DWORD dwFlags) { FIXME("stub: %s %lx\n", debugstr_a(pszFuncName), dwFlags); - return NULL; + return (HCRYPTOIDFUNCSET)0xbaadf00d; } BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, Index: wine/dlls/crypt32/crypt32.spec diff -u -p wine/dlls/crypt32/crypt32.spec:1.32 wine/dlls/crypt32/crypt32.spec:1.33 --- wine/dlls/crypt32/crypt32.spec:1.32 28 Nov 2005 20:11:46 -0000 +++ wine/dlls/crypt32/crypt32.spec 28 Nov 2005 20:11:46 -0000 @@ -104,11 +104,11 @@ @ stub CryptFormatObject @ stub CryptFreeOIDFunctionAddress @ stub CryptGetAsyncParam -@ stub CryptGetDefaultOIDDllList +@ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) @ stub CryptGetDefaultOIDFunctionAddress @ stub CryptGetMessageCertificates @ stub CryptGetMessageSignerCount -@ stub CryptGetOIDFunctionAddress +@ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) @ stub CryptHashMessage @@ -118,7 +118,7 @@ @ stdcall CryptImportPublicKeyInfo(long long ptr ptr) @ stdcall CryptImportPublicKeyInfoEx(long long ptr long long ptr ptr) @ stdcall CryptInitOIDFunctionSet(str long) -@ stub CryptInstallOIDFunctionAddress +@ stdcall CryptInstallOIDFunctionAddress(ptr long str long ptr long) @ stub CryptLoadSip @ stdcall CryptMemAlloc(long) @ stdcall CryptMemFree(ptr) @@ -166,12 +166,12 @@ @ stub CryptVerifyMessageSignatureWithKey @ stub CryptVerifySignatureU @ stdcall I_CryptAllocTls() -@ stdcall I_CryptCreateLruCache(long long) +@ stdcall I_CryptCreateLruCache(ptr ptr) @ stub I_CryptCreateLruEntry @ stdcall I_CryptDetachTls(long) -@ stdcall I_CryptFindLruEntryData(long) -@ stdcall I_CryptFlushLruCache(long) -@ stdcall I_CryptFreeLruCache(long) +@ stdcall I_CryptFindLruEntryData(long long long) +@ stdcall I_CryptFlushLruCache(ptr long long) +@ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) @ stub I_CryptGetDefaultCryptProv @ stub I_CryptGetDefaultCryptProvForEncrypt Index: wine/dlls/crypt32/main.c diff -u -p wine/dlls/crypt32/main.c:1.26 wine/dlls/crypt32/main.c:1.27 --- wine/dlls/crypt32/main.c:1.26 28 Nov 2005 20:11:46 -0000 +++ wine/dlls/crypt32/main.c 28 Nov 2005 20:11:46 -0000 @@ -53,30 +53,37 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void return hDefProv; } -/* this function is called by Internet Explorer when it is about to verify a downloaded component */ -BOOL WINAPI I_CryptCreateLruCache(DWORD x, DWORD y) +typedef void * HLRUCACHE; + +/* this function is called by Internet Explorer when it is about to verify a + * downloaded component. The first parameter appears to be a pointer to an + * unknown type, native fails unless it points to a buffer of at least 20 bytes. + * The second parameter appears to be an out parameter, whatever it's set to is + * passed (by cryptnet.dll) to I_CryptFlushLruCache. + */ +BOOL WINAPI I_CryptCreateLruCache(void *unknown, HLRUCACHE *out) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %p): stub!\n", unknown, out); + *out = (void *)0xbaadf00d; + return TRUE; } -/* these functions all have an unknown number of args */ -BOOL WINAPI I_CryptFindLruEntryData(DWORD x) +BOOL WINAPI I_CryptFindLruEntryData(DWORD unk0, DWORD unk1, DWORD unk2) { - FIXME("stub!\n"); + FIXME("(%08lx, %08lx, %08lx): stub!\n", unk0, unk1, unk2); return FALSE; } -BOOL WINAPI I_CryptFlushLruCache(DWORD x) +DWORD WINAPI I_CryptFlushLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1); + return 0; } -BOOL WINAPI I_CryptFreeLruCache(DWORD x) +HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1); + return h; } BOOL WINAPI CryptSIPRemoveProvider(GUID *pgProv) @@ -215,6 +222,37 @@ BOOL WINAPI CryptRegisterDefaultOIDFunct return FALSE; } +BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, + DWORD dwEncodingType, LPCSTR pszFuncName, DWORD cFuncEntry, + const CRYPT_OID_FUNC_ENTRY rgFuncEntry[], DWORD dwFlags) +{ + FIXME("(%p, %ld, %s, %ld, %p, %08lx): stub\n", hModule, dwEncodingType, + debugstr_a(pszFuncName), cFuncEntry, rgFuncEntry, dwFlags); + return TRUE; +} + +BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPCSTR pszOID, DWORD dwFlags, void **ppvFuncAddr, + HCRYPTOIDFUNCADDR *phFuncAddr) +{ + FIXME("(%p, %ld, %s, %08lx, %p, %p): stub\n", hFuncSet, dwEncodingType, + debugstr_a(pszOID), dwFlags, ppvFuncAddr, phFuncAddr); + return FALSE; +} + +BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList) +{ + FIXME("(%p, %ld, %p, %p): stub\n", hFuncSet, dwEncodingType, pwszDllList, + pcchDllList); + + if (*pcchDllList) + *pwszDllList = '\0'; + *pcchDllList = 1; + + return TRUE; +} + struct OIDToAlgID { LPCSTR oid;

18 years, 5 months

← Newer
1
...
4
5
6
7
8
9
10
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2005