Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 44609: - Update the wiki-page containting the developer names and commit logins - fix exception if name not known yet - Now we have again a (initial) script for generating ChangeLogs from commit messages
by mkupfer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: mkupfer Date: Tue Dec 15 20:18:55 2009 New Revision: 44609 URL: http://svn.reactos.org/svn/reactos?rev=44609&view=rev Log: - Update the wiki-page containting the developer names and commit logins - fix exception if name not known yet - Now we have again a (initial) script for generating ChangeLogs from commit messages Modified: trunk/tools/changelog/autocl.py Modified: trunk/tools/changelog/autocl.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/autocl.py?rev=4460… ============================================================================== --- trunk/tools/changelog/autocl.py [iso-8859-1] (original) +++ trunk/tools/changelog/autocl.py [iso-8859-1] Tue Dec 15 20:18:55 2009 @@ -4,7 +4,7 @@ # - argument is the generated xml log file with log entries # created by 'svn log -v --xml -r revision1:revision2 repository' # - needs internet access for retrieving the author names from wiki -# (http://www.reactos.org/wiki/index.php?title=Developer_Roles&action=edit) +# (http://www.reactos.org/wiki/index.php?title=People_of_ReactOS&action=edit) # - needs a section file 'sections' # this file contains all generated wiki-sections and the according paths # to assign the log messages correctly @@ -129,7 +129,7 @@ authors = {} # dictionary for commit name -> real names sections = {} # dictionary for path -> sections messages = {} # dictionary for section -> log messages - author = urllib.urlopen("http://www.reactos.org/wiki/index.php?title=Developer_Roles&action=edit").readlines() + author = urllib.urlopen("http://www.reactos.org/wiki/index.php?title=People_of_ReactOS&action=edit").readlines() for i in author: m = re.match("^.*\[\[(.*)\]\].*\|\|[^|]*\|\|\s([^ ]*)\s\|\|.*$",i) if m: @@ -151,7 +151,10 @@ if len(l) > 0: lns.append(l) msg = string.join(lns) - author = authors[i['author']] + if authors.has_key(i['author']): + author = authors[i['author']] + else: + author = i['author'] if not i.has_key('paths'): print "Error: no path information found" print "Did you really use the option '-v' in 'svn log'?"

1 0

[tkreuzer] 44608: [MAIN] Use UlongToPtr instead of casting.
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 20:06:23 2009 New Revision: 44608 URL: http://svn.reactos.org/svn/reactos?rev=44608&view=rev Log: [MAIN] Use UlongToPtr instead of casting. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Tue Dec 15 20:06:23 2009 @@ -384,7 +384,7 @@ //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); #if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, (PVOID)pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, UlongToPtr(pButtonData->g_ClickLockEnabled), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); if (pButtonData->g_ClickLockEnabled) SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); #endif @@ -1258,7 +1258,7 @@ //#if (WINVER >= 0x0500) if (pPointerData->bOrigCursorShadow != pPointerData->bCursorShadow) { - SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bCursorShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETCURSORSHADOW, 0, UlongToPtr(pPointerData->bCursorShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); pPointerData->bOrigCursorShadow = pPointerData->bCursorShadow; } //#endif @@ -1267,7 +1267,7 @@ else if (lppsn->hdr.code == PSN_RESET) { //#if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bOrigCursorShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETCURSORSHADOW, 0, UlongToPtr(pPointerData->bOrigCursorShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); //#endif } break;

1 0

[gschneider] 44607: Jerome Gardou <jerome DOT gardou AT laposte DOT net>: [kernel32] Set the SYNCHRONIZE access mask when using FILE_SYNCHRONOUS_IO options
by gschneider＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: gschneider Date: Tue Dec 15 19:39:13 2009 New Revision: 44607 URL: http://svn.reactos.org/svn/reactos?rev=44607&view=rev Log: Jerome Gardou <jerome DOT gardou AT laposte DOT net>: [kernel32] Set the SYNCHRONIZE access mask when using FILE_SYNCHRONOUS_IO options Modified: trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/move.c trunk/reactos/dll/win32/kernel32/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Tue Dec 15 19:39:13 2009 @@ -545,7 +545,7 @@ TRACE("NtPathU '%S'\n", NtPathU.Buffer); Status = NtOpenFile(&DirectoryHandle, - DELETE, + DELETE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Tue Dec 15 19:39:13 2009 @@ -273,7 +273,7 @@ NULL); errCode = NtOpenFile( &hNewFile, - GENERIC_READ | GENERIC_WRITE, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, 0, Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Tue Dec 15 19:39:13 2009 @@ -968,7 +968,7 @@ RtlInitUnicodeString(&NtFileName, L"\\??\\MountPointManager"); InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); - Status = NtOpenFile(&FileHandle, FILE_GENERIC_READ, &ObjectAttributes, + Status = NtOpenFile(&FileHandle, FILE_GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &Iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status))

1 0

[tkreuzer] 44606: [MSVCRT20] Fix _getmainargs params in spec file
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 18:51:31 2009 New Revision: 44606 URL: http://svn.reactos.org/svn/reactos?rev=44606&view=rev Log: [MSVCRT20] Fix _getmainargs params in spec file Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Tue Dec 15 18:51:31 2009 @@ -464,7 +464,7 @@ @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode -@ cdecl __getmainargs(ptr ptr ptr long long) MSVCRT20__getmainargs +@ cdecl __getmainargs(ptr ptr ptr long ptr) MSVCRT20__getmainargs @ extern __initenv msvcrt.__initenv @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym

1 0

