November 2005 - Wine-Commits

wine/dlls/msi msi.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21190 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:58:24 Modified files: dlls/msi : msi.c Log message: Mike McCormack <mike(a)codeweavers.com> Make sure we only CoUninitialize after successfully initializing. Fix the address of the returned IShellLinkDataList interface. Patch: http://cvs.winehq.org/patch.py?id=21190 Old revision New revision Changes Path 1.114 1.115 +5 -6 wine/dlls/msi/msi.c Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.114 wine/dlls/msi/msi.c:1.115 --- wine/dlls/msi/msi.c:1.114 9 Nov 2005 10:58:24 -0000 +++ wine/dlls/msi/msi.c 9 Nov 2005 10:58:24 -0000 @@ -1818,14 +1818,12 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWS IShellLinkDataList *dl = NULL; IPersistFile *pf = NULL; LPEXP_DARWIN_LINK darwin = NULL; - HRESULT r; + HRESULT r, init; TRACE("%s %p %p %p\n", debugstr_w(szShortcutTarget), szProductCode, szFeatureId, szComponentCode ); - r = CoInitialize(NULL); - if( FAILED( r ) ) - return ERROR_FUNCTION_FAILED; + init = CoInitialize(NULL); r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistFile, (LPVOID*) &pf ); @@ -1836,7 +1834,7 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWS if( SUCCEEDED( r ) ) { r = IPersistFile_QueryInterface( pf, &IID_IShellLinkDataList, - (LPVOID*) dl ); + (LPVOID*) &dl ); if( SUCCEEDED( r ) ) { IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, @@ -1847,7 +1845,8 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWS IPersistFile_Release( pf ); } - CoUninitialize(); + if (SUCCEEDED(init)) + CoUninitialize(); TRACE("darwin = %p\n", darwin);

1 0

wine/dlls/urlmon file.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21189 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:58:02 Modified files: dlls/urlmon : file.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Added IInternetPriority implementation to FileProtocol. Patch: http://cvs.winehq.org/patch.py?id=21189 Old revision New revision Changes Path 1.4 1.5 +61 -2 wine/dlls/urlmon/file.c Index: wine/dlls/urlmon/file.c diff -u -p wine/dlls/urlmon/file.c:1.4 wine/dlls/urlmon/file.c:1.5 --- wine/dlls/urlmon/file.c:1.4 9 Nov 2005 10:58: 2 -0000 +++ wine/dlls/urlmon/file.c 9 Nov 2005 10:58: 2 -0000 @@ -33,15 +33,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; HANDLE file; + LONG priority; LONG ref; } FileProtocol; -#define PROTOCOL_THIS(iface) DEFINE_THIS(FileProtocol, InternetProtocol, iface) - #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) + +#define PROTOCOL_THIS(iface) DEFINE_THIS(FileProtocol, InternetProtocol, iface) static HRESULT WINAPI FileProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { @@ -57,6 +60,9 @@ static HRESULT WINAPI FileProtocol_Query }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -266,6 +272,57 @@ static const IInternetProtocolVtbl FileP FileProtocol_UnlockRequest }; +#define PRIORITY_THIS(iface) DEFINE_THIS(FileProtocol, InternetPriority, iface) + +static HRESULT WINAPI FilePriority_QueryInterface(IInternetPriority *iface, + REFIID riid, void **ppv) +{ + FileProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI FilePriority_AddRef(IInternetPriority *iface) +{ + FileProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI FilePriority_Release(IInternetPriority *iface) +{ + FileProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI FilePriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + FileProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%ld)\n", This, nPriority); + + This->priority = nPriority; + return S_OK; +} + +static HRESULT WINAPI FilePriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + FileProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pnPriority); + + *pnPriority = This->priority; + return S_OK; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl FilePriorityVtbl = { + FilePriority_QueryInterface, + FilePriority_AddRef, + FilePriority_Release, + FilePriority_SetPriority, + FilePriority_GetPriority +}; + HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FileProtocol *ret; @@ -277,7 +334,9 @@ HRESULT FileProtocol_Construct(IUnknown ret = HeapAlloc(GetProcessHeap(), 0, sizeof(FileProtocol)); ret->lpInternetProtocolVtbl = &FileProtocolVtbl; + ret->lpInternetPriorityVtbl = &FilePriorityVtbl; ret->file = NULL; + ret->priority = 0; ret->ref = 1; *ppobj = PROTOCOL(ret);

