July 2007 - Wine-commits - list.winehq.org

Damjan Jovanovic : tools: Add basic support for the startup notifications standard.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 25e938c11a7bebac7b266c8c78c4ab6c35e858a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e938c11a7bebac7b266c8c7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Jul 21 17:18:46 2007 +0200 tools: Add basic support for the startup notifications standard. --- tools/wineshelllink | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index 3cfea28..a58fb18 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -89,6 +89,7 @@ desktop_entry() Name=$linkname Exec=env WINEPREFIX="${WINEPREFIX:-$HOME/.wine}" wine "$path" $args Type=Application +StartupWMClass=Wine EOF [ -z "$descr" ] || echo "Comment=$descr" [ -z "$workdir" ] || echo "Path=$workdir"

1 0

Misha Koshelev : urlmon: Actually send the additional headers returned by IHttpNegotiate:: BeginningTransaction.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 609d91fb0ca73807768705e4add3781e3e00861e URL: http://source.winehq.org/git/wine.git/?a=commit;h=609d91fb0ca73807768705e4a… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jul 20 19:56:05 2007 -0500 urlmon: Actually send the additional headers returned by IHttpNegotiate::BeginningTransaction. --- dlls/urlmon/http.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 33d23b0..d072159 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -290,7 +290,8 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl ULONG num = 0; IServiceProvider *service_provider = 0; IHttpNegotiate2 *http_negotiate2 = 0; - LPWSTR host = 0, path = 0, user = 0, pass = 0, addl_header = 0; + LPWSTR host = 0, path = 0, user = 0, pass = 0, + addl_header = 0, full_header = 0; BYTE security_id[512]; LPOLESTR user_agent, accept_mimes[257]; HRESULT hres; @@ -435,6 +436,23 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl WARN("IHttpNegotiate_BeginningTransaction failed: %08x\n", hres); goto done; } + else if (addl_header == NULL) + { + full_header = (LPWSTR)wszHeaders; + } + else + { + full_header = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(addl_header)+sizeof(wszHeaders))*sizeof(WCHAR)); + if (!full_header) + { + WARN("Out of memory\n"); + hres = E_OUTOFMEMORY; + goto done; + } + lstrcpyW(full_header, addl_header); + lstrcpyW(&full_header[lstrlenW(addl_header)], wszHeaders); + } hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate2, &IID_IHttpNegotiate2, (void **)&http_negotiate2); @@ -456,7 +474,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl /* FIXME: Handle security_id. Native calls undocumented function IsHostInProxyBypassList. */ - if (!HttpSendRequestW(This->request, wszHeaders, lstrlenW(wszHeaders), NULL, 0) && + if (!HttpSendRequestW(This->request, full_header, lstrlenW(full_header), NULL, 0) && GetLastError() != ERROR_IO_PENDING) { WARN("HttpSendRequest failed: %d\n", GetLastError()); @@ -472,6 +490,8 @@ done: HTTPPROTOCOL_Close(This); } + if (full_header != wszHeaders) + HeapFree(GetProcessHeap(), 0, full_header); CoTaskMemFree(addl_header); if (http_negotiate2) IHttpNegotiate2_Release(http_negotiate2);

1 0