[tkreuzer] 44605: Copy crypt32 from trunk, fixing more merge fail.
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 18:17:03 2009 New Revision: 44605 URL: http://svn.reactos.org/svn/reactos?rev=44605&view=rev Log: Copy crypt32 from trunk, fixing more merge fail. Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/base64.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/cert.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/chain.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/context.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crl.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.spec branches/ros-amd64-bringup/reactos/dll/win32/crypt32/ctl.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/decode.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/encode.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/oid.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/rootstore.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/serialize.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/base64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/base64.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -100,7 +100,7 @@ TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; if (sep) - needed += (needed / 64 + 1) * strlen(sep); + needed += (needed / 64 + 1) * strlen(sep); if (needed > *out_len) { @@ -164,7 +164,7 @@ break; } if (sep) - strcpy(ptr, sep); + strcpy(ptr, sep); return ERROR_SUCCESS; } @@ -205,7 +205,7 @@ charsNeeded = 0; encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded); if (sep) - charsNeeded += strlen(sep); + charsNeeded += strlen(sep); if (header) charsNeeded += strlen(header) + strlen(sep); if (trailer) @@ -221,9 +221,9 @@ ptr += strlen(ptr); if (sep) { - strcpy(ptr, sep); - ptr += strlen(sep); - } + strcpy(ptr, sep); + ptr += strlen(sep); + } } encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -233,9 +233,9 @@ ptr += strlen(ptr); if (sep) { - strcpy(ptr, sep); - ptr += strlen(sep); - } + strcpy(ptr, sep); + ptr += strlen(sep); + } } *pcchString = charsNeeded - 1; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -1499,7 +1499,7 @@ if (strstrW(str, pvPara)) ret = TRUE; CryptMemFree(str); -} + } } return ret; } @@ -1591,8 +1591,8 @@ compare, dwType, dwFlags, pvPara); else ret = NULL; - if (!ret) - SetLastError(CRYPT_E_NOT_FOUND); + if (!ret) + SetLastError(CRYPT_E_NOT_FOUND); TRACE("returning %p\n", ret); return ret; } @@ -1829,6 +1829,92 @@ if (pName->rgRDN[i].rgRDNAttr[j].pszObjId && !strcmp(pszObjId, pName->rgRDN[i].rgRDNAttr[j].pszObjId)) ret = &pName->rgRDN[i].rgRDNAttr[j]; + return ret; +} + +static BOOL find_matching_rdn_attr(DWORD dwFlags, const CERT_NAME_INFO *name, + const CERT_RDN_ATTR *attr) +{ + DWORD i, j; + BOOL match = FALSE; + + for (i = 0; !match && i < name->cRDN; i++) + { + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + { + if (!strcmp(name->rgRDN[i].rgRDNAttr[j].pszObjId, + attr->pszObjId) && + name->rgRDN[i].rgRDNAttr[j].dwValueType == + attr->dwValueType) + { + if (dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG) + { + LPCWSTR nameStr = + (LPCWSTR)name->rgRDN[i].rgRDNAttr[j].Value.pbData; + LPCWSTR attrStr = (LPCWSTR)attr->Value.pbData; + + if (attr->Value.cbData != + name->rgRDN[i].rgRDNAttr[j].Value.cbData) + match = FALSE; + else if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) + match = !strncmpiW(nameStr, attrStr, + attr->Value.cbData / sizeof(WCHAR)); + else + match = !strncmpW(nameStr, attrStr, + attr->Value.cbData / sizeof(WCHAR)); + TRACE("%s : %s => %d\n", + debugstr_wn(nameStr, attr->Value.cbData / sizeof(WCHAR)), + debugstr_wn(attrStr, attr->Value.cbData / sizeof(WCHAR)), + match); + } + else + { + LPCSTR nameStr = + (LPCSTR)name->rgRDN[i].rgRDNAttr[j].Value.pbData; + LPCSTR attrStr = (LPCSTR)attr->Value.pbData; + + if (attr->Value.cbData != + name->rgRDN[i].rgRDNAttr[j].Value.cbData) + match = FALSE; + else if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) + match = !strncasecmp(nameStr, attrStr, + attr->Value.cbData); + else + match = !strncmp(nameStr, attrStr, attr->Value.cbData); + TRACE("%s : %s => %d\n", + debugstr_an(nameStr, attr->Value.cbData), + debugstr_an(attrStr, attr->Value.cbData), match); + } + } + } + } + return match; +} + +BOOL WINAPI CertIsRDNAttrsInCertificateName(DWORD dwCertEncodingType, + DWORD dwFlags, PCERT_NAME_BLOB pCertName, PCERT_RDN pRDN) +{ + CERT_NAME_INFO *name; + LPCSTR type; + DWORD size; + BOOL ret; + + TRACE("(%08x, %08x, %p, %p)\n", dwCertEncodingType, dwFlags, pCertName, + pRDN); + + type = dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG ? X509_UNICODE_NAME : + X509_NAME; + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, type, pCertName->pbData, + pCertName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &name, &size))) + { + DWORD i; + + for (i = 0; ret && i < pRDN->cRDNAttr; i++) + ret = find_matching_rdn_attr(dwFlags, name, &pRDN->rgRDNAttr[i]); + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); + LocalFree(name); + } return ret; } @@ -2894,7 +2980,7 @@ assert(pubKey); if (pExtensions && pExtensions->cExtension) - info->dwVersion = CERT_V3; + info->dwVersion = CERT_V3; else info->dwVersion = CERT_V1; info->SerialNumber.cbData = pSerialNumber->cbData; Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -101,10 +101,10 @@ if (cert) { if (!(check = CRYPT_FindCertInStore(rootStore, cert))) - ret = FALSE; - else - CertFreeCertificateContext(check); - } + ret = FALSE; + else + CertFreeCertificateContext(check); + } } while (ret && cert); if (cert) CertFreeCertificateContext(cert); @@ -506,6 +506,41 @@ return validBasicConstraints; } +static BOOL domain_name_matches(LPCWSTR constraint, LPCWSTR name) +{ + BOOL match; + + /* RFC 5280, section 4.2.1.10: + * "For URIs, the constraint applies to the host part of the name... + * When the constraint begins with a period, it MAY be expanded with one + * or more labels. That is, the constraint ".example.com" is satisfied by + * both host.example.com and my.host.example.com. However, the constraint + * ".example.com" is not satisfied by "example.com". When the constraint + * does not begin with a period, it specifies a host." + * and for email addresses, + * "To indicate all Internet mail addresses on a particular host, the + * constraint is specified as the host name. For example, the constraint + * "example.com" is satisfied by any mail address at the host + * "example.com". To specify any address within a domain, the constraint + * is specified with a leading period (as with URIs)." + */ + if (constraint[0] == '.') + { + /* Must be strictly greater than, a name can't begin with '.' */ + if (lstrlenW(name) > lstrlenW(constraint)) + match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), + constraint); + else + { + /* name is too short, no match */ + match = FALSE; + } + } + else + match = !lstrcmpiW(name, constraint); + return match; +} + static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, DWORD *trustErrorStatus) { @@ -517,14 +552,58 @@ *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; else if (!name) ; /* no match */ - else if (constraint[0] == '.') - { - if (lstrlenW(name) > lstrlenW(constraint)) - match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), - constraint); - } else - match = !lstrcmpiW(constraint, name); + { + LPCWSTR colon, authority_end, at, hostname = NULL; + /* The maximum length for a hostname is 254 in the DNS, see RFC 1034 */ + WCHAR hostname_buf[255]; + + /* RFC 5280: only the hostname portion of the URL is compared. From + * section 4.2.1.10: + * "For URIs, the constraint applies to the host part of the name. + * The constraint MUST be specified as a fully qualified domain name + * and MAY specify a host or a domain." + * The format for URIs is in RFC 2396. + * + * First, remove any scheme that's present. */ + colon = strchrW(name, ':'); + if (colon && *(colon + 1) == '/' && *(colon + 2) == '/') + name = colon + 3; + /* Next, find the end of the authority component. (The authority is + * generally just the hostname, but it may contain a username or a port. + * Those are removed next.) + */ + authority_end = strchrW(name, '/'); + if (!authority_end) + authority_end = strchrW(name, '?'); + if (!authority_end) + authority_end = name + strlenW(name); + /* Remove any port number from the authority */ + for (colon = authority_end; colon >= name && *colon != ':'; colon--) + ; + if (*colon == ':') + authority_end = colon; + /* Remove any username from the authority */ + if ((at = strchrW(name, '@'))) + name = at; + /* Ignore any path or query portion of the URL. */ + if (*authority_end) + { + if (authority_end - name < sizeof(hostname_buf) / + sizeof(hostname_buf[0])) + { + memcpy(hostname_buf, name, + (authority_end - name) * sizeof(WCHAR)); + hostname_buf[authority_end - name] = 0; + hostname = hostname_buf; + } + /* else: Hostname is too long, not a match */ + } + else + hostname = name; + if (hostname) + match = domain_name_matches(constraint, hostname); + } return match; } @@ -545,7 +624,7 @@ else { if ((at = strchrW(name, '@'))) - match = url_matches(constraint, at + 1, trustErrorStatus); + match = domain_name_matches(constraint, at + 1); else match = !lstrcmpiW(constraint, name); } @@ -563,9 +642,35 @@ *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; else if (!name) ; /* no match */ - else if (lstrlenW(name) >= lstrlenW(constraint)) + /* RFC 5280, section 4.2.1.10: + * "DNS name restrictions are expressed as host.example.com. Any DNS name + * that can be constructed by simply adding zero or more labels to the + * left-hand side of the name satisfies the name constraint. For example, + * www.host.example.com would satisfy the constraint but host1.example.com + * would not." + */ + else if (lstrlenW(name) == lstrlenW(constraint)) + match = !lstrcmpiW(name, constraint); + else if (lstrlenW(name) > lstrlenW(constraint)) + { match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), constraint); + if (match) + { + BOOL dot = FALSE; + LPCWSTR ptr; + + /* This only matches if name is a subdomain of constraint, i.e. + * there's a '.' between the beginning of the name and the + * matching portion of the name. + */ + for (ptr = name + lstrlenW(name) - lstrlenW(constraint); + !dot && ptr >= name; ptr--) + if (*ptr == '.') + dot = TRUE; + match = dot; + } + } /* else: name is too short, no match */ return match; @@ -615,46 +720,95 @@ return match; } -static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, - const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus, - DWORD errorIfFound, DWORD errorIfNotFound) +static BOOL directory_name_matches(const CERT_NAME_BLOB *constraint, + const CERT_NAME_BLOB *name) +{ + CERT_NAME_INFO *constraintName; + DWORD size; + BOOL match = FALSE; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME, constraint->pbData, + constraint->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &constraintName, &size)) + { + DWORD i; + + match = TRUE; + for (i = 0; match && i < constraintName->cRDN; i++) + match = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, + (CERT_NAME_BLOB *)name, &constraintName->rgRDN[i]); + LocalFree(constraintName); + } + return match; +} + +static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, + const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus, BOOL *present) +{ + BOOL match = FALSE; + + if (name->dwAltNameChoice == constraint->dwAltNameChoice) + { + if (present) + *present = TRUE; + switch (constraint->dwAltNameChoice) + { + case CERT_ALT_NAME_RFC822_NAME: + match = rfc822_name_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_DNS_NAME: + match = dns_name_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_URL: + match = url_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_IP_ADDRESS: + match = ip_address_matches(&constraint->u.IPAddress, + &name->u.IPAddress, trustErrorStatus); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + match = directory_name_matches(&constraint->u.DirectoryName, + &name->u.DirectoryName); + break; + default: + ERR("name choice %d unsupported in this context\n", + constraint->dwAltNameChoice); + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; + } + } + else if (present) + *present = FALSE; + return match; +} + +static BOOL alt_name_matches_excluded_name(const CERT_ALT_NAME_ENTRY *name, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) { DWORD i; BOOL match = FALSE; - for (i = 0; i < subjectName->cAltEntry; i++) - { - if (subjectName->rgAltEntry[i].dwAltNameChoice == - constraint->dwAltNameChoice) - { - switch (constraint->dwAltNameChoice) - { - case CERT_ALT_NAME_RFC822_NAME: - match = rfc822_name_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_DNS_NAME: - match = dns_name_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_URL: - match = url_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_IP_ADDRESS: - match = ip_address_matches(&constraint->u.IPAddress, - &subjectName->rgAltEntry[i].u.IPAddress, trustErrorStatus); - break; - case CERT_ALT_NAME_DIRECTORY_NAME: - default: - ERR("name choice %d unsupported in this context\n", - constraint->dwAltNameChoice); - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; - } - } - } - *trustErrorStatus |= match ? errorIfFound : errorIfNotFound; + for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) + match = alt_name_matches(name, + &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus, NULL); + return match; +} + +static BOOL alt_name_matches_permitted_name(const CERT_ALT_NAME_ENTRY *name, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus, + BOOL *present) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + match = alt_name_matches(name, + &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus, + present); + return match; } static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) @@ -669,55 +823,251 @@ return ext; } +static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + CERT_ALT_NAME_INFO *subjectAltName; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + altNameExt->Value.pbData, altNameExt->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectAltName, &size)) + { + DWORD i; + + for (i = 0; i < subjectAltName->cAltEntry; i++) + { + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is present. + * From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ + if (alt_name_matches_excluded_name( + &subjectAltName->rgAltEntry[i], nameConstraints, + trustErrorStatus)) + { + TRACE_(chain)("subject alternate name form %d excluded\n", + subjectAltName->rgAltEntry[i].dwAltNameChoice); + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } + nameFormPresent = FALSE; + if (!alt_name_matches_permitted_name( + &subjectAltName->rgAltEntry[i], nameConstraints, + trustErrorStatus, &nameFormPresent) && nameFormPresent) + { + TRACE_(chain)("subject alternate name form %d not permitted\n", + subjectAltName->rgAltEntry[i].dwAltNameChoice); + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } + } + LocalFree(subjectAltName); + } + else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; +} + +static BOOL rfc822_attr_matches_excluded_name(const CERT_RDN_ATTR *attr, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) + { + const CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgExcludedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_RFC822_NAME) + match = rfc822_name_matches(constraint->u.pwszRfc822Name, + (LPCWSTR)attr->Value.pbData, trustErrorStatus); + } + return match; +} + +static BOOL rfc822_attr_matches_permitted_name(const CERT_RDN_ATTR *attr, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus, + BOOL *present) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + { + const CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_RFC822_NAME) + { + *present = TRUE; + match = rfc822_name_matches(constraint->u.pwszRfc822Name, + (LPCWSTR)attr->Value.pbData, trustErrorStatus); + } + } + return match; +} + +static void compare_subject_with_email_constraints( + const CERT_NAME_BLOB *subjectName, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + CERT_NAME_INFO *name; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, + subjectName->pbData, subjectName->cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, &name, &size)) + { + DWORD i, j; + + for (i = 0; i < name->cRDN; i++) + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + if (!strcmp(name->rgRDN[i].rgRDNAttr[j].pszObjId, + szOID_RSA_emailAddr)) + { + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is + * present. From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ + if (rfc822_attr_matches_excluded_name( + &name->rgRDN[i].rgRDNAttr[j], nameConstraints, + trustErrorStatus)) + { + TRACE_(chain)( + "email address in subject name is excluded\n"); + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } + nameFormPresent = FALSE; + if (!rfc822_attr_matches_permitted_name( + &name->rgRDN[i].rgRDNAttr[j], nameConstraints, + trustErrorStatus, &nameFormPresent) && nameFormPresent) + { + TRACE_(chain)( + "email address in subject name is not permitted\n"); + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } + } + LocalFree(name); + } + else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; +} + +static BOOL CRYPT_IsEmptyName(const CERT_NAME_BLOB *name) +{ + BOOL empty; + + if (!name->cbData) + empty = TRUE; + else if (name->cbData == 2 && name->pbData[1] == 0) + { + /* An empty sequence is also empty */ + empty = TRUE; + } + else + empty = FALSE; + return empty; +} + +static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + BOOL hasEmailConstraint = FALSE; + DWORD i; + + /* In general, a subject distinguished name only matches a directory name + * constraint. However, an exception exists for email addresses. + * From RFC 5280, section 4.2.1.6: + * "Legacy implementations exist where an electronic mail address is + * embedded in the subject distinguished name as an emailAddress + * attribute [RFC2985]." + * If an email address constraint exists, check that constraint separately. + */ + for (i = 0; !hasEmailConstraint && i < nameConstraints->cExcludedSubtree; + i++) + if (nameConstraints->rgExcludedSubtree[i].Base.dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + hasEmailConstraint = TRUE; + for (i = 0; !hasEmailConstraint && i < nameConstraints->cPermittedSubtree; + i++) + if (nameConstraints->rgPermittedSubtree[i].Base.dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + hasEmailConstraint = TRUE; + if (hasEmailConstraint) + compare_subject_with_email_constraints(subjectName, nameConstraints, + trustErrorStatus); + for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + { + CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgExcludedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME && + directory_name_matches(&constraint->u.DirectoryName, subjectName)) + { + TRACE_(chain)("subject name is excluded\n"); + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } + } + /* RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is present. + * If no name of the type is in the certificate, the certificate is + * acceptable." + * An empty name can't have the name form present, so don't check it. + */ + if (nameConstraints->cPermittedSubtree && !CRYPT_IsEmptyName(subjectName)) + { + BOOL match = FALSE, hasDirectoryConstraint = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + { + CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + { + hasDirectoryConstraint = TRUE; + match = directory_name_matches(&constraint->u.DirectoryName, + subjectName); + } + } + if (hasDirectoryConstraint && !match) + { + TRACE_(chain)("subject name is not permitted\n"); + *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } + } +} + static void CRYPT_CheckNameConstraints( const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, DWORD *trustErrorStatus) { - /* If there aren't any existing constraints, don't bother checking */ - if (nameConstraints->cPermittedSubtree || nameConstraints->cExcludedSubtree) - { - CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); - - if (ext) - { - CERT_ALT_NAME_INFO *subjectName; - DWORD size; - - if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, - ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - &subjectName, &size)) - { - DWORD i; - - for (i = 0; i < nameConstraints->cExcludedSubtree; i++) - CRYPT_FindMatchingNameEntry( - &nameConstraints->rgExcludedSubtree[i].Base, subjectName, - trustErrorStatus, - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - CRYPT_FindMatchingNameEntry( - &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, 0, - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); - LocalFree(subjectName); - } - else - *trustErrorStatus |= - CERT_TRUST_INVALID_EXTENSION | - CERT_TRUST_INVALID_NAME_CONSTRAINTS; - } - else - { - if (nameConstraints->cPermittedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - if (nameConstraints->cExcludedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } - } + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + + if (ext) + compare_alt_name_with_constraints(ext, nameConstraints, + trustErrorStatus); + /* Name constraints apply to the subject alternative name as well as the + * subject name. From RFC 5280, section 4.2.1.10: + * "Restrictions apply to the subject distinguished name and apply to + * subject alternative names." + */ + compare_subject_with_constraints(&cert->Subject, nameConstraints, + trustErrorStatus); } /* Gets cert's name constraints, if any. Free with LocalFree. */ @@ -745,6 +1095,17 @@ DWORD i; BOOL ret = TRUE; + /* Make sure at least one permitted or excluded subtree is present. From + * RFC 5280, section 4.2.1.10: + * "Conforming CAs MUST NOT issue certificates where name constraints is an + * empty sequence. That is, either the permittedSubtrees field or the + * excludedSubtrees MUST be present." + */ + if (!info->cPermittedSubtree && !info->cExcludedSubtree) + { + WARN_(chain)("constraints contain no permitted nor excluded subtree\n"); + ret = FALSE; + } /* Check that none of the constraints specifies a minimum or a maximum. * See RFC 5280, section 4.2.1.10: * "Within this profile, the minimum and maximum fields are not used with @@ -802,23 +1163,31 @@ CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; else { - for (j = i - 1; j >= 0; j--) - { - DWORD errorStatus = 0; - - /* According to RFC 3280, self-signed certs don't have name - * constraints checked unless they're the end cert. - */ - if (j == 0 || !CRYPT_IsCertificateSelfSigned( - chain->rgpElement[j]->pCertContext)) + for (j = i - 1; j >= 0; j--) { - CRYPT_CheckNameConstraints(nameConstraints, + DWORD errorStatus = 0; + + /* According to RFC 3280, self-signed certs don't have name + * constraints checked unless they're the end cert. + */ + if (j == 0 || !CRYPT_IsCertificateSelfSigned( + chain->rgpElement[j]->pCertContext)) + { + CRYPT_CheckNameConstraints(nameConstraints, chain->rgpElement[j]->pCertContext->pCertInfo, - &errorStatus); - chain->rgpElement[i]->TrustStatus.dwErrorStatus |= - errorStatus; + &errorStatus); + if (errorStatus) + { + chain->rgpElement[i]->TrustStatus.dwErrorStatus |= + errorStatus; + CRYPT_CombineTrustStatus(&chain->TrustStatus, + &chain->rgpElement[i]->TrustStatus); + } + else + chain->rgpElement[i]->TrustStatus.dwInfoStatus |= + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS; + } } - } } LocalFree(nameConstraints); } @@ -1235,58 +1604,6 @@ return ret; } -static BOOL CRYPT_ExtendedKeyUsageValidForCA(PCCERT_CONTEXT cert) -{ - PCERT_EXTENSION ext; - BOOL ret; - - /* RFC 5280, section 4.2.1.12: "In general, this extension will only - * appear in end entity certificates." And, "If a certificate contains - * both a key usage extension and an extended key usage extension, then - * both extensions MUST be processed independently and the certificate MUST - * only be used for a purpose consistent with both extensions." This seems - * to imply that it should be checked if present, and ignored if not. - * Unfortunately some CAs, e.g. the Thawte SGC CA, don't include the code - * signing extended key usage, whereas they do include the keyCertSign - * key usage. Thus, when checking for a CA, we only require the - * code signing extended key usage if the extended key usage is critical. - */ - ext = CertFindExtension(szOID_ENHANCED_KEY_USAGE, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); - if (ext && ext->fCritical) - { - CERT_ENHKEY_USAGE *usage; - DWORD size; - - ret = CryptDecodeObjectEx(cert->dwCertEncodingType, - X509_ENHANCED_KEY_USAGE, ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, &usage, &size); - if (ret) - { - DWORD i; - - /* Explicitly require the code signing extended key usage for a CA - * with an extended key usage extension. That is, don't assume - * a cert is allowed to be a CA if it specifies the - * anyExtendedKeyUsage usage oid. See again RFC 5280, section - * 4.2.1.12: "Applications that require the presence of a - * particular purpose MAY reject certificates that include the - * anyExtendedKeyUsage OID but not the particular OID expected for - * the application." - */ - ret = FALSE; - for (i = 0; !ret && i < usage->cUsageIdentifier; i++) - if (!strcmp(usage->rgpszUsageIdentifier[i], - szOID_PKIX_KP_CODE_SIGNING)) - ret = TRUE; - LocalFree(usage); - } - } - else - ret = TRUE; - return ret; -} - static BOOL CRYPT_CriticalExtensionsSupported(PCCERT_CONTEXT cert) { BOOL ret = TRUE; @@ -1435,11 +1752,6 @@ isRoot, constraints.fCA, i)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_VALID_FOR_USAGE; - if (i != 0) - if (!CRYPT_ExtendedKeyUsageValidForCA( - chain->rgpElement[i]->pCertContext)) - chain->rgpElement[i]->TrustStatus.dwErrorStatus |= - CERT_TRUST_IS_NOT_VALID_FOR_USAGE; if (CRYPT_IsSimpleChainCyclic(chain)) { /* If the chain is cyclic, then the path length constraints @@ -1501,7 +1813,10 @@ subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by issuer/serial number\n"); *infoStatus = CERT_TRUST_HAS_EXACT_MATCH_ISSUER; + } } else if (info->KeyId.cbData) { @@ -1511,7 +1826,10 @@ subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by key id\n"); *infoStatus = CERT_TRUST_HAS_KEY_MATCH_ISSUER; + } } LocalFree(info); } @@ -1554,7 +1872,10 @@ subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by directory name\n"); *infoStatus = CERT_TRUST_HAS_EXACT_MATCH_ISSUER; + } } else FIXME("no supported name type in authority key id2\n"); @@ -1567,7 +1888,10 @@ subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) + { + TRACE_(chain)("issuer found by key id\n"); *infoStatus = CERT_TRUST_HAS_KEY_MATCH_ISSUER; + } } LocalFree(info); } @@ -1577,6 +1901,7 @@ issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, &subject->pCertInfo->Issuer, prevIssuer); + TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } return issuer; @@ -1914,7 +2239,7 @@ #define CHAIN_QUALITY_TIME_VALID 8 #define CHAIN_QUALITY_COMPLETE_CHAIN 4 #define CHAIN_QUALITY_BASIC_CONSTRAINTS 2 -#define CHAIN_QUALITY_TRUSTED_ROOT 1 +#define CHAIN_QUALITY_TRUSTED_ROOT 1 #define CHAIN_QUALITY_HIGHEST \ CHAIN_QUALITY_SIGNATURE_VALID | CHAIN_QUALITY_TIME_VALID | \ @@ -2054,7 +2379,7 @@ if (cContext) { PCCERT_CONTEXT *contexts = - CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT *)); + CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT)); if (contexts) { @@ -2101,7 +2426,11 @@ case CRYPT_E_NO_REVOCATION_CHECK: case CRYPT_E_NO_REVOCATION_DLL: case CRYPT_E_NOT_IN_REVOCATION_DATABASE: - error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN; + /* If the revocation status is unknown, it's assumed to be + * offline too. + */ + error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN | + CERT_TRUST_IS_OFFLINE_REVOCATION; break; case CRYPT_E_REVOCATION_OFFLINE: error = CERT_TRUST_IS_OFFLINE_REVOCATION; @@ -2125,14 +2454,122 @@ } } +static void CRYPT_CheckUsages(PCERT_CHAIN_CONTEXT chain, + const CERT_CHAIN_PARA *pChainPara) +{ + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS) && + pChainPara->RequestedUsage.Usage.cUsageIdentifier) + { + PCCERT_CONTEXT endCert; + PCERT_EXTENSION ext; + BOOL validForUsage; + + /* A chain, if created, always includes the end certificate */ + endCert = chain->rgpChain[0]->rgpElement[0]->pCertContext; + /* The extended key usage extension specifies how a certificate's + * public key may be used. From RFC 5280, section 4.2.1.12: + * "This extension indicates one or more purposes for which the + * certified public key may be used, in addition to or in place of the + * basic purposes indicated in the key usage extension." + * If the extension is present, it only satisfies the requested usage + * if that usage is included in the extension: + * "If the extension is present, then the certificate MUST only be used + * for one of the purposes indicated." + * There is also the special anyExtendedKeyUsage OID, but it doesn't + * have to be respected: + * "Applications that require the presence of a particular purpose + * MAY reject certificates that include the anyExtendedKeyUsage OID + * but not the particular OID expected for the application." + * For now, I'm being more conservative and ignoring the presence of + * the anyExtendedKeyUsage OID. + */ + if ((ext = CertFindExtension(szOID_ENHANCED_KEY_USAGE, + endCert->pCertInfo->cExtension, endCert->pCertInfo->rgExtension))) + { + const CERT_ENHKEY_USAGE *requestedUsage = + &pChainPara->RequestedUsage.Usage; + CERT_ENHKEY_USAGE *usage; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_ENHANCED_KEY_USAGE, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &usage, &size)) + { + if (pChainPara->RequestedUsage.dwType == USAGE_MATCH_TYPE_AND) + { + DWORD i, j; + + /* For AND matches, all usages must be present */ + validForUsage = TRUE; + for (i = 0; validForUsage && + i < requestedUsage->cUsageIdentifier; i++) + { + BOOL match = FALSE; + + for (j = 0; !match && j < usage->cUsageIdentifier; j++) + match = !strcmp(usage->rgpszUsageIdentifier[j], + requestedUsage->rgpszUsageIdentifier[i]); + if (!match) + validForUsage = FALSE; + } + } + else + { + DWORD i, j; + + /* For OR matches, any matching usage suffices */ + validForUsage = FALSE; + for (i = 0; !validForUsage && + i < requestedUsage->cUsageIdentifier; i++) + { + for (j = 0; !validForUsage && + j < usage->cUsageIdentifier; j++) + validForUsage = + !strcmp(usage->rgpszUsageIdentifier[j], + requestedUsage->rgpszUsageIdentifier[i]); + } + } + LocalFree(usage); + } + else + validForUsage = FALSE; + } + else + { + /* If the extension isn't present, any interpretation is valid: + * "Certificate using applications MAY require that the extended + * key usage extension be present and that a particular purpose + * be indicated in order for the certificate to be acceptable to + * that application." + * For now I'm being more conservative and disallowing it. + */ + WARN_(chain)("requested usage from a certificate with no usages\n"); + validForUsage = FALSE; + } + if (!validForUsage) + { + chain->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + chain->rgpChain[0]->rgpElement[0]->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + } + } + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA) && + pChainPara->RequestedIssuancePolicy.Usage.cUsageIdentifier) + FIXME("unimplemented for RequestedIssuancePolicy\n"); +} + static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch) { - DWORD i; - - TRACE_(chain)("%s: %s\n", name, - usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); - for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) - TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); + if (usageMatch->Usage.cUsageIdentifier) + { + DWORD i; + + TRACE_(chain)("%s: %s\n", name, + usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); + for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) + TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); + } } static void dump_chain_para(const CERT_CHAIN_PARA *pChainPara) @@ -2201,7 +2638,9 @@ if (!(dwFlags & CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS)) CRYPT_FreeLowerQualityChains(chain); pChain = (PCERT_CHAIN_CONTEXT)chain; - CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + if (!pChain->TrustStatus.dwErrorStatus) + CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + CRYPT_CheckUsages(pChain, pChainPara); if (ppChainContext) *ppChainContext = pChain; else @@ -2378,8 +2817,8 @@ * in section 4.2.1.6: * "Multiple name forms, and multiple instances of each name form, * MAY be included." - * It doesn't specify the behavior in such cases, but common usage is - * to accept a certificate if any name matches. + * It doesn't specify the behavior in such cases, but both RFC 2818 + * and RFC 2595 explicitly accept a certificate if any name matches. */ for (i = 0; !matches && i < subjectName->cAltEntry; i++) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/context.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -125,7 +125,7 @@ contextSize); else linkedBase = NULL; -} + } if (linkedContext) { /* It's not a link context, so it wasn't add-ref'ed in the while @@ -178,14 +178,14 @@ return FALSE; } if (base->type == ContextTypeLink) - { - /* The linked context is of the same type as this, so release - * it as well, using the same offset and data free function. - */ + { + /* The linked context is of the same type as this, so release + * it as well, using the same offset and data free function. + */ ret = Context_Release(CONTEXT_FROM_BASE_CONTEXT( - ((PLINK_CONTEXT)base)->linked, contextSize), contextSize, - dataContextFree); - } + ((PLINK_CONTEXT)base)->linked, contextSize), contextSize, + dataContextFree); + } if (InterlockedDecrement(&base->ref) == 0) { TRACE("freeing %p\n", context); @@ -321,7 +321,7 @@ EnterCriticalSection(&list->cs); if (!list_empty(entry)) { - list_remove(entry); + list_remove(entry); inList = TRUE; } LeaveCriticalSection(&list->cs); Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -19,10 +19,12 @@ #include <assert.h> #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -113,7 +115,82 @@ PCCERT_CONTEXT issuer = pvPara; ret = CertCompareCertificateName(issuer->dwCertEncodingType, - &issuer->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); + &issuer->pCertInfo->Subject, &pCrlContext->pCrlInfo->Issuer); + if (ret && (dwFlags & CRL_FIND_ISSUED_BY_SIGNATURE_FLAG)) + ret = CryptVerifyCertificateSignatureEx(0, + issuer->dwCertEncodingType, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_CRL, (void *)pCrlContext, + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)issuer, 0, NULL); + if (ret && (dwFlags & CRL_FIND_ISSUED_BY_AKI_FLAG)) + { + PCERT_EXTENSION ext = CertFindExtension( + szOID_AUTHORITY_KEY_IDENTIFIER2, pCrlContext->pCrlInfo->cExtension, + pCrlContext->pCrlInfo->rgExtension); + + if (ext) + { + CERT_AUTHORITY_KEY_ID2_INFO *info; + DWORD size; + + if ((ret = CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_AUTHORITY_KEY_ID2, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) + { + if (info->AuthorityCertIssuer.cAltEntry && + info->AuthorityCertSerialNumber.cbData) + { + PCERT_ALT_NAME_ENTRY directoryName = NULL; + DWORD i; + + for (i = 0; !directoryName && + i < info->AuthorityCertIssuer.cAltEntry; i++) + if (info->AuthorityCertIssuer.rgAltEntry[i]. + dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + directoryName = + &info->AuthorityCertIssuer.rgAltEntry[i]; + if (directoryName) + { + ret = CertCompareCertificateName( + issuer->dwCertEncodingType, + &issuer->pCertInfo->Subject, + &directoryName->u.DirectoryName); + if (ret) + ret = CertCompareIntegerBlob( + &issuer->pCertInfo->SerialNumber, + &info->AuthorityCertSerialNumber); + } + else + { + FIXME("no supported name type in authority key id2\n"); + ret = FALSE; + } + } + else if (info->KeyId.cbData) + { + if ((ext = CertFindExtension( + szOID_SUBJECT_KEY_IDENTIFIER, + issuer->pCertInfo->cExtension, + issuer->pCertInfo->rgExtension))) + { + if (info->KeyId.cbData == ext->Value.cbData) + ret = !memcmp(info->KeyId.pbData, + ext->Value.pbData, info->KeyId.cbData); + else + ret = FALSE; + } + else + ret = FALSE; + } + else + { + FIXME("unsupported value for AKI extension\n"); + ret = FALSE; + } + LocalFree(info); + } + } + /* else: a CRL without an AKI matches any cert */ + } } else ret = TRUE; @@ -134,6 +211,17 @@ } else ret = TRUE; + return ret; +} + +static BOOL compare_crl_issued_for(PCCRL_CONTEXT pCrlContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + const CRL_FIND_ISSUED_FOR_PARA *para = pvPara; + BOOL ret; + + ret = CertCompareCertificateName(para->pIssuerCert->dwCertEncodingType, + &para->pIssuerCert->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); return ret; } @@ -158,6 +246,9 @@ case CRL_FIND_EXISTING: compare = compare_crl_existing; break; + case CRL_FIND_ISSUED_FOR: + compare = compare_crl_issued_for; + break; default: FIXME("find type %08x unimplemented\n", dwFindType); compare = NULL; @@ -229,7 +320,7 @@ { TRACE("(%p)\n", pCrlContext); if (pCrlContext) - Context_AddRef((void *)pCrlContext, sizeof(CRL_CONTEXT)); + Context_AddRef((void *)pCrlContext, sizeof(CRL_CONTEXT)); return pCrlContext; } @@ -467,11 +558,151 @@ return ret; } +static BOOL compare_dist_point_name(const CRL_DIST_POINT_NAME *name1, + const CRL_DIST_POINT_NAME *name2) +{ + BOOL match; + + if (name1->dwDistPointNameChoice == name2->dwDistPointNameChoice) + { + match = TRUE; + if (name1->dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) + { + if (name1->u.FullName.cAltEntry == name2->u.FullName.cAltEntry) + { + DWORD i; + + for (i = 0; match && i < name1->u.FullName.cAltEntry; i++) + { + const CERT_ALT_NAME_ENTRY *entry1 = + &name1->u.FullName.rgAltEntry[i]; + const CERT_ALT_NAME_ENTRY *entry2 = + &name2->u.FullName.rgAltEntry[i]; + + if (entry1->dwAltNameChoice == entry2->dwAltNameChoice) + { + switch (entry1->dwAltNameChoice) + { + case CERT_ALT_NAME_URL: + match = !strcmpiW(entry1->u.pwszURL, + entry2->u.pwszURL); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + match = (entry1->u.DirectoryName.cbData == + entry2->u.DirectoryName.cbData) && + !memcmp(entry1->u.DirectoryName.pbData, + entry2->u.DirectoryName.pbData, + entry1->u.DirectoryName.cbData); + break; + default: + FIXME("unimplemented for type %d\n", + entry1->dwAltNameChoice); + match = FALSE; + } + } + else + match = FALSE; + } + } + else + match = FALSE; + } + } + else + match = FALSE; + return match; +} + +static BOOL match_dist_point_with_issuing_dist_point( + const CRL_DIST_POINT *distPoint, const CRL_ISSUING_DIST_POINT *idp) +{ + BOOL match; + + /* While RFC 5280, section 4.2.1.13 recommends against segmenting + * CRL distribution points by reasons, it doesn't preclude doing so. + * "This profile RECOMMENDS against segmenting CRLs by reason code." + * If the issuing distribution point for this CRL is only valid for + * some reasons, only match if the reasons covered also match the + * reasons in the CRL distribution point. + */ + if (idp->OnlySomeReasonFlags.cbData) + { + if (idp->OnlySomeReasonFlags.cbData == distPoint->ReasonFlags.cbData) + { + DWORD i; + + match = TRUE; + for (i = 0; match && i < distPoint->ReasonFlags.cbData; i++) + if (idp->OnlySomeReasonFlags.pbData[i] != + distPoint->ReasonFlags.pbData[i]) + match = FALSE; + } + else + match = FALSE; + } + else + match = TRUE; + if (match) + match = compare_dist_point_name(&idp->DistPointName, + &distPoint->DistPointName); + return match; +} + BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, PCCRL_CONTEXT pCrl, DWORD dwFlags, void *pvReserved) { + PCERT_EXTENSION ext; + BOOL ret; + TRACE("(%p, %p, %08x, %p)\n", pCert, pCrl, dwFlags, pvReserved); - return TRUE; + + if (!pCert) + return TRUE; + + if ((ext = CertFindExtension(szOID_ISSUING_DIST_POINT, + pCrl->pCrlInfo->cExtension, pCrl->pCrlInfo->rgExtension))) + { + CRL_ISSUING_DIST_POINT *idp; + DWORD size; + + if ((ret = CryptDecodeObjectEx(pCrl->dwCertEncodingType, + X509_ISSUING_DIST_POINT, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &idp, &size))) + { + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, + pCert->pCertInfo->cExtension, pCert->pCertInfo->rgExtension))) + { + CRL_DIST_POINTS_INFO *distPoints; + + if ((ret = CryptDecodeObjectEx(pCert->dwCertEncodingType, + X509_CRL_DIST_POINTS, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &distPoints, &size))) + { + DWORD i; + + ret = FALSE; + for (i = 0; !ret && i < distPoints->cDistPoint; i++) + ret = match_dist_point_with_issuing_dist_point( + &distPoints->rgDistPoint[i], idp); + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); + LocalFree(distPoints); + } + } + else + { + /* no CRL dist points extension in cert, can't match the CRL + * (which has an issuing dist point extension) + */ + ret = FALSE; + SetLastError(CRYPT_E_NO_MATCH); + } + LocalFree(idp); + } + } + else + ret = TRUE; + return ret; } static PCRL_ENTRY CRYPT_FindCertificateInCRL(PCERT_INFO cert, const CRL_INFO *crl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -66,7 +66,7 @@ @ stdcall CertGetStoreProperty(ptr long ptr ptr) @ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) -@ stub CertIsRDNAttrsInCertificateName +@ stdcall CertIsRDNAttrsInCertificateName(long long ptr ptr) @ stdcall CertIsValidCRLForCertificate(ptr ptr long ptr) @ stdcall CertNameToStrA(long ptr long ptr long) @ stdcall CertNameToStrW(long ptr long ptr long) Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -454,7 +454,7 @@ { TRACE("(%p)\n", pCtlContext); if (pCtlContext) - Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT)); + Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT)); return pCtlContext; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/decode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/decode.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -361,8 +361,8 @@ items[i].size = items[i].minSize; else if (items[i].size > items[i].minSize) { - /* Account for alignment padding */ - items[i].size = ALIGN_DWORD_PTR(items[i].size); + /* Account for alignment padding */ + items[i].size = ALIGN_DWORD_PTR(items[i].size); } TRACE("item %d size: %d\n", i, items[i].size); if (nextData && items[i].hasPointer && @@ -1464,7 +1464,7 @@ ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); - } + } __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); @@ -1928,7 +1928,7 @@ ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, &bytesNeeded, NULL); - } + } } } __EXCEPT_PAGE_FAULT @@ -2023,7 +2023,7 @@ ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, &bytesNeeded, NULL); - } + } } } __EXCEPT_PAGE_FAULT @@ -2347,7 +2347,7 @@ ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); - } + } __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); @@ -2819,7 +2819,7 @@ ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); - } + } __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); @@ -2996,7 +2996,7 @@ ret = FALSE; } else - bytesNeeded += (dataLen + 1) * sizeof(WCHAR); + bytesNeeded += (dataLen + 1) * sizeof(WCHAR); break; case 4: /* directoryName */ case 7: /* iPAddress */ @@ -3106,43 +3106,6 @@ return ret; } -/* Like CRYPT_AsnDecodeIntegerInternal, but swaps the bytes */ -static BOOL CRYPT_AsnDecodeIntegerSwapBytes(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded) -{ - BOOL ret; - - TRACE("(%p, %d, 0x%08x, %p, %d, %p)\n", pbEncoded, cbEncoded, dwFlags, - pvStructInfo, *pcbStructInfo, pcbDecoded); - - /* Can't use the CRYPT_DECODE_NOCOPY_FLAG, because we modify the bytes in- - * place. - */ - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_NOCOPY_FLAG, pvStructInfo, pcbStructInfo, - pcbDecoded); - if (ret && pvStructInfo) - { - CRYPT_DATA_BLOB *blob = pvStructInfo; - - if (blob->cbData) - { - DWORD i; - BYTE temp; - - for (i = 0; i < blob->cbData / 2; i++) - { - temp = blob->pbData[i]; - blob->pbData[i] = blob->pbData[blob->cbData - i - 1]; - blob->pbData[blob->cbData - i - 1] = temp; - } - } - } - TRACE("returning %d (%08x)\n", ret, GetLastError()); - return ret; -} - static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -3153,7 +3116,7 @@ { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId), - CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID_INFO, CertIssuer), @@ -3188,7 +3151,7 @@ { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId), - CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, AuthorityCertIssuer), Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -2438,45 +2438,6 @@ return ret; } -static BOOL WINAPI CRYPT_AsnEncodeIntegerSwapBytes(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, - PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) -{ - BOOL ret; - - __TRY - { - const CRYPT_DATA_BLOB *blob = pvStructInfo; - CRYPT_DATA_BLOB newBlob = { blob->cbData, NULL }; - - ret = TRUE; - if (newBlob.cbData) - { - newBlob.pbData = CryptMemAlloc(newBlob.cbData); - if (newBlob.pbData) - { - DWORD i; - - for (i = 0; i < newBlob.cbData; i++) - newBlob.pbData[newBlob.cbData - i - 1] = blob->pbData[i]; - } - else - ret = FALSE; - } - if (ret) - ret = CRYPT_AsnEncodeInteger(dwCertEncodingType, lpszStructType, - &newBlob, dwFlags, pEncodePara, pbEncoded, pcbEncoded); - CryptMemFree(newBlob.pbData); - } - __EXCEPT_PAGE_FAULT - { - SetLastError(STATUS_ACCESS_VIOLATION); - ret = FALSE; - } - __ENDTRY - return ret; -} - static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -2495,7 +2456,7 @@ { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++; @@ -2626,7 +2587,7 @@ { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++; Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -881,9 +881,11 @@ } else { - /* Copy remainder of string "left" */ - memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, - (len - (spotToRemove - multi)) * sizeof(WCHAR)); + LPCWSTR nextStr = spotToRemove + lstrlenW(toRemove) + 1; + + /* Copy remainder of string "left" */ + memmove(spotToRemove, nextStr, + (len - (nextStr - multi)) * sizeof(WCHAR)); } ret = TRUE; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -40,6 +40,9 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" +#ifdef __APPLE__ +#include <Security/Security.h> +#endif WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -713,6 +716,35 @@ DWORD i; BOOL ret = FALSE; +#ifdef __APPLE__ + OSStatus status; + CFArrayRef rootCerts; + + status = SecTrustCopyAnchorCertificates(&rootCerts); + if (status == noErr) + { + int i; + for (i = 0; i < CFArrayGetCount(rootCerts); i++) + { + SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(rootCerts, i); + CFDataRef certData; + if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + { + if (CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + CFDataGetBytePtr(certData), CFDataGetLength(certData), + CERT_STORE_ADD_NEW, NULL)) + ret = TRUE; + else + WARN("adding root cert %d failed: %08x\n", i, GetLastError()); + CFRelease(certData); + } + else + WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); + } + CFRelease(rootCerts); + } +#endif + for (i = 0; !ret && i < sizeof(CRYPT_knownLocations) / sizeof(CRYPT_knownLocations[0]); i++) Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/serialize.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/serialize.c [iso-8859-1] Tue Dec 15 18:17:03 2009 @@ -505,12 +505,12 @@ WARN("prop id %d before a context id\n", propHdr.propID); ret = FALSE; - } + } else ret = CRYPT_ReadContextProp( contextInterface, context, &propHdr, buf, read); - } + } } } else