1 0

wine/dlls/user cursoricon.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21188 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:57:57 Modified files: dlls/user : cursoricon.c Log message: Christian Costa <titan.costa(a)wanadoo.fr> If a color bitmap is provided, store bitmap information from it instead of the mask bitmap one. Patch: http://cvs.winehq.org/patch.py?id=21188 Old revision New revision Changes Path 1.19 1.20 +20 -9 wine/dlls/user/cursoricon.c Index: wine/dlls/user/cursoricon.c diff -u -p wine/dlls/user/cursoricon.c:1.19 wine/dlls/user/cursoricon.c:1.20 --- wine/dlls/user/cursoricon.c:1.19 9 Nov 2005 10:57:57 -0000 +++ wine/dlls/user/cursoricon.c 9 Nov 2005 10:57:57 -0000 @@ -1831,20 +1831,31 @@ HICON WINAPI CreateIconIndirect(PICONINF /* If we are creating an icon, the hotspot is unused */ if (iconinfo->fIcon) { - info->ptHotSpot.x = ICON_HOTSPOT; - info->ptHotSpot.y = ICON_HOTSPOT; + info->ptHotSpot.x = ICON_HOTSPOT; + info->ptHotSpot.y = ICON_HOTSPOT; } else { - info->ptHotSpot.x = iconinfo->xHotspot; - info->ptHotSpot.y = iconinfo->yHotspot; + info->ptHotSpot.x = iconinfo->xHotspot; + info->ptHotSpot.y = iconinfo->yHotspot; } - info->nWidth = bmpAnd.bmWidth; - info->nHeight = iconinfo->hbmColor ? bmpAnd.bmHeight : (bmpAnd.bmHeight / 2); - info->nWidthBytes = bmpAnd.bmWidthBytes; - info->bPlanes = bmpAnd.bmPlanes; - info->bBitsPerPixel = bmpAnd.bmBitsPixel; + if (iconinfo->hbmColor) + { + info->nWidth = bmpXor.bmWidth; + info->nHeight = bmpXor.bmHeight; + info->nWidthBytes = bmpXor.bmWidthBytes; + info->bPlanes = bmpXor.bmPlanes; + info->bBitsPerPixel = bmpXor.bmBitsPixel; + } + else + { + info->nWidth = bmpAnd.bmWidth; + info->nHeight = bmpAnd.bmHeight / 2; + info->nWidthBytes = bmpAnd.bmWidthBytes; + info->bPlanes = bmpAnd.bmPlanes; + info->bBitsPerPixel = bmpAnd.bmBitsPixel; + } /* Transfer the bitmap bits to the CURSORICONINFO structure */

1 0