Misha Koshelev : urlmon/tests: Add test for BINDVERB_POST in http_protocol.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: e9312fbc92ca61e7704bfeaceac33769645b5025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9312fbc92ca61e7704bfeace… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jul 20 19:55:32 2007 -0500 urlmon/tests: Add test for BINDVERB_POST in http_protocol. --- dlls/urlmon/tests/protocol.c | 87 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 08476d0..5e5a4a8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -77,6 +77,7 @@ DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); DEFINE_EXPECT(GetBindString_ACCEPT_MIMES); DEFINE_EXPECT(GetBindString_USER_AGENT); +DEFINE_EXPECT(GetBindString_POST_COOKIE); DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); DEFINE_EXPECT(BeginningTransaction); @@ -96,7 +97,8 @@ static const WCHAR index_url[] = static HRESULT expect_hrResult; static LPCWSTR file_name, http_url, expect_wsz; static IInternetProtocol *http_protocol = NULL; -static BOOL first_data_notif = FALSE, http_is_first = FALSE; +static BOOL first_data_notif = FALSE, http_is_first = FALSE, + http_post_test = FALSE; static HWND protocol_hwnd; static int state = 0; static DWORD bindf = 0; @@ -136,13 +138,33 @@ static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate2 *iface) static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { + LPWSTR addl_headers; + + static const WCHAR wszHeaders[] = + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ','a','p','p','l','i','c','a','t', + 'i','o','n','/','x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o', + 'd','e','d','\r','\n',0}; + CHECK_EXPECT(BeginningTransaction); ok(!lstrcmpW(szURL, http_url), "szURL != http_url\n"); ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalHeaders) + { ok(*pszAdditionalHeaders == NULL, "*pszAdditionalHeaders != NULL\n"); + if (http_post_test) + { + addl_headers = CoTaskMemAlloc(sizeof(wszHeaders)); + if (!addl_headers) + { + skip("Out of memory\n"); + return E_OUTOFMEMORY; + } + lstrcpyW(addl_headers, wszHeaders); + *pszAdditionalHeaders = addl_headers; + } + } return S_OK; } @@ -266,10 +288,16 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; static const WCHAR host[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR post_host[] = + {'c','r','o','s','s','o','v','e','r','.','c','o','d','e', + 'w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR wszWineHQIP[] = {'2','0','9','.','4','6','.','2','5','.','1','3','4',0}; + static const WCHAR wszCrossoverIP[] = + {'2','0','9','.','4','6','.','2','5','.','1','3','2',0}; /* I'm not sure if it's a good idea to hardcode here the IP address... */ switch(ulStatusCode) { @@ -279,6 +307,10 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, if(szStatusText) { if(tested_protocol == BIND_TEST) ok(szStatusText == expect_wsz, "unexpected szStatusText\n"); + else if (http_post_test) + ok(lstrlenW(text_plain) <= lstrlenW(szStatusText) && + !memcmp(szStatusText, text_plain, lstrlenW(text_plain)*sizeof(WCHAR)), + "szStatusText != text/plain\n"); else ok(lstrlenW(text_html) <= lstrlenW(szStatusText) && !memcmp(szStatusText, text_html, lstrlenW(text_html)*sizeof(WCHAR)), @@ -311,13 +343,22 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_FINDINGRESOURCE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!lstrcmpW(szStatusText, host), "szStatustext != \"www.winehq.org\"\n"); + { + if (!http_post_test) + ok(!lstrcmpW(szStatusText, host), + "szStatustext != \"www.winehq.org\"\n"); + else + ok(!lstrcmpW(szStatusText, post_host), + "szStatustext != \"crossover.codeweavers.com\"\n"); + } break; case BINDSTATUS_CONNECTING: CHECK_EXPECT(ReportProgress_CONNECTING); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!lstrcmpW(szStatusText, wszWineHQIP), "Unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, http_post_test ? + wszCrossoverIP : wszWineHQIP), + "Unexpected szStatusText\n"); break; case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); @@ -361,6 +402,8 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR }else if(tested_protocol == HTTP_TEST) { if(!(grfBSCF & BSCF_LASTDATANOTIFICATION)) CHECK_EXPECT(ReportData); + else if (http_post_test) todo_wine + ok(ulProgress == 13, "Read %u bytes instead of 13\n", ulProgress); ok(ulProgress, "ulProgress == 0\n"); @@ -446,6 +489,8 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB { DWORD cbSize; + static const CHAR szPostData[] = "mode=Test"; + CHECK_EXPECT(GetBindInfo); ok(grfBINDF != NULL, "grfBINDF == NULL\n"); @@ -457,6 +502,22 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB memset(pbindinfo, 0, cbSize); pbindinfo->cbSize = cbSize; + if (http_post_test) + { + pbindinfo->dwBindVerb = BINDVERB_POST; + pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; + /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly + * with urlmon on native (Win98 and WinXP) */ + pbindinfo->stgmedData.hGlobal = GlobalAlloc(GPTR, sizeof(szPostData)); + if (!pbindinfo->stgmedData.hGlobal) + { + skip("Out of memory\n"); + return E_OUTOFMEMORY; + } + lstrcpy((LPSTR)pbindinfo->stgmedData.hGlobal, szPostData); + pbindinfo->cbstgmedData = sizeof(szPostData)-1; + } + return S_OK; } @@ -494,6 +555,12 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS memcpy(*ppwzStr, user_agent, sizeof(user_agent)); } return S_OK; + case BINDSTRING_POST_COOKIE: + CHECK_EXPECT(GetBindString_POST_COOKIE); + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); + if(pcElFetched) + ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + return S_OK; default: ok(0, "unexpected call\n"); } @@ -1081,6 +1148,8 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) SET_EXPECT(QueryService_HttpNegotiate); SET_EXPECT(BeginningTransaction); SET_EXPECT(GetRootSecurityId); + if (http_post_test) + SET_EXPECT(GetBindString_POST_COOKIE); hres = IInternetProtocol_Start(http_protocol, url, &protocol_sink, &bind_info, 0, 0); ok(hres == S_OK, "Start failed: %08x\n", hres); @@ -1105,6 +1174,8 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) CHECK_CALLED(BeginningTransaction); /* GetRootSecurityId called on WinXP but not on Win98 */ CLEAR_CALLED(GetRootSecurityId); + if (http_post_test) todo_wine + CHECK_CALLED(GetBindString_POST_COOKIE); return TRUE; } @@ -1191,6 +1262,10 @@ static void test_http_protocol(void) static const WCHAR winehq_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.', 'o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; + static const WCHAR posttest_url[] = + {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', + 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', + 'p','o','s','t','t','e','s','t','.','p','h','p',0}; tested_protocol = HTTP_TEST; bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; @@ -1198,6 +1273,12 @@ static void test_http_protocol(void) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; test_http_protocol_url(winehq_url, FALSE); + http_post_test = TRUE; + /* Without this flag we get a ReportProgress_CACHEFILENAMEAVAILABLE + * notification with BINDVERB_POST */ + bindf |= BINDF_NOWRITECACHE; + test_http_protocol_url(posttest_url, TRUE); + http_post_test = FALSE; } static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

Misha Koshelev : urlmon: Call HttpOpenRequest with INTERNET_FLAG_KEEP_CONNECTION, INTERNET_FLAG_NO_CACHE_WRITE if appropriate.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 2a4e41878d0ba56dcf5353a24d12eb9cb048b47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4e41878d0ba56dcf5353a24… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jul 20 19:55:55 2007 -0500 urlmon: Call HttpOpenRequest with INTERNET_FLAG_KEEP_CONNECTION, INTERNET_FLAG_NO_CACHE_WRITE if appropriate. --- dlls/urlmon/http.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 6a8e603..33d23b0 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -286,7 +286,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl HttpProtocol *This = PROTOCOL_THIS(iface); URL_COMPONENTSW url; BINDINFO bindinfo; - DWORD len = 0; + DWORD len = 0, request_flags = INTERNET_FLAG_KEEP_CONNECTION; ULONG num = 0; IServiceProvider *service_provider = 0; IHttpNegotiate2 *http_negotiate2 = 0; @@ -401,8 +401,10 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl } accept_mimes[num] = 0; + if (This->grfBINDF & BINDF_NOWRITECACHE) + request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; This->request = HttpOpenRequestW(This->connect, NULL, path, NULL, NULL, - (LPCWSTR *)accept_mimes, 0, (DWORD)This); + (LPCWSTR *)accept_mimes, request_flags, (DWORD)This); if (!This->request) { WARN("HttpOpenRequest failed: %d\n", GetLastError());

1 0

James Hawkins : msi: Ref count temporary columns and release them when necessary.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: ccef56f2cc6c253eb43fd4e8821456c959f2e908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccef56f2cc6c253eb43fd4e88… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 20 18:41:16 2007 -0700 msi: Ref count temporary columns and release them when necessary. --- dlls/msi/alter.c | 8 +++-- dlls/msi/create.c | 1 + dlls/msi/delete.c | 1 + dlls/msi/distinct.c | 1 + dlls/msi/insert.c | 1 + dlls/msi/join.c | 1 + dlls/msi/msipriv.h | 8 ++++- dlls/msi/order.c | 1 + dlls/msi/select.c | 1 + dlls/msi/sql.y | 14 +++++++-- dlls/msi/streams.c | 1 + dlls/msi/table.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/db.c | 35 ++++----------------- dlls/msi/update.c | 1 + dlls/msi/where.c | 1 + 15 files changed, 119 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccef56f2cc6c253eb43fd…

1 0

Vitaliy Margolen : server: Treat desktop as a top-level window.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: dcdf7c55d642bf584678ca44054f410f0634ec05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdf7c55d642bf584678ca440… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jul 20 07:15:39 2007 -0600 server: Treat desktop as a top-level window. --- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/win.c | 3 --- server/window.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d04028c..799c891 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9250,7 +9250,7 @@ static void test_SetForegroundWindow(void) trace("SetForegroundWindow( GetDesktopWindow() )\n"); SetForegroundWindow( GetDesktopWindow() ); ok_sequence(SetForegroundWindowSeq, "SetForegroundWindow( desktop ) away from " - "foreground top level window", TRUE); + "foreground top level window", FALSE); trace("done\n"); DestroyWindow(hwnd); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b5d2ad5..6cbddeb 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2213,12 +2213,9 @@ static void test_SetForegroundWindow(HWND hwnd) hwnd2 = GetForegroundWindow(); ok(hwnd2 == hwnd, "Wrong foreground window %p\n", hwnd2); - todo_wine - { ok(SetForegroundWindow( GetDesktopWindow() ), "SetForegroundWindow(desktop) error: %d\n", GetLastError()); hwnd2 = GetForegroundWindow(); ok(hwnd2 != hwnd, "Wrong foreground window %p\n", hwnd2); - } ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); diff --git a/server/window.c b/server/window.c index cbb4296..182213e 100644 --- a/server/window.c +++ b/server/window.c @@ -514,7 +514,7 @@ int is_child_window( user_handle_t parent, user_handle_t child ) int is_top_level_window( user_handle_t window ) { struct window *win = get_user_object( window, USER_WINDOW ); - return (win && win->parent && is_desktop_window(win->parent)); + return (win && (is_desktop_window(win) || is_desktop_window(win->parent))); } /* make a window active if possible */