1 0

[tkreuzer] 44604: Fix a whole lot of merge artifacts or whatever that was that changed indentation here and there.
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 17:33:41 2009 New Revision: 44604 URL: http://svn.reactos.org/svn/reactos?rev=44604&view=rev Log: Fix a whole lot of merge artifacts or whatever that was that changed indentation here and there. Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/dispex.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmldoc.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmliframe.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmllocation.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlnode.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlwindow.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/mutation.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/navigate.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/nsio.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/task.c branches/ros-amd64-bringup/reactos/dll/win32/msi/action.c branches/ros-amd64-bringup/reactos/dll/win32/msi/install.c branches/ros-amd64-bringup/reactos/dll/win32/msi/media.c branches/ros-amd64-bringup/reactos/dll/win32/msi/msi.c branches/ros-amd64-bringup/reactos/dll/win32/msi/msi_main.c branches/ros-amd64-bringup/reactos/dll/win32/msi/package.c branches/ros-amd64-bringup/reactos/dll/win32/ntdsapi/ntdsapi.rbuild branches/ros-amd64-bringup/reactos/dll/win32/olecli32/olecli32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/pdh/pdh.rbuild branches/ros-amd64-bringup/reactos/dll/win32/printui/printui.rbuild branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/ordinal.c branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/url.c branches/ros-amd64-bringup/reactos/dll/win32/sxs/sxs.rbuild branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild branches/ros-amd64-bringup/reactos/dll/win32/wininet/cookie.c branches/ros-amd64-bringup/reactos/dll/win32/wininet/dialogs.c branches/ros-amd64-bringup/reactos/dll/win32/wininet/ftp.c branches/ros-amd64-bringup/reactos/dll/win32/wininet/http.c branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.c branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.h branches/ros-amd64-bringup/reactos/dll/win32/wininet/netconnection.c branches/ros-amd64-bringup/reactos/dll/win32/wininet/urlcache.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/dispex.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/dispex.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -813,7 +813,7 @@ if(This->data->vtbl && This->data->vtbl->value) { return This->data->vtbl->value(This->outer, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - } + } FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); return E_FAIL; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmldoc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmldoc.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1992,9 +1992,9 @@ return hres; - nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &nswindow); - if(NS_FAILED(nsres)) - ERR("GetContentDOMWindow failed: %08x\n", nsres); + nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &nswindow); + if(NS_FAILED(nsres)) + ERR("GetContentDOMWindow failed: %08x\n", nsres); hres = HTMLWindow_Create(doc, nswindow, NULL /* FIXME */, &doc->basedoc.window); if(nswindow) Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmliframe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmliframe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmliframe.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -109,7 +109,7 @@ }else { WARN("NULL content window\n"); *p = NULL; - } + } return S_OK; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmllocation.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmllocation.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -157,7 +157,7 @@ if(!This->window || !This->window->doc) { FIXME("No document available\n"); return E_FAIL; -} + } return navigate_url(This->window->doc, v); } @@ -195,7 +195,7 @@ memcpy(url_path + 1, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); url.lpszUrlPath = url_path; url.dwUrlPathLength = url.dwUrlPathLength + 1; -} + } break; case INTERNET_SCHEME_HTTP: @@ -287,13 +287,13 @@ if(!url.dwSchemeLength) { FIXME("Unexpected blank protocol\n"); - return E_NOTIMPL; + return E_NOTIMPL; }else { WCHAR buf[url.dwSchemeLength + 1]; memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); buf[url.dwSchemeLength] = ':'; *p = SysAllocStringLen(buf, url.dwSchemeLength + 1); -} + } if(!*p) return E_OUTOFMEMORY; return S_OK; @@ -325,7 +325,7 @@ if(!url.dwHostNameLength){ *p = NULL; return S_OK; -} + } if(url.nPort) { /* <hostname>:<port> */ @@ -371,7 +371,7 @@ if(!url.dwHostNameLength){ *p = NULL; return S_OK; -} + } *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); if(!*p) @@ -409,7 +409,7 @@ }else { const WCHAR empty[] = {0}; *p = SysAllocString(empty); -} + } if(!*p) return E_OUTOFMEMORY; @@ -477,7 +477,7 @@ if(!url.dwExtraInfoLength){ *p = NULL; return S_OK; -} + } url.dwExtraInfoLength = strcspnW(url.lpszExtraInfo, hash); @@ -516,7 +516,7 @@ if(!url.dwExtraInfoLength){ *p = NULL; return S_OK; -} + } hash_pos = strcspnW(url.lpszExtraInfo, hash); url.dwExtraInfoLength -= hash_pos; Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlnode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlnode.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -739,7 +739,7 @@ IHTMLDOMNode_AddRef(*p); }else { *p = NULL; -} + } return S_OK; } @@ -840,8 +840,8 @@ if(This == &This->doc->node) { *p = NULL; }else { - *p = (IDispatch*)HTMLDOC(&This->doc->basedoc); - IDispatch_AddRef(*p); + *p = (IDispatch*)HTMLDOC(&This->doc->basedoc); + IDispatch_AddRef(*p); } return S_OK; } @@ -917,7 +917,7 @@ node->doc = doc; if(nsnode) - nsIDOMNode_AddRef(nsnode); + nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; node->next = doc->nodes; Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlwindow.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/htmlwindow.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -53,7 +53,7 @@ window->doc_obj->basedoc.doc_node = doc_node; if(doc_node) htmldoc_addref(&doc_node->basedoc); -} + } } nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc) @@ -252,7 +252,7 @@ if(NS_FAILED(nsres)) { ERR("GetFrames failed: %08x\n", nsres); return E_FAIL; -} + } nsres = nsIDOMWindowCollection_GetLength(nscollection, &length); nsIDOMWindowCollection_Release(nscollection); @@ -565,7 +565,7 @@ }else { *p = NULL; hres = S_OK; -} + } }else { ERR("GetName failed: %08x\n", nsres); hres = E_FAIL; @@ -1021,21 +1021,21 @@ IDispatch *disp; disp = get_script_disp(prop->script_host); - if(!disp) - return E_UNEXPECTED; - - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { + if(!disp) + return E_UNEXPECTED; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { TRACE("%s >>>\n", debugstr_w(prop->name)); hres = IDispatchEx_InvokeEx(dispex, prop->id, lcid, flags, params, res, ei, caller); - if(hres == S_OK) + if(hres == S_OK) TRACE("%s <<<\n", debugstr_w(prop->name)); - else + else WARN("%s <<< %08x\n", debugstr_w(prop->name), hres); - IDispatchEx_Release(dispex); - }else { - FIXME("No IDispatchEx\n"); - } + IDispatchEx_Release(dispex); + }else { + FIXME("No IDispatchEx\n"); + } IDispatch_Release(disp); break; } @@ -1044,7 +1044,7 @@ hres = IHTMLDocument3_getElementById(HTMLDOC3(&This->doc->basedoc), prop->name, &elem); if(FAILED(hres)) - return hres; + return hres; if(!elem) return DISP_E_MEMBERNOTFOUND; @@ -1052,7 +1052,7 @@ V_VT(res) = VT_DISPATCH; V_DISPATCH(res) = (IDispatch*)elem; break; -} + } default: ERR("invalid type %d\n", prop->type); hres = DISP_E_MEMBERNOTFOUND; @@ -1480,14 +1480,14 @@ prop = alloc_global_prop(This, GLOBAL_SCRIPTVAR, bstrName); if(!prop) - return E_OUTOFMEMORY; + return E_OUTOFMEMORY; prop->script_host = script_host; prop->id = id; *pid = prop_to_dispid(This, prop); return S_OK; - } + } hres = IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); if(hres != DISP_E_UNKNOWNNAME) @@ -1503,11 +1503,11 @@ prop = alloc_global_prop(This, GLOBAL_ELEMENTVAR, bstrName); if(!prop) - return E_OUTOFMEMORY; + return E_OUTOFMEMORY; *pid = prop_to_dispid(This, prop); - return S_OK; - } + return S_OK; + } } return DISP_E_UNKNOWNNAME; Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/mutation.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/mutation.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -267,7 +267,7 @@ doc->mutation_queue_tail = NULL; if(tmp->nsiface) - nsISupports_Release(tmp->nsiface); + nsISupports_Release(tmp->nsiface); heap_free(tmp); } @@ -691,7 +691,7 @@ push_mutation_queue(This, MUTATION_IFRAME, (nsISupports*)nsiframe); nsIDOMHTMLIFrameElement_Release(nsiframe); -} + } nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe); if(NS_SUCCEEDED(nsres)) { @@ -762,7 +762,7 @@ if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); return; -} + } nsIDOMNSDocument_WineAddObserver(nsdoc, NSDOCOBS(doc)); nsIDOMNSDocument_Release(nsdoc); Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/navigate.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/navigate.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -955,7 +955,7 @@ if(This->window) update_window_doc(This->window); - } + } This->bsc.readed += This->nsstream->buf_size; Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/nsio.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/nsio.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -156,7 +156,7 @@ hres = hlink_frame_navigate(&doc->basedoc, uri, channel->post_data_stream, hlnf); return hres != S_OK; - } +} #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface) @@ -705,14 +705,14 @@ if(NS_FAILED(nsres)) { ERR("Could not get nsIWebProgress iface: %08x\n", nsres); return NULL; - } + } nsres = nsIWebProgress_GetDOMWindow(web_progress, &nswindow); nsIWebProgress_Release(web_progress); if(NS_FAILED(nsres) || !nswindow) { ERR("GetDOMWindow failed: %08x\n", nsres); return NULL; - } + } window = nswindow_to_window(nswindow); nsIDOMWindow_Release(nswindow); @@ -722,7 +722,7 @@ else FIXME("NULL window for %p\n", nswindow); return window; - } +} typedef struct { task_t header; @@ -735,7 +735,7 @@ start_binding_task_t *task = (start_binding_task_t*)_task; start_binding(NULL, task->doc, (BSCallback*)task->bscallback, NULL); - } +} typedef struct { task_t header; @@ -777,7 +777,7 @@ task = heap_alloc(sizeof(start_doc_binding_task_t)); task->window = window; - task->bscallback = bscallback; + task->bscallback = bscallback; push_task(&task->header, start_doc_binding_proc, window->task_magic); }else { start_binding_task_t *task = heap_alloc(sizeof(start_binding_task_t)); Modified: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mshtml/task.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mshtml/task.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -203,7 +203,7 @@ { TRACE("(%p)\n", doc); - } +} static void call_timer_disp(IDispatch *disp) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msi/action.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -4921,20 +4921,20 @@ if (*value) { LPCWSTR ptr = *value; - if (!strncmpW(ptr, prefix, prefix_len)) - { - *flags |= ENV_MOD_APPEND; - *value += lstrlenW(prefix); - } - else if (lstrlenW(*value) >= prefix_len) - { - ptr += lstrlenW(ptr) - prefix_len; - if (!lstrcmpW(ptr, prefix)) - { - *flags |= ENV_MOD_PREFIX; - /* the "[~]" will be removed by deformat_string */; - } - } + if (!strncmpW(ptr, prefix, prefix_len)) + { + *flags |= ENV_MOD_APPEND; + *value += lstrlenW(prefix); + } + else if (lstrlenW(*value) >= prefix_len) + { + ptr += lstrlenW(ptr) - prefix_len; + if (!lstrcmpW(ptr, prefix)) + { + *flags |= ENV_MOD_PREFIX; + /* the "[~]" will be removed by deformat_string */; + } + } } if (check_flag_combo(*flags, ENV_ACT_SETALWAYS | ENV_ACT_SETABSENT) || @@ -5083,8 +5083,8 @@ if (newval) { - TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); - res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); + TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); + res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); } else res = ERROR_SUCCESS; Modified: branches/ros-amd64-bringup/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msi/install.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msi/install.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1001,8 +1001,8 @@ return ERROR_FUNCTION_FAILED; } - return ERROR_SUCCESS; -} + return ERROR_SUCCESS; + } feature = get_loaded_feature(package, szFeature); Modified: branches/ros-amd64-bringup/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msi/media.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -104,7 +104,7 @@ MsiRecordSetStringW(rec, 0, error); gUIHandlerRecord(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); MsiCloseHandle(rec); - } + } } msi_free(error); Modified: branches/ros-amd64-bringup/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msi/msi.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1906,8 +1906,8 @@ gUIHandlerA = puiHandler; gUIHandlerW = NULL; - gUIFilter = dwMessageFilter; - gUIContext = pvContext; + gUIFilter = dwMessageFilter; + gUIContext = pvContext; return prev; } @@ -1921,8 +1921,8 @@ gUIHandlerA = NULL; gUIHandlerW = puiHandler; - gUIFilter = dwMessageFilter; - gUIContext = pvContext; + gUIFilter = dwMessageFilter; + gUIContext = pvContext; return prev; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msi/msi_main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msi/msi_main.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -37,13 +37,13 @@ static LONG dll_count; /* the UI level */ -INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; -HWND gUIhwnd = 0; -INSTALLUI_HANDLERA gUIHandlerA = NULL; -INSTALLUI_HANDLERW gUIHandlerW = NULL; +INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; +HWND gUIhwnd = 0; +INSTALLUI_HANDLERA gUIHandlerA = NULL; +INSTALLUI_HANDLERW gUIHandlerW = NULL; INSTALLUI_HANDLER_RECORD gUIHandlerRecord = NULL; -DWORD gUIFilter = 0; -LPVOID gUIContext = NULL; +DWORD gUIFilter = 0; +LPVOID gUIContext = NULL; WCHAR gszLogFile[MAX_PATH]; HINSTANCE msi_hInstance; Modified: branches/ros-amd64-bringup/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msi/package.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1217,7 +1217,7 @@ } else if (gUIHandlerA && (gUIFilter & log_type)) { - rc = gUIHandlerA(gUIContext,eMessageType,msg); + rc = gUIHandlerA( gUIContext, eMessageType, msg ); } else if (gUIHandlerRecord && (gUIFilter & log_type)) { @@ -1243,7 +1243,7 @@ } } msi_free( msg ); - msi_free( message); + msi_free( message ); switch (eMessageType & 0xff000000) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/ntdsapi/ntdsapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ntdsapi/ntdsapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ntdsapi/ntdsapi.rbuild [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1,10 +1,10 @@ <module name="ntdsapi" type="win32dll" baseaddress="${BASEADDRESS_NTDSAPI}" installbase="system32" installname="ntdsapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="ntdsapi.spec" /> - <include base="ntdsapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>user32</library> - <library>ntdll</library> - <file>ntdsapi.c</file> + <importlibrary definition="ntdsapi.spec" /> + <include base="ntdsapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>user32</library> + <library>ntdll</library> + <file>ntdsapi.c</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/olecli32/olecli32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/olecli32/olecli32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/olecli32/olecli32.rbuild [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="olecli32" type="win32dll" baseaddress="${BASEADDRESS_OLECLI32}" installbase="system32" installname="olecli32.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="olecli32.spec" /> - <include base="olecli32">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <file>olecli_main.c</file> - <library>wine</library> - <library>ole32</library> - <library>gdi32</library> - <library>ntdll</library> + <importlibrary definition="olecli32.spec" /> + <include base="olecli32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>olecli_main.c</file> + <library>wine</library> + <library>ole32</library> + <library>gdi32</library> + <library>ntdll</library> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/pdh/pdh.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/pdh/pdh.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/pdh/pdh.rbuild [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1,10 +1,10 @@ <module name="pdh" type="win32dll" baseaddress="${BASEADDRESS_PDH}" installbase="system32" installname="pdh.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="pdh.spec" /> - <include base="pdh">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <redefine name="_WIN32_WINNT">0x600</redefine> - <library>wine</library> - <library>ntdll</library> - <file>pdh_main.c</file> + <importlibrary definition="pdh.spec" /> + <include base="pdh">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <redefine name="_WIN32_WINNT">0x600</redefine> + <library>wine</library> + <library>ntdll</library> + <file>pdh_main.c</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/printui/printui.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/printui/printui.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/printui/printui.rbuild [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1,11 +1,11 @@ <module name="printui" type="win32dll" baseaddress="${BASEADDRESS_PRINTUI}" installbase="system32" installname="printui.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="printui.spec" /> - <include base="printui">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>shell32</library> - <library>ntdll</library> - <file>printui.c</file> - <file>printui.rc</file> + <importlibrary definition="printui.spec" /> + <include base="printui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>shell32</library> + <library>ntdll</library> + <file>printui.c</file> + <file>printui.rc</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1250,12 +1250,10 @@ if (lpInt1 == lpInt2) return TRUE; - if (FAILED(IUnknown_QueryInterface(lpInt1, &IID_IUnknown, - (LPVOID *)&lpUnknown1))) + if (FAILED(IUnknown_QueryInterface(lpInt1, &IID_IUnknown, &lpUnknown1))) return FALSE; - if (FAILED(IUnknown_QueryInterface(lpInt2, &IID_IUnknown, - (LPVOID *)&lpUnknown2))) + if (FAILED(IUnknown_QueryInterface(lpInt2, &IID_IUnknown, &lpUnknown2))) return FALSE; if (lpUnknown1 == lpUnknown2) @@ -2273,7 +2271,7 @@ if (IsEqualIID(riid, xmove->refid)) { a_vtbl = (IUnknown*)(xmove->indx + (LPBYTE)w); TRACE("matched, returning (%p)\n", a_vtbl); - *ppv = (LPVOID)a_vtbl; + *ppv = a_vtbl; IUnknown_AddRef(a_vtbl); return S_OK; } @@ -2283,7 +2281,7 @@ if (IsEqualIID(riid, &IID_IUnknown)) { a_vtbl = (IUnknown*)(x->indx + (LPBYTE)w); TRACE("returning first for IUnknown (%p)\n", a_vtbl); - *ppv = (LPVOID)a_vtbl; + *ppv = a_vtbl; IUnknown_AddRef(a_vtbl); return S_OK; } @@ -2576,7 +2574,7 @@ if (retval != ERROR_SUCCESS) return 0; - SHGetValueW(hKey, lpSubName, lpValue, NULL, (LPBYTE)&retval, &datsize); + SHGetValueW(hKey, lpSubName, lpValue, NULL, &retval, &datsize); RegCloseKey(hKey); return retval; } @@ -2655,7 +2653,7 @@ *ppv = NULL; if(pUnk && pInner) { - hret = IUnknown_QueryInterface(pInner, riid, (LPVOID*)ppv); + hret = IUnknown_QueryInterface(pInner, riid, ppv); if (SUCCEEDED(hret)) IUnknown_Release(pUnk); } TRACE("-- 0x%08x\n", hret); @@ -4224,7 +4222,7 @@ { IUnknown* lpUnk; - if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)szSkipBinding, &lpUnk))) + if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, szSkipBinding, &lpUnk))) { CLSID clsid; Modified: branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -167,7 +167,7 @@ y->cchSuffix = strlen(y->pszSuffix); len = MultiByteToWideChar(CP_ACP, 0, x, ptr-x, - scheme, sizeof(scheme)/sizeof(WCHAR)); + scheme, sizeof(scheme)/sizeof(WCHAR)); y->nScheme = get_scheme_code(scheme, len); return S_OK; Modified: branches/ros-amd64-bringup/reactos/dll/win32/sxs/sxs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sxs/sxs.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/sxs/sxs.rbuild [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1,11 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="sxs" type="win32dll" baseaddress="${BASEADDRESS_SXS}" installbase="system32" installname="sxs.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="sxs.spec" /> - <include base="sxs">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <file>sxs.c</file> - <library>wine</library> - <library>ntdll</library> + <importlibrary definition="sxs.spec" /> + <include base="sxs">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>sxs.c</file> + <library>wine</library> + <library>ntdll</library> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -1,7 +1,7 @@ <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="winfax.spec" /> - <include base="winfax">.</include> - <library>ntdll</library> - <file>winfax.c</file> - <file>winfax.rc</file> + <importlibrary definition="winfax.spec" /> + <include base="winfax">.</include> + <library>ntdll</library> + <file>winfax.c</file> + <file>winfax.rc</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/cookie.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/cookie.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -192,7 +192,7 @@ UrlComponents.dwUrlPathLength = pathLen; return InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents); - } +} /* match a domain. domain must match if the domain is not NULL. path must match if the path is not NULL */ static BOOL COOKIE_matchDomain(LPCWSTR lpszCookieDomain, LPCWSTR lpszCookiePath, @@ -219,8 +219,8 @@ if (!searchDomain->lpCookiePath) return FALSE; if (strcmpW(lpszCookiePath, searchDomain->lpCookiePath)) - return FALSE; - } + return FALSE; + } return TRUE; } @@ -415,7 +415,7 @@ } if (!thisCookieDomain) - thisCookieDomain = COOKIE_addDomain(domain, path); + thisCookieDomain = COOKIE_addDomain(domain, path); if ((thisCookie = COOKIE_findCookie(thisCookieDomain, cookie_name))) COOKIE_deleteCookie(thisCookie, FALSE); Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -65,7 +65,7 @@ lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest ); if (NULL == lpwhr) - return FALSE; + return FALSE; lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs) @@ -206,8 +206,8 @@ lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest ); if( !lpwhr ) - return FALSE; - + return FALSE; + lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { @@ -220,14 +220,14 @@ p = HeapAlloc( GetProcessHeap(), 0, (strlenW( username ) + 1)*sizeof(WCHAR) ); if( !p ) return FALSE; - + lstrcpyW( p, username ); - hIC->lpszProxyUsername = p; + hIC->lpszProxyUsername = p; p = HeapAlloc( GetProcessHeap(), 0, (strlenW( password ) + 1)*sizeof(WCHAR) ); if( !p ) return FALSE; - + lstrcpyW( p, password ); hIC->lpszProxyPassword = p; @@ -367,8 +367,8 @@ dwStatus = WININET_GetConnectionStatus( hRequest ); if( HTTP_STATUS_PROXY_AUTH_REQ != dwStatus ) return ERROR_SUCCESS; - return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), - hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), + hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); case ERROR_INTERNET_INCORRECT_PASSWORD: return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -710,7 +710,7 @@ if (ret && lpFindFileData) WININET_find_data_WtoA(lpFindFileDataW, lpFindFileData); - + return ret; } @@ -1087,7 +1087,7 @@ { LPWSTR lpwzFileName; HINTERNET ret; - + lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; ret = FtpOpenFileW(hFtpSession, lpwzFileName, fdwAccess, dwFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzFileName); @@ -1347,9 +1347,9 @@ iar.dwResult = (DWORD)bSuccess; iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); - SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, - &iar, sizeof(INTERNET_ASYNC_RESULT)); - } + SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, + &iar, sizeof(INTERNET_ASYNC_RESULT)); + } lend: if( lpwh ) @@ -3515,7 +3515,7 @@ /* Hacky and bad Y2K protection :-) */ if (lpfp->tmLastModified.tm_year < 70) lpfp->tmLastModified.tm_year += 100; - + pszToken = strtok(NULL, szSpace); if(!pszToken) continue; sscanf(pszToken, "%d:%d", @@ -3530,7 +3530,7 @@ lpfp->tmLastModified.tm_hour, lpfp->tmLastModified.tm_min, lpfp->tmLastModified.tm_sec, (lpfp->tmLastModified.tm_year >= 100) ? lpfp->tmLastModified.tm_year - 100 : lpfp->tmLastModified.tm_year, lpfp->tmLastModified.tm_mon, lpfp->tmLastModified.tm_mday); - + pszToken = strtok(NULL, szSpace); if(!pszToken) continue; if(!strcasecmp(pszToken, "<DIR>")) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -146,21 +146,21 @@ int i; LPCWSTR next_token; - /* empty string has no tokens */ - if (*string) + /* empty string has no tokens */ + if (*string) + tokens++; + /* count tokens */ + for (i = 0; string[i]; i++) + if (!strncmpW(string+i, token_string, strlenW(token_string))) + { + DWORD j; tokens++; - /* count tokens */ - for (i = 0; string[i]; i++) - if (!strncmpW(string+i, token_string, strlenW(token_string))) - { - DWORD j; - tokens++; - /* we want to skip over separators, but not the null terminator */ - for (j = 0; j < strlenW(token_string) - 1; j++) - if (!string[i+j]) - break; - i += j; - } + /* we want to skip over separators, but not the null terminator */ + for (j = 0; j < strlenW(token_string) - 1; j++) + if (!string[i+j]) + break; + i += j; + } /* add 1 for terminating NULL */ token_array = HeapAlloc(GetProcessHeap(), 0, (tokens+1) * sizeof(*token_array)); @@ -318,10 +318,10 @@ HeaderIndex = HTTP_GetCustomHeaderIndex(lpwhr, szSet_Cookie, 0, FALSE); if (HeaderIndex == -1) return; - setCookieHeader = &lpwhr->pCustHeaders[HeaderIndex]; - - if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && setCookieHeader->lpszValue) - { + setCookieHeader = &lpwhr->pCustHeaders[HeaderIndex]; + + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && setCookieHeader->lpszValue) + { int nPosStart = 0, nPosEnd = 0, len; static const WCHAR szFmt[] = { 'h','t','t','p',':','/','/','%','s','/',0}; @@ -335,11 +335,11 @@ int nEqualPos = 0; while (setCookieHeader->lpszValue[nPosEnd] != ';' && setCookieHeader->lpszValue[nPosEnd] != ',' && setCookieHeader->lpszValue[nPosEnd] != '\0') -{ + { nPosEnd++; - } + } if (setCookieHeader->lpszValue[nPosEnd] == ';') -{ + { /* fixme: not case sensitive, strcasestr is gnu only */ int nDomainPosEnd = 0; int nDomainPosStart = 0, nDomainLength = 0; @@ -349,28 +349,28 @@ { /* they have specified their own domain, lets use it */ while (lpszDomain[nDomainPosEnd] != ';' && lpszDomain[nDomainPosEnd] != ',' && lpszDomain[nDomainPosEnd] != '\0') - { + { nDomainPosEnd++; - } + } nDomainPosStart = strlenW(szDomain); nDomainLength = (nDomainPosEnd - nDomainPosStart) + 1; domain = HeapAlloc(GetProcessHeap(), 0, (nDomainLength + 1)*sizeof(WCHAR)); lstrcpynW(domain, &lpszDomain[nDomainPosStart], nDomainLength + 1); - } -} + } + } if (setCookieHeader->lpszValue[nPosEnd] == '\0') break; buf_cookie = HeapAlloc(GetProcessHeap(), 0, ((nPosEnd - nPosStart) + 1)*sizeof(WCHAR)); lstrcpynW(buf_cookie, &setCookieHeader->lpszValue[nPosStart], (nPosEnd - nPosStart) + 1); TRACE("%s\n", debugstr_w(buf_cookie)); while (buf_cookie[nEqualPos] != '=' && buf_cookie[nEqualPos] != '\0') -{ + { nEqualPos++; -} + } if (buf_cookie[nEqualPos] == '\0' || buf_cookie[nEqualPos + 1] == '\0') -{ + { HeapFree(GetProcessHeap(), 0, buf_cookie); - break; - } + break; + } cookie_name = HeapAlloc(GetProcessHeap(), 0, (nEqualPos + 1)*sizeof(WCHAR)); lstrcpynW(cookie_name, buf_cookie, nEqualPos + 1); @@ -393,11 +393,11 @@ } static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue ) - { +{ static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ return !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) && ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); - } +} static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, struct HttpAuthInfo **ppAuthInfo, @@ -525,17 +525,17 @@ * retrieve them if the application didn't pass us any credentials */ if (!domain_and_username) return FALSE; - userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, NULL); - passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); - - /* length includes a nul terminator, which will be re-used for the ':' */ - auth_data = HeapAlloc(GetProcessHeap(), 0, userlen + 1 + passlen); - if (!auth_data) - return FALSE; - - WideCharToMultiByte(CP_UTF8, 0, domain_and_username, -1, auth_data, userlen, NULL, NULL); - auth_data[userlen] = ':'; - WideCharToMultiByte(CP_UTF8, 0, password, -1, &auth_data[userlen+1], passlen, NULL, NULL); + userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, NULL); + passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); + + /* length includes a nul terminator, which will be re-used for the ':' */ + auth_data = HeapAlloc(GetProcessHeap(), 0, userlen + 1 + passlen); + if (!auth_data) + return FALSE; + + WideCharToMultiByte(CP_UTF8, 0, domain_and_username, -1, auth_data, userlen, NULL, NULL); + auth_data[userlen] = ':'; + WideCharToMultiByte(CP_UTF8, 0, password, -1, &auth_data[userlen+1], passlen, NULL, NULL); pAuthInfo->auth_data = auth_data; pAuthInfo->auth_data_len = userlen + 1 + passlen; @@ -776,7 +776,7 @@ ptrW = lpBuffersOutW; while (ptr) -{ + { if (ptr->lpvBuffer && ptr->dwBufferLength) ptrW->lpvBuffer = HeapAlloc(GetProcessHeap(),0,ptr->dwBufferLength); ptrW->dwBufferLength = ptr->dwBufferLength; @@ -805,8 +805,8 @@ ptrW2 = ptrW->Next; HeapFree(GetProcessHeap(),0,ptrW); ptrW = ptrW2; - } - } + } + } return rc; } @@ -837,7 +837,7 @@ INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); if (lpwhr) WININET_Release( &lpwhr->hdr ); - return FALSE; + return FALSE; } lpwhr->hdr.dwFlags |= dwFlags; @@ -886,7 +886,7 @@ rc = HTTP_HandleRedirect(lpwhr, szNewLocation); if (rc) rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); - } + } } } @@ -1017,12 +1017,12 @@ types = lpszAcceptTypes; while (*types) { - /* find out how many there are */ + /* find out how many there are */ if (((ULONG_PTR)*types >> 16) && **types) - { - TRACE("accept type: %s\n", debugstr_a(*types)); - acceptTypesCount++; - } + { + TRACE("accept type: %s\n", debugstr_a(*types)); + acceptTypesCount++; + } types++; } szAcceptTypes = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * (acceptTypesCount+1)); @@ -1372,7 +1372,7 @@ if(lpwhr->lpszCacheFile) { DeleteFileW(lpwhr->lpszCacheFile); /* FIXME */ - HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); } WININET_Release(&lpwhr->lpHttpSession->hdr); @@ -1403,7 +1403,7 @@ return; if (lpwhr->pAuthInfo) -{ + { if (SecIsValidHandle(&lpwhr->pAuthInfo->ctx)) DeleteSecurityContext(&lpwhr->pAuthInfo->ctx); if (SecIsValidHandle(&lpwhr->pAuthInfo->cred)) @@ -1413,9 +1413,9 @@ HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->scheme); HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo); lpwhr->pAuthInfo = NULL; -} + } if (lpwhr->pProxyAuthInfo) -{ + { if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->ctx)) DeleteSecurityContext(&lpwhr->pProxyAuthInfo->ctx); if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->cred)) @@ -1434,10 +1434,10 @@ INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); - } +} static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) - { +{ WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; switch(option) { @@ -1616,7 +1616,7 @@ *read = 0; HTTP_FinishedReading(req); return ERROR_SUCCESS; -} + } req->dwContentRead += bytes_read; *read = bytes_read; @@ -1628,26 +1628,26 @@ res = WriteFile(req->hCacheFile, buffer, bytes_read, &dwBytesWritten, NULL); if(!res) WARN("WriteFile failed: %u\n", GetLastError()); - } + } if(!bytes_read && (req->dwContentRead == req->dwContentLength)) HTTP_FinishedReading(req); return ERROR_SUCCESS; - } +} static DWORD get_chunk_size(const char *buffer) - { +{ const char *p; DWORD size = 0; for (p = buffer; *p; p++) -{ + { if (*p >= '0' && *p <= '9') size = size * 16 + *p - '0'; else if (*p >= 'a' && *p <= 'f') size = size * 16 + *p - 'a' + 10; else if (*p >= 'A' && *p <= 'F') size = size * 16 + *p - 'A' + 10; else if (*p == ';') break; - } + } return size; } @@ -1663,27 +1663,27 @@ if (*read == size) break; if (req->dwContentLength == ~0UL) /* new chunk */ -{ + { buflen = sizeof(reply); if (!NETCON_getNextLine(&req->netConnection, reply, &buflen)) break; if (!(req->dwContentLength = get_chunk_size(reply))) -{ + { /* zero sized chunk marks end of transfer; read any trailing headers and return */ HTTP_GetResponseHeaders(req, FALSE); break; - } -} + } + } to_read = min(to_write, req->dwContentLength - req->dwContentRead); if (!NETCON_recv(&req->netConnection, p, to_read, sync ? MSG_WAITALL : 0, &bytes_read)) -{ + { if (bytes_read != to_read) ERR("Not all data received %d/%d\n", bytes_read, to_read); /* always return success, even if the network layer returns an error */ *read = 0; - break; + break; } if (!bytes_read) break; @@ -1692,12 +1692,12 @@ *read += bytes_read; if (req->lpszCacheFile) -{ + { DWORD dwBytesWritten; if (!WriteFile(req->hCacheFile, p, bytes_read, &dwBytesWritten, NULL)) WARN("WriteFile failed: %u\n", GetLastError()); - } + } p += bytes_read; if (req->dwContentRead == req->dwContentLength) /* chunk complete */ @@ -1707,12 +1707,12 @@ buflen = sizeof(reply); if (!NETCON_getNextLine(&req->netConnection, reply, &buflen)) -{ + { ERR("Malformed chunk\n"); *read = 0; break; - } -} + } + } } if (!*read) HTTP_FinishedReading(req); return ERROR_SUCCESS; @@ -1731,7 +1731,7 @@ } else return HTTP_Read(req, buffer, size, read, sync); - } +} static DWORD HTTPREQ_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read) { @@ -1779,17 +1779,17 @@ NETCON_query_data_available(&req->netConnection, &available); if (!available) - { - WORKREQUEST workRequest; + { + WORKREQUEST workRequest; workRequest.asyncproc = HTTPREQ_AsyncReadFileExProc; - workRequest.hdr = WININET_AddRef(&req->hdr); - workRequest.u.InternetReadFileExA.lpBuffersOut = buffers; - - INTERNET_AsyncCall(&workRequest); - - return ERROR_IO_PENDING; - } + workRequest.hdr = WININET_AddRef(&req->hdr); + workRequest.u.InternetReadFileExA.lpBuffersOut = buffers; + + INTERNET_AsyncCall(&workRequest); + + return ERROR_IO_PENDING; + } } res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength, @@ -1825,7 +1825,7 @@ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); - } +} static DWORD HTTPREQ_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) { @@ -1846,7 +1846,7 @@ if (NETCON_recv(&req->netConnection, buffer, min(async ? 1 : sizeof(buffer), req->dwContentLength - req->dwContentRead), MSG_PEEK, (int *)available) && async && *available) -{ + { WORKREQUEST workRequest; *available = 0; @@ -2233,13 +2233,13 @@ return FALSE; } - for (i = 0; ppszRawHeaderLines[i]; i++) - { - DWORD len = strlenW(ppszRawHeaderLines[i]); - memcpy(pszString, ppszRawHeaderLines[i], (len+1)*sizeof(WCHAR)); - pszString += len+1; - } - *pszString = '\0'; + for (i = 0; ppszRawHeaderLines[i]; i++) + { + DWORD len = strlenW(ppszRawHeaderLines[i]); + memcpy(pszString, ppszRawHeaderLines[i], (len+1)*sizeof(WCHAR)); + pszString += len+1; + } + *pszString = '\0'; TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, size)); @@ -2258,7 +2258,7 @@ INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - memcpy(lpBuffer, lpwhr->lpszStatusText, (len + 1) * sizeof(WCHAR)); + memcpy(lpBuffer, lpwhr->lpszStatusText, (len+1)*sizeof(WCHAR)); *lpdwBufferLength = len * sizeof(WCHAR); TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); @@ -2276,7 +2276,7 @@ INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - memcpy(lpBuffer, lpwhr->lpszVersion, (len + 1) * sizeof(WCHAR)); + memcpy(lpBuffer, lpwhr->lpszVersion, (len+1)*sizeof(WCHAR)); *lpdwBufferLength = len * sizeof(WCHAR); TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); @@ -2310,8 +2310,8 @@ /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) { - *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); - bSuccess = TRUE; + *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); + bSuccess = TRUE; TRACE(" returning number : %d\n", *(int *)lpBuffer); } @@ -2324,24 +2324,24 @@ tmpTime = ConvertTimeString(lphttpHdr->lpszValue); tmpTM = *gmtime(&tmpTime); - STHook = (SYSTEMTIME *)lpBuffer; + STHook = (SYSTEMTIME *) lpBuffer; if(STHook==NULL) return bSuccess; - STHook->wDay = tmpTM.tm_mday; - STHook->wHour = tmpTM.tm_hour; - STHook->wMilliseconds = 0; - STHook->wMinute = tmpTM.tm_min; - STHook->wDayOfWeek = tmpTM.tm_wday; - STHook->wMonth = tmpTM.tm_mon + 1; - STHook->wSecond = tmpTM.tm_sec; - STHook->wYear = tmpTM.tm_year; + STHook->wDay = tmpTM.tm_mday; + STHook->wHour = tmpTM.tm_hour; + STHook->wMilliseconds = 0; + STHook->wMinute = tmpTM.tm_min; + STHook->wDayOfWeek = tmpTM.tm_wday; + STHook->wMonth = tmpTM.tm_mon + 1; + STHook->wSecond = tmpTM.tm_sec; + STHook->wYear = tmpTM.tm_year; - bSuccess = TRUE; + bSuccess = TRUE; - TRACE(" returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", - STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek, - STHook->wHour, STHook->wMinute, STHook->wSecond, STHook->wMilliseconds); + TRACE(" returning time : %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", + STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek, + STHook->wHour, STHook->wMinute, STHook->wSecond, STHook->wMilliseconds); } else if (lphttpHdr->lpszValue) { @@ -2354,7 +2354,7 @@ return bSuccess; } - memcpy(lpBuffer, lphttpHdr->lpszValue, len); + memcpy(lpBuffer, lphttpHdr->lpszValue, len); *lpdwBufferLength = len - sizeof(WCHAR); bSuccess = TRUE; @@ -2679,7 +2679,7 @@ if (lpBuffersIn) { if (lpBuffersIn->lpcszHeader) - /* FIXME: this should use dwHeadersLength or may not be necessary at all */ + /* FIXME: this should use dwHeadersLength or may not be necessary at all */ req->lpszHeader = WININET_strdupW(lpBuffersIn->lpcszHeader); else req->lpszHeader = NULL; @@ -2871,57 +2871,57 @@ { URL_COMPONENTSW urlComponents; WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; - static WCHAR szHttp[] = {'h','t','t','p',0}; - static WCHAR szHttps[] = {'h','t','t','p','s',0}; - DWORD url_length = 0; - LPWSTR orig_url; - LPWSTR combined_url; - - urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); - urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; - urlComponents.dwSchemeLength = 0; - urlComponents.lpszHostName = lpwhs->lpszHostName; - urlComponents.dwHostNameLength = 0; - urlComponents.nPort = lpwhs->nHostPort; - urlComponents.lpszUserName = lpwhs->lpszUserName; - urlComponents.dwUserNameLength = 0; - urlComponents.lpszPassword = NULL; - urlComponents.dwPasswordLength = 0; - urlComponents.lpszUrlPath = lpwhr->lpszPath; - urlComponents.dwUrlPathLength = 0; - urlComponents.lpszExtraInfo = NULL; - urlComponents.dwExtraInfoLength = 0; - - if (!InternetCreateUrlW(&urlComponents, 0, NULL, &url_length) && - (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + static WCHAR szHttp[] = {'h','t','t','p',0}; + static WCHAR szHttps[] = {'h','t','t','p','s',0}; + DWORD url_length = 0; + LPWSTR orig_url; + LPWSTR combined_url; + + urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); + urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; + urlComponents.dwSchemeLength = 0; + urlComponents.lpszHostName = lpwhs->lpszHostName; + urlComponents.dwHostNameLength = 0; + urlComponents.nPort = lpwhs->nHostPort; + urlComponents.lpszUserName = lpwhs->lpszUserName; + urlComponents.dwUserNameLength = 0; + urlComponents.lpszPassword = NULL; + urlComponents.dwPasswordLength = 0; + urlComponents.lpszUrlPath = lpwhr->lpszPath; + urlComponents.dwUrlPathLength = 0; + urlComponents.lpszExtraInfo = NULL; + urlComponents.dwExtraInfoLength = 0; + + if (!InternetCreateUrlW(&urlComponents, 0, NULL, &url_length) && + (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) return FALSE; - orig_url = HeapAlloc(GetProcessHeap(), 0, url_length); - - /* convert from bytes to characters */ - url_length = url_length / sizeof(WCHAR) - 1; - if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) - { + orig_url = HeapAlloc(GetProcessHeap(), 0, url_length); + + /* convert from bytes to characters */ + url_length = url_length / sizeof(WCHAR) - 1; + if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + return FALSE; + } + + url_length = 0; + if (!InternetCombineUrlW(orig_url, lpszUrl, NULL, &url_length, ICU_ENCODE_SPACES_ONLY) && + (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + return FALSE; + } + combined_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + + if (!InternetCombineUrlW(orig_url, lpszUrl, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + HeapFree(GetProcessHeap(), 0, combined_url); + return FALSE; + } HeapFree(GetProcessHeap(), 0, orig_url); - return FALSE; - } - - url_length = 0; - if (!InternetCombineUrlW(orig_url, lpszUrl, NULL, &url_length, ICU_ENCODE_SPACES_ONLY) && - (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) - { - HeapFree(GetProcessHeap(), 0, orig_url); - return FALSE; - } - combined_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); - - if (!InternetCombineUrlW(orig_url, lpszUrl, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY)) - { - HeapFree(GetProcessHeap(), 0, orig_url); - HeapFree(GetProcessHeap(), 0, combined_url); - return FALSE; - } - HeapFree(GetProcessHeap(), 0, orig_url); userName[0] = 0; hostName[0] = 0; @@ -3349,13 +3349,13 @@ INTERNET_STATUS_REDIRECT, szNewLocation, dwBufferSize); bSuccess = HTTP_HandleRedirect(lpwhr, szNewLocation); - if (bSuccess) - { - HeapFree(GetProcessHeap(), 0, requestString); - loop_next = TRUE; - } + if (bSuccess) + { + HeapFree(GetProcessHeap(), 0, requestString); + loop_next = TRUE; } } + } if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTH) && bSuccess) { WCHAR szAuthValue[2048]; @@ -3429,12 +3429,12 @@ /* TODO: send notification for P3P header */ - iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); TRACE("<--\n"); if (bSuccess) INTERNET_SetLastError(ERROR_SUCCESS); @@ -3745,20 +3745,20 @@ goto lend; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); - /* split the version from the status code */ - status_code = strchrW( buffer, ' ' ); - if( !status_code ) - goto lend; - *status_code++=0; - - /* split the status code from the status text */ - status_text = strchrW( status_code, ' ' ); - if( !status_text ) - goto lend; - *status_text++=0; - - TRACE("version [%s] status code [%s] status text [%s]\n", - debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); + /* split the version from the status code */ + status_code = strchrW( buffer, ' ' ); + if( !status_code ) + goto lend; + *status_code++=0; + + /* split the status code from the status text */ + status_text = strchrW( status_code, ' ' ); + if( !status_text ) + goto lend; + *status_text++=0; + + TRACE("version [%s] status code [%s] status text [%s]\n", + debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); } while (!strcmpW(status_code, szHundred)); /* ignore "100 Continue" responses */ @@ -3799,26 +3799,26 @@ TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) + while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) { - cchMaxRawHeaders *= 2; + cchMaxRawHeaders *= 2; lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); } - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; + memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); + cchRawHeaders += (buflen-1); + memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); + cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; + lpszRawHeaders[cchRawHeaders] = '\0'; pFieldAndValue = HTTP_InterpretHttpHeader(buffer); if (!pFieldAndValue) break; - HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1], - HTTP_ADDREQ_FLAG_ADD ); - - HTTP_FreeTokens(pFieldAndValue); - } + HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1], + HTTP_ADDREQ_FLAG_ADD ); + + HTTP_FreeTokens(pFieldAndValue); + } else { cbreaks++; Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -460,7 +460,7 @@ }; #undef FE int i; - + for (i = 0; i < (sizeof(flag) / sizeof(flag[0])); i++) { if (flag[i].val & dwFlags) { TRACE(" %s", flag[i].name); @@ -520,13 +520,13 @@ if(!buffer || bufsize < *size) return ERROR_INSUFFICIENT_BUFFER; - strcpyW(buffer, ai->lpszAgent); + strcpyW(buffer, ai->lpszAgent); }else { - *size = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); + *size = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); if(!buffer || bufsize < *size) return ERROR_INSUFFICIENT_BUFFER; - WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, buffer, *size, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, buffer, *size, NULL, NULL); } return ERROR_SUCCESS; @@ -543,7 +543,7 @@ if (ai->lpszProxyBypass) proxyBypassBytesRequired = (lstrlenW(ai->lpszProxyBypass) + 1) * sizeof(WCHAR); if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired) - return ERROR_INSUFFICIENT_BUFFER; + return ERROR_INSUFFICIENT_BUFFER; proxy = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW)); proxy_bypass = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired); @@ -1814,7 +1814,7 @@ LPWININETHANDLEHEADER lpwh; TRACE("0x%08x\n", (ULONG)hInternet); - + if (!(lpwh = WININET_GetObject(hInternet))) return INTERNET_INVALID_STATUS_CALLBACK; @@ -2016,8 +2016,8 @@ ERR("(%p, %p, 0x%x, 0x%lx): not implemented in native\n", hFile, lpBuffer, dwFlags, dwContext); INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } + return FALSE; +} DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) { @@ -2047,7 +2047,7 @@ return ERROR_SUCCESS; case INTERNET_OPTION_CONNECTED_STATE: - FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); + FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; @@ -2259,7 +2259,7 @@ INTERNET_STATUS_CALLBACK callback = *(INTERNET_STATUS_CALLBACK *)lpBuffer; ret = (set_status_callback(lpwhh, callback, TRUE) != INTERNET_INVALID_STATUS_CALLBACK); break; - } + } case INTERNET_OPTION_HTTP_VERSION: { HTTP_VERSION_INFO* pVersion=(HTTP_VERSION_INFO*)lpBuffer; @@ -2737,11 +2737,11 @@ len = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0); if (!(szUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) - return FALSE; + return FALSE; MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, len); rc = InternetCheckConnectionW(szUrl, dwFlags, dwReserved); HeapFree(GetProcessHeap(), 0, szUrl); - + return rc; } @@ -2905,7 +2905,7 @@ workRequest.asyncproc = AsyncInternetOpenUrlProc; workRequest.hdr = WININET_AddRef( &hIC->hdr ); - req = &workRequest.u.InternetOpenUrlW; + req = &workRequest.u.InternetOpenUrlW; req->lpszUrl = WININET_strdupW(lpszUrl); if (lpszHeaders) req->lpszHeaders = WININET_strdupW(lpszHeaders); Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/internet.h [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -78,8 +78,8 @@ { int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0); LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if(ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + if (ret) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len); return ret; } @@ -87,7 +87,7 @@ { int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); LPSTR ret = HeapAlloc( GetProcessHeap(), 0, len ); - if(ret) + if (ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL); return ret; } @@ -339,7 +339,7 @@ struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_HTTPSENDREQUESTW HttpSendRequestW; struct WORKREQ_SENDCALLBACK SendCallback; - struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; + struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; } u; Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -621,7 +621,7 @@ } #endif return TRUE; - } +} /****************************************************************************** * NETCON_getNextLine @@ -663,8 +663,8 @@ if (lpszBuffer[nRecv] != '\r') nRecv++; } - else - { + else + { INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT); goto lend; } @@ -700,7 +700,7 @@ { INTERNET_SetLastError(ERROR_CONNECTION_ABORTED); success = FALSE; - } + } if (lpszBuffer[nRecv] == '\n') { @@ -717,8 +717,8 @@ lpszBuffer[nRecv++] = '\0'; *dwBuffer = nRecv; TRACE("_SSL:%u %s\n", nRecv, lpszBuffer); - return TRUE; -} + return TRUE; + } return FALSE; #else return FALSE; Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Tue Dec 15 17:33:41 2009 @@ -617,8 +617,8 @@ MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, lpwszUrl, url_len); ret = URLCacheContainers_FindContainerW(lpwszUrl, ppContainer); HeapFree(GetProcessHeap(), 0, lpwszUrl); - return ret; -} + return ret; + } return GetLastError(); } @@ -2462,9 +2462,9 @@ lpszFileExtensionA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); if (!lpszFileExtensionA) { - error = GetLastError(); - goto cleanup; - } + error = GetLastError(); + goto cleanup; + } WideCharToMultiByte(CP_ACP, 0, lpszFileExtension, -1, lpszFileExtensionA, len, NULL, NULL); } @@ -3626,8 +3626,8 @@ BOOL WINAPI GetDiskInfoA(PCSTR p0, PDWORD p1, PDWORDLONG p2, PDWORDLONG p3) { FIXME("(%p, %p, %p, %p)\n", p0, p1, p2, p3); - return FALSE; - } + return FALSE; +} /*********************************************************************** * RegisterUrlCacheNotification (WININET.@)

1 0

[dreimer] 44603: Using the right Cross Compiler is useful, of course. Now We just need a native one, because the cygwin one has evil *nix, blasphemical, god negating and devil worshipping search paths.
by dreimer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: dreimer Date: Tue Dec 15 17:07:47 2009 New Revision: 44603 URL: http://svn.reactos.org/svn/reactos?rev=44603&view=rev Log: Using the right Cross Compiler is useful, of course. Now We just need a native one, because the cygwin one has evil *nix, blasphemical, god negating and devil worshipping search paths. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec 15 17:07:47 2009 @@ -10,7 +10,7 @@ if ("$ENV:ROS_ARCH" -eq "amd64") { $ENV:ROS_PREFIX = "x86_64-w64-mingw32" } elseif ("$ENV:ROS_ARCH" -eq "arm") { - $ENV:ROS_PREFIX = "i386-mingw32ce" + $ENV:ROS_PREFIX = "arm-mingw32ce" } else { $ENV:ROS_PREFIX = $null } Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 15 17:07:47 2009 @@ -18,7 +18,7 @@ if "%ROS_ARCH%" == "amd64" ( set ROS_PREFIX=x86_64-w64-mingw32 ) else if "%ROS_ARCH%" == "arm" ( - set ROS_PREFIX=i386-mingw32ce + set ROS_PREFIX=arm-mingw32ce ) else ( set ROS_PREFIX= ) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Tue Dec 15 17:07:47 2009 @@ -193,9 +193,9 @@ } else if (arm) { - if ((wcslen(checkmgw) + wcslen(L"\\bin\\i386-mingw32ce-gcc.exe")) < MAX_PATH) - { - wcscat(checkmgw, L"\\bin\\i386-mingw32ce-gcc.exe"); + if ((wcslen(checkmgw) + wcslen(L"\\bin\\arm-mingw32ce-gcc.exe")) < MAX_PATH) + { + wcscat(checkmgw, L"\\bin\\arm-mingw32ce-gcc.exe"); } } else

