October 2010 - Wine-Commits

Thomas Mullaly : urlmon: Implemented functionality for generating raw URI string of a IUriBuilder.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: a057153c2e86dcae16b55e19ae924ac8cc11bb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a057153c2e86dcae16b55e19a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 29 16:59:30 2010 -0400 urlmon: Implemented functionality for generating raw URI string of a IUriBuilder. --- dlls/urlmon/uri.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 168 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1707429..c34c418 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -933,6 +933,19 @@ static DWORD ui2ipv4(WCHAR *dest, UINT address) { return ret; } +static DWORD ui2str(WCHAR *dest, UINT value) { + static const WCHAR formatW[] = {'%','u',0}; + DWORD ret = 0; + + if(!dest) { + WCHAR tmp[11]; + ret = sprintfW(tmp, formatW, value); + } else + ret = sprintfW(dest, formatW, value); + + return ret; +} + /* Converts an h16 component (from an IPv6 address) into it's * numerical value. * @@ -3847,11 +3860,14 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, if(FAILED(hr)) return hr; - /* The URI is opaque if it doesn't have an authority component. */ - data->is_opaque = !data->username && !data->password && !data->host; - setup_port(builder, data, flags); + /* The URI is opaque if it doesn't have an authority component. */ + if(!data->is_relative) + data->is_opaque = !data->username && !data->password && !data->host && !data->has_port; + else + data->is_opaque = !data->host && !data->has_port; + hr = validate_path(builder, data, flags); if(FAILED(hr)) return hr; @@ -3869,11 +3885,144 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, return S_OK; } +/* Generates a raw uri string using the parse_data. */ +static DWORD generate_raw_uri(const parse_data *data, BSTR uri) { + DWORD length = 0; + + if(data->scheme) { + if(uri) { + memcpy(uri, data->scheme, data->scheme_len*sizeof(WCHAR)); + uri[data->scheme_len] = ':'; + } + length += data->scheme_len+1; + } + + if(!data->is_opaque) { + /* For the "//" which appears before the authority component. */ + if(uri) { + uri[length] = '/'; + uri[length+1] = '/'; + } + length += 2; + } + + if(data->username) { + if(uri) + memcpy(uri+length, data->username, data->username_len*sizeof(WCHAR)); + length += data->username_len; + } + + if(data->password) { + if(uri) { + uri[length] = ':'; + memcpy(uri+length+1, data->password, data->password_len*sizeof(WCHAR)); + } + length += data->password_len+1; + } + + if(data->password || data->username) { + if(uri) + uri[length] = '@'; + ++length; + } + + if(data->host) { + /* IPv6 addresses get the brackets added around them if they don't already + * have them. + */ + const BOOL add_brackets = data->host_type == Uri_HOST_IPV6 && *(data->host) != '['; + if(add_brackets) { + if(uri) + uri[length] = '['; + ++length; + } + + if(uri) + memcpy(uri+length, data->host, data->host_len*sizeof(WCHAR)); + length += data->host_len; + + if(add_brackets) { + if(uri) + uri[length] = ']'; + length++; + } + } + + if(data->has_port) { + /* The port isn't included in the raw uri if it's the default + * port for the scheme type. + */ + DWORD i; + BOOL is_default = FALSE; + + for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + if(data->scheme_type == default_ports[i].scheme && + data->port_value == default_ports[i].port) + is_default = TRUE; + } + + if(!is_default) { + if(uri) + uri[length] = ':'; + ++length; + + if(uri) + length += ui2str(uri+length, data->port_value); + else + length += ui2str(NULL, data->port_value); + } + } + + /* Check if a '/' should be added before the path for hierarchical URIs. */ + if(!data->is_opaque && data->path && *(data->path) != '/') { + if(uri) + uri[length] = '/'; + ++length; + } + + if(data->path) { + if(uri) + memcpy(uri+length, data->path, data->path_len*sizeof(WCHAR)); + length += data->path_len; + } + + if(data->query) { + if(uri) + memcpy(uri+length, data->query, data->query_len*sizeof(WCHAR)); + length += data->query_len; + } + + if(data->fragment) { + if(uri) + memcpy(uri+length, data->fragment, data->fragment_len*sizeof(WCHAR)); + length += data->fragment_len; + } + + if(uri) + TRACE("(%p %p): Generated raw uri=%s len=%d\n", data, uri, debugstr_wn(uri, length), length); + else + TRACE("(%p %p): Computed raw uri len=%d\n", data, uri, length); + + return length; +} + +static HRESULT generate_uri(const UriBuilder *builder, const parse_data *data, Uri *uri, DWORD flags) { + DWORD length = generate_raw_uri(data, NULL); + uri->raw_uri = SysAllocStringLen(NULL, length); + if(!uri->raw_uri) + return E_OUTOFMEMORY; + + generate_raw_uri(data, uri->raw_uri); + + return E_NOTIMPL; +} + static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_flags, DWORD use_orig_flags, DWORD encoding_mask) { HRESULT hr; parse_data data; + Uri *ret; if(!uri) return E_POINTER; @@ -3909,7 +4058,22 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return hr; } - return E_NOTIMPL; + ret = heap_alloc_zero(sizeof(Uri)); + if(!ret) { + *uri = NULL; + return E_OUTOFMEMORY; + } + + hr = generate_uri(builder, &data, ret, create_flags); + if(FAILED(hr)) { + SysFreeString(ret->raw_uri); + heap_free(ret->canon_uri); + heap_free(ret); + *uri = NULL; + return hr; + } + + return S_OK; } #define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)

