Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hpoussin] 64902: [NTOS:IO] Replace an error message by an assert This was expected to be done soon after r32518.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Oct 22 19:17:13 2014 New Revision: 64902 URL: http://svn.reactos.org/svn/reactos?rev=64902&view=rev Log: [NTOS:IO] Replace an error message by an assert This was expected to be done soon after r32518. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Oct 22 19:17:13 2014 @@ -310,14 +310,8 @@ HANDLE CCSKey, ServiceKey; PVOID BaseAddress; - DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); - - /* FIXME: This check may be removed once the bug is fixed */ - if (ServiceName->Buffer == NULL) - { - DPRINT1("If you see this, please report to Fireball or hpoussin!\n"); - return STATUS_UNSUCCESSFUL; - } + ASSERT(ServiceName->Length); + DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); if (ExpInTextModeSetup) {

9 years, 11 months

[akhaldi] 64901: [ADVAPI32/CRED] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 18:41:40 2014 New Revision: 64901 URL: http://svn.reactos.org/svn/reactos?rev=64901&view=rev Log: [ADVAPI32/CRED] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/sec/cred.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Wed Oct 22 18:41:40 2014 @@ -178,4 +178,16 @@ DWORD CheckNtMartaPresent(VOID); +/* heap allocation helpers */ +static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + #endif /* __ADVAPI32_H */ Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Wed Oct 22 18:41:40 2014 @@ -236,15 +236,13 @@ DWORD *len) { OSStatus status; - UInt32 i; - UInt32 cred_blob_len; + UInt32 i, cred_blob_len; void *cred_blob; - LPWSTR domain = NULL; - LPWSTR user = NULL; + WCHAR *user = NULL; BOOL user_name_present = FALSE; SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServerItemAttr, kSecSecurityDomainItemAttr, kSecAccountItemAttr, + UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, kSecCommentItemAttr, kSecCreationDateItemAttr }; info.count = sizeof(info_tags)/sizeof(info_tags[0]); info.tag = info_tags; @@ -294,8 +292,8 @@ { switch (attr_list->attr[i].tag) { - case kSecServerItemAttr: - TRACE("kSecServerItemAttr: %.*s\n", (int)attr_list->attr[i].length, + case kSecServiceItemAttr: + TRACE("kSecServiceItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data); if (!attr_list->attr[i].data) continue; if (buffer) @@ -324,7 +322,7 @@ if (!attr_list->attr[i].data) continue; str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0); - user = HeapAlloc(GetProcessHeap(), 0, (str_len + 1) * sizeof(WCHAR)); + user = heap_alloc((str_len + 1) * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, user, str_len); user[str_len] = '\0'; @@ -352,20 +350,6 @@ *len += (str_len + 1) * sizeof(WCHAR); } break; - case kSecSecurityDomainItemAttr: - { - INT str_len; - TRACE("kSecSecurityDomainItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - domain = HeapAlloc(GetProcessHeap(), 0, (str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, domain, str_len); - domain[str_len] = '\0'; - break; - } case kSecCreationDateItemAttr: TRACE("kSecCreationDateItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data); @@ -382,6 +366,9 @@ credential->LastWritten.dwHighDateTime = win_time.u.HighPart; } break; + default: + FIXME("unhandled attribute %lu\n", attr_list->attr[i].tag); + break; } } @@ -390,18 +377,6 @@ INT str_len; if (buffer) credential->UserName = (LPWSTR)buffer; - if (domain) - { - str_len = strlenW(domain); - *len += (str_len + 1) * sizeof(WCHAR); - if (buffer) - { - memcpy(credential->UserName, domain, str_len * sizeof(WCHAR)); - /* FIXME: figure out when to use an '@' */ - credential->UserName[str_len] = '\\'; - buffer += (str_len + 1) * sizeof(WCHAR); - } - } str_len = strlenW(user); *len += (str_len + 1) * sizeof(WCHAR); if (buffer) @@ -411,8 +386,7 @@ TRACE("UserName = %s\n", debugstr_w(credential->UserName)); } } - HeapFree(GetProcessHeap(), 0, user); - HeapFree(GetProcessHeap(), 0, domain); + heap_free(user); if (cred_blob) { @@ -450,7 +424,7 @@ key.Length = key.MaximumLength = KEY_SIZE; key.Buffer = (unsigned char *)key_data; - encrypted_credential_blob = HeapAlloc(GetProcessHeap(), 0, credential_blob_size); + encrypted_credential_blob = heap_alloc(credential_blob_size); if (!encrypted_credential_blob) return ERROR_OUTOFMEMORY; memcpy(encrypted_credential_blob, credential_blob, credential_blob_size); @@ -459,7 +433,7 @@ SystemFunction032(&data, &key); ret = RegSetValueExW(hkey, wszPasswordValue, 0, REG_BINARY, encrypted_credential_blob, credential_blob_size); - HeapFree(GetProcessHeap(), 0, encrypted_credential_blob); + heap_free(encrypted_credential_blob); return ret; } @@ -520,15 +494,8 @@ { OSStatus status; SecKeychainItemRef keychain_item; - char *username; - char *domain = NULL; - char *password; - char *servername; - UInt32 userlen; - UInt32 domainlen = 0; - UInt32 pwlen; - UInt32 serverlen; - LPCWSTR p; + char *username, *password, *servername; + UInt32 userlen, pwlen, serverlen; SecKeychainAttribute attrs[1]; SecKeychainAttributeList attr_list; @@ -541,61 +508,36 @@ if (credential->AttributeCount) FIXME("custom attributes not supported\n"); - p = strchrW(credential->UserName, '\\'); - if (p) - { - domainlen = WideCharToMultiByte(CP_UTF8, 0, credential->UserName, - p - credential->UserName, NULL, 0, NULL, NULL); - domain = HeapAlloc(GetProcessHeap(), 0, (domainlen + 1) * sizeof(*domain)); - WideCharToMultiByte(CP_UTF8, 0, credential->UserName, p - credential->UserName, - domain, domainlen, NULL, NULL); - domain[domainlen] = '\0'; - p++; - } - else - p = credential->UserName; - userlen = WideCharToMultiByte(CP_UTF8, 0, p, -1, NULL, 0, NULL, NULL); - username = HeapAlloc(GetProcessHeap(), 0, userlen * sizeof(*username)); - WideCharToMultiByte(CP_UTF8, 0, p, -1, username, userlen, NULL, NULL); + userlen = WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, NULL, 0, NULL, NULL); + username = heap_alloc(userlen * sizeof(*username)); + WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, username, userlen, NULL, NULL); serverlen = WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, NULL, 0, NULL, NULL); - servername = HeapAlloc(GetProcessHeap(), 0, serverlen * sizeof(*servername)); + servername = heap_alloc(serverlen * sizeof(*servername)); WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, servername, serverlen, NULL, NULL); pwlen = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, credential->CredentialBlobSize / sizeof(WCHAR), NULL, 0, NULL, NULL); - password = HeapAlloc(GetProcessHeap(), 0, pwlen * sizeof(*domain)); + password = heap_alloc(pwlen * sizeof(*password)); WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, credential->CredentialBlobSize / sizeof(WCHAR), password, pwlen, NULL, NULL); - TRACE("adding server %s, domain %s, username %s using Keychain\n", servername, domain, username); - status = SecKeychainAddInternetPassword(NULL, strlen(servername), servername, - strlen(domain), domain, strlen(username), - username, 0, NULL, 0, - 0 /* no protocol */, - kSecAuthenticationTypeDefault, - strlen(password), password, &keychain_item); + TRACE("adding server %s, username %s using Keychain\n", servername, username); + status = SecKeychainAddGenericPassword(NULL, strlen(servername), servername, strlen(username), + username, strlen(password), password, &keychain_item); if (status != noErr) - ERR("SecKeychainAddInternetPassword returned %ld\n", status); + ERR("SecKeychainAddGenericPassword returned %ld\n", status); if (status == errSecDuplicateItem) { - SecKeychainItemRef keychain_item; - - status = SecKeychainFindInternetPassword(NULL, strlen(servername), servername, - strlen(domain), domain, - strlen(username), username, - 0, NULL /* any path */, 0, - 0 /* any protocol */, - 0 /* any authentication type */, - 0, NULL, &keychain_item); + status = SecKeychainFindGenericPassword(NULL, strlen(servername), servername, strlen(username), + username, NULL, NULL, &keychain_item); if (status != noErr) - ERR("SecKeychainFindInternetPassword returned %ld\n", status); - } - HeapFree(GetProcessHeap(), 0, domain); - HeapFree(GetProcessHeap(), 0, username); - HeapFree(GetProcessHeap(), 0, servername); + ERR("SecKeychainFindGenericPassword returned %ld\n", status); + } + heap_free(username); + heap_free(servername); if (status != noErr) { - HeapFree(GetProcessHeap(), 0, password); + heap_free(password); return ERROR_GEN_FAILURE; } if (credential->Comment) @@ -605,7 +547,7 @@ attrs[0].tag = kSecCommentItemAttr; attrs[0].length = WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, NULL, 0, NULL, NULL); if (attrs[0].length) attrs[0].length--; - attrs[0].data = HeapAlloc(GetProcessHeap(), 0, attrs[0].length); + attrs[0].data = heap_alloc(attrs[0].length); WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, attrs[0].data, attrs[0].length, NULL, NULL); } else @@ -617,8 +559,8 @@ preserve_blob ? 0 : strlen(password), preserve_blob ? NULL : password); if (credential->Comment) - HeapFree(GetProcessHeap(), 0, attrs[0].data); - HeapFree(GetProcessHeap(), 0, password); + heap_free(attrs[0].data); + heap_free(password); /* FIXME: set TargetAlias attribute */ CFRelease(keychain_item); if (status != noErr) @@ -702,7 +644,7 @@ len += sizeof(wszDomPasswdPrefix)/sizeof(wszDomPasswdPrefix[0]); } - key_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + key_name = heap_alloc(len * sizeof(WCHAR)); if (!key_name) return NULL; strcpyW(key_name, prefix); @@ -730,13 +672,13 @@ else if (type != REG_SZ) return FALSE; - target_name = HeapAlloc(GetProcessHeap(), 0, count); + target_name = heap_alloc(count); if (!target_name) return FALSE; ret = RegQueryValueExW(hkeyCred, NULL, 0, &type, (LPVOID)target_name, &count); if (ret != ERROR_SUCCESS || type != REG_SZ) { - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); return FALSE; } @@ -744,11 +686,11 @@ debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); return ret; } @@ -809,17 +751,17 @@ if (!filter) return TRUE; len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0); - if (!(target_name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) return FALSE; + if (!(target_name = heap_alloc((len + 1) * sizeof(WCHAR)))) return FALSE; MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len); target_name[len] = 0; TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); return ret; } @@ -835,14 +777,14 @@ SecKeychainGetUserInteractionAllowed(&saved_user_interaction_allowed); SecKeychainSetUserInteractionAllowed(false); - status = SecKeychainSearchCreateFromAttributes(NULL, kSecInternetPasswordItemClass, NULL, &search); + status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); if (status == noErr) { while (SecKeychainSearchCopyNext(search, &item) == noErr) { SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServerItemAttr }; + UInt32 info_tags[] = { kSecServiceItemAttr }; BOOL match; info.count = sizeof(info_tags)/sizeof(info_tags[0]); @@ -861,12 +803,12 @@ } else *len += sizeof(CREDENTIALW); - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) { SecKeychainItemFreeAttributesAndData(attr_list, NULL); continue; } - TRACE("server item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); + TRACE("service item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter); SecKeychainItemFreeAttributesAndData(attr_list, NULL); if (!match) continue; @@ -893,7 +835,7 @@ { OSStatus status; SecKeychainSearchRef search; - status = SecKeychainSearchCreateFromAttributes(NULL, kSecInternetPasswordItemClass, NULL, &search); + status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); if (status == noErr) { SecKeychainItemRef item; @@ -901,7 +843,7 @@ { SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServerItemAttr }; + UInt32 info_tags[] = { kSecServiceItemAttr }; LPWSTR target_name; INT str_len; info.count = sizeof(info_tags)/sizeof(info_tags[0]); @@ -913,23 +855,23 @@ WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); continue; } - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) { CFRelease(item); continue; } str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0); - target_name = HeapAlloc(GetProcessHeap(), 0, (str_len + 1) * sizeof(WCHAR)); + target_name = heap_alloc((str_len + 1) * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, target_name, str_len); /* nul terminate */ target_name[str_len] = '\0'; if (strcmpiW(TargetName, target_name)) { CFRelease(item); - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); continue; } - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); SecKeychainItemFreeAttributesAndData(attr_list, NULL); SecKeychainItemDelete(item); CFRelease(item); @@ -1142,7 +1084,7 @@ } len = MultiByteToWideChar(CP_ACP, 0, TargetName, -1, NULL, 0); - TargetNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + TargetNameW = heap_alloc(len * sizeof(WCHAR)); if (!TargetNameW) { SetLastError(ERROR_OUTOFMEMORY); @@ -1152,7 +1094,7 @@ ret = CredDeleteW(TargetNameW, Type, Flags); - HeapFree(GetProcessHeap(), 0, TargetNameW); + heap_free(TargetNameW); return ret; } @@ -1207,7 +1149,7 @@ key_name = get_key_name_for_target(TargetName, Type); ret = RegDeleteKeyW(hkeyMgr, key_name); - HeapFree(GetProcessHeap(), 0, key_name); + heap_free(key_name); RegCloseKey(hkeyMgr); if (ret != ERROR_SUCCESS) { @@ -1236,7 +1178,7 @@ if (Filter) { len = MultiByteToWideChar(CP_ACP, 0, Filter, -1, NULL, 0); - FilterW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + FilterW = heap_alloc(len * sizeof(WCHAR)); if (!FilterW) { SetLastError(ERROR_OUTOFMEMORY); @@ -1249,16 +1191,16 @@ if (!CredEnumerateW(FilterW, Flags, Count, &CredentialsW)) { - HeapFree(GetProcessHeap(), 0, FilterW); - return FALSE; - } - HeapFree(GetProcessHeap(), 0, FilterW); + heap_free(FilterW); + return FALSE; + } + heap_free(FilterW); len = *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); - *Credentials = HeapAlloc(GetProcessHeap(), 0, len); + *Credentials = heap_alloc(len); if (!*Credentials) { CredFree(CredentialsW); @@ -1327,7 +1269,7 @@ return FALSE; } - target_name = HeapAlloc(GetProcessHeap(), 0, (target_name_len+1)*sizeof(WCHAR)); + target_name = heap_alloc((target_name_len+1)*sizeof(WCHAR)); if (!target_name) { RegCloseKey(hkeyMgr); @@ -1347,7 +1289,7 @@ ret = ERROR_NOT_FOUND; if (ret != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); RegCloseKey(hkeyMgr); SetLastError(ret); return FALSE; @@ -1356,7 +1298,7 @@ if (ret == ERROR_SUCCESS) { - buffer = HeapAlloc(GetProcessHeap(), 0, len); + buffer = heap_alloc(len); *Credentials = (PCREDENTIALW *)buffer; if (buffer) { @@ -1376,7 +1318,7 @@ ret = ERROR_OUTOFMEMORY; } - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); RegCloseKey(hkeyMgr); if (ret != ERROR_SUCCESS) @@ -1392,7 +1334,7 @@ */ VOID WINAPI CredFree(PVOID Buffer) { - HeapFree(GetProcessHeap(), 0, Buffer); + heap_free(Buffer); } /****************************************************************************** @@ -1413,7 +1355,7 @@ } len = MultiByteToWideChar(CP_ACP, 0, TargetName, -1, NULL, 0); - TargetNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + TargetNameW = heap_alloc(len * sizeof(WCHAR)); if (!TargetNameW) { SetLastError(ERROR_OUTOFMEMORY); @@ -1423,13 +1365,13 @@ if (!CredReadW(TargetNameW, Type, Flags, &CredentialW)) { - HeapFree(GetProcessHeap(), 0, TargetNameW); - return FALSE; - } - HeapFree(GetProcessHeap(), 0, TargetNameW); + heap_free(TargetNameW); + return FALSE; + } + heap_free(TargetNameW); len = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, 0); - *Credential = HeapAlloc(GetProcessHeap(), 0, len); + *Credential = heap_alloc(len); if (!*Credential) { SetLastError(ERROR_OUTOFMEMORY); @@ -1481,7 +1423,7 @@ { OSStatus status; SecKeychainSearchRef search; - status = SecKeychainSearchCreateFromAttributes(NULL, kSecInternetPasswordItemClass, NULL, &search); + status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); if (status == noErr) { SecKeychainItemRef item; @@ -1489,7 +1431,7 @@ { SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServerItemAttr }; + UInt32 info_tags[] = { kSecServiceItemAttr }; LPWSTR target_name; INT str_len; info.count = sizeof(info_tags)/sizeof(info_tags[0]); @@ -1502,28 +1444,28 @@ WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); continue; } - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) { CFRelease(item); continue; } str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0); - target_name = HeapAlloc(GetProcessHeap(), 0, (str_len + 1) * sizeof(WCHAR)); + target_name = heap_alloc((str_len + 1) * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, target_name, str_len); /* nul terminate */ target_name[str_len] = '\0'; if (strcmpiW(TargetName, target_name)) { CFRelease(item); - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); continue; } - HeapFree(GetProcessHeap(), 0, target_name); + heap_free(target_name); SecKeychainItemFreeAttributesAndData(attr_list, NULL); ret = mac_read_credential_from_item(item, TRUE, NULL, NULL, &len); if (ret == ERROR_SUCCESS) { - *Credential = HeapAlloc(GetProcessHeap(), 0, len); + *Credential = heap_alloc(len); if (*Credential) { len = sizeof(**Credential); @@ -1566,7 +1508,7 @@ key_name = get_key_name_for_target(TargetName, Type); ret = RegOpenKeyExW(hkeyMgr, key_name, 0, KEY_QUERY_VALUE, &hkeyCred); - HeapFree(GetProcessHeap(), 0, key_name); + heap_free(key_name); if (ret != ERROR_SUCCESS) { TRACE("credentials for target name %s not found\n", debugstr_w(TargetName)); @@ -1578,7 +1520,7 @@ ret = registry_read_credential(hkeyCred, NULL, key_data, NULL, &len); if (ret == ERROR_SUCCESS) { - *Credential = HeapAlloc(GetProcessHeap(), 0, len); + *Credential = heap_alloc(len); if (*Credential) { len = sizeof(**Credential); @@ -1641,7 +1583,7 @@ if (TargetInformation->PackageName) len += MultiByteToWideChar(CP_ACP, 0, TargetInformation->PackageName, -1, NULL, 0) * sizeof(WCHAR); - TargetInformationW = HeapAlloc(GetProcessHeap(), 0, len); + TargetInformationW = heap_alloc(len); if (!TargetInformationW) { SetLastError(ERROR_OUTOFMEMORY); @@ -1712,7 +1654,7 @@ ret = CredReadDomainCredentialsW(TargetInformationW, Flags, Size, &CredentialsW); - HeapFree(GetProcessHeap(), 0, TargetInformationW); + heap_free(TargetInformationW); if (ret) { @@ -1723,7 +1665,7 @@ for (i = 0; i < *Size; i++) len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); - *Credentials = HeapAlloc(GetProcessHeap(), 0, len); + *Credentials = heap_alloc(len); if (!*Credentials) { CredFree(CredentialsW); @@ -1785,7 +1727,7 @@ } len = convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, 0); - CredentialW = HeapAlloc(GetProcessHeap(), 0, len); + CredentialW = heap_alloc(len); if (!CredentialW) { SetLastError(ERROR_OUTOFMEMORY); @@ -1796,7 +1738,7 @@ ret = CredWriteW(CredentialW, Flags); - HeapFree(GetProcessHeap(), 0, CredentialW); + heap_free(CredentialW); return ret; } @@ -1889,7 +1831,7 @@ ret = RegCreateKeyExW(hkeyMgr, key_name, 0, NULL, Credential->Persist == CRED_PERSIST_SESSION ? REG_OPTION_VOLATILE : REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkeyCred, NULL); - HeapFree(GetProcessHeap(), 0, key_name); + heap_free(key_name); if (ret != ERROR_SUCCESS) { TRACE("credentials for target name %s not found\n", @@ -1945,20 +1887,20 @@ if ((ret = CredMarshalCredentialW( type, cred, &outW ))) { int len = WideCharToMultiByte( CP_ACP, 0, outW, -1, NULL, 0, NULL, NULL ); - if (!(*out = HeapAlloc( GetProcessHeap(), 0, len ))) - { - HeapFree( GetProcessHeap(), 0, outW ); + if (!(*out = heap_alloc( len ))) + { + heap_free( outW ); return FALSE; } WideCharToMultiByte( CP_ACP, 0, outW, -1, *out, len, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, outW ); + heap_free( outW ); } return ret; } static UINT cred_encode( const char *bin, unsigned int len, WCHAR *cred ) { - static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789#-"; + static const char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789#-"; UINT n = 0, x; while (len > 0) @@ -2009,7 +1951,7 @@ case CertCredential: { size = (sizeof(cert->rgbHashOfCert) + 2) * 4 / 3; - if (!(p = HeapAlloc( GetProcessHeap(), 0, (size + 4) * sizeof(WCHAR) ))) return FALSE; + if (!(p = heap_alloc( (size + 4) * sizeof(WCHAR) ))) return FALSE; p[0] = '@'; p[1] = '@'; p[2] = 'A' + type; @@ -2021,7 +1963,7 @@ { len = strlenW( target->UserName ); size = (sizeof(DWORD) + len * sizeof(WCHAR) + 2) * 4 / 3; - if (!(p = HeapAlloc( GetProcessHeap(), 0, (size + 4) * sizeof(WCHAR) ))) return FALSE; + if (!(p = heap_alloc( (size + 4) * sizeof(WCHAR) ))) return FALSE; p[0] = '@'; p[1] = '@'; p[2] = 'A' + type; @@ -2054,11 +1996,11 @@ if (cred) { int len = MultiByteToWideChar( CP_ACP, 0, cred, -1, NULL, 0 ); - if (!(credW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + if (!(credW = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; MultiByteToWideChar( CP_ACP, 0, cred, -1, credW, len ); } ret = CredUnmarshalCredentialW( credW, type, out ); - HeapFree( GetProcessHeap(), 0, credW ); + heap_free( credW ); return ret; } @@ -2144,7 +2086,7 @@ SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (!(cert = HeapAlloc( GetProcessHeap(), 0, sizeof(*cert) ))) return FALSE; + if (!(cert = heap_alloc( sizeof(*cert) ))) return FALSE; memcpy( cert->rgbHashOfCert, hash, sizeof(cert->rgbHashOfCert) ); cert->cbSize = sizeof(*cert); *out = cert; @@ -2162,10 +2104,10 @@ return FALSE; } buflen = sizeof(*target) + size + sizeof(WCHAR); - if (!(target = HeapAlloc( GetProcessHeap(), 0, buflen ))) return FALSE; + if (!(target = heap_alloc( buflen ))) return FALSE; if (!cred_decode( cred + 9, len - 6, (char *)(target + 1) )) { - HeapFree( GetProcessHeap(), 0, target ); + heap_free( target ); return FALSE; } target->UserName = (WCHAR *)(target + 1); @@ -2241,11 +2183,11 @@ if (name) { len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); - nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + nameW = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); } res = CredIsMarshaledCredentialW(nameW); - HeapFree(GetProcessHeap(), 0, nameW); + heap_free(nameW); return res; } 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] Wed Oct 22 18:41:40 2014 @@ -257,7 +257,7 @@ advapi32 - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.27 - reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.1 + reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.27 reactos/dll/win32/advapi32/sec/sid.c # Out of Sync gdi32 -

