October 2011 - Wine-commits

Huw Davies : gdi32: Move the font list initialisation to a separate function.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 63070bdf89a7a5454004cd4cf40e6ace2773badd URL: http://source.winehq.org/git/wine.git/?a=commit;h=63070bdf89a7a5454004cd4cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 6 16:26:05 2011 -0500 gdi32: Move the font list initialisation to a separate function. --- dlls/gdi32/freetype.c | 64 +++++++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ae8ca41..62c0504 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2745,12 +2745,7 @@ sym_not_found: return FALSE; } -/************************************************************* - * WineEngInit - * - * Initialize FreeType library and create a list of available faces - */ -BOOL WineEngInit(void) +static void init_font_list(void) { static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; static const WCHAR pathW[] = {'P','a','t','h',0}; @@ -2758,22 +2753,8 @@ BOOL WineEngInit(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; char *unixname; - HANDLE font_mutex; const char *data_dir; - TRACE("\n"); - - /* update locale dependent font info in registry */ - update_font_info(); - - if(!init_freetype()) return FALSE; - - if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) { - ERR("Failed to create font mutex\n"); - return FALSE; - } - WaitForSingleObject(font_mutex, INFINITE); - delete_external_font_keys(); /* load the system bitmap fonts */ @@ -2791,7 +2772,8 @@ BOOL WineEngInit(void) /* load the system truetype fonts */ data_dir = wine_get_data_dir(); if (!data_dir) data_dir = wine_get_build_dir(); - if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) { + if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) + { strcpy(unixname, data_dir); strcat(unixname, "/fonts/"); ReadFontDir(unixname, TRUE); @@ -2804,20 +2786,22 @@ BOOL WineEngInit(void) will skip these. */ if(RegOpenKeyW(HKEY_LOCAL_MACHINE, is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, - &hkey) == ERROR_SUCCESS) { + &hkey) == ERROR_SUCCESS) + { LPWSTR data, valueW; RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); + &valuelen, &datalen, NULL, NULL); - valuelen++; /* returned value doesn't include room for '\0' */ - valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); + valuelen++; /* returned value doesn't include room for '\0' */ + valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); + data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); if (valueW && data) { dlen = datalen * sizeof(WCHAR); vlen = valuelen; while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, (LPBYTE)data, - &dlen) == ERROR_SUCCESS) { + &dlen) == ERROR_SUCCESS) + { if(data[0] && (data[1] == ':')) { if((unixname = wine_get_unix_file_name(data))) @@ -2848,7 +2832,7 @@ BOOL WineEngInit(void) } HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, valueW); - RegCloseKey(hkey); + RegCloseKey(hkey); } load_fontconfig_fonts(); @@ -2885,6 +2869,30 @@ BOOL WineEngInit(void) } RegCloseKey(hkey); } +} + +/************************************************************* + * WineEngInit + * + * Initialize FreeType library and create a list of available faces + */ +BOOL WineEngInit(void) +{ + HANDLE font_mutex; + + /* update locale dependent font info in registry */ + update_font_info(); + + if(!init_freetype()) return FALSE; + + if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) + { + ERR("Failed to create font mutex\n"); + return FALSE; + } + WaitForSingleObject(font_mutex, INFINITE); + + init_font_list(); DumpFontList(); LoadSubstList();

1 0

Huw Davies : gdi32: Cache the loaded font list properties.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: a155292f98f62c10eaf3b9328cbd8c085b8818e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a155292f98f62c10eaf3b9328… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 6 16:26:06 2011 -0500 gdi32: Cache the loaded font list properties. --- dlls/gdi32/freetype.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 122 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a155292f98f62c10eaf3b…

1 0

Huw Davies : gdi32: Load the font properties from the cache if it exists.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 17e72c816b9cbc17aeaae1c2ecf2ba230083817d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e72c816b9cbc17aeaae1c2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 6 16:26:07 2011 -0500 gdi32: Load the font properties from the cache if it exists. --- dlls/gdi32/freetype.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ecd01dc..24935df 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1145,11 +1145,185 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua return ret; } +static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) +{ + DWORD type, needed; + LONG r = RegQueryValueExW(hkey, value, NULL, &type, NULL, &needed); + if(r != ERROR_SUCCESS) return r; + if(type != REG_DWORD || needed != sizeof(DWORD)) return ERROR_BAD_CONFIGURATION; + return RegQueryValueExW(hkey, value, NULL, &type, (BYTE*)data, &needed); +} + static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) { return RegSetValueExW(hkey, value, 0, REG_DWORD, (BYTE*)&data, sizeof(DWORD)); } +static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) +{ + DWORD needed; + DWORD num_strikes, max_strike_key_len; + + /* If we have a File Name key then this is a real font, not just the parent + key of a bunch of non-scalable strikes */ + if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, NULL, &needed) == ERROR_SUCCESS) + { + DWORD italic, bold; + Face *face; + face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); + face->cached_enum_data = NULL; + + face->file = HeapAlloc(GetProcessHeap(), 0, needed); + RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); + + face->StyleName = strdupW(face_name); + face->family = family; + + if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) + { + WCHAR *fullName = HeapAlloc(GetProcessHeap(), 0, needed); + RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, (BYTE*)fullName, &needed); + face->FullName = fullName; + } + else + face->FullName = NULL; + + reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); + reg_load_dword(hkey_face, face_italic_value, &italic); + reg_load_dword(hkey_face, face_bold_value, &bold); + reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); + reg_load_dword(hkey_face, face_external_value, (DWORD*)&face->external); + + needed = sizeof(face->fs); + RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); + memset(&face->fs_links, 0, sizeof(face->fs_links)); + + if(reg_load_dword(hkey_face, face_height_value, (DWORD*)&face->size.height) != ERROR_SUCCESS) + { + face->scalable = TRUE; + memset(&face->size, 0, sizeof(face->size)); + } + else + { + face->scalable = FALSE; + reg_load_dword(hkey_face, face_width_value, (DWORD*)&face->size.width); + reg_load_dword(hkey_face, face_size_value, (DWORD*)&face->size.size); + reg_load_dword(hkey_face, face_x_ppem_value, (DWORD*)&face->size.x_ppem); + reg_load_dword(hkey_face, face_y_ppem_value, (DWORD*)&face->size.y_ppem); + reg_load_dword(hkey_face, face_internal_leading_value, (DWORD*)&face->size.internal_leading); + + TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", + face->size.height, face->size.width, face->size.size >> 6, + face->size.x_ppem >> 6, face->size.y_ppem >> 6); + } + + face->ntmFlags = 0; + if (italic) face->ntmFlags |= NTM_ITALIC; + if (bold) face->ntmFlags |= NTM_BOLD; + if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; + + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", + face->fs.fsCsb[0], face->fs.fsCsb[1], + face->fs.fsUsb[0], face->fs.fsUsb[1], + face->fs.fsUsb[2], face->fs.fsUsb[3]); + + if(!italic && !bold) + list_add_head(&family->faces, &face->entry); + else + list_add_tail(&family->faces, &face->entry); + + TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); + } + + /* do we have any bitmap strikes? */ + RegQueryInfoKeyW(hkey_face, NULL, NULL, NULL, &num_strikes, &max_strike_key_len, NULL, NULL, + NULL, NULL, NULL, NULL); + if(num_strikes != 0) + { + WCHAR strike_name[10]; + DWORD strike_index = 0; + + needed = sizeof(strike_name) / sizeof(WCHAR); + while(RegEnumKeyExW(hkey_face, strike_index++, strike_name, &needed, + NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + HKEY hkey_strike; + RegOpenKeyExW(hkey_face, strike_name, 0, KEY_ALL_ACCESS, &hkey_strike); + load_face(hkey_strike, face_name, family); + RegCloseKey(hkey_strike); + needed = sizeof(strike_name) / sizeof(WCHAR); + } + } +} + +static void load_font_list_from_cache(HKEY hkey_font_cache) +{ + DWORD max_family_key_len, size; + WCHAR *family_name; + DWORD family_index = 0; + Family *family; + HKEY hkey_family; + + RegQueryInfoKeyW(hkey_font_cache, NULL, NULL, NULL, NULL, &max_family_key_len, NULL, NULL, + NULL, NULL, NULL, NULL); + family_name = HeapAlloc(GetProcessHeap(), 0, (max_family_key_len + 1) * sizeof(WCHAR)); + + size = max_family_key_len + 1; + while(RegEnumKeyExW(hkey_font_cache, family_index++, family_name, &size, + NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + WCHAR *english_family = NULL; + DWORD face_index = 0; + WCHAR *face_name; + DWORD max_face_key_len; + + RegOpenKeyExW(hkey_font_cache, family_name, 0, KEY_ALL_ACCESS, &hkey_family); + TRACE("opened family key %s\n", debugstr_w(family_name)); + if(RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, NULL, &size) == ERROR_SUCCESS) + { + english_family = HeapAlloc(GetProcessHeap(), 0, size); + RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE*)english_family, &size); + } + + family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); + family->FamilyName = strdupW(family_name); + family->EnglishName = english_family; + list_init(&family->faces); + list_add_tail(&font_list, &family->entry); + + if(english_family) + { + FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); + subst->from.name = strdupW(english_family); + subst->from.charset = -1; + subst->to.name = strdupW(family_name); + subst->to.charset = -1; + add_font_subst(&font_subst_list, subst, 0); + } + + RegQueryInfoKeyW(hkey_family, NULL, NULL, NULL, NULL, &max_face_key_len, NULL, NULL, + NULL, NULL, NULL, NULL); + + face_name = HeapAlloc(GetProcessHeap(), 0, (max_face_key_len + 1) * sizeof(WCHAR)); + size = max_face_key_len + 1; + while(RegEnumKeyExW(hkey_family, face_index++, face_name, &size, + NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + HKEY hkey_face; + + RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face); + load_face(hkey_face, face_name, family); + RegCloseKey(hkey_face); + size = max_face_key_len + 1; + } + HeapFree(GetProcessHeap(), 0, face_name); + RegCloseKey(hkey_family); + size = max_family_key_len + 1; + } + + HeapFree(GetProcessHeap(), 0, family_name); +} + static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition) { LONG ret; @@ -3005,7 +3179,10 @@ BOOL WineEngInit(void) create_font_cache_key(&hkey_font_cache, &disposition); - init_font_list(); + if(disposition == REG_CREATED_NEW_KEY) + init_font_list(); + else + load_font_list_from_cache(hkey_font_cache); RegCloseKey(hkey_font_cache); @@ -3013,7 +3190,9 @@ BOOL WineEngInit(void) LoadSubstList(); DumpSubstList(); LoadReplaceList(); - update_reg_entries(); + + if(disposition == REG_CREATED_NEW_KEY) + update_reg_entries(); update_system_links(); init_system_links();

1 0

Huw Davies : gdi32: Move some common default fonts to the head of the font list.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 5bd2db4521778e38269218be088d86bf1c441713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd2db4521778e38269218be0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 6 16:26:08 2011 -0500 gdi32: Move some common default fonts to the head of the font list. --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 24935df..8a687f4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3154,6 +3154,40 @@ static void init_font_list(void) } } +static BOOL move_to_front(const WCHAR *name) +{ + Family *family, *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(family, cursor2, &font_list, Family, entry) + { + if(!strcmpiW(family->FamilyName, name)) + { + list_remove(&family->entry); + list_add_head(&font_list, &family->entry); + return TRUE; + } + } + return FALSE; +} + +static const WCHAR arial[] = {'A','r','i','a','l',0}; +static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; +static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; +static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; +static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; +static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; + +static void reorder_font_list(void) +{ + if(!move_to_front(times_new_roman)) + move_to_front(bitstream_vera_serif); + + if(!move_to_front(courier_new)) + move_to_front(bitstream_vera_sans_mono); + + if(!move_to_front(arial)) + move_to_front(bitstream_vera_sans); +} + /************************************************************* * WineEngInit * @@ -3186,6 +3220,8 @@ BOOL WineEngInit(void) RegCloseKey(hkey_font_cache); + reorder_font_list(); + DumpFontList(); LoadSubstList(); DumpSubstList();

1 0

Andrew Talbot : mshtml: Mark fall-through in switch statement.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: a29f69718beb646a82d74ebf507004cae5858fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29f69718beb646a82d74ebf5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 6 22:29:38 2011 +0100 mshtml: Mark fall-through in switch statement. --- dlls/mshtml/htmlevent.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 93a5367..2b9e62e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1229,6 +1229,7 @@ HRESULT set_event_handler(event_target_t **event_target, nsIDOMNode *nsnode, HTM default: FIXME("not supported vt=%d\n", V_VT(var)); + /* fall through */ case VT_EMPTY: return E_NOTIMPL; }

