ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2018
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
21 participants
354 discussions
Start a n
N
ew thread
01/01: [NTOSKRNL] Respect PFN cache attribute when required
by Pierre Schweitzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd8893e58fb5b21ebe196…
commit fd8893e58fb5b21ebe19617a9fd206c6e107aa30 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 1 13:47:06 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 1 20:59:37 2018 +0200 [NTOSKRNL] Respect PFN cache attribute when required This fixes noisy DPRINT1 being printed while reading or writing files with NFS. --- ntoskrnl/mm/ARM3/mdlsup.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 4675fe2c58..4975b3edc8 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -21,6 +21,8 @@ BOOLEAN MmTrackPtes; BOOLEAN MmTrackLockedPages; SIZE_T MmSystemLockPagesCount; +ULONG MiCacheOverride[MiNotMapped + 1]; + /* INTERNAL FUNCTIONS *********************************************************/ static PVOID @@ -36,6 +38,7 @@ MiMapLockedPagesInUserSpace( PETHREAD Thread = PsGetCurrentThread(); TABLE_SEARCH_RESULT Result; MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + MI_PFN_CACHE_ATTRIBUTE EffectiveCacheAttribute; BOOLEAN IsIoMapping; KIRQL OldIrql; ULONG_PTR StartingVa; @@ -180,23 +183,50 @@ MiMapLockedPagesInUserSpace( MM_READWRITE, *MdlPages); - /* FIXME: We need to respect the PFN's caching information in some cases */ + EffectiveCacheAttribute = CacheAttribute; + + /* We need to respect the PFN's caching information in some cases */ Pfn2 = MiGetPfnEntry(*MdlPages); if (Pfn2 != NULL) { ASSERT(Pfn2->u3.e2.ReferenceCount != 0); - if (Pfn2->u3.e1.CacheAttribute != CacheAttribute) + switch (Pfn2->u3.e1.CacheAttribute) { - DPRINT1("FIXME: Using caller's cache attribute instead of PFN override\n"); - } + case MiNonCached: + if (CacheAttribute != MiNonCached) + { + MiCacheOverride[1]++; + EffectiveCacheAttribute = MiNonCached; + } + break; - /* We don't support AWE magic */ - ASSERT(Pfn2->u3.e1.CacheAttribute != MiNotMapped); + case MiCached: + if (CacheAttribute != MiCached) + { + MiCacheOverride[0]++; + EffectiveCacheAttribute = MiCached; + } + break; + + case MiWriteCombined: + if (CacheAttribute != MiWriteCombined) + { + MiCacheOverride[2]++; + EffectiveCacheAttribute = MiWriteCombined; + } + break; + + default: + /* We don't support AWE magic (MiNotMapped) */ + DPRINT1("FIXME: MiNotMapped is not supported\n"); + ASSERT(FALSE); + break; + } } /* Configure caching */ - switch (CacheAttribute) + switch (EffectiveCacheAttribute) { case MiNonCached: MI_PAGE_DISABLE_CACHE(&TempPte);
6 years, 2 months
1
0
0
0
01/01: [DMUSIC] Fix the build for vs 2010
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc27de18f47e295f81e0c…
commit cc27de18f47e295f81e0c47f1f6f7a0dfec34468 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Oct 1 20:47:01 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Oct 1 20:47:01 2018 +0200 [DMUSIC] Fix the build for vs 2010 --- dll/directx/wine/dmusic/dmobject.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/directx/wine/dmusic/dmobject.c b/dll/directx/wine/dmusic/dmobject.c index d421c3fbef..0183934f88 100644 --- a/dll/directx/wine/dmusic/dmobject.c +++ b/dll/directx/wine/dmusic/dmobject.c @@ -258,7 +258,11 @@ HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface, static inline void info_get_name(IStream *stream, const struct chunk_entry *info, DMUS_OBJECTDESC *desc) { +#ifndef __REACTOS__ struct chunk_entry chunk = {.parent = info}; +#else + struct chunk_entry chunk = { 0, 0, 0, {{0}}, info }; +#endif char name[DMUS_MAX_NAME]; ULONG len; HRESULT hr = E_FAIL; @@ -277,7 +281,11 @@ static inline void info_get_name(IStream *stream, const struct chunk_entry *info static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo, DMUS_OBJECTDESC *desc, BOOL inam) { +#ifndef __REACTOS__ struct chunk_entry chunk = {.parent = unfo}; +#else + struct chunk_entry chunk = { 0, 0, 0, {{0}}, unfo }; +#endif while (stream_next_chunk(stream, &chunk) == S_OK) if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M'))) @@ -288,7 +296,11 @@ static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, DMUS_OBJECTDESC *desc, DWORD supported) { +#ifndef __REACTOS__ struct chunk_entry chunk = {.parent = riff}; +#else + struct chunk_entry chunk = { 0, 0, 0, {{0}}, riff }; +#endif HRESULT hr; TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
6 years, 2 months
1
0
0
0
01/01: [RTL] actctx: When probing a dll for a manifest, use the first manifest id present, instead of always searching for CREATEPROCESS_MANIFEST_RESOURCE_ID. CORE-9519
by Mark Jansen
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57ed670b5a0b51806b529…
commit 57ed670b5a0b51806b529ab18848022e55d82e8a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Sep 24 23:59:57 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Oct 1 20:16:10 2018 +0200 [RTL] actctx: When probing a dll for a manifest, use the first manifest id present, instead of always searching for CREATEPROCESS_MANIFEST_RESOURCE_ID. CORE-9519 --- sdk/lib/rtl/actctx.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 2f82808dd5..8df2af46fc 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -2947,6 +2947,65 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb return status; } +IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( IMAGE_RESOURCE_DIRECTORY *dir, + LPCWSTR name, void *root, + int want_dir ); + +IMAGE_RESOURCE_DIRECTORY *find_first_entry( IMAGE_RESOURCE_DIRECTORY *dir, + void *root, int want_dir ); + + +static IMAGE_RESOURCE_DIRECTORY *find_first_id_entry( IMAGE_RESOURCE_DIRECTORY *dir, + void *root, int want_dir ) +{ + const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); + int pos; + + for (pos = dir->NumberOfNamedEntries; pos < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; pos++) + { + if (!entry[pos].DataIsDirectory == !want_dir) + return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory); + } + return NULL; +} + + +static NTSTATUS search_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai, + LPCWSTR filename, LPCWSTR directory, BOOL shared, + HANDLE hModule, ULONG lang ) +{ + ULONG size; + PVOID root, ptr; + IMAGE_RESOURCE_DIRECTORY *resdirptr; + IMAGE_RESOURCE_DATA_ENTRY *entry; + NTSTATUS status; + + root = RtlImageDirectoryEntryToData(hModule, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size); + if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND; + if (size < sizeof(*resdirptr)) return STATUS_RESOURCE_DATA_NOT_FOUND; + resdirptr = root; + + if (!(ptr = find_entry_by_name(resdirptr, (LPCWSTR)RT_MANIFEST, root, 1))) + return STATUS_RESOURCE_TYPE_NOT_FOUND; + + resdirptr = ptr; + if (!(ptr = find_first_id_entry(resdirptr, root, 1))) + return STATUS_RESOURCE_TYPE_NOT_FOUND; + + resdirptr = ptr; + if (!(ptr = find_first_entry(resdirptr, root, 0))) + return STATUS_RESOURCE_TYPE_NOT_FOUND; + + entry = ptr; + status = LdrAccessResource(hModule, entry, &ptr, NULL); + + if (status == STATUS_SUCCESS) + status = parse_manifest(acl, ai, filename, directory, shared, ptr, entry->Size); + + return status; +} + + static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai, LPCWSTR filename, LPCWSTR directory, BOOL shared, HANDLE file, LPCWSTR resname, ULONG lang ) @@ -2958,8 +3017,16 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem NTSTATUS status; SIZE_T count; void *base; + WCHAR resnameBuf[20]; + LPCWSTR resptr = resname; - DPRINT( "looking for res %S in %S\n", resname, filename ); + if ((!((ULONG_PTR)resname >> 16))) + { + sprintfW(resnameBuf, L"#%u", (ULONG_PTR)resname); + resptr = resnameBuf; + } + + DPRINT( "looking for res %S in %S\n", resptr, filename ? filename : L"<NULL>"); attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -2984,7 +3051,10 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem if (RtlImageNtHeader(base)) /* we got a PE file */ { HANDLE module = (HMODULE)((ULONG_PTR)base | 1); /* make it a LOAD_LIBRARY_AS_DATAFILE handle */ - status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang ); + if (resname) + status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang ); + else + status = search_manifest_in_module(acl, ai, filename, directory, shared, module, lang); } else status = STATUS_INVALID_IMAGE_FORMAT; @@ -3308,7 +3378,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, if (!status) { status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, - (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); + (LPCWSTR)0, 0 ); NtClose( file ); break; } @@ -5098,7 +5168,7 @@ RtlCreateActivationContext(IN ULONG Flags, status = get_manifest_in_associated_manifest( &acl, NULL, NULL, directory, pActCtx->hModule, pActCtx->lpResourceName ); } - else if (pActCtx->lpSource) + else if (pActCtx->lpSource && pActCtx->lpResourceName) { status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, FALSE, file, pActCtx->lpResourceName, lang );
6 years, 2 months
1
0
0
0
01/01: [ITSS_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50ae3dd409e6c42a0fa4a…
commit 50ae3dd409e6c42a0fa4a18db44c1fb71012974a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:57:42 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:57:42 2018 +0100 [ITSS_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/itss/protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/itss/protocol.c b/modules/rostests/winetests/itss/protocol.c index ea3a1d6967..6c46ca1061 100644 --- a/modules/rostests/winetests/itss/protocol.c +++ b/modules/rostests/winetests/itss/protocol.c @@ -504,18 +504,18 @@ static void test_its_protocol_info(IInternetProtocol *protocol) for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { if(i != PARSE_CANONICALIZE && i != PARSE_SECURITY_URL) { hres = IInternetProtocolInfo_ParseUrl(info, blank_url1, i, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); } } - for(i=0; i < sizeof(combine_tests)/sizeof(combine_tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(combine_tests); i++) { size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", i, hres, combine_tests[i].hres); ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1
6 years, 2 months
1
0
0
0
01/01: [ITSS] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ccdd32f50572374c9502…
commit 0ccdd32f50572374c9502873c0cfe7d236e7214b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:57:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:57:08 2018 +0100 [ITSS] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/itss/moniker.c | 4 ++-- dll/win32/itss/protocol.c | 12 ++++++------ media/doc/README.WINE | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/itss/moniker.c b/dll/win32/itss/moniker.c index 0509c9e1a5..6c61f47482 100644 --- a/dll/win32/itss/moniker.c +++ b/dll/win32/itss/moniker.c @@ -287,7 +287,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( ITS_IMonikerImpl *This = impl_from_IMoniker(iface); static const WCHAR szFormat[] = { 'm','s','-','i','t','s',':','%','s',':',':','%','s',0 }; - DWORD len = sizeof szFormat / sizeof(WCHAR); + DWORD len; LPWSTR str; TRACE("%p %p %p %p\n", iface, pbc, pmkToLeft, ppszDisplayName); @@ -435,7 +435,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( { static const WCHAR szPrefix[] = { '@','M','S','I','T','S','t','o','r','e',':',0 }; - const DWORD prefix_len = (sizeof szPrefix/sizeof szPrefix[0])-1; + const DWORD prefix_len = ARRAY_SIZE(szPrefix)-1; DWORD n; ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); diff --git a/dll/win32/itss/protocol.c b/dll/win32/itss/protocol.c index 1cdb365002..a7c40077cc 100644 --- a/dll/win32/itss/protocol.c +++ b/dll/win32/itss/protocol.c @@ -153,12 +153,12 @@ static LPCWSTR skip_schema(LPCWSTR url) static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) - return url+sizeof(its_schema)/sizeof(WCHAR); - if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) - return url+sizeof(msits_schema)/sizeof(WCHAR); - if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) - return url+sizeof(mk_schema)/sizeof(WCHAR); + if(!strncmpiW(its_schema, url, ARRAY_SIZE(its_schema))) + return url + ARRAY_SIZE(its_schema); + if(!strncmpiW(msits_schema, url, ARRAY_SIZE(msits_schema))) + return url + ARRAY_SIZE(msits_schema); + if(!strncmpiW(mk_schema, url, ARRAY_SIZE(mk_schema))) + return url + ARRAY_SIZE(mk_schema); return NULL; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 60f29d4dda..a867ad3b16 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -84,7 +84,7 @@ reactos/dll/win32/initpki # Synced to WineStaging-3.3 reactos/dll/win32/inseng # Synced to WineStaging-3.3 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-3.3 -reactos/dll/win32/itss # Synced to WineStaging-3.9 +reactos/dll/win32/itss # Synced to WineStaging-3.17 reactos/dll/win32/jscript # Synced to WineStaging-3.9 reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 reactos/dll/win32/loadperf # Synced to WineStaging-3.3
6 years, 2 months
1
0
0
0
01/01: [INETMIB1] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bd06f3b766a7108a2ed3…
commit 6bd06f3b766a7108a2ed3dc6d4b6d92ab0e23560 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:56:32 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:56:32 2018 +0100 [INETMIB1] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/inetmib1/main.c | 4 ++-- media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/inetmib1/main.c b/dll/win32/inetmib1/main.c index c0719c1d63..2f7b9cadfe 100644 --- a/dll/win32/inetmib1/main.c +++ b/dll/win32/inetmib1/main.c @@ -1321,7 +1321,7 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, pFirstSupportedRegion); minSupportedIDLength = UINT_MAX; - for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + for (i = 0; i < ARRAY_SIZE(supportedIDs); i++) { if (supportedIDs[i].init) supportedIDs[i].init(); @@ -1337,7 +1337,7 @@ static void cleanup(void) { UINT i; - for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + for (i = 0; i < ARRAY_SIZE(supportedIDs); i++) if (supportedIDs[i].cleanup) supportedIDs[i].cleanup(); } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 841f112a5e..60f29d4dda 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -79,7 +79,7 @@ reactos/dll/win32/imaadp32.acm # Synced to WineStaging-3.17 reactos/dll/win32/imagehlp # Synced to WineStaging-3.3 reactos/dll/win32/imm32 # Synced to WineStaging-3.17 reactos/dll/win32/inetcomm # Synced to WineStaging-3.17 -reactos/dll/win32/inetmib1 # Synced to WineStaging-3.3 +reactos/dll/win32/inetmib1 # Synced to WineStaging-3.17 reactos/dll/win32/initpki # Synced to WineStaging-3.3 reactos/dll/win32/inseng # Synced to WineStaging-3.3 reactos/dll/win32/iphlpapi # Out of sync
6 years, 2 months
1
0
0
0
01/01: [INETCOMM_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d736703417068ccf9d419…
commit d736703417068ccf9d419dc788eb7dfcfc0917c8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:55:57 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:55:57 2018 +0100 [INETCOMM_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/inetcomm/mimeole.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/rostests/winetests/inetcomm/mimeole.c b/modules/rostests/winetests/inetcomm/mimeole.c index 4eea605eef..9db7a6ac49 100644 --- a/modules/rostests/winetests/inetcomm/mimeole.c +++ b/modules/rostests/winetests/inetcomm/mimeole.c @@ -20,6 +20,9 @@ #define COBJMACROS #define NONAMELESSUNION +#ifdef __REACTOS__ +#define CONST_VTABLE +#endif #include "initguid.h" #include "windows.h" @@ -129,7 +132,7 @@ static WCHAR *a2w(const char *str) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -436,7 +439,7 @@ static HRESULT WINAPI Stream_Clone(IStream *iface, IStream **ppstm) return E_NOTIMPL; } -static /* const */ IStreamVtbl StreamVtbl = { +static const IStreamVtbl StreamVtbl = { Stream_QueryInterface, Stream_AddRef, Stream_Release, @@ -1300,7 +1303,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return E_FAIL; } -static /* const */ IServiceProviderVtbl ServiceProviderVtbl = { +static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryInterface, ServiceProvider_AddRef, ServiceProvider_Release, @@ -1430,7 +1433,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CloseHandle(file); sprintf(urla, test->url, file_name); - MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, ARRAY_SIZE(test_url)); hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres); @@ -1514,13 +1517,13 @@ static void test_mhtml_protocol_info(void) &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); - for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) { + for(i = 0; i < ARRAY_SIZE(combine_tests); i++) { base_url = a2w(combine_tests[i].base_url); relative_url = a2w(combine_tests[i].relative_url); combined_len = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); if(SUCCEEDED(hres)) { @@ -1541,7 +1544,7 @@ static void test_mhtml_protocol_info(void) } hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); IInternetProtocolInfo_Release(protocol_info); @@ -1563,7 +1566,7 @@ static ULONG WINAPI outer_Release(IUnknown *iface) return 1; } -static /* const */ IUnknownVtbl outer_vtbl = { +static const IUnknownVtbl outer_vtbl = { outer_QueryInterface, outer_AddRef, outer_Release @@ -1605,7 +1608,7 @@ static void test_mhtml_protocol(void) if(!broken_mhtml_resolver) test_mhtml_protocol_info(); - for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++) + for(i = 0; i < ARRAY_SIZE(binding_tests); i++) test_mhtml_protocol_binding(binding_tests + i); } @@ -1628,7 +1631,7 @@ static void test_MimeOleObjectFromMoniker(void) {"../test.mht", "mhtml:../test.mht"} }; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) { + for(i = 0; i < ARRAY_SIZE(tests); i++) { url = a2w(tests[i].url); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres);
6 years, 2 months
1
0
0
0
01/01: [INETCOMM] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33351fe5add268b3d8462…
commit 33351fe5add268b3d8462d95fca5d85759793ff2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:55:17 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:55:17 2018 +0100 [INETCOMM] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/inetcomm/mimeole.c | 7 +++---- dll/win32/inetcomm/protocol.c | 18 +++++++++--------- media/doc/README.WINE | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dll/win32/inetcomm/mimeole.c b/dll/win32/inetcomm/mimeole.c index b7d6d6ab3a..f13a4ff17a 100644 --- a/dll/win32/inetcomm/mimeole.c +++ b/dll/win32/inetcomm/mimeole.c @@ -1584,9 +1584,8 @@ static HRESULT decode_base64(IStream *input, IStream **ret_stream) while(1) { /* skip invalid chars */ - while(ptr < end && - (*ptr >= sizeof(base64_decode_table)/sizeof(*base64_decode_table) - || base64_decode_table[*ptr] == -1)) + while(ptr < end && (*ptr >= ARRAY_SIZE(base64_decode_table) + || base64_decode_table[*ptr] == -1)) ptr++; if(ptr == end) break; @@ -3718,7 +3717,7 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx return E_OUTOFMEMORY; memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); - strcpyW(mhtml_url + sizeof(mhtml_prefixW)/sizeof(WCHAR), display_name); + strcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); HeapFree(GetProcessHeap(), 0, display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dll/win32/inetcomm/protocol.c b/dll/win32/inetcomm/protocol.c index 028463a269..c6a59fee7c 100644 --- a/dll/win32/inetcomm/protocol.c +++ b/dll/win32/inetcomm/protocol.c @@ -83,16 +83,16 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(strncmpiW(url, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) + if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) return E_FAIL; - r->mhtml = url + sizeof(mhtml_prefixW)/sizeof(WCHAR); + r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); p = strchrW(r->mhtml, '!'); if(p) { r->mhtml_len = p - r->mhtml; /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ - if(!strncmpW(p, mhtml_separatorW, sizeof(mhtml_separatorW)/sizeof(WCHAR))) - p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + if(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) + p += ARRAY_SIZE(mhtml_separatorW); else p++; }else { @@ -657,7 +657,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - size_t len = sizeof(mhtml_prefixW)/sizeof(WCHAR); + size_t len = ARRAY_SIZE(mhtml_prefixW); mhtml_url_t url; WCHAR *p; HRESULT hres; @@ -670,26 +670,26 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(hres)) return hres; - if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) { + if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { FIXME("Relative URL is mhtml protocol\n"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += strlenW(pwzRelativeUrl) + sizeof(mhtml_separatorW)/sizeof(WCHAR); + len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; } memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW)); - p = pwzResult + sizeof(mhtml_prefixW)/sizeof(WCHAR); + p = pwzResult + ARRAY_SIZE(mhtml_prefixW); memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR)); p += url.mhtml_len; if(*pwzRelativeUrl) { memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); - p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + p += ARRAY_SIZE(mhtml_separatorW); strcpyW(p, pwzRelativeUrl); }else { *p = 0; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 7d01cb3e41..841f112a5e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -78,7 +78,7 @@ reactos/dll/win32/ieframe # Synced to WineStaging-3.17 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-3.17 reactos/dll/win32/imagehlp # Synced to WineStaging-3.3 reactos/dll/win32/imm32 # Synced to WineStaging-3.17 -reactos/dll/win32/inetcomm # Synced to WineStaging-3.3 +reactos/dll/win32/inetcomm # Synced to WineStaging-3.17 reactos/dll/win32/inetmib1 # Synced to WineStaging-3.3 reactos/dll/win32/initpki # Synced to WineStaging-3.3 reactos/dll/win32/inseng # Synced to WineStaging-3.3
6 years, 2 months
1
0
0
0
01/01: [IMM32_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41d938c3896d41e84a9bd…
commit 41d938c3896d41e84a9bdcca241f18f64aab2c82 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:54:28 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:54:28 2018 +0100 [IMM32_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/imm32/imm32.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/rostests/winetests/imm32/imm32.c b/modules/rostests/winetests/imm32/imm32.c index be3ddfce03..ee1aeb3965 100644 --- a/modules/rostests/winetests/imm32/imm32.c +++ b/modules/rostests/winetests/imm32/imm32.c @@ -26,8 +26,6 @@ #include "imm.h" #include "ddk/imm.h" -#define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) - static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -73,7 +71,7 @@ static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) MSG *msg = (MSG*)lParam; if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) { msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; @@ -94,7 +92,7 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) { memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); msg_spy.msgs[msg_spy.i_msg].post = FALSE; @@ -126,7 +124,7 @@ static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { msg_spy_pump_msg_queue(); - if (msg_spy.i_msg >= NUMELEMS(msg_spy.msgs)) + if (msg_spy.i_msg >= ARRAY_SIZE(msg_spy.msgs)) fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); @@ -1067,8 +1065,8 @@ static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && - !lstrcmpW(class_nameW, imeW)) { + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + { *ime_window = hWnd; return FALSE; } @@ -1229,7 +1227,7 @@ static void test_default_ime_window_creation(void) { FALSE, FALSE } }; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError());
6 years, 2 months
1
0
0
0
01/01: [IMM32] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=789fa9c8197895841689f…
commit 789fa9c8197895841689f2298c7ce885330904cf Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 12:53:21 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 12:53:21 2018 +0100 [IMM32] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/imm32/CMakeLists.txt | 7 ------ dll/win32/imm32/imm.c | 55 +++++++++++++++++++----------------------- media/doc/README.WINE | 2 +- 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index c6da33a0bf..91368f84e4 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -13,13 +13,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) add_library(imm32 SHARED ${SOURCE} version.rc) - -if(MSVC) - # FIXME:
http://www.cmake.org/Bug/view.php?id=12998
- #add_target_compile_flags(imm32 "/FIwine/typeof.h") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") -endif() - set_module_type(imm32 win32dll) target_link_libraries(imm32 wine) add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 685eb018c4..28eb00f355 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); #define IMM_INIT_MAGIC 0x19650412 BOOL WINAPI User32InitializeImmEntryTable(DWORD); -#define MAKE_FUNCPTR(f) typeof(f) * p##f typedef struct _tagImmHkl{ struct list entry; HKL hkl; @@ -51,24 +50,23 @@ typedef struct _tagImmHkl{ HWND UIWnd; /* Function Pointers */ - MAKE_FUNCPTR(ImeInquire); - MAKE_FUNCPTR(ImeConfigure); - MAKE_FUNCPTR(ImeDestroy); - MAKE_FUNCPTR(ImeEscape); - MAKE_FUNCPTR(ImeSelect); - MAKE_FUNCPTR(ImeSetActiveContext); - MAKE_FUNCPTR(ImeToAsciiEx); - MAKE_FUNCPTR(NotifyIME); - MAKE_FUNCPTR(ImeRegisterWord); - MAKE_FUNCPTR(ImeUnregisterWord); - MAKE_FUNCPTR(ImeEnumRegisterWord); - MAKE_FUNCPTR(ImeSetCompositionString); - MAKE_FUNCPTR(ImeConversionList); - MAKE_FUNCPTR(ImeProcessKey); - MAKE_FUNCPTR(ImeGetRegisterWordStyle); - MAKE_FUNCPTR(ImeGetImeMenuItems); + BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *); + BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); + BOOL (WINAPI *pImeDestroy)(UINT); + LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); + BOOL (WINAPI *pImeSelect)(HIMC, BOOL); + BOOL (WINAPI *pImeSetActiveContext)(HIMC, BOOL); + UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, DWORD *, UINT, HIMC); + BOOL (WINAPI *pNotifyIME)(HIMC, DWORD, DWORD, DWORD); + BOOL (WINAPI *pImeRegisterWord)(const WCHAR *, DWORD, const WCHAR *); + BOOL (WINAPI *pImeUnregisterWord)(const WCHAR *, DWORD, const WCHAR *); + UINT (WINAPI *pImeEnumRegisterWord)(REGISTERWORDENUMPROCW, const WCHAR *, DWORD, const WCHAR *, void *); + BOOL (WINAPI *pImeSetCompositionString)(HIMC, DWORD, const void *, DWORD, const void *, DWORD); + DWORD (WINAPI *pImeConversionList)(HIMC, const WCHAR *, CANDIDATELIST *, DWORD, UINT); + BOOL (WINAPI *pImeProcessKey)(HIMC, UINT, LPARAM, const BYTE *); + UINT (WINAPI *pImeGetRegisterWordStyle)(UINT, STYLEBUFW *); + DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD); } ImmHkl; -#undef MAKE_FUNCPTR typedef struct tagInputContextData { @@ -308,7 +306,7 @@ static HMODULE load_graphics_driver(void) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0; @@ -769,7 +767,7 @@ HIMC WINAPI ImmCreateContext(void) gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); - for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + for (i = 0; i < ARRAY_SIZE(new_context->IMC.cfCandForm); i++) new_context->IMC.cfCandForm[i].dwIndex = ~0u; /* Initialize the IME Private */ @@ -1013,8 +1011,7 @@ DWORD WINAPI ImmGetCandidateListA( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1117,8 +1114,7 @@ DWORD WINAPI ImmGetCandidateListW( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1152,7 +1148,7 @@ BOOL WINAPI ImmGetCandidateWindow( if (!data || !lpCandidate) return FALSE; - if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) @@ -1624,8 +1620,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, sizeof(classW)/sizeof(classW[0])) && - !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1844,7 +1839,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) HKEY hkey; DWORD length; DWORD rc; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL ); rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); @@ -2062,7 +2057,7 @@ HKL WINAPI ImmInstallIMEW( HKL hkl; DWORD rc; HKEY hkey; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)); @@ -2314,7 +2309,7 @@ BOOL WINAPI ImmSetCandidateWindow( wine_dbgstr_point(&lpCandidate->ptCurrentPos), wine_dbgstr_rect(&lpCandidate->rcArea)); - if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0583308dba..7d01cb3e41 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -77,7 +77,7 @@ reactos/dll/win32/iccvid # Synced to WineStaging-3.3 reactos/dll/win32/ieframe # Synced to WineStaging-3.17 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-3.17 reactos/dll/win32/imagehlp # Synced to WineStaging-3.3 -reactos/dll/win32/imm32 # Synced to WineStaging-3.9 +reactos/dll/win32/imm32 # Synced to WineStaging-3.17 reactos/dll/win32/inetcomm # Synced to WineStaging-3.3 reactos/dll/win32/inetmib1 # Synced to WineStaging-3.3 reactos/dll/win32/initpki # Synced to WineStaging-3.3
6 years, 2 months
1
0
0
0
← Newer
1
...
31
32
33
34
35
36
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Results per page:
10
25
50
100
200