9 years, 11 months

[akhaldi] 64900: [ADVAPI32/CRYPT] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 18:29:59 2014 New Revision: 64900 URL: http://svn.reactos.org/svn/reactos?rev=64900&view=rev Log: [ADVAPI32/CRYPT] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/crypt/crypt.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -681,4 +681,4 @@ @ stub WmiSetSingleItemA @ stub WmiSetSingleItemW @ stub Wow64Win32ApiEntry -@ stub WriteEncryptedFileRaw +@ stdcall WriteEncryptedFileRaw(ptr ptr ptr) Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -1802,7 +1802,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, +BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -1922,7 +1922,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -1956,7 +1956,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey; @@ -2131,7 +2131,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -2147,7 +2147,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags & PP_USE_HARDWARE_RNG) + if (dwParam == PP_USE_HARDWARE_RNG) { FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); FIXME("\tLetting the CSP decide.\n"); @@ -2190,7 +2190,7 @@ * NULL. It is supported only for compatibility with Microsoft's Cryptographic * Providers. */ -BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -2218,7 +2218,7 @@ * * See CryptVerifySignatureW. */ -BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags) { LPWSTR wsDescription; @@ -2362,3 +2362,22 @@ return STATUS_SUCCESS; } #endif /* !__REACTOS __ */ + +/****************************************************************************** + * WriteEncryptedFileRaw (ADVAPI32.@) + * + * Import encrypted files + * + * PARAMS + * import [I] pointer to the import callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC import, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", import, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.h [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -45,15 +45,15 @@ BOOL (WINAPI *pCPGetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPGetProvParam)(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPGetUserKey)(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey); - BOOL (WINAPI *pCPHashData)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); + BOOL (WINAPI *pCPHashData)(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPHashSessionKey)(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); - BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); + BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); BOOL (WINAPI *pCPReleaseContext)(HCRYPTPROV hProv, DWORD dwFlags); - BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); BOOL (WINAPI *pCPSignHash)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); - BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); + BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); } PROVFUNCS, *PPROVFUNCS; #define MAGIC_CRYPTPROV 0xA39E741F 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] Wed Oct 22 18:29:59 2014 @@ -256,7 +256,7 @@ reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27 advapi32 - - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1 + reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.27 reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.1 reactos/dll/win32/advapi32/sec/sid.c # Out of Sync