1 0

Vitaliy Margolen : winex11drv: Correctly react to focus loss away from Wine .
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: d836a5062141dd42293ed044debbaf25f914f383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d836a5062141dd42293ed044d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jul 20 07:15:42 2007 -0600 winex11drv: Correctly react to focus loss away from Wine. --- dlls/winex11.drv/event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index aad09c6..1f9d2a9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -570,8 +570,8 @@ static void EVENT_FocusOut( HWND hwnd, XEvent *xev ) case we don't have to change the foreground window to 0 */ if (hwnd == GetForegroundWindow()) { - TRACE( "lost focus, setting fg to 0\n" ); - SetForegroundWindow( 0 ); + TRACE( "lost focus, setting fg to desktop\n" ); + SetForegroundWindow( GetDesktopWindow() ); } } }

1 0

Andrew Talbot : kernel32: Cast-qual warning fix.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 6c0ccbc23a2b8a79571224a512b2895c84975699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0ccbc23a2b8a79571224a51… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 20 21:36:39 2007 +0100 kernel32: Cast-qual warning fix. --- dlls/kernel32/resource.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 096a550..52a5f2e 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -968,7 +968,7 @@ static void *address_from_rva( void *base, DWORD mapping_size, DWORD rva, DWORD return NULL; if (rva + len <= (DWORD)sec->VirtualAddress + sec->SizeOfRawData) - return (void*)((const BYTE*) base + (sec->PointerToRawData + rva - sec->VirtualAddress)); + return (void*)((LPBYTE) base + (sec->PointerToRawData + rva - sec->VirtualAddress)); return NULL; }

