Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [PSDK] Update http.h. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f07f98945e77f0d6712c8… commit f07f98945e77f0d6712c88ffd7638695b5fe136b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:31:30 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:31:30 2019 +0100 [PSDK] Update http.h. CORE-16441 --- sdk/include/psdk/http.h | 390 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 387 insertions(+), 3 deletions(-) diff --git a/sdk/include/psdk/http.h b/sdk/include/psdk/http.h index db8a3d4e902..7586d0cbe01 100644 --- a/sdk/include/psdk/http.h +++ b/sdk/include/psdk/http.h @@ -37,10 +37,28 @@ typedef struct _HTTPAPI_VERSION #define HTTPAPI_VERSION_1 {1,0} #define HTTPAPI_VERSION_2 {2,0} -/* HttpInitialize and HttpTerminate flags */ +#define HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING 0x00000001 +#define HTTP_CREATE_REQUEST_QUEUE_FLAG_CONTROLLER 0x00000002 + #define HTTP_INITIALIZE_SERVER 0x00000001 #define HTTP_INITIALIZE_CONFIG 0x00000002 +#define HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY 0x00000001 +#define HTTP_RECEIVE_REQUEST_FLAG_FLUSH_BODY 0x00000002 + +#define HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS 0x00000001 +#define HTTP_REQUEST_FLAG_IP_ROUTED 0x00000002 +#define HTTP_REQUEST_FLAG_HTTP2 0x00000004 + +#define HTTP_SEND_RESPONSE_FLAG_DISCONNECT 0x00000001 +#define HTTP_SEND_RESPONSE_FLAG_MORE_DATA 0x00000002 +#define HTTP_SEND_RESPONSE_FLAG_BUFFER_DATA 0x00000004 +#define HTTP_SEND_RESPONSE_FLAG_ENABLE_NAGLING 0x00000008 +#define HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES 0x00000020 +#define HTTP_SEND_RESPONSE_FLAG_OPAQUE 0x00000040 + +#define HTTP_URL_FLAG_REMOVE_ALL 0x0000001 + typedef enum _HTTP_SERVICE_CONFIG_ID { HttpServiceConfigIPListenList, @@ -50,18 +68,384 @@ typedef enum _HTTP_SERVICE_CONFIG_ID HttpServiceConfigMax } HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; +#define HTTP_NULL_ID ((ULONGLONG)0) + typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; +typedef HTTP_OPAQUE_ID HTTP_CONNECTION_ID, *PHTTP_CONNECTION_ID; +typedef HTTP_OPAQUE_ID HTTP_RAW_CONNECTION_ID, *PHTTP_RAW_CONNECTION_ID; +typedef HTTP_OPAQUE_ID HTTP_REQUEST_ID, *PHTTP_REQUEST_ID; typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; +typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID; +typedef ULONGLONG HTTP_URL_CONTEXT; + +typedef struct _HTTP_VERSION +{ + USHORT MajorVersion; + USHORT MinorVersion; +} HTTP_VERSION, *PHTTP_VERSION; + +typedef enum _HTTP_VERB +{ + HttpVerbUnparsed = 0, + HttpVerbUnknown, + HttpVerbInvalid, + HttpVerbOPTIONS, + HttpVerbGET, + HttpVerbHEAD, + HttpVerbPOST, + HttpVerbPUT, + HttpVerbDELETE, + HttpVerbTRACE, + HttpVerbCONNECT, + HttpVerbTRACK, + HttpVerbMOVE, + HttpVerbCOPY, + HttpVerbPROPFIND, + HttpVerbPROPPATCH, + HttpVerbMKCOL, + HttpVerbLOCK, + HttpVerbUNLOCK, + HttpVerbSEARCH, + HttpVerbMaximum, +} HTTP_VERB, *PHTTP_VERB; + +typedef struct _HTTP_COOKED_URL +{ + USHORT FullUrlLength; + USHORT HostLength; + USHORT AbsPathLength; + USHORT QueryStringLength; + const WCHAR *pFullUrl; + const WCHAR *pHost; + const WCHAR *pAbsPath; + const WCHAR *pQueryString; +} HTTP_COOKED_URL, *PHTTP_COOKED_URL; + +typedef struct _HTTP_TRANSPORT_ADDRESS +{ + SOCKADDR *pRemoteAddress; + SOCKADDR *pLocalAddress; +} HTTP_TRANSPORT_ADDRESS, *PHTTP_TRANSPORT_ADDRESS; + +typedef struct _HTTP_UNKNOWN_HEADER +{ + USHORT NameLength; + USHORT RawValueLength; + const char *pName; + const char *pRawValue; +} HTTP_UNKNOWN_HEADER, *PHTTP_UNKNOWN_HEADER; + +typedef struct _HTTP_KNOWN_HEADER +{ + USHORT RawValueLength; + const char *pRawValue; +} HTTP_KNOWN_HEADER, *PHTTP_KNOWN_HEADER; + +typedef enum _HTTP_HEADER_ID +{ + HttpHeaderCacheControl = 0, + HttpHeaderConnection = 1, + HttpHeaderDate = 2, + HttpHeaderKeepAlive = 3, + HttpHeaderPragma = 4, + HttpHeaderTrailer = 5, + HttpHeaderTransferEncoding = 6, + HttpHeaderUpgrade = 7, + HttpHeaderVia = 8, + HttpHeaderWarning = 9, + HttpHeaderAllow = 10, + HttpHeaderContentLength = 11, + HttpHeaderContentType = 12, + HttpHeaderContentEncoding = 13, + HttpHeaderContentLanguage = 14, + HttpHeaderContentLocation = 15, + HttpHeaderContentMd5 = 16, + HttpHeaderContentRange = 17, + HttpHeaderExpires = 18, + HttpHeaderLastModified = 19, + + HttpHeaderAccept = 20, + HttpHeaderAcceptCharset = 21, + HttpHeaderAcceptEncoding = 22, + HttpHeaderAcceptLanguage = 23, + HttpHeaderAuthorization = 24, + HttpHeaderCookie = 25, + HttpHeaderExpect = 26, + HttpHeaderFrom = 27, + HttpHeaderHost = 28, + HttpHeaderIfMatch = 29, + HttpHeaderIfModifiedSince = 30, + HttpHeaderIfNoneMatch = 31, + HttpHeaderIfRange = 32, + HttpHeaderIfUnmodifiedSince = 33, + HttpHeaderMaxForwards = 34, + HttpHeaderProxyAuthorization = 35, + HttpHeaderReferer = 36, + HttpHeaderRange = 37, + HttpHeaderTe = 38, + HttpHeaderTranslate = 39, + HttpHeaderUserAgent = 40, + HttpHeaderRequestMaximum = 41, + + HttpHeaderAcceptRanges = 20, + HttpHeaderAge = 21, + HttpHeaderEtag = 22, + HttpHeaderLocation = 23, + HttpHeaderProxyAuthenticate = 24, + HttpHeaderRetryAfter = 25, + HttpHeaderServer = 26, + HttpHeaderSetCookie = 27, + HttpHeaderVary = 28, + HttpHeaderWwwAuthenticate = 29, + HttpHeaderResponseMaximum = 30, + + HttpHeaderMaximum = 41, +} HTTP_HEADER_ID, *PHTTP_HEADER_ID; + +typedef struct _HTTP_REQUEST_HEADERS +{ + USHORT UnknownHeaderCount; + HTTP_UNKNOWN_HEADER *pUnknownHeaders; + USHORT TrailerCount; + HTTP_UNKNOWN_HEADER *pTrailers; + HTTP_KNOWN_HEADER KnownHeaders[HttpHeaderRequestMaximum]; +} HTTP_REQUEST_HEADERS, *PHTTP_REQUEST_HEADERS; + +typedef enum _HTTP_DATA_CHUNK_TYPE +{ + HttpDataChunkFromMemory = 0, + HttpDataChunkFromFileHandle, + HttpDataChunkFromFragmentCache, + HttpDataChunkFromFragmentCacheEx, + HttpDataChunkMaximum, +} HTTP_DATA_CHUNK_TYPE, *PHTTP_DATA_CHUNK_TYPE; + +#define HTTP_BYTE_RANGE_TO_EOF ((ULONGLONG)-1) + +typedef struct _HTTP_BYTE_RANGE +{ + ULARGE_INTEGER StartingOffset; + ULARGE_INTEGER Length; +} HTTP_BYTE_RANGE, *PHTTP_BYTE_RANGE; + +typedef struct _HTTP_DATA_CHUNK +{ + HTTP_DATA_CHUNK_TYPE DataChunkType; + __C89_NAMELESS union + { + struct + { + void *pBuffer; + ULONG BufferLength; + } FromMemory; + struct + { + HTTP_BYTE_RANGE ByteRange; + HANDLE FileHandle; + } FromFileHandle; + struct + { + USHORT FragmentNameLength; + const WCHAR *pFragmentName; + } FromFragmentCache; + } DUMMYUNIONNAME; +} HTTP_DATA_CHUNK, *PHTTP_DATA_CHUNK; + +typedef struct _HTTP_SSL_CLIENT_CERT_INFO +{ + ULONG CertFlags; + ULONG CertEncodedSize; + UCHAR *pCertEncoded; + HANDLE Token; + BOOLEAN CertDeniedByMapper; +} HTTP_SSL_CLIENT_CERT_INFO, *PHTTP_SSL_CLIENT_CERT_INFO; + +typedef struct _HTTP_SSL_INFO +{ + USHORT ServerCertKeySize; + USHORT ConnectionKeySize; + ULONG ServerCertIssuerSize; + ULONG ServerCertSubjectSize; + const char *pServerCertIssuer; + const char *pServerCertSubject; + HTTP_SSL_CLIENT_CERT_INFO *pClientCertInfo; + ULONG SslClientCertNegotiated; +} HTTP_SSL_INFO, *PHTTP_SSL_INFO; + +typedef struct _HTTP_REQUEST_V1 +{ + ULONG Flags; + HTTP_CONNECTION_ID ConnectionId; + HTTP_REQUEST_ID RequestId; + HTTP_URL_CONTEXT UrlContext; + HTTP_VERSION Version; + HTTP_VERB Verb; + USHORT UnknownVerbLength; + USHORT RawUrlLength; + const char *pUnknownVerb; + const char *pRawUrl; + HTTP_COOKED_URL CookedUrl; + HTTP_TRANSPORT_ADDRESS Address; + HTTP_REQUEST_HEADERS Headers; + ULONGLONG BytesReceived; + USHORT EntityChunkCount; + HTTP_DATA_CHUNK *pEntityChunks; + HTTP_RAW_CONNECTION_ID RawConnectionId; + HTTP_SSL_INFO *pSslInfo; +} HTTP_REQUEST_V1; -ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); -ULONG WINAPI HttpTerminate(ULONG,PVOID); +typedef enum _HTTP_REQUEST_INFO_TYPE +{ + HttpRequestInfoTypeAuth = 0, +} HTTP_REQUEST_INFO_TYPE, *PHTTP_REQUEST_INFO_TYPE; + +typedef struct _HTTP_REQUEST_INFO +{ + HTTP_REQUEST_INFO_TYPE InfoType; + ULONG InfoLength; + void *pInfo; +} HTTP_REQUEST_INFO, *PHTTP_REQUEST_INFO; + +#ifdef __cplusplus +typedef struct _HTTP_REQUEST_V2 : HTTP_REQUEST_V1 +{ + USHORT RequestInfoCount; + HTTP_REQUEST_INFO *pRequestInfo; +} HTTP_REQUEST_V2, *PHTTP_REQUEST_V2; +#else +typedef struct _HTTP_REQUEST_V2 +{ + HTTP_REQUEST_V1 s; + USHORT RequestInfoCount; + HTTP_REQUEST_INFO *pRequestInfo; +} HTTP_REQUEST_V2, *PHTTP_REQUEST_V2; +#endif + +typedef HTTP_REQUEST_V2 HTTP_REQUEST, *PHTTP_REQUEST; + +typedef struct _HTTP_RESPONSE_HEADERS +{ + USHORT UnknownHeaderCount; + HTTP_UNKNOWN_HEADER *pUnknownHeaders; + USHORT TrailerCount; + HTTP_UNKNOWN_HEADER *pTrailers; + HTTP_KNOWN_HEADER KnownHeaders[HttpHeaderResponseMaximum]; +} HTTP_RESPONSE_HEADERS,*PHTTP_RESPONSE_HEADERS; + +typedef struct _HTTP_RESPONSE_V1 +{ + ULONG Flags; + HTTP_VERSION Version; + USHORT StatusCode; + USHORT ReasonLength; + const char *pReason; + HTTP_RESPONSE_HEADERS Headers; + USHORT EntityChunkCount; + HTTP_DATA_CHUNK *pEntityChunks; +} HTTP_RESPONSE_V1, *PHTTP_RESPONSE_V1; + +typedef enum _HTTP_RESPONSE_INFO_TYPE +{ + HttpResponseInfoTypeMultipleKnownHeaders = 0, + HttpResponseInfoTypeAuthenticationProperty, + HttpResponseInfoTypeQosProperty, + HttpResponseInfoTypeChannelBind, +} HTTP_RESPONSE_INFO_TYPE, *PHTTP_RESPONSE_INFO_TYPE; + +typedef struct _HTTP_RESPONSE_INFO +{ + HTTP_RESPONSE_INFO_TYPE Type; + ULONG Length; + void *pInfo; +} HTTP_RESPONSE_INFO, *PHTTP_RESPONSE_INFO; + +#ifdef __cplusplus +typedef struct _HTTP_RESPONSE_V2 : HTTP_RESPONSE_V1 +{ + USHORT ResponseInfoCount; + HTTP_RESPONSE_INFO *pResponseInfo; +} HTTP_RESPONSE_V2, *PHTTP_RESPONSE_V2; +#else +typedef struct _HTTP_RESPONSE_V2 +{ + HTTP_RESPONSE_V1 s; + USHORT ResponseInfoCount; + HTTP_RESPONSE_INFO *pResponseInfo; +} HTTP_RESPONSE_V2, *PHTTP_RESPONSE_V2; +#endif + +typedef HTTP_RESPONSE_V2 HTTP_RESPONSE, *PHTTP_RESPONSE; + +typedef enum _HTTP_CACHE_POLICY_TYPE +{ + HttpCachePolicyNocache, + HttpCachePolicyUserInvalidates, + HttpCachePolicyTimeToLive, + HttpCachePolicyMaximum, +} HTTP_CACHE_POLICY_TYPE, *PHTTP_CACHE_POLICY_TYPE; + +typedef struct _HTTP_CACHE_POLICY +{ + HTTP_CACHE_POLICY_TYPE Policy; + ULONG SecondsToLive; +} HTTP_CACHE_POLICY, *PHTTP_CACHE_POLICY; + +typedef enum _HTTP_LOG_DATA_TYPE +{ + HttpLogDataTypeFields = 0, +} HTTP_LOG_DATA_TYPE, *PHTTP_LOG_DATA_TYPE; + +typedef struct _HTTP_LOG_DATA +{ + HTTP_LOG_DATA_TYPE Type; +} HTTP_LOG_DATA, *PHTTP_LOG_DATA; + +typedef enum _HTTP_SERVER_PROPERTY +{ + HttpServerAuthenticationProperty, + HttpServerLoggingProperty, + HttpServerQosProperty, + HttpServerTimeoutsProperty, + HttpServerQueueLengthProperty, + HttpServerStateProperty, + HttpServer503VerbosityProperty, + HttpServerBindingProperty, + HttpServerExtendedAuthenticationProperty, + HttpServerListenEndpointProperty, + HttpServerChannelBindProperty, + HttpServerProtectionLevelProperty, +} HTTP_SERVER_PROPERTY, *PHTTP_SERVER_PROPERTY; + +typedef struct _HTTP_PROPERTY_FLAGS +{ + ULONG Present : 1; +} HTTP_PROPERTY_FLAGS, *PHTTP_PROPERTY_FLAGS; + +typedef struct _HTTP_BINDING_INFO +{ + HTTP_PROPERTY_FLAGS Flags; + HANDLE RequestQueueHandle; +} HTTP_BINDING_INFO, *PHTTP_BINDING_INFO; ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); +ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); +ULONG WINAPI HttpCloseRequestQueue(HANDLE handle); +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); +ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); +ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); +ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); +ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); +ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); #ifdef __cplusplus }

4 years, 11 months

[reactos] 01/01: [HLINK_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b3703d8cd791bba36462… commit 5b3703d8cd791bba364627c4e56a379d6a0c17e3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:31:02 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:31:02 2019 +0100 [HLINK_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/hlink/browse_ctx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/rostests/winetests/hlink/browse_ctx.c b/modules/rostests/winetests/hlink/browse_ctx.c index 319352500ca..95a72d77722 100644 --- a/modules/rostests/winetests/hlink/browse_ctx.c +++ b/modules/rostests/winetests/hlink/browse_ctx.c @@ -165,16 +165,12 @@ static void test_GetObject(void) { IHlinkBrowseContext *bc; IMoniker *dummy; - IBindCtx *bindctx; IUnknown *unk; WCHAR one[] = {'1',0}; WCHAR five[] = {'5',0}; DWORD cookie; HRESULT hres; - hres = CreateBindCtx(0, &bindctx); - ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); - hres = CreateItemMoniker(one, five, &dummy); ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); @@ -198,6 +194,7 @@ static void test_GetObject(void) ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); IHlinkBrowseContext_Release(bc); + IMoniker_Release(dummy); } START_TEST(browse_ctx)

4 years, 11 months

[reactos] 01/01: [HLINK] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61d79795bd2a3979c2f64… commit 61d79795bd2a3979c2f647caffa3b4248a3f722b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:30:25 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:30:25 2019 +0100 [HLINK] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/hlink/extserv.c | 3 +-- dll/win32/hlink/hlink_main.c | 10 +++++----- dll/win32/hlink/hlink_private.h | 5 ++--- dll/win32/hlink/link.c | 8 ++++---- media/doc/README.WINE | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dll/win32/hlink/extserv.c b/dll/win32/hlink/extserv.c index 3a97fa9cb95..98af4c1aecd 100644 --- a/dll/win32/hlink/extserv.c +++ b/dll/win32/hlink/extserv.c @@ -19,7 +19,6 @@ #include "hlink_private.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); @@ -243,7 +242,7 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR if (!pwzAdditionalHeaders) return S_OK; - len = strlenW(pwzAdditionalHeaders); + len = lstrlenW(pwzAdditionalHeaders); if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { static const WCHAR endlW[] = {'\r','\n',0}; diff --git a/dll/win32/hlink/hlink_main.c b/dll/win32/hlink/hlink_main.c index 4af5961753b..f7a6714c669 100644 --- a/dll/win32/hlink/hlink_main.c +++ b/dll/win32/hlink/hlink_main.c @@ -119,7 +119,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (pwzTarget) { - hash = strchrW(pwzTarget, '#'); + hash = wcschr(pwzTarget, '#'); if (hash) { if (hash == pwzTarget) @@ -280,11 +280,11 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) if(!pwzFileName) return E_INVALIDARG; - len = strlenW(pwzFileName)-4; + len = lstrlenW(pwzFileName)-4; if(len < 0) return S_FALSE; - return strcmpiW(pwzFileName+len, url_ext) ? S_FALSE : S_OK; + return wcsicmp(pwzFileName+len, url_ext) ? S_FALSE : S_OK; } /*********************************************************************** @@ -389,7 +389,7 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo if(fNoForceAbs) FIXME("Unsupported fNoForceAbs\n"); - if(!strncmpiW(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { + if(!_wcsnicmp(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { pwzDisplayName += ARRAY_SIZE(file_colonW); eaten += ARRAY_SIZE(file_colonW); @@ -409,7 +409,7 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo hres = CreateFileMoniker(pwzDisplayName, ppimk); if(SUCCEEDED(hres)) - *pcchEaten = eaten + strlenW(pwzDisplayName); + *pcchEaten = eaten + lstrlenW(pwzDisplayName); return hres; } diff --git a/dll/win32/hlink/hlink_private.h b/dll/win32/hlink/hlink_private.h index 26132091b9d..560e328eb8e 100644 --- a/dll/win32/hlink/hlink_private.h +++ b/dll/win32/hlink/hlink_private.h @@ -30,7 +30,6 @@ #include "hlink.h" #include "wine/heap.h" -#include "wine/unicode.h" extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; @@ -42,7 +41,7 @@ static inline LPWSTR hlink_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); memcpy(ret, str, size); } @@ -57,7 +56,7 @@ static inline LPWSTR hlink_co_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = CoTaskMemAlloc(size); memcpy(ret, str, size); } diff --git a/dll/win32/hlink/link.c b/dll/win32/hlink/link.c index e3de7646ef2..e11db125165 100644 --- a/dll/win32/hlink/link.c +++ b/dll/win32/hlink/link.c @@ -242,7 +242,7 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, CreateBindCtx( 0, &pbc); IMoniker_GetDisplayName(This->Moniker, pbc, NULL, &display_name); IBindCtx_Release(pbc); - This->absolute = display_name && strchrW(display_name, ':'); + This->absolute = display_name && wcschr(display_name, ':'); CoTaskMemFree(display_name); } } @@ -290,7 +290,7 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, if (FAILED(r)) { - LPCWSTR p = strchrW(pwzTarget, ':'); + LPCWSTR p = wcschr(pwzTarget, ':'); if (p && (p - pwzTarget > 1)) r = CreateURLMoniker(NULL, pwzTarget, &pMon); else @@ -739,7 +739,7 @@ static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) TRACE("(%p, %s)\n", pStm, debugstr_w(str)); - len = strlenW(str) + 1; + len = lstrlenW(str) + 1; hr = IStream_Write(pStm, &len, sizeof(len), NULL); if (FAILED(hr)) return hr; @@ -752,7 +752,7 @@ static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) static inline ULONG size_hlink_string(LPCWSTR str) { - return sizeof(DWORD) + (strlenW(str) + 1) * sizeof(WCHAR); + return sizeof(DWORD) + (lstrlenW(str) + 1) * sizeof(WCHAR); } static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 01c8ef6cb1e..d8d40757b98 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -71,7 +71,7 @@ dll/win32/fontsub # Synced to WineStaging-2.9 dll/win32/fusion # Synced to WineStaging-4.18 dll/win32/gdiplus # Synced to WineStaging-4.0 dll/win32/hhctrl.ocx # Synced to WineStaging-4.18 -dll/win32/hlink # Synced to WineStaging-4.0 +dll/win32/hlink # Synced to WineStaging-4.18 dll/win32/hnetcfg # Synced to WineStaging-4.18 dll/win32/httpapi # Synced to WineStaging-3.3 dll/win32/iccvid # Synced to WineStaging-4.0

