wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Nikolay Sivov : ntdll/tests: Tests for RtlHashUnicodeString().
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 173b834b4ae81349794ffb5dd88c0cabfb903b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173b834b4ae81349794ffb5dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 16 12:52:39 2013 +0400 ntdll/tests: Tests for RtlHashUnicodeString(). --- dlls/ntdll/tests/rtlstr.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 5205089..69f2586 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -30,6 +30,9 @@ #include "winnls.h" #include "guiddef.h" +#define HASH_STRING_ALGORITHM_X65599 1 +#define HASH_STRING_ALGORITHM_INVALID 0xffffffff + /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); @@ -64,6 +67,7 @@ static NTSTATUS (WINAPI *pRtlValidateUnicodeString)(LONG, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlGUIDFromString)(const UNICODE_STRING*,GUID*); static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); static BOOLEAN (WINAPI *pRtlIsTextUnicode)(LPVOID, INT, INT *); +static NTSTATUS (WINAPI *pRtlHashUnicodeString)(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); /*static VOID (WINAPI *pRtlFreeOemString)(PSTRING);*/ /*static VOID (WINAPI *pRtlCopyUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *);*/ @@ -132,10 +136,10 @@ static void InitFunctionPtrs(void) pRtlGUIDFromString = (void *)GetProcAddress(hntdll, "RtlGUIDFromString"); pRtlStringFromGUID = (void *)GetProcAddress(hntdll, "RtlStringFromGUID"); pRtlIsTextUnicode = (void *)GetProcAddress(hntdll, "RtlIsTextUnicode"); + pRtlHashUnicodeString = (void*)GetProcAddress(hntdll, "RtlHashUnicodeString"); } } - static void test_RtlInitString(void) { static const char teststring[] = "Some Wild String"; @@ -1867,6 +1871,70 @@ static void test_RtlStringFromGUID(void) pRtlFreeUnicodeString(&str); } +struct hash_unicodestring_test { + WCHAR str[50]; + BOOLEAN case_insensitive; + ULONG hash; +}; + +static const struct hash_unicodestring_test hash_test[] = { + { {'T',0}, FALSE, 0x00000054 }, + { {'T','e','s','t',0}, FALSE, 0x766bb952 }, + { {'T','e','S','t',0}, FALSE, 0x764bb172 }, + { {'t','e','s','t',0}, FALSE, 0x4745d132 }, + { {'t','e','s','t',0}, TRUE, 0x6689c132 }, + { {'T','E','S','T',0}, TRUE, 0x6689c132 }, + { {'T','E','S','T',0}, FALSE, 0x6689c132 }, + { {'a','b','c','d','e','f',0}, FALSE, 0x971318c3 }, + { { 0 } } +}; + +static void test_RtlHashUnicodeString(void) +{ + static const WCHAR strW[] = {'T','e','s','t',0,'1',0}; + const struct hash_unicodestring_test *ptr; + UNICODE_STRING str; + NTSTATUS status; + ULONG hash; + + if (!pRtlHashUnicodeString) + { + skip("RtlHashUnicodeString is not available\n"); + return; + } + + status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + RtlInitUnicodeString(&str, strW); + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_INVALID, &hash); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + /* embedded null */ + str.Buffer = (PWSTR)strW; + str.Length = sizeof(strW) - sizeof(WCHAR); + str.MaximumLength = sizeof(strW); + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_SUCCESS, "got status 0x%08x\n", status); + ok(hash == 0x32803083, "got 0x%08x\n", hash); + + ptr = hash_test; + while (*ptr->str) + { + RtlInitUnicodeString(&str, ptr->str); + hash = 0; + status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); + ok(hash == ptr->hash, "got wrong hash 0x%08x, expected 0x%08x, for %s, mode %d\n", hash, ptr->hash, + wine_dbgstr_w(ptr->str), ptr->case_insensitive); + + ptr++; + } +} + START_TEST(rtlstr) { InitFunctionPtrs(); @@ -1905,4 +1973,5 @@ START_TEST(rtlstr) test_RtlUpcaseUnicodeString(); test_RtlDowncaseUnicodeString(); } + test_RtlHashUnicodeString(); }

1 0

Francois Gouget : windowscodecs: Autoconf macros don't always have a value.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 9f90ec8dea4a2b745263c689f8015e5fb2b285c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f90ec8dea4a2b745263c689f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 16 12:28:20 2013 +0200 windowscodecs: Autoconf macros don't always have a value. --- dlls/windowscodecs/pngformat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1708580..065b5b8 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -176,7 +176,7 @@ MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); -#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 +#ifdef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); #else MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); @@ -225,7 +225,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); -#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 +#ifdef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); #else LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); @@ -467,7 +467,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p { if (bit_depth < 8) { -#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 +#ifdef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 ppng_set_expand_gray_1_2_4_to_8(This->png_ptr); #else ppng_set_gray_1_2_4_to_8(This->png_ptr);

1 0

Alexandre Julliard : widl: Fix typo in man page.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: a93ee68f2eaf9cec033c328b24a606a06f49b0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93ee68f2eaf9cec033c328b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 19 11:53:17 2013 +0200 widl: Fix typo in man page. --- tools/widl/widl.man.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 7e9b9fe..473bfac 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -97,7 +97,7 @@ names. The default output filename is \fBdlldata.c\fR. .IP "\fB-I \fIpath\fR" Add a header search directory to path. Multiple search directories are allowed. -.IP "\fB-D \fIid\fR[\f\fB=\fIval\fR]" +.IP "\fB-D \fIid\fR[\fB=\fIval\fR]" Define preprocessor macro \fIid\fR with value \fIval\fR. .IP "\fB-E\fR" Preprocess only.

1 0

Marcus Meissner : winecfg: Free result in error nodes (Coverity).
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: a7cc44a6dbc279849a99d69111a8b86ede0b7e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cc44a6dbc279849a99d6911… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jul 15 21:49:15 2013 +0200 winecfg: Free result in error nodes (Coverity). --- programs/winecfg/winecfg.h | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index e8289ea..b031497 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -154,7 +154,11 @@ static inline char *get_text(HWND dialog, WORD id) HWND item = GetDlgItem(dialog, id); int len = GetWindowTextLengthA(item) + 1; char *result = len ? HeapAlloc(GetProcessHeap(), 0, len) : NULL; - if (!result || GetWindowTextA(item, result, len) == 0) return NULL; + if (!result) return NULL; + if (GetWindowTextA(item, result, len) == 0) { + HeapFree (GetProcessHeap(), 0, result); + return NULL; + } return result; } @@ -163,7 +167,11 @@ static inline WCHAR *get_textW(HWND dialog, WORD id) HWND item = GetDlgItem(dialog, id); int len = GetWindowTextLengthW(item) + 1; WCHAR *result = len ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL; - if (!result || GetWindowTextW(item, result, len) == 0) return NULL; + if (!result) return NULL; + if(GetWindowTextW(item, result, len) == 0) { + HeapFree (GetProcessHeap(), 0, result); + return NULL; + } return result; }

1 0

Marcus Meissner : xcopy: fclose filedescriptor on eof case (Coverity).
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: ba7b56b22518f6e1c68267e25f3f29a320a38d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7b56b22518f6e1c68267e25… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jul 15 21:33:32 2013 +0200 xcopy: fclose filedescriptor on eof case (Coverity). --- programs/xcopy/xcopy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 7a68831..f894b0e 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -291,6 +291,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { if (!feof(inFile)) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); *endOfName = endChar; + fclose(inFile); return TRUE; }

1 0

Frédéric Delanoy : winelib: Use proper entity escaping for '&', '<' and '>'.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: docs Branch: master Commit: 809f1fc52540a9d1ff92b357957704e4aac80b56 URL: http://source.winehq.org/git/docs.git/?a=commit;h=809f1fc52540a9d1ff92b3579… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 18 22:34:00 2013 +0200 winelib: Use proper entity escaping for '&','<' and '>'. --- en/winelib-toolkit.sgml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index fb1844b..40f8ce5 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -353,7 +353,7 @@ WRCFLAGS = -r -L .SUFFIXES: .rc .res .rc.res: - $(WRC) $(WRCFLAGS) $(WINELIB_FLAGS) -o $@ $< + $(WRC) $(WRCFLAGS) $(WINELIB_FLAGS) -o $@ $< </programlisting> <para> There are two issues you are likely to encounter with resource files. @@ -390,7 +390,7 @@ WRCFLAGS = -r -L </para> <programlisting> .rc.res: - $(CC) $(CC_OPTS) -DRC_INVOKED -E -x c $< | $(WRC) -N $(WRCFLAGS) $(WINELIB_FLAGS) -o $@ + $(CC) $(CC_OPTS) -DRC_INVOKED -E -x c $< | $(WRC) -N $(WRCFLAGS) $(WINELIB_FLAGS) -o $@ </programlisting>

1 0

Frédéric Delanoy : wineusr: Use proper entity escaping for '&', '<' and '>'.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: docs Branch: master Commit: fbad10eacde8db2a3ce306cb6f72a2594dcdcf49 URL: http://source.winehq.org/git/docs.git/?a=commit;h=fbad10eacde8db2a3ce306cb6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 18 22:33:59 2013 +0200 wineusr: Use proper entity escaping for '&','<' and '>'. --- en/wineusr-bugs.sgml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 4ed4f99..19ebd4d 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -44,7 +44,7 @@ , <command>wine ~/.wine/drive_c/full/path/to/prg.exe</command> and - <command>cd ~/.wine/drive_c/full/path/to/ && wine prg.exe</command> + <command>cd ~/.wine/drive_c/full/path/to/ && wine prg.exe</command> </para> </sect2> @@ -273,7 +273,7 @@ Create an attachment with full terminal output in a text file. <literallayout> <command>cd ~/.wine/drive_c/Games/Tron</command> - <command>wine tron.exe &> log.txt</command> + <command>wine tron.exe &> log.txt</command> </literallayout> </para> </listitem> @@ -295,7 +295,7 @@ <para> You may be asked to re-run the program with the WINEDEBUG environment variable <parameter> WINEDEBUG=+relay,+seh,+tid</parameter> option (e.g. <command>WINEDEBUG=+relay,+seh,+tid - wine sol.exe &> log.txt</command>). + wine sol.exe &> log.txt</command>). </para> <para> This will produce additional information which may include the cause

1 0

Frédéric Delanoy : winedev: Use proper entity escaping for '&', '<' and '>'.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: docs Branch: master Commit: da3cd80b568540c37297f8254211f79820a7f5e2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=da3cd80b568540c37297f8254… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 18 22:33:58 2013 +0200 winedev: Use proper entity escaping for '&','<' and '>'. --- en/winedev-architecture.sgml | 6 +++--- en/winedev-debugger.sgml | 18 +++++++++--------- en/winedev-debugging.sgml | 14 +++++++------- en/winedev-documentation.sgml | 4 ++-- en/winedev-kernel.sgml | 4 ++-- en/winedev-multimedia.sgml | 10 +++++----- en/winedev-otherdebug.sgml | 12 ++++++------ en/winedev-testing.sgml | 4 ++-- 8 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=da3cd80b568540c37297f…

1 0

Frédéric Delanoy : winedev: Avoid empty end tags.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: docs Branch: master Commit: 4057acb5b83bd4db225e60bbef969689de115f33 URL: http://source.winehq.org/git/docs.git/?a=commit;h=4057acb5b83bd4db225e60bbe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 18 00:48:31 2013 +0200 winedev: Avoid empty end tags. --- en/winedev-debugger.sgml | 28 ++++---- en/winedev-documentation.sgml | 4 +- en/winedev-kernel.sgml | 2 +- en/winedev-testing.sgml | 135 +++++++++++++++++++++-------------------- 4 files changed, 85 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=4057acb5b83bd4db225e6…

1 0

Frédéric Delanoy : winelib: Avoid empty end tags.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: docs Branch: master Commit: fd8962ce6c768f02a8d14cb2f5345d20590df91b URL: http://source.winehq.org/git/docs.git/?a=commit;h=fd8962ce6c768f02a8d14cb2f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 18 00:48:32 2013 +0200 winelib: Avoid empty end tags. --- en/winelib-intro.sgml | 2 +- en/winelib-toolkit.sgml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index 32342d9..8a6fe38 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -326,7 +326,7 @@ <listitem> <para> The <option>-i</option> specifies a Winelib library to - import via the <link linkend="spec-file">spec file</> + import via the <link linkend="spec-file">spec file</link> mechanism. Contrast this with the <option>-l</option> which specifies a Unix library to link with. The other options work the same way they would with a C diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 3617c1c..fb1844b 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -145,8 +145,8 @@ you can guess at the items that winemaker may get wrong in this phase: macro definitions, include path, DLL path, DLLs to import, library path, libraries to link with. You can deal with - these issues by using winemaker <option>-D</>, <option>-P</>, - <option>-i</>, <option>-I</>, <option>-L</> and <option>-l</> + these issues by using winemaker <option>-D</option>, <option>-P</option>, + <option>-i</option>, <option>-I</option>, <option>-L</option> and <option>-l</option> options if they are homogeneous enough between all your targets. Otherwise you may want to use winemaker <link linkend="interactive">interactive @@ -171,9 +171,9 @@ <para> The target is not importing the right set of DLLs, or is not being linked with the right set of libraries. You can avoid - this by using winemaker <option>-P</>, <option>-i</>, - <option>-L</option> and <option>-l</> options or adding these - DLLs and libraries to the <filename>Makefile</>. + this by using winemaker <option>-P</option>, <option>-i</option>, + <option>-L</option> and <option>-l</option> options or adding these + DLLs and libraries to the <filename>Makefile</filename>. </para> </listitem> <listitem> @@ -239,13 +239,13 @@ LIBRARIES = </programlisting> <para> This section contains the global compilation settings: they apply - to all the targets in this makefile. The <varname>LIBRARIES</> + to all the targets in this makefile. The <varname>LIBRARIES</varname> variable allows you to specify additional Unix libraries to link with. Note that you would normally not specify Winelib libraries - there. To link with a Winelib library, one uses <varname>DLL_IMPORTS</>. + there. To link with a Winelib library, one uses <varname>DLL_IMPORTS</varname>. The exception is for C++ libraries where you currently don't have a choice but to link with them in the Unix sense. One library you are - likely to find here is <literal>mfc</>. + likely to find here is <literal>mfc</literal>. </para> <para> The other variable @@ -286,7 +286,7 @@ hello_exe_LIBRARIES = add to the global settings we saw at the beginning of this file. </para> <para> - The <varname>DLLS</> field is where you would enumerate the list of + The <varname>DLLS</varname> field is where you would enumerate the list of DLLs that executable imports. It should contain the full DLL name , but not the '-l' option. </para>

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
45
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 July 2013