1 0

Thomas Mullaly : urlmon: validate_fragment works better if it actually calls parse_fragment instead of parse_query .
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: 1674bdd9320896241ba4787bb2a6409e5893b3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1674bdd9320896241ba4787bb… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 29 17:43:52 2010 -0400 urlmon: validate_fragment works better if it actually calls parse_fragment instead of parse_query. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2aee38a..1707429 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3805,7 +3805,7 @@ static HRESULT validate_fragment(const UriBuilder *builder, parse_data *data, DW const WCHAR *component = ptr; pptr = &ptr; - if(parse_query(pptr, data, flags) && expected_len == data->fragment_len) + if(parse_fragment(pptr, data, flags) && expected_len == data->fragment_len) TRACE("(%p %p %x): Valid fragment component %s len=%d.\n", builder, data, flags, debugstr_wn(data->fragment, data->fragment_len), data->fragment_len); else {

1 0

Luca Bennati : inetcpl.cpl: Update Italian translation.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: 7cc3a6774cdedb4a75210b7b7826260ef93dd3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc3a6774cdedb4a75210b7b7… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 2 09:02:15 2010 +0200 inetcpl.cpl: Update Italian translation. --- dlls/inetcpl.cpl/cpl_It.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc index 6be9341..8e0f5f8 100644 --- a/dlls/inetcpl.cpl/cpl_It.rc +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -32,6 +32,23 @@ BEGIN IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Generale" +BEGIN + + GROUPBOX " Pagina iniziale ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Puoi scegliere l'indirizzo che sarà usato come tua pagina iniziale.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "Pagina &attuale", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "Pagina &predefinita", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Pagina &vuota", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Andrew Talbot : fusion: Constify some variables.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: ea1ec880910ed363697bbdc1025f80fe153f0d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1ec880910ed363697bbdc10… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 2 23:25:52 2010 +0100 fusion: Constify some variables. --- dlls/fusion/asmname.c | 4 ++-- dlls/fusion/assembly.c | 8 ++++---- dlls/fusion/fusionpriv.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 54be4e8..8100e61 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -450,7 +450,7 @@ static HRESULT parse_version(IAssemblyNameImpl *name, LPWSTR version) return S_OK; } -static HRESULT parse_culture(IAssemblyNameImpl *name, LPWSTR culture) +static HRESULT parse_culture(IAssemblyNameImpl *name, LPCWSTR culture) { static const WCHAR empty[] = {0}; @@ -480,7 +480,7 @@ static BYTE hextobyte(WCHAR c) return 0; } -static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPWSTR pubkey) +static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) { int i; BYTE val; diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 328b279..a3abc4e 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -146,7 +146,7 @@ static VOID *assembly_data_offset(ASSEMBLY *assembly, ULONG offset) #define MAX_TABLES_3BIT_ENCODE 8191 #define MAX_TABLES_5BIT_ENCODE 2047 -static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) +static inline ULONG get_table_size(const ASSEMBLY *assembly, DWORD index) { DWORD size; INT tables; @@ -731,11 +731,11 @@ HRESULT assembly_release(ASSEMBLY *assembly) return S_OK; } -static LPWSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) +static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) { int len; LPWSTR cpy; - LPSTR str = (LPSTR)&assembly->strings[index]; + LPCSTR str = (LPCSTR)&assembly->strings[index]; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -772,7 +772,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) return S_OK; } -HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path) +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { LPWSTR cpy = HeapAlloc(GetProcessHeap(), 0, (strlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 6f4b28d..f717f14 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -431,7 +431,7 @@ typedef struct tagASSEMBLY ASSEMBLY; HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); -HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path); HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); BYTE assembly_get_architecture(ASSEMBLY *assembly); HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token);

1 0

Andrew Talbot : gdi.exe16: Constify a variable.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: 73efb62fc36de8889c80705f86d743cb78f81079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73efb62fc36de8889c80705f8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Oct 3 10:13:41 2010 +0100 gdi.exe16: Constify a variable. --- dlls/gdi.exe16/printdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index aee0e65..2060d9f 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -514,7 +514,7 @@ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) * * Helper for DrvGetPrinterData */ -static DWORD DrvGetPrinterDataInternal(LPSTR RegStr_Printer, +static DWORD DrvGetPrinterDataInternal(LPCSTR RegStr_Printer, LPBYTE lpPrinterData, int cbData, int what) { DWORD res = -1;

1 0

Aurimas Fišeras : inetcpl.cpl: Update Lithuanian translation.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: b664fc836984331357b49f798cb0bd5a324a8954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b664fc836984331357b49f798… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Oct 2 10:06:14 2010 +0300 inetcpl.cpl: Update Lithuanian translation. --- dlls/inetcpl.cpl/cpl_Lt.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index 0eda833..92d2ac5 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -32,6 +32,23 @@ BEGIN IDS_CPL_INFO "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Bendrosios" +BEGIN + + GROUPBOX " Pradžios tinklalapis ", IDC_STATIC, 4, 4, 312, 56 + LTEXT "Galite pasirinkti adresą, kuris bus naudojamas kaip jūsų pradžios tinklalapis.", + IDC_STATIC, 58, 14, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 26, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Dabartinis puslapis", IDC_HOME_CURRENT, 58, 40, 80, 14 + PUSHBUTTON "&Numatytasis puslapis", IDC_HOME_DEFAULT, 144, 40, 80, 14 + PUSHBUTTON "&Tuščias puslapis", IDC_HOME_BLANK, 230, 40, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Andrew Talbot : explorerframe: Constify some variables.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: 49e993c64165fb283f6a637102e21f0b28196fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e993c64165fb283f6a63710… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 2 19:41:04 2010 +0100 explorerframe: Constify some variables. --- dlls/explorerframe/explorerframe_main.c | 2 +- dlls/explorerframe/nstc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index dd3c0cf..cc535e7 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -211,7 +211,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) /************************************************************************* * Register/Unregister DLL, based on shdocvw/factory.c */ -static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) +static HRESULT reg_install(LPCSTR section, const STRTABLEA *strtable) { HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); HMODULE hadvpack; diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 02633b0..6ae1458 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -422,7 +422,7 @@ static void collapse_all(NSTC2Impl *This, HTREEITEM node) if(next) collapse_all(This, next); } -static HTREEITEM treeitem_from_point(NSTC2Impl *This, POINT *pt, UINT *hitflag) +static HTREEITEM treeitem_from_point(NSTC2Impl *This, const POINT *pt, UINT *hitflag) { TVHITTESTINFO tviht; tviht.pt.x = pt->x;

1 0

Gerald Pfeifer : msxml3: Use the existing READYSTATE type instead of creating our own enum READYSTATE (and mixing the two).
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: 632a6c7904f00e10b6b0dd7fe7fa20dfe2d7d9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632a6c7904f00e10b6b0dd7fe… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 2 01:05:23 2010 +0200 msxml3: Use the existing READYSTATE type instead of creating our own enum READYSTATE (and mixing the two). --- dlls/msxml3/httprequest.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index dfc8dae..8820e68 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -50,15 +50,6 @@ struct reqheader BSTR value; }; -enum READYSTATE -{ - STATE_UNINITIALIZED = 0, - STATE_LOADING = 1, - STATE_LOADED = 2, - STATE_INTERACTIVE = 3, - STATE_COMPLETED = 4 -}; - typedef struct { const struct IXMLHTTPRequestVtbl *lpVtbl; @@ -571,7 +562,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR if (hr == S_OK) This->password = V_BSTR(&str); - httprequest_setreadystate(This, STATE_LOADING); + httprequest_setreadystate(This, READYSTATE_LOADING); return S_OK; } @@ -584,7 +575,7 @@ static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR TRACE("(%p)->(%s %s)\n", This, debugstr_w(header), debugstr_w(value)); if (!header || !*header) return E_INVALIDARG; - if (This->state != STATE_LOADING) return E_FAIL; + if (This->state != READYSTATE_LOADING) return E_FAIL; if (!value) return E_INVALIDARG; /* replace existing header value if already added */ @@ -634,7 +625,7 @@ static HRESULT WINAPI httprequest_send(IXMLHTTPRequest *iface, VARIANT varBody) TRACE("(%p)\n", This); - if (This->state != STATE_LOADING) return E_FAIL; + if (This->state != READYSTATE_LOADING) return E_FAIL; hr = BindStatusCallback_create(This, &bsc); if (FAILED(hr)) return hr; @@ -771,7 +762,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->async = FALSE; req->verb = -1; req->url = req->user = req->password = NULL; - req->state = STATE_UNINITIALIZED; + req->state = READYSTATE_UNINITIALIZED; req->bsc = NULL; list_init(&req->reqheaders);

1 0

Juan Lang : cryptui: Remove redundant close line.
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: e47fae98e3ac2906f5a2ab0bc15a3d61307b0d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47fae98e3ac2906f5a2ab0bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 1 14:58:51 2010 -0700 cryptui: Remove redundant close line. --- dlls/cryptui/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a95a7a4..540ef73 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1282,7 +1282,6 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case IDCANCEL: free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); - close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); data = (struct CertMgrData *)GetWindowLongPtrW(hwnd, DWLP_USER); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data);