1 0

[tkreuzer] 44601: [SHELL32] Fix a prototype. Convert RtlLargeInteger to native int64. Fixes 64bit built.
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 14:01:55 2009 New Revision: 44601 URL: http://svn.reactos.org/svn/reactos?rev=44601&view=rev Log: [SHELL32] Fix a prototype. Convert RtlLargeInteger to native int64. Fixes 64bit built. Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] Tue Dec 15 14:01:55 2009 @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define LARGEINT_PROTOS -#define LargeIntegerDivide RtlLargeIntegerDivide -#define ExtendedIntegerMultiply RtlExtendedIntegerMultiply -#define ConvertUlongToLargeInteger RtlConvertUlongToLargeInteger -#define LargeIntegerSubtract RtlLargeIntegerSubtract #define MAX_PROPERTY_SHEET_PAGE 32 #define WIN32_NO_STATUS @@ -291,26 +286,25 @@ static -LARGE_INTEGER -GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes) -{ - LARGE_INTEGER Temp, Result, Remainder; - - if (TotalNumberOfFreeBytes.QuadPart == 0LL) +ULONGLONG +GetFreeBytesShare(ULONGLONG TotalNumberOfFreeBytes, ULONGLONG TotalNumberOfBytes) +{ + ULONGLONG Temp; + + if (TotalNumberOfFreeBytes == 0LL) { - return ConvertUlongToLargeInteger(0); - } - - Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); - if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) + return 0; + } + + Temp = TotalNumberOfBytes / 100; + if (Temp >= TotalNumberOfFreeBytes) { - Result = ConvertUlongToLargeInteger(1); - }else + return 1; + } + else { - Result = LargeIntegerDivide(TotalNumberOfFreeBytes, Temp, &Remainder); - } - - return Result; + return TotalNumberOfFreeBytes / Temp; + } } static @@ -343,20 +337,20 @@ HBRUSH hMagBrush; RECT rect; LONG horzsize; - LARGE_INTEGER Result; + LONGLONG Result; WCHAR szBuffer[20]; hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); SendDlgItemMessageW(hwndDlg, 14006, WM_GETTEXT, 20, (LPARAM)szBuffer); - Result.QuadPart = _wtoi(szBuffer); + Result = _wtoi(szBuffer); CopyRect(&rect, &drawItem->rcItem); horzsize = rect.right - rect.left; - Result.QuadPart = (Result.QuadPart * horzsize) / 100; - - rect.right = drawItem->rcItem.right - Result.QuadPart; + Result = (Result * horzsize) / 100; + + rect.right = drawItem->rcItem.right - Result; FillRect(drawItem->hDC, &rect, hBlueBrush); rect.left = rect.right; rect.right = drawItem->rcItem.right; @@ -400,7 +394,7 @@ if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes)) { WCHAR szResult[128]; - LARGE_INTEGER Result; + LONGLONG Result; #ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED HANDLE hVolume; DWORD BytesReturned = 0; @@ -427,13 +421,13 @@ if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); - Result = GetFreeBytesShare(TotalNumberOfFreeBytes, TotalNumberOfBytes); + Result = GetFreeBytesShare(TotalNumberOfFreeBytes.QuadPart, TotalNumberOfBytes.QuadPart); /* set free bytes percentage */ - swprintf(szResult, L"%02d%%", Result.QuadPart); + swprintf(szResult, L"%02d%%", Result); SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); /* store used share amount */ - Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); - swprintf(szResult, L"%02d%%", Result.QuadPart); + Result = 100 - Result; + swprintf(szResult, L"%02d%%", Result); SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); if (DriveType == DRIVE_FIXED) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Tue Dec 15 14:01:55 2009 @@ -81,7 +81,7 @@ #define MRUF_STRING_LIST 0 -typedef int (WINAPI *CREATEMRULISTPROCW)( +typedef HANDLE (WINAPI *CREATEMRULISTPROCW)( LPMRUINFO lpmi );

