October 2008 - Wine-Commits

Juan Lang : cryptui: Don't crash if pImportSrc is NULL.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 199bf795077a6e2e7638b19b30ab49584b5abad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199bf795077a6e2e7638b19b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 13:44:00 2008 -0700 cryptui: Don't crash if pImportSrc is NULL. --- dlls/cryptui/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 482bd14..b31763d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -117,6 +117,12 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) FIXME("UI not implemented\n"); + if (!pImportSrc) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (pImportSrc->dwSubjectChoice != CRYPTUI_WIZ_IMPORT_SUBJECT_FILE) { FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice);

1 0

Alexandre Julliard : Wine release 1.1.7
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: website Branch: master Commit: a326eddeee33b5c5397d65adbf4baa728b3fee91 URL: http://source.winehq.org/git/website.git/?a=commit;h=a326eddeee33b5c5397d65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 18:03:30 2008 +0200 Wine release 1.1.7 --- news/en/2008102401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2008102401.xml b/news/en/2008102401.xml new file mode 100644 index 0000000..4dadfab --- /dev/null +++ b/news/en/2008102401.xml @@ -0,0 +1,16 @@ +<news> +<date>October 24, 2008</date> +<title>Wine 1.1.7 Released</title> +<body> + The Wine development release 1.1.7 is now available. + <a href="?announce=1.1.7">What's new</a> in this release: +<ul> + <li>Improved device management for DOS drives.</li> + <li>Many Richedit fixes.</li> + <li>Various installer fixes, particularly for IE 7.</li> + <li>First steps of Direct3D 10 implementation.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.7.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.7 : Alexandre Julliard : Release 1.1.7
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: refs/tags/wine-1.1.7 Tag: eab40e2135c24b76eaa5979974a9d615beb45c0f URL: http://source.winehq.org/git/wine.git/?a=tag;h=eab40e2135c24b76eaa5979974a9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 17:55:14 2008 +0200 Release 1.1.7

1 0

Alexandre Julliard : Release 1.1.7.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: 07fafa26a318a3da3185fcac71bfa6d3fba82787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fafa26a318a3da3185fcac7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 17:55:14 2008 +0200 Release 1.1.7. --- ANNOUNCE | 1624 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 760 insertions(+), 884 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07fafa26a318a3da3185f…

1 0

James Hawkins : msi: Fix a failing test in win9x.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: acfc9159149afdae4ede87d601b0bf6c03b067dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfc9159149afdae4ede87d60… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Oct 24 07:14:52 2008 -0500 msi: Fix a failing test in win9x. --- dlls/msi/tests/db.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index afee033..961aa5a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6864,7 +6864,12 @@ static void test_dbmerge(void) GetCurrentDirectoryA(MAX_PATH, buf); r = MsiDatabaseImportA(hdb, buf, "codepage.idt"); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(r == ERROR_SUCCESS || + broken(r == ERROR_FUNCTION_FAILED), /* win9x */ + "Expected ERROR_SUCCESS, got %d\n", r); + } query = "DROP TABLE `One`"; r = run_query(hdb, 0, query);

1 0

James Hawkins : msi: Fix several test failures.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: cd4b952863864122ee0cfd0974e730fbf461d8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4b952863864122ee0cfd097… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Oct 24 07:15:01 2008 -0500 msi: Fix several test failures. --- dlls/msi/tests/package.c | 161 ++++++++++++++++++++++++++++++---------------- 1 files changed, 106 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd4b952863864122ee0cf…

1 0