9 years, 11 months

[akhaldi] 64899: [PSDK] * Add missing PFE_IMPORT_FUNC and WriteEncryptedFileRaw.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 18:26:47 2014 New Revision: 64899 URL: http://svn.reactos.org/svn/reactos?rev=64899&view=rev Log: [PSDK] * Add missing PFE_IMPORT_FUNC and WriteEncryptedFileRaw. Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Oct 22 18:26:47 2014 @@ -1277,6 +1277,12 @@ #define MAKEINTATOM(i) (LPTSTR)((ULONG_PTR)((WORD)(i))) #endif +typedef DWORD +(WINAPI *PFE_IMPORT_FUNC)( + _Out_writes_bytes_to_(*ulLength, *ulLength) PBYTE pbData, + _In_opt_ PVOID pvCallbackContext, + _Inout_ PULONG ulLength); + /* Functions */ #ifndef UNDER_CE int APIENTRY WinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ LPSTR, _In_ int); @@ -3142,6 +3148,7 @@ BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); BOOLEAN WINAPI Wow64EnableWow64FsRedirection(_In_ BOOLEAN); BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); +DWORD WINAPI WriteEncryptedFileRaw(_In_ PFE_IMPORT_FUNC, _In_opt_ PVOID, _In_ PVOID); BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);