1 0

[dreimer] 44600: Fix more remaining Bugs. - PS1 options script now sets the settings immediately after closing the options tool, too. - Add missing Target Compiler C++ Paths. - Cleanup the RosBE64 NSIS Script. - Fix last remaining bug in the options tool. ARM Port still does not build. HAAAALLP!
by dreimer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: dreimer Date: Tue Dec 15 11:23:45 2009 New Revision: 44600 URL: http://svn.reactos.org/svn/reactos?rev=44600&view=rev Log: Fix more remaining Bugs. - PS1 options script now sets the settings immediately after closing the options tool, too. - Add missing Target Compiler C++ Paths. - Cleanup the RosBE64 NSIS Script. - Fix last remaining bug in the options tool. ARM Port still does not build. HAAAALLP! Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -22,7 +22,7 @@ if (Test-Path "$options") { Push-Location "$_ROSBE_BASEDIR" - &{IEX "& '$options' $param"} | out-null + &{IEX "& 'options' $param"} | out-null Pop-Location if (Test-Path "$cfgfile") { & "$cfgfile" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -35,4 +35,4 @@ $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" $ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include\c++"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" $ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include\c++""" +$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include\c++"" -I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET""" Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -39,4 +39,4 @@ set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include\c++" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" -set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include\c++" +set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include\c++" -I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -129,7 +129,7 @@ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 @@ -148,7 +148,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd @@ -161,7 +161,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -454,11 +454,18 @@ LoadedSettings->writelog = 1; LoadedSettings->showversion = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); - if (amd64 || arm) + if (amd64) { if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION64)) < MAX_PATH) { wcscat(LoadedSettings->mingwpath, MINGWVERSION64); + } + } + else if (arm) + { + if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSIONARM)) < MAX_PATH) + { + wcscat(LoadedSettings->mingwpath, MINGWVERSIONARM); } } else

