Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 18357: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Stefan Leichter <Stefan.Leichter(a)camLine.com> - Added version resource to urlmon.dll. Alexandre Julliard <julliard(a)winehq.org> - Fixed a compiler warning. - We are no longer generating .dbg.c files. Jacek Caban <jack(a)itma.pwr.wroc.pl> - Added IHttpNegotiate2 interface. - Update BINDSTRING and IInternetSession. - Added MIME type checking to FileProtocol::Start. - Rewrote FindMimeFromData to pass tests. - Encode URL in file protocol. - Added ReleaseBindInfo implementation. - Added RegisterFormatEnumerator and RevokeFormatEnumerator implementation. - Added PARSE_SECURITY_DOMAIN action implementation. - Added CreateAsyncBindCtxEx implementation. - Added PARSE_SECURITY_URL action implementation. - Added CoInternetGetSession implementation. - Register zones. - Added PARSE_PATH_FROM_URL action implementation. - Added http and ftp protocol stub implementation. - Register ZoneMap. - Move protocol's CLSIDs to urlmon.idl. - Added urlmon.inf as dependency of rsrc.res. - Added GetZoneActionPolicy implementation. - Added CoInternetParseUrl implementation. - Added MapUrlToZone implementation. - Added file protocol implementation. - Added IInternetSecurityManager::[SG]etSecuritySite implementation. - Forward IInternetSecurityManager calls to custom manager. - Added CreateFormatEnumerator implementation. Added: trunk/reactos/lib/urlmon/file.c Added: trunk/reactos/lib/urlmon/format.c Added: trunk/reactos/lib/urlmon/ftp.c Added: trunk/reactos/lib/urlmon/http.c Added: trunk/reactos/lib/urlmon/internet.c Modified: trunk/reactos/lib/urlmon/regsvr.c Modified: trunk/reactos/lib/urlmon/rsrc.rc Modified: trunk/reactos/lib/urlmon/sec_mgr.c Added: trunk/reactos/lib/urlmon/session.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/urlmon.inf Modified: trunk/reactos/lib/urlmon/urlmon.spec Modified: trunk/reactos/lib/urlmon/urlmon.xml Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/lib/urlmon/urlmon_main.h Added: trunk/reactos/lib/urlmon/version.rc Modified: trunk/reactos/w32api/include/urlmon.h _____ Copied: trunk/reactos/lib/urlmon/file.c (from rev 18356, vendor/wine/dlls/urlmon/current/file.c) Property changes on: trunk/reactos/lib/urlmon/file.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/urlmon/format.c (from rev 18356, vendor/wine/dlls/urlmon/current/format.c) Property changes on: trunk/reactos/lib/urlmon/format.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/urlmon/ftp.c (from rev 18356, vendor/wine/dlls/urlmon/current/ftp.c) Property changes on: trunk/reactos/lib/urlmon/ftp.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/urlmon/http.c (from rev 18356, vendor/wine/dlls/urlmon/current/http.c) Property changes on: trunk/reactos/lib/urlmon/http.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/urlmon/internet.c (from rev 18356, vendor/wine/dlls/urlmon/current/internet.c) Property changes on: trunk/reactos/lib/urlmon/internet.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/regsvr.c --- trunk/reactos/lib/urlmon/regsvr.c 2005-10-08 19:30:16 UTC (rev 18356) +++ trunk/reactos/lib/urlmon/regsvr.c 2005-10-08 19:43:11 UTC (rev 18357) @@ -37,7 +37,6 @@ #include "wine/debug.h" -#include "initguid.h" #include "urlmon_main.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -546,7 +545,7 @@ "urlmon.dll", "Apartment" }, - { &CLSID_HttpsProtocol, + { &CLSID_HttpSProtocol, "https: Asynchronous Pluggable Protocol Handler", NULL, "urlmon.dll", @@ -594,7 +593,7 @@ INF_SET_CLSID(FtpProtocol); INF_SET_CLSID(GopherProtocol); INF_SET_CLSID(HttpProtocol); - INF_SET_CLSID(HttpsProtocol); + INF_SET_CLSID(HttpSProtocol); INF_SET_CLSID(MkProtocol); for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { _____ Modified: trunk/reactos/lib/urlmon/rsrc.rc --- trunk/reactos/lib/urlmon/rsrc.rc 2005-10-08 19:30:16 UTC (rev 18356) +++ trunk/reactos/lib/urlmon/rsrc.rc 2005-10-08 19:43:11 UTC (rev 18357) @@ -17,3 +17,5 @@ */ REGINST REGINST urlmon.inf + +#include "version.rc" _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2005-10-08 19:30:16 UTC (rev 18356) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2005-10-08 19:43:11 UTC (rev 18357) @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "wine/debug.h" #include "ole2.h" #include "wine/unicode.h" @@ -39,17 +40,84 @@ * InternetSecurityManager implementation * */ -typedef struct SecManagerImpl{ +typedef struct { + const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; - const IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ + LONG ref; - LONG ref; /* reference counter for this object */ - + IInternetSecurityMgrSite *mgrsite; + IInternetSecurityManager *custom_manager; } SecManagerImpl; +#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) + +static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone) +{ + WCHAR schema[64]; + DWORD res, size=0; + HKEY hkey; + HRESULT hres; + + static const WCHAR wszZoneMapProtocolKey[] = + {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','M','a','p','\\', + 'P','r','o','t','o','c','o','l','D','e','f','a','u','l','t','s',0}; + static const WCHAR wszFile[] = {'f','i','l','e',0}; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); + if(FAILED(hres)) + return hres; + if(!*schema) + return 0x80041001; + + /* file protocol is a special case */ + if(!strcmpW(schema, wszFile)) { + WCHAR path[MAX_PATH]; + + hres = CoInternetParseUrl(url, PARSE_PATH_FROM_URL, 0, path, + sizeof(path)/sizeof(WCHAR), &size, 0); + + if(SUCCEEDED(hres) && strchrW(path, '\\')) { + *zone = 0; + return S_OK; + } + } + + WARN("domains are not yet implemented\n"); + + res = RegOpenKeyW(HKEY_CURRENT_USER, wszZoneMapProtocolKey, &hkey); + if(res != ERROR_SUCCESS) { + ERR("Could not open key %s\n", debugstr_w(wszZoneMapProtocolKey)); + return E_UNEXPECTED; + } + + size = sizeof(DWORD); + res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); + if(res == ERROR_SUCCESS) + return S_OK; + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszZoneMapProtocolKey, &hkey); + if(res != ERROR_SUCCESS) { + ERR("Could not open key %s\n", debugstr_w(wszZoneMapProtocolKey)); + return E_UNEXPECTED; + } + + size = sizeof(DWORD); + res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); + if(res == ERROR_SUCCESS) + return S_OK; + + *zone = 3; + return S_OK; +} + static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* iface,REFIID riid,void** ppvObject) { - SecManagerImpl *This = (SecManagerImpl *)iface; + SecManagerImpl *This = SECMGR_THIS(iface); TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); @@ -66,8 +134,10 @@ *ppvObject = iface; /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) + if (!*ppvObject) { + WARN("not supported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; + } /* Query Interface always increases the reference count by one when it is successful */ IInternetSecurityManager_AddRef(iface); @@ -77,24 +147,30 @@ static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManager* iface) { - SecManagerImpl *This = (SecManagerImpl *)iface; + SecManagerImpl *This = SECMGR_THIS(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); + TRACE("(%p) ref=%lu\n", This, refCount); return refCount; } static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManager* iface) { - SecManagerImpl *This = (SecManagerImpl *)iface; + SecManagerImpl *This = SECMGR_THIS(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); + TRACE("(%p) ref=%lu\n", This, refCount); /* destroy the object if there's no more reference on it */ if (!refCount){ + if(This->mgrsite) + IInternetSecurityMgrSite_Release(This->mgrsite); + if(This->custom_manager) + IInternetSecurityManager_Release(This->custom_manager); + HeapFree(GetProcessHeap(),0,This); + URLMON_UnlockModule(); } @@ -104,32 +180,112 @@ static HRESULT WINAPI SecManagerImpl_SetSecuritySite(IInternetSecurityManager *iface, IInternetSecurityMgrSite *pSite) { - FIXME("(%p)->(%p)\n", iface, pSite); - return E_NOTIMPL; + SecManagerImpl *This = SECMGR_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pSite); + + if(This->mgrsite) + IInternetSecurityMgrSite_Release(This->mgrsite); + + if(This->custom_manager) { + IInternetSecurityManager_Release(This->custom_manager); + This->custom_manager = NULL; + } + + This->mgrsite = pSite; + + if(pSite) { + IServiceProvider *servprov; + HRESULT hres; + + IInternetSecurityMgrSite_AddRef(pSite); + + hres = IInternetSecurityMgrSite_QueryInterface(pSite, &IID_IServiceProvider, + (void**)&servprov); + if(SUCCEEDED(hres)) { + IServiceProvider_QueryService(servprov, &SID_SInternetSecurityManager, + &IID_IInternetSecurityManager, (void**)&This->custom_manager); + IServiceProvider_Release(servprov); + } + } + + return S_OK; } static HRESULT WINAPI SecManagerImpl_GetSecuritySite(IInternetSecurityManager *iface, IInternetSecurityMgrSite **ppSite) { - FIXME("(%p)->( %p)\n", iface, ppSite); - return E_NOTIMPL; + SecManagerImpl *This = SECMGR_THIS(iface); + + TRACE("(%p)->(%p)\n", This, ppSite); + + if(!ppSite) + return E_INVALIDARG; + + if(This->mgrsite) + IInternetSecurityMgrSite_AddRef(This->mgrsite); + + *ppSite = This->mgrsite; + return S_OK; } static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *iface, LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags) { - FIXME("(%p)->(%s %p %08lx)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); - return E_NOTIMPL; + SecManagerImpl *This = SECMGR_THIS(iface); + LPWSTR url; + DWORD size; + HRESULT hres; + + TRACE("(%p)->(%s %p %08lx)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); + + if(This->custom_manager) { + hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager, + pwszUrl, pdwZone, dwFlags); + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + + if(!pwszUrl) + return E_INVALIDARG; + + if(dwFlags) + FIXME("not supported flags: %08lx\n", dwFlags); + + size = (strlenW(pwszUrl)+16) * sizeof(WCHAR); + url = HeapAlloc(GetProcessHeap(), 0, size); + + hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, url, size/sizeof(WCHAR), &size, 0); + if(FAILED(hres)) + memcpy(url, pwszUrl, size); + + hres = map_url_to_zone(url, pdwZone); + + HeapFree(GetProcessHeap(), 0, url); + + return hres; } static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, - DWORD dwReserved) + DWORD_PTR dwReserved) { - FIXME("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, + SecManagerImpl *This = SECMGR_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, dwReserved); + + if(This->custom_manager) { + hres = IInternetSecurityManager_GetSecurityId(This->custom_manager, + pwszUrl, pbSecurityId, pcbSecurityId, dwReserved); + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + + FIXME("Default action is not implemented\n"); return E_NOTIMPL; } @@ -140,8 +296,20 @@ BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) { - FIXME("(%p)->(%s %08lx %p %08lx %p %08lx %08lx %08lx)\n", iface, debugstr_w(pwszUrl), dwAction, + SecManagerImpl *This = SECMGR_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%s %08lx %p %08lx %p %08lx %08lx %08lx)\n", iface, debugstr_w(pwszUrl), dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + + if(This->custom_manager) { + hres = IInternetSecurityManager_ProcessUrlAction(This->custom_manager, pwszUrl, dwAction, + pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + + FIXME("Default action is not implemented\n"); return E_NOTIMPL; } @@ -152,22 +320,58 @@ BYTE *pContext, DWORD cbContext, DWORD dwReserved) { - FIXME("(%p)->(%s %s %p %p %p %08lx %08lx )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), + SecManagerImpl *This = SECMGR_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%s %s %p %p %p %08lx %08lx )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + + if(This->custom_manager) { + hres = IInternetSecurityManager_QueryCustomPolicy(This->custom_manager, pwszUrl, guidKey, + ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + + FIXME("Default action is not implemented\n"); return E_NOTIMPL; } static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, DWORD dwZone, LPCWSTR pwszPattern, DWORD dwFlags) { - FIXME("(%p)->(%08lx %s %08lx)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); + SecManagerImpl *This = SECMGR_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%08lx %s %08lx)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); + + if(This->custom_manager) { + hres = IInternetSecurityManager_SetZoneMapping(This->custom_manager, dwZone, + pwszPattern, dwFlags); + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + + FIXME("Default action is not implemented\n"); return E_NOTIMPL; } static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManager *iface, - DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags) + DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags) { - FIXME("(%p)->(%08lx %p %08lx)\n", iface, dwZone, ppenumString,dwFlags); + SecManagerImpl *This = SECMGR_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%08lx %p %08lx)\n", iface, dwZone, ppenumString,dwFlags); + + if(This->custom_manager) { + hres = IInternetSecurityManager_GetZoneMappings(This->custom_manager, dwZone, + ppenumString, dwFlags); + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + + FIXME("Default action is not implemented\n"); return E_NOTIMPL; } @@ -194,9 +398,12 @@ This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); /* Initialize the virtual function table. */ - This->lpvtbl1 = &VT_SecManagerImpl; - This->ref = 1; + This->lpInternetSecurityManagerVtbl = &VT_SecManagerImpl; + This->ref = 1; + This->mgrsite = NULL; + This->custom_manager = NULL; + *ppobj = This; URLMON_LockModule(); @@ -213,6 +420,46 @@ LONG ref; } ZoneMgrImpl; +static HRESULT open_zone_key(DWORD zone, HKEY *hkey, URLZONEREG zone_reg) +{ + static const WCHAR wszZonesKey[] = + {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','s','\\',0}; + static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; + + WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; + HKEY parent_key; + DWORD res; + + switch(zone_reg) { + case URLZONEREG_DEFAULT: /* FIXME: TEST */ + case URLZONEREG_HKCU: + parent_key = HKEY_CURRENT_USER; + break; + case URLZONEREG_HKLM: + parent_key = HKEY_LOCAL_MACHINE; + break; + default: + WARN("Unknown URLZONEREG: %d\n", zone_reg); + return E_FAIL; + }; + + wsprintfW(key_name, wszFormat, wszZonesKey, zone); + + res = RegOpenKeyW(parent_key, key_name, hkey); + + if(res != ERROR_SUCCESS) { + WARN("RegOpenKey failed\n"); + return E_INVALIDARG; + } + + return S_OK; +} + /******************************************************************** * IInternetZoneManager_QueryInterface */ @@ -324,15 +571,41 @@ * IInternetZoneManager_GetZoneActionPolicy */ static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicy(IInternetZoneManager* iface, - DWORD dwZone, - DWORD dwAction, - BYTE* pPolicy, - DWORD cbPolicy, - URLZONEREG urlZoneReg) + DWORD dwZone, DWORD dwAction, BYTE* pPolicy, DWORD cbPolicy, URLZONEREG urlZoneReg) { - FIXME("(%p)->(%08lx %08lx %p %08lx %08x) stub\n", iface, dwZone, dwAction, pPolicy, - cbPolicy, urlZoneReg); - return E_NOTIMPL; + WCHAR action[16]; + HKEY hkey; + LONG res; + DWORD size = cbPolicy; + HRESULT hres; + + static const WCHAR wszFormat[] = {'%','l','X',0}; + + TRACE("(%p)->(%ld %08lx %p %ld %d)\n", iface, dwZone, dwAction, pPolicy, + cbPolicy, urlZoneReg); + + if(!pPolicy) + return E_INVALIDARG; + + hres = open_zone_key(dwZone, &hkey, urlZoneReg); + if(FAILED(hres)) + return hres; + + wsprintfW(action, wszFormat, dwAction); + + res = RegQueryValueExW(hkey, action, NULL, NULL, pPolicy, &size); + if(res == ERROR_MORE_DATA) { + hres = E_INVALIDARG; + }else if(res == ERROR_FILE_NOT_FOUND) { + hres = E_FAIL; + }else if(res != ERROR_SUCCESS) { + ERR("RegQueryValue failed: %ld\n", res); + hres = E_UNEXPECTED; + } + + RegCloseKey(hkey); + + return hres; } /******************************************************************** @@ -468,6 +741,10 @@ IInternetSecurityManager **ppSM, DWORD dwReserved ) { TRACE("%p %p %ld\n", pSP, ppSM, dwReserved ); + + if(pSP) + FIXME("pSP not supported\n"); + return SecManagerImpl_Construct(NULL, (void**) ppSM); } _____ Copied: trunk/reactos/lib/urlmon/session.c (from rev 18356, vendor/wine/dlls/urlmon/current/session.c) Property changes on: trunk/reactos/lib/urlmon/session.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-10-08 19:30:16 UTC (rev 18356) +++ trunk/reactos/lib/urlmon/umon.c 2005-10-08 19:43:11 UTC (rev 18357) @@ -1179,17 +1179,39 @@ HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx **pbind) { + TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind); + + if(!callback) + return E_INVALIDARG; + + return CreateAsyncBindCtxEx(NULL, 0, callback, format, pbind, 0); +} +/********************************************************************** * + * CreateAsyncBindCtxEx (URLMON.@) + * + * Create an asynchronous bind context. + */ +HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, + IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx** pbind, + DWORD reserved) +{ HRESULT hres; BIND_OPTS bindopts; IBindCtx *bctx; - TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind); + TRACE("(%p %08lx %p %p %p %ld)\n", ibind, options, callback, format, pbind, reserved); - if(!callback) + if(!pbind) return E_INVALIDARG; + + if(options) + FIXME("not supported options %08lx", options); if(format) - FIXME("format is not supported yet\n"); + FIXME("format is not supported\n"); + if(reserved) + WARN("reserved=%ld\n", reserved); + hres = CreateBindCtx(0, &bctx); if(FAILED(hres)) return hres; @@ -1200,31 +1222,13 @@ bindopts.dwTickCountDeadline = 0; IBindCtx_SetBindOptions(bctx, &bindopts); - hres = IBindCtx_RegisterObjectParam(bctx, (LPOLESTR)BSCBHolder, (IUnknown*)callback); - if(FAILED(hres)) { - IBindCtx_Release(bctx); - return hres; - } + if(callback) + RegisterBindStatusCallback(bctx, callback, NULL, 0); *pbind = bctx; return S_OK; } -/********************************************************************** * - * CreateAsyncBindCtxEx (URLMON.@) - * - * Create an asynchronous bind context. - * - * FIXME - * Not implemented. - */ -HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, - IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx** pbind, - DWORD reserved) -{ - FIXME("stub, returns failure\n"); - return E_INVALIDARG; -} /*********************************************************************** @@ -1274,40 +1278,7 @@ return hres; } - /*********************************************************************** - * CoInternetGetSession (URLMON.@) - * - * Create a new internet session and return an IInternetSession interface - * representing it. - * - * PARAMS - * dwSessionMode [I] Mode for the internet session - * ppIInternetSession [O] Destination for creates IInternetSession object - * dwReserved [I] Reserved, must be 0. - * - * RETURNS - * Success: S_OK. ppIInternetSession contains the IInternetSession interface. - * Failure: E_INVALIDARG, if any argument is invalid, or - * E_OUTOFMEMORY if memory allocation fails. - */ -HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, IInternetSession **ppIInternetSession, DWORD dwReserved) -{ - FIXME("(%ld, %p, %ld): stub\n", dwSessionMode, ppIInternetSession, dwReserved); - - if(dwSessionMode) { - ERR("dwSessionMode: %ld, must be zero\n", dwSessionMode); - } - - if(dwReserved) { - ERR("dwReserved: %ld, must be zero\n", dwReserved); - } - - *ppIInternetSession=NULL; - return E_OUTOFMEMORY; -} - -/********************************************************************** * * CoInternetQueryInfo (URLMON.@) * * Retrieves information relevant to a specified URL @@ -1327,70 +1298,7 @@ return S_OK; } -static BOOL URLMON_IsBinary(LPVOID pBuffer, DWORD cbSize) -{ - unsigned int i, binarycount = 0; - unsigned char *buff = pBuffer; - for(i=0; i<cbSize; i++) { - if(buff[i] < 32) - binarycount++; - } - return binarycount > (cbSize-binarycount); -} - /*********************************************************************** - * FindMimeFromData (URLMON.@) - * - * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. - * - * NOTE - * See http://msdn.microsoft.com/workshop/networking/moniker/overview/appendix_ a.asp - */ -HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, - DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, - LPWSTR* ppwzMimeOut, DWORD dwReserved) -{ - static const WCHAR szBinaryMime[] = {'a','p','p','l','i','c','a','t','i','o','n','/','o','c','t','e','t','-' ,'s','t','r','e','a','m','\0'}; - static const WCHAR szTextMime[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; - static const WCHAR szContentType[] = {'C','o','n','t','e','n','t',' ','T','y','p','e','\0'}; - WCHAR szTmpMime[256]; - LPCWSTR mimeType = NULL; - HKEY hKey = NULL; - - TRACE("(%p,%s,%p,%ld,%s,0x%lx,%p,0x%lx)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, - debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); - - if((!pwzUrl && (!pBuffer || cbSize <= 0)) || !ppwzMimeOut) - return E_INVALIDARG; - - if(pwzMimeProposed) - mimeType = pwzMimeProposed; - else { - /* Try and find the mime type in the registry */ - if(pwzUrl) { - LPWSTR ext = strrchrW(pwzUrl, '.'); - if(ext) { - DWORD dwSize; - if(!RegOpenKeyExW(HKEY_CLASSES_ROOT, ext, 0, 0, &hKey)) { - if(!RegQueryValueExW(hKey, szContentType, NULL, NULL, (LPBYTE)szTmpMime, &dwSize)) { - mimeType = szTmpMime; - } - RegCloseKey(hKey); - } - } - } - } - if(!mimeType && pBuffer && cbSize > 0) - mimeType = URLMON_IsBinary(pBuffer, cbSize)?szBinaryMime:szTextMime; - - TRACE("Using %s\n", debugstr_w(mimeType)); - *ppwzMimeOut = CoTaskMemAlloc((lstrlenW(mimeType)+1)*sizeof(WCHAR)); - if(!*ppwzMimeOut) return E_OUTOFMEMORY; - lstrcpyW(*ppwzMimeOut, mimeType); - return S_OK; -} - -/********************************************************************** * * IsAsyncMoniker (URLMON.@) */ HRESULT WINAPI IsAsyncMoniker(IMoniker *pmk) @@ -1445,7 +1353,7 @@ IBindStatusCallback_Release(prev); } - return IBindCtx_RegisterObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown *)pbsc); + return IBindCtx_RegisterObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown *)pbsc); } /*********************************************************************** @@ -1487,22 +1395,6 @@ } /*********************************************************************** - * ReleaseBindInfo (URLMON.@) - * - * Release the resources used by the specified BINDINFO structure. - * - * PARAMS - * pbindinfo [I] BINDINFO to release. - * - * RETURNS - * Nothing. - */ -void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) -{ - FIXME("(%p)stub!\n", pbindinfo); -} - -/********************************************************************** * * URLDownloadToFileA (URLMON.@) * * Downloads URL szURL to rile szFileName and call lpfnCB callback to _____ Modified: trunk/reactos/lib/urlmon/urlmon.inf --- trunk/reactos/lib/urlmon/urlmon.inf 2005-10-08 19:30:16 UTC (rev 18356) +++ trunk/reactos/lib/urlmon/urlmon.inf 2005-10-08 19:43:11 UTC (rev 18357) @@ -3,11 +3,11 @@ [RegisterDll] -AddReg=Protocols.Reg +AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg [UnregisterDll] -DelReg=Protocols.Reg +DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg [Protocols.Reg] @@ -27,3 +27,455 @@ HKCR,"PROTOCOLS\Handler\https","CLSID",,"%CLSID_HttpsProtocol%" HKCR,"PROTOCOLS\Handler\mk",,,"mk: Asynchronous Pluggable Protocol Handler" HKCR,"PROTOCOLS\Handler\mk","CLSID",,"%CLSID_MkProtocol%" + + +[ZoneMap.Reg] +HKCU,"Software\Microsoft\Windows\CurrentVersion\Internet Settings",,, +HKCU,"%PATH_ZONEMAP%",,, +HKLM,"%PATH_ZONEMAP%",,, +HKCU,"%PATH_ZONEMAP%","ProxyByPass", 0x10001,0x1 +HKLM,"%PATH_ZONEMAP%","ProxyByPass", 0x10001,0x1 +HKCU,"%PATH_ZONEMAP%","IntranetName", 0x10001,0x1 +HKLM,"%PATH_ZONEMAP%","IntranetName", 0x10001,0x1 +HKCU,"%PATH_ZONEMAP%","UNCAsIntranet",0x10001,0x1 +HKLM,"%PATH_ZONEMAP%","UNCAsIntranet",0x10001,0x1 +HKCU,"%PATH_ZONEMAP_PROTOCOLS%",,, +HKLM,"%PATH_ZONEMAP_PROTOCOLS%",,, +HKCU,"%PATH_ZONEMAP_PROTOCOLS%","http", 0x10001,0x3 +HKLM,"%PATH_ZONEMAP_PROTOCOLS%","http", 0x10001,0x3 +HKCU,"%PATH_ZONEMAP_PROTOCOLS%","https",0x10001,0x3 +HKLM,"%PATH_ZONEMAP_PROTOCOLS%","https",0x10001,0x3 +HKCU,"%PATH_ZONEMAP_PROTOCOLS%","ftp", 0x10001,0x3 +HKLM,"%PATH_ZONEMAP_PROTOCOLS%","ftp", 0x10001,0x3 +HKCU,"%PATH_ZONEMAP_PROTOCOLS%","file", 0x10001,0x3 +HKLM,"%PATH_ZONEMAP_PROTOCOLS%","file", 0x10001,0x3 +HKCU,"%PATH_ZONEMAP_PROTOCOLS%","@ivt", 0x10001,0x1 +HKLM,"%PATH_ZONEMAP_PROTOCOLS%","@ivt",0x10001,0x1 +HKCU,"%PATH_ZONEMAP_DOMAINS%",,, +HKLM,"%PATH_ZONEMAP_DOMAINS%",,, +HKCU,"%PATH_ZONEMAP_RANGES%",,, +HKLM,"%PATH_ZONEMAP_RANGES%",,, + + +[Zones.Reg] +HKCU,"%PATH_ZONES%",,, + +;; Local Zone +HKCU,"%ZONES_LOCAL%",,, +HKLM,"%ZONES_LOCAL%",,, +HKCU,"%ZONES_LOCAL%","DisplayName",,%NAME_LOCAL% +HKLM,"%ZONES_LOCAL%","DisplayName",,%NAME_LOCAL% +HKCU,"%ZONES_LOCAL%","Description",,%DESC_LOCAL% +HKLM,"%ZONES_LOCAL%","Description",,%DESC_LOCAL% +HKCU,"%ZONES_LOCAL%","Icon",,%ZICON_LOCAL% +HKLM,"%ZONES_LOCAL%","Icon",,%ZICON_LOCAL% +HKCU,"%ZONES_LOCAL%","CurrentLevel",0x10001,0x00000 +HKLM,"%ZONES_LOCAL%","CurrentLevel",0x10001,0x00000 +HKCU,"%ZONES_LOCAL%","Flags",0x10001,0x21 +HKLM,"%ZONES_LOCAL%","Flags",0x10001,0x21 +HKCU,"%ZONES_LOCAL%","1001",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1001",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1004",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1004",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1200",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1200",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1201",0x10003,0x1 +HKLM,"%ZONES_LOCAL%","1201",0x10003,0x1 +HKCU,"%ZONES_LOCAL%","1400",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1400",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1402",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1402",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1405",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1405",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1406",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1406",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1407",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1407",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1601",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1601",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1604",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1604",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1605",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1605",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1606",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1606",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1607",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1607",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1608",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1608",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1609",0x10003,0x1 +HKLM,"%ZONES_LOCAL%","1609",0x10003,0x1 +HKCU,"%ZONES_LOCAL%","1800",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1800",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1802",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1802",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1803",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1803",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1804",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1804",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1805",0x10001,0x0 +HKLM,"%ZONES_LOCAL%","1805",0x10001,0x0 +HKCU,"%ZONES_LOCAL%","1A00",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A00",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1A02",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A02",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1A03",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A03",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1A04",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A04",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1A05",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A05",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1A06",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A06",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1A10",0x10003,0x0 +HKLM,"%ZONES_LOCAL%","1A10",0x10003,0x0 +HKCU,"%ZONES_LOCAL%","1C00",0x10003,0x20000 +HKLM,"%ZONES_LOCAL%","1C00",0x10003,0x20000 +HKCU,"%ZONES_LOCAL%","1E05",0x10003,0x30000 +HKLM,"%ZONES_LOCAL%","1E05",0x10003,0x30000 + +;; Intranet Zone +HKCU,"%ZONES_INTRANET%",,, +HKLM,"%ZONES_INTRANET%",,, +HKCU,"%ZONES_INTRANET%","DisplayName",,%NAME_INTRANET% +HKLM,"%ZONES_INTRANET%","DisplayName",,%NAME_INTRANET% +HKCU,"%ZONES_INTRANET%","Description",,%DESC_INTRANET% +HKLM,"%ZONES_INTRANET%","Description",,%DESC_INTRANET% +HKCU,"%ZONES_INTRANET%","Icon",,%ZICON_INTRANET% +HKLM,"%ZONES_INTRANET%","Icon",,%ZICON_INTRANET% +HKCU,"%ZONES_INTRANET%","CurrentLevel",0x10003,0x10500 +HKLM,"%ZONES_INTRANET%","CurrentLevel",0x10003,0x10500 +HKCU,"%ZONES_INTRANET%","MinLevel",0x10001,0x10000 +HKLM,"%ZONES_INTRANET%","MinLevel",0x10001,0x10000 +HKCU,"%ZONES_INTRANET%","RecommendedLevel",0x10001,0x10500 +HKLM,"%ZONES_INTRANET%","RecommendedLevel",0x10001,0x10500 +HKCU,"%ZONES_INTRANET%","Flags",0x10003,0xDB +HKLM,"%ZONES_INTRANET%","Flags",0x10003,0xDB +HKCU,"%ZONES_INTRANET%","1001",0x10003,0x1 +HKLM,"%ZONES_INTRANET%","1001",0x10003,0x1 +HKCU,"%ZONES_INTRANET%","1004",0x10003,0x3 +HKLM,"%ZONES_INTRANET%","1004",0x10003,0x3 +HKCU,"%ZONES_INTRANET%","1200",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1200",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1201",0x10003,0x3 +HKLM,"%ZONES_INTRANET%","1201",0x10003,0x3 +HKCU,"%ZONES_INTRANET%","1400",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1400",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1402",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1402",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1405",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1405",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1406",0x10003,0x1 +HKLM,"%ZONES_INTRANET%","1406",0x10003,0x1 +HKCU,"%ZONES_INTRANET%","1407",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1407",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1601",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1601",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1604",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1604",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1605",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1605",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1606",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1606",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1607",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1607",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1608",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1608",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1609",0x10003,0x1 +HKLM,"%ZONES_INTRANET%","1609",0x10003,0x1 +HKCU,"%ZONES_INTRANET%","1800",0x10003,0x1 +HKLM,"%ZONES_INTRANET%","1800",0x10003,0x1 +HKCU,"%ZONES_INTRANET%","1802",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1802",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1803",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1803",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1804",0x10003,0x1 +HKLM,"%ZONES_INTRANET%","1804",0x10003,0x1 +HKCU,"%ZONES_INTRANET%","1805",0x10001,0x0 +HKLM,"%ZONES_INTRANET%","1805",0x10001,0x0 +HKCU,"%ZONES_INTRANET%","1A00",0x10003,0x20000 +HKLM,"%ZONES_INTRANET%","1A00",0x10003,0x20000 +HKCU,"%ZONES_INTRANET%","1A02",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1A02",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1A03",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1A03",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1A04",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1A04",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1A05",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1A05",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1A06",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1A06",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1A10",0x10003,0x0 +HKLM,"%ZONES_INTRANET%","1A10",0x10003,0x0 +HKCU,"%ZONES_INTRANET%","1C00",0x10003,0x20000 +HKLM,"%ZONES_INTRANET%","1C00",0x10003,0x20000 +HKCU,"%ZONES_INTRANET%","1E05",0x10003,0x20000 +HKLM,"%ZONES_INTRANET%","1E05",0x10003,0x20000 + +;; Trusted Zone +HKCU,"%ZONES_TRUSTED%",,, +HKLM,"%ZONES_TRUSTED%",,, +HKCU,"%ZONES_TRUSTED%","DisplayName",,%NAME_TRUSTED% +HKLM,"%ZONES_TRUSTED%","DisplayName",,%NAME_TRUSTED% +HKCU,"%ZONES_TRUSTED%","Description",,%DESC_TRUSTED% +HKLM,"%ZONES_TRUSTED%","Description",,%DESC_TRUSTED% +HKCU,"%ZONES_TRUSTED%","Icon",,%ZICON_TRUSTED% [truncated at 1000 lines; 540 more skipped]

1 0

[gvg] 18356: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Francois Gouget <fgouget(a)free.fr> - Fix .spec declarations for functinos with 64bit arguments (reported by winapi_check). Stefan Leichter <Stefan.Leichter(a)camLine.com> - Added version resource to shlwapi.dll. Alexandre Julliard <julliard(a)winehq.org> - Remove the 'L' suffix on a number of constants to avoid comparison errors on 64-bit platforms. - Take into account -noname functions when checking for duplicate export names. Fixed a couple of issues found by the stricter check. - Specify 64-bit integers as double instead of long long in spec files so that we get the correct number of arguments. - We are no longer generating .dbg.c files. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Fix the usage of COLOR_xxx constants in the place of the window's class hbrBackground. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translations. Marcus Meissner <marcus(a)jet.franken.de> - The last argument to MultiByteToWideChar is wide character count and not the buffer size in bytes. Fixed all places where it was wrong. Modified: trunk/reactos/lib/shlwapi/clist.c Modified: trunk/reactos/lib/shlwapi/ordinal.c Modified: trunk/reactos/lib/shlwapi/reg.c Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Modified: trunk/reactos/lib/shlwapi/shlwapi_De.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_En.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_Es.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_It.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_Ja.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_Nl.rc Added: trunk/reactos/lib/shlwapi/shlwapi_No.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_Pt.rc Modified: trunk/reactos/lib/shlwapi/shlwapi_Sv.rc Modified: trunk/reactos/lib/shlwapi/string.c Added: trunk/reactos/lib/shlwapi/version.rc _____ Modified: trunk/reactos/lib/shlwapi/clist.c --- trunk/reactos/lib/shlwapi/clist.c 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/clist.c 2005-10-08 19:30:16 UTC (rev 18356) @@ -40,7 +40,7 @@ typedef const SHLWAPI_CLIST* LPCSHLWAPI_CLIST; /* ulId for contained SHLWAPI_CLIST items */ -#define CLIST_ID_CONTAINER (~0UL) +#define CLIST_ID_CONTAINER (~0U) HRESULT WINAPI SHAddDataBlock(LPSHLWAPI_CLIST*,LPCSHLWAPI_CLIST); _____ Modified: trunk/reactos/lib/shlwapi/ordinal.c --- trunk/reactos/lib/shlwapi/ordinal.c 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/ordinal.c 2005-10-08 19:30:16 UTC (rev 18356) @@ -2593,7 +2593,7 @@ wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); - wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW; + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = NULL; wc.lpszClassName = szClass; @@ -2880,7 +2880,7 @@ wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); - wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW; + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = NULL; wc.lpszClassName = szClass; _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/reg.c 2005-10-08 19:30:16 UTC (rev 18356) @@ -134,7 +134,7 @@ /* Create internal HUSKEY */ hKey = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*hKey)); - lstrcpynW(hKey->lpszPath, Path, sizeof(hKey->lpszPath)); + lstrcpynW(hKey->lpszPath, Path, sizeof(hKey->lpszPath)/sizeof(WCHAR)); if (hRelativeUSKey) { _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,34 +1,37 @@ -/* - * Top level resource file for shlwapi - * - * Copyright 2004 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "resource.h" - -#include "shlwapi_De.rc" -#include "shlwapi_En.rc" -#include "shlwapi_Es.rc" -#include "shlwapi_Nl.rc" -#include "shlwapi_It.rc" -#include "shlwapi_Ja.rc" -#include "shlwapi_Pl.rc" -#include "shlwapi_Pt.rc" -#include "shlwapi_Sv.rc" +/* + * Top level resource file for shlwapi + * + * Copyright 2004 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "resource.h" + +#include "version.rc" + +#include "shlwapi_De.rc" +#include "shlwapi_En.rc" +#include "shlwapi_Es.rc" +#include "shlwapi_Nl.rc" +#include "shlwapi_No.rc" +#include "shlwapi_It.rc" +#include "shlwapi_Ja.rc" +#include "shlwapi_Pl.rc" +#include "shlwapi_Pt.rc" +#include "shlwapi_Sv.rc" Property changes on: trunk/reactos/lib/shlwapi/shlwapi.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2005-10-08 19:30:16 UTC (rev 18356) @@ -546,7 +546,7 @@ 550 stub -noname GetTemplateInfoFromHandle 551 stub -noname IShellFolder_CompareIDs -@ stdcall AssocCreate(long long long long ptr ptr) +@ stdcall AssocCreate(double double ptr ptr) @ stdcall AssocIsDangerous(long) @ stdcall AssocQueryKeyA(long long str ptr ptr) @ stdcall AssocQueryKeyW(long long wstr ptr ptr) @@ -768,11 +768,11 @@ @ stdcall StrCpyW (ptr wstr) @ stdcall StrDupA (str) @ stdcall StrDupW (wstr) -@ stdcall StrFormatByteSize64A(long long ptr long) +@ stdcall StrFormatByteSize64A(double ptr long) @ stdcall StrFormatByteSizeA(long ptr long) -@ stdcall StrFormatByteSizeW(long long ptr long) -@ stdcall StrFormatKBSizeA(long long str long) -@ stdcall StrFormatKBSizeW(long long wstr long) +@ stdcall StrFormatByteSizeW(double ptr long) +@ stdcall StrFormatKBSizeA(double str long) +@ stdcall StrFormatKBSizeW(double wstr long) @ stdcall StrFromTimeIntervalA(ptr long long long) @ stdcall StrFromTimeIntervalW(ptr long long long) @ stdcall StrIsIntlEqualA(long str str long) _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_De.rc --- trunk/reactos/lib/shlwapi/shlwapi_De.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_De.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * German resources for shlwapi - * - * Copyright 2004 Henning Gerhardt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fehler!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "&Diesen Dialog nicht mehr anzeigen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Abbrechen" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nein" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * German resources for shlwapi + * + * Copyright 2004 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fehler!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&Diesen Dialog nicht mehr anzeigen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Abbrechen" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nein" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_De.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_En.rc --- trunk/reactos/lib/shlwapi/shlwapi_En.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_En.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * English resources for shlwapi - * - * Copyright 2004 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Error!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Don't show me th&is message again", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancel" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Yes" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * English resources for shlwapi + * + * Copyright 2004 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Error!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Don't show me th&is message again", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancel" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Yes" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_En.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_Es.rc --- trunk/reactos/lib/shlwapi/shlwapi_Es.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_Es.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * Spanish resources for shlwapi - * - * Copyright 2004 JosÚ Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "íError!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "No volver a mostrar este &mensaje", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Aceptar" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&SÝ" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Spanish resources for shlwapi + * + * Copyright 2004 JosÚ Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "íError!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "No volver a mostrar este &mensaje", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Aceptar" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&SÝ" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_It.rc --- trunk/reactos/lib/shlwapi/shlwapi_It.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_It.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * Italian resources for shlwapi - * - * Copyright 2004 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Errore!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Non mostrare nuovamente &questo messaggio", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annulla" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Si" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Italian resources for shlwapi + * + * Copyright 2004 Ivan Leo Puoti + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Errore!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Non mostrare nuovamente &questo messaggio", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annulla" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Si" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_It.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_Ja.rc --- trunk/reactos/lib/shlwapi/shlwapi_Ja.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_Ja.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * Japanese resources for shlwapi - * - * Copyright 2004 Hajime Segawa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "âGâëü[!" -FONT 9, "MS UI Gothic" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "ìíîÒé?é?é?âüâbâZü[âWéò\ÄªéÁé?éó(&i)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"âLâââôâZâï(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"é?éó(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"éóéóéª(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Japanese resources for shlwapi + * + * Copyright 2004 Hajime Segawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "âGâëü[!" +FONT 9, "MS UI Gothic" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "ìíîÒé?é?é?âüâbâZü[âWéò\ÄªéÁé?éó(&i)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"âLâââôâZâï(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"é?éó(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"éóéóéª(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Ja.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_Nl.rc --- trunk/reactos/lib/shlwapi/shlwapi_Nl.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_Nl.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * Dutch resources for shlwapi - * - * Copyright 2004 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fout!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Deze boodschap &niet opnieuw tonen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuleren" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nee" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Dutch resources for shlwapi + * + * Copyright 2004 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fout!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Deze boodschap &niet opnieuw tonen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annuleren" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nee" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Nl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/shlwapi/shlwapi_No.rc (from rev 18354, vendor/wine/dlls/shlwapi/current/shlwapi_No.rc) Property changes on: trunk/reactos/lib/shlwapi/shlwapi_No.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_Pt.rc --- trunk/reactos/lib/shlwapi/shlwapi_Pt.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_Pt.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * Portuguese resources for shlwapi - * - * Copyright 2004 Marcelo Duarte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Erro!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "N?úo &me mostre essa mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&N?úo" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Portuguese resources for shlwapi + * + * Copyright 2004 Marcelo Duarte + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Erro!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "N?úo &me mostre essa mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&N?úo" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Pt.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/shlwapi_Sv.rc --- trunk/reactos/lib/shlwapi/shlwapi_Sv.rc 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/shlwapi_Sv.rc 2005-10-08 19:30:16 UTC (rev 18356) @@ -1,35 +1,35 @@ -/* - * Swedish resources for shlwapi - * - * Copyright 2005 Andreas Bjerkeholt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fel!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 - LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "&Visa inte detta meddelande igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Swedish resources for shlwapi + * + * Copyright 2005 Andreas Bjerkeholt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fel!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&Visa inte detta meddelande igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Sv.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/string.c --- trunk/reactos/lib/shlwapi/string.c 2005-10-08 19:29:20 UTC (rev 18355) +++ trunk/reactos/lib/shlwapi/string.c 2005-10-08 19:30:16 UTC (rev 18356) @@ -1811,7 +1811,7 @@ if (*lppszDest) { - MultiByteToWideChar(0, 0, lpszStr, -1, *lppszDest, len); + MultiByteToWideChar(0, 0, lpszStr, -1, *lppszDest, len/sizeof(WCHAR)); hRet = S_OK; } else _____ Copied: trunk/reactos/lib/shlwapi/version.rc (from rev 18354, vendor/wine/dlls/shlwapi/current/version.rc) Property changes on: trunk/reactos/lib/shlwapi/version.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[mf] 18355: basic implementation of zoomin functionality
by mf＠svn.reactos.com 08 Oct '05

08 Oct '05

basic implementation of zoomin functionality Modified: trunk/rosapps/devutils/zoomin/framewnd.c Modified: trunk/rosapps/devutils/zoomin/main.c Modified: trunk/rosapps/devutils/zoomin/main.h Deleted: trunk/rosapps/devutils/zoomin/res/small.ico Modified: trunk/rosapps/devutils/zoomin/zoomin.rc Property changes on: trunk/rosapps/devutils/zoomin ___________________________________________________________________ Name: svn:ignore - *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.a + *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.a Debug Release _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.c --- trunk/rosapps/devutils/zoomin/framewnd.c 2005-10-08 19:24:54 UTC (rev 18354) +++ trunk/rosapps/devutils/zoomin/framewnd.c 2005-10-08 19:29:20 UTC (rev 18355) @@ -1,27 +1,29 @@ /* - * ReactOS zoomin + * ReactOS zoomin * - * framewnd.c + * framewnd.c * - * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright (C) 2005 Martin Fuchs <martin-fuchs(a)gmx.net> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <windows.h> +#include <windowsx.h> #include <tchar.h> #include "main.h" @@ -29,10 +31,14 @@ //////////////////////////////////////////////////////////////////////// //////// -// Global and Local Variables: +// Global Variables: // +static int s_factor = 2; // zoom factor +static POINT s_srcPos = {0, 0}; // zoom factor + + //////////////////////////////////////////////////////////////////////// //////// // Local module support methods // @@ -40,61 +46,117 @@ //////////////////////////////////////////////////////////////////////// //////// // -// FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) +// FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) // -// PURPOSE: Processes WM_COMMAND messages for the main frame window. +// PURPOSE: Processes WM_COMMAND messages for the main frame window. // // static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (LOWORD(wParam)) { - // Parse the menu selections: - case ID_EDIT_EXIT: - DestroyWindow(hWnd); - break; - case ID_EDIT_COPY: - case ID_EDIT_REFRESH: - case ID_OPTIONS_REFRESH_RATE: - case ID_HELP_ABOUT: - // TODO: - break; - default: - return FALSE; - } + // Parse the menu selections: + case ID_EDIT_EXIT: + DestroyWindow(hWnd); + break; + + case ID_EDIT_COPY: + case ID_EDIT_REFRESH: + case ID_OPTIONS_REFRESH_RATE: + case ID_HELP_ABOUT: + // TODO: + break; + + default: + return FALSE; + } + return TRUE; } //////////////////////////////////////////////////////////////////////// //////// // -// FUNCTION: FrameWndProc(HWND, unsigned, WORD, LONG) +// FUNCTION: FrameWndProc(HWND, unsigned, WORD, LONG) // -// PURPOSE: Processes messages for the main frame window. +// PURPOSE: Processes messages for the main window. // -// WM_COMMAND - process the application menu -// WM_DESTROY - post a quit message and return -// -// LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) { - case WM_CREATE: - break; - case WM_COMMAND: - if (!_CmdWndProc(hWnd, message, wParam, lParam)) { - return DefWindowProc(hWnd, message, wParam, lParam); - } + switch (message) { + case WM_CREATE: + SetTimer(hWnd, 0, 200, NULL); // refresh display all 200 ms break; - case WM_SIZE: - break; - case WM_TIMER: - break; - case WM_DESTROY: - PostQuitMessage(0); - default: - return DefWindowProc(hWnd, message, wParam, lParam); + + case WM_COMMAND: + if (!_CmdWndProc(hWnd, message, wParam, lParam)) { + return DefWindowProc(hWnd, message, wParam, lParam); + } + break; + + case WM_PAINT: { + PAINTSTRUCT ps; + HDC hdcMem; + RECT rect; + SIZE size; + + BeginPaint(hWnd, &ps); + hdcMem = GetDC(GetDesktopWindow()); + + GetClientRect(hWnd, &rect); + size.cx = rect.right / s_factor; + size.cy = rect.bottom / s_factor; + + StretchBlt(ps.hdc, 0, 0, size.cx*s_factor, size.cy*s_factor, hdcMem, s_srcPos.x, s_srcPos.y, size.cx, size.cy, SRCCOPY); + + ReleaseDC(GetDesktopWindow(), hdcMem); + EndPaint(hWnd, &ps); + break;} + + case WM_TIMER: + if (GetCapture() == hWnd) { + RECT rect; + + int width = GetSystemMetrics(SM_CXSCREEN); + int height = GetSystemMetrics(SM_CYSCREEN); + + GetClientRect(hWnd, &rect); + + GetCursorPos(&s_srcPos); + + s_srcPos.x -= rect.right / s_factor / 2; + s_srcPos.y -= rect.bottom / s_factor / 2; + + if (s_srcPos.x < 0) + s_srcPos.x = 0; + else if (s_srcPos.x+rect.right/s_factor > width) + s_srcPos.x = width - rect.right/s_factor; + + if (s_srcPos.y < 0) + s_srcPos.y = 0; + else if (s_srcPos.y+rect.bottom/s_factor > height) + s_srcPos.y = height - rect.bottom/s_factor; + } + + InvalidateRect(hWnd, NULL, FALSE); + break; + + case WM_LBUTTONDOWN: + SetCapture(hWnd); + break; + + case WM_LBUTTONUP: + ReleaseCapture(); + break; + + case WM_DESTROY: + KillTimer(hWnd, 0); + PostQuitMessage(0); + break; + + default: + return DefWindowProc(hWnd, message, wParam, lParam); } + return 0; } - _____ Modified: trunk/rosapps/devutils/zoomin/main.c --- trunk/rosapps/devutils/zoomin/main.c 2005-10-08 19:24:54 UTC (rev 18354) +++ trunk/rosapps/devutils/zoomin/main.c 2005-10-08 19:29:20 UTC (rev 18355) @@ -34,7 +34,6 @@ // Global Variables: // -HINSTANCE hInst; HWND hFrameWnd; HMENU hMenuFrame; @@ -44,16 +43,10 @@ //////////////////////////////////////////////////////////////////////// //////// // -// // FUNCTION: InitInstance(HANDLE, int) // -// PURPOSE: Saves instance handle and creates main window +// PURPOSE: creates main window // -// COMMENTS: -// -// In this function, we save the instance handle in a global variable and -// create and display the main program window. -// BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { @@ -66,7 +59,7 @@ hInstance, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ZOOMIN)), LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, + 0,//(HBRUSH)(COLOR_BTNFACE+1), 0/*lpszMenuName*/, szFrameClass, (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_ZOOMIN), IMAGE_ICON, @@ -78,7 +71,7 @@ hFrameWnd = CreateWindowEx(0, (LPCTSTR)(int)hFrameWndClass, szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, 250, 250, NULL, hMenuFrame, hInstance, NULL/*lpParam*/); if (!hFrameWnd) { @@ -110,13 +103,11 @@ LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); LoadString(hInstance, IDC_ZOOMIN, szFrameClass, MAX_LOADSTRING); - // Store instance handle in our global variable - hInst = hInstance; - // Perform application initialization: if (!InitInstance(hInstance, nCmdShow)) { return FALSE; } + hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_ZOOMIN); // Main message loop: @@ -129,4 +120,3 @@ ExitInstance(); return msg.wParam; } - _____ Modified: trunk/rosapps/devutils/zoomin/main.h --- trunk/rosapps/devutils/zoomin/main.h 2005-10-08 19:24:54 UTC (rev 18354) +++ trunk/rosapps/devutils/zoomin/main.h 2005-10-08 19:29:20 UTC (rev 18355) @@ -31,13 +31,11 @@ #include "resource.h" #define MAX_LOADSTRING 100 -#define MAX_NAME_LEN 500 //////////////////////////////////////////////////////////////////////// //////// // Global Variables: // -extern HINSTANCE hInst; extern HWND hFrameWnd; extern HMENU hMenuFrame; _____ Deleted: trunk/rosapps/devutils/zoomin/res/small.ico (Binary files differ) _____ Modified: trunk/rosapps/devutils/zoomin/zoomin.rc --- trunk/rosapps/devutils/zoomin/zoomin.rc 2005-10-08 19:24:54 UTC (rev 18354) +++ trunk/rosapps/devutils/zoomin/zoomin.rc 2005-10-08 19:29:20 UTC (rev 18355) @@ -3,7 +3,7 @@ #include <windows.h> #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Zoomin by Robert Dickenson\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Zoomin Utility\0" #define REACTOS_STR_INTERNAL_NAME "zoomin\0" #define REACTOS_STR_ORIGINAL_FILENAME "zoomin.exe\0" #include <reactos/version.rc> @@ -17,7 +17,6 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_ZOOMIN ICON DISCARDABLE "res/zoomin.ico" -IDI_SMALL ICON DISCARDABLE "res/small.ico" //////////////////////////////////////////////////////////////////////// ///// // @@ -93,5 +92,3 @@ IDS_APP_TITLE "ReactOS Zoomin" IDC_ZOOMIN "ZOOMIN" END - -

1 0

[gvg] 18354: Vendor import of shfolder
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Vendor import of shfolder Added: trunk/reactos/lib/shfolder/ Deleted: trunk/reactos/lib/shfolder/Makefile.in Added: trunk/reactos/lib/shfolder/shfolder.xml _____ Copied: trunk/reactos/lib/shfolder (from rev 18353, vendor/wine/dlls/shfolder/current) Property changes on: trunk/reactos/lib/shfolder ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Deleted: trunk/reactos/lib/shfolder/Makefile.in --- vendor/wine/dlls/shfolder/current/Makefile.in 2005-10-08 19:20:41 UTC (rev 18353) +++ trunk/reactos/lib/shfolder/Makefile.in 2005-10-08 19:24:54 UTC (rev 18354) @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = shfolder.dll -IMPORTLIB = libshfolder.$(IMPLIBEXT) -IMPORTS = shell32 kernel32 - -C_SRCS = shfolder_main.c - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Added: trunk/reactos/lib/shfolder/shfolder.xml --- vendor/wine/dlls/shfolder/current/shfolder.xml 2005-10-08 19:20:41 UTC (rev 18353) +++ trunk/reactos/lib/shfolder/shfolder.xml 2005-10-08 19:24:54 UTC (rev 18354) @@ -0,0 +1,10 @@ +<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll"> + <importlibrary definition="shfolder.spec.def" /> + <include base="shfolder">.</include> + <include base="shfolder">include</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>shell32</library> + <file>shfolder_main.c</file> + <file>shfolder.spec</file> +</module> Property changes on: trunk/reactos/lib/shfolder/shfolder.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gvg] 18353: Remove old shfolder in preparation for vendor import
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Remove old shfolder in preparation for vendor import Deleted: trunk/reactos/lib/shfolder/

1 0

[gvg] 18352: shfolder vendor drop
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

shfolder vendor drop Added: vendor/wine/dlls/shfolder/ Added: vendor/wine/dlls/shfolder/current/ Added: vendor/wine/dlls/shfolder/current/Makefile.in Added: vendor/wine/dlls/shfolder/current/shfolder.spec Added: vendor/wine/dlls/shfolder/current/shfolder_main.c _____ Added: vendor/wine/dlls/shfolder/current/Makefile.in --- vendor/wine/dlls/shfolder/current/Makefile.in 2005-10-08 19:07:39 UTC (rev 18351) +++ vendor/wine/dlls/shfolder/current/Makefile.in 2005-10-08 19:15:17 UTC (rev 18352) @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = shfolder.dll +IMPORTLIB = libshfolder.$(IMPLIBEXT) +IMPORTS = shell32 kernel32 + +C_SRCS = shfolder_main.c + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/shfolder/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/shfolder/current/shfolder.spec --- vendor/wine/dlls/shfolder/current/shfolder.spec 2005-10-08 19:07:39 UTC (rev 18351) +++ vendor/wine/dlls/shfolder/current/shfolder.spec 2005-10-08 19:15:17 UTC (rev 18352) @@ -0,0 +1,2 @@ +@ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA +@ stdcall SHGetFolderPathW(long long long long ptr) shell32.SHGetFolderPathW _____ Added: vendor/wine/dlls/shfolder/current/shfolder_main.c --- vendor/wine/dlls/shfolder/current/shfolder_main.c 2005-10-08 19:07:39 UTC (rev 18351) +++ vendor/wine/dlls/shfolder/current/shfolder_main.c 2005-10-08 19:15:17 UTC (rev 18352) @@ -0,0 +1 @@ +/* nothing here yet */ Property changes on: vendor/wine/dlls/shfolder/current/shfolder_main.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[gvg] 18351: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Alexandre Julliard <julliard(a)winehq.org> - Take into account -noname functions when checking for duplicate export names. Fixed a couple of issues found by the stricter check. - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translations. Jacek Caban <jack(a)itma.pwr.wroc.pl> - Make IPersist* interfaces heap based. - Added IWebBrowser2 stub implementation. - Make IProvideClassInfo2 interface heap based. - Make IConnectionPointContainer interface heap based. - Make WebBrowser heap based object. - Improve stubs. - Make IQuickActivate interface heap based. - Added SetClientSite implementation. - Make IOleControl and IOleInPlaceObject interface heap based. Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> - Added Finnish resources. Modified: trunk/reactos/include/wine/exdisp.h Modified: trunk/reactos/include/wine/winnt.h Added: trunk/reactos/lib/shdocvw/Bg.rc Added: trunk/reactos/lib/shdocvw/Fi.rc Added: trunk/reactos/lib/shdocvw/No.rc Modified: trunk/reactos/lib/shdocvw/Ru.rc Modified: trunk/reactos/lib/shdocvw/Sv.rc Modified: trunk/reactos/lib/shdocvw/classinfo.c Modified: trunk/reactos/lib/shdocvw/events.c Modified: trunk/reactos/lib/shdocvw/factory.c Modified: trunk/reactos/lib/shdocvw/misc.c Modified: trunk/reactos/lib/shdocvw/oleobject.c Modified: trunk/reactos/lib/shdocvw/persist.c Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw.rc Modified: trunk/reactos/lib/shdocvw/version.rc Modified: trunk/reactos/lib/shdocvw/webbrowser.c Modified: trunk/reactos/lib/uuid/uuid.c _____ Modified: trunk/reactos/include/wine/exdisp.h --- trunk/reactos/include/wine/exdisp.h 2005-10-08 18:08:17 UTC (rev 18350) +++ trunk/reactos/include/wine/exdisp.h 2005-10-08 19:07:39 UTC (rev 18351) @@ -24,13 +24,11 @@ navHyperlink = 0x40, navEnforceRestricted = 0x80 } BrowserNavConstants; - typedef enum RefreshConstants { REFRESH_NORMAL = 0, REFRESH_IFEXPIRED = 1, REFRESH_COMPLETELY = 3 } RefreshConstants; - /*********************************************************************** ****** * IWebBrowser interface */ @@ -127,6 +125,8 @@ const IWebBrowserVtbl* lpVtbl; }; struct IWebBrowserVtbl { + BEGIN_INTERFACE + /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( IWebBrowser* This, @@ -268,8 +268,10 @@ IWebBrowser* This, VARIANT_BOOL* pBool); + END_INTERFACE }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IWebBrowser_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IWebBrowser_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -305,46 +307,10 @@ #define IWebBrowser_get_LocationName(p,a) (p)->lpVtbl->get_LocationName(p,a) #define IWebBrowser_get_LocationURL(p,a) (p)->lpVtbl->get_LocationURL(p,a) #define IWebBrowser_get_Busy(p,a) (p)->lpVtbl->get_Busy(p,a) +#endif #endif -#define IWebBrowser_METHODS \ - /*** IUnknown methods ***/ \ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \ - STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ - STDMETHOD_(ULONG,Release)(THIS) PURE; \ - /*** IDispatch methods ***/ \ - STDMETHOD_(HRESULT,GetTypeInfoCount)(THIS_ UINT* pctinfo) PURE; \ - STDMETHOD_(HRESULT,GetTypeInfo)(THIS_ UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) PURE; \ - STDMETHOD_(HRESULT,GetIDsOfNames)(THIS_ REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) PURE; \ - STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) PURE; \ - /*** IWebBrowser methods ***/ \ - STDMETHOD_(HRESULT,GoBack)(THIS) PURE; \ - STDMETHOD_(HRESULT,GoForward)(THIS) PURE; \ - STDMETHOD_(HRESULT,GoHome)(THIS) PURE; \ - STDMETHOD_(HRESULT,GoSearch)(THIS) PURE; \ - STDMETHOD_(HRESULT,Navigate)(THIS_ BSTR URL, VARIANT* Flags, VARIANT* TargetFrameName, VARIANT* PostData, VARIANT* Headers) PURE; \ - STDMETHOD_(HRESULT,Refresh)(THIS) PURE; \ - STDMETHOD_(HRESULT,Refresh2)(THIS_ VARIANT* Level) PURE; \ - STDMETHOD_(HRESULT,Stop)(THIS) PURE; \ - STDMETHOD_(HRESULT,get_Application)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_Parent)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_Container)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_Document)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_TopLevelContainer)(THIS_ VARIANT_BOOL* pBool) PURE; \ - STDMETHOD_(HRESULT,get_Type)(THIS_ BSTR* Type) PURE; \ - STDMETHOD_(HRESULT,get_Left)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Left)(THIS_ long Left) PURE; \ - STDMETHOD_(HRESULT,get_Top)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Top)(THIS_ long Top) PURE; \ - STDMETHOD_(HRESULT,get_Width)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Width)(THIS_ long Width) PURE; \ - STDMETHOD_(HRESULT,get_Height)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Height)(THIS_ long Height) PURE; \ - STDMETHOD_(HRESULT,get_LocationName)(THIS_ BSTR* LocationName) PURE; \ - STDMETHOD_(HRESULT,get_LocationURL)(THIS_ BSTR* LocationURL) PURE; \ - STDMETHOD_(HRESULT,get_Busy)(THIS_ VARIANT_BOOL* pBool) PURE; - HRESULT CALLBACK IWebBrowser_GoBack_Proxy( IWebBrowser* This); void __RPC_STUB IWebBrowser_GoBack_Stub( @@ -631,6 +597,8 @@ const IWebBrowserAppVtbl* lpVtbl; }; struct IWebBrowserAppVtbl { + BEGIN_INTERFACE + /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( IWebBrowserApp* This, @@ -855,8 +823,10 @@ IWebBrowserApp* This, VARIANT_BOOL bFullScreen); + END_INTERFACE }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IWebBrowserApp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IWebBrowserApp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -913,67 +883,10 @@ #define IWebBrowserApp_put_MenuBar(p,a) (p)->lpVtbl->put_MenuBar(p,a) #define IWebBrowserApp_get_FullScreen(p,a) (p)->lpVtbl->get_FullScreen(p,a) #define IWebBrowserApp_put_FullScreen(p,a) (p)->lpVtbl->put_FullScreen(p,a) +#endif #endif -#define IWebBrowserApp_METHODS \ - /*** IUnknown methods ***/ \ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \ - STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ - STDMETHOD_(ULONG,Release)(THIS) PURE; \ - /*** IDispatch methods ***/ \ - STDMETHOD_(HRESULT,GetTypeInfoCount)(THIS_ UINT* pctinfo) PURE; \ - STDMETHOD_(HRESULT,GetTypeInfo)(THIS_ UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) PURE; \ - STDMETHOD_(HRESULT,GetIDsOfNames)(THIS_ REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) PURE; \ - STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) PURE; \ - /*** IWebBrowser methods ***/ \ - STDMETHOD_(HRESULT,GoBack)(THIS) PURE; \ - STDMETHOD_(HRESULT,GoForward)(THIS) PURE; \ - STDMETHOD_(HRESULT,GoHome)(THIS) PURE; \ - STDMETHOD_(HRESULT,GoSearch)(THIS) PURE; \ - STDMETHOD_(HRESULT,Navigate)(THIS_ BSTR URL, VARIANT* Flags, VARIANT* TargetFrameName, VARIANT* PostData, VARIANT* Headers) PURE; \ - STDMETHOD_(HRESULT,Refresh)(THIS) PURE; \ - STDMETHOD_(HRESULT,Refresh2)(THIS_ VARIANT* Level) PURE; \ - STDMETHOD_(HRESULT,Stop)(THIS) PURE; \ - STDMETHOD_(HRESULT,get_Application)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_Parent)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_Container)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_Document)(THIS_ IDispatch** ppDisp) PURE; \ - STDMETHOD_(HRESULT,get_TopLevelContainer)(THIS_ VARIANT_BOOL* pBool) PURE; \ - STDMETHOD_(HRESULT,get_Type)(THIS_ BSTR* Type) PURE; \ - STDMETHOD_(HRESULT,get_Left)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Left)(THIS_ long Left) PURE; \ - STDMETHOD_(HRESULT,get_Top)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Top)(THIS_ long Top) PURE; \ - STDMETHOD_(HRESULT,get_Width)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Width)(THIS_ long Width) PURE; \ - STDMETHOD_(HRESULT,get_Height)(THIS_ long* pl) PURE; \ - STDMETHOD_(HRESULT,put_Height)(THIS_ long Height) PURE; \ - STDMETHOD_(HRESULT,get_LocationName)(THIS_ BSTR* LocationName) PURE; \ - STDMETHOD_(HRESULT,get_LocationURL)(THIS_ BSTR* LocationURL) PURE; \ - STDMETHOD_(HRESULT,get_Busy)(THIS_ VARIANT_BOOL* pBool) PURE; \ - /*** IWebBrowserApp methods ***/ \ - STDMETHOD_(HRESULT,Quit)(THIS) PURE; \ - STDMETHOD_(HRESULT,ClientToWindow)(THIS_ int* pcx, int* pcy) PURE; \ - STDMETHOD_(HRESULT,PutProperty)(THIS_ BSTR szProperty, VARIANT vtValue) PURE; \ - STDMETHOD_(HRESULT,GetProperty)(THIS_ BSTR szProperty, VARIANT* pvtValue) PURE; \ - STDMETHOD_(HRESULT,get_Name)(THIS_ BSTR* Name) PURE; \ - STDMETHOD_(HRESULT,get_HWND)(THIS_ long* pHWND) PURE; \ - STDMETHOD_(HRESULT,get_FullName)(THIS_ BSTR* FullName) PURE; \ - STDMETHOD_(HRESULT,get_Path)(THIS_ BSTR* Path) PURE; \ - STDMETHOD_(HRESULT,get_Visible)(THIS_ VARIANT_BOOL* pBool) PURE; \ - STDMETHOD_(HRESULT,put_Visible)(THIS_ VARIANT_BOOL Value) PURE; \ - STDMETHOD_(HRESULT,get_StatusBar)(THIS_ VARIANT_BOOL* pBool) PURE; \ - STDMETHOD_(HRESULT,put_StatusBar)(THIS_ VARIANT_BOOL Value) PURE; \ - STDMETHOD_(HRESULT,get_StatusText)(THIS_ BSTR* StatusText) PURE; \ - STDMETHOD_(HRESULT,put_StatusText)(THIS_ BSTR StatusText) PURE; \ - STDMETHOD_(HRESULT,get_ToolBar)(THIS_ int* Value) PURE; \ - STDMETHOD_(HRESULT,put_ToolBar)(THIS_ int Value) PURE; \ - STDMETHOD_(HRESULT,get_MenuBar)(THIS_ VARIANT_BOOL* Value) PURE; \ - STDMETHOD_(HRESULT,put_MenuBar)(THIS_ VARIANT_BOOL Value) PURE; \ - STDMETHOD_(HRESULT,get_FullScreen)(THIS_ VARIANT_BOOL* pbFullScreen) PURE; \ - STDMETHOD_(HRESULT,put_FullScreen)(THIS_ VARIANT_BOOL bFullScreen) PURE; - HRESULT CALLBACK IWebBrowserApp_Quit_Proxy( IWebBrowserApp* This); void __RPC_STUB IWebBrowserApp_Quit_Stub( @@ -1139,7 +1052,1169 @@ #endif /* __IWebBrowserApp_INTERFACE_DEFINED__ */ -DEFINE_GUID(CLSID_WebBrowser, 0x8856f961, 0x340a, 0x11d0, 0xa9, 0x6b, 0x00, 0xc0, 0x4f, 0xd7, 0x05, 0xa2); +#ifndef __IWebBrowser2_FWD_DEFINED__ +#define __IWebBrowser2_FWD_DEFINED__ +typedef struct IWebBrowser2 IWebBrowser2; +#endif + +/********************************************************************** ******* + * IWebBrowser2 interface + */ +#ifndef __IWebBrowser2_INTERFACE_DEFINED__ +#define __IWebBrowser2_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IWebBrowser2, 0xd30c1661, 0xcdaf, 0x11d0, 0x8a,0x3e, 0x00,0xc0,0x4f,0xc9,0xe2,0x6e); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IWebBrowser2 : public IWebBrowserApp +{ + virtual HRESULT STDMETHODCALLTYPE Navigate2( + VARIANT* URL, + VARIANT* Flags, + VARIANT* TargetFrameName, + VARIANT* PostData, + VARIANT* Headers) = 0; + + virtual HRESULT STDMETHODCALLTYPE QueryStatusWB( + OLECMDID cmdID, + OLECMDF* pcmdf) = 0; + + virtual HRESULT STDMETHODCALLTYPE ExecWB( + OLECMDID cmdID, + OLECMDEXECOPT cmdexecopt, + VARIANT* pvaIn, + VARIANT* pvaOut) = 0; + + virtual HRESULT STDMETHODCALLTYPE ShowBrowserBar( + VARIANT* pvaClsid, + VARIANT* pvarShow, + VARIANT* pvarSize) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_ReadyState( + READYSTATE* plReadyState) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Offline( + VARIANT_BOOL* pbOffline) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_Offline( + VARIANT_BOOL bOffline) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Silent( + VARIANT_BOOL* pbSilent) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_Silent( + VARIANT_BOOL bSilent) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_RegisterAsBrowser( + VARIANT_BOOL* pbRegister) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_RegisterAsBrowser( + VARIANT_BOOL bRegister) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_RegisterAsDropTarget( + VARIANT_BOOL* pbRegister) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_RegisterAsDropTarget( + VARIANT_BOOL bRegister) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_TheaterMode( + VARIANT_BOOL* pbRegister) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_TheaterMode( + VARIANT_BOOL bRegister) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_AddressBar( + VARIANT_BOOL* Value) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_AddressBar( + VARIANT_BOOL Value) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Resizable( + VARIANT_BOOL* Value) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_Resizable( + VARIANT_BOOL Value) = 0; + +}; +#else +typedef struct IWebBrowser2Vtbl IWebBrowser2Vtbl; +struct IWebBrowser2 { + const IWebBrowser2Vtbl* lpVtbl; +}; +struct IWebBrowser2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IWebBrowser2* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IWebBrowser2* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IWebBrowser2* This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + IWebBrowser2* This, + UINT* pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + IWebBrowser2* This, + UINT iTInfo, + LCID lcid, + ITypeInfo** ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + IWebBrowser2* This, + REFIID riid, + LPOLESTR* rgszNames, + UINT cNames, + LCID lcid, + DISPID* rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + IWebBrowser2* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); + + /*** IWebBrowser methods ***/ + HRESULT (STDMETHODCALLTYPE *GoBack)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *GoForward)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *GoHome)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *GoSearch)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *Navigate)( + IWebBrowser2* This, + BSTR URL, + VARIANT* Flags, + VARIANT* TargetFrameName, + VARIANT* PostData, + VARIANT* Headers); + + HRESULT (STDMETHODCALLTYPE *Refresh)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *Refresh2)( + IWebBrowser2* This, + VARIANT* Level); + + HRESULT (STDMETHODCALLTYPE *Stop)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *get_Application)( + IWebBrowser2* This, + IDispatch** ppDisp); + + HRESULT (STDMETHODCALLTYPE *get_Parent)( + IWebBrowser2* This, + IDispatch** ppDisp); + + HRESULT (STDMETHODCALLTYPE *get_Container)( + IWebBrowser2* This, + IDispatch** ppDisp); + + HRESULT (STDMETHODCALLTYPE *get_Document)( + IWebBrowser2* This, + IDispatch** ppDisp); + + HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)( + IWebBrowser2* This, + VARIANT_BOOL* pBool); + + HRESULT (STDMETHODCALLTYPE *get_Type)( + IWebBrowser2* This, + BSTR* Type); + + HRESULT (STDMETHODCALLTYPE *get_Left)( + IWebBrowser2* This, + long* pl); + + HRESULT (STDMETHODCALLTYPE *put_Left)( + IWebBrowser2* This, + long Left); + + HRESULT (STDMETHODCALLTYPE *get_Top)( + IWebBrowser2* This, + long* pl); + + HRESULT (STDMETHODCALLTYPE *put_Top)( + IWebBrowser2* This, + long Top); + + HRESULT (STDMETHODCALLTYPE *get_Width)( + IWebBrowser2* This, + long* pl); + + HRESULT (STDMETHODCALLTYPE *put_Width)( + IWebBrowser2* This, + long Width); + + HRESULT (STDMETHODCALLTYPE *get_Height)( + IWebBrowser2* This, + long* pl); + + HRESULT (STDMETHODCALLTYPE *put_Height)( + IWebBrowser2* This, + long Height); + + HRESULT (STDMETHODCALLTYPE *get_LocationName)( + IWebBrowser2* This, + BSTR* LocationName); + + HRESULT (STDMETHODCALLTYPE *get_LocationURL)( + IWebBrowser2* This, + BSTR* LocationURL); + + HRESULT (STDMETHODCALLTYPE *get_Busy)( + IWebBrowser2* This, + VARIANT_BOOL* pBool); + + /*** IWebBrowserApp methods ***/ + HRESULT (STDMETHODCALLTYPE *Quit)( + IWebBrowser2* This); + + HRESULT (STDMETHODCALLTYPE *ClientToWindow)( + IWebBrowser2* This, + int* pcx, + int* pcy); + + HRESULT (STDMETHODCALLTYPE *PutProperty)( + IWebBrowser2* This, + BSTR szProperty, + VARIANT vtValue); + + HRESULT (STDMETHODCALLTYPE *GetProperty)( + IWebBrowser2* This, + BSTR szProperty, + VARIANT* pvtValue); + + HRESULT (STDMETHODCALLTYPE *get_Name)( + IWebBrowser2* This, + BSTR* Name); + + HRESULT (STDMETHODCALLTYPE *get_HWND)( + IWebBrowser2* This, + long* pHWND); + + HRESULT (STDMETHODCALLTYPE *get_FullName)( + IWebBrowser2* This, + BSTR* FullName); + + HRESULT (STDMETHODCALLTYPE *get_Path)( + IWebBrowser2* This, + BSTR* Path); + + HRESULT (STDMETHODCALLTYPE *get_Visible)( + IWebBrowser2* This, + VARIANT_BOOL* pBool); + + HRESULT (STDMETHODCALLTYPE *put_Visible)( + IWebBrowser2* This, + VARIANT_BOOL Value); + + HRESULT (STDMETHODCALLTYPE *get_StatusBar)( + IWebBrowser2* This, + VARIANT_BOOL* pBool); + + HRESULT (STDMETHODCALLTYPE *put_StatusBar)( + IWebBrowser2* This, + VARIANT_BOOL Value); + + HRESULT (STDMETHODCALLTYPE *get_StatusText)( + IWebBrowser2* This, + BSTR* StatusText); + + HRESULT (STDMETHODCALLTYPE *put_StatusText)( + IWebBrowser2* This, + BSTR StatusText); + + HRESULT (STDMETHODCALLTYPE *get_ToolBar)( + IWebBrowser2* This, + int* Value); + + HRESULT (STDMETHODCALLTYPE *put_ToolBar)( + IWebBrowser2* This, + int Value); + + HRESULT (STDMETHODCALLTYPE *get_MenuBar)( + IWebBrowser2* This, + VARIANT_BOOL* Value); + + HRESULT (STDMETHODCALLTYPE *put_MenuBar)( + IWebBrowser2* This, + VARIANT_BOOL Value); + + HRESULT (STDMETHODCALLTYPE *get_FullScreen)( + IWebBrowser2* This, + VARIANT_BOOL* pbFullScreen); + + HRESULT (STDMETHODCALLTYPE *put_FullScreen)( + IWebBrowser2* This, + VARIANT_BOOL bFullScreen); + + /*** IWebBrowser2 methods ***/ + HRESULT (STDMETHODCALLTYPE *Navigate2)( + IWebBrowser2* This, + VARIANT* URL, + VARIANT* Flags, + VARIANT* TargetFrameName, + VARIANT* PostData, + VARIANT* Headers); + + HRESULT (STDMETHODCALLTYPE *QueryStatusWB)( + IWebBrowser2* This, + OLECMDID cmdID, + OLECMDF* pcmdf); + + HRESULT (STDMETHODCALLTYPE *ExecWB)( + IWebBrowser2* This, + OLECMDID cmdID, + OLECMDEXECOPT cmdexecopt, + VARIANT* pvaIn, + VARIANT* pvaOut); + + HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( + IWebBrowser2* This, + VARIANT* pvaClsid, + VARIANT* pvarShow, + VARIANT* pvarSize); + + HRESULT (STDMETHODCALLTYPE *get_ReadyState)( + IWebBrowser2* This, + READYSTATE* plReadyState); + + HRESULT (STDMETHODCALLTYPE *get_Offline)( + IWebBrowser2* This, + VARIANT_BOOL* pbOffline); + + HRESULT (STDMETHODCALLTYPE *put_Offline)( + IWebBrowser2* This, + VARIANT_BOOL bOffline); + + HRESULT (STDMETHODCALLTYPE *get_Silent)( + IWebBrowser2* This, + VARIANT_BOOL* pbSilent); + + HRESULT (STDMETHODCALLTYPE *put_Silent)( + IWebBrowser2* This, + VARIANT_BOOL bSilent); + + HRESULT (STDMETHODCALLTYPE *get_RegisterAsBrowser)( + IWebBrowser2* This, + VARIANT_BOOL* pbRegister); + + HRESULT (STDMETHODCALLTYPE *put_RegisterAsBrowser)( + IWebBrowser2* This, + VARIANT_BOOL bRegister); + + HRESULT (STDMETHODCALLTYPE *get_RegisterAsDropTarget)( + IWebBrowser2* This, + VARIANT_BOOL* pbRegister); + + HRESULT (STDMETHODCALLTYPE *put_RegisterAsDropTarget)( + IWebBrowser2* This, + VARIANT_BOOL bRegister); + + HRESULT (STDMETHODCALLTYPE *get_TheaterMode)( + IWebBrowser2* This, + VARIANT_BOOL* pbRegister); + + HRESULT (STDMETHODCALLTYPE *put_TheaterMode)( + IWebBrowser2* This, + VARIANT_BOOL bRegister); + + HRESULT (STDMETHODCALLTYPE *get_AddressBar)( + IWebBrowser2* This, + VARIANT_BOOL* Value); + + HRESULT (STDMETHODCALLTYPE *put_AddressBar)( + IWebBrowser2* This, + VARIANT_BOOL Value); + + HRESULT (STDMETHODCALLTYPE *get_Resizable)( + IWebBrowser2* This, + VARIANT_BOOL* Value); + + HRESULT (STDMETHODCALLTYPE *put_Resizable)( + IWebBrowser2* This, + VARIANT_BOOL Value); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IWebBrowser2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IWebBrowser2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IWebBrowser2_Release(p) (p)->lpVtbl->Release(p) +/*** IDispatch methods ***/ +#define IWebBrowser2_GetTypeInfoCount(p,a) (p)->lpVtbl->GetTypeInfoCount(p,a) +#define IWebBrowser2_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) +#define IWebBrowser2_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) +#define IWebBrowser2_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +/*** IWebBrowser methods ***/ +#define IWebBrowser2_GoBack(p) (p)->lpVtbl->GoBack(p) +#define IWebBrowser2_GoForward(p) (p)->lpVtbl->GoForward(p) +#define IWebBrowser2_GoHome(p) (p)->lpVtbl->GoHome(p) +#define IWebBrowser2_GoSearch(p) (p)->lpVtbl->GoSearch(p) +#define IWebBrowser2_Navigate(p,a,b,c,d,e) (p)->lpVtbl->Navigate(p,a,b,c,d,e) +#define IWebBrowser2_Refresh(p) (p)->lpVtbl->Refresh(p) +#define IWebBrowser2_Refresh2(p,a) (p)->lpVtbl->Refresh2(p,a) +#define IWebBrowser2_Stop(p) (p)->lpVtbl->Stop(p) +#define IWebBrowser2_get_Application(p,a) (p)->lpVtbl->get_Application(p,a) +#define IWebBrowser2_get_Parent(p,a) (p)->lpVtbl->get_Parent(p,a) +#define IWebBrowser2_get_Container(p,a) (p)->lpVtbl->get_Container(p,a) +#define IWebBrowser2_get_Document(p,a) (p)->lpVtbl->get_Document(p,a) +#define IWebBrowser2_get_TopLevelContainer(p,a) (p)->lpVtbl->get_TopLevelContainer(p,a) +#define IWebBrowser2_get_Type(p,a) (p)->lpVtbl->get_Type(p,a) +#define IWebBrowser2_get_Left(p,a) (p)->lpVtbl->get_Left(p,a) +#define IWebBrowser2_put_Left(p,a) (p)->lpVtbl->put_Left(p,a) +#define IWebBrowser2_get_Top(p,a) (p)->lpVtbl->get_Top(p,a) +#define IWebBrowser2_put_Top(p,a) (p)->lpVtbl->put_Top(p,a) +#define IWebBrowser2_get_Width(p,a) (p)->lpVtbl->get_Width(p,a) +#define IWebBrowser2_put_Width(p,a) (p)->lpVtbl->put_Width(p,a) +#define IWebBrowser2_get_Height(p,a) (p)->lpVtbl->get_Height(p,a) +#define IWebBrowser2_put_Height(p,a) (p)->lpVtbl->put_Height(p,a) +#define IWebBrowser2_get_LocationName(p,a) (p)->lpVtbl->get_LocationName(p,a) +#define IWebBrowser2_get_LocationURL(p,a) (p)->lpVtbl->get_LocationURL(p,a) +#define IWebBrowser2_get_Busy(p,a) (p)->lpVtbl->get_Busy(p,a) +/*** IWebBrowserApp methods ***/ +#define IWebBrowser2_Quit(p) (p)->lpVtbl->Quit(p) +#define IWebBrowser2_ClientToWindow(p,a,b) (p)->lpVtbl->ClientToWindow(p,a,b) +#define IWebBrowser2_PutProperty(p,a,b) (p)->lpVtbl->PutProperty(p,a,b) +#define IWebBrowser2_GetProperty(p,a,b) (p)->lpVtbl->GetProperty(p,a,b) +#define IWebBrowser2_get_Name(p,a) (p)->lpVtbl->get_Name(p,a) +#define IWebBrowser2_get_HWND(p,a) (p)->lpVtbl->get_HWND(p,a) +#define IWebBrowser2_get_FullName(p,a) (p)->lpVtbl->get_FullName(p,a) +#define IWebBrowser2_get_Path(p,a) (p)->lpVtbl->get_Path(p,a) +#define IWebBrowser2_get_Visible(p,a) (p)->lpVtbl->get_Visible(p,a) +#define IWebBrowser2_put_Visible(p,a) (p)->lpVtbl->put_Visible(p,a) +#define IWebBrowser2_get_StatusBar(p,a) (p)->lpVtbl->get_StatusBar(p,a) +#define IWebBrowser2_put_StatusBar(p,a) (p)->lpVtbl->put_StatusBar(p,a) +#define IWebBrowser2_get_StatusText(p,a) (p)->lpVtbl->get_StatusText(p,a) +#define IWebBrowser2_put_StatusText(p,a) (p)->lpVtbl->put_StatusText(p,a) +#define IWebBrowser2_get_ToolBar(p,a) (p)->lpVtbl->get_ToolBar(p,a) +#define IWebBrowser2_put_ToolBar(p,a) (p)->lpVtbl->put_ToolBar(p,a) +#define IWebBrowser2_get_MenuBar(p,a) (p)->lpVtbl->get_MenuBar(p,a) +#define IWebBrowser2_put_MenuBar(p,a) (p)->lpVtbl->put_MenuBar(p,a) +#define IWebBrowser2_get_FullScreen(p,a) (p)->lpVtbl->get_FullScreen(p,a) +#define IWebBrowser2_put_FullScreen(p,a) (p)->lpVtbl->put_FullScreen(p,a) +/*** IWebBrowser2 methods ***/ +#define IWebBrowser2_Navigate2(p,a,b,c,d,e) (p)->lpVtbl->Navigate2(p,a,b,c,d,e) +#define IWebBrowser2_QueryStatusWB(p,a,b) (p)->lpVtbl->QueryStatusWB(p,a,b) +#define IWebBrowser2_ExecWB(p,a,b,c,d) (p)->lpVtbl->ExecWB(p,a,b,c,d) +#define IWebBrowser2_ShowBrowserBar(p,a,b,c) (p)->lpVtbl->ShowBrowserBar(p,a,b,c) +#define IWebBrowser2_get_ReadyState(p,a) (p)->lpVtbl->get_ReadyState(p,a) +#define IWebBrowser2_get_Offline(p,a) (p)->lpVtbl->get_Offline(p,a) +#define IWebBrowser2_put_Offline(p,a) (p)->lpVtbl->put_Offline(p,a) +#define IWebBrowser2_get_Silent(p,a) (p)->lpVtbl->get_Silent(p,a) +#define IWebBrowser2_put_Silent(p,a) (p)->lpVtbl->put_Silent(p,a) +#define IWebBrowser2_get_RegisterAsBrowser(p,a) (p)->lpVtbl->get_RegisterAsBrowser(p,a) +#define IWebBrowser2_put_RegisterAsBrowser(p,a) (p)->lpVtbl->put_RegisterAsBrowser(p,a) +#define IWebBrowser2_get_RegisterAsDropTarget(p,a) (p)->lpVtbl->get_RegisterAsDropTarget(p,a) +#define IWebBrowser2_put_RegisterAsDropTarget(p,a) (p)->lpVtbl->put_RegisterAsDropTarget(p,a) +#define IWebBrowser2_get_TheaterMode(p,a) (p)->lpVtbl->get_TheaterMode(p,a) +#define IWebBrowser2_put_TheaterMode(p,a) (p)->lpVtbl->put_TheaterMode(p,a) +#define IWebBrowser2_get_AddressBar(p,a) (p)->lpVtbl->get_AddressBar(p,a) +#define IWebBrowser2_put_AddressBar(p,a) (p)->lpVtbl->put_AddressBar(p,a) +#define IWebBrowser2_get_Resizable(p,a) (p)->lpVtbl->get_Resizable(p,a) +#define IWebBrowser2_put_Resizable(p,a) (p)->lpVtbl->put_Resizable(p,a) +#endif + +#endif + +HRESULT CALLBACK IWebBrowser2_Navigate2_Proxy( + IWebBrowser2* This, + VARIANT* URL, + VARIANT* Flags, + VARIANT* TargetFrameName, + VARIANT* PostData, + VARIANT* Headers); +void __RPC_STUB IWebBrowser2_Navigate2_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_QueryStatusWB_Proxy( + IWebBrowser2* This, + OLECMDID cmdID, + OLECMDF* pcmdf); +void __RPC_STUB IWebBrowser2_QueryStatusWB_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_ExecWB_Proxy( + IWebBrowser2* This, + OLECMDID cmdID, + OLECMDEXECOPT cmdexecopt, + VARIANT* pvaIn, + VARIANT* pvaOut); +void __RPC_STUB IWebBrowser2_ExecWB_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_ShowBrowserBar_Proxy( + IWebBrowser2* This, + VARIANT* pvaClsid, + VARIANT* pvarShow, + VARIANT* pvarSize); +void __RPC_STUB IWebBrowser2_ShowBrowserBar_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_ReadyState_Proxy( + IWebBrowser2* This, + READYSTATE* plReadyState); +void __RPC_STUB IWebBrowser2_get_ReadyState_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_Offline_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* pbOffline); +void __RPC_STUB IWebBrowser2_get_Offline_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_Offline_Proxy( + IWebBrowser2* This, + VARIANT_BOOL bOffline); +void __RPC_STUB IWebBrowser2_put_Offline_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_Silent_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* pbSilent); +void __RPC_STUB IWebBrowser2_get_Silent_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_Silent_Proxy( + IWebBrowser2* This, + VARIANT_BOOL bSilent); +void __RPC_STUB IWebBrowser2_put_Silent_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_RegisterAsBrowser_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* pbRegister); +void __RPC_STUB IWebBrowser2_get_RegisterAsBrowser_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_RegisterAsBrowser_Proxy( + IWebBrowser2* This, + VARIANT_BOOL bRegister); +void __RPC_STUB IWebBrowser2_put_RegisterAsBrowser_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_RegisterAsDropTarget_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* pbRegister); +void __RPC_STUB IWebBrowser2_get_RegisterAsDropTarget_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_RegisterAsDropTarget_Proxy( + IWebBrowser2* This, + VARIANT_BOOL bRegister); +void __RPC_STUB IWebBrowser2_put_RegisterAsDropTarget_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_TheaterMode_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* pbRegister); +void __RPC_STUB IWebBrowser2_get_TheaterMode_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_TheaterMode_Proxy( + IWebBrowser2* This, + VARIANT_BOOL bRegister); +void __RPC_STUB IWebBrowser2_put_TheaterMode_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_AddressBar_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* Value); +void __RPC_STUB IWebBrowser2_get_AddressBar_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_AddressBar_Proxy( + IWebBrowser2* This, + VARIANT_BOOL Value); +void __RPC_STUB IWebBrowser2_put_AddressBar_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_get_Resizable_Proxy( + IWebBrowser2* This, + VARIANT_BOOL* Value); +void __RPC_STUB IWebBrowser2_get_Resizable_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IWebBrowser2_put_Resizable_Proxy( + IWebBrowser2* This, + VARIANT_BOOL Value); +void __RPC_STUB IWebBrowser2_put_Resizable_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IWebBrowser2_INTERFACE_DEFINED__ */ + +#ifndef __DWebBrowserEvents_FWD_DEFINED__ +#define __DWebBrowserEvents_FWD_DEFINED__ +typedef struct DWebBrowserEvents DWebBrowserEvents; +#endif + +/********************************************************************** ******* + * DWebBrowserEvents dispinterface + */ +#ifndef __DWebBrowserEvents_DISPINTERFACE_DEFINED__ +#define __DWebBrowserEvents_DISPINTERFACE_DEFINED__ + +DEFINE_GUID(DIID_DWebBrowserEvents, 0xeab22ac2, 0x30c1, 0x11cf, 0xa7,0xeb, 0x00,0x00,0xc0,0x5b,0xae,0x0b); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct DWebBrowserEvents : public IDispatch +{ +}; +#else +typedef struct DWebBrowserEventsVtbl DWebBrowserEventsVtbl; +struct DWebBrowserEvents { + const DWebBrowserEventsVtbl* lpVtbl; +}; +struct DWebBrowserEventsVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + DWebBrowserEvents* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + DWebBrowserEvents* This); + + ULONG (STDMETHODCALLTYPE *Release)( + DWebBrowserEvents* This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + DWebBrowserEvents* This, + UINT* pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + DWebBrowserEvents* This, + UINT iTInfo, + LCID lcid, + ITypeInfo** ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + DWebBrowserEvents* This, + REFIID riid, + LPOLESTR* rgszNames, + UINT cNames, + LCID lcid, + DISPID* rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + DWebBrowserEvents* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define DWebBrowserEvents_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define DWebBrowserEvents_AddRef(p) (p)->lpVtbl->AddRef(p) +#define DWebBrowserEvents_Release(p) (p)->lpVtbl->Release(p) +/*** IDispatch methods ***/ +#define DWebBrowserEvents_GetTypeInfoCount(p,a) (p)->lpVtbl->GetTypeInfoCount(p,a) +#define DWebBrowserEvents_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) +#define DWebBrowserEvents_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) +#define DWebBrowserEvents_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +#endif + +#endif + +#endif /* __DWebBrowserEvents_DISPINTERFACE_DEFINED__ */ + +#ifndef __DWebBrowserEvents2_FWD_DEFINED__ +#define __DWebBrowserEvents2_FWD_DEFINED__ +typedef struct DWebBrowserEvents2 DWebBrowserEvents2; +#endif + +/********************************************************************** ******* + * DWebBrowserEvents2 dispinterface + */ +#ifndef __DWebBrowserEvents2_DISPINTERFACE_DEFINED__ +#define __DWebBrowserEvents2_DISPINTERFACE_DEFINED__ + +DEFINE_GUID(DIID_DWebBrowserEvents2, 0x34a715a0, 0x6587, 0x11d0, 0x92,0x4a, 0x00,0x20,0xaf,0xc7,0xac,0x4d); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct DWebBrowserEvents2 : public IDispatch +{ +}; +#else +typedef struct DWebBrowserEvents2Vtbl DWebBrowserEvents2Vtbl; +struct DWebBrowserEvents2 { + const DWebBrowserEvents2Vtbl* lpVtbl; +}; +struct DWebBrowserEvents2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + DWebBrowserEvents2* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + DWebBrowserEvents2* This); + + ULONG (STDMETHODCALLTYPE *Release)( + DWebBrowserEvents2* This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + DWebBrowserEvents2* This, + UINT* pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + DWebBrowserEvents2* This, + UINT iTInfo, + LCID lcid, + ITypeInfo** ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + DWebBrowserEvents2* This, + REFIID riid, + LPOLESTR* rgszNames, + UINT cNames, + LCID lcid, + DISPID* rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + DWebBrowserEvents2* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define DWebBrowserEvents2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define DWebBrowserEvents2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define DWebBrowserEvents2_Release(p) (p)->lpVtbl->Release(p) +/*** IDispatch methods ***/ +#define DWebBrowserEvents2_GetTypeInfoCount(p,a) (p)->lpVtbl->GetTypeInfoCount(p,a) +#define DWebBrowserEvents2_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) +#define DWebBrowserEvents2_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) +#define DWebBrowserEvents2_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +#endif + +#endif + +#endif /* __DWebBrowserEvents2_DISPINTERFACE_DEFINED__ */ [truncated at 1000 lines; 3330 more skipped]

1 0

[turner] 18350: Bring it up to date.
by turner＠svn.reactos.com 08 Oct '05

08 Oct '05

Bring it up to date. Modified: trunk/reactos/subsys/system/cmd/todo.txt _____ Modified: trunk/reactos/subsys/system/cmd/todo.txt --- trunk/reactos/subsys/system/cmd/todo.txt 2005-10-08 18:07:45 UTC (rev 18349) +++ trunk/reactos/subsys/system/cmd/todo.txt 2005-10-08 18:08:17 UTC (rev 18350) @@ -1,14 +1,33 @@ Things to do ~~~~~~~~~~~~ -Fix bugs :) +*Implmenet Set /P +This is pretty straight forward. When doing this make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5". -Optimize the code! For size and speed. There are numerous places -where the code is hardly optimal for either. +*Compile as unicode +Not sure what is wrong with it, put probably more then just one thing blocking this. For sure pipes break when it is compiled as unicode. -^S and ^Q to pause/resume displays. +*Move.c code clean up +It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isnt a bug anymore. -Improve DEL, COPY and MOVE commands. +*If rewrite +It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. -Add wildcard support to REN. +*Decrease Size +MS cmd is 380 kb, and ROS DBG=0 cmd is 404kb! We need to cut down. I think the best way to do this is push a lot of repeated code into misc.c. This is mostly my fault for copying code to all different commands. And i will try to fix this when i get time. -And many, many more... +*Remove Hardcoded buffers +This is mostly done thanks to Greatlord(cmd.c is the hardest spot that is left). ANytime when you are handling a string that is taken from the commandline there should be no limit to the size. + +*Implment & and && +& runs two commands no matter what. +&& runs the 2nd command only if the first was a success +Not sure where to put this code even + +*mkdir needs recurvisly create folders +When doing "mkdir c:\windows\foo\bar\foofoo" where foo, bar, and foofoo are not folders, it will create all the folders to that a vaild path + +*Correct Error checking +A lot of commands on failure just spit out GetLastError instead of looking for the real cause. It should give a better output to give at least some kinda clue what is wrong. + +*Reg Testing +We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. \ No newline at end of file

1 0

[turner] 18349: DisplayBuffer is only used when DBG=1
by turner＠svn.reactos.com 08 Oct '05

08 Oct '05

DisplayBuffer is only used when DBG=1 Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-10-08 17:41:41 UTC (rev 18348) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-10-08 18:07:45 UTC (rev 18349) @@ -104,7 +104,7 @@ LARGE_INTEGER TicksPerUs; /* Ticks per microsecond */ BOOL UsePerformanceCounter; - +#ifdef DBG /* Display the contents of a buffer */ static VOID DisplayBuffer( PVOID Buffer, @@ -123,6 +123,7 @@ printf("%02X ", (p[i]) & 0xFF); } } +#endif /* DBG */ /* Display usage information on screen */ static VOID Usage(VOID)

1 0

[gvg] 18348: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Don't clone pidlLast in SHBindToParent. - Pass correct pointer to SHFree in case of failure in UNIXFS_path_to_pidl. - Return E_FAIL if we can't get the unix path in IPersistFolder3::InitializeEx. - Return E_NOAGGREGATION if non-NULL pUnkOuter is given to the constructor. Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .spec.c files. - Generate 16-bit spec files as assembly code too. - Use a more portable scheme for storing the name of a critical section. - Removed unused debug channels. - Specify 64-bit integers as double instead of long long in spec files so that we get the correct number of arguments. - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Kevin Koltzau <kevin(a)plop.org> - Fix warnings in 64bit. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Stop using a not initialized variable szTemp in _dbg_ILSimpleGetText, make _dbg_ILSimpleGetText return no value since nobody is using it. - Stop dereferencing a possible NULL in pdump since _dbg_ILGetDataPointer can potentially return NULL (for instance for root or desktop pidl). - Make shdebugstr_guid use standard wine_dbg_sprintf instead of the handmade solution. - Translate file name from unix to ANSI encoding in UnixFolder_IShellFolder2_GetDisplayNameOf. - Pass a locally modified version of SHELLEXECUTEINFO to IShellExecuteHookW_Execute, this should pass through at least sei_tmp.nShow retrieved from an .lnk file (fStartup). Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translation of comctl32 and shell32. Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> - Update Finnish resources. Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/changenotify.c Modified: trunk/reactos/lib/shell32/control.c Modified: trunk/reactos/lib/shell32/dde.c Modified: trunk/reactos/lib/shell32/debughlp.c Modified: trunk/reactos/lib/shell32/iconcache.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/shell.c Modified: trunk/reactos/lib/shell32/shell32.spec Added: trunk/reactos/lib/shell32/shell32_Bg.rc Modified: trunk/reactos/lib/shell32/shell32_Fi.rc Modified: trunk/reactos/lib/shell32/shell32_No.rc Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellord.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlmenu.c Modified: trunk/reactos/lib/shell32/shres.rc Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/Makefile.in 2005-10-08 17:41:41 UTC (rev 18348) @@ -81,8 +81,8 @@ version16.res: version16.rc $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc -shell.spec.c: shell.spec version16.res - $(WINEBUILD) $(DEFS) $(DLLFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec +shell.spec.o: shell.spec version16.res + $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -316,7 +316,7 @@ HRESULT hr; HWND hwnd = GetParent( info->hwndTreeView ); - TRACE("%p %p %x %p\n",lpsf, pidl, (INT)hParent, lpe); + TRACE("%p %p %p %p\n",lpsf, pidl, hParent, lpe); /* No IEnumIDList -> No children */ if (!lpe) return; _____ Modified: trunk/reactos/lib/shell32/changenotify.c --- trunk/reactos/lib/shell32/changenotify.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/changenotify.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -36,7 +36,7 @@ { 0, 0, &SHELL32_ChangenotifyCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": SHELL32_ChangenotifyCS") } + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_ChangenotifyCS") } }; static CRITICAL_SECTION SHELL32_ChangenotifyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; _____ Modified: trunk/reactos/lib/shell32/control.c --- trunk/reactos/lib/shell32/control.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/control.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -153,7 +153,7 @@ { CPanel* panel = (CPanel*)cs->lpCreateParams; - SetWindowLongA(hWnd, 0, (LPARAM)panel); + SetWindowLongPtrA(hWnd, 0, (LONG_PTR)panel); panel->status = 0; panel->hWnd = hWnd; } @@ -244,7 +244,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { - CPanel* panel = (CPanel*)GetWindowLongA(hWnd, 0); + CPanel* panel = (CPanel*)GetWindowLongPtrA(hWnd, 0); if (panel || wMsg == WM_CREATE) { switch (wMsg) { _____ Modified: trunk/reactos/lib/shell32/dde.c --- trunk/reactos/lib/shell32/dde.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/dde.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -104,16 +104,16 @@ switch (uType) { case XTYP_CONNECT: - return (HDDEDATA)Dde_OnConnect(hsz1, hsz2); + return (HDDEDATA)(DWORD_PTR)Dde_OnConnect(hsz1, hsz2); case XTYP_CONNECT_CONFIRM: Dde_OnConnectConfirm(hconv, hsz1, hsz2); return NULL; case XTYP_WILDCONNECT: - return (HDDEDATA)Dde_OnWildConnect(hsz1, hsz2); + return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); case XTYP_REQUEST: return (HDDEDATA)Dde_OnRequest(uFmt, hconv, hsz1, hsz2); case XTYP_EXECUTE: - return (HDDEDATA)Dde_OnExecute(hconv, hsz1, hdata); + return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); case XTYP_DISCONNECT: Dde_OnDisconnect(hconv); return NULL; _____ Modified: trunk/reactos/lib/shell32/debughlp.c --- trunk/reactos/lib/shell32/debughlp.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/debughlp.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -144,14 +144,12 @@ } static -DWORD _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) +void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { - DWORD dwReturn=0; LPSTR szSrc; GUID const * riid; - char szTemp[MAX_PATH]; - if (!pidl) return 0; + if (!pidl) return; if (szOut) *szOut = 0; @@ -160,13 +158,11 @@ { /* desktop */ if (szOut) lstrcpynA(szOut, "Desktop", uOutSize); - dwReturn = strlen ("Desktop"); } else if (( szSrc = _dbg_ILGetTextPointer(pidl) )) { /* filesystem */ if (szOut) lstrcpynA(szOut, szSrc, uOutSize); - dwReturn = strlen(szSrc); } else if (( riid = _dbg_ILGetGUIDPointer(pidl) )) { @@ -175,9 +171,7 @@ riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - dwReturn = strlen (szTemp); } - return dwReturn; } @@ -202,17 +196,18 @@ { DWORD dwAttrib = 0; LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); - DWORD type = pData->type; + DWORD type = pData ? pData->type : 0; LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); char szName[MAX_PATH]; _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); - if( PT_FOLDER == type || PT_VALUE == type) + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) dwAttrib = pData->u.file.uFileAttribs; - MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=\"%s\" (%s,%s)\n", - pidltemp, pidltemp->mkid.cb,type,dwAttrib,szName,debugstr_a(szLongName), debugstr_a(szShortName)); + MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); pidltemp = _dbg_ILGetNext(pidltemp); @@ -290,11 +285,7 @@ return TRUE; } -static char shdebugstr_buf1[100]; -static char shdebugstr_buf2[100]; -static char * shdebugstr_buf = shdebugstr_buf1; - -static struct { +static const struct { REFIID riid; const char *name; } InterfaceDesc[] = { @@ -328,11 +319,8 @@ const char* name = NULL; char clsidbuf[100]; - shdebugstr_buf = (shdebugstr_buf == shdebugstr_buf1) ? shdebugstr_buf2 : shdebugstr_buf1; + if (!id) return "(null)"; - if (!id) { - strcpy (shdebugstr_buf, "(null)"); - } else { for (i=0;InterfaceDesc[i].riid && !name;i++) { if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; } @@ -341,10 +329,8 @@ name = clsidbuf; } - sprintf( shdebugstr_buf, "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", + return wine_dbg_sprintf( "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" ); - } - return shdebugstr_buf; } _____ Modified: trunk/reactos/lib/shell32/iconcache.c --- trunk/reactos/lib/shell32/iconcache.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/iconcache.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -67,7 +67,7 @@ { 0, 0, &SHELL32_SicCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": SHELL32_SicCS") } + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_SicCS") } }; static CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 }; _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/pidl.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -1278,55 +1278,41 @@ */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) { - IShellFolder * psf; - LPITEMIDLIST pidlChild, pidlParent; + IShellFolder * psfDesktop; HRESULT hr=E_FAIL; TRACE_(shell)("pidl=%p\n", pidl); pdump(pidl); - + + if (!pidl || !ppv) + return E_INVALIDARG; + *ppv = NULL; if (ppidlLast) *ppidlLast = NULL; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + if (_ILIsPidlSimple(pidl)) { - IShellFolder* desktop; - /* we are on desktop level */ - hr = SHGetDesktopFolder(&desktop); - - if (SUCCEEDED(hr)) - { - hr = IShellFolder_QueryInterface(desktop, riid, ppv); - - if (SUCCEEDED(hr) && ppidlLast) - *ppidlLast = ILClone(pidl); - - IShellFolder_Release(desktop); - } + hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv); } else { - pidlChild = ILClone(ILFindLastID(pidl)); - pidlParent = ILClone(pidl); + LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); - - hr = SHGetDesktopFolder(&psf); - - if (SUCCEEDED(hr)) - hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); - - if (SUCCEEDED(hr) && ppidlLast) - *ppidlLast = pidlChild; - else - ILFree (pidlChild); - + hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv); SHFree (pidlParent); - if (psf) - IShellFolder_Release(psf); } + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } _____ Modified: trunk/reactos/lib/shell32/shell.c --- trunk/reactos/lib/shell32/shell.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -51,7 +51,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); -WINE_DECLARE_DEBUG_CHANNEL(exec); typedef struct { /* structure for dropped files */ _____ Modified: trunk/reactos/lib/shell32/shell32.spec --- trunk/reactos/lib/shell32/shell32.spec 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32.spec 2005-10-08 17:41:41 UTC (rev 18348) @@ -120,9 +120,9 @@ 127 stdcall -noname SHWinHelp(long long long long) 129 stdcall -noname DAD_AutoScroll(long ptr ptr) 130 stdcall -noname DAD_DragEnter(long) - 131 stdcall -noname DAD_DragEnterEx(long long long) + 131 stdcall -noname DAD_DragEnterEx(long double) 132 stdcall -noname DAD_DragLeave() - 134 stdcall -noname DAD_DragMove(long long) + 134 stdcall -noname DAD_DragMove(double) 136 stdcall -noname DAD_SetDragImage(long long) 137 stdcall -noname DAD_ShowDragImage(long) 139 stub Desktop_UpdateBriefcaseOnEvent _____ Copied: trunk/reactos/lib/shell32/shell32_Bg.rc (from rev 18347, vendor/wine/dlls/shell32/current/shell32_Bg.rc) Property changes on: trunk/reactos/lib/shell32/shell32_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shell32/shell32_Fi.rc --- trunk/reactos/lib/shell32/shell32_Fi.rc 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32_Fi.rc 2005-10-08 17:41:41 UTC (rev 18348) @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 Kimmo Myllyvirta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,9 +18,95 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Nõkymõ" + BEGIN + MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "&Jõrjestõ Kuvakkeet" + BEGIN + MENUITEM "&Nimen mukaan", 0x30 /* column 0 */ + MENUITEM "&Tyypin mukaan", 0x32 /* column 2 */ + MENUITEM "&Koon mukaan", 0x31 /* ... */ + MENUITEM "&Põivõmõõrõn mukaan", 0x33 + MENUITEM SEPARATOR + MENUITEM "Jõrjestõ &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Jõrjestõ kuvakkeet riviin", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Põivitõ", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Liitõ", FCIDM_SHVIEW_INSERT + MENUITEM "Liitõ Linkiksi", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Uusi" + BEGIN + MENUITEM "Uusi &Kansio", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Uusi &Linkki", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Selaa", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Avaa", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&Leikkaa", FCIDM_SHVIEW_CUT + MENUITEM "&Kopioi", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Lu&o Linkki", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Poista", FCIDM_SHVIEW_DELETE + MENUITEM "&Nimeõ Uudelleen", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Ominaisuudet", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Valitse Kansio" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Tietoja: %s" +CAPTION "Tietoja %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP @@ -28,7 +114,7 @@ ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS:n tekijõt:", 98, 8, 55, 137, 10 + LTEXT "ReactOS:n toi Sinulle:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +123,82 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Peruuta", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Selaa...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Tiedosto" + IDS_SHV_COLUMN2 "Koko" + IDS_SHV_COLUMN3 "Tyyppi" + IDS_SHV_COLUMN4 "Muokattu" + IDS_SHV_COLUMN5 "Ominaisuudet" + IDS_SHV_COLUMN6 "Koko" + IDS_SHV_COLUMN7 "Tilaa jõljellõ" + IDS_SHV_COLUMN8 "Nimi" + IDS_SHV_COLUMN9 "Kommentit" + IDS_SHV_COLUMN10 "Omistaja" + IDS_SHV_COLUMN11 "Ryhmõ" + + /* special folders */ + IDS_DESKTOP "Ty÷p÷ytõ" + IDS_MYCOMPUTER "Oma Tietokone" + + /* context menus */ + IDS_VIEW_LARGE "&Suuret Kuvakkeet" + IDS_VIEW_SMALL "&Pienet Kuvakkeet" + IDS_VIEW_LIST "&Lista" + IDS_VIEW_DETAILS "&Tiedot" + IDS_SELECT "Valitse" + IDS_OPEN "Avaa" + + IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivõt riitõ." + IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" + IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" + IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" + IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" + IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota nõmõ %1?" + IDS_OVERWRITEFILE_TEXT "Ylikirjoita tiedosto %1?" + IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" + + /* message box strings */ + IDS_RESTART_TITLE "Kõynnistõ uudestaan" + IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkõynnistõmistõ?" + IDS_SHUTDOWN_TITLE "Sammuta" + IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + + /* shell folder path default values */ + IDS_PROGRAMS "Kõynnistõ\\Ohjelmat" + IDS_PERSONAL "Omat tiedostot" + IDS_FAVORITES "Suosikit" + IDS_STARTUP "Kõynnistõ\\Ohjelmat\\Kõynnistys" + IDS_RECENT "?skettõin kõytetyt" + IDS_SENDTO "Lõhetõ" + IDS_STARTMENU "Kõynnistõ" + IDS_MYMUSIC "Omat tiedostot\\Omat musiikkitiedostot" + IDS_MYVIDEO "Omat tiedostot\\Omat videotiedostot" + IDS_DESKTOPDIRECTORY "Ty÷p÷ytõ" + IDS_NETHOOD "Verkkoympõrist÷" + IDS_TEMPLATES "Mallit" + IDS_APPDATA "Ohjelmien Tiedot" + IDS_PRINTHOOD "Tulostinympõrist÷" + IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" + IDS_INTERNET_CACHE "Võliaikaiset Internet-tiedostot" + IDS_COOKIES "Evõsteet" + IDS_HISTORY "Historia" + IDS_PROGRAM_FILES "Ohjelmat" + IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" + IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" + IDS_COMMON_DOCUMENTS "Dokumentit" + IDS_ADMINTOOLS "Kõynnistys\\Ohjauspaneeli\\Administrative Tools" + IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" + IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" + IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" + IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shell32_No.rc --- trunk/reactos/lib/shell32/shell32_No.rc 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32_No.rc 2005-10-08 17:41:41 UTC (rev 18348) @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,94 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "&SmÕ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Vis" + BEGIN + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mÕ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Ordne &ikoner" + BEGIN + MENUITEM "Etter &navn", 0x30 /* column 0 */ + MENUITEM "Etter &type", 0x32 /* column 2 */ + MENUITEM "Etter &st°rrelse", 0x31 /* ... */ + MENUITEM "Etter &dato", 0x33 + MENUITEM SEPARATOR + MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Still opp ikoner", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Oppdater", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT + MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Ny" + BEGIN + MENUITEM "Ny &mappe", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Ny &snarvei", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Utforsk", FCIDM_SHVIEW_EXPLORE + MENUITEM "&?pne", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT + MENUITEM "&Kopier", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "&Opprett snarvei", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Slett", FCIDM_SHVIEW_DELETE + MENUITEM "&Gi nytt navn", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "Egenska&per", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Bla etter mappe" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" @@ -28,7 +114,7 @@ ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + LTEXT "ReactOS er laget av", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +123,82 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Skriv inn navnet pÕ programmet, mappen, dokumentet etter Internett-ressursen du °nsker Õ Õpne.", 12289, 36, 11, 182, 18 + LTEXT "&?pne:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bla . . .", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Fil" + IDS_SHV_COLUMN2 "St°rrelse" + IDS_SHV_COLUMN3 "Type" + IDS_SHV_COLUMN4 "Endret" + IDS_SHV_COLUMN5 "Egenskaper" + IDS_SHV_COLUMN6 "St°rrelse" + IDS_SHV_COLUMN7 "Ledig plass" + IDS_SHV_COLUMN8 "Navn" + IDS_SHV_COLUMN9 "Kommentarer" + IDS_SHV_COLUMN10 "Eier" + IDS_SHV_COLUMN11 "Gruppe" + + /* special folders */ + IDS_DESKTOP "Skrivebord" + IDS_MYCOMPUTER "Min datamaskin" + + /* context menus */ + IDS_VIEW_LARGE "&Store ikoner" + IDS_VIEW_SMALL "S&mÕ ikoner" + IDS_VIEW_LIST "&Liste" + IDS_VIEW_DETAILS "&Detaljer" + IDS_SELECT "Velg" + IDS_OPEN "?pne" + + IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." + IDS_CREATEFOLDER_CAPTION "Feil ved oppretting av ny mappe" + IDS_DELETEITEM_CAPTION "Bekreft filsletting" + IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" + IDS_DELETEITEM_TEXT "Virkelig slette '%1'?" + IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" + IDS_OVERWRITEFILE_TEXT "Overskrive filen '%1'?" + IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" + + /* message box strings */ + IDS_RESTART_TITLE "Starte pÕ nytt" + IDS_RESTART_PROMPT "Vil du simulere en omstart av Windows?" + IDS_SHUTDOWN_TITLE "Avslutt" + IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-°kten?" + + /* shell folder path default values */ + IDS_PROGRAMS "Start-meny\\Programmer" + IDS_PERSONAL "Mine dokumenter" + IDS_FAVORITES "Favoritter" + IDS_STARTUP "Start-meny\\Programmer\\Oppstart" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start-meny" + IDS_MYMUSIC "Mine dokumenter\\Min musikk" + IDS_MYVIDEO "Mine dokumenter\\Mine videoklipp" + IDS_DESKTOPDIRECTORY "Skrivebord" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "Mine dokumenter\\Mine bilder" + IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" + IDS_COMMON_DOCUMENTS "Dokumenter" + IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verkt°y" + IDS_COMMON_MUSIC "Dokumenter\\Min musikk" + IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" + IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shell32_main.c --- trunk/reactos/lib/shell32/shell32_main.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32_main.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -308,12 +308,13 @@ * SHGetFileInfoW [SHELL32.@] * */ -DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, - SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags ) +DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, + SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags ) { WCHAR szLocation[MAX_PATH], szFullPath[MAX_PATH]; int iIndex; - DWORD ret = TRUE, dwAttributes = 0; + DWORD_PTR ret = TRUE; + DWORD dwAttributes = 0; IShellFolder * psfParent = NULL; IExtractIconW * pei = NULL; LPITEMIDLIST pidlLast = NULL, pidl = NULL; @@ -557,9 +558,9 @@ if (ret) { if (flags & SHGFI_SMALLICON) - ret = (DWORD) ShellSmallIconList; + ret = (DWORD_PTR) ShellSmallIconList; else - ret = (DWORD) ShellBigIconList; + ret = (DWORD_PTR) ShellBigIconList; } } @@ -596,9 +597,9 @@ /*********************************************************************** ** * SHGetFileInfoA [SHELL32.@] */ -DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, - SHFILEINFOA *psfi, UINT sizeofpsfi, - UINT flags ) +DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, + SHFILEINFOA *psfi, UINT sizeofpsfi, + UINT flags ) { INT len; LPWSTR temppath; @@ -706,7 +707,7 @@ { ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); if (ret != 0xFFFFFFFF && ret) - return (HICON)ret; + return (HICON)(UINT_PTR)ret; return NULL; } else _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shelllink.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -2384,7 +2384,7 @@ } static HRESULT WINAPI -ShellLink_GetCommandString( IContextMenu* iface, UINT idCmd, UINT uType, +ShellLink_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); _____ Modified: trunk/reactos/lib/shell32/shellord.c --- trunk/reactos/lib/shell32/shellord.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shellord.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -355,16 +355,16 @@ va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ - TRACE("(%08lx,%08lx,%p,%p,%08x)\n", - (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); + TRACE("(%p,%p,%p,%p,%08x)\n", + hInstance,hWnd,lpText,lpCaption,uType); - if (!HIWORD(lpCaption)) - LoadStringW(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + if (IS_INTRESOURCE(lpCaption)) + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); else pszTitle = lpCaption; - if (!HIWORD(lpText)) - LoadStringW(hInstance, (DWORD)lpText, szText, sizeof(szText)/sizeof(szText[0])); + if (IS_INTRESOURCE(lpText)) + LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0])); else pszText = lpText; @@ -412,16 +412,16 @@ va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ - TRACE("(%08lx,%08lx,%p,%p,%08x)\n", - (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); + TRACE("(%p,%p,%p,%p,%08x)\n", + hInstance,hWnd,lpText,lpCaption,uType); - if (!HIWORD(lpCaption)) - LoadStringA(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)); + if (IS_INTRESOURCE(lpCaption)) + LoadStringA(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)); else pszTitle = lpCaption; - if (!HIWORD(lpText)) - LoadStringA(hInstance, (DWORD)lpText, szText, sizeof(szText)); + if (IS_INTRESOURCE(lpText)) + LoadStringA(hInstance, LOWORD(lpText), szText, sizeof(szText)); else pszText = lpText; @@ -1004,10 +1004,9 @@ * NOTES * Sets the interface */ -HRESULT WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) +VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) { TRACE("%p\n", lpUnknown); SHELL32_IExplorerInterface = lpUnknown; - return (HRESULT) lpUnknown; } /*********************************************************************** ** * SHGetInstanceExplorer [SHELL32.@] _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shellpath.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -1303,7 +1303,7 @@ IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) { if (LoadStringW(shell32_hInstance, - (UINT)CSIDL_Data[folder].szDefaultPath, resourcePath, MAX_PATH)) + LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH)) { hr = S_OK; pDefaultPath = resourcePath; _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shlexec.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -928,7 +928,7 @@ if (wDirectory) SHFree( wDirectory ); TRACE("returning %s\n", lpResult); - return (HINSTANCE)retval; + return retval; } /*********************************************************************** ** @@ -1051,7 +1051,7 @@ if (SUCCEEDED(hr)) { - hr = IShellExecuteHookW_Execute(pSEH, sei); + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); IShellExecuteHookW_Release(pSEH); @@ -1151,7 +1151,7 @@ if (SUCCEEDED(hr)) { - hr = IShellExecuteHookW_Execute(pSEH, sei); + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); IShellExecuteHookW_Release(pSEH); @@ -1338,7 +1338,7 @@ WCHAR lpstrTmpFile[256]; strcpyW(lpstrTmpFile, wHttp); strcatW(lpstrTmpFile, lpFile); - retval = (UINT)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); + retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } TRACE("retval %u\n", retval); _____ Modified: trunk/reactos/lib/shell32/shlmenu.c --- trunk/reactos/lib/shell32/shlmenu.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shlmenu.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -206,7 +206,7 @@ MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (DWORD) lpFmMi; + MenuInfo.dwMenuData = (ULONG_PTR) lpFmMi; SetMenuInfo (hMenuPopup, &MenuInfo); FileMenu_AppendItemW (hmenu, sTemp, uID, iIcon, hMenuPopup, FM_DEFAULT_HEIGHT); @@ -277,7 +277,7 @@ MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (DWORD) menudata; + MenuInfo.dwMenuData = (ULONG_PTR) menudata; SetMenuInfo (hMenu, &MenuInfo); return hMenu; @@ -342,7 +342,7 @@ myItem->iIconIndex = icon; myItem->hMenu = hMenu; mii.fMask = MIIM_DATA; - mii.dwItemData = (DWORD) myItem; + mii.dwItemData = (ULONG_PTR) myItem; } if ( hMenuPopup ) _____ Modified: trunk/reactos/lib/shell32/shres.rc --- trunk/reactos/lib/shell32/shres.rc 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shres.rc 2005-10-08 17:41:41 UTC (rev 18348) @@ -24358,6 +24358,7 @@ * which also have a neutral version. This is to * get localized bitmaps for example. */ +#include "shell32_Bg.rc" #include "shell32_Ca.rc" #include "shell32_Cn.rc" #include "shell32_Cs.rc" _____ Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c --- trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -400,7 +400,7 @@ */ static HRESULT WINAPI ISVBgCm_fnGetCommandString( IContextMenu2 *iface, - UINT idCommand, + UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName, _____ Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c --- trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -467,7 +467,7 @@ */ static HRESULT WINAPI ISvItemCm_fnGetCommandString( IContextMenu2 *iface, - UINT idCommand, + UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs