December 2012 - Wine-commits

Frédéric Delanoy : cmd: Remove dead assignments ( clang).
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 5188f08bf426497ea0f17e3f6751320cc11aeaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5188f08bf426497ea0f17e3f6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 19 21:55:40 2012 +0100 cmd: Remove dead assignments (clang). --- programs/cmd/builtins.c | 1 - programs/cmd/wcmdmain.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8715c51..acf0882 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -440,7 +440,6 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app } /* Loop copying data from source to destination until EOF read */ - ok = TRUE; do { char buffer[MAXSTRING]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3884727..d2884c9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1157,8 +1157,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR batExt[] = {'.','b','a','t','\0'}; static const WCHAR cmdExt[] = {'.','c','m','d','\0'}; - launched = TRUE; - /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { BOOL oldinteractive = interactive; @@ -2404,9 +2402,6 @@ int wmain (int argc, WCHAR *argvW[]) * parameters after the /C or /K by pretending there was a single space */ if (argPos == NULL) argPos = (WCHAR *)spaceW; - /* Build the command to execute - It is what is left in argPos */ - len = strlenW(argPos); - /* Take a copy */ cmd = heap_strdupW(argPos);

1 0

Austin English : widl: write_array_element_type shouldn't return a value.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 554a2ccb117817c869ab5643aa5de67b09c3d165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=554a2ccb117817c869ab5643a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 14:55:46 2012 -0600 widl: write_array_element_type shouldn't return a value. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 280bd05..cab4276 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2343,7 +2343,7 @@ static void write_array_element_type(FILE *file, const type_t *type, return; } } - return write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); + write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); } static void write_end(FILE *file, unsigned int *tfsoff)

1 0

Austin English : widl: add_interface_typeinfo should not return a value.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: ecfb6539f6126ee753e9880fadd0d4031552e9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfb6539f6126ee753e9880fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 15:03:10 2012 -0600 widl: add_interface_typeinfo should not return a value. --- tools/widl/write_msft.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 416f81d..918923b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2026,8 +2026,10 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) return; } - if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) - return add_dispinterface_typeinfo(typelib, interface); + if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) { + add_dispinterface_typeinfo(typelib, interface); + return; + } /* midl adds the parent interface first, unless the parent itself has no parent (i.e. it stops before IUnknown). */

1 0

Austin English : winedbg: stack_backtrace should not return a value.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: bc4e1efce30c5c5661ccd314d81824fc8c74fc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4e1efce30c5c5661ccd314d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 15:05:28 2012 -0600 winedbg: stack_backtrace should not return a value. --- programs/winedbg/stack.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 74dcc40..f49480a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -447,7 +447,11 @@ void stack_backtrace(DWORD tid) /* backtrace every thread in every process except the debugger itself, * invoking via "bt all" */ - if (tid == -1) return backtrace_all(); + if (tid == -1) + { + backtrace_all(); + return; + } if (!dbg_curr_process) {

1 0

Frédéric Delanoy : xmllite: Avoid dead initialization (clang).
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 2952db640397f417115a54439e51df1d84e4098e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952db640397f417115a54439… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 20 00:29:19 2012 +0100 xmllite: Avoid dead initialization (clang). --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5c027ef..9e32216 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -449,7 +449,7 @@ static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) { encoded_buffer *buffer = &readerinput->buffer->encoded; - int len = buffer->written; + int len; if (cp == CP_UTF8) len = readerinput_get_utf8_convlen(readerinput);

1 0

Detlef Riekenberg : api-ms-win-downlevel-version-l1-1-0: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: f8c041fef40b573b8f3ebfb33afa0870d37e6e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c041fef40b573b8f3ebfb33… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:49:58 2012 +0100 api-ms-win-downlevel-version-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-version-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 4 ++++ 5 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f852ed9..595ea7d 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po diff --git a/configure.ac b/configure.ac index e05dfe1..6e99a46 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in new file mode 100644 index 0000000..44b316b --- /dev/null +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-version-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec new file mode 100644 index 0000000..e99d8a0 --- /dev/null +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stub GetFileVersionInfoExW +@ stub GetFileVersionInfoSizeExW +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA +@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index e582810..b5937be 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -124,6 +124,10 @@ my @dll_groups = "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ], + [ + "version", + "api-ms-win-downlevel-version-l1-1-0", + ], ); my $update_flags = 0;

1 0

Detlef Riekenberg : api-ms-win-downlevel-user32-l1-1-0: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 5b5e8d9b680e57f2d870b90ce3186b3c5530fcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5e8d9b680e57f2d870b90ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:49:59 2012 +0100 api-ms-win-downlevel-user32-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../api-ms-win-downlevel-user32-l1-1-0/Makefile.in | 3 ++ .../api-ms-win-downlevel-user32-l1-1-0.spec | 22 ++++++++++++++++++++ tools/make_specfiles | 4 +++ 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 595ea7d..7041f83 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test diff --git a/configure.ac b/configure.ac index 6e99a46..fa15fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in new file mode 100644 index 0000000..eca911a --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-user32-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec new file mode 100644 index 0000000..182d964 --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stdcall CharLowerA(str) user32.CharLowerA +@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA +@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW +@ stdcall CharLowerW(wstr) user32.CharLowerW +@ stdcall CharNextA(str) user32.CharNextA +@ stdcall CharNextExA(long str long) user32.CharNextExA +@ stdcall CharNextW(wstr) user32.CharNextW +@ stdcall CharPrevA(str str) user32.CharPrevA +@ stdcall CharPrevExA(long str str long) user32.CharPrevExA +@ stdcall CharPrevW(wstr wstr) user32.CharPrevW +@ stdcall CharUpperA(str) user32.CharUpperA +@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA +@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW +@ stdcall CharUpperW(wstr) user32.CharUpperW +@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA +@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW +@ stdcall IsCharLowerA(long) user32.IsCharLowerA +@ stdcall IsCharLowerW(long) user32.IsCharLowerW +@ stdcall IsCharUpperA(long) user32.IsCharUpperA +@ stdcall IsCharUpperW(long) user32.IsCharUpperW diff --git a/tools/make_specfiles b/tools/make_specfiles index b5937be..20453ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,10 @@ my @dll_groups = "api-ms-win-downlevel-shlwapi-l1-1-0", ], [ + "user32", + "api-ms-win-downlevel-user32-l1-1-0", + ], + [ "version", "api-ms-win-downlevel-version-l1-1-0", ],