9 years, 11 months

[akhaldi] 64898: [KERNEL32] * Zap szCountryListName. * Comment out unused charset_names and strcpynAtoW. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 18:05:36 2014 New Revision: 64898 URL: http://svn.reactos.org/svn/reactos?rev=64898&view=rev Log: [KERNEL32] * Zap szCountryListName. * Comment out unused charset_names and strcpynAtoW. CORE-8540 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Wed Oct 22 18:05:36 2014 @@ -54,6 +54,7 @@ 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 }; +#ifndef __REACTOS__ /* Charset to codepage map, sorted by name. */ static const struct charset_entry { @@ -114,7 +115,7 @@ { "KOI8U", 21866 }, { "UTF8", CP_UTF8 } }; - +#endif struct locale_name { @@ -139,6 +140,7 @@ static LCID lcid_LC_MEASUREMENT; static LCID lcid_LC_TELEPHONE; +#ifndef __REACTOS__ /* Copy Ascii string to Unicode without using codepages */ static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n ) { @@ -149,7 +151,7 @@ } if (n) *dst = 0; } - +#endif /*********************************************************************** * get_lcid_codepage @@ -1976,18 +1978,6 @@ } return bRet; } - -/* Registry keys for NLS related information */ - -static const WCHAR szCountryListName[] = { - '\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'T','e','l','e','p','h','o','n','y','\\', - 'C','o','u','n','t','r','y',' ','L','i','s','t','\0' -}; - /* Callback function ptrs for EnumSystemLanguageGroupsA/W */ typedef struct

9 years, 11 months

[akhaldi] 64897: [KERNEL32] * Sync GetStringTypeW with Wine 1.7.27. * Allows more kernel32:locale tests to run. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 17:58:58 2014 New Revision: 64897 URL: http://svn.reactos.org/svn/reactos?rev=64897&view=rev Log: [KERNEL32] * Sync GetStringTypeW with Wine 1.7.27. * Allows more kernel32:locale tests to run. CORE-8540 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Wed Oct 22 17:58:58 2014 @@ -1277,6 +1277,9 @@ if ((c>=0x4E00)&&(c<=0x9FAF)) type3 |= C3_IDEOGRAPH; if ((c>=0x0600)&&(c<=0x06FF)) type3 |= C3_KASHIDA; if ((c>=0x3000)&&(c<=0x303F)) type3 |= C3_SYMBOL; + + if ((c>=0xD800)&&(c<=0xDBFF)) type3 |= C3_HIGHSURROGATE; + if ((c>=0xDC00)&&(c<=0xDFFF)) type3 |= C3_LOWSURROGATE; if ((c>=0xFF00)&&(c<=0xFF60)) type3 |= C3_FULLWIDTH; if ((c>=0xFF00)&&(c<=0xFF20)) type3 |= C3_SYMBOL;

9 years, 11 months

