April 2020 - Wine-commits - list.winehq.org

Zhipeng Zhao : explorer: Support '/cd,' command line option.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 9d79746425ba2e292f85f656227d703672076499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d79746425ba2e292f85f656… Author: Zhipeng Zhao <near2see(a)163.com> Date: Fri Mar 27 15:14:52 2020 +0800 explorer: Support '/cd,' command line option. '/cd,' is an undocumented option that seems to have the same effect as '/root,'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48816. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index dcd09ac969..763fca381b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -718,6 +718,7 @@ static void copy_path_root(LPWSTR root, LPWSTR path) * Command Line parameters are: * [/n] Opens in single-paned view for each selected items. This is default * [/e,] Uses Windows Explorer View + * [/cd,object] Specifies the root level of the view * [/root,object] Specifies the root level of the view * [/select,object] parent folder is opened and specified object is selected */ @@ -725,6 +726,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) { static const WCHAR arg_n[] = {'/','n'}; static const WCHAR arg_e[] = {'/','e',','}; + static const WCHAR arg_cd[] = {'/','c','d',','}; static const WCHAR arg_root[] = {'/','r','o','o','t',','}; static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; @@ -745,6 +747,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) parameters->explorer_mode = TRUE; p += ARRAY_SIZE( arg_e ); } + else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + { + p += ARRAY_SIZE( arg_cd ); + p = copy_path_string(parameters->root,p); + } else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) { p += ARRAY_SIZE( arg_root );

1 0

Jacek Caban : dbghelp: Don't store entire mach header in image_file_map.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 7254579417f337063734933975b25d21da4d31f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7254579417f3370637349339… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 20:27:59 2020 +0200 dbghelp: Don't store entire mach header in image_file_map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 5 +++-- dlls/dbghelp/macho_module.c | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 2b414b9607..9f015c2707 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -94,10 +94,11 @@ struct image_file_map size_t segs_start; HANDLE handle; struct image_file_map* dsym; /* the debug symbols file associated with this one */ + size_t header_size; /* size of real header in file */ + size_t commands_size; + size_t commands_count; #ifdef HAVE_MACH_O_LOADER_H - struct mach_header mach_header; - size_t header_size; /* size of real header in file */ const struct load_command* load_commands; const struct uuid_command* uuid; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1e01d84c19..5d3f8615e8 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -448,7 +448,7 @@ static const struct load_command* macho_map_load_commands(struct macho_file_map* if (fmap->load_commands == IMAGE_NO_MAP) { fmap->load_commands = (const struct load_command*) macho_map_range( - fmap, fmap->header_size, fmap->mach_header.sizeofcmds, NULL); + fmap, fmap->header_size, fmap->commands_size, NULL); TRACE("Mapped load commands: %p\n", fmap->load_commands); } @@ -466,7 +466,7 @@ static void macho_unmap_load_commands(struct macho_file_map* fmap) { TRACE("Unmapping load commands: %p\n", fmap->load_commands); macho_unmap_range(NULL, (const void**)&fmap->load_commands, fmap, - fmap->header_size, fmap->mach_header.sizeofcmds); + fmap->header_size, fmap->commands_size); } } @@ -504,9 +504,9 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, if ((lc = macho_map_load_commands(fmap)) == IMAGE_NO_MAP) return -1; - TRACE("%d total commands\n", fmap->mach_header.ncmds); + TRACE("%lu total commands\n", fmap->commands_count); - for (i = 0; i < fmap->mach_header.ncmds; i++, lc = macho_next_load_command(lc)) + for (i = 0; i < fmap->commands_count; i++, lc = macho_next_load_command(lc)) { int result; @@ -683,6 +683,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, { struct macho_file_map* fmap = &ifm->u.macho; struct fat_header fat_header; + struct mach_header mach_header; int i; WCHAR* filename; struct section_info info; @@ -745,15 +746,16 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, /* Individual architecture (standalone or within a fat file) is in its native byte order. */ SetFilePointer(fmap->handle, fmap->arch_offset, 0, FILE_BEGIN); - if (!ReadFile(fmap->handle, &fmap->mach_header, sizeof(fmap->mach_header), &bytes_read, NULL) - || bytes_read != sizeof(fmap->mach_header)) + if (!ReadFile(fmap->handle, &mach_header, sizeof(mach_header), &bytes_read, NULL) + || bytes_read != sizeof(mach_header)) goto done; TRACE("... got possible Mach header\n"); /* and check for a Mach-O header */ - if (fmap->mach_header.magic != target_magic || - fmap->mach_header.cputype != target_cpu) goto done; + if (mach_header.magic != target_magic || mach_header.cputype != target_cpu) goto done; + fmap->commands_size = mach_header.sizeofcmds; + fmap->commands_count = mach_header.ncmds; /* Make sure the file type is one of the ones we expect. */ - switch (fmap->mach_header.filetype) + switch (mach_header.filetype) { case MH_EXECUTE: case MH_DYLIB:

1 0

Jacek Caban : dbghelp: Use local macho load command declaration.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: c695e7e99e0a06b6039d46f98fea35c363aa6cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c695e7e99e0a06b6039d46f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 20:28:10 2020 +0200 dbghelp: Use local macho load command declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 19 ++++++++++++++++--- dlls/dbghelp/macho_module.c | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 9f015c2707..da977c08f5 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -63,6 +63,19 @@ struct elf_section_header UINT64 sh_entsize; /* Entry size if section holds table */ }; +struct macho_load_command +{ + UINT32 cmd; /* type of load command */ + UINT32 cmdsize; /* total size of command in bytes */ +}; + +struct macho_uuid_command +{ + UINT32 cmd; /* LC_UUID */ + UINT32 cmdsize; + UINT8 uuid[16]; +}; + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -98,14 +111,14 @@ struct image_file_map size_t commands_size; size_t commands_count; -#ifdef HAVE_MACH_O_LOADER_H - const struct load_command* load_commands; - const struct uuid_command* uuid; + const struct macho_load_command* load_commands; + const struct macho_uuid_command* uuid; /* The offset in the file which is this architecture. mach_header was * read from arch_offset. */ unsigned arch_offset; +#ifdef HAVE_MACH_O_LOADER_H int num_sections; struct { diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 5d3f8615e8..ac4e8cbb7e 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -443,11 +443,11 @@ static const struct image_file_map_ops macho_file_map_ops = * * Maps the load commands from a Mach-O file into memory */ -static const struct load_command* macho_map_load_commands(struct macho_file_map* fmap) +static const struct macho_load_command* macho_map_load_commands(struct macho_file_map* fmap) { if (fmap->load_commands == IMAGE_NO_MAP) { - fmap->load_commands = (const struct load_command*) macho_map_range( + fmap->load_commands = (const struct macho_load_command*) macho_map_range( fmap, fmap->header_size, fmap->commands_size, NULL); TRACE("Mapped load commands: %p\n", fmap->load_commands); } @@ -475,9 +475,9 @@ static void macho_unmap_load_commands(struct macho_file_map* fmap) * * Advance to the next load command */ -static const struct load_command* macho_next_load_command(const struct load_command* lc) +static const struct macho_load_command* macho_next_load_command(const struct macho_load_command* lc) { - return (const struct load_command*)((const char*)lc + lc->cmdsize); + return (const struct macho_load_command*)((const char*)lc + lc->cmdsize); } /****************************************************************** @@ -492,11 +492,11 @@ static const struct load_command* macho_next_load_command(const struct load_comm * processed. */ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, - int (*cb)(struct image_file_map*, const struct load_command*, void*), + int (*cb)(struct image_file_map*, const struct macho_load_command*, void*), void* user) { struct macho_file_map* fmap = &ifm->u.macho; - const struct load_command* lc; + const struct macho_load_command* lc; int i; int count = 0; @@ -528,7 +528,7 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, * significant sections in a Mach-O file. All commands are * expected to be of LC_SEGMENT[_64] type. */ -static int macho_count_sections(struct image_file_map* ifm, const struct load_command* lc, void* user) +static int macho_count_sections(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { char segname[16]; uint32_t nsects; @@ -560,7 +560,7 @@ static int macho_count_sections(struct image_file_map* ifm, const struct load_co * range covered by the segments of a Mach-O file and builds the * section map. All commands are expected to be of LC_SEGMENT[_64] type. */ -static int macho_load_section_info(struct image_file_map* ifm, const struct load_command* lc, void* user) +static int macho_load_section_info(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { struct macho_file_map* fmap = &ifm->u.macho; struct section_info* info = user; @@ -652,9 +652,9 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load * Callback for macho_enum_load_commands. Records the UUID load * command of a Mach-O file. */ -static int find_uuid(struct image_file_map* ifm, const struct load_command* lc, void* user) +static int find_uuid(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { - ifm->u.macho.uuid = (const struct uuid_command*)lc; + ifm->u.macho.uuid = (const struct macho_uuid_command*)lc; return 1; } @@ -927,7 +927,7 @@ static void macho_stabs_def_cb(struct module* module, ULONG_PTR load_offset, * load commands from the Mach-O file. */ static int macho_parse_symtab(struct image_file_map* ifm, - const struct load_command* lc, void* user) + const struct macho_load_command* lc, void* user) { struct macho_file_map* fmap = &ifm->u.macho; const struct symtab_command* sc = (const struct symtab_command*)lc;

