wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Michael Stefaniuc : wscript: Use wide-char string literals.
by Alexandre Julliard 04 Nov '20

04 Nov '20

Module: wine Branch: master Commit: 4e3c4d6f1d4bf7085581b63f124d137769785cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e3c4d6f1d4bf7085581b63f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:33 2020 +0100 wscript: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 12 +++--------- programs/wscript/main.c | 30 +++++++++--------------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 315b8ac7234..9541994d3b0 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); #define BUILDVERSION 16535 - -static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; VARIANT_BOOL wshInteractive = @@ -49,10 +47,8 @@ static HRESULT to_string(VARIANT *src, BSTR *dst) VARIANT v; HRESULT hres; - static const WCHAR nullW[] = {'n','u','l','l',0}; - if(V_VT(src) == VT_NULL) { - *dst = SysAllocString(nullW); + *dst = SysAllocString(L"null"); return *dst ? S_OK : E_OUTOFMEMORY; } @@ -73,9 +69,7 @@ static void print_string(const WCHAR *string) char *buf; if(wshInteractive) { - static const WCHAR windows_script_hostW[] = - {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; - MessageBoxW(NULL, string, windows_script_hostW, MB_OK); + MessageBoxW(NULL, string, L"Windows Script Host", MB_OK); return; } @@ -163,7 +157,7 @@ static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name) { WINE_TRACE("(%p)\n", out_Name); - if(!(*out_Name = SysAllocString(wshNameW))) + if(!(*out_Name = SysAllocString(L"Windows Script Host"))) return E_OUTOFMEMORY; return S_OK; } diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 8a8036073bd..a7005a9289c 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -47,9 +47,6 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(wscript); - -static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; -static const WCHAR wshW[] = {'W','S','H',0}; WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; @@ -86,7 +83,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, { WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); - if(lstrcmpW(pstrName, wshW) && lstrcmpW(pstrName, wscriptW)) + if(lstrcmpW(pstrName, L"WSH") && lstrcmpW(pstrName, L"WScript")) return E_FAIL; if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { @@ -223,9 +220,7 @@ static BOOL load_typelib(void) ITypeLib *typelib; HRESULT hres; - static const WCHAR wscript_exeW[] = {'w','s','c','r','i','p','t','.','e','x','e',0}; - - hres = LoadTypeLib(wscript_exeW, &typelib); + hres = LoadTypeLib(L"wscript.exe", &typelib); if(FAILED(hres)) return FALSE; @@ -245,9 +240,6 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) HKEY hkey; HRESULT hres; - static const WCHAR script_engineW[] = - {'\\','S','c','r','i','p','t','E','n','g','i','n','e',0}; - res = RegOpenKeyW(HKEY_CLASSES_ROOT, ext, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -260,7 +252,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) WINE_TRACE("fileid is %s\n", wine_dbgstr_w(fileid)); - lstrcatW(fileid, script_engineW); + lstrcatW(fileid, L"\\ScriptEngine"); res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -319,11 +311,11 @@ static BOOL init_engine(IActiveScript *script, IActiveScriptParse *parser) if(FAILED(hres)) return FALSE; - hres = IActiveScript_AddNamedItem(script, wscriptW, SCRIPTITEM_ISVISIBLE); + hres = IActiveScript_AddNamedItem(script, L"WScript", SCRIPTITEM_ISVISIBLE); if(FAILED(hres)) return FALSE; - hres = IActiveScript_AddNamedItem(script, wshW, SCRIPTITEM_ISVISIBLE); + hres = IActiveScript_AddNamedItem(script, L"WSH", SCRIPTITEM_ISVISIBLE); if(FAILED(hres)) return FALSE; @@ -387,10 +379,6 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri static BOOL set_host_properties(const WCHAR *prop) { - static const WCHAR nologoW[] = {'n','o','l','o','g','o',0}; - static const WCHAR iactive[] = {'i',0}; - static const WCHAR batch[] = {'b',0}; - if(*prop == '/') { ++prop; if(*prop == '/') @@ -399,12 +387,12 @@ static BOOL set_host_properties(const WCHAR *prop) else ++prop; - if(wcsicmp(prop, iactive) == 0) + if(wcsicmp(prop, L"i") == 0) wshInteractive = VARIANT_TRUE; - else if(wcsicmp(prop, batch) == 0) + else if(wcsicmp(prop, L"b") == 0) wshInteractive = VARIANT_FALSE; - else if(wcsicmp(prop, nologoW) == 0) - WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); + else if(wcsicmp(prop, L"nologo") == 0) + WINE_FIXME("ignored %s switch\n", debugstr_w(L"nologo")); else { WINE_FIXME("unsupported switch %s\n", debugstr_w(prop));