1 0

Andrew Talbot : msi: Add a break to a switch statement.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 48a6130279a685c7a858dc15255a9594c08ca50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a6130279a685c7a858dc152… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 6 22:29:42 2011 +0100 msi: Add a break to a switch statement. --- dlls/msi/record.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 7acbfc7..1dace78 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -494,6 +494,7 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, case MSIFIELD_NULL: if( szValue && *pcchValue > 0 ) szValue[0] = 0; + break; default: break; }

1 0

Nikolay Sivov : advapi32/tests: Add one more QueryServiceStatusEx() test.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: cd919f60cf11c26a37f45c749e6341e3ce6cee05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd919f60cf11c26a37f45c749… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 17:53:41 2011 -0500 advapi32/tests: Add one more QueryServiceStatusEx() test. --- dlls/advapi32/tests/service.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d594416..5bb40eb 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1032,6 +1032,14 @@ static void test_query_svc(void) else ok(statusproc->dwProcessId == 0, "Expect no process id for this stopped service\n"); + + /* same call with null needed pointer */ + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, NULL); + ok(!ret, "Expected failure\n"); + ok(broken(GetLastError() == ERROR_INVALID_PARAMETER) /* NT4 */ || + GetLastError() == ERROR_INVALID_ADDRESS, "got %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, statusproc); CloseServiceHandle(svc_handle);

1 0

Charles Davis : winegcc: On Mac OS, turn -s into -Wl,-x.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 486783626f133c549a3f9455c683b059aacc7897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=486783626f133c549a3f9455c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 5 17:07:38 2011 -0600 winegcc: On Mac OS, turn -s into -Wl,-x. --- tools/winegcc/winegcc.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3a7e93a..adb1873 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -199,6 +199,7 @@ struct options int force_pointer_size; int large_address_aware; int unwind_tables; + int strip; const char* wine_objdir; const char* output_name; const char* image_base; @@ -1009,6 +1010,8 @@ static void build(struct options* opts) strarray_add(link_args, "-image_base"); strarray_add(link_args, opts->image_base); } + if (opts->strip) + strarray_add(link_args, "-Wl,-x"); break; case PLATFORM_SOLARIS: { @@ -1417,6 +1420,15 @@ int main(int argc, char **argv) opts.shared = 1; raw_compiler_arg = raw_linker_arg = 0; } + else if (strcmp("-s", argv[i]) == 0 && opts.target_platform == PLATFORM_APPLE) + { + /* On Mac, change -s into -Wl,-x. ld's -s switch + * is deprecated, and it doesn't work on Tiger with + * MH_BUNDLEs anyway + */ + opts.strip = 1; + raw_linker_arg = 0; + } break; case 'v': if (argv[i][2] == 0) verbose++;

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in dpa tests.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: b76e2daec2d54addf88c6bee0bebd5c45d87a593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76e2daec2d54addf88c6bee0… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Wed Oct 5 16:18:40 2011 +0200 comctl32/tests: Removed sign comparison warning in dpa tests. --- dlls/comctl32/tests/dpa.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 419c1b1..e359139 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -96,13 +96,13 @@ static BOOL InitFunctionPtrs(HMODULE hcomctl32) /* Callbacks */ static INT CALLBACK CB_CmpLT(PVOID p1, PVOID p2, LPARAM lp) { - ok(lp == 0xdeadbeef, "lp=%ld\n", lp); + ok(lp == 0x1abe11ed, "lp=%ld\n", lp); return p1 < p2 ? -1 : p1 > p2 ? 1 : 0; } static INT CALLBACK CB_CmpGT(PVOID p1, PVOID p2, LPARAM lp) { - ok(lp == 0xdeadbeef, "lp=%ld\n", lp); + ok(lp == 0x1abe11ed, "lp=%ld\n", lp); return p1 > p2 ? -1 : p1 < p2 ? 1 : 0; } @@ -115,14 +115,14 @@ static INT nMessages[4]; static PVOID CALLBACK CB_MergeInsertSrc(UINT op, PVOID p1, PVOID p2, LPARAM lp) { nMessages[op]++; - ok(lp == 0xdeadbeef, "lp=%ld\n", lp); + ok(lp == 0x1abe11ed, "lp=%ld\n", lp); return p1; } static PVOID CALLBACK CB_MergeDeleteOddSrc(UINT op, PVOID p1, PVOID p2, LPARAM lp) { nMessages[op]++; - ok(lp == 0xdeadbeef, "lp=%ld\n", lp); + ok(lp == 0x1abe11ed, "lp=%ld\n", lp); return ((PCHAR)p2)+1; } @@ -247,12 +247,12 @@ static void test_dpa(void) INT j, k; k = pDPA_GetPtrIndex(dpa, (PVOID)(INT_PTR)i); /* Linear searches should work on unsorted DPAs */ - j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpLT, 0xdeadbeef, 0); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpLT, 0x1abe11ed, 0); ok(j == k, "j=%d k=%d\n", j, k); } /* Sort DPA */ - ok(pDPA_Sort(dpa, CB_CmpGT, 0xdeadbeef), "\n"); + ok(pDPA_Sort(dpa, CB_CmpGT, 0x1abe11ed), "\n"); rc=CheckDPA(dpa, 0x654321, &dw); ok(rc, "dw=0x%x\n", dw); @@ -262,7 +262,7 @@ static void test_dpa(void) /* The old data should have been preserved */ rc=CheckDPA(dpa2, 0x654321, &dw2); ok(rc, "dw=0x%x\n", dw2); - ok(pDPA_Sort(dpa, CB_CmpLT, 0xdeadbeef), "\n"); + ok(pDPA_Sort(dpa, CB_CmpLT, 0x1abe11ed), "\n"); /* Test if the DPA itself was really copied */ rc=CheckDPA(dpa, 0x123456, &dw); @@ -284,14 +284,14 @@ static void test_dpa(void) /* The array is in order so ptr == index+1 */ j = pDPA_GetPtrIndex(dpa, (PVOID)(INT_PTR)i); ok(j+1 == i, "j=%d i=%d\n", j, i); - j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpLT, 0x1abe11ed, DPAS_SORTED); ok(j+1 == i, "j=%d i=%d\n", j, i); /* Linear searches respect iStart ... */ - j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0xdeadbeef, 0); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0x1abe11ed, 0); ok(j == DPA_ERR, "j=%d\n", j); /* ... but for a binary search it's ignored */ - j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0x1abe11ed, DPAS_SORTED); ok(j+1 == i, "j=%d i=%d\n", j, i); } @@ -313,15 +313,15 @@ static void test_dpa(void) /* Check where to re-insert the deleted item */ i = pDPA_Search(dpa, (PVOID)3, 0, - CB_CmpLT, 0xdeadbeef, DPAS_SORTED|DPAS_INSERTAFTER); + CB_CmpLT, 0x1abe11ed, DPAS_SORTED|DPAS_INSERTAFTER); ok(i == 2, "i=%d\n", i); /* DPAS_INSERTBEFORE works just like DPAS_INSERTAFTER */ i = pDPA_Search(dpa, (PVOID)3, 0, - CB_CmpLT, 0xdeadbeef, DPAS_SORTED|DPAS_INSERTBEFORE); + CB_CmpLT, 0x1abe11ed, DPAS_SORTED|DPAS_INSERTBEFORE); ok(i == 2, "i=%d\n", i); /* without DPAS_INSERTBEFORE/AFTER */ i = pDPA_Search(dpa, (PVOID)3, 0, - CB_CmpLT, 0xdeadbeef, DPAS_SORTED); + CB_CmpLT, 0x1abe11ed, DPAS_SORTED); ok(i == -1, "i=%d\n", i); /* Re-insert the item */ @@ -334,7 +334,7 @@ static void test_dpa(void) * should be bogus */ for(i = 0; i < 6; i++) { - INT j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpGT, 0xdeadbeef, + INT j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpGT, 0x1abe11ed, DPAS_SORTED|DPAS_INSERTBEFORE); ok(j != i, "i=%d\n", i); } @@ -396,7 +396,7 @@ static void test_DPA_Merge(void) /* Delete all odd entries from dpa2 */ memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, - CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); + CB_CmpLT, CB_MergeDeleteOddSrc, 0x1abe11ed); rc = CheckDPA(dpa2, 0x246, &dw); ok(rc, "dw=0x%x\n", dw); @@ -413,7 +413,7 @@ static void test_DPA_Merge(void) /* DPAM_INTERSECT - returning source while merging */ memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, - CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + CB_CmpLT, CB_MergeInsertSrc, 0x1abe11ed); rc = CheckDPA(dpa2, 0x135, &dw); ok(rc, "dw=0x%x\n", dw); @@ -433,7 +433,7 @@ static void test_DPA_Merge(void) memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa, DPAM_UNION, - CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + CB_CmpLT, CB_MergeInsertSrc, 0x1abe11ed); rc = CheckDPA(dpa2, 0x123456, &dw); ok(rc || broken(!rc && dw == 0x23456), /* 4.7x */ @@ -448,7 +448,7 @@ static void test_DPA_Merge(void) /* Merge dpa3 into dpa2 and dpa */ memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa, dpa3, DPAM_UNION|DPAM_SORTED, - CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + CB_CmpLT, CB_MergeInsertSrc, 0x1abe11ed); expect(3, nMessages[DPAMM_MERGE]); expect(0, nMessages[DPAMM_DELETE]); expect(3, nMessages[DPAMM_INSERT]); @@ -461,7 +461,7 @@ static void test_DPA_Merge(void) memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa3, DPAM_UNION|DPAM_SORTED, - CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + CB_CmpLT, CB_MergeInsertSrc, 0x1abe11ed); expect(3, nMessages[DPAMM_MERGE]); expect(0, nMessages[DPAMM_DELETE]); ok(nMessages[DPAMM_INSERT] == 3 || @@ -667,7 +667,7 @@ static void test_DPA_SaveStream(void) IStream* pStm = NULL; DWORD dwMode, dw; HRESULT hRes; - ULONG ret; + INT ret; INT i; BOOL rc; LARGE_INTEGER liZero;

1 0

Marko Nikolic : advapi32: Removed sign comparison warning.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 30fde946fad3de3ebe7945ee210e94dd2e3a8174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fde946fad3de3ebe7945ee2… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Wed Oct 5 17:01:24 2011 +0200 advapi32: Removed sign comparison warning. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e4953d0..172b9a2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3600,7 +3600,7 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries, { DWORD err = ERROR_SUCCESS; EXPLICIT_ACCESSW *pEntriesW; - int alloc_index, free_index; + UINT alloc_index, free_index; TRACE("%d %p %p %p\n", count, pEntries, OldAcl, NewAcl);

1 0