Detlef Riekenberg : shdocvw/tests: Add tests for URLSubRegQueryA.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: d4e7845887de72cd3c36b7b862297cf23ccb0a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e7845887de72cd3c36b7b86… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 23 23:05:37 2008 +0200 shdocvw/tests: Add tests for URLSubRegQueryA. --- dlls/shdocvw/tests/Makefile.in | 1 + dlls/shdocvw/tests/shdocvw.c | 168 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 635d553..e20f8ed 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32 CTESTS = \ intshcut.c \ + shdocvw.c \ shortcut.c \ webbrowser.c diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c new file mode 100644 index 0000000..f80a111 --- /dev/null +++ b/dlls/shdocvw/tests/shdocvw.c @@ -0,0 +1,168 @@ +/* + * Unit tests for misc shdocvw functions + * + * Copyright 2008 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wininet.h" + +#include "wine/test.h" + +/* ################ */ + +static HMODULE hshdocvw; +static HRESULT (WINAPI *pURLSubRegQueryA)(LPCSTR, LPCSTR, DWORD, LPVOID, DWORD, DWORD); + +static CHAR appdata[] = "AppData"; +static CHAR common_appdata[] = "Common AppData"; +static CHAR default_page_url[] = "Default_Page_URL"; +static CHAR does_not_exist[] = "does_not_exist"; +static CHAR regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; +static CHAR regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; +static CHAR start_page[] = "Start Page"; + +/* ################ */ + +static void init_functions(void) +{ + hshdocvw = LoadLibraryA("shdocvw.dll"); + pURLSubRegQueryA = (void *) GetProcAddress(hshdocvw, (LPSTR) 151); +} + +/* ################ */ + +static void test_URLSubRegQueryA(void) +{ + CHAR buffer[INTERNET_MAX_URL_LENGTH]; + HRESULT hr; + DWORD used; + DWORD len; + + if (!pURLSubRegQueryA) { + skip("URLSubRegQueryA not found\n"); + return; + } + + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + /* called by inetcpl.cpl */ + hr = pURLSubRegQueryA(regpath_iemain, default_page_url, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); + ok(hr == E_FAIL || hr == S_OK, "got 0x%x (expected E_FAIL or S_OK)\n", hr); + + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + /* called by inetcpl.cpl */ + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); + len = lstrlenA(buffer); + /* respect privacy: do not dump the url */ + ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, len); + + /* test buffer length: just large enough */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len+1, -1); + used = lstrlenA(buffer); + /* respect privacy: do not dump the url */ + ok((hr == S_OK) && (used == len), + "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len); + + /* no space for terminating 0: result is truncated */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len, -1); + used = lstrlenA(buffer); + ok((hr == S_OK) && (used == len - 1), + "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len - 1); + + /* no space for the complete result: truncate another char */ + if (len > 1) { + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len-1, -1); + used = lstrlenA(buffer); + ok((hr == S_OK) && (used == (len - 2)), + "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len - 2); + } + + /* only space for the terminating 0: function still succeded */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 1, -1); + used = lstrlenA(buffer); + ok((hr == S_OK) && !used, + "got 0x%x and %d (expected S_OK and 0)\n", hr, used); + + /* size of buffer is 0, but the function still succeed */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 0, -1); + used = lstrlenA(buffer); + ok((hr == S_OK) && (used == INTERNET_MAX_URL_LENGTH - 1), + "got 0x%x and %d (expected S_OK and %d)\n", hr, used, INTERNET_MAX_URL_LENGTH-1); + + /* still succeed without a buffer for the result */ + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, NULL, 0, -1); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* still succeed, when a length is given without a buffer */ + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, NULL, INTERNET_MAX_URL_LENGTH, -1); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* this value does not exist */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, does_not_exist, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); + /* random bytes are copied to the buffer */ + ok((hr == E_FAIL), "got 0x%x (expected E_FAIL)\n", hr); + + /* the third parameter is ignored. Is it really a type? (data is REG_SZ) */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_DWORD, buffer, INTERNET_MAX_URL_LENGTH, -1); + used = lstrlenA(buffer); + ok((hr == S_OK) && (used == len), + "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len); + + /* the function works for HKCU and HKLM */ + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_shellfolders, appdata, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); + used = lstrlenA(buffer); + ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, used); + + memset(buffer, '#', sizeof(buffer)-2); + buffer[sizeof(buffer)-1] = '\0'; + hr = pURLSubRegQueryA(regpath_shellfolders, common_appdata, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); + used = lstrlenA(buffer); + ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, used); + + /* todo: what does the last parameter mean? */ +} + +/* ################ */ + +START_TEST(shdocvw) +{ + init_functions(); + test_URLSubRegQueryA(); +}

1 0

