July 2011 - Wine-Commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add tests for || on failure conditional execution.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 3d9245830f1739781797cd07bb52dc159715897a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9245830f1739781797cd07b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 23 15:34:22 2011 +0200 cmd/tests: Add tests for || on failure conditional execution. --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a4b4594..d94c3e7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -113,6 +113,13 @@ if exist foo3 ( del foo3 ) else echo foo3 not created echo bar4 && echo foo4 +echo ...on failure conditional ^|^| +call :setError 789 || echo foo5 +echo foo6 || echo bar6 > bar6 +if exist bar6 ( + echo bar6 created + del bar6 +) echo ------------ Testing type ------------ echo bar> foobaz diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index de98364..6e842b8 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -100,6 +100,9 @@ foo2 @todo_wine(a)foo3 not created bar4(a)space@ foo4 +(a)todo_wine@...on failure conditional || +(a)todo_wine@foo5 +(a)todo_wine@foo6(a)space@ ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Frédéric Delanoy : cmd/tests: Add tests for && on success conditional execution.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 73413693d6e964f33b4fdf4dbfb1686e969ea39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73413693d6e964f33b4fdf4db… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 23 15:34:21 2011 +0200 cmd/tests: Add tests for && on success conditional execution. --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 88c7c75..a4b4594 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -106,6 +106,13 @@ if exist foobazbar ( cd .. rd /s/q foobar ) else echo foobar deleted +echo ...on success conditional ^&^& +call :setError 456 && echo foo3 > foo3 +if exist foo3 ( + echo foo3 created + del foo3 +) else echo foo3 not created +echo bar4 && echo foo4 echo ------------ Testing type ------------ echo bar> foobaz diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1c56629..de98364 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -96,6 +96,10 @@ foo1 bar2(a)space@ foo2 @todo_wine(a)foobar deleted +(a)todo_wine@...on success conditional && +(a)todo_wine@foo3 not created +bar4(a)space@ +foo4 ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Frédéric Delanoy : urlmon: Fix various typos/ misspellings.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: d1e15baca7133e3b672443f3b2ff7b209d939f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e15baca7133e3b672443f3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 23 09:14:25 2011 +0200 urlmon: Fix various typos/misspellings. --- dlls/urlmon/uri.c | 120 ++++++++++++++++++++++++++-------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1e15baca7133e3b67244…

1 0

Huw Davies : gdi32/tests: Add some SetDIBits tests.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 046ec2d13238c0420411bf716a162fe9b93dbb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046ec2d13238c0420411bf716… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 25 10:56:31 2011 +0100 gdi32/tests: Add some SetDIBits tests. --- dlls/gdi32/tests/bitmap.c | 375 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 375 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=046ec2d13238c0420411b…

1 0

Huw Davies : gdi32: Rewrite SetDIBits to use the PutImage gdi driver function.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 3cb26488bdee73c39c04f8644d83bddca1bea141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb26488bdee73c39c04f8644… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 25 10:56:30 2011 +0100 gdi32: Rewrite SetDIBits to use the PutImage gdi driver function. --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dib.c | 252 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/gdi_private.h | 2 + 3 files changed, 253 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cb26488bdee73c39c04f…

1 0

Alexandre Julliard : shlwapi: Add support for 64-bit formats in wsprintf.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 2bf9c26df630525024e6b3ed0c1ce73f52b80cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf9c26df630525024e6b3ed0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 13:38:04 2011 +0200 shlwapi: Add support for 64-bit formats in wsprintf. --- dlls/shlwapi/wsprintf.c | 72 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 57 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index 26bca5d..1093393 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); #define WPRINTF_SHORT 0x0010 /* Short arg ('h' prefix) */ #define WPRINTF_UPPER_HEX 0x0020 /* Upper-case hex ('X' specifier) */ #define WPRINTF_WIDE 0x0040 /* Wide arg ('w' prefix) */ +#define WPRINTF_INTPTR 0x0080 /* Pointer-size arg ('I' prefix) */ +#define WPRINTF_I64 0x0100 /* 64-bit arg ('I64' prefix) */ typedef enum { @@ -65,11 +67,11 @@ typedef struct } WPRINTF_FORMAT; typedef union { - WCHAR wchar_view; - CHAR char_view; - LPCSTR lpcstr_view; - LPCWSTR lpcwstr_view; - INT int_view; + WCHAR wchar_view; + CHAR char_view; + LPCSTR lpcstr_view; + LPCWSTR lpcwstr_view; + LONGLONG int_view; } WPRINTF_DATA; static const CHAR null_stringA[] = "(null)"; @@ -111,6 +113,12 @@ static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res ) if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; } else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; } else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; } + else if (*p == 'I') + { + if (p[1] == '6' && p[2] == '4') { res->flags |= WPRINTF_I64; p += 3; } + else if (p[1] == '3' && p[2] == '2') p += 3; + else { res->flags |= WPRINTF_INTPTR; p++; } + } switch(*p) { case 'c': @@ -132,6 +140,10 @@ static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res ) case 'u': res->type = WPR_UNSIGNED; break; + case 'p': + res->width = 2 * sizeof(void *); + res->flags |= WPRINTF_ZEROPAD | WPRINTF_INTPTR; + /* fall through */ case 'X': res->flags |= WPRINTF_UPPER_HEX; /* fall through */ @@ -183,7 +195,13 @@ static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res ) if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; } else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; } else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; } - switch((CHAR)*p) + else if (*p == 'I') + { + if (p[1] == '6' && p[2] == '4') { res->flags |= WPRINTF_I64; p += 3; } + else if (p[1] == '3' && p[2] == '2') p += 3; + else { res->flags |= WPRINTF_INTPTR; p++; } + } + switch(*p) { case 'c': res->type = (res->flags & WPRINTF_SHORT) ? WPR_CHAR : WPR_WCHAR; @@ -204,6 +222,10 @@ static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res ) case 'u': res->type = WPR_UNSIGNED; break; + case 'p': + res->width = 2 * sizeof(void *); + res->flags |= WPRINTF_ZEROPAD | WPRINTF_INTPTR; + /* fall through */ case 'X': res->flags |= WPRINTF_UPPER_HEX; /* fall through */ @@ -247,16 +269,32 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, if (len > maxlen) len = maxlen; return (format->precision = len); case WPR_SIGNED: - len = sprintf( number, "%d", arg->int_view ); - break; case WPR_UNSIGNED: - len = sprintf( number, "%u", (UINT)arg->int_view ); - break; case WPR_HEXA: - len = sprintf( number, - (format->flags & WPRINTF_UPPER_HEX) ? "%X" : "%x", - (UINT)arg->int_view); + { + const char *digits = (format->flags & WPRINTF_UPPER_HEX) ? "0123456789ABCDEF" : "0123456789abcdef"; + ULONGLONG num = arg->int_view; + int base = format->type == WPR_HEXA ? 16 : 10; + char buffer[20], *p = buffer, *dst = number; + + if (format->type == WPR_SIGNED && arg->int_view < 0) + { + *dst++ = '-'; + num = -arg->int_view; + } + if (format->flags & WPRINTF_INTPTR) num = (UINT_PTR)num; + else if (!(format->flags & WPRINTF_I64)) num = (UINT)num; + + do + { + *p++ = digits[num % base]; + num /= base; + } while (num); + while (p > buffer) *dst++ = *(--p); + *dst = 0; + len = dst - number; break; + } default: return 0; } @@ -318,7 +356,9 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + if (format.flags & WPRINTF_INTPTR) argData.int_view = va_arg(args, INT_PTR); + else if (format.flags & WPRINTF_I64) argData.int_view = va_arg(args, LONGLONG); + else argData.int_view = va_arg(args, INT); break; default: argData.wchar_view = 0; @@ -423,7 +463,9 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + if (format.flags & WPRINTF_INTPTR) argData.int_view = va_arg(args, INT_PTR); + else if (format.flags & WPRINTF_I64) argData.int_view = va_arg(args, LONGLONG); + else argData.int_view = va_arg(args, INT); break; default: argData.wchar_view = 0;

1 0

Nikolay Sivov : shell32/autocomplete: Autocompletion should be case insensitive for string comparison.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 2210e9bbf01a0d7758e2afa17dbf4338e1407e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2210e9bbf01a0d7758e2afa17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 23 12:40:56 2011 +0400 shell32/autocomplete: Autocompletion should be case insensitive for string comparison. --- dlls/shell32/autocomplete.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index af450ba..fa80713 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -589,7 +589,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (hr != S_OK) break; - if (strstrW(strs, hwndText) == strs) { + if (StrStrIW(strs, hwndText) == strs) { if (!filled && (This->options & ACO_AUTOAPPEND)) { SetWindowTextW(hwnd, strs); SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs));

1 0

Nikolay Sivov : shell32/autocomplete: Really append suggested part instead of replacing whole string.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 5354b974a1a6ce503faf6c25a0f415b21f8a0a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5354b974a1a6ce503faf6c25a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 24 22:42:25 2011 +0400 shell32/autocomplete: Really append suggested part instead of replacing whole string. --- dlls/shell32/autocomplete.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index fa80713..2c59207 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,7 +486,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: - GetWindowTextW( hwnd, hwndText, 255); + GetWindowTextW( hwnd, hwndText, sizeof(hwndText)/sizeof(WCHAR)); switch(wParam) { case VK_RETURN: @@ -591,11 +591,16 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (StrStrIW(strs, hwndText) == strs) { if (!filled && (This->options & ACO_AUTOAPPEND)) { - SetWindowTextW(hwnd, strs); - SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs)); + INT typed_length = strlenW(hwndText); + WCHAR buffW[255]; + + strcpyW(buffW, hwndText); + strcatW(buffW, &strs[typed_length]); + SetWindowTextW(hwnd, buffW); + SendMessageW(hwnd, EM_SETSEL, typed_length, strlenW(strs)); if (!(This->options & ACO_AUTOSUGGEST)) break; - } + } if (This->options & ACO_AUTOSUGGEST) { SendMessageW(This->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs);

1 0

Frédéric Delanoy : cmd/tests: Add tests for & (un )conditional execution.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 8b1d8e9e82be5ac4c8ec379c533e3b57390c4014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1d8e9e82be5ac4c8ec379c5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 23 15:34:20 2011 +0200 cmd/tests: Add tests for & (un)conditional execution. --- programs/cmd/tests/test_builtins.cmd | 19 ++++++++++++++++--- programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 81a326a..88c7c75 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -94,6 +94,19 @@ echo P%ERRORLEVEL% echo %ERRORLEVEL%S echo P%ERRORLEVEL%S +echo ------------ Testing conditional execution -------------- +echo ...unconditional ^& +call :setError 123 & echo foo1 +echo bar2 & echo foo2 +mkdir foobar & cd foobar +echo > foobazbar +cd .. & rd /s/q foobar +if exist foobazbar ( + echo foobar not deleted! + cd .. + rd /s/q foobar +) else echo foobar deleted + echo ------------ Testing type ------------ echo bar> foobaz @echo on @@ -105,7 +118,7 @@ echo *** del foobaz echo ------------ Testing NUL ------------ -md foobar && cd foobar +md foobar & cd foobar rem NUL file (non) creation + case insensitivity rem Note: "if exist" does not work with NUL, so to check for file existence we use a kludgy workaround echo > bar @@ -277,7 +290,7 @@ echo %ErrorLevel% rem Trailing backslashes mkdir foo\\\\ echo %ErrorLevel% -if exist foo (rmdir foo && echo dir created +if exist foo (rmdir foo & echo dir created ) else ( echo dir not created ) echo %ErrorLevel% rem Invalid chars @@ -289,7 +302,7 @@ echo %ErrorLevel% call :setError 0 mkdir foo\? echo %ErrorLevel% -if exist foo (rmdir foo && echo ok, foo created +if exist foo (rmdir foo & echo ok, foo created ) else ( echo foo not created ) call :setError 0 mkdir foo\bar\? diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c3fee1a..1c56629 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -90,6 +90,12 @@ ERRORLEVEL P0 0S P0S +------------ Testing conditional execution -------------- +(a)todo_wine@...unconditional & +foo1 +bar2(a)space@ +foo2 +(a)todo_wine@foobar deleted ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Nikolay Sivov : shell32/autocomplete: Remove redundant memory initialization.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 46a2ec0209e4dbc47e79d35f5db1ad04a84c7b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a2ec0209e4dbc47e79d35f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 24 23:18:51 2011 +0400 shell32/autocomplete: Remove redundant memory initialization. --- dlls/shell32/autocomplete.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 2c59207..684e990 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -287,7 +287,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LONG len; /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); + key = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); strcpyW(key, pwzsRegKeyPath); value = strrchrW(key, '\\'); *value = 0; @@ -301,7 +301,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (res == ERROR_SUCCESS) { res = RegQueryValueW(hKey, value, result, &len); if (res == ERROR_SUCCESS) { - This->quickComplete = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); + This->quickComplete = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); strcpyW(This->quickComplete, result); } RegCloseKey(hKey); @@ -310,7 +310,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( } if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); + This->quickComplete = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); lstrcpyW(This->quickComplete, pwszQuickComplete); } @@ -493,7 +493,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; if (control && This->quickComplete) { - hwndQCText = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + hwndQCText = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); sel = sprintfW(hwndQCText, This->quickComplete, hwndText); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); @@ -536,7 +536,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, int len; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); + msg = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg)); @@ -573,8 +573,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); HeapFree(GetProcessHeap(), 0, This->txtbackup); - This->txtbackup = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, (lstrlenW(hwndText)+1)*sizeof(WCHAR)); + This->txtbackup = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(hwndText)+1)*sizeof(WCHAR)); lstrcpyW(This->txtbackup, hwndText); /* Returns if there is no text to search and we doesn't want to display all the entries */ @@ -664,7 +663,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (sel < 0) break; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); + msg = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));

1 0