1 0

Juan Lang : cryptui: Check whether caller called WinVerifyTrust when deciding whether to call it .
by Alexandre Julliard Oct. 4, 2010

Oct. 4, 2010

Module: wine Branch: master Commit: 99e557f02be0b089c64e127025ebf7deb98f89d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e557f02be0b089c64e12702… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 1 15:06:35 2010 -0700 cryptui: Check whether caller called WinVerifyTrust when deciding whether to call it. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 540ef73..abda52a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4434,7 +4434,7 @@ BOOL WINAPI CryptUIDlgViewCertificateW( } /* Make a local copy in case we have to call WinVerifyTrust ourselves */ memcpy(&viewInfo, pCertViewInfo, sizeof(viewInfo)); - if (!viewInfo.u.hWVTStateData) + if (!pCertViewInfo->u.hWVTStateData) { memset(&wvt, 0, sizeof(wvt)); wvt.cbStruct = sizeof(wvt); @@ -4476,7 +4476,7 @@ BOOL WINAPI CryptUIDlgViewCertificateW( if (ret) { ret = show_cert_dialog(&viewInfo, provCert, pfPropertiesChanged); - if (!viewInfo.u.hWVTStateData) + if (!pCertViewInfo->u.hWVTStateData) { wvt.dwStateAction = WTD_STATEACTION_CLOSE; WinVerifyTrust(NULL, &generic_cert_verify, &wvt);

1 0