[akhaldi] 64896: [KERNEL32] * Sync LCMapString{A, W} with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 17:52:18 2014 New Revision: 64896 URL: http://svn.reactos.org/svn/reactos?rev=64896&view=rev Log: [KERNEL32] * Sync LCMapString{A,W} with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Wed Oct 22 17:52:18 2014 @@ -1386,16 +1386,34 @@ return GetStringTypeA(locale, type, src, count, chartype); } - /************************************************************************* - * LCMapStringW (KERNEL32.@) - * - * See LCMapStringA. - */ -INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, - LPWSTR dst, INT dstlen) + * LCMapStringEx (KERNEL32.@) + * + * Map characters in a locale sensitive string. + * + * PARAMS + * name [I] Locale name for the conversion. + * flags [I] Flags controlling the mapping (LCMAP_ constants from "winnls.h") + * src [I] String to map + * srclen [I] Length of src in chars, or -1 if src is NUL terminated + * dst [O] Destination for mapped string + * dstlen [I] Length of dst in characters + * version [I] reserved, must be NULL + * reserved [I] reserved, must be NULL + * lparam [I] reserved, must be 0 + * + * RETURNS + * Success: The length of the mapped string in dst, including the NUL terminator. + * Failure: 0. Use GetLastError() to determine the cause. + */ +INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen, + LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lparam) { LPWSTR dst_ptr; + + if (version) FIXME("unsupported version structure %p\n", version); + if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); + if (lparam) FIXME("unsupported lparam %lx\n", lparam); if (!src || !srclen || dstlen < 0) { @@ -1414,8 +1432,6 @@ } if (!dstlen) dst = NULL; - - lcid = ConvertDefaultLocale(lcid); if (flags & LCMAP_SORTKEY) { @@ -1428,8 +1444,8 @@ if (srclen < 0) srclen = strlenW(src); - TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", - lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + TRACE("(%s,0x%08x,%s,%d,%p,%d)\n", + debugstr_w(name), flags, debugstr_wn(src, srclen), srclen, dst, dstlen); ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); if (ret == 0) @@ -1448,8 +1464,8 @@ if (srclen < 0) srclen = strlenW(src) + 1; - TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", - lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + TRACE("(%s,0x%08x,%s,%d,%p,%d)\n", + debugstr_w(name), flags, debugstr_wn(src, srclen), srclen, dst, dstlen); if (!dst) /* return required string length */ { @@ -1518,6 +1534,20 @@ } /************************************************************************* + * LCMapStringW (KERNEL32.@) + * + * See LCMapStringA. + */ +INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, + LPWSTR dst, INT dstlen) +{ + TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", + lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + + return LCMapStringEx(NULL, flags, src, srclen, dst, dstlen, NULL, NULL, 0); +} + +/************************************************************************* * LCMapStringA (KERNEL32.@) * * Map characters in a locale sensitive string. @@ -1586,7 +1616,7 @@ goto map_string_exit; } - dstlenW = LCMapStringW(lcid, flags, srcW, srclenW, NULL, 0); + dstlenW = LCMapStringEx(NULL, flags, srcW, srclenW, NULL, 0, NULL, NULL, 0); if (!dstlenW) goto map_string_exit; @@ -1597,7 +1627,7 @@ goto map_string_exit; } - LCMapStringW(lcid, flags, srcW, srclenW, dstW, dstlenW); + LCMapStringEx(NULL, flags, srcW, srclenW, dstW, dstlenW, NULL, NULL, 0); ret = WideCharToMultiByte(locale_cp, 0, dstW, dstlenW, dst, dstlen, NULL, NULL); HeapFree(GetProcessHeap(), 0, dstW);

9 years, 11 months

[akhaldi] 64895: * Sync up to trunk head (r64894).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 17:07:43 2014 New Revision: 64895 URL: http://svn.reactos.org/svn/reactos?rev=64895&view=rev Log: * Sync up to trunk head (r64894). Added: branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c - copied unchanged from r64894, trunk/reactos/base/applications/network/net/cmdLocalGroup.c Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/CMakeLists.txt branches/shell-experiments/base/applications/cmdutils/help/help.c branches/shell-experiments/base/applications/msconfig/srvpage.c branches/shell-experiments/base/applications/msconfig/startuppage.c branches/shell-experiments/base/applications/mscutils/servman/export.c branches/shell-experiments/base/applications/mscutils/servman/mainwnd.c branches/shell-experiments/base/applications/mscutils/servman/progress.c branches/shell-experiments/base/applications/mscutils/servman/propsheet_general.c branches/shell-experiments/base/applications/mscutils/servman/query.c branches/shell-experiments/base/applications/mscutils/servman/stop_dependencies.c branches/shell-experiments/base/applications/network/net/CMakeLists.txt branches/shell-experiments/base/applications/network/net/cmdAccounts.c branches/shell-experiments/base/applications/network/net/lang/en-US.rc branches/shell-experiments/base/applications/network/net/lang/ro-RO.rc branches/shell-experiments/base/applications/network/net/lang/ru-RU.rc branches/shell-experiments/base/applications/network/net/main.c branches/shell-experiments/base/applications/network/net/net.h branches/shell-experiments/base/applications/taskmgr/column.c branches/shell-experiments/base/applications/taskmgr/graphctl.c branches/shell-experiments/base/applications/taskmgr/graphctl.h branches/shell-experiments/base/applications/taskmgr/taskmgr.c branches/shell-experiments/base/shell/cmd/copy.c branches/shell-experiments/base/shell/cmd/internal.c branches/shell-experiments/base/shell/cmd/locale.c branches/shell-experiments/base/shell/cmd/move.c branches/shell-experiments/base/shell/cmd/replace.c branches/shell-experiments/base/shell/explorer/desktop/desktop.h branches/shell-experiments/base/system/regsvr32/regsvr32.c branches/shell-experiments/configure.cmd branches/shell-experiments/dll/keyboard/CMakeLists.txt branches/shell-experiments/dll/win32/devmgr/devprblm.c branches/shell-experiments/dll/win32/kernel32/client/file/move.c branches/shell-experiments/dll/win32/kernel32/winnls/string/casemap.c branches/shell-experiments/dll/win32/kernel32/winnls/string/format_msg.c branches/shell-experiments/dll/win32/kernel32/winnls/string/lang.c branches/shell-experiments/dll/win32/setupapi/devclass.c branches/shell-experiments/dll/win32/ws2_32_new/src/addrinfo.c branches/shell-experiments/drivers/filesystems/fastfat/close.c branches/shell-experiments/drivers/filesystems/fastfat/create.c branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c branches/shell-experiments/drivers/filesystems/fastfat/fcb.c branches/shell-experiments/drivers/filesystems/fastfat/finfo.c branches/shell-experiments/drivers/filesystems/fastfat/vfat.h branches/shell-experiments/drivers/filesystems/npfs/create.c branches/shell-experiments/drivers/filesystems/npfs/secursup.c branches/shell-experiments/drivers/filesystems/npfs/seinfo.c branches/shell-experiments/drivers/filesystems/ntfs/dirctl.c branches/shell-experiments/drivers/filesystems/ntfs/misc.c branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h branches/shell-experiments/drivers/network/afd/afd/bind.c branches/shell-experiments/drivers/network/afd/afd/connect.c branches/shell-experiments/drivers/network/afd/afd/listen.c branches/shell-experiments/drivers/network/afd/afd/main.c branches/shell-experiments/drivers/network/afd/afd/read.c branches/shell-experiments/drivers/network/afd/afd/tdi.c branches/shell-experiments/drivers/network/afd/afd/write.c branches/shell-experiments/drivers/network/afd/include/afd.h branches/shell-experiments/drivers/network/afd/include/tdi_proto.h branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp branches/shell-experiments/drivers/storage/ide/uniata/id_dma.cpp branches/shell-experiments/drivers/storage/ide/uniata/id_sata.cpp branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h branches/shell-experiments/include/reactos/mc/bugcodes.mc branches/shell-experiments/lib/3rdparty/strmbase/pin.c branches/shell-experiments/lib/3rdparty/strmbase/transform.c branches/shell-experiments/lib/drivers/ip/transport/tcp/event.c branches/shell-experiments/lib/drivers/sound/mmixer/controls.c branches/shell-experiments/lib/drivers/sound/mmixer/midi.c branches/shell-experiments/lib/drivers/sound/mmixer/mixer.c branches/shell-experiments/lib/fast486/common.c branches/shell-experiments/lib/fast486/common.inl branches/shell-experiments/lib/fast486/debug.c branches/shell-experiments/lib/fast486/extraops.c branches/shell-experiments/lib/fast486/fast486.c branches/shell-experiments/lib/fast486/opcodes.c branches/shell-experiments/lib/fast486/opgroups.c branches/shell-experiments/lib/fast486/opgroups.h branches/shell-experiments/lib/rtl/bitmap.c branches/shell-experiments/media/doc/README.WINE branches/shell-experiments/ntoskrnl/include/internal/mm.h branches/shell-experiments/ntoskrnl/ke/bug.c branches/shell-experiments/ntoskrnl/mm/ARM3/expool.c branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c branches/shell-experiments/ntoskrnl/mm/ARM3/special.c branches/shell-experiments/subsystems/ntvdm/int32.c branches/shell-experiments/win32ss/drivers/videoprt/registry.c branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c branches/shell-experiments/win32ss/gdi/ntgdi/misc.h branches/shell-experiments/win32ss/include/ntuser.h branches/shell-experiments/win32ss/user/ntuser/callproc.c branches/shell-experiments/win32ss/user/ntuser/class.c branches/shell-experiments/win32ss/user/ntuser/cursoricon.c branches/shell-experiments/win32ss/user/ntuser/cursoricon.h branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/dce.h branches/shell-experiments/win32ss/user/ntuser/defwnd.c branches/shell-experiments/win32ss/user/ntuser/desktop.c branches/shell-experiments/win32ss/user/ntuser/display.c branches/shell-experiments/win32ss/user/ntuser/main.c branches/shell-experiments/win32ss/user/ntuser/message.c branches/shell-experiments/win32ss/user/ntuser/msgqueue.c branches/shell-experiments/win32ss/user/ntuser/object.c branches/shell-experiments/win32ss/user/ntuser/object.h branches/shell-experiments/win32ss/user/ntuser/painting.c branches/shell-experiments/win32ss/user/ntuser/painting.h branches/shell-experiments/win32ss/user/ntuser/windc.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/user32/misc/desktop.c branches/shell-experiments/win32ss/user/user32/windows/class.c branches/shell-experiments/win32ss/user/user32/windows/defwnd.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/CMakeLists.tx… Modified: branches/shell-experiments/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/propsheet_general.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/graphctl.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/r… Modified: branches/shell-experiments/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/configure.cmd… Modified: branches/shell-experiments/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/keyboard/… Modified: branches/shell-experiments/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/string/casemap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/set… Modified: branches/shell-experiments/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ws2… Modified: branches/shell-experiments/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/secursup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/afd/include/tdi_proto.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/i… Modified: branches/shell-experiments/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/s… Modified: branches/shell-experiments/lib/drivers/sound/mmixer/midi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/s… Modified: branches/shell-experiments/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/s… Modified: branches/shell-experiments/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/debug.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/d… Modified: branches/shell-experiments/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/e… Modified: branches/shell-experiments/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/bitma… Modified: branches/shell-experiments/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/REA… Modified: branches/shell-experiments/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ke/b… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/drivers/videoprt/registry.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/drive… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/misc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/inclu… Modified: branches/shell-experiments/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/dce.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

