November 2018 - Wine-Commits

Alex Henrie : ieframe: Turn several variables into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 05cf118538fa94f23de1b9d2aa6c236407db9b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05cf118538fa94f23de1b9d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:06 2018 -0700 ieframe: Turn several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 1a83ee3..4f3df13 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -170,8 +170,8 @@ static void add_fav_to_menu(HMENU favmenu, HMENU menu, LPWSTR title, LPCWSTR url static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) { + static const WCHAR search[] = {'*',0}; WCHAR path[MAX_PATH*2]; - const WCHAR search[] = {'*',0}; WCHAR* filename; HANDLE findhandle; WIN32_FIND_DATAW finddata; @@ -202,9 +202,9 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) if(finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + static const WCHAR ignore1[] = {'.','.',0}; + static const WCHAR ignore2[] = {'.',0}; MENUITEMINFOW item; - const WCHAR ignore1[] = {'.','.',0}; - const WCHAR ignore2[] = {'.',0}; if(!lstrcmpW(filename, ignore1) || !lstrcmpW(filename, ignore2)) continue; @@ -217,9 +217,9 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) add_favs_to_menu(favmenu, item.hSubMenu, path); } else { + static const WCHAR urlext[] = {'.','u','r','l',0}; WCHAR* fileext; WCHAR* url = NULL; - const WCHAR urlext[] = {'.','u','r','l',0}; if(lstrcmpiW(PathFindExtensionW(filename), urlext)) continue; @@ -250,18 +250,18 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) static void add_tbs_to_menu(HMENU menu) { + static const WCHAR toolbar_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ', + 'E','x','p','l','o','r','e','r','\\', + 'T','o','o','l','b','a','r',0}; HUSKEY toolbar_handle; - WCHAR toolbar_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ', - 'E','x','p','l','o','r','e','r','\\', - 'T','o','o','l','b','a','r',0}; if(SHRegOpenUSKeyW(toolbar_key, KEY_READ, NULL, &toolbar_handle, TRUE) == ERROR_SUCCESS) { + static const WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; HUSKEY classes_handle; - WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; WCHAR guid[39]; DWORD value_len = ARRAY_SIZE(guid); int i;

1 0

Jactry Zeng : mshtml: Load xul with LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 8780a4fa6d1189ef08b761d921682767a17f59d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8780a4fa6d1189ef08b761d9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 30 15:07:05 2018 +0800 mshtml: Load xul with LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9acb0d2..5f6c046 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -496,7 +496,7 @@ static BOOL load_xul(const PRUnichar *gre_path) set_environment(gre_path); - xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + xul_handle = LoadLibraryExW(file_name, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError()); return FALSE;

1 0

Nikolay Sivov : shlwapi: Forward IUnknown_* helpers to shcore.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 24d5e853b20f8fa5b561357bfc6bc64dd182f0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24d5e853b20f8fa5b561357b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 30 13:50:11 2018 +0300 shlwapi: Forward IUnknown_* helpers to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 2 +- dlls/shlwapi/ordinal.c | 146 ++------------------- dlls/shlwapi/shlwapi.spec | 10 +- 3 files changed, 15 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24d5e853b20f8fa5b561…

1 0

Alex Henrie : oledb32: Turn variable 'format' into a static constant.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 4d525212a9cbb8f63587635a3e5b2b9d94248e09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d525212a9cbb8f63587635a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:16 2018 -0700 oledb32: Turn variable 'format' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 5bad105..971e6d9 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -619,7 +619,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { WCHAR szBuff[39]; const GUID *id = (const GUID *)src; - WCHAR format[] = { + static const WCHAR format[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', '%','0','2','X','%','0','2','X','-', '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0};

1 0

Alex Henrie : mscms: Turn variables 'slash' and 'spec' into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: a07e3341252580ca1e5c288755945834479024df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07e3341252580ca1e5c2887… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:09 2018 -0700 mscms: Turn variables 'slash' and 'spec' into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 039a271..a0b9d41 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -668,9 +668,10 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) { + static const WCHAR slash[] = {'\\',0}; BOOL ret; PROFILE profile; - WCHAR path[MAX_PATH], slash[] = {'\\',0}; + WCHAR path[MAX_PATH]; DWORD size = sizeof(path); HANDLE handle; @@ -953,8 +954,8 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { + static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; - WCHAR spec[] = {'\\','*','i','c','m',0}; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; PROFILEHEADER header;

1 0

Alex Henrie : midimap: Turn variable 'throughportW' into a static constant.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: cd485b325226280f1c224b773049a3b66dfe57db URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd485b325226280f1c224b77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:08 2018 -0700 midimap: Turn variable 'throughportW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 290300a..540dac3 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -553,9 +553,9 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, */ static LRESULT MIDIMAP_drvOpen(void) { + static const WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; MIDIOUTCAPSW moc; unsigned dev, i; - WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; BOOL found_valid_port = FALSE; if (midiOutPorts)

1 0

Alex Henrie : hhctrl.ocx: Make constant 'szHTMext' static.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 634637c05766fdec049997c7363f25a22a42caeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=634637c05766fdec049997c7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:05 2018 -0700 hhctrl.ocx: Make constant 'szHTMext' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index d758a1b..0e198b8 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -152,7 +152,7 @@ cleanup: static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, const char *needle) { - const WCHAR szHTMext[] = {'.','h','t','m',0}; + static const WCHAR szHTMext[] = {'.','h','t','m',0}; IEnumSTATSTG *elem = NULL; WCHAR *filename = NULL; STATSTG entries;

1 0

Alexandre Julliard : makefiles: Output rules for building generated .rc files.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 364f97c2e174f5969bbea65a13ba91a83ce6b635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364f97c2e174f5969bbea65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 12:55:18 2018 +0100 makefiles: Output rules for building generated .rc files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 5 ++--- tools/makedep.c | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 85eacb9..d74a279 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -16,7 +16,7 @@ SVG_SRCS = winetest.svg EXTRA_OBJS = build.res -EXTRA_TARGETS = build.rc build.nfo +EXTRA_TARGETS = build.nfo INSTALL_LIB = none @@ -26,8 +26,7 @@ build.rc: dummy build.nfo: -$(CC) -v 2>$@ -build.res: build.rc build.nfo - $(WRC) -o $@ build.rc +build.res: build.nfo dummy: .PHONY: dummy diff --git a/tools/makedep.c b/tools/makedep.c index e2f6d23..1afac8d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1805,7 +1805,9 @@ static struct makefile *parse_makefile( const char *path ) */ static void add_generated_sources( struct makefile *make ) { + unsigned int i; struct incl_file *source, *next, *file; + struct strarray objs = get_expanded_make_var_array( make, "EXTRA_OBJS" ); LIST_FOR_EACH_ENTRY_SAFE( source, next, &make->sources, struct incl_file, entry ) { @@ -1904,6 +1906,16 @@ static void add_generated_sources( struct makefile *make ) add_dependency( file->file, "wine/test.h", INCL_NORMAL ); add_all_includes( make, file, file->file ); } + for (i = 0; i < objs.count; i++) + { + /* default to .c for unknown extra object files */ + if (strendswith( objs.str[i], ".o" )) + add_generated_source( make, objs.str[i], replace_extension( objs.str[i], ".o", ".c" )); + else if (strendswith( objs.str[i], ".res" )) + add_generated_source( make, replace_extension( objs.str[i], ".res", ".rc" ), NULL ); + else + add_generated_source( make, objs.str[i], NULL ); + } } @@ -2514,6 +2526,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c struct strarray extradefs = get_expanded_file_local_var( make, obj, "EXTRADEFS" ); unsigned int i; + if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); strarray_add( &make->object_files, strmake( "%s.res", obj )); if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); @@ -4086,16 +4099,6 @@ static void load_sources( struct makefile *make ) add_generated_sources( make ); - value = get_expanded_make_var_array( make, "EXTRA_OBJS" ); - for (i = 0; i < value.count; i++) - { - /* default to .c for unknown extra object files */ - if (strendswith( value.str[i], ".o" )) - add_generated_source( make, value.str[i], replace_extension( value.str[i], ".o", ".c" ) ); - else - add_generated_source( make, value.str[i], NULL ); - } - LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); }