Detlef Riekenberg : shdocvw: Implement URLSubRegQueryA.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: 507665deeebf3b95c73fdebc2293bc27d3aa9e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507665deeebf3b95c73fdebc2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 23 23:05:01 2008 +0200 shdocvw: Implement URLSubRegQueryA. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 209abd7..1cf297d 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -37,7 +37,7 @@ 148 stub -noname IEGetDisplayName 149 stub -noname IEBindToObjectEx 150 stub -noname _GetStdLocation -151 stub -noname URLSubRegQueryA +151 stdcall -noname URLSubRegQueryA(str str long ptr long long) 152 stub -noname CShellUIHelper_CreateInstance2 153 stub -noname IsURLChild 158 stub -noname SHRestricted2A diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 99af73b..c9deff1 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -3,6 +3,7 @@ * * Copyright 2001 John R. Sheets (for CodeWeavers) * Copyright 2004 Mike McCormack (for CodeWeavers) + * Copyright 2008 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,6 +32,7 @@ #include "winreg.h" #include "shlwapi.h" +#include "wininet.h" #include "initguid.h" @@ -268,3 +270,28 @@ DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************** + * URLSubRegQueryA (SHDOCVW.151) + */ +HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type, + LPSTR out, DWORD outlen, DWORD unknown) +{ + CHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD len; + LONG res; + + TRACE("(%s, %s, %d, %p, %d, %d)\n", debugstr_a(regpath), debugstr_a(name), + type, out, outlen, unknown); + + if (!out) return S_OK; + + len = sizeof(buffer); + res = SHRegGetUSValueA(regpath, name, NULL, buffer, &len, FALSE, NULL, 0); + if (!res) { + lstrcpynA(out, buffer, outlen); + return S_OK; + } + + return E_FAIL; +}

1 0