1 0

Jacek Caban : dbghelp: Use local macho section declaration.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 64341284c58bcc22f13f8146bcb6c8a08c0c4ff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64341284c58bcc22f13f8146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 20:28:32 2020 +0200 dbghelp: Use local macho section declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 45 +++++++++++++++++++++++++++++++------------- dlls/dbghelp/macho_module.c | 4 ++-- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index da977c08f5..4171b38923 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -19,16 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef HAVE_LINK_H -# include <link.h> -#endif -#ifdef HAVE_SYS_LINK_H -# include <sys/link.h> -#endif -#ifdef HAVE_MACH_O_LOADER_H -#include <mach-o/loader.h> -#endif - #define IMAGE_NO_MAP ((void*)-1) struct elf_header @@ -76,6 +66,37 @@ struct macho_uuid_command UINT8 uuid[16]; }; +struct macho_section +{ + char sectname[16]; /* name of this section */ + char segname[16]; /* segment this section goes in */ + UINT64 addr; /* memory address of this section */ + UINT64 size; /* size in bytes of this section */ + UINT32 offset; /* file offset of this section */ + UINT32 align; /* section alignment (power of 2) */ + UINT32 reloff; /* file offset of relocation entries */ + UINT32 nreloc; /* number of relocation entries */ + UINT32 flags; /* flags (section type and attributes)*/ + UINT32 reserved1; /* reserved (for offset or index) */ + UINT32 reserved2; /* reserved (for count or sizeof) */ + UINT32 reserved3; /* reserved */ +}; + +struct macho_section32 +{ + char sectname[16]; /* name of this section */ + char segname[16]; /* segment this section goes in */ + UINT32 addr; /* memory address of this section */ + UINT32 size; /* size in bytes of this section */ + UINT32 offset; /* file offset of this section */ + UINT32 align; /* section alignment (power of 2) */ + UINT32 reloff; /* file offset of relocation entries */ + UINT32 nreloc; /* number of relocation entries */ + UINT32 flags; /* flags (section type and attributes)*/ + UINT32 reserved1; /* reserved (for offset or index) */ + UINT32 reserved2; /* reserved (for count or sizeof) */ +}; + /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -118,15 +139,13 @@ struct image_file_map * read from arch_offset. */ unsigned arch_offset; -#ifdef HAVE_MACH_O_LOADER_H int num_sections; struct { - struct section_64 section; + struct macho_section section; const char* mapped; unsigned int ignored : 1; }* sect; -#endif } macho; struct pe_file_map { diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ac4e8cbb7e..0e532c354b 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -624,7 +624,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach { if (ifm->addr_size == 32) { - const struct section *section = &((const struct section *)sections)[i]; + const struct macho_section32 *section = &((const struct macho_section32 *)sections)[i]; memcpy(fmap->sect[info->section_index].section.sectname, section->sectname, sizeof(section->sectname)); memcpy(fmap->sect[info->section_index].section.segname, section->segname, sizeof(section->segname)); fmap->sect[info->section_index].section.addr = section->addr; @@ -636,7 +636,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach fmap->sect[info->section_index].section.flags = section->flags; } else - fmap->sect[info->section_index].section = ((const struct section_64 *)sections)[i]; + fmap->sect[info->section_index].section = ((const struct macho_section *)sections)[i]; fmap->sect[info->section_index].mapped = IMAGE_NO_MAP; fmap->sect[info->section_index].ignored = ignore;

