wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Piotr Caban : msvcp90: Added char_traits<unsigned short> 64-bit exports.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 96c622dfc895814bdfd0b344f797307cc3a1360d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c622dfc895814bdfd0b344f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:06:17 2010 +0200 msvcp90: Added char_traits<unsigned short> 64-bit exports. --- dlls/msvcp90/msvcp90.spec | 30 +++++++++++++++--------------- dlls/msvcp90/string.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96c622dfc895814bdfd0b…

1 0

Piotr Caban : msvcp90: Added char_traits<wchar_t> 64-bit exports.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: fad0f817eec351db6e9d0eddba6cf0886073c441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad0f817eec351db6e9d0eddb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:06:01 2010 +0200 msvcp90: Added char_traits<wchar_t> 64-bit exports. --- dlls/msvcp90/msvcp90.spec | 30 +++++++++++++++--------------- dlls/msvcp90/string.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fad0f817eec351db6e9d0…

1 0

Piotr Caban : msvcp90: Added char_traits<char> 64-bit exports.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 2ef0077d6b87c07113b7715d9fc9ca35d752e97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef0077d6b87c07113b7715d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:05:39 2010 +0200 msvcp90: Added char_traits<char> 64-bit exports. --- dlls/msvcp90/msvcp90.spec | 30 +++++++++++++++--------------- dlls/msvcp90/string.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ef0077d6b87c07113b77…

1 0

Gerald Pfeifer : d3dx9_36: minwidth and minheight are set but not used in point_filter_simple_data; remove them.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: f781be07fc2927bc8e6693053782f0e6068c55f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f781be07fc2927bc8e6693053… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 15 23:52:30 2010 +0200 d3dx9_36: minwidth and minheight are set but not used in point_filter_simple_data; remove them. --- dlls/d3dx9_36/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 82881bc..487f06f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -573,15 +573,11 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr struct argb_conversion_info conv_info; DWORD channels[4]; - UINT minwidth, minheight; UINT x, y; ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(srcformat, destformat, &conv_info); - minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; - minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; - for(y = 0;y < destsize.y;y++) { BYTE *destptr = dest + y * destpitch; const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y);

1 0

Austin Lund : dmime: Ensure IDirectMusicPort is initialised when calling IDirectMusicPerformance ::PChannelInfo.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 5b27cdf93b2f4a21427dc5af57176098cb79b586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b27cdf93b2f4a21427dc5af5… Author: Austin Lund <austin.lund(a)gmail.com> Date: Sat Aug 7 15:01:14 2010 +1000 dmime: Ensure IDirectMusicPort is initialised when calling IDirectMusicPerformance::PChannelInfo. --- dlls/dmime/performance.c | 9 +++++++++ dlls/dmime/tests/performance.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 850d834..91df283 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -588,7 +588,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel (LPDIRECTMUSIC static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo (LPDIRECTMUSICPERFORMANCE8 iface, DWORD dwPChannel, IDirectMusicPort** ppPort, DWORD* pdwGroup, DWORD* pdwMChannel) { IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; + DMUS_PORTPARAMS8 dmusportparams; + GUID def; + FIXME("(%p, %d, %p, %p, %p): stub\n", This, dwPChannel, ppPort, pdwGroup, pdwMChannel); + + dmusportparams.dwSize = sizeof(DMUS_PORTPARAMS8); + dmusportparams.dwValidParams = 0; + IDirectMusic8_GetDefaultPort(This->pDirectMusic, &def); + IDirectMusic8_CreatePort(This->pDirectMusic, &def, &dmusportparams, ppPort, NULL); + return S_OK; } diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index a681b6a..f184314 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -45,7 +45,7 @@ static void test_PChannelInfo(void) pDirectMusicPort = NULL; hr = IDirectMusicPerformance8_PChannelInfo(idmusicperformance, 0, &pDirectMusicPort, NULL, NULL); ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); - todo_wine ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); + ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); if (hr == S_OK && pDirectMusicPort != NULL) IDirectMusicPort_Release(pDirectMusicPort); }

1 0

Austin Lund : dmime/tests: Added tests for IDirectMusicPerformance.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 203272eafa2bd530c9078d8e59fc38550e9b3056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203272eafa2bd530c9078d8e5… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Aug 6 17:50:49 2010 +1000 dmime/tests: Added tests for IDirectMusicPerformance. --- configure | 1 + configure.ac | 1 + dlls/dmime/tests/Makefile.in | 11 ++++ dlls/dmime/tests/performance.c | 102 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 05a9317..4549b38 100755 --- a/configure +++ b/configure @@ -14499,6 +14499,7 @@ wine_fn_config_dll display.drv16 enable_win16 wine_fn_config_dll dmband enable_dmband wine_fn_config_dll dmcompos enable_dmcompos wine_fn_config_dll dmime enable_dmime +wine_fn_config_test dlls/dmime/tests dmime_test wine_fn_config_dll dmloader enable_dmloader wine_fn_config_test dlls/dmloader/tests dmloader_test wine_fn_config_dll dmscript enable_dmscript diff --git a/configure.ac b/configure.ac index eedfec5..5b56bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -2338,6 +2338,7 @@ WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband) WINE_CONFIG_DLL(dmcompos) WINE_CONFIG_DLL(dmime) +WINE_CONFIG_TEST(dlls/dmime/tests) WINE_CONFIG_DLL(dmloader) WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in new file mode 100644 index 0000000..f3c83dc --- /dev/null +++ b/dlls/dmime/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = dmime.dll +IMPORTS = user32 ole32 + +C_SRCS = \ + performance.c + +@MAKE_TEST_RULES@ diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c new file mode 100644 index 0000000..a681b6a --- /dev/null +++ b/dlls/dmime/tests/performance.c @@ -0,0 +1,102 @@ +/* + * Unit test suite for IDirectMusicPerformance + * + * Copyright 2010 Austin Lund + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + +IDirectMusicPerformance8 *idmusicperformance; + +static HRESULT test_InitAudio(void) +{ + IDirectSound *pDirectSound; + HRESULT hr; + + pDirectSound = NULL; + hr = IDirectMusicPerformance8_InitAudio(idmusicperformance ,NULL, + &pDirectSound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); + return hr; +} + +static void test_PChannelInfo(void) +{ + IDirectMusicPort *pDirectMusicPort; + HRESULT hr; + + pDirectMusicPort = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(idmusicperformance, 0, &pDirectMusicPort, NULL, NULL); + ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); + todo_wine ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); + if (hr == S_OK && pDirectMusicPort != NULL) + IDirectMusicPort_Release(pDirectMusicPort); +} + +static void test_GetDefaultAudioPath(void) +{ + IDirectMusicAudioPath *pDirectMusicAudioPath; + HRESULT hr; + + hr = IDirectMusicPerformance8_GetDefaultAudioPath(idmusicperformance, &pDirectMusicAudioPath); + ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); + if (hr == S_OK) + IDirectMusicAudioPath_Release(pDirectMusicAudioPath); +} + +static void test_CloseDown(void) +{ + HRESULT hr; + + hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); +} + +START_TEST( performance ) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + if (FAILED(hr)) { + skip("Cannot initialize COM (%x)\n", hr); + return; + } + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (LPVOID *)&idmusicperformance); + if (hr != S_OK) { + skip("Cannot create DirectMusicPerformance object (%x)\n", hr); + CoUninitialize(); + return; + } + + hr = test_InitAudio(); + if (hr != S_OK) { + skip("InitAudio failed (%x)\n", hr); + return; + } + + test_GetDefaultAudioPath(); + test_PChannelInfo(); + test_CloseDown(); + + IDirectMusicPerformance8_Release(idmusicperformance); + CoUninitialize(); +}

1 0

Juan Lang : crypt32: Honor SECURITY_FLAG_IGNORE_CERT_CN_INVALID.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: d6c9c7a08bc21435047f64bb1f5f6d608a1f0955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c9c7a08bc21435047f64bb1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 12 11:28:18 2010 -0700 crypt32: Honor SECURITY_FLAG_IGNORE_CERT_CN_INVALID. --- dlls/crypt32/chain.c | 4 +++- dlls/crypt32/tests/chain.c | 7 +------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5c63224..36ed1f3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -23,6 +23,7 @@ #define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include "wincrypt.h" +#include "wininet.h" #include "wine/debug.h" #include "wine/unicode.h" #include "crypt32_private.h" @@ -3331,7 +3332,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) { if (sslPara->dwAuthType == AUTHTYPE_SERVER && - sslPara->pwszServerName) + sslPara->pwszServerName && + !(sslPara->fdwChecks & SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) { PCCERT_CONTEXT cert; PCERT_EXTENSION altNameExt; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 1f7a11f..707d62e 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3822,11 +3822,6 @@ static const ChainPolicyCheck winehqPolicyCheckWithMatchingName = { { 0, 0, -1, -1, NULL}, NULL, 0 }; -static const ChainPolicyCheck winehqPolicyCheckWithIgnoredNonMatchingName = { - { sizeof(chain29) / sizeof(chain29[0]), chain29 }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR -}; - static const ChainPolicyCheck winehqPolicyCheckWithoutMatchingName = { { sizeof(chain29) / sizeof(chain29[0]), chain29 }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 @@ -4207,7 +4202,7 @@ static void check_ssl_policy(void) /* When specifying to ignore name mismatch: match */ sslPolicyPara.fdwChecks |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, engine, - &winehqPolicyCheckWithIgnoredNonMatchingName, 0, &oct2007, &policyPara); + &winehqPolicyCheckWithMatchingName, 0, &oct2007, &policyPara); CertFreeCertificateChainEngine(engine); CertCloseStore(testRoot, 0); }

1 0

Juan Lang : crypt32/tests: Add a test of SSL_EXTRA_CERT_CHAIN_POLICY_PARA' s fdwChecks field.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: e922faec4ad1cd38a7354c13105217a5eab09ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e922faec4ad1cd38a7354c131… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 12 11:25:29 2010 -0700 crypt32/tests: Add a test of SSL_EXTRA_CERT_CHAIN_POLICY_PARA's fdwChecks field. --- dlls/crypt32/tests/chain.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a59a95a..1f7a11f 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -24,6 +24,7 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> +#include <wininet.h> #include "wine/test.h" @@ -3821,6 +3822,11 @@ static const ChainPolicyCheck winehqPolicyCheckWithMatchingName = { { 0, 0, -1, -1, NULL}, NULL, 0 }; +static const ChainPolicyCheck winehqPolicyCheckWithIgnoredNonMatchingName = { + { sizeof(chain29) / sizeof(chain29[0]), chain29 }, + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR +}; + static const ChainPolicyCheck winehqPolicyCheckWithoutMatchingName = { { sizeof(chain29) / sizeof(chain29[0]), chain29 }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 @@ -4198,6 +4204,10 @@ static void check_ssl_policy(void) sslPolicyPara.pwszServerName = a_dot_b_dot_winehq_dot_org; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, engine, &winehqPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); + /* When specifying to ignore name mismatch: match */ + sslPolicyPara.fdwChecks |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, engine, + &winehqPolicyCheckWithIgnoredNonMatchingName, 0, &oct2007, &policyPara); CertFreeCertificateChainEngine(engine); CertCloseStore(testRoot, 0); }

1 0

André Hentschel : user32: Use a macro instead of direct values.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: aef6e3d2324d51428943cd7692026e35b68ebf5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef6e3d2324d51428943cd769… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 9 16:50:30 2010 +0200 user32: Use a macro instead of direct values. --- dlls/user32/button.c | 19 +++++++++---------- include/winuser.h | 1 + 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 54d54dc..1b28204 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -31,7 +31,6 @@ * Styles * - BS_NOTIFY: is it complete? * - BS_RIGHTBUTTON: same as BS_LEFTTEXT - * - BS_TYPEMASK * * Messages * - WM_CHAR: Checks a (manual or automatic) check box on '+' or '=', clears it on '-' key. @@ -191,7 +190,7 @@ static inline void set_button_font( HWND hwnd, HFONT font ) static inline UINT get_button_type( LONG window_style ) { - return (window_style & 0x0f); + return (window_style & BS_TYPEMASK); } /* paint a button of any type */ @@ -273,8 +272,8 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ if (btn_type == BS_USERBUTTON ) { - style = (style & ~0x0f) | BS_PUSHBUTTON; - WIN_SetStyle( hWnd, style, 0x0f & ~style ); + style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); } set_button_state( hWnd, BUTTON_UNCHECKED ); return 0; @@ -459,10 +458,10 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, break; case BM_SETSTYLE: - if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; - btn_type = wParam & 0x0f; - style = (style & ~0x0f) | btn_type; - WIN_SetStyle( hWnd, style, 0x0f & ~style ); + if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; + btn_type = wParam & BS_TYPEMASK; + style = (style & ~BS_TYPEMASK) | btn_type; + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); /* Only redraw if lParam flag is set.*/ if (lParam) @@ -547,7 +546,7 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) /* "Convert" pushlike buttons to pushbuttons */ if (style & BS_PUSHLIKE) - style &= ~0x0F; + style &= ~BS_TYPEMASK; if (!(style & BS_MULTILINE)) dtStyle |= DT_SINGLELINE; @@ -988,7 +987,7 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) { if (!sibling) break; if ((hwnd != sibling) && - ((GetWindowLongW( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON)) + ((GetWindowLongW( sibling, GWL_STYLE) & BS_TYPEMASK) == BS_AUTORADIOBUTTON)) SendMessageW( sibling, BM_SETCHECK, BUTTON_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); diff --git a/include/winuser.h b/include/winuser.h index d4920c2..82d0e2e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -711,6 +711,7 @@ typedef struct tagWINDOWPLACEMENT #define BS_USERBUTTON 0x00000008L #define BS_AUTORADIOBUTTON 0x00000009L #define BS_OWNERDRAW 0x0000000BL +#define BS_TYPEMASK 0x0000000FL #define BS_LEFTTEXT 0x00000020L #define BS_RIGHTBUTTON BS_LEFTTEXT

1 0

Andrew Eikum : regedit: Improve importing of REG_SZ with invalid quoting.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: dcfdfbaa54cfbcd7546f1a14217cdbaa1e96c80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfdfbaa54cfbcd7546f1a142… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 5 11:57:55 2010 -0500 regedit: Improve importing of REG_SZ with invalid quoting. --- programs/regedit/regproc.c | 12 ++++- programs/regedit/tests/regedit.c | 85 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 122d678..82349f6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -372,6 +372,8 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) * the extra garbage in the registry. */ dwLen = lstrlenW(val_data); + if(val_data[dwLen-1] != '"') + return ERROR_INVALID_DATA; if (dwLen>0 && val_data[dwLen-1]=='"') { dwLen--; @@ -497,7 +499,7 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) } else if (line[line_idx] == '\"') { line_idx++; val_name = line + line_idx; - while (TRUE) { + while (line[line_idx]) { if (line[line_idx] == '\\') /* skip escaped character */ { line_idx += 2; @@ -512,18 +514,22 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) } } while ( isspaceW(line[line_idx]) ) line_idx++; + if (!line[line_idx]) { + fprintf(stderr, "%s: warning: unexpected EOL\n", getAppName()); + return; + } if (line[line_idx] != '=') { char* lineA; line[line_idx] = '\"'; lineA = GetMultiByteString(line); - fprintf(stderr,"Warning! unrecognized line:\n%s\n", lineA); + fprintf(stderr,"%s: warning: unrecognized line: '%s'\n", getAppName(), lineA); HeapFree(GetProcessHeap(), 0, lineA); return; } } else { char* lineA = GetMultiByteString(line); - fprintf(stderr,"Warning! unrecognized line:\n%s\n", lineA); + fprintf(stderr,"%s: warning: unrecognized line: '%s'\n", getAppName(), lineA); HeapFree(GetProcessHeap(), 0, lineA); return; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 6fc1305..da8b1e0 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -219,6 +219,28 @@ static void r_verify_reg_binary(unsigned line, HKEY key, const char *subkey, "Data differs\n"); } +#define verify_reg_nonexist(k,s,n) r_verify_reg_nonexist(__LINE__,k,s,n) +static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *subkey, + const char *value_name) +{ + LONG lr; + DWORD fnd_type, fnd_len; + char fnd_value[32]; + HKEY fnd_key; + + lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key); + lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + if(lr != ERROR_SUCCESS) + return; + + fnd_len = sizeof(fnd_value); + lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type, + (BYTE*)fnd_value, &fnd_len); + RegCloseKey(fnd_key); + lok(lr == ERROR_FILE_NOT_FOUND, "Reg value shouldn't exist: %s\n", + value_name); +} + static void test_basic_import(void) { char exp_binary[] = {0xAA,0xBB,0xCC,0x11}; @@ -286,6 +308,68 @@ static void test_basic_import(void) verify_reg_binary(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", "TestBinary", exp_binary, sizeof(exp_binary)); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "\"With=Equals\"=\"asdf\"\n"); + verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "With=Equals", "asdf"); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); +} + +static void test_invalid_import(void) +{ + LONG lr; + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, + "RegDeleteKeyA failed: %d\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "\"TestNoEndQuote\"=\"Asdffdsa\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "TestNoEndQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "\"TestNoBeginQuote\"=Asdffdsa\"\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "TestNoBeginQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "\"TestNoQuotes\"=Asdffdsa\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "TestNoQuotes"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "\"NameNoEndQuote=\"Asdffdsa\"\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "NameNoEndQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "NameNoBeginQuote\"=\"Asdffdsa\"\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "NameNoBeginQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "NameNoQuotes=\"Asdffdsa\"\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "NameNoQuotes"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "\"MixedQuotes=Asdffdsa\"\n"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "MixedQuotes"); + verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "MixedQuotes=Asdffdsa"); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } @@ -304,4 +388,5 @@ START_TEST(regedit) supports_wchar = exec_import_wstr(wchar_test); test_basic_import(); + test_invalid_import(); }

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
89
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 August 2010