1 0

Austin English : dpnsvr: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 908c837b17ac1c285ef32e98f53df730c3770295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=908c837b17ac1c285ef32e98… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:49 2020 -0500 dpnsvr: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dpnsvr/Makefile.in | 2 ++ programs/dpnsvr/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in index 9bcf4ad2ac1..bced5ca06dd 100644 --- a/programs/dpnsvr/Makefile.in +++ b/programs/dpnsvr/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = version.rc diff --git a/programs/dpnsvr/version.rc b/programs/dpnsvr/version.rc new file mode 100644 index 00000000000..c740736243f --- /dev/null +++ b/programs/dpnsvr/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpnsvr" +#define WINE_FILENAME_STR "dpnsvr.dll" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : strmdll: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: bc1d3e67b175e7c8d23d0361a8e06abd314c72bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc1d3e67b175e7c8d23d0361… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:48 2020 -0500 strmdll: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmdll/Makefile.in | 2 ++ dlls/strmdll/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in index 2eded8bf433..f710169b6ab 100644 --- a/dlls/strmdll/Makefile.in +++ b/dlls/strmdll/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = version.rc diff --git a/dlls/strmdll/version.rc b/dlls/strmdll/version.rc new file mode 100644 index 00000000000..eebae122c80 --- /dev/null +++ b/dlls/strmdll/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine strmdll" +#define WINE_FILENAME_STR "strmdll.dll" +#define WINE_FILEVERSION 4,1,0,3936 +#define WINE_FILEVERSION_STR "4.1.0.3936" +#define WINE_PRODUCTVERSION 4,1,0,3936 +#define WINE_PRODUCTVERSION_STR "4.1.0.3936" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : qdvd: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 4afaddda71a1ae55c74884468b4d55619a3225d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4afaddda71a1ae55c7488446… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:47 2020 -0500 qdvd: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 2 ++ dlls/qdvd/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index 364a81e6378..bda22a79074 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ IDL_SRCS = \ qdvd_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qdvd/version.rc b/dlls/qdvd/version.rc new file mode 100644 index 00000000000..40259b7f027 --- /dev/null +++ b/dlls/qdvd/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qdvd" +#define WINE_FILENAME_STR "qdvd.dll" +#define WINE_FILEVERSION 6,5,1,904 +#define WINE_FILEVERSION_STR "6.5.1.904" +#define WINE_PRODUCTVERSION 6,5,1,904 +#define WINE_PRODUCTVERSION_STR "6.5.1.904" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : ksuser: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: c205840f5b6725b772f4563b559fbbfe70bf5db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c205840f5b6725b772f4563b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:46 2020 -0500 ksuser: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksuser/Makefile.in | 2 ++ dlls/ksuser/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ksuser/Makefile.in b/dlls/ksuser/Makefile.in index 6674a680f24..c5e8251fb23 100644 --- a/dlls/ksuser/Makefile.in +++ b/dlls/ksuser/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = version.rc diff --git a/dlls/ksuser/version.rc b/dlls/ksuser/version.rc new file mode 100644 index 00000000000..7cb006bdbfd --- /dev/null +++ b/dlls/ksuser/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ksuser" +#define WINE_FILENAME_STR "ksuser.dll" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : ksproxy.ax: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 22fbf7f3241c087ce60f4080163f84cd208769fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=22fbf7f3241c087ce60f4080… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:45 2020 -0500 ksproxy.ax: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksproxy.ax/Makefile.in | 2 ++ dlls/ksproxy.ax/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ksproxy.ax/Makefile.in b/dlls/ksproxy.ax/Makefile.in index db6565855d3..efc24e78cc0 100644 --- a/dlls/ksproxy.ax/Makefile.in +++ b/dlls/ksproxy.ax/Makefile.in @@ -1,3 +1,5 @@ MODULE = ksproxy.ax EXTRADLLFLAGS = -mno-cygwin + +RC_SRCS = version.rc diff --git a/dlls/ksproxy.ax/version.rc b/dlls/ksproxy.ax/version.rc new file mode 100644 index 00000000000..340f8a47e77 --- /dev/null +++ b/dlls/ksproxy.ax/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ksproxy.ax" +#define WINE_FILENAME_STR "ksproxy.ax" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dx8vb: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 3ff1686c442935a101aec4e34aae9ae99c58676e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff1686c442935a101aec4e3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:44 2020 -0500 dx8vb: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 ++ dlls/dx8vb/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index c11eb9ef428..727265c6983 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -7,3 +7,5 @@ C_SRCS = \ main.c IDL_SRCS = dx8vb.idl + +RC_SRCS = version.rc diff --git a/dlls/dx8vb/version.rc b/dlls/dx8vb/version.rc new file mode 100644 index 00000000000..b87d8f8ad96 --- /dev/null +++ b/dlls/dx8vb/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dx8vb" +#define WINE_FILENAME_STR "dx8vb.dll" +#define WINE_FILEVERSION 5,3,1,902 +#define WINE_FILEVERSION_STR "5.3.1.902" +#define WINE_PRODUCTVERSION 5,3,1,902 +#define WINE_PRODUCTVERSION_STR "5.3.1.902" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dpwsockx: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: dd54a699ea9b7378773549ea508f54ed9bb14f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd54a699ea9b7378773549ea… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:43 2020 -0500 dpwsockx: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 2 ++ dlls/dpwsockx/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 5ed3c7e5e50..5a386a7ac88 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -5,3 +5,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ dpwsockx_main.c + +RC_SRCS = version.rc diff --git a/dlls/dpwsockx/version.rc b/dlls/dpwsockx/version.rc new file mode 100644 index 00000000000..f7db0b69433 --- /dev/null +++ b/dlls/dpwsockx/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpwsockx" +#define WINE_FILENAME_STR "dpwsockx.dll" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : ddrawex: Add version resource.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 1940bc2ae0c98c119e818b4a3c1b966cc1486f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1940bc2ae0c98c119e818b4a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 29 05:00:42 2020 -0500 ddrawex: Add version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/Makefile.in | 2 ++ dlls/ddrawex/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in index fc4a50bbab7..056f90a222f 100644 --- a/dlls/ddrawex/Makefile.in +++ b/dlls/ddrawex/Makefile.in @@ -9,3 +9,5 @@ C_SRCS = \ surface.c IDL_SRCS = ddrawex.idl + +RC_SRCS = version.rc diff --git a/dlls/ddrawex/version.rc b/dlls/ddrawex/version.rc new file mode 100644 index 00000000000..b58c91950ff --- /dev/null +++ b/dlls/ddrawex/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ddrawex" +#define WINE_FILENAME_STR "ddrawex.dll" +#define WINE_FILEVERSION 5,3,0,900 +#define WINE_FILEVERSION_STR "5.3.0.900" +#define WINE_PRODUCTVERSION 5,3,0,900 +#define WINE_PRODUCTVERSION_STR "5.3.0.900" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : jscript: Fix allocation size in BindFunction_call.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: d39e3d8762dcce81434114aef02142866ad5ddb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39e3d8762dcce81434114ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 11:31:40 2020 +0100 jscript: Fix allocation size in BindFunction_call. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index e43d19464bb..6361eefc677 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -836,7 +836,7 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDis call_argc = function->argc + argc; if(call_argc) { - call_args = heap_alloc(function->argc * sizeof(*function->args)); + call_args = heap_alloc(call_argc * sizeof(*call_args)); if(!call_args) return E_OUTOFMEMORY;

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020