9 years, 11 months

[akhaldi] 64894: [CMAKE] * Allow the use of the LOCATION property with new CMake versions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 16:56:56 2014 New Revision: 64894 URL: http://svn.reactos.org/svn/reactos?rev=64894&view=rev Log: [CMAKE] * Allow the use of the LOCATION property with new CMake versions. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=64894&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Oct 22 16:56:56 2014 @@ -4,6 +4,11 @@ if(POLICY CMP0017) # Shadow cmake provided modules cmake_policy(SET CMP0017 OLD) +endif() + +if(POLICY CMP0026) + # Allow use of the LOCATION property + cmake_policy(SET CMP0026 OLD) endif() project(REACTOS)

9 years, 11 months

[akhaldi] 64893: [TASKMGR] * Minor style changes in wWinMain.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 22 16:51:25 2014 New Revision: 64893 URL: http://svn.reactos.org/svn/reactos?rev=64893&view=rev Log: [TASKMGR] * Minor style changes in wWinMain. Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Wed Oct 22 16:51:25 2014 @@ -152,9 +152,10 @@ */ /* Get a token for this process. */ - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) { + if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) + { /* Get the LUID for the debug privilege. */ - if(LookupPrivilegeValueW(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid)) + if (LookupPrivilegeValueW(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid)) { tkp.PrivilegeCount = 1; /* one privilege to set */ tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; @@ -169,7 +170,8 @@ LoadSettings(); /* Initialize perf data */ - if (!PerfDataInitialize()) { + if (!PerfDataInitialize()) + { return -1; }

9 years, 11 months

← Newer
1
...
24
25
26
27
28
29
30
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014