4 years, 11 months

[reactos] 01/01: [KERNEL32] Fix MultiByteToWideChar(CP_UTF8, ...) (#2007)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a63678c9a94e704db6dbc… commit a63678c9a94e704db6dbca9316731817e56e0e45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 2 14:16:26 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 14:16:26 2019 +0900 [KERNEL32] Fix MultiByteToWideChar(CP_UTF8, ...) (#2007) CP_UTF8 validation was not strict. 5- or 6-byte length sequences are invalid in RFC 3629 UTF-8. CORE-16468 - Fix MultiByteToWideChar(CP_UTF8, ...) by making check strict. --- dll/win32/kernel32/winnls/string/nls.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/nls.c b/dll/win32/kernel32/winnls/string/nls.c index 78574c6b436..c6d5372dc38 100644 --- a/dll/win32/kernel32/winnls/string/nls.c +++ b/dll/win32/kernel32/winnls/string/nls.c @@ -28,10 +28,10 @@ static const char UTF8Length[128] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x90 - 0x9F */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xA0 - 0xAF */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xB0 - 0xBF */ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xC0 - 0xCF */ + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xC0 - 0xCF */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xD0 - 0xDF */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 0xE0 - 0xEF */ - 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 0, 0 /* 0xF0 - 0xFF */ + 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0 /* 0xF0 - 0xFF */ }; /* First byte mask depending on UTF-8 sequence length. */ @@ -389,21 +389,27 @@ IntMultiByteToWideCharUTF8(DWORD Flags, for (; MultiByteString < MbsEnd; WideCharCount++) { Char = *MultiByteString++; - if (Char < 0xC0) + if (Char < 0x80) { TrailLength = 0; continue; } - if (Char >= 0xF8 || (Char & 0xC0) == 0x80) + if ((Char & 0xC0) == 0x80) { TrailLength = 0; StringIsValid = FALSE; continue; } + TrailLength = UTF8Length[Char - 0x80]; + if (TrailLength == 0) + { + StringIsValid = FALSE; + continue; + } + CharIsValid = TRUE; MbsPtrSave = MultiByteString; - TrailLength = UTF8Length[Char - 0x80]; WideChar = Char & UTF8Mask[TrailLength]; while (TrailLength && MultiByteString < MbsEnd) @@ -427,9 +433,10 @@ IntMultiByteToWideCharUTF8(DWORD Flags, if (TrailLength) { WideCharCount++; + StringIsValid = FALSE; } - if (Flags == MB_ERR_INVALID_CHARS && (!StringIsValid || TrailLength)) + if (Flags == MB_ERR_INVALID_CHARS && !StringIsValid) { SetLastError(ERROR_NO_UNICODE_TRANSLATION); return 0; @@ -449,16 +456,24 @@ IntMultiByteToWideCharUTF8(DWORD Flags, TrailLength = 0; continue; } - if (Char >= 0xF8 || Char == 0x80 || (Char & 0xC0) == 0x80) + if ((Char & 0xC0) == 0x80) { *WideCharString++ = InvalidChar; TrailLength = 0; + StringIsValid = FALSE; + continue; + } + + TrailLength = UTF8Length[Char - 0x80]; + if (TrailLength == 0) + { + *WideCharString++ = InvalidChar; + StringIsValid = FALSE; continue; } CharIsValid = TRUE; MbsPtrSave = MultiByteString; - TrailLength = UTF8Length[Char - 0x80]; WideChar = Char & UTF8Mask[TrailLength]; while (TrailLength && MultiByteString < MbsEnd) @@ -481,6 +496,7 @@ IntMultiByteToWideCharUTF8(DWORD Flags, { *WideCharString++ = InvalidChar; MultiByteString = MbsPtrSave; + StringIsValid = FALSE; } }

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Restore 'Source Sans Pro' partially for Mizu theme (#1957)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be731acfdeb94f75287ea… commit be731acfdeb94f75287eaa691d63d40e610a927c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 2 09:25:00 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 09:25:00 2019 +0900 [MEDIA][FONTS] Restore 'Source Sans Pro' partially for Mizu theme (#1957) Deleting some fonts caused font regression in Mizu theme. CORE-16415 This PR will restore the following font files and related documents: SourceSansPro-Regular.ttf SourceSansPro-Bold.ttf SourceSansPro-BoldIt.ttf SourceSansPro-It.ttf --- media/fonts/CMakeLists.txt | 10 +++- media/fonts/SourceSansPro-Bold.ttf | Bin 0 -> 291424 bytes media/fonts/SourceSansPro-BoldIt.ttf | Bin 0 -> 103608 bytes media/fonts/SourceSansPro-It.ttf | Bin 0 -> 104236 bytes media/fonts/SourceSansPro-Regular.ttf | Bin 0 -> 293956 bytes media/fonts/doc/SourceSansPro/LICENSE.txt | 93 ++++++++++++++++++++++++++++++ media/fonts/doc/SourceSansPro/README.md | 20 +++++++ 7 files changed, 120 insertions(+), 3 deletions(-) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 46bb4587c55..61cc87db140 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -38,9 +38,10 @@ list(APPEND FONT_FILES palab.ttf palabi.ttf palai.ttf - symbol.ttf - tahoma.ttf - tahomabd.ttf + SourceSansPro-Regular.ttf + SourceSansPro-Bold.ttf + SourceSansPro-BoldIt.ttf + SourceSansPro-It.ttf #ssee874.fon # to be added #ssee1255.fon # to be added #ssee1256.fon # to be added @@ -49,6 +50,9 @@ list(APPEND FONT_FILES #sserifeg.fon # to be added #sserifer.fon # to be added #sserifet.fon # to be added + symbol.ttf + tahoma.ttf + tahomabd.ttf times.ttf timesbd.ttf timesbi.ttf diff --git a/media/fonts/SourceSansPro-Bold.ttf b/media/fonts/SourceSansPro-Bold.ttf new file mode 100644 index 00000000000..5d65c93242f Binary files /dev/null and b/media/fonts/SourceSansPro-Bold.ttf differ diff --git a/media/fonts/SourceSansPro-BoldIt.ttf b/media/fonts/SourceSansPro-BoldIt.ttf new file mode 100644 index 00000000000..3decd130070 Binary files /dev/null and b/media/fonts/SourceSansPro-BoldIt.ttf differ diff --git a/media/fonts/SourceSansPro-It.ttf b/media/fonts/SourceSansPro-It.ttf new file mode 100644 index 00000000000..f7af5377595 Binary files /dev/null and b/media/fonts/SourceSansPro-It.ttf differ diff --git a/media/fonts/SourceSansPro-Regular.ttf b/media/fonts/SourceSansPro-Regular.ttf new file mode 100644 index 00000000000..44486cdc670 Binary files /dev/null and b/media/fonts/SourceSansPro-Regular.ttf differ diff --git a/media/fonts/doc/SourceSansPro/LICENSE.txt b/media/fonts/doc/SourceSansPro/LICENSE.txt new file mode 100644 index 00000000000..df187637e18 --- /dev/null +++ b/media/fonts/doc/SourceSansPro/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media/fonts/doc/SourceSansPro/README.md b/media/fonts/doc/SourceSansPro/README.md new file mode 100644 index 00000000000..a3e1b9dded8 --- /dev/null +++ b/media/fonts/doc/SourceSansPro/README.md @@ -0,0 +1,20 @@ +# Source Sans Pro + +Source Sans Pro is a set of OpenType fonts that have been designed to work well +in user interface (UI) environments. In addition to a functional OpenType font, this open +source project provides all of the source files that were used to build this OpenType font +by using the AFDKO makeotf tool. + +## Font installation instructions + +* [Mac OS X](http://support.apple.com/kb/HT2509) +* [Windows](http://windows.microsoft.com/en-us/windows-vista/install-or-uninst… +* [Linux/Unix-based systems](https://github.com/adobe-fonts/source-code-pro/issues/17#issuecomm… + +## Getting Involved + +Send suggestions for changes to the Source Sans OpenType font project maintainer, [Paul D. Hunt](mailto:opensourcefonts@adobe.com?subject=[GitHub] Source Sans Pro), for consideration. + +## Further information + +For information about the design and background of Source Sans, please refer to the [official font readme file](http://www.adobe.com/products/type/font-information/source-sans-pro-r….

4 years, 11 months

[reactos] 01/01: [INF] Use the StartName entry for DHCP and DNS service install

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d7ee10f928e472dffb80… commit 7d7ee10f928e472dffb8004fa6207c82d62ed91e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 2 00:29:53 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 2 00:29:53 2019 +0100 [INF] Use the StartName entry for DHCP and DNS service install --- media/inf/nettcpip.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/inf/nettcpip.inf b/media/inf/nettcpip.inf index 00202f73d12..bbd08701583 100644 --- a/media/inf/nettcpip.inf +++ b/media/inf/nettcpip.inf @@ -270,10 +270,10 @@ StartType = 2 ErrorControl = 1 ServiceBinary = "%11%\svchost.exe -k netsvcs" LoadOrderGroup = TDI +StartName = "LocalSystem" AddReg=dhcp_AddReg [dhcp_AddReg] -HKR,,"ObjectName",0x00000000,"LocalSystem" HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll" [dns_Service_Inst] @@ -284,10 +284,10 @@ StartType = 2 ErrorControl = 1 ServiceBinary = "%11%\svchost.exe -k NetworkService" LoadOrderGroup = TDI +StartName = "NT AUTHORITY\NetworkService" AddReg=dns_AddReg [dns_AddReg] -HKR,,"ObjectName",0x00000000,"NT AUTHORITY\NetworkService" HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dnsrslvr.dll" ;-------------------------------- STRINGS -------------------------------

4 years, 11 months

[reactos] 01/01: [SETUPAPI] Add support for the optional StartName entry in inf file service install sections

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a95a0b61bd6c693c4ba9b… commit a95a0b61bd6c693c4ba9bdca5009bee0b3047dc6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 2 00:16:41 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 2 00:17:33 2019 +0100 [SETUPAPI] Add support for the optional StartName entry in inf file service install sections --- dll/win32/setupapi/install.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/install.c b/dll/win32/setupapi/install.c index 9fddeafc712..9527ad32067 100644 --- a/dll/win32/setupapi/install.c +++ b/dll/win32/setupapi/install.c @@ -42,6 +42,7 @@ static const WCHAR SecurityKey[] = {'S','e','c','u','r','i','t','y',0}; static const WCHAR ServiceBinaryKey[] = {'S','e','r','v','i','c','e','B','i','n','a','r','y',0}; static const WCHAR ServiceTypeKey[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR StartTypeKey[] = {'S','t','a','r','t','T','y','p','e',0}; +static const WCHAR StartNameKey[] = {'S','t','a','r','t','N','a','m','e',0}; static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR CmdLine[] = {'C','m','d','L','i','n','e',0}; @@ -1791,6 +1792,7 @@ static BOOL InstallOneService( LPWSTR DisplayName = NULL; LPWSTR Description = NULL; LPWSTR Dependencies = NULL; + LPWSTR StartName = NULL; LPWSTR SecurityDescriptor = NULL; PSECURITY_DESCRIPTOR sd = NULL; INT ServiceType, StartType, ErrorControl; @@ -1834,6 +1836,7 @@ static BOOL InstallOneService( GetLineText(hInf, ServiceSection, DisplayNameKey, &DisplayName); GetLineText(hInf, ServiceSection, DescriptionKey, &Description); GetLineText(hInf, ServiceSection, DependenciesKey, &Dependencies); + GetLineText(hInf, ServiceSection, StartNameKey, &StartName); /* If there is no group, we must not request a tag */ if (!LoadOrderGroup || !*LoadOrderGroup) @@ -1868,7 +1871,8 @@ static BOOL InstallOneService( LoadOrderGroup, useTag ? &tagId : NULL, Dependencies, - NULL, NULL); + StartName, + NULL); if (hService == NULL) goto cleanup; } @@ -1901,7 +1905,8 @@ static BOOL InstallOneService( (ServiceFlags & SPSVCINST_NOCLOBBER_LOADORDERGROUP && ServiceConfig->lpLoadOrderGroup) ? NULL : LoadOrderGroup, useTag ? &tagId : NULL, (ServiceFlags & SPSVCINST_NOCLOBBER_DEPENDENCIES && ServiceConfig->lpDependencies) ? NULL : Dependencies, - NULL, NULL, + StartName, + NULL, (ServiceFlags & SPSVCINST_NOCLOBBER_DISPLAYNAME && ServiceConfig->lpDisplayName) ? NULL : DisplayName); if (!ret) goto cleanup; @@ -2057,6 +2062,7 @@ cleanup: MyFree(Dependencies); MyFree(SecurityDescriptor); MyFree(GroupOrder); + MyFree(StartName); TRACE("Returning %d\n", ret); return ret;

4 years, 11 months

[reactos] 03/03: [NTOS][CLASS2][FFS][WIN32SS] Fix some pool tags so that they correctly appear in pool dump lists.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b2f1585933da12f7a247… commit 3b2f1585933da12f7a247f0a16003448c654a252 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 1 19:05:20 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 1 19:12:27 2019 +0100 [NTOS][CLASS2][FFS][WIN32SS] Fix some pool tags so that they correctly appear in pool dump lists. Reminder: in the code they are defined using reverse byte order (Windows/ReactOS are little-endian OSes). --- drivers/filesystems/ffs/src/init.c | 8 ++++---- drivers/storage/class/class2/class2.c | 2 +- ntoskrnl/fsrtl/filelock.c | 6 +++--- ntoskrnl/fsrtl/largemcb.c | 8 ++++---- ntoskrnl/fsrtl/notify.c | 8 ++++---- ntoskrnl/fsrtl/stackovf.c | 4 ++-- ntoskrnl/include/internal/tag.h | 2 +- win32ss/user/ntuser/tags.h | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/filesystems/ffs/src/init.c b/drivers/filesystems/ffs/src/init.c index df9189e6c7d..bf867a23f68 100644 --- a/drivers/filesystems/ffs/src/init.c +++ b/drivers/filesystems/ffs/src/init.c @@ -411,7 +411,7 @@ DriverEntry( NULL, 0, sizeof(FFS_IRP_CONTEXT), - 'SFF', + ' SFF', 0); ExInitializeNPagedLookasideList(&(FFSGlobal->FFSFcbLookasideList), @@ -419,7 +419,7 @@ DriverEntry( NULL, 0, sizeof(FFS_FCB), - 'SFF', + ' SFF', 0); ExInitializeNPagedLookasideList(&(FFSGlobal->FFSCcbLookasideList), @@ -427,7 +427,7 @@ DriverEntry( NULL, 0, sizeof(FFS_CCB), - 'SFF', + ' SFF', 0); ExInitializePagedLookasideList(&(FFSGlobal->FFSMcbLookasideList), @@ -435,7 +435,7 @@ DriverEntry( NULL, 0, sizeof(FFS_MCB), - 'SFF', + ' SFF', 0); #if FFS_UNLOAD diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index 5107c45f7ad..bf67de960fd 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -5120,7 +5120,7 @@ Return Value: NULL, NonPagedPoolMustSucceed, SCSI_REQUEST_BLOCK_SIZE, - 'ScsH', + 'HscS', (USHORT)NumberElements); } diff --git a/ntoskrnl/fsrtl/filelock.c b/ntoskrnl/fsrtl/filelock.c index d42e35b781a..9cb46e0d301 100644 --- a/ntoskrnl/fsrtl/filelock.c +++ b/ntoskrnl/fsrtl/filelock.c @@ -51,9 +51,9 @@ typedef struct _LOCK_SHARED_RANGE } LOCK_SHARED_RANGE, *PLOCK_SHARED_RANGE; -#define TAG_TABLE 'LTAB' -#define TAG_RANGE 'FSRA' -#define TAG_FLOCK 'FLCK' +#define TAG_TABLE 'BATL' +#define TAG_RANGE 'ARSF' +#define TAG_FLOCK 'KCLF' /* PRIVATE FUNCTIONS *********************************************************/ diff --git a/ntoskrnl/fsrtl/largemcb.c b/ntoskrnl/fsrtl/largemcb.c index 8e007660e6f..a70584b6663 100644 --- a/ntoskrnl/fsrtl/largemcb.c +++ b/ntoskrnl/fsrtl/largemcb.c @@ -55,7 +55,7 @@ static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { PVOID Result; PBASE_MCB Mcb = (PBASE_MCB)Table->TableContext; - Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'LMCB'); + Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'BCML'); DPRINT("McbMappingAllocate(%lu) => %p\n", Bytes, Result); return Result; } @@ -63,7 +63,7 @@ static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) static VOID NTAPI McbMappingFree(PRTL_GENERIC_TABLE Table, PVOID Buffer) { DPRINT("McbMappingFree(%p)\n", Buffer); - ExFreePoolWithTag(Buffer, 'LMCB'); + ExFreePoolWithTag(Buffer, 'BCML'); } static @@ -429,7 +429,7 @@ FsRtlInitializeBaseMcb(IN PBASE_MCB OpaqueMcb, { Mcb->Mapping = ExAllocatePoolWithTag(PoolType | POOL_RAISE_IF_ALLOCATION_FAILURE, sizeof(LARGE_MCB_MAPPING), - 'FSBC'); + 'CBSF'); } Mcb->PoolType = PoolType; @@ -1041,7 +1041,7 @@ FsRtlUninitializeBaseMcb(IN PBASE_MCB Mcb) } else { - ExFreePoolWithTag(Mcb->Mapping, 'FSBC'); + ExFreePoolWithTag(Mcb->Mapping, 'CBSF'); } } diff --git a/ntoskrnl/fsrtl/notify.c b/ntoskrnl/fsrtl/notify.c index 73f6e480685..e7b73771232 100644 --- a/ntoskrnl/fsrtl/notify.c +++ b/ntoskrnl/fsrtl/notify.c @@ -681,7 +681,7 @@ FsRtlNotifyCleanup(IN PNOTIFY_SYNC NotifySync, } /* Finally, free the notification, as it's not needed anymore */ - ExFreePoolWithTag(NotifyChange, 'FSrN'); + ExFreePoolWithTag(NotifyChange, 'NrSF'); } } } @@ -842,7 +842,7 @@ FsRtlNotifyFilterChangeDirectory(IN PNOTIFY_SYNC NotifySync, /* Allocate new notification */ NotifyChange = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(NOTIFY_CHANGE), 'FSrN'); + sizeof(NOTIFY_CHANGE), 'NrSF'); RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE)); /* Set basic information */ @@ -1565,7 +1565,7 @@ FsRtlNotifyInitializeSync(IN PNOTIFY_SYNC *NotifySync) *NotifySync = NULL; RealNotifySync = ExAllocatePoolWithTag(NonPagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(REAL_NOTIFY_SYNC), 'FSNS'); + sizeof(REAL_NOTIFY_SYNC), 'SNSF'); ExInitializeFastMutex(&(RealNotifySync->FastMutex)); RealNotifySync->OwningThread = 0; RealNotifySync->OwnerCount = 0; @@ -1640,7 +1640,7 @@ FsRtlNotifyUninitializeSync(IN PNOTIFY_SYNC *NotifySync) { if (*NotifySync) { - ExFreePoolWithTag(*NotifySync, 'FSNS'); + ExFreePoolWithTag(*NotifySync, 'SNSF'); *NotifySync = NULL; } } diff --git a/ntoskrnl/fsrtl/stackovf.c b/ntoskrnl/fsrtl/stackovf.c index c5dda39f7ac..7462b83a733 100644 --- a/ntoskrnl/fsrtl/stackovf.c +++ b/ntoskrnl/fsrtl/stackovf.c @@ -61,7 +61,7 @@ FsRtlStackOverflowRead(IN PVOID Context) /* Otherwise, free the work item */ else { - ExFreePoolWithTag(WorkItem, 'FSrs'); + ExFreePoolWithTag(WorkItem, 'srSF'); } /* Reset top level */ @@ -81,7 +81,7 @@ FsRtlpPostStackOverflow(IN PVOID Context, PSTACK_OVERFLOW_WORK_ITEM WorkItem; /* Try to allocate a work item */ - WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(STACK_OVERFLOW_WORK_ITEM), 'FSrs'); + WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(STACK_OVERFLOW_WORK_ITEM), 'srSF'); if (WorkItem == NULL) { /* If we failed, and we are not a paging file, just raise an error */ diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index 4b36524ea5d..9f86c7cb623 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -108,7 +108,7 @@ #define TAG_DRIVER_MEM 'MVRD' /* drvm */ #define TAG_MODULE_OBJECT 'omlk' /* klmo - kernel ldr module object */ #define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ -#define TAG_LDR_IMPORTS 'klim' /* klim - kernel ldr imports */ +#define TAG_LDR_IMPORTS 'milk' /* klim - kernel ldr imports */ /* formerly located in lpc/connect */ #define TAG_LPC_CONNECT_MESSAGE 'CCPL' diff --git a/win32ss/user/ntuser/tags.h b/win32ss/user/ntuser/tags.h index a7fdfd67243..0cce9da16ff 100644 --- a/win32ss/user/ntuser/tags.h +++ b/win32ss/user/ntuser/tags.h @@ -15,7 +15,7 @@ #define TAG_COLORMAP 'MLOC' /* Color map */ #define TAG_GDIHNDTBLE 'bthG' /* GDI handle table */ #define TAG_DIB ' BID' /* Dib */ -#define TAG_INTERNAL_SYNC 'sync' /* Internal synchronization object. Waiting for a better suggestion than 'sync' */ +#define TAG_INTERNAL_SYNC 'cnys' /* Internal synchronization object. Waiting for a better suggestion than 'sync' */ /* GDI objects from the handle table */ #define TAG_DC GDITAG_HMGR_LOOKASIDE_DC_TYPE

4 years, 11 months

[reactos] 02/03: [NTOS:KDBG] Fix the display type of GDT TRAPGATE32.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29f6d029454d200b44ba7… commit 29f6d029454d200b44ba7752fdd49f8cf529de69 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 28 00:59:44 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 1 19:12:27 2019 +0100 [NTOS:KDBG] Fix the display type of GDT TRAPGATE32. --- ntoskrnl/kdbg/kdb_cli.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index e4da9d78903..b4d750db304 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -2024,19 +2024,19 @@ KdbpCmdGdtLdtIdt( { switch (Type) { - case 1: SegType = "TSS16(Avl)"; break; - case 2: SegType = "LDT"; break; - case 3: SegType = "TSS16(Busy)"; break; - case 4: SegType = "CALLGATE16"; break; - case 5: SegType = "TASKGATE"; break; - case 6: SegType = "INTGATE16"; break; - case 7: SegType = "TRAPGATE16"; break; - case 9: SegType = "TSS32(Avl)"; break; - case 11: SegType = "TSS32(Busy)"; break; - case 12: SegType = "CALLGATE32"; break; - case 14: SegType = "INTGATE32"; break; - case 15: SegType = "INTGATE32"; break; - default: SegType = "UNKNOWN"; break; + case 1: SegType = "TSS16(Avl)"; break; + case 2: SegType = "LDT"; break; + case 3: SegType = "TSS16(Busy)"; break; + case 4: SegType = "CALLGATE16"; break; + case 5: SegType = "TASKGATE"; break; + case 6: SegType = "INTGATE16"; break; + case 7: SegType = "TRAPGATE16"; break; + case 9: SegType = "TSS32(Avl)"; break; + case 11: SegType = "TSS32(Busy)"; break; + case 12: SegType = "CALLGATE32"; break; + case 14: SegType = "INTGATE32"; break; + case 15: SegType = "TRAPGATE32"; break; + default: SegType = "UNKNOWN"; break; } if (!(Type >= 1 && Type <= 3) && @@ -2061,7 +2061,7 @@ KdbpCmdGdtLdtIdt( SegType = "CODE16"; } - if ((SegDesc[1] & (1 << 15)) == 0) /* not present */ + if ((SegDesc[1] & (1 << 15)) == 0) /* Not present */ { KdbpPrint(" %03d 0x%04x %-11s [NP] [NP] %02d NP\n", i / 8, i | Dpl | ul, SegType, Dpl);

4 years, 11 months

[reactos] 01/03: [NTOS] Just go ahead and allow printing all the printable ASCII characters in ExpTagAllowPrint().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5e86c0fd3488a3c38fe5… commit f5e86c0fd3488a3c38fe53e5568a8c00784f1ed5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 27 01:19:11 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 1 19:09:29 2019 +0100 [NTOS] Just go ahead and allow printing all the printable ASCII characters in ExpTagAllowPrint(). As documented in https://docs.microsoft.com/fr-fr/windows-hardware/drivers/ddi/wdm/nf-wdm-ex… pool tag "characters" must be a value in the range 0x20 (space) to 0x7E (tilde), which happen indeed to be the range of printable (non-extended) ASCII characters. (The display problem was originally caught while attempting to display the pool tag 0x3a306847 corresponding to 'Gh0:', a win32ss GDIOBJ pool tag encoded with macro GDIOBJ_POOL_TAG().) --- ntoskrnl/mm/ARM3/expool.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 416a2fbda78..bccb0e9bbdd 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -463,21 +463,13 @@ ExpComputePartialHashForAddress(IN PVOID BaseAddress) } #if DBG -FORCEINLINE -BOOLEAN -ExpTagAllowPrint(CHAR Tag) -{ - if ((Tag >= 'a' && Tag <= 'z') || - (Tag >= 'A' && Tag <= 'Z') || - (Tag >= '0' && Tag <= '9') || - Tag == ' ' || Tag == '=' || - Tag == '?' || Tag == '@') - { - return TRUE; - } - - return FALSE; -} +/* + * FORCEINLINE + * BOOLEAN + * ExpTagAllowPrint(CHAR Tag); + */ +#define ExpTagAllowPrint(Tag) \ + ((Tag) >= 0x20 /* Space */ && (Tag) <= 0x7E /* Tilde */) #ifdef KDBG #define MiDumperPrint(dbg, fmt, ...) \ @@ -587,7 +579,7 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask, ULONG Flags) { if (Verbose) { - MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, + MiDumperPrint(CalledFromDbg, "0x%08x\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, TableEntry->NonPagedAllocs, TableEntry->NonPagedFrees, (TableEntry->NonPagedAllocs - TableEntry->NonPagedFrees), TableEntry->NonPagedBytes, TableEntry->PagedAllocs, TableEntry->PagedFrees, @@ -595,7 +587,7 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask, ULONG Flags) } else { - MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, + MiDumperPrint(CalledFromDbg, "0x%08x\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, TableEntry->PagedAllocs, TableEntry->PagedBytes); }

4 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019