1 0

Alexandre Julliard : makefiles: Expand more variables into the generated makefiles.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 1fd60d5656d9dda8486f1e4fcf8a45ab2188de43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fd60d5656d9dda8486f1e4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 13:26:36 2018 +0100 makefiles: Expand more variables into the generated makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- tools/makedep.c | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 13b5a5a..5e7ad68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ -SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@srcdir\@,$(srcdir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' +SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) diff --git a/tools/makedep.c b/tools/makedep.c index 355f7fc..6b631b6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -148,11 +148,16 @@ static const char *man_ext; static const char *crosstarget; static const char *fontforge; static const char *convert; +static const char *flex; +static const char *bison; +static const char *ar; +static const char *ranlib; static const char *rsvg; static const char *icotool; static const char *dlltool; static const char *msgfmt; static const char *ln_s; +static const char *sed_cmd; struct makefile { @@ -2492,15 +2497,15 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t$(BISON) -p %s_ -o %s.tab.c -d %s\n", - obj, obj_dir_path( make, obj ), source->filename ); + output( "\t%s -p %s_ -o %s.tab.c -d %s\n", + bison, obj, obj_dir_path( make, obj ), source->filename ); output( "%s.tab.c: %s %s\n", obj_dir_path( make, obj ), source->filename, obj_dir_path( make, header )); strarray_add( &make->clean_files, header ); } else output( "%s.tab.c: %s\n", obj, source->filename ); - output( "\t$(BISON) -p %s_ -o $@ %s\n", obj, source->filename ); + output( "\t%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); } @@ -2510,7 +2515,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co static void output_source_l( struct makefile *make, struct incl_file *source, const char *obj ) { output( "%s.yy.c: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(FLEX) -o$@ %s\n", source->filename ); + output( "\t%s -o$@ %s\n", flex, source->filename ); } @@ -2825,7 +2830,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c strarray_add( &make->in_files, xstrdup(obj) ); strarray_add( &make->all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(SED_CMD) %s >$@ || (rm -f $@ && false)\n", source->filename ); + output( "\t%s %s >$@ || (rm -f $@ && false)\n", sed_cmd, source->filename ); output( "%s:", obj_dir_path( make, obj )); output_filenames( source->dependencies ); output( "\n" ); @@ -3177,9 +3182,9 @@ static void output_static_lib( struct makefile *make ) output( "%s:", obj_dir_path( make, make->staticlib )); output_filenames_obj_dir( make, make->object_files ); output( "\n\trm -f $@\n" ); - output( "\t$(AR) $(ARFLAGS) $@" ); + output( "\t%s rc $@", ar ); output_filenames_obj_dir( make, make->object_files ); - output( "\n\t$(RANLIB) $@\n" ); + output( "\n\t%s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); if (crosstarget && make->module) @@ -3190,7 +3195,7 @@ static void output_static_lib( struct makefile *make ) output( "%s:", obj_dir_path( make, name )); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n\trm -f $@\n" ); - output( "\t%s-ar $(ARFLAGS) $@", crosstarget ); + output( "\t%s-ar rc $@", crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n\t%s-ranlib $@\n", crosstarget ); } @@ -4229,10 +4234,15 @@ int main( int argc, char *argv[] ) crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); convert = get_expanded_make_variable( top_makefile, "CONVERT" ); + flex = get_expanded_make_variable( top_makefile, "FLEX" ); + bison = get_expanded_make_variable( top_makefile, "BISON" ); + ar = get_expanded_make_variable( top_makefile, "AR" ); + ranlib = get_expanded_make_variable( top_makefile, "RANLIB" ); rsvg = get_expanded_make_variable( top_makefile, "RSVG" ); icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); + sed_cmd = get_expanded_make_variable( top_makefile, "SED_CMD" ); ln_s = get_expanded_make_variable( top_makefile, "LN_S" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL;

1 0

Józef Kucia : mfplat: Fix memory allocation in mfsourceresolver_CreateObjectFromByteStream() ( Coverity).
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 7176f9b2d2053b0b6a6f0dcc5d4a7d337ce4eb68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7176f9b2d2053b0b6a6f0dcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 11:19:51 2018 +0100 mfplat: Fix memory allocation in mfsourceresolver_CreateObjectFromByteStream() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 83afb94..c7c3465 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1907,7 +1907,7 @@ static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResol { mfsource *new_object; - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); if (!new_object) return E_OUTOFMEMORY;

1 0