1 0

Zebediah Figura : quartz/acmwrapper: Get rid of the ACMWrapperImpl typedef.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 1f1f417791d6d3684ef2289f25d59d8a67cd8efd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1f417791d6d3684ef2289f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:15 2020 -0500 quartz/acmwrapper: Get rid of the ACMWrapperImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b116f98ef0..6df04595bb 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct ACMWrapperImpl +struct acm_wrapper { struct strmbase_filter filter; CRITICAL_SECTION stream_cs; @@ -53,16 +53,16 @@ typedef struct ACMWrapperImpl LONGLONG lasttime_real; LONGLONG lasttime_sent; -} ACMWrapperImpl; +}; -static inline ACMWrapperImpl *impl_from_strmbase_filter(struct strmbase_filter *iface) +static struct acm_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, filter); + return CONTAINING_RECORD(iface, struct acm_wrapper, filter); } static HRESULT acm_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; @@ -80,7 +80,7 @@ static HRESULT acm_wrapper_sink_query_accept(struct strmbase_pin *iface, const A static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - ACMWrapperImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *This = impl_from_strmbase_filter(iface->pin.filter); IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; LPBYTE pbDstStream; @@ -278,7 +278,7 @@ static BOOL is_audio_subtype(const GUID *guid) static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; MMRESULT res; @@ -312,7 +312,7 @@ static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, static void acm_wrapper_sink_disconnect(struct strmbase_sink *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); if (filter->has) acmStreamClose(filter->has, 0); @@ -332,7 +332,7 @@ static const struct strmbase_sink_ops sink_ops = static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; @@ -347,7 +347,7 @@ static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, RE static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) && (IsEqualGUID(&mt->subtype, &filter->mt.subtype) @@ -359,7 +359,7 @@ static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (index) return VFW_S_NO_MORE_ITEMS; @@ -370,7 +370,7 @@ static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, static HRESULT WINAPI acm_wrapper_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -395,34 +395,34 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = acm_wrapper_source_DecideBufferSize, }; -static ACMWrapperImpl *impl_from_source_IQualityControl(IQualityControl *iface) +static struct acm_wrapper *impl_from_source_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, source_IQualityControl_iface); + return CONTAINING_RECORD(iface, struct acm_wrapper, source_IQualityControl_iface); } static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); IQualityControl *peer; HRESULT hr = S_OK; @@ -443,7 +443,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sink %p.\n", filter, sink); @@ -463,7 +463,7 @@ static const IQualityControlVtbl source_qc_vtbl = static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); if (index == 0) return &filter->sink.pin; @@ -474,7 +474,7 @@ static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, u static void acm_wrapper_destroy(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); if (filter->sink.pin.peer) IPin_Disconnect(filter->sink.pin.peer); @@ -499,7 +499,7 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); BaseOutputPinImpl_Active(&filter->source); return S_OK; @@ -507,7 +507,7 @@ static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) static HRESULT acm_wrapper_cleanup_stream(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); BaseOutputPinImpl_Inactive(&filter->source); return S_OK; @@ -523,7 +523,7 @@ static const struct strmbase_filter_ops filter_ops = HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) { - ACMWrapperImpl *object; + struct acm_wrapper *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Zebediah Figura : quartz/avidec: Get rid of the AVIDecImpl typedef.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 27c9b689c100f4b2370a5767c3dbe05194b73f55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c9b689c100f4b2370a5767… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:16 2020 -0500 quartz/avidec: Get rid of the AVIDecImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8d38b89e99..1d9bc8acdf 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct AVIDecImpl +struct avi_decompressor { struct strmbase_filter filter; CRITICAL_SECTION stream_cs; @@ -50,16 +50,16 @@ typedef struct AVIDecImpl HIC hvid; BITMAPINFOHEADER* pBihIn; REFERENCE_TIME late; -} AVIDecImpl; +}; -static AVIDecImpl *impl_from_strmbase_filter(struct strmbase_filter *iface) +static struct avi_decompressor *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, AVIDecImpl, filter); + return CONTAINING_RECORD(iface, struct avi_decompressor, filter); } static HRESULT avi_decompressor_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; @@ -77,14 +77,15 @@ static HRESULT avi_decompressor_sink_query_accept(struct strmbase_pin *iface, co static HRESULT avi_decompressor_sink_end_flush(struct strmbase_sink *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->pin.filter); filter->late = -1; if (filter->source.pin.peer) return IPin_EndFlush(filter->source.pin.peer); return S_OK; } -static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { +static int AVIDec_DropSample(struct avi_decompressor *This, REFERENCE_TIME tStart) +{ if (This->late < 0) return 0; @@ -98,7 +99,7 @@ static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - AVIDecImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *This = impl_from_strmbase_filter(iface->pin.filter); VIDEOINFOHEADER *source_format; HRESULT hr; DWORD res; @@ -219,7 +220,7 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, static HRESULT avi_decompressor_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { - AVIDecImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; /* Check root (GUID w/o FOURCC) */ @@ -273,7 +274,7 @@ failed: static void avi_decompressor_sink_disconnect(struct strmbase_sink *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->pin.filter); if (filter->hvid) ICClose(filter->hvid); @@ -295,7 +296,7 @@ static const struct strmbase_sink_ops sink_ops = static HRESULT avi_decompressor_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; @@ -310,7 +311,7 @@ static HRESULT avi_decompressor_source_query_interface(struct strmbase_pin *ifac static HRESULT avi_decompressor_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); VIDEOINFOHEADER *sink_format, *format; if (!filter->sink.pin.peer || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) @@ -346,7 +347,7 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface {&MEDIASUBTYPE_RGB8, BI_RGB, 8}, }; - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); const VIDEOINFOHEADER *sink_format; VIDEOINFO *format; @@ -464,34 +465,34 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = avi_decompressor_source_DecideBufferSize, }; -static AVIDecImpl *impl_from_source_IQualityControl(IQualityControl *iface) +static struct avi_decompressor *impl_from_source_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, AVIDecImpl, source_IQualityControl_iface); + return CONTAINING_RECORD(iface, struct avi_decompressor, source_IQualityControl_iface); } static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); @@ -507,7 +508,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sink %p.\n", filter, sink); @@ -525,7 +526,7 @@ static const IQualityControlVtbl source_qc_vtbl = static struct strmbase_pin *avi_decompressor_get_pin(struct strmbase_filter *iface, unsigned int index) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); if (index == 0) return &filter->sink.pin; @@ -536,7 +537,7 @@ static struct strmbase_pin *avi_decompressor_get_pin(struct strmbase_filter *ifa static void avi_decompressor_destroy(struct strmbase_filter *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); if (filter->sink.pin.peer) IPin_Disconnect(filter->sink.pin.peer); @@ -560,7 +561,7 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); VIDEOINFOHEADER *source_format; LRESULT res; @@ -579,7 +580,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); LRESULT res; if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) @@ -602,7 +603,7 @@ static const struct strmbase_filter_ops filter_ops = HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) { - AVIDecImpl *object; + struct avi_decompressor *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Zebediah Figura : quartz/avidec: Fix some copy-paste errors.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: f817fde7ea6a9221843ce430f9ad4b6278027a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f817fde7ea6a9221843ce430… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:17 2020 -0500 quartz/avidec: Fix some copy-paste errors. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 1d9bc8acdf..ada3a1c7e6 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -470,26 +470,26 @@ static struct avi_decompressor *impl_from_source_IQualityControl(IQualityControl return CONTAINING_RECORD(iface, struct avi_decompressor, source_IQualityControl_iface); } -static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, +static HRESULT WINAPI avi_decompressor_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } -static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) +static ULONG WINAPI avi_decompressor_source_qc_AddRef(IQualityControl *iface) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } -static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) +static ULONG WINAPI avi_decompressor_source_qc_Release(IQualityControl *iface) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } -static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, +static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); @@ -506,7 +506,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, return S_OK; } -static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +static HRESULT WINAPI avi_decompressor_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); @@ -517,11 +517,11 @@ static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQua static const IQualityControlVtbl source_qc_vtbl = { - acm_wrapper_source_qc_QueryInterface, - acm_wrapper_source_qc_AddRef, - acm_wrapper_source_qc_Release, - acm_wrapper_source_qc_Notify, - acm_wrapper_source_qc_SetSink, + avi_decompressor_source_qc_QueryInterface, + avi_decompressor_source_qc_AddRef, + avi_decompressor_source_qc_Release, + avi_decompressor_source_qc_Notify, + avi_decompressor_source_qc_SetSink, }; static struct strmbase_pin *avi_decompressor_get_pin(struct strmbase_filter *iface, unsigned int index)

1 0

Zebediah Figura : quartz/dsoundrender: Use calloc() in dsound_render_create().
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: e1bdc1e7a001a8efb203186e7dd7d1d62a3e302e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bdc1e7a001a8efb203186e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:18 2020 -0500 quartz/dsoundrender: Use calloc() in dsound_render_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e4a39239e5..00b2a5a2be 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -502,7 +502,7 @@ static void dsound_render_destroy(struct strmbase_renderer *iface) filter->dsound = NULL; strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); InterlockedDecrement(&object_locks); } @@ -821,9 +821,8 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) DSoundRenderImpl *object; HRESULT hr; - if (!(object = CoTaskMemAlloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - memset(object, 0, sizeof(*object)); strmbase_renderer_init(&object->renderer, outer, &CLSID_DSoundRender, L"Audio Input pin (rendered)", &renderer_ops); @@ -831,7 +830,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) if (FAILED(hr = system_clock_create(&object->renderer.filter.IUnknown_inner, &object->system_clock))) { strmbase_renderer_cleanup(&object->renderer); - CoTaskMemFree(object); + free(object); return hr; } @@ -842,7 +841,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) { IUnknown_Release(object->system_clock); strmbase_renderer_cleanup(&object->renderer); - CoTaskMemFree(object); + free(object); return hr; } @@ -852,7 +851,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) IDirectSound8_Release(object->dsound); IUnknown_Release(object->system_clock); strmbase_renderer_cleanup(&object->renderer); - CoTaskMemFree(object); + free(object); return hr; }

1 0

Zebediah Figura : quartz/dsoundrender: Get rid of the DSoundRenderImpl typedef.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 5a5db91edde0a77febad12d12496c0a7356930d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a5db91edde0a77febad12d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:19 2020 -0500 quartz/dsoundrender: Get rid of the DSoundRenderImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 91 ++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a5db91edde0a77febad…

1 0

Alexandre Julliard : kernel32: Reimplement Get/WritePrivateProfileStructW functions using exported APIs.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 30ad67dc1465e960bb77a2d38587373cb21a1899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ad67dc1465e960bb77a2d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:27:53 2020 +0200 kernel32: Reimplement Get/WritePrivateProfileStructW functions using exported APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 107 +++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 70 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8310ad6fe2..e4bd861b14 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1600,6 +1600,23 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, return ret; } +static int get_hex_byte( const WCHAR *p ) +{ + int val; + + if (*p >= '0' && *p <= '9') val = *p - '0'; + else if (*p >= 'A' && *p <= 'Z') val = *p - 'A' + 10; + else if (*p >= 'a' && *p <= 'z') val = *p - 'a' + 10; + else return -1; + val <<= 4; + p++; + if (*p >= '0' && *p <= '9') val += *p - '0'; + else if (*p >= 'A' && *p <= 'Z') val += *p - 'A' + 10; + else if (*p >= 'a' && *p <= 'z') val += *p - 'a' + 10; + else return -1; + return val; +} + /*********************************************************************** * GetPrivateProfileStructW (KERNEL32.@) * @@ -1608,70 +1625,29 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, LPVOID buf, UINT len, LPCWSTR filename) { - BOOL ret = FALSE; + BOOL ret = FALSE; + LPBYTE data = buf; + BYTE chksum = 0; + int val; + WCHAR *p, *buffer; - RtlEnterCriticalSection( &PROFILE_CritSect ); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (2 * len + 3) * sizeof(WCHAR) ))) return FALSE; - if (PROFILE_Open( filename, FALSE )) { - PROFILEKEY *k = PROFILE_Find ( &CurProfile->section, section, key, FALSE, FALSE); - if (k) { - TRACE("value (at %p): %s\n", k->value, debugstr_w(k->value)); - if (((strlenW(k->value) - 2) / 2) == len) - { - LPWSTR end, p; - BOOL valid = TRUE; - WCHAR c; - DWORD chksum = 0; - - end = k->value + strlenW(k->value); /* -> '\0' */ - /* check for invalid chars in ASCII coded hex string */ - for (p=k->value; p < end; p++) - { - if (!isxdigitW(*p)) - { - WARN("invalid char '%x' in file %s->[%s]->%s !\n", - *p, debugstr_w(filename), debugstr_w(section), debugstr_w(key)); - valid = FALSE; - break; - } - } - if (valid) - { - BOOL highnibble = TRUE; - BYTE b = 0, val; - LPBYTE binbuf = buf; - - end -= 2; /* don't include checksum in output data */ - /* translate ASCII hex format into binary data */ - for (p=k->value; p < end; p++) - { - c = toupperW(*p); - val = (c > '9') ? - (c - 'A' + 10) : (c - '0'); - - if (highnibble) - b = val << 4; - else - { - b += val; - *binbuf++ = b; /* feed binary data into output */ - chksum += b; /* calculate checksum */ - } - highnibble ^= 1; /* toggle */ - } - /* retrieve stored checksum value */ - c = toupperW(*p++); - b = ( (c > '9') ? (c - 'A' + 10) : (c - '0') ) << 4; - c = toupperW(*p); - b += (c > '9') ? (c - 'A' + 10) : (c - '0'); - if (b == (chksum & 0xff)) /* checksums match ? */ - ret = TRUE; - } - } - } + if (GetPrivateProfileStringW( section, key, NULL, buffer, 2 * len + 3, filename ) != 2 * len + 2) + goto done; + + for (p = buffer; len; p += 2, len--) + { + if ((val = get_hex_byte( p )) == -1) goto done; + *data++ = val; + chksum += val; } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + /* retrieve stored checksum value */ + if ((val = get_hex_byte( p )) == -1) goto done; + ret = ((BYTE)val == chksum); +done: + HeapFree( GetProcessHeap(), 0, buffer ); return ret; } @@ -1730,17 +1706,8 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, *p++ = hex[sum & 0xf]; *p++ = '\0'; - RtlEnterCriticalSection( &PROFILE_CritSect ); - - if (PROFILE_Open( filename, TRUE )) { - ret = PROFILE_SetString( section, key, outstring, FALSE); - if (ret) ret = PROFILE_FlushFile(); - } - - RtlLeaveCriticalSection( &PROFILE_CritSect ); - + ret = WritePrivateProfileStringW( section, key, outstring, filename ); HeapFree( GetProcessHeap(), 0, outstring ); - return ret; }

1 0