1 0

[dreimer] 44599: Add ARM Support to RosBE. Not really tested yet.
by dreimer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: dreimer Date: Tue Dec 15 10:25:30 2009 New Revision: 44599 URL: http://svn.reactos.org/svn/reactos?rev=44599&view=rev Log: Add ARM Support to RosBE. Not really tested yet. Added: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -25,6 +25,9 @@ } if ("$ENV:ROS_ARCH" -eq "amd64") { (Get-Host).UI.RawUI.ForegroundColor = 0xB + (Get-Host).UI.RawUI.BackgroundColor = 0x0 +} elseif ("$ENV:ROS_ARCH" -eq "arm") { + (Get-Host).UI.RawUI.ForegroundColor = 0xC (Get-Host).UI.RawUI.BackgroundColor = 0x0 } else { (Get-Host).UI.RawUI.ForegroundColor = 0xA Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -8,14 +8,12 @@ $host.ui.RawUI.WindowTitle = "Options" +$options="$_ROSBE_BASEDIR\Tools\options.exe" - -if ("$ENV:ROS_ARCH" -eq "amd64") { - $options="$_ROSBE_BASEDIR\Tools\options.exe" - $param = "amd64" - $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.ps1" +if ("$ENV:ROS_ARCH" -ne "i386") { + $param = "$ENV:ROS_ARCH" + $cfgfile ="$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } else { - $options="$_ROSBE_BASEDIR\Tools\options.exe" $param = $null $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.ps1" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -6,9 +6,11 @@ # COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # -# Check if we're switching to the AMD64 architecture +# Check if we're switching to the AMD64 or AMR architecture. if ("$ENV:ROS_ARCH" -eq "amd64") { $ENV:ROS_PREFIX = "x86_64-w64-mingw32" +} elseif ("$ENV:ROS_ARCH" -eq "arm") { + $ENV:ROS_PREFIX = "i386-mingw32ce" } else { $ENV:ROS_PREFIX = $null } Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -55,6 +55,8 @@ if "%ROS_ARCH%" == "amd64" ( color 0B +) else if "%ROS_ARCH%" == "arm" ( + color 0C ) :: Load the user's options if any if "%ROS_ARCH%" == "i386" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -14,12 +14,12 @@ title Options -if "%ROS_ARCH%" == "amd64" ( - set options=%_ROSBE_BASEDIR%\Tools\options.exe - set param=amd64 - set cfgfile=%APPDATA%\RosBE\rosbe-options-amd64.cmd +set options=%_ROSBE_BASEDIR%\Tools\options.exe + +if not "%ROS_ARCH%" == "i386" ( + set param=%ROS_ARCH% + set cfgfile=%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd ) else ( - set options=%_ROSBE_BASEDIR%\Tools\options.exe set param= set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -14,9 +14,11 @@ @echo on ) -:: Check if we're switching to the AMD64 architecture +:: Check if we're switching to the AMD64 or ARM architecture. if "%ROS_ARCH%" == "amd64" ( set ROS_PREFIX=x86_64-w64-mingw32 +) else if "%ROS_ARCH%" == "arm" ( + set ROS_PREFIX=i386-mingw32ce ) else ( set ROS_PREFIX= ) Added: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE-AR… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi (added) +++ trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -1,0 +1,274 @@ +!define PRODUCT_NAME "ReactOS Build Environment for Windows - ARM Target Compiler" +!define PRODUCT_VERSION "1.0" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKCU" +!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" + +;; +;; Basic installer options +;; +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "RosBE-ARM-${PRODUCT_VERSION}.exe" +InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +;; +;; Add version/product information metadata to the installation file. +;; +VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0" +VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" +VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" +VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" +VIProductVersion "1.0.0.0" + +CRCCheck force +SetDatablockOptimize on +XPStyle on +SetCompressor /FINAL /SOLID lzma + +!include "MUI2.nsh" +!include "InstallOptions.nsh" +!include "RosSourceDir.nsh" +!include "LogicLib.nsh" +!include "x64.nsh" + +;; +;; Read our custom page ini, remove previous version and make sure only +;; one instance of the installer is running. +;; +Function .onInit + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "The ${PRODUCT_NAME} v${PRODUCT_VERSION} installer is already running." + Abort + ${If} ${RunningX64} + StrCpy $INSTDIR "$PROGRAMFILES64\RosBE" + ${Else} + StrCpy $INSTDIR "$PROGRAMFILES\RosBE" + ${Endif} + Call UninstallPrevious + !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" +FunctionEnd + +;; +;; MUI Settings +;; +!define MUI_ABORTWARNING +!define MUI_ICON "Icons\rosbe.ico" +!define MUI_UNICON "Icons\uninstall.ico" +!define MUI_COMPONENTSPAGE_NODESC + +!define MUI_WELCOMEPAGE_TITLE_3LINES +!insertmacro MUI_PAGE_WELCOME +;!insertmacro MUI_PAGE_LICENSE "Root\License.txt" +!insertmacro MUI_PAGE_DIRECTORY + +;; +;; ReactOS Source Directory Pages +;; +var REACTOS_SOURCE_DIRECTORY +!insertmacro CUSTOM_PAGE_ROSDIRECTORY + +;; +;; Start menu page +;; +var ICONS_GROUP +!define MUI_STARTMENUPAGE_NODISABLE +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "ReactOS Build Environment" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" +!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP + +!insertmacro MUI_PAGE_COMPONENTS + +!insertmacro MUI_PAGE_INSTFILES + +!define MUI_FINISHPAGE_TITLE_3LINES +!insertmacro MUI_PAGE_FINISH + +;; +;; Uninstaller pages +;; +!insertmacro MUI_UNPAGE_INSTFILES + +;; +;; Language and reserve files +;; +ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" +!insertmacro MUI_LANGUAGE "English" + +Section -MinGWGCCNASM SEC01 + SetOutPath "$INSTDIR\arm" + SetOverwrite try + File /r Components\arm\*.* + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\options.cmd + IfFileExists "$INSTDIR\RosBE.ps1" 0 +3 + File /r Components\Powershell\options.ps1 + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\options.exe +SectionEnd + +Section -StartMenuShortcuts SEC02 + SetShellVarContext current + + ;; + ;; Add our start menu shortcuts. + ;; + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options - ARM.lnk" "$INSTDIR\Tools\options.exe" arm + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - ARM Target.lnk" \ + "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +Section /o "Desktop Shortcuts" SEC03 + SetShellVarContext current + + ;; + ;; Add our desktop shortcuts. + ;; + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" +SectionEnd + +Section /o "Quick Launch Shortcuts" SEC04 + SetShellVarContext current + + ;; + ;; Add our quick launch shortcuts. + ;; + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" +SectionEnd + +Section -Post SEC06 + WriteUninstaller "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" +SectionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK \ + "ReactOS Build Environment - ARM Target was successfully removed from your computer." +FunctionEnd + +Function un.onInit + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Are you sure you want to completely remove ReactOS Build Environment - ARM Target and all of its components?" \ + IDYES +2 + Abort +FunctionEnd + +Section Uninstall + !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP + SetShellVarContext current + + ;; + ;; Clean up installed files. + ;; + RMDir /r /REBOOTOK "$INSTDIR\arm" + Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! + RMDir /REBOOTOK "$INSTDIR" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" + + ;; + ;; Clean up the registry. + ;; + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +Function UninstallPrevious + ReadRegStr $R0 HKCU \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ + "UninstallString" + ReadRegStr $R1 HKCU \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ + "DisplayVersion" + ${If} $R1 == "${PRODUCT_VERSION}" + messageBox MB_OK|MB_ICONEXCLAMATION \ + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." + ${EndIf} + ${If} $R0 == "" + ReadRegStr $R0 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\ReactOS Build Environment" \ + "UninstallString" + ReadRegStr $R1 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\ReactOS Build Environment" \ + "DisplayVersion" + ${If} $R0 == "" + Return + ${EndIf} + ${EndIf} + MessageBox MB_YESNO|MB_ICONQUESTION \ + "A previous version of the ${PRODUCT_NAME} was found. You should uninstall it before installing this version.$\n$\nDo you want to do that now?" \ + IDNO UninstallPrevious_no \ + IDYES UninstallPrevious_yes + Abort + UninstallPrevious_yes: + Var /global PREVIOUSINSTDIR + Push $R0 + Call GetParent + Pop $PREVIOUSINSTDIR + Pop $R0 + ExecWait '$R0 _?=$PREVIOUSINSTDIR' + UninstallPrevious_no: +FunctionEnd + +Function GetParent + Exch $R0 + Push $R1 + Push $R2 + Push $R3 + + StrCpy $R1 0 + StrLen $R2 $R0 + + loop: + IntOp $R1 $R1 + 1 + IntCmp $R1 $R2 get 0 get + StrCpy $R3 $R0 1 -$R1 + StrCmp $R3 "\" get + Goto loop + + get: + StrCpy $R0 $R0 -$R1 + + Pop $R3 + Pop $R2 + Pop $R1 + Exch $R0 +FunctionEnd Propchange: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE AMD64 Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 + LTEXT "Schriftfarbe", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nBeispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Nostrip Dateien zum Debuggen erzeugen", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Versions Header anzeigen", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RosBE ARM Einstellungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS AMD64 Build Environment Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Background Color", -1, 10, 10, 75, 12 + LTEXT "Font Color", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS ARM Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Background Color", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configuración de ReactOS AMD64 Build Environment" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Color de fondo", -1, 10, 10, 75, 12 + LTEXT "Color de fuente", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nTexto ejemplo", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Mostrar tiempo de creación", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Usar CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Limpiar salida", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Cree archivos no limpios para depuración", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Ruta de MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Guardar Logs (Registros)", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Cambiar carpeta parar OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Cambiar carpeta para OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Guardar", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancelar", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "¡Bienvenido!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuración de ReactOS ARM Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Color de fondo", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètres de AMD64 l'Environnement de Compilation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 + LTEXT "Couleur de la police", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nTexte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 50, 120, 36 + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 110, 12 + CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paramètres de ARM l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia ReactOS AMD64 Build Environment" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kolor t³a", -1, 10, 10, 75, 12 + LTEXT "Kolor czcionki", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nPrzyk³adowy tekst", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Poka¿ czas budowania", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "U¿yj CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Usuñ dane debugowania", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Utwórz pliki nostrip dla debugowania", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "cie¿ka do MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Zapisuj logi", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Zmieñ folder plików OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Zmieñ folder plików OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Zapisz", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Anuluj", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ustawienia ReactOS ARM Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kolor t³a", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -37,6 +37,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - AMD64" +FONT 8,"MS Sans Serif",0,0 +BEGIN + LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 + LTEXT "Öâåò øðèôòà", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Îñòàâëÿòü â ôàéëàõ èíôîðìàöèþ äëÿ âîçìîæíîñòè ðàáîòû äåáàãåðà", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - ARM" FONT 8,"MS Sans Serif",0,0 BEGIN LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -43,6 +43,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - AMD64" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 + LTEXT "Êîë³ð øðèôòó", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÇðàçîê òåêñòó", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Â³äîáðàæàòè ÷àñ êîìï³ëÿö³¿", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - ARM" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -43,6 +43,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m - AMD64" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "I´ºÃC¦â", -1, 10, 10, 75, 12 + LTEXT "¦rÅéÃC¦â", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\n¥Ü¨Ò¤å¥»", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Åã¥Ü«Ø¸m®É¶¡", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "¨Ï¥Î CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "µô´î¿é¥X", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "«Ø¥ß½Õ¸Õ¥Îªº¥]¸ËÀÉ", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Åã¥Üª©¥»¼ÐÀY", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "MinGW/GCC ªº¸ô®|", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Àx¦s¤é»x", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "§ó§ï OBJ ªº¥Ø¿ý", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "§ó§ï OUT ªº¥Ø¿ý", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Àx¦s", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "¨ú®ø", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Åwªï¡I", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m - ARM" FONT 8, "MS Shell Dlg" BEGIN LTEXT "I´ºÃC¦â", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -5,6 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer + * Copyright 2009 Daniel Reimer * */ @@ -45,19 +46,40 @@ static WCHAR filename[MAX_PATH]; if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) { - if (amd64) { + if (amd64) + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-amd64.cmd")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options-amd64.cmd"); - } else { + } + } + else if (arm) + { + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-arm.cmd")) < MAX_PATH) + { + wcscat(filename, L"\\RosBE\\rosbe-options-arm.cmd"); + } + } + else + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options.cmd"); + } } } else { - if (amd64) { + if (amd64) + { wcscpy(filename, L"rosbe-options-amd64.cmd"); - } else { + } + else if (arm) + { + wcscpy(filename, L"rosbe-options-arm.cmd"); + } + else + { wcscpy(filename, L"rosbe-options.cmd"); } } @@ -72,19 +94,40 @@ static WCHAR filename[MAX_PATH]; if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) { - if (amd64) { + if (amd64) + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-amd64.ps1")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options-amd64.ps1"); - } else { + } + } + else if (arm) + { + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-arm.ps1")) < MAX_PATH) + { + wcscat(filename, L"\\RosBE\\rosbe-options-arm.ps1"); + } + } + else + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.ps1")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options.ps1"); + } } } else { - if (amd64) { + if (amd64) + { wcscpy(filename, L"rosbe-options-amd64.ps1"); - } else { + } + else if (arm) + { + wcscpy(filename, L"rosbe-options-arm.ps1"); + } + else + { wcscpy(filename, L"rosbe-options.ps1"); } } @@ -117,24 +160,50 @@ GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) + { if (!CreateDir(infoPtr->hwndDlg, logdir)) + { return FALSE; + } + } if (objstate && (objdir[0] != 0)) + { if (!CreateDir(infoPtr->hwndDlg, objdir)) + { return FALSE; + } + } if (outstate && (outdir[0] != 0)) + { if (!CreateDir(infoPtr->hwndDlg, outdir)) + { return FALSE; + } + } wcscpy(checkmgw, mingwpath); - if (amd64) { + if (amd64) + { if ((wcslen(checkmgw) + wcslen(L"\\bin\\x86_64-w64-mingw32-gcc.exe")) < MAX_PATH) + { wcscat(checkmgw, L"\\bin\\x86_64-w64-mingw32-gcc.exe"); - } else { + } + } + else if (arm) + { + if ((wcslen(checkmgw) + wcslen(L"\\bin\\i386-mingw32ce-gcc.exe")) < MAX_PATH) + { + wcscat(checkmgw, L"\\bin\\i386-mingw32ce-gcc.exe"); + } + } + else + { if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) + { wcscat(checkmgw, L"\\bin\\gcc.exe"); + } } hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -157,32 +226,52 @@ fwprintf(pFilecmd, L"color %X%X\n", background, foreground); fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - if (strip == 1) { + if (strip == 1) + { fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=yes\n"); - } else { + } + else + { fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=no\n"); } - if (nostrip == 1) { + if (nostrip == 1) + { fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=yes\n"); - } else { + } + else + { fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=no\n"); } fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); - if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); - if (amd64) { - if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); - } else { - if (mingwpath[0] != 0) { + if (logdir[0] != 0) + { + fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); + } + if (amd64 || arm) + { + if (mingwpath[0] != 0) + { + fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); + } + } + else + { + if (mingwpath[0] != 0) + { fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); } } - if ((objdir[0] != 0) && objstate) { + if ((objdir[0] != 0) && objstate) + { fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); } - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); + if ((outdir[0] != 0) && outstate) + { + fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); + } } if (pFileps1) @@ -196,32 +285,52 @@ fwprintf(pFileps1, L"clear-host\n"); fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); - if (strip == 1) { + if (strip == 1) + { fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"yes\"\n"); - } else { + } + else + { fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"no\"\n"); } - if (nostrip == 1) { + if (nostrip == 1) + { fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"yes\"\n"); - } else { + } + else + { fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"no\"\n"); } fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); - if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (amd64) { - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); - } else { - if (mingwpath[0] != 0) { + if (logdir[0] != 0) + { + fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); + } + if (amd64 || arm) + { + if (mingwpath[0] != 0) + { + fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); + } + } + else + { + if (mingwpath[0] != 0) + { fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); } } - if ((objdir[0] != 0) && objstate) { + if ((objdir[0] != 0) && objstate) + { fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = \"%s\"\n", objdir); fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = \"%s\"\n", objdir); } - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = \"%s\"\n", outdir); + if ((outdir[0] != 0) && outstate) + { + fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = \"%s\"\n", outdir); + } } if (pFilecmd && pFileps1) @@ -277,27 +386,49 @@ ptr = wcstok(ptr, L"="); ptr2 = wcstok(NULL, L"="); if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) + { LoadedSettings->showtime = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) + { LoadedSettings->useccache = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"ROS_LEAN_AND_MEAN") == 0) + { wcsncpy(LoadedSettings->lstrip, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"ROS_BUILDNOSTRIP") == 0) + { wcsncpy(LoadedSettings->lnostrip, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) + { LoadedSettings->writelog = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"_ROSBE_SHOWVERSION") == 0) + { LoadedSettings->showversion = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) + { wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); - else if ((amd64) && (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0)) + } + else if ((amd64 || arm) && (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0)) + { wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if ((!amd64) && (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0)) + } + else if ((!(amd64 || arm)) && (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0)) + { wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0) + { wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"ROS_OUTPUT") == 0) + { wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); + } } } fclose(pFile); @@ -306,9 +437,16 @@ } else { - if (amd64) { + if (amd64) + { LoadedSettings->foreground = 0xb; - } else { + } + else if (arm) + { + LoadedSettings->foreground = 0xc; + } + else + { LoadedSettings->foreground = 0xa; } LoadedSettings->background = 0; @@ -316,26 +454,39 @@ LoadedSettings->writelog = 1; LoadedSettings->showversion = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); - if (amd64) { + if (amd64 || arm) + { if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION64)) < MAX_PATH) + { wcscat(LoadedSettings->mingwpath, MINGWVERSION64); - } else { + } + } + else + { if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) + { wcscat(LoadedSettings->mingwpath, MINGWVERSION); + } } LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } - if (!wcscmp(LoadedSettings->lstrip, L"yes")) { + if (!wcscmp(LoadedSettings->lstrip, L"yes")) + { LoadedSettings->strip = 1; - } else { + } + else + { LoadedSettings->strip = 0; } - if (!wcscmp(LoadedSettings->lnostrip, L"yes")) { + if (!wcscmp(LoadedSettings->lnostrip, L"yes")) + { LoadedSettings->nostrip = 1; - } else { + } + else + { LoadedSettings->nostrip = 0; } SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); @@ -379,14 +530,20 @@ BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; - if (!wcscmp(DefaultSettings->lstrip, L"yes")) { + if (!wcscmp(DefaultSettings->lstrip, L"yes")) + { DefaultSettings->strip = 1; - } else { + } + else + { DefaultSettings->strip = 0; } - if (!wcscmp(DefaultSettings->lnostrip, L"yes")) { + if (!wcscmp(DefaultSettings->lnostrip, L"yes")) + { DefaultSettings->nostrip = 1; - } else { + } + else + { DefaultSettings->nostrip = 0; } @@ -406,14 +563,26 @@ GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (objstate) + { if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && (wcslen(objdir) > 0)) + { StateObj = FALSE; + } + } if (outstate) + { if ((wcscmp(outdir, DefaultSettings->outdir) != 0) && (wcslen(outdir) > 0)) + { StateOut = FALSE; + } + } if (writelog) + { if ((wcscmp(logdir, DefaultSettings->logdir) != 0) && (wcslen(logdir) > 0)) + { StateLog = FALSE; + } + } State ^= ((foreground == DefaultSettings->foreground) && (background == DefaultSettings->background) && (showtime == DefaultSettings->showtime) && (writelog == DefaultSettings->writelog) && @@ -451,7 +620,9 @@ { PathLen = wcslen((LPWSTR)wParam); if (wcscmp((LPWSTR)wParam+PathLen, L"\\")) + { wcsset((LPWSTR)wParam+(PathLen-1), '\0'); + } if (CreateDirectory((LPWSTR)wParam, NULL) == 0) { LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); @@ -499,7 +670,9 @@ { infoPtr = (POPTIONS_DLG)GetWindowLongPtr(Dlg, DWLP_USER); if (infoPtr == NULL) + { return FALSE; + } } switch (Msg) @@ -555,7 +728,9 @@ NULL); for (i = 0; i < sizeof(ToolTipAssociations) / sizeof(ToolTipAssociations[0]); i++) + { AssociateToolWithControl(infoPtr, ToolTipAssociations[i].ControlId, ToolTipAssociations[i].StringId); + } infoPtr->hIcon = LoadImage( hInstance, MAKEINTRESOURCE(ID_OPTICON), @@ -564,7 +739,9 @@ GetSystemMetrics(SM_CYSMICON), 0); if(infoPtr->hIcon) + { SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)infoPtr->hIcon); + } GetObject(GetStockObject(ANSI_FIXED_FONT), sizeof(LOGFONT), &lf); lf.lfWeight = FW_BOLD; @@ -595,7 +772,9 @@ case ID_OK: { if (!WriteSettings(infoPtr)) + { break; + } } case ID_CANCEL: { @@ -605,7 +784,9 @@ LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); LoadString(hInstance, MSG_EXITCHANGE, BoxMsg, 256); if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDNO) + { break; + } } PostMessage(Dlg, WM_CLOSE, 0, 0); break; @@ -652,7 +833,9 @@ if ((pidl = SHBrowseForFolder(&PathInfo)) != NULL) { if (SHGetPathFromIDList(pidl, path)) + { SetDlgItemText(Dlg, Control, path); + } pMalloc->lpVtbl->Free(pMalloc, pidl); } pMalloc->lpVtbl->Release(pMalloc); @@ -710,10 +893,13 @@ case WM_DESTROY: { if (infoPtr->hIcon) + { DestroyIcon(infoPtr->hIcon); + } if (infoPtr->hFont) + { DeleteObject(infoPtr->hFont); - + } } case WM_CLOSE: @@ -734,6 +920,13 @@ if (strcmp(cmdline,"amd64") == 0) { amd64 = TRUE; + arm = FALSE; + } + + if (strcmp(cmdline,"arm") == 0) + { + amd64 = FALSE; + arm = TRUE; } OptionsDlgInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgInfo)); @@ -741,9 +934,17 @@ { ZeroMemory(OptionsDlgInfo, sizeof(OPTIONS_DLG)); if (amd64) - DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG64), 0, DlgProc, (LPARAM)OptionsDlgInfo); - else - DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); + { + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG64), 0, DlgProc, (LPARAM)OptionsDlgInfo); + } + else if (arm) + { + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOGARM), 0, DlgProc, (LPARAM)OptionsDlgInfo); + } + else + { + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); + } HeapFree(GetProcessHeap(), 0, OptionsDlgInfo); } return 0; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -3,7 +3,7 @@ <assemblyIdentity name="ReactOS.options" processorArchitecture="x86" - version="1.1.0.0" + version="1.5.0.0" type="win32"/> <description>Config Tool</description> <dependency> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -5,6 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer + * Copyright 2009 Daniel Reimer * */ @@ -15,6 +16,7 @@ #include "resources.h" #define MINGWVERSION64 L"\\amd64" +#define MINGWVERSIONARM L"\\arm" #define MINGWVERSION L"\\i386" typedef struct _SETTINGS @@ -40,3 +42,4 @@ wchar_t *wcsset(wchar_t *string, wchar_t c); BOOL amd64 = FALSE; +BOOL arm = FALSE; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -6,8 +6,8 @@ 1 24 "options.exe.Manifest" VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,0,0 - PRODUCTVERSION 1,1,0,0 + FILEVERSION 1,5,0,0 + PRODUCTVERSION 1,5,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0" VALUE "FileDescription", "Config Tool for RosBE\0" - VALUE "FileVersion", "1.1.0.0\0" + VALUE "FileVersion", "1.5.0.0\0" VALUE "InternalName", "options\0" - VALUE "LegalCopyright", "Copyright © Daniel Reimer 2007\0" + VALUE "LegalCopyright", "Copyright © Daniel Reimer 2009\0" VALUE "OriginalFilename", "options.exe\0" VALUE "ProductName", "Config Tool for RosBE\0" - VALUE "ProductVersion", "1.1.0.0\0" + VALUE "ProductVersion", "1.5.0.0\0" END END BLOCK "VarFileInfo" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -5,6 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer + * Copyright 2009 Daniel Reimer * */ @@ -27,25 +28,26 @@ #define CLR15 0x0f /* Controls */ -#define ID_OK 0x11 -#define ID_CANCEL 0x12 -#define ID_OPTICON 0x13 -#define ID_SAVELOGS 0x14 -#define ID_SHOWBUILDTIME 0x15 -#define ID_USECCACHE 0x16 -#define ID_STRIP 0x17 -#define ID_OTHEROBJ 0x18 -#define ID_OTHEROUT 0x19 -#define ID_LOGDIR 0x1a -#define ID_MGWDIR 0x1b -#define ID_OBJDIR 0x1c -#define ID_OUTDIR 0x1d -#define ID_BROWSE 0x1e -#define ID_BROWSEMGW 0x1f -#define ID_BROWSEOBJ 0x20 -#define ID_BROWSEOUT 0x21 -#define ID_DIALOG 0x22 -#define ID_DIALOG64 0x23 +#define ID_OK 0x10 +#define ID_CANCEL 0x11 +#define ID_OPTICON 0x12 +#define ID_SAVELOGS 0x13 +#define ID_SHOWBUILDTIME 0x14 +#define ID_USECCACHE 0x15 +#define ID_STRIP 0x16 +#define ID_OTHEROBJ 0x17 +#define ID_OTHEROUT 0x18 +#define ID_LOGDIR 0x19 +#define ID_MGWDIR 0x1a +#define ID_OBJDIR 0x1b +#define ID_OUTDIR 0x1c +#define ID_BROWSE 0x1d +#define ID_BROWSEMGW 0x1e +#define ID_BROWSEOBJ 0x1f +#define ID_BROWSEOUT 0x20 +#define ID_DIALOG 0x21 +#define ID_DIALOG64 0x22 +#define ID_DIALOGARM 0x23 #define ID_EXAMPLE 0x24 #define IDC_FONT 0x25 #define IDC_BACK 0x26

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs