August 2010 - Wine-commits - list.winehq.org

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 64-bit char_traits tests.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 084d4ec6525771a33ab226a5a90ae3909926951a URL: http://source.winehq.org/git/wine.git/?a=commit;h=084d4ec6525771a33ab226a5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 16 11:06:28 2010 +0200 msvcp90: Added 64-bit char_traits tests. --- dlls/msvcp90/tests/misc.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index ab154e9..a3f7401 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -32,7 +32,7 @@ static BYTE (__cdecl *p_char_eq)(const void*, const void*); static BYTE (__cdecl *p_wchar_eq)(const void*, const void*); static BYTE (__cdecl *p_short_eq)(const void*, const void*); -static char* (__cdecl *p_Copy_s)(char*, unsigned int, const char*, unsigned int); +static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -64,15 +64,27 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); - p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); - p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); - p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)Z"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); + p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAEAGAEBG(a)Z"); - p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z"); - p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)_W@std@@SA_NAB_W0(a)Z"); - p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)Z"); + p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)D@std@@SA_NAEBD0(a)Z"); + p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)_W@std@@SA_NAEB_W0(a)Z"); + p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NAEBG0(a)Z"); - p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z"); + p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPEADPEAD_KPEBD1(a)Z"); + } else { + p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); + p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)Z"); + + p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z"); + p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)_W@std@@SA_NAB_W0(a)Z"); + p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)Z"); + + p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z"); + } return TRUE; } @@ -83,7 +95,7 @@ static void test_assign(void) char out[4]; if(!p_char_assign || !p_wchar_assign || !p_short_assign) { - skip("assign tests skipped\n"); + win_skip("assign tests skipped\n"); return; } @@ -114,7 +126,7 @@ static void test_equal(void) BYTE ret; if(!p_char_eq || !p_wchar_eq || !p_short_eq) { - skip("equal tests skipped\n"); + win_skip("equal tests skipped\n"); return; } @@ -146,7 +158,7 @@ static void test_Copy_s(void) char dest[32], *ret; if(!p_Copy_s) { - skip("Copy_s tests skipped\n"); + win_skip("Copy_s tests skipped\n"); return; }

1 0

Matteo Bruni : wined3d: Call set_render_offscreen at the end of context_setup_target.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: e0528084b19a6f3c27d1af20aabfd512c0dca95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0528084b19a6f3c27d1af20a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Aug 7 22:35:31 2010 +0200 wined3d: Call set_render_offscreen at the end of context_setup_target. This fixes a regression caused by 20f51c29a99299384e840e148f02aae66bfb45be. --- dlls/wined3d/context.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e22149c..93b4228 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2278,8 +2278,6 @@ static void context_setup_target(IWineD3DDeviceImpl *device, render_offscreen = surface_is_offscreen(target); if (context->current_rt == target && render_offscreen == old_render_offscreen) return; - context_set_render_offscreen(context, StateTable, render_offscreen); - /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ if (!context->current_rt) @@ -2347,6 +2345,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, context->draw_buffer_dirty = TRUE; context->current_rt = target; + context_set_render_offscreen(context, StateTable, render_offscreen); } /*****************************************************************************

1 0

Jacek Caban : dbghelp: Silence template related dwarf FIXMEs.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 1a1ffe60fdb0fa0e5e23e3c2b7247bfecbfcbae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1ffe60fdb0fa0e5e23e3c2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 15:12:46 2010 +0200 dbghelp: Silence template related dwarf FIXMEs. --- dlls/dbghelp/dwarf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4fec9cc..a0fcc12 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1300,6 +1300,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, /* FIXME: we need to handle nested udt definitions */ case DW_TAG_inheritance: case DW_TAG_subprogram: + case DW_TAG_template_type_param: + case DW_TAG_template_value_param: case DW_TAG_variable: /* FIXME: some C++ related stuff */ break; @@ -1771,6 +1773,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* the type referred to will be loaded when we need it, so skip it */ break; case DW_TAG_unspecified_parameters: + case DW_TAG_template_type_param: + case DW_TAG_template_value_param: /* FIXME: no support in dbghelp's internals so far */ break; default:

1 0

Juan Lang : ntdll: Implement NtSetInformationProcess for ProcessDefaultHardErrorMode.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: a4331aaf5dd1a425992d318d69677a56c2d6f2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4331aaf5dd1a425992d318d6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 22 09:33:28 2010 -0700 ntdll: Implement NtSetInformationProcess for ProcessDefaultHardErrorMode. --- dlls/ntdll/process.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2e73c91..b9b81ca 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -440,6 +440,10 @@ NTSTATUS WINAPI NtSetInformationProcess( switch (ProcessInformationClass) { + case ProcessDefaultHardErrorMode: + if (ProcessInformationLength != sizeof(UINT)) return STATUS_INVALID_PARAMETER; + process_error_mode = *(UINT *)ProcessInformation; + break; case ProcessAffinityMask: if (ProcessInformationLength != sizeof(DWORD_PTR)) return STATUS_INVALID_PARAMETER; if (*(PDWORD_PTR)ProcessInformation & ~(((DWORD_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1))

1 0

Juan Lang : kernel32: Implement GetErrorMode/SetErrorMode on top of NTDLL.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 5e87ca772ed20897673f42eab18af313ef6fe316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e87ca772ed20897673f42eab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jun 21 11:04:04 2010 -0700 kernel32: Implement GetErrorMode/SetErrorMode on top of NTDLL. --- dlls/kernel32/process.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index fc170f9..65dc2eb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -70,8 +70,6 @@ typedef struct DWORD dwReserved; } LOADPARMS32; -static UINT process_error_mode; - static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static BOOL is_wow64; @@ -2450,8 +2448,12 @@ BOOL WINAPI GetExitCodeProcess( HANDLE hProcess, LPDWORD lpExitCode ) */ UINT WINAPI SetErrorMode( UINT mode ) { - UINT old = process_error_mode; - process_error_mode = mode; + UINT old; + + NtQueryInformationProcess( GetCurrentProcess(), ProcessDefaultHardErrorMode, + &old, sizeof(old), NULL ); + NtSetInformationProcess( GetCurrentProcess(), ProcessDefaultHardErrorMode, + &mode, sizeof(mode) ); return old; } @@ -2460,7 +2462,11 @@ UINT WINAPI SetErrorMode( UINT mode ) */ UINT WINAPI GetErrorMode( void ) { - return process_error_mode; + UINT mode; + + NtQueryInformationProcess( GetCurrentProcess(), ProcessDefaultHardErrorMode, + &mode, sizeof(mode), NULL ); + return mode; } /**********************************************************************

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

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

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

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