wine/dlls x11drv/winpos.c user/tests/msg.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21187 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:35:48 Modified files: dlls/x11drv : winpos.c dlls/user/tests: msg.c Log message: Don't call SetWindowPos in ShowWindow if a parent window is not visible, only toggle the WS_VISIBLE flag. Patch: http://cvs.winehq.org/patch.py?id=21187 Old revision New revision Changes Path 1.140 1.141 +15 -5 wine/dlls/x11drv/winpos.c 1.100 1.101 +17 -4 wine/dlls/user/tests/msg.c Index: wine/dlls/x11drv/winpos.c diff -u -p wine/dlls/x11drv/winpos.c:1.140 wine/dlls/x11drv/winpos.c:1.141 --- wine/dlls/x11drv/winpos.c:1.140 9 Nov 2005 10:35:48 -0000 +++ wine/dlls/x11drv/winpos.c 9 Nov 2005 10:35:48 -0000 @@ -1003,12 +1003,22 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c if (!IsWindow( hwnd )) return wasVisible; } - /* ShowWindow won't activate a not being maximized child window */ - if ((style & WS_CHILD) && cmd != SW_MAXIMIZE) - swp |= SWP_NOACTIVATE | SWP_NOZORDER; + if (!IsWindowVisible( GetAncestor( hwnd, GA_PARENT ))) + { + /* if parent is not visible simply toggle WS_VISIBLE and return */ + if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 ); + else WIN_SetStyle( hwnd, 0, WS_VISIBLE ); + } + else + { + /* ShowWindow won't activate a not being maximized child window */ + if ((style & WS_CHILD) && cmd != SW_MAXIMIZE) + swp |= SWP_NOACTIVATE | SWP_NOZORDER; + + SetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top, + newPos.right, newPos.bottom, LOWORD(swp) ); + } - SetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top, - newPos.right, newPos.bottom, LOWORD(swp) ); if (cmd == SW_HIDE) { HWND hFocus; Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.100 wine/dlls/user/tests/msg.c:1.101 --- wine/dlls/user/tests/msg.c:1.100 9 Nov 2005 10:35:48 -0000 +++ wine/dlls/user/tests/msg.c 9 Nov 2005 10:35:48 -0000 @@ -543,6 +543,15 @@ static const struct message WmDestroyChi { WM_NCDESTROY, sent }, { 0 } }; +/* DestroyWindow for a visible child window with invisible parent */ +static const struct message WmDestroyInvisibleChildSeq[] = { + { HCBT_DESTROYWND, hook }, + { WM_PARENTNOTIFY, sent|parent|wparam, WM_DESTROY }, + { WM_SHOWWINDOW, sent|wparam, 0 }, + { WM_DESTROY, sent }, + { WM_NCDESTROY, sent }, + { 0 } +}; /* Moving the mouse in nonclient area */ static const struct message WmMouseMoveInNonClientAreaSeq[] = { /* FIXME: add */ { WM_NCHITTEST, sent }, @@ -2855,14 +2864,14 @@ static void test_showwindow(void) /* ShowWindow(SW_SHOWNA) with child and parent invisible */ trace("calling ShowWindow( SW_SHOWNA) for invisible child with invisible parent\n"); ok( ShowWindow(hchild, SW_SHOWNA) == FALSE, "ShowWindow: window was visible\n" ); - ok_sequence(WmSHOWNAChildInvisParInvis, "ShowWindow(SW_SHOWNA) invisible child and parent", TRUE); + ok_sequence(WmSHOWNAChildInvisParInvis, "ShowWindow(SW_SHOWNA) invisible child and parent", FALSE); trace("done\n"); /* ShowWindow(SW_SHOWNA) with child visible and parent invisible */ ok( ShowWindow(hchild, SW_SHOW) != FALSE, "ShowWindow: window was invisible\n" ); flush_sequence(); trace("calling ShowWindow( SW_SHOWNA) for the visible child and invisible parent\n"); ok( ShowWindow(hchild, SW_SHOWNA) != FALSE, "ShowWindow: window was invisible\n" ); - ok_sequence(WmSHOWNAChildVisParInvis, "ShowWindow(SW_SHOWNA) visible child and invisible parent", TRUE); + ok_sequence(WmSHOWNAChildVisParInvis, "ShowWindow(SW_SHOWNA) visible child and invisible parent", FALSE); trace("done\n"); /* ShowWindow(SW_SHOWNA) with child visible and parent visible */ ShowWindow( hwnd, SW_SHOW); @@ -3176,12 +3185,12 @@ static void test_messages(void) ok_sequence(WmCreateChildSeq, "CreateWindow:child", FALSE); ShowWindow( hchild, SW_SHOW ); - ok_sequence(WmShowChildInvisibleParentSeq, "ShowWindow:show child with invisible parent", TRUE); + ok_sequence(WmShowChildInvisibleParentSeq, "ShowWindow:show child with invisible parent", FALSE); ok(GetWindowLongA(hchild, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); ok(!IsWindowVisible(hchild), "IsWindowVisible() should return FALSE\n"); ShowWindow( hchild, SW_HIDE ); - ok_sequence(WmHideChildInvisibleParentSeq, "ShowWindow:hide child with invisible parent", TRUE); + ok_sequence(WmHideChildInvisibleParentSeq, "ShowWindow:hide child with invisible parent", FALSE); ok(!(GetWindowLongA(hchild, GWL_STYLE) & WS_VISIBLE), "WS_VISIBLE should be not set\n"); ok(!IsWindowVisible(hchild), "IsWindowVisible() should return FALSE\n"); @@ -3195,7 +3204,11 @@ static void test_messages(void) ok(!(GetWindowLongA(hchild, GWL_STYLE) & WS_VISIBLE), "WS_VISIBLE should not be set\n"); ok(!IsWindowVisible(hchild), "IsWindowVisible() should return FALSE\n"); + SetWindowPos(hchild, 0,0,0,0,0, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOZORDER); + flush_sequence(); DestroyWindow(hchild); + ok_sequence(WmDestroyInvisibleChildSeq, "DestroyInvisibleChildSeq", FALSE); + DestroyWindow(hparent); flush_sequence();

1 0

wine/dlls/user winproc.c win.c scroll.c resour ...
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21186 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:33:40 Modified files: dlls/user : winproc.c win.c scroll.c resource.c misc.c message.c menu.c defwnd.c dde_misc.c cursoricon.c class.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing description - add missing returns section - complete missing A/W pairs - reformate comments, to match c2man requirements Patch: http://cvs.winehq.org/patch.py?id=21186 Old revision New revision Changes Path 1.12 1.13 +2 -0 wine/dlls/user/winproc.c 1.20 1.21 +3 -1 wine/dlls/user/win.c 1.16 1.17 +9 -3 wine/dlls/user/scroll.c 1.28 1.29 +3 -1 wine/dlls/user/resource.c 1.28 1.29 +3 -0 wine/dlls/user/misc.c 1.96 1.97 +5 -3 wine/dlls/user/message.c 1.40 1.41 +1 -1 wine/dlls/user/menu.c 1.6 1.7 +1 -0 wine/dlls/user/defwnd.c 1.6 1.7 +17 -11 wine/dlls/user/dde_misc.c 1.18 1.19 +13 -4 wine/dlls/user/cursoricon.c 1.1 1.2 +5 -0 wine/dlls/user/class.c

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21185 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:31:20 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> - Cleanup formating of DispCallFunc. - Fix DispCallFunc for functions with return values. - Don't rely on _copy_arg as it is going away soon. Patch: http://cvs.winehq.org/patch.py?id=21185 Old revision New revision Changes Path 1.174 1.175 +26 -25 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.174 wine/dlls/oleaut32/typelib.c:1.175 --- wine/dlls/oleaut32/typelib.c:1.174 9 Nov 2005 10:31:20 -0000 +++ wine/dlls/oleaut32/typelib.c 9 Nov 2005 10:31:20 -0000 @@ -4862,46 +4862,47 @@ static HRESULT typedescvt_to_variantvt(I HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, - VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult -) { + VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) +{ int i, argsize, argspos; DWORD *args; HRESULT hres; TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", - pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult) - ); - /* DispCallFunc is only used to invoke methods belonging to an IDispatch-derived COM interface. - So we need to add a first parameter to the list of arguments, to supply the interface pointer */ + pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, + pvargResult, V_VT(pvargResult)); + + /* DispCallFunc is only used to invoke methods belonging to an + * IDispatch-derived COM interface. So we need to add a first parameter + * to the list of arguments, to supply the interface pointer */ argsize = 1; - for (i=0;i<cActuals;i++) { - TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); - dump_Variant(prgpvarg[i]); - argsize += _argsize(prgvt[i]); + for (i=0;i<cActuals;i++) + { + TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); + dump_Variant(prgpvarg[i]); + argsize += _argsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */ argspos = 1; - for (i=0;i<cActuals;i++) { - VARIANT *arg = prgpvarg[i]; - TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); - _copy_arg(NULL, NULL, &args[argspos], arg, prgvt[i]); - argspos += _argsize(prgvt[i]); - } - - if(pvargResult!=NULL && V_VT(pvargResult)==VT_EMPTY) + for (i=0;i<cActuals;i++) { - _invoke((*(FARPROC**)pvInstance)[oVft/4],cc,argsize,args); - hres=S_OK; + VARIANT *arg = prgpvarg[i]; + TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); + memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); + argspos += _argsize(prgvt[i]); } - else + + hres = _invoke((*(FARPROC**)pvInstance)[oVft/sizeof(void *)],cc,argsize,args); + if (pvargResult && (vtReturn != VT_EMPTY)) { - FIXME("Do not know how to handle pvargResult %p. Expect crash ...\n",pvargResult); - hres = _invoke((*(FARPROC**)pvInstance)[oVft/4],cc,argsize,args); - FIXME("Method returned %lx\n",hres); + TRACE("Method returned 0x%08lx\n",hres); + V_VT(pvargResult) = vtReturn; + V_UI4(pvargResult) = hres; } + HeapFree(GetProcessHeap(),0,args); - return hres; + return S_OK; } static HRESULT WINAPI ITypeInfo_fnInvoke(

1 0

wine/dlls/ntdll string.c sec.c reg.c error.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21184 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:30:57 Modified files: dlls/ntdll : string.c sec.c reg.c error.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Patch: http://cvs.winehq.org/patch.py?id=21184 Old revision New revision Changes Path 1.17 1.18 +3 -0 wine/dlls/ntdll/string.c 1.66 1.67 +2 -2 wine/dlls/ntdll/sec.c 1.64 1.65 +3 -3 wine/dlls/ntdll/reg.c 1.17 1.18 +6 -0 wine/dlls/ntdll/error.c Index: wine/dlls/ntdll/string.c diff -u -p wine/dlls/ntdll/string.c:1.17 wine/dlls/ntdll/string.c:1.18 --- wine/dlls/ntdll/string.c:1.17 9 Nov 2005 10:30:57 -0000 +++ wine/dlls/ntdll/string.c 9 Nov 2005 10:30:57 -0000 @@ -382,6 +382,9 @@ LONGLONG __cdecl _atoi64( char *str ) * dir [O] Destination for directory component. Should be at least MAX_PATH characters. * fname [O] Destination for File name component. Should be at least MAX_PATH characters. * ext [O] Destination for file extension component. Should be at least MAX_PATH characters. + * + * RETURNS + * Nothing. */ void __cdecl _splitpath(const char* inpath, char * drv, char * dir, char* fname, char * ext ) Index: wine/dlls/ntdll/sec.c diff -u -p wine/dlls/ntdll/sec.c:1.66 wine/dlls/ntdll/sec.c:1.67 --- wine/dlls/ntdll/sec.c:1.66 9 Nov 2005 10:30:57 -0000 +++ wine/dlls/ntdll/sec.c 9 Nov 2005 10:30:57 -0000 @@ -414,7 +414,7 @@ BOOLEAN WINAPI RtlValidSid( PSID pSid ) * lpsd [O] Descriptor to initialise. * rev [I] Revision, must be set to SECURITY_DESCRIPTOR_REVISION. * - * RETURNS: + * RETURNS * Success: STATUS_SUCCESS. * Failure: STATUS_UNKNOWN_REVISION if rev is incorrect. */ @@ -438,7 +438,7 @@ NTSTATUS WINAPI RtlCreateSecurityDescrip * pSourceSD [O] SD to copy from. * pDestinationSD [I] Destination SD. * - * RETURNS: + * RETURNS * Success: STATUS_SUCCESS. * Failure: STATUS_UNKNOWN_REVISION if rev is incorrect. */ Index: wine/dlls/ntdll/reg.c diff -u -p wine/dlls/ntdll/reg.c:1.64 wine/dlls/ntdll/reg.c:1.65 --- wine/dlls/ntdll/reg.c:1.64 9 Nov 2005 10:30:57 -0000 +++ wine/dlls/ntdll/reg.c 9 Nov 2005 10:30:57 -0000 @@ -837,9 +837,9 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyP /****************************************************************************** * RtlOpenCurrentUser [NTDLL.@] * - * if we return just HKEY_CURRENT_USER the advapi tries to find a remote - * registry (odd handle) and fails - * + * NOTES + * If we return just HKEY_CURRENT_USER the advapi tries to find a remote + * registry (odd handle) and fails. */ DWORD WINAPI RtlOpenCurrentUser( IN ACCESS_MASK DesiredAccess, /* [in] */ Index: wine/dlls/ntdll/error.c diff -u -p wine/dlls/ntdll/error.c:1.17 wine/dlls/ntdll/error.c:1.18 --- wine/dlls/ntdll/error.c:1.17 9 Nov 2005 10:30:58 -0000 +++ wine/dlls/ntdll/error.c 9 Nov 2005 10:30:58 -0000 @@ -132,6 +132,9 @@ DWORD WINAPI RtlGetLastWin32Error(void) * * PARAMS * err [I] The new error value to set + * + * RETURNS + * Nothing. */ void WINAPI RtlSetLastWin32Error( DWORD err ) { @@ -145,6 +148,9 @@ void WINAPI RtlSetLastWin32Error( DWORD * * PARAMS * err [I] The new status value to set + * + * RETURNS + * Nothing. */ void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus( NTSTATUS status ) {

1 0

wine/dlls/shell32 brsfolder.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21183 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:30:28 Modified files: dlls/shell32 : brsfolder.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Initialize COM prior to displaying the SHBrowseForFolder dialog. Patch: http://cvs.winehq.org/patch.py?id=21183 Old revision New revision Changes Path 1.65 1.66 +4 -0 wine/dlls/shell32/brsfolder.c Index: wine/dlls/shell32/brsfolder.c diff -u -p wine/dlls/shell32/brsfolder.c:1.65 wine/dlls/shell32/brsfolder.c:1.66 --- wine/dlls/shell32/brsfolder.c:1.65 9 Nov 2005 10:30:28 -0000 +++ wine/dlls/shell32/brsfolder.c 9 Nov 2005 10:30:28 -0000 @@ -672,14 +672,18 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW ( { browse_info info; DWORD r; + HRESULT hr; info.hWnd = 0; info.pidlRet = NULL; info.lpBrowseInfo = lpbi; info.hwndTreeView = NULL; + hr = CoInitialize(NULL); r = DialogBoxParamW( shell32_hInstance, swBrowseTemplateName, lpbi->hwndOwner, BrsFolderDlgProc, (LPARAM)&info ); + if (SUCCEEDED(hr)) + CoUninitialize(); if (!r) return NULL;

1 0

wine/dlls/shell32/tests shlfolder.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21182 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:30:15 Modified files: dlls/shell32/tests: shlfolder.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Disable code that segfaults on Win98 SE. Patch: http://cvs.winehq.org/patch.py?id=21182 Old revision New revision Changes Path 1.42 1.43 +6 -0 wine/dlls/shell32/tests/shlfolder.c Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.42 wine/dlls/shell32/tests/shlfolder.c:1.43 --- wine/dlls/shell32/tests/shlfolder.c:1.42 9 Nov 2005 10:30:15 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 9 Nov 2005 10:30:15 -0000 @@ -267,8 +267,11 @@ static void test_BindToObject(void) hr = IShellFolder_BindToObject(psfMyComputer, pidlEmpty, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with empty pidl! hr = %08lx\n", hr); +#if 0 + /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfMyComputer, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with NULL pidl! hr = %08lx\n", hr); +#endif cChars = GetSystemDirectoryA(szSystemDir, MAX_PATH); ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %08lx\n", GetLastError()); @@ -295,9 +298,12 @@ static void test_BindToObject(void) ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with empty pidl! hr = %08lx\n", hr); +#if 0 + /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfSystemDir, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with NULL pidl! hr = %08lx\n", hr); +#endif IShellFolder_Release(psfSystemDir); }

1 0

wine/dlls/ole32 rpc.c ole2.c ole16.c compobj_p ...
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21181 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:29:11 Modified files: dlls/ole32 : rpc.c ole2.c ole16.c compobj_private.h compobj.c Log message: Robert Shearman <rob(a)codeweavers.com> - Extend COM_OpenKeyForCLSID to open a subkey and return an HRESULT. - Fix up the callers and reorganize CoGetClassObject to split out the inproc code into another function. Patch: http://cvs.winehq.org/patch.py?id=21181 Old revision New revision Changes Path 1.67 1.68 +7 -16 wine/dlls/ole32/rpc.c 1.77 1.78 +13 -29 wine/dlls/ole32/ole2.c 1.22 1.23 +16 -17 wine/dlls/ole32/ole16.c 1.58 1.59 +1 -1 wine/dlls/ole32/compobj_private.h 1.166 1.167 +92 -74 wine/dlls/ole32/compobj.c

1 0