Michael Stefaniuc : ntdll: Don't cast void pointers to other pointer types.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: 26bba27dc02b0790b08c30558972c3290d62fb7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bba27dc02b0790b08c30558… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 23 23:53:02 2008 +0200 ntdll: Don't cast void pointers to other pointer types. --- dlls/ntdll/debugbuffer.c | 2 +- dlls/ntdll/reg.c | 10 ++++------ dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index be1ddff..0ad8882 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -96,7 +96,7 @@ PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(IN ULONG iSize, IN BOOLEAN iEvent if (iSize < sizeof(DEBUG_BUFFER)) { iSize = sizeof(DEBUG_BUFFER); } - oBuf = (PDEBUG_BUFFER) RtlAllocateHeap(GetProcessHeap(), 0, iSize); + oBuf = RtlAllocateHeap(GetProcessHeap(), 0, iSize); memset(oBuf, 0, iSize); FIXME("(%d, %d): returning %p\n", iSize, iEventPair, oBuf); return oBuf; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index af0f200..8aba3ae 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -325,7 +325,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG if (out->Length) { dwLen = out->Length + sizeof(KEY_BASIC_INFORMATION); - info = (KEY_BASIC_INFORMATION*)RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); + info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) return STATUS_NO_MEMORY; } @@ -543,7 +543,7 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE de DWORD dwResultLen; DWORD dwLen = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + (result_len ? *result_len : 0); - info = (KEY_VALUE_PARTIAL_INFORMATION*)RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); + info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) return STATUS_NO_MEMORY; @@ -1220,8 +1220,7 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, { buflen = len; RtlFreeHeap(GetProcessHeap(), 0, pInfo); - pInfo = (KEY_VALUE_FULL_INFORMATION*)RtlAllocateHeap( - GetProcessHeap(), 0, buflen); + pInfo = RtlAllocateHeap(GetProcessHeap(), 0, buflen); NtEnumerateValueKey(handle, i, KeyValueFullInformation, pInfo, buflen, &len); } @@ -1255,8 +1254,7 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, { buflen = len; RtlFreeHeap(GetProcessHeap(), 0, pInfo); - pInfo = (KEY_VALUE_FULL_INFORMATION*)RtlAllocateHeap( - GetProcessHeap(), 0, buflen); + pInfo = RtlAllocateHeap(GetProcessHeap(), 0, buflen); status = NtQueryValueKey(handle, &Value, KeyValueFullInformation, pInfo, buflen, &len); } diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 3a50155..de208a2 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -2126,7 +2126,7 @@ NTSTATUS WINAPI RtlStringFromGUID(const GUID* guid, UNICODE_STRING *str) str->Length = GUID_STRING_LENGTH * sizeof(WCHAR); str->MaximumLength = str->Length + sizeof(WCHAR); - str->Buffer = (WCHAR*)RtlAllocateHeap(GetProcessHeap(), 0, str->MaximumLength); + str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, str->MaximumLength); if (!str->Buffer) { str->Length = str->MaximumLength = 0; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fb2c0fd..a9482e9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -599,7 +599,7 @@ static void wine_sigacthandler( int signal, siginfo_t *siginfo, void *sigcontext __asm__ __volatile__("mov %ss,%ax; mov %ax,%ds; mov %ax,%es"); - thread_data = (struct ntdll_thread_data *)get_current_teb()->SystemReserved2; + thread_data = get_current_teb()->SystemReserved2; wine_set_fs( thread_data->fs ); wine_set_gs( thread_data->gs );

1 0

Andrew Talbot : ntdll: Sign-compare warnings fix.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: a63749cce0330fe3e4ee193395dfca3a17a35e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63749cce0330fe3e4ee19339… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 23 22:24:04 2008 +0100 ntdll: Sign-compare warnings fix. --- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/heap.c | 6 +++--- dlls/ntdll/reg.c | 2 +- dlls/ntdll/rtlstr.c | 9 +++++---- dlls/ntdll/thread.c | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index f6fed81..998b2dc 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1370,7 +1370,7 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW DWORD lba = raw->DiskOffset.QuadPart >> 11; struct cdrom_msf* msf; PBYTE *bp; /* current buffer pointer */ - int i; + DWORD i; if ((lba + raw->SectorCount) > ((1 << 8*sizeof(msf->cdmsf_min0)) * CD_SECS * CD_FRAMES diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 44b88b2..cd3fdd7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -256,7 +256,7 @@ static RTL_CRITICAL_SECTION_DEBUG process_heap_critsect_debug = */ static void HEAP_Dump( HEAP *heap ) { - int i; + unsigned int i; SUBHEAP *subheap; char *ptr; @@ -620,7 +620,7 @@ static SUBHEAP *HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, { SUBHEAP *subheap; FREE_LIST_ENTRY *pEntry; - int i; + unsigned int i; /* Commit memory */ @@ -819,7 +819,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, */ static BOOL HEAP_IsValidArenaPtr( const HEAP *heap, const ARENA_FREE *ptr ) { - int i; + unsigned int i; const SUBHEAP *subheap = HEAP_FindSubHeap( heap, ptr ); if (!subheap) return FALSE; if ((const char *)ptr >= (const char *)subheap->base + subheap->headerSize) return TRUE; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 425ddf8..af0f200 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -899,7 +899,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, NTSTATUS status = STATUS_SUCCESS; ULONG len; LPWSTR String; - INT count = 0; + ULONG count = 0; if (pInfo == NULL) { diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 0e98588..3a50155 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1511,8 +1511,7 @@ NTSTATUS WINAPI RtlFindCharInUnicodeString( const UNICODE_STRING *search_chars, /* [I] Unicode string which contains the characters to search for */ USHORT *pos) /* [O] Position of the first character found + 2 */ { - int main_idx; - unsigned int search_idx; + unsigned int main_idx, search_idx; switch (flags) { case 0: @@ -1527,7 +1526,8 @@ NTSTATUS WINAPI RtlFindCharInUnicodeString( *pos = 0; return STATUS_NOT_FOUND; case 1: - for (main_idx = main_str->Length / sizeof(WCHAR) - 1; main_idx >= 0; main_idx--) { + main_idx = main_str->Length / sizeof(WCHAR); + while (main_idx-- > 0) { for (search_idx = 0; search_idx < search_chars->Length / sizeof(WCHAR); search_idx++) { if (main_str->Buffer[main_idx] == search_chars->Buffer[search_idx]) { *pos = main_idx * sizeof(WCHAR); @@ -1552,7 +1552,8 @@ NTSTATUS WINAPI RtlFindCharInUnicodeString( *pos = 0; return STATUS_NOT_FOUND; case 3: - for (main_idx = main_str->Length / sizeof(WCHAR) - 1; main_idx >= 0; main_idx--) { + main_idx = main_str->Length / sizeof(WCHAR); + while (main_idx-- > 0) { search_idx = 0; while (search_idx < search_chars->Length / sizeof(WCHAR) && main_str->Buffer[main_idx] != search_chars->Buffer[search_idx]) { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9411db1..47e0196 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -274,8 +274,8 @@ HANDLE thread_init(void) /* allocate and initialize the initial TEB */ sigstack_total_size = get_signal_stack_total_size(); - while (1 << sigstack_zero_bits < sigstack_total_size) sigstack_zero_bits++; - assert( 1 << sigstack_zero_bits == sigstack_total_size ); /* must be a power of 2 */ + while (1U << sigstack_zero_bits < sigstack_total_size) sigstack_zero_bits++; + assert( 1U << sigstack_zero_bits == sigstack_total_size ); /* must be a power of 2 */ assert( sigstack_total_size >= sizeof(TEB) + sizeof(struct startup_info) ); thread_info.teb_size = sigstack_total_size;

1 0