Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56779: [PSDK] - Fix bogus initializer in IN4ADDR_SCOPE_ID (aka let's not copy MS's header bugs)
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 19:02:56 2012 New Revision: 56779 URL: http://svn.reactos.org/svn/reactos?rev=56779&view=rev Log: [PSDK] - Fix bogus initializer in IN4ADDR_SCOPE_ID (aka let's not copy MS's header bugs) Modified: trunk/reactos/include/psdk/mstcpip.h Modified: trunk/reactos/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstcpip.h?rev… ============================================================================== --- trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] Thu Jun 21 19:02:56 2012 @@ -443,7 +443,7 @@ IN4ADDR_SCOPE_ID( IN CONST SOCKADDR_IN *a) { - SCOPE_ID UnspecifiedScopeId = {0}; + SCOPE_ID UnspecifiedScopeId = {{{0}}}; UNREFERENCED_PARAMETER(a); return UnspecifiedScopeId; }

1 0

[tfaber] 56778: [PSDK] - Revert bcrypt.h. Our headers are doomed to be forever incompatible ; )
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 18:25:41 2012 New Revision: 56778 URL: http://svn.reactos.org/svn/reactos?rev=56778&view=rev Log: [PSDK] - Revert bcrypt.h. Our headers are doomed to be forever incompatible ;) Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Thu Jun 21 18:25:41 2012 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __BCRYPT_H__ -#define __BCRYPT_H__ +#ifndef __WINE_BCRYPT_H +#define __WINE_BCRYPT_H #ifndef WINAPI #define WINAPI __stdcall @@ -35,11 +35,6 @@ #define OPTIONAL #endif -#ifndef _NTDEF_ -typedef _Return_type_success_(return >= 0) LONG NTSTATUS; -typedef NTSTATUS *PNTSTATUS; -#endif - typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -47,4 +42,4 @@ ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; -#endif /* __BCRYPT_H__ */ +#endif /* __WINE_BCRYPT_H */

1 0

[tfaber] 56777: [PSDK][NDK] - Fix build
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 18:20:38 2012 New Revision: 56777 URL: http://svn.reactos.org/svn/reactos?rev=56777&view=rev Log: [PSDK][NDK] - Fix build Modified: trunk/reactos/include/ndk/umtypes.h trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umtypes.h [iso-8859-1] Thu Jun 21 18:20:38 2012 @@ -128,7 +128,9 @@ // #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_) +#ifndef __BCRYPT_H__ typedef LONG NTSTATUS, *PNTSTATUS; +#endif typedef struct _UNICODE_STRING { Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Thu Jun 21 18:20:38 2012 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_BCRYPT_H -#define __WINE_BCRYPT_H +#ifndef __BCRYPT_H__ +#define __BCRYPT_H__ #ifndef WINAPI #define WINAPI __stdcall @@ -47,4 +47,4 @@ ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; -#endif /* __WINE_BCRYPT_H */ +#endif /* __BCRYPT_H__ */

1 0

[tfaber] 56776: [PSDK] - At least Wine's headers suck as much as ours
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 17:45:02 2012 New Revision: 56776 URL: http://svn.reactos.org/svn/reactos?rev=56776&view=rev Log: [PSDK] - At least Wine's headers suck as much as ours Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Thu Jun 21 17:45:02 2012 @@ -35,9 +35,9 @@ #define OPTIONAL #endif -#ifndef WINE_NTSTATUS_DECLARED -#define WINE_NTSTATUS_DECLARED -typedef LONG NTSTATUS; +#ifndef _NTDEF_ +typedef _Return_type_success_(return >= 0) LONG NTSTATUS; +typedef NTSTATUS *PNTSTATUS; #endif typedef struct _BCRYPT_ALGORITHM_IDENTIFIER

1 0

[tfaber] 56775: [PSDK] - Add missing alignment defines to winnt.h (copied from ntdef.h) - Update bcrypt.h to Wine 1.5.4
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 17:41:25 2012 New Revision: 56775 URL: http://svn.reactos.org/svn/reactos?rev=56775&view=rev Log: [PSDK] - Add missing alignment defines to winnt.h (copied from ntdef.h) - Update bcrypt.h to Wine 1.5.4 Modified: trunk/reactos/include/psdk/bcrypt.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Thu Jun 21 17:41:25 2012 @@ -35,6 +35,11 @@ #define OPTIONAL #endif +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Jun 21 17:41:25 2012 @@ -109,12 +109,41 @@ #ifndef RC_INVOKED #include <string.h> -/* FIXME: add more architectures. Is there a way to specify this in GCC? */ -#if defined(_M_AMD64) -#undef UNALIGNED +#if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) || defined(_M_AMD64) +#define ALIGNMENT_MACHINE #define UNALIGNED __unaligned +#if defined(_WIN64) +#define UNALIGNED64 __unaligned #else +#define UNALIGNED64 +#endif +#else +#undef ALIGNMENT_MACHINE #define UNALIGNED +#define UNALIGNED64 +#endif + +#if defined(_WIN64) || defined(_M_ALPHA) +#define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) +#define MEMORY_ALLOCATION_ALIGNMENT 16 +#else +#define MAX_NATURAL_ALIGNMENT sizeof(ULONG) +#define MEMORY_ALLOCATION_ALIGNMENT 8 +#endif + +/* Returns the type's alignment */ +#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#define TYPE_ALIGNMENT(t) __alignof(t) +#else +#define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) +#endif + +#if defined(_AMD64_) || defined(_X86_) +#define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT(ULONG) +#elif defined(_IA64_) || defined(_ARM_) +#define PROBE_ALIGNMENT(_s) max((TYPE_ALIGNMENT(_s), TYPE_ALIGNMENT(ULONG)) +#else +#error "unknown architecture" #endif #ifndef DECLSPEC_NOVTABLE

1 0

[tfaber] 56774: [PSDK] - Add httprequest.idl and httprequestid.h from Wine 1.5.4 - Update winhttp.h to Wine 1.5.4
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 16:33:23 2012 New Revision: 56774 URL: http://svn.reactos.org/svn/reactos?rev=56774&view=rev Log: [PSDK] - Add httprequest.idl and httprequestid.h from Wine 1.5.4 - Update winhttp.h to Wine 1.5.4 Added: trunk/reactos/include/psdk/httprequest.idl (with props) trunk/reactos/include/psdk/httprequestid.h (with props) Modified: trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/include/psdk/winhttp.h trunk/reactos/lib/sdk/uuid/CMakeLists.txt Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Thu Jun 21 16:33:23 2012 @@ -41,6 +41,7 @@ fusion.idl hlink.idl htiframe.idl + httprequest.idl iads.idl icftypes.idl imnact.idl Added: trunk/reactos/include/psdk/httprequest.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/httprequest.i… ============================================================================== --- trunk/reactos/include/psdk/httprequest.idl (added) +++ trunk/reactos/include/psdk/httprequest.idl [iso-8859-1] Thu Jun 21 16:33:23 2012 @@ -1,0 +1,191 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "httprequestid.h" + +import "oaidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#endif + +[ + uuid(662901fc-6951-4854-9eb2-d9a2570f2b2e), + helpstring("Microsoft WinHTTP Services, version 5.1"), + lcid(0x0000), + version(5.1) +] +library WinHttp { + +importlib ("stdole2.tlb"); + +typedef [public] LONG HTTPREQUEST_PROXY_SETTING; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_DEFAULT = 0x00000000; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_PRECONFIG = 0x00000000; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_DIRECT = 0x00000001; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_PROXY = 0x00000002; + +typedef [public] LONG HTTPREQUEST_SETCREDENTIALS_FLAGS; +const HTTPREQUEST_SETCREDENTIALS_FLAGS HTTPREQUEST_SETCREDENTIALS_FOR_SERVER = 0x00000000; +const HTTPREQUEST_SETCREDENTIALS_FLAGS HTTPREQUEST_SETCREDENTIALS_FOR_PROXY = 0x00000001; + +typedef +[uuid(12782009-fe90-4877-9730-e5e183669b19)] +enum WinHttpRequestOption +{ + WinHttpRequestOption_UserAgentString, + WinHttpRequestOption_URL, + WinHttpRequestOption_URLCodePage, + WinHttpRequestOption_EscapePercentInURL, + WinHttpRequestOption_SslErrorIgnoreFlags, + WinHttpRequestOption_SelectCertificate, + WinHttpRequestOption_EnableRedirects, + WinHttpRequestOption_UrlEscapeDisable, + WinHttpRequestOption_UrlEscapeDisableQuery, + WinHttpRequestOption_SecureProtocols, + WinHttpRequestOption_EnableTracing, + WinHttpRequestOption_RevertImpersonationOverSsl, + WinHttpRequestOption_EnableHttpsToHttpRedirects, + WinHttpRequestOption_EnablePassportAuthentication, + WinHttpRequestOption_MaxAutomaticRedirects, + WinHttpRequestOption_MaxResponseHeaderSize, + WinHttpRequestOption_MaxResponseDrainSize, + WinHttpRequestOption_EnableHttp1_1, + WinHttpRequestOption_EnableCertificateRevocationCheck, + WinHttpRequestOption_RejectUserpwd +} WinHttpRequestOption; + +typedef +[uuid(9d8a6df8-13de-4b1f-a330-67c719d62514)] +enum WinHttpRequestAutoLogonPolicy +{ + AutoLogonPolicy_Always, + AutoLogonPolicy_OnlyIfBypassProxy, + AutoLogonPolicy_Never +} WinHttpRequestAutoLogonPolicy; + +[ + object, + uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396b), + odl, + dual, + oleautomation, + nonextensible, + pointer_default(unique) +] +interface IWinHttpRequest : IDispatch +{ + [id(DISPID_HTTPREQUEST_SETPROXY)] + HRESULT SetProxy( + [in] HTTPREQUEST_PROXY_SETTING proxy_setting, + [in, optional] VARIANT proxy_server, + [in, optional] VARIANT bypass_list); + + [id(DISPID_HTTPREQUEST_SETCREDENTIALS)] + HRESULT SetCredentials( + [in] BSTR username, + [in] BSTR password, + [in] HTTPREQUEST_SETCREDENTIALS_FLAGS flags); + + [id(DISPID_HTTPREQUEST_OPEN)] + HRESULT Open( + [in] BSTR method, + [in] BSTR url, + [in, optional] VARIANT async); + + [id(DISPID_HTTPREQUEST_SETREQUESTHEADER)] + HRESULT SetRequestHeader( + [in] BSTR header, + [in] BSTR value); + + [id(DISPID_HTTPREQUEST_GETRESPONSEHEADER)] + HRESULT GetResponseHeader( + [in] BSTR header, + [out, retval] BSTR *value); + + [id(DISPID_HTTPREQUEST_GETALLRESPONSEHEADERS)] + HRESULT GetAllResponseHeaders( + [out, retval] BSTR *headers); + + [id(DISPID_HTTPREQUEST_SEND)] + HRESULT Send( + [in, optional] VARIANT body); + + [propget, id(DISPID_HTTPREQUEST_STATUS)] + HRESULT Status( + [out, retval] LONG *status); + + [propget, id(DISPID_HTTPREQUEST_STATUSTEXT)] + HRESULT StatusText( + [out, retval] BSTR *status); + + [propget, id(DISPID_HTTPREQUEST_RESPONSETEXT)] + HRESULT ResponseText( + [out, retval] BSTR *body); + + [propget, id(DISPID_HTTPREQUEST_RESPONSEBODY)] + HRESULT ResponseBody( + [out, retval] VARIANT *body); + + [propget, id(DISPID_HTTPREQUEST_RESPONSESTREAM)] + HRESULT ResponseStream( + [out, retval] VARIANT *body); + + [propget, id(DISPID_HTTPREQUEST_OPTION)] + HRESULT Option( + [in] WinHttpRequestOption option, + [out, retval] VARIANT *value); + + [propput, id(DISPID_HTTPREQUEST_OPTION)] + HRESULT Option( + [in] WinHttpRequestOption option, + [in] VARIANT value); + + [id(DISPID_HTTPREQUEST_WAITFORRESPONSE)] + HRESULT WaitForResponse( + [in, optional] VARIANT timeout, + [out, retval] VARIANT_BOOL *succeeded); + + [id(DISPID_HTTPREQUEST_ABORT)] + HRESULT Abort(); + + [id(DISPID_HTTPREQUEST_SETTIMEOUTS)] + HRESULT SetTimeouts( + [in] LONG resolve_timeout, + [in] LONG connect_timeout, + [in] LONG send_timeout, + [in] LONG receive_timeout); + + [id(DISPID_HTTPREQUEST_SETCLIENTCERTIFICATE)] + HRESULT SetClientCertificate( + [in] BSTR certificate); + + [id(DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY)] + HRESULT SetAutoLogonPolicy( + [in] WinHttpRequestAutoLogonPolicy policy); +} +[ + helpstring("WinHttpRequest Component version 5.1"), + threading(apartment), + progid("WinHttp.WinHttpRequest.5.1"), + uuid(2087c2f4-2cef-4953-a8ab-66779b670495) +] +coclass WinHttpRequest { interface IWinHttpRequest; } + +} /* WinHttp */ Propchange: trunk/reactos/include/psdk/httprequest.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/httprequestid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/httprequestid… ============================================================================== --- trunk/reactos/include/psdk/httprequestid.h (added) +++ trunk/reactos/include/psdk/httprequestid.h [iso-8859-1] Thu Jun 21 16:33:23 2012 @@ -1,0 +1,42 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_HTTPREQUESTID_H +#define __WINE_HTTPREQUESTID_H + +#define DISPID_HTTPREQUEST_BASE 1 +#define DISPID_HTTPREQUEST_OPEN (DISPID_HTTPREQUEST_BASE) +#define DISPID_HTTPREQUEST_SETREQUESTHEADER (DISPID_HTTPREQUEST_BASE + 1) +#define DISPID_HTTPREQUEST_GETRESPONSEHEADER (DISPID_HTTPREQUEST_BASE + 2) +#define DISPID_HTTPREQUEST_GETALLRESPONSEHEADERS (DISPID_HTTPREQUEST_BASE + 3) +#define DISPID_HTTPREQUEST_SEND (DISPID_HTTPREQUEST_BASE + 4) +#define DISPID_HTTPREQUEST_OPTION (DISPID_HTTPREQUEST_BASE + 5) +#define DISPID_HTTPREQUEST_STATUS (DISPID_HTTPREQUEST_BASE + 6) +#define DISPID_HTTPREQUEST_STATUSTEXT (DISPID_HTTPREQUEST_BASE + 7) +#define DISPID_HTTPREQUEST_RESPONSETEXT (DISPID_HTTPREQUEST_BASE + 8) +#define DISPID_HTTPREQUEST_RESPONSEBODY (DISPID_HTTPREQUEST_BASE + 9) +#define DISPID_HTTPREQUEST_RESPONSESTREAM (DISPID_HTTPREQUEST_BASE + 10) +#define DISPID_HTTPREQUEST_ABORT (DISPID_HTTPREQUEST_BASE + 11) +#define DISPID_HTTPREQUEST_SETPROXY (DISPID_HTTPREQUEST_BASE + 12) +#define DISPID_HTTPREQUEST_SETCREDENTIALS (DISPID_HTTPREQUEST_BASE + 13) +#define DISPID_HTTPREQUEST_WAITFORRESPONSE (DISPID_HTTPREQUEST_BASE + 14) +#define DISPID_HTTPREQUEST_SETTIMEOUTS (DISPID_HTTPREQUEST_BASE + 15) +#define DISPID_HTTPREQUEST_SETCLIENTCERTIFICATE (DISPID_HTTPREQUEST_BASE + 16) +#define DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY (DISPID_HTTPREQUEST_BASE + 17) + +#endif /* __WINE_HTTPREQUESTID_H */ Propchange: trunk/reactos/include/psdk/httprequestid.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/winhttp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winhttp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winhttp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winhttp.h [iso-8859-1] Thu Jun 21 16:33:23 2012 @@ -408,7 +408,7 @@ | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR) #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff -#define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1L)) +#define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) #define API_RECEIVE_RESPONSE (1) #define API_QUERY_DATA_AVAILABLE (2) @@ -502,6 +502,14 @@ } WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); + +#define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 +#define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 + +#define WINHTTP_AUTOPROXY_AUTO_DETECT 0x00000001 +#define WINHTTP_AUTOPROXY_CONFIG_URL 0x00000002 +#define WINHTTP_AUTOPROXY_RUN_INPROCESS 0x00010000 +#define WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY 0x00020000 typedef struct { Modified: trunk/reactos/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] Thu Jun 21 16:33:23 2012 @@ -49,7 +49,7 @@ # htiface.idl htiframe.idl # htmlfilter.idl -# httprequest.idl + httprequest.idl # iaccess.idl # iaspolcy.idl # iedial.idl

1 0

[tfaber] 56773: [WINE] - We have getaddrinfo
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 16:16:39 2012 New Revision: 56773 URL: http://svn.reactos.org/svn/reactos?rev=56773&view=rev Log: [WINE] - We have getaddrinfo Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Thu Jun 21 16:16:39 2012 @@ -197,7 +197,7 @@ /* #undef HAVE_FUTIMESAT */ /* Define to 1 if you have the `getaddrinfo' function. */ -/* #undef HAVE_GETADDRINFO */ +#define HAVE_GETADDRINFO 1 /* Define to 1 if you have the `getattrlist' function. */ /* #undef HAVE_GETATTRLIST */

1 0

[spetreolle] 56772: [VERSION] Remove unnecessary lz32 import.
by spetreolle＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: spetreolle Date: Thu Jun 21 14:53:23 2012 New Revision: 56772 URL: http://svn.reactos.org/svn/reactos?rev=56772&view=rev Log: [VERSION] Remove unnecessary lz32 import. Modified: trunk/reactos/dll/win32/version/CMakeLists.txt Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/CMakeLists.txt [iso-8859-1] Thu Jun 21 14:53:23 2012 @@ -16,7 +16,7 @@ set_module_type(version win32dll ENTRYPOINT 0 ) target_link_libraries(version wine) -add_importlibs(version lz32 kernel32 ntdll) +add_importlibs(version kernel32 ntdll) add_dependencies(version psdk) add_cd_file(TARGET version DESTINATION reactos/system32 FOR all)

1 0

[pschweitzer] 56771: [RAPPS] Fix typos in French translation. Patch by Philippe Morin
by pschweitzer＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: pschweitzer Date: Thu Jun 21 11:47:15 2012 New Revision: 56771 URL: http://svn.reactos.org/svn/reactos?rev=56771&view=rev Log: [RAPPS] Fix typos in French translation. Patch by Philippe Morin Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Thu Jun 21 11:47:15 2012 @@ -160,7 +160,7 @@ IDS_CAT_FINANCE "Finance" IDS_CAT_GAMES "Jeux & dÃ©tente" IDS_CAT_GRAPHICS "Graphismes" - IDS_CAT_INTERNET "Internet & rÃ©saux" + IDS_CAT_INTERNET "Internet & rÃ©seaux" IDS_CAT_LIBS "BibliothÃ¨ques" IDS_CAT_OFFICE "Bureautique" IDS_CAT_OTHER "Autres" @@ -178,13 +178,13 @@ IDS_MODIFY "Modifier" IDS_APPS_COUNT "Nombre d'applications : %d" IDS_WELCOME_TITLE "Bienvenue Ã ReactOS Applications Manager!\n\n" - IDS_WELCOME_TEXT "Choisisez une catÃ©gorie Ã gauche, ensuite choisisez une application Ã installer ou dÃ©sinstaller.\nSite internet de ReactOS : " + IDS_WELCOME_TEXT "Choisissez une catÃ©gorie Ã gauche, ensuite choisissez une application Ã installer ou dÃ©sinstaller.\nSite internet de ReactOS : " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "InstallÃ©" IDS_AVAILABLEFORINST "Disponible pour installation" IDS_UPDATES "Mises Ã jour" IDS_APPLICATIONS "Applications" - IDS_CHOOSE_FOLDER_TEXT "Choisisez un dossier dans lequel seront tÃ©lÃ©chargÃ©s les programmes :" + IDS_CHOOSE_FOLDER_TEXT "Choisissez un dossier dans lequel seront tÃ©lÃ©chargÃ©s les programmes :" IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spÃ©cifiÃ© n'existe pas. Le crÃ©er ?" IDS_USER_NOT_ADMIN "Vous devez Ãªtre un administrateur pour dÃ©marrer ""ReactOS Applications Manager""!" IDS_APP_REG_REMOVE "Etes-vous sÃ»r de vouloir supprimer les donnÃ©es du programme installÃ© du registre ?"

1 0

[tfaber] 56770: [WUAPI] - Sync to Wine 1.5.4
by tfaber＠svn.reactos.org 21 Jun '12

21 Jun '12

Author: tfaber Date: Thu Jun 21 09:05:15 2012 New Revision: 56770 URL: http://svn.reactos.org/svn/reactos?rev=56770&view=rev Log: [WUAPI] - Sync to Wine 1.5.4 Added: trunk/reactos/dll/win32/wuapi/systeminfo.c (with props) trunk/reactos/dll/win32/wuapi/wuapi.rc (with props) trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl (with props) Removed: trunk/reactos/dll/win32/wuapi/regsvr.c Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt trunk/reactos/dll/win32/wuapi/downloader.c trunk/reactos/dll/win32/wuapi/installer.c trunk/reactos/dll/win32/wuapi/main.c trunk/reactos/dll/win32/wuapi/searcher.c trunk/reactos/dll/win32/wuapi/session.c trunk/reactos/dll/win32/wuapi/updates.c trunk/reactos/dll/win32/wuapi/wuapi_private.h trunk/reactos/include/psdk/wuapi.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -1,5 +1,9 @@ -add_definitions(-D__WINESRC__) +add_typelib(wuapi_tlb.idl) + +add_definitions( + -D__WINESRC__ + -DCOM_NO_WINDOWS_H) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -14,15 +18,22 @@ downloader.c installer.c main.c - regsvr.c searcher.c session.c + systeminfo.c updates.c + wuapi.rc ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) + +set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb) add_library(wuapi SHARED ${SOURCE}) set_module_type(wuapi win32dll) target_link_libraries(wuapi uuid wine wuguid) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) + +# wuapi_tlb.tlb needs stdole2.tlb +add_dependencies(wuapi stdole2) + add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wuapi/downloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/downloader… ============================================================================== --- trunk/reactos/dll/win32/wuapi/downloader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/downloader.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -36,13 +36,13 @@ typedef struct _update_downloader { - const struct IUpdateDownloaderVtbl *vtbl; + IUpdateDownloader IUpdateDownloader_iface; LONG refs; } update_downloader; static inline update_downloader *impl_from_IUpdateDownloader( IUpdateDownloader *iface ) { - return (update_downloader *)((char *)iface - FIELD_OFFSET( update_downloader, vtbl )); + return CONTAINING_RECORD(iface, update_downloader, IUpdateDownloader_iface); } static ULONG WINAPI update_downloader_AddRef( @@ -257,10 +257,10 @@ downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); if (!downloader) return E_OUTOFMEMORY; - downloader->vtbl = &update_downloader_vtbl; + downloader->IUpdateDownloader_iface.lpVtbl = &update_downloader_vtbl; downloader->refs = 1; - *ppObj = &downloader->vtbl; + *ppObj = &downloader->IUpdateDownloader_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/wuapi/installer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/installer.… ============================================================================== --- trunk/reactos/dll/win32/wuapi/installer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/installer.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -35,13 +35,13 @@ typedef struct _update_installer { - const struct IUpdateInstallerVtbl *vtbl; + IUpdateInstaller IUpdateInstaller_iface; LONG refs; } update_installer; static inline update_installer *impl_from_IUpdateInstaller( IUpdateInstaller *iface ) { - return (update_installer *)((char *)iface - FIELD_OFFSET( update_installer, vtbl )); + return CONTAINING_RECORD(iface, update_installer, IUpdateInstaller_iface); } static ULONG WINAPI update_installer_AddRef( @@ -208,6 +208,103 @@ static HRESULT WINAPI update_installer_put_Updates( IUpdateInstaller *This, IUpdateCollection *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_BeginInstall( + IUpdateInstaller *This, + IUnknown *onProgressChanged, + IUnknown *onCompleted, + VARIANT state, + IInstallationJob **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_BeginUninstall( + IUpdateInstaller *This, + IUnknown *onProgressChanged, + IUnknown *onCompleted, + VARIANT state, + IInstallationJob **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_EndInstall( + IUpdateInstaller *This, + IInstallationJob *value, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_EndUninstall( + IUpdateInstaller *This, + IInstallationJob *value, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_Install( + IUpdateInstaller *This, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_RunWizard( + IUpdateInstaller *This, + BSTR dialogTitle, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_IsBusy( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_Uninstall( + IUpdateInstaller *This, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_AllowSourcePrompts( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_AllowSourcePrompts( + IUpdateInstaller *This, + VARIANT_BOOL value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_RebootRequiredBeforeInstallation( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) { FIXME("\n"); return E_NOTIMPL; @@ -232,6 +329,17 @@ update_installer_get_ParentWindow, update_installer_get_Updates, update_installer_put_Updates, + update_installer_BeginInstall, + update_installer_BeginUninstall, + update_installer_EndInstall, + update_installer_EndUninstall, + update_installer_Install, + update_installer_RunWizard, + update_installer_get_IsBusy, + update_installer_Uninstall, + update_installer_get_AllowSourcePrompts, + update_installer_put_AllowSourcePrompts, + update_installer_get_RebootRequiredBeforeInstallation }; HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) @@ -243,10 +351,10 @@ installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); if (!installer) return E_OUTOFMEMORY; - installer->vtbl = &update_installer_vtbl; + installer->IUpdateInstaller_iface.lpVtbl = &update_installer_vtbl; installer->refs = 1; - *ppObj = &installer->vtbl; + *ppObj = &installer->IUpdateInstaller_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "rpcproxy.h" #include "wuapi.h" #include "wine/debug.h" @@ -38,13 +39,13 @@ typedef struct _wucf { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } wucf; static inline wucf *impl_from_IClassFactory( IClassFactory *iface ) { - return (wucf *)((char *)iface - FIELD_OFFSET( wucf, vtbl )); + return CONTAINING_RECORD(iface, wucf, IClassFactory_iface); } static HRESULT WINAPI wucf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -111,8 +112,11 @@ wucf_LockServer }; -static wucf sessioncf = { &wucf_vtbl, UpdateSession_create }; -static wucf updatescf = { &wucf_vtbl, AutomaticUpdates_create }; +static wucf sessioncf = { { &wucf_vtbl }, UpdateSession_create }; +static wucf updatescf = { { &wucf_vtbl }, AutomaticUpdates_create }; +static wucf sysinfocf = { { &wucf_vtbl }, SystemInformation_create }; + +static HINSTANCE instance; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { @@ -121,6 +125,7 @@ case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + instance = hinst; DisableThreadLibraryCalls( hinst ); break; case DLL_PROCESS_DETACH: @@ -137,11 +142,15 @@ if (IsEqualGUID( rclsid, &CLSID_UpdateSession )) { - cf = (IClassFactory *)&sessioncf.vtbl; + cf = &sessioncf.IClassFactory_iface; } else if (IsEqualGUID( rclsid, &CLSID_AutomaticUpdates )) { - cf = (IClassFactory *)&updatescf.vtbl; + cf = &updatescf.IClassFactory_iface; + } + else if (IsEqualGUID( rclsid, &CLSID_SystemInformation )) + { + cf = &sysinfocf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); @@ -151,3 +160,19 @@ { return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (WUAPI.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (WUAPI.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +} Removed: trunk/reactos/dll/win32/wuapi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/wuapi/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/regsvr.c (removed) @@ -1,430 +1,0 @@ -/* - * self-registerable dll functions for wuapi.dll - * - * Copyright (C) 2003 John K. Hohm - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "objbase.h" -#include "wuapi.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); - -/* - * Near the bottom of this file are the exported DllRegisterServer and - * DllUnregisterServer, which make all this worthwhile. - */ - -/*********************************************************************** - * interface for self-registering - */ -struct regsvr_interface -{ - IID const *iid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - IID const *base_iid; /* can be NULL to omit */ - int num_methods; /* can be <0 to omit */ - CLSID const *ps_clsid; /* can be NULL to omit */ - CLSID const *ps_clsid32; /* can be NULL to omit */ -}; - -static HRESULT register_interfaces(struct regsvr_interface const *list); -static HRESULT unregister_interfaces(struct regsvr_interface const *list); - -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR clsid_str; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - -/*********************************************************************** - * static string constants - */ -static WCHAR const interface_keyname[10] = { - 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { - 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', - 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { - 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const ips_keyname[13] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static WCHAR const ips32_keyname[15] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static char const tmodel_valuename[] = "ThreadingModel"; - -/*********************************************************************** - * static helper functions - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); -static LONG register_key_defvalueW(HKEY base, WCHAR const *name, - WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); - -/*********************************************************************** - * register_interfaces - */ -static HRESULT register_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - HKEY iid_key; - - StringFromGUID2(list->iid, buf, 39); - res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_interface_key; - - if (list->name) { - res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->base_iid) { - res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (0 <= list->num_methods) { - static WCHAR const fmt[3] = { '%', 'd', 0 }; - HKEY key; - - res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - - sprintfW(buf, fmt, list->num_methods); - res = RegSetValueExW(key, NULL, 0, REG_SZ, - (CONST BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid) { - res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid32) { - res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - error_close_iid_key: - RegCloseKey(iid_key); - } - -error_close_interface_key: - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_interfaces - */ -static HRESULT unregister_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, - KEY_READ | KEY_WRITE, &interface_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - } - - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->clsid_str) { - res = register_key_defvalueA(clsid_key, clsid_keyname, - list->clsid_str); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - HKEY progid_key; - - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_key_defvalueW(progid_key, clsid_keyname, buf); - RegCloseKey(progid_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * regsvr_key_guid - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) -{ - WCHAR buf[39]; - - StringFromGUID2(guid, buf, 39); - return register_key_defvalueW(base, name, buf); -} - -/*********************************************************************** - * regsvr_key_defvalueW - */ -static LONG register_key_defvalueW( - HKEY base, - WCHAR const *name, - WCHAR const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { - { &CLSID_UpdateSession, - "CLSID_UpdateSession", - NULL, - "wuapi.dll", - "Both" - }, - { &CLSID_AutomaticUpdates, - "CLSID_AutomaticUpdates", - NULL, - "wuapi.dll", - "Both" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ -static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (WUAPI.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (WUAPI.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - return hr; -} Modified: trunk/reactos/dll/win32/wuapi/searcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/searcher.c… ============================================================================== --- trunk/reactos/dll/win32/wuapi/searcher.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/searcher.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -35,13 +35,13 @@ typedef struct _update_searcher { - const struct IUpdateSearcherVtbl *vtbl; + IUpdateSearcher IUpdateSearcher_iface; LONG refs; } update_searcher; static inline update_searcher *impl_from_IUpdateSearcher( IUpdateSearcher *iface ) { - return (update_searcher *)((char *)iface - FIELD_OFFSET( update_searcher, vtbl )); + return CONTAINING_RECORD(iface, update_searcher, IUpdateSearcher_iface); } static ULONG WINAPI update_searcher_AddRef( @@ -212,6 +212,74 @@ IUpdateSearcher *This, ISearchJob *searchJob, ISearchResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_EscapeString( + IUpdateSearcher *This, + BSTR unescaped, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_QueryHistory( + IUpdateSearcher *This, + LONG startIndex, + LONG count, + IUpdateHistoryEntryCollection **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_Search( + IUpdateSearcher *This, + BSTR criteria, + ISearchResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_Online( + IUpdateSearcher *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_Online( + IUpdateSearcher *This, + VARIANT_BOOL value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_GetTotalHistoryCount( + IUpdateSearcher *This, + LONG *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_ServiceID( + IUpdateSearcher *This, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_ServiceID( + IUpdateSearcher *This, + BSTR value ) { FIXME("\n"); return E_NOTIMPL; @@ -235,7 +303,15 @@ update_searcher_get_ServerSelection, update_searcher_put_ServerSelection, update_searcher_BeginSearch, - update_searcher_EndSearch + update_searcher_EndSearch, + update_searcher_EscapeString, + update_searcher_QueryHistory, + update_searcher_Search, + update_searcher_get_Online, + update_searcher_put_Online, + update_searcher_GetTotalHistoryCount, + update_searcher_get_ServiceID, + update_searcher_put_ServiceID }; HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) @@ -247,10 +323,10 @@ searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); if (!searcher) return E_OUTOFMEMORY; - searcher->vtbl = &update_searcher_vtbl; + searcher->IUpdateSearcher_iface.lpVtbl = &update_searcher_vtbl; searcher->refs = 1; - *ppObj = &searcher->vtbl; + *ppObj = &searcher->IUpdateSearcher_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/wuapi/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/session.c?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/session.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -36,13 +36,13 @@ typedef struct _update_session { - const struct IUpdateSessionVtbl *vtbl; + IUpdateSession IUpdateSession_iface; LONG refs; } update_session; static inline update_session *impl_from_IUpdateSession( IUpdateSession *iface ) { - return (update_session *)((char *)iface - FIELD_OFFSET( update_session, vtbl )); + return CONTAINING_RECORD(iface, update_session, IUpdateSession_iface); } static ULONG WINAPI update_session_AddRef( @@ -226,10 +226,10 @@ session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); if (!session) return E_OUTOFMEMORY; - session->vtbl = &update_session_vtbl; + session->IUpdateSession_iface.lpVtbl = &update_session_vtbl; session->refs = 1; - *ppObj = &session->vtbl; + *ppObj = &session->IUpdateSession_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Added: trunk/reactos/dll/win32/wuapi/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/systeminfo… ============================================================================== --- trunk/reactos/dll/win32/wuapi/systeminfo.c (added) +++ trunk/reactos/dll/win32/wuapi/systeminfo.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -1,0 +1,163 @@ +/* + * IAutomaticUpdates implementation + * + * Copyright 2008 Hans Leidekker + * Copyright 2011 Bernhard Loos + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _systeminfo +{ + ISystemInformation ISystemInformation_iface; + LONG refs; +} systeminfo; + +static inline systeminfo *impl_from_ISystemInformation(ISystemInformation *iface) +{ + return CONTAINING_RECORD(iface, systeminfo, ISystemInformation_iface); +} + +static ULONG WINAPI systeminfo_AddRef(ISystemInformation *iface) +{ + systeminfo *This = impl_from_ISystemInformation(iface); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI systeminfo_Release(ISystemInformation *iface) +{ + systeminfo *This = impl_from_ISystemInformation(iface); + LONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI systeminfo_QueryInterface(ISystemInformation *iface, + REFIID riid, void **ppvObject) +{ + systeminfo *This = impl_from_ISystemInformation(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_ISystemInformation) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + ISystemInformation_AddRef(iface); + return S_OK; +} + +static HRESULT WINAPI systeminfo_GetTypeInfoCount(ISystemInformation *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_GetTypeInfo(ISystemInformation *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_GetIDsOfNames(ISystemInformation *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, + DISPID *rgDispId) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_Invoke(ISystemInformation *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_get_OemHardwareSupportLink(ISystemInformation *iface, + BSTR *retval) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_get_RebootRequired(ISystemInformation *iface, + VARIANT_BOOL *retval) +{ + *retval = VARIANT_FALSE; + return S_OK; +} + +static const struct ISystemInformationVtbl systeminfo_vtbl = +{ + systeminfo_QueryInterface, + systeminfo_AddRef, + systeminfo_Release, + systeminfo_GetTypeInfoCount, + systeminfo_GetTypeInfo, + systeminfo_GetIDsOfNames, + systeminfo_Invoke, + systeminfo_get_OemHardwareSupportLink, + systeminfo_get_RebootRequired +}; + +HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + systeminfo *info; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); + if (!info) + return E_OUTOFMEMORY; + + info->ISystemInformation_iface.lpVtbl = &systeminfo_vtbl; + info->refs = 1; + + *ppObj = &info->ISystemInformation_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} Propchange: trunk/reactos/dll/win32/wuapi/systeminfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wuapi/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/updates.c?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/updates.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/updates.c [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -35,13 +35,13 @@ typedef struct _automatic_updates { - const struct IAutomaticUpdatesVtbl *vtbl; + IAutomaticUpdates IAutomaticUpdates_iface; LONG refs; } automatic_updates; static inline automatic_updates *impl_from_IAutomaticUpdates( IAutomaticUpdates *iface ) { - return (automatic_updates *)((char*)iface - FIELD_OFFSET( automatic_updates, vtbl )); + return CONTAINING_RECORD(iface, automatic_updates, IAutomaticUpdates_iface); } static ULONG WINAPI automatic_updates_AddRef( @@ -151,7 +151,7 @@ IAutomaticUpdates *This ) { FIXME("\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI automatic_updates_ShowSettingsDialog( @@ -211,10 +211,10 @@ updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); if (!updates) return E_OUTOFMEMORY; - updates->vtbl = &automatic_updates_vtbl; + updates->IAutomaticUpdates_iface.lpVtbl = &automatic_updates_vtbl; updates->refs = 1; - *ppObj = &updates->vtbl; + *ppObj = &updates->IAutomaticUpdates_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Added: trunk/reactos/dll/win32/wuapi/wuapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi.rc?r… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi.rc (added) +++ trunk/reactos/dll/win32/wuapi/wuapi.rc [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -1,0 +1,2 @@ +/* @makedep: wuapi_tlb.tlb */ +1 TYPELIB wuapi_tlb.tlb Propchange: trunk/reactos/dll/win32/wuapi/wuapi.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wuapi/wuapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_priv… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; Added: trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_tlb.… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl (added) +++ trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -1,0 +1,21 @@ +/* + * Typelib for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wuapi.idl" Propchange: trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/wuapi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wuapi.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/wuapi.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wuapi.idl [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -1301,6 +1301,26 @@ } [ + object, + uuid(ADE87BF7-7B56-4275-8FAB-B9B0E591844B), + oleautomation, + hidden, + dual, + nonextensible, + pointer_default(unique), +] +interface ISystemInformation : IDispatch +{ + [propget] + HRESULT OemHardwareSupportLink( + [out, retval] BSTR *retval); + + [propget] + HRESULT RebootRequired( + [out, retval] VARIANT_BOOL *retval); +} + +[ helpstring("AutomaticUpdates Class"), threading(both), progid("Microsoft.Update.AutoUpdate.1"), @@ -1318,4 +1338,13 @@ ] coclass UpdateSession { interface IUpdateSession; } +[ + helpstring("SystemInformation Class"), + threading(both), + progid("Microsoft.Update.SystemInfo.1"), + vi_progid("Microsoft.Update.SystemInfo"), + uuid(C01B9BA0-BEA7-41BA-B604-D0A36F469133) +] +coclass SystemInformation { interface ISystemInformation; } + } /* WUApiLib */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Jun 21 09:05:15 2012 @@ -193,7 +193,7 @@ reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Synced to Wine-1.5.4 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 -reactos/dll/win32/wuapi # Autosync +reactos/dll/win32/wuapi # Synced to Wine-1.5.4 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.4 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.4 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.4 @@ -246,9 +246,6 @@ reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130 reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 - -snmpapi - - reactos/dll/win32/snmpapi/main.c # Synced at 20090222 User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39

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