1 0

Andrew Talbot : comcat: Cast-qual warning fix.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 815c3ccbdc50dfc9c43e382d609e64982ea0c9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=815c3ccbdc50dfc9c43e382d6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 20 21:36:36 2007 +0100 comcat: Cast-qual warning fix. --- dlls/comcat/information.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index 51032ac..cd5a9ea 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -39,7 +39,7 @@ static struct class_categories *COMCAT_PrepareClassCategories( static HRESULT COMCAT_IsClassOfCategories( HKEY key, struct class_categories const* class_categories); static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct( - struct class_categories const* class_categories); + struct class_categories *class_categories); static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct( REFCLSID rclsid, LPCWSTR impl_req); @@ -608,7 +608,7 @@ typedef struct { const IEnumGUIDVtbl *lpVtbl; LONG ref; - const struct class_categories *categories; + struct class_categories *categories; HKEY key; DWORD next_index; } CLSID_IEnumGUIDImpl; @@ -775,8 +775,7 @@ static const IEnumGUIDVtbl COMCAT_CLSID_IEnumGUID_Vtbl = COMCAT_CLSID_IEnumGUID_Clone }; -static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct( - struct class_categories const* categories) +static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(struct class_categories *categories) { CLSID_IEnumGUIDImpl *This;

1 0

Juan Lang : crypt32: Move decoding hash messages to a helper function.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 52cc727348a218ab42c35e3149b68532793ad02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cc727348a218ab42c35e314… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 20 14:43:12 2007 -0700 crypt32: Move decoding hash messages to a helper function. --- dlls/crypt32/msg.c | 68 ++++++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index c3d7b96..67a4024 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -693,6 +693,41 @@ static inline void CRYPT_FixUpAlgorithmID(CRYPT_ALGORITHM_IDENTIFIER *id) id->Parameters.pbData = (BYTE *)id->pszObjId + strlen(id->pszObjId) + 1; } +static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, + CRYPT_DER_BLOB *blob) +{ + BOOL ret; + CRYPT_DIGESTED_DATA *digestedData; + DWORD size; + + ret = CRYPT_AsnDecodePKCSDigestedData(blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_DIGESTED_DATA *)&digestedData, + &size); + if (ret) + { + msg->type = CMSG_HASHED; + ContextPropertyList_SetProperty(msg->properties, CMSG_VERSION_PARAM, + (const BYTE *)&digestedData->version, sizeof(digestedData->version)); + CDecodeMsg_SaveAlgorithmID(msg, CMSG_HASH_ALGORITHM_PARAM, + &digestedData->DigestAlgorithm); + ContextPropertyList_SetProperty(msg->properties, + CMSG_INNER_CONTENT_TYPE_PARAM, + (const BYTE *)digestedData->ContentInfo.pszObjId, + digestedData->ContentInfo.pszObjId ? + strlen(digestedData->ContentInfo.pszObjId) + 1 : 0); + if (digestedData->ContentInfo.Content.cbData) + CDecodeMsg_DecodeDataContent(msg, + &digestedData->ContentInfo.Content); + else + ContextPropertyList_SetProperty(msg->properties, + CMSG_CONTENT_PARAM, NULL, 0); + ContextPropertyList_SetProperty(msg->properties, CMSG_HASH_DATA_PARAM, + digestedData->hash.pbData, digestedData->hash.cbData); + LocalFree(digestedData); + } + return ret; +} + /* Decodes the content in blob as the type given, and updates the value * (type, parameters, etc.) of msg based on what blob contains. * It doesn't just use msg's type, to allow a recursive call from an implicitly @@ -702,7 +737,6 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, DWORD type) { BOOL ret; - DWORD size; switch (type) { @@ -711,38 +745,9 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, msg->type = CMSG_DATA; break; case CMSG_HASHED: - { - CRYPT_DIGESTED_DATA *digestedData; - - ret = CRYPT_AsnDecodePKCSDigestedData(blob->pbData, blob->cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_DIGESTED_DATA *)&digestedData, - &size); - if (ret) - { + if ((ret = CDecodeMsg_DecodeHashedContent(msg, blob))) msg->type = CMSG_HASHED; - ContextPropertyList_SetProperty(msg->properties, - CMSG_VERSION_PARAM, (const BYTE *)&digestedData->version, - sizeof(digestedData->version)); - CDecodeMsg_SaveAlgorithmID(msg, CMSG_HASH_ALGORITHM_PARAM, - &digestedData->DigestAlgorithm); - ContextPropertyList_SetProperty(msg->properties, - CMSG_INNER_CONTENT_TYPE_PARAM, - (const BYTE *)digestedData->ContentInfo.pszObjId, - digestedData->ContentInfo.pszObjId ? - strlen(digestedData->ContentInfo.pszObjId) + 1 : 0); - if (digestedData->ContentInfo.Content.cbData) - CDecodeMsg_DecodeDataContent(msg, - &digestedData->ContentInfo.Content); - else - ContextPropertyList_SetProperty(msg->properties, - CMSG_CONTENT_PARAM, NULL, 0); - ContextPropertyList_SetProperty(msg->properties, - CMSG_HASH_DATA_PARAM, digestedData->hash.pbData, - digestedData->hash.cbData); - LocalFree(digestedData); - } break; - } case CMSG_ENVELOPED: case CMSG_SIGNED: FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); @@ -751,6 +756,7 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, default: { CRYPT_CONTENT_INFO *info; + DWORD size; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_CONTENT_INFO, msg->msg_data.pbData, msg->msg_data.cbData, CRYPT_DECODE_ALLOC_FLAG,

1 0