1 0

Detlef Riekenberg : api-ms-win-downlevel-normaliz-l1-1-0: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: dcce81854068e054cbc56b6bfc9baa520e43b803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcce81854068e054cbc56b6bf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:50:00 2012 +0100 api-ms-win-downlevel-normaliz-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-normaliz-l1-1-0.spec | 2 ++ tools/make_specfiles | 4 ++++ 5 files changed, 11 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7041f83..a3453fa 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 diff --git a/configure.ac b/configure.ac index fa15fb6..6642d38 100644 --- a/configure.ac +++ b/configure.ac @@ -2530,6 +2530,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in new file mode 100644 index 0000000..0fce8ac --- /dev/null +++ b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-normaliz-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec new file mode 100644 index 0000000..04e68b6 --- /dev/null +++ b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode diff --git a/tools/make_specfiles b/tools/make_specfiles index 20453ba..11157ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -121,6 +121,10 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l1-1-0", ], [ + "kernel32", + "api-ms-win-downlevel-normaliz-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ],

1 0

Detlef Riekenberg : api-ms-win-downlevel-ole32-l1-1-0.dll: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: cdec918b2600cc27296b1b0170ed5994868e513d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdec918b2600cc27296b1b017… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:50:01 2012 +0100 api-ms-win-downlevel-ole32-l1-1-0.dll: Add dll. --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in | 3 + .../api-ms-win-downlevel-ole32-l1-1-0.spec | 48 ++++++++++++++++++++ tools/make_specfiles | 4 ++ 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a3453fa..3c5dccd 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-ole32-l1-1-0 enable_api_ms_win_downlevel_ole32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 diff --git a/configure.ac b/configure.ac index 6642d38..4c2c45f 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-ole32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in new file mode 100644 index 0000000..813b82d --- /dev/null +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-ole32-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec new file mode 100644 index 0000000..a0eabe9 --- /dev/null +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec @@ -0,0 +1,48 @@ +@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID +@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString +@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy +@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler +@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stub CoGetApartmentType +@ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject +@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stub CoGetStdMarshalEx +@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass +@ stdcall CoImpersonateClient() ole32.CoImpersonateClient +@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject +@ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy +@ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter +@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject +@ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket +@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc +@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree +@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc +@ stdcall CoUninitialize() ole32.CoUninitialize +@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface +@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) ole32.CoWaitForMultipleHandles +@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal +@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray +@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream +@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID +@ stdcall PropVariantClear(ptr) ole32.PropVariantClear +@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy +@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 +@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID diff --git a/tools/make_specfiles b/tools/make_specfiles index 11157ad..b24280e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,10 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", ], [ + "ole32", + "api-ms-win-downlevel-ole32-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ],

1 0

Alistair Leslie-Hughes : oleaut32: Don' t output an error when the typelib cannot be found.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: f20427361c77e08ee852b0d304b5e2fef696491e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20427361c77e08ee852b0d30… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 14 14:05:09 2012 +1100 oleaut32: Don't output an error when the typelib cannot be found. --- dlls/oleaut32/typelib.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fa9b050..722b0c4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2544,9 +2544,10 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return S_OK; } } - - hr = E_FAIL; } + + TRACE("No TYPELIB resource found\n"); + hr = E_FAIL; } TLB_PEFile_Release((IUnknown *)&This->lpvtbl); @@ -2949,8 +2950,6 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TYPE_E_CANTLOADLIBRARY; IUnknown_Release(pFile); } - else - ret = TYPE_E_CANTLOADLIBRARY; if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; @@ -2966,8 +2965,15 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath list_add_head(&tlb_cache, &impl->entry); LeaveCriticalSection(&cache_section); ret = S_OK; - } else - ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + } + else + { + if(ret != E_FAIL) + ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + + ret = TYPE_E_CANTLOADLIBRARY; + } + return ret; }

1 0