March 2006 - Wine-Commits - list.winehq.org

Robert Shearman : ole32: Don' t process posted messages in CoWaitForMultipleHandles.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 8c7706bad04b90f4f9a7c25d94a27309d0347c80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c7706bad04b90f4f9a7c25… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:40:46 2006 +0100 ole32: Don't process posted messages in CoWaitForMultipleHandles. Tests with native show that during COM calls posted messages aren't retrieved other than COM calls so change the PeekMessage parameters in CoWaitForMultipleHandles to duplicate this. --- dlls/ole32/compobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ab87a5d..a82ed4a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2647,8 +2647,8 @@ static BOOL COM_PeekMessage(struct apart { /* first try to retrieve messages for incoming COM calls to the apartment window */ return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || - /* next retrieve all other messages */ - PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); + /* next retrieve other messages necessary for the app to remain responsive */ + PeekMessageW(msg, NULL, 0, WM_USER - 1, PM_REMOVE|PM_NOYIELD); } /***********************************************************************

1 0

Robert Shearman : ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function .
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: a1548b45d8c3d19fad5632f997da65e5deb4ce0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1548b45d8c3d19fad5632f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:39:03 2006 +0100 ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function. Put the PeekMessage call of CoWaitForMultipleHandles into a separate function so that the order and type of the messages retrieved can be customised in the future. --- dlls/ole32/compobj.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 32d7a73..9ab9478 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2643,6 +2643,11 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr } +static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) +{ + return PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); +} + /*********************************************************************** * CoWaitForMultipleHandles [OLE32.@] * @@ -2704,7 +2709,7 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD)) + while (COM_PeekMessage(apt, &msg)) { /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);

1 0

Robert Shearman : ole32: Whether the message loop is entered in CoWaitForMultipleHandles,
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 8c551796a99d5656efe487d1733ed8ce0dd63fda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c551796a99d5656efe487d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:38:42 2006 +0100 ole32: Whether the message loop is entered in CoWaitForMultipleHandles, should depend on whether the current apartment is a single threaded one. --- dlls/ole32/compobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2528b61..32d7a73 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2673,7 +2673,8 @@ HRESULT WINAPI CoWaitForMultipleHandles( { HRESULT hr = S_OK; DWORD start_time = GetTickCount(); - BOOL message_loop = TRUE; + APARTMENT *apt = COM_CurrentApt(); + BOOL message_loop = apt && !apt->multi_threaded; TRACE("(0x%08lx, 0x%08lx, %ld, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex);

1 0

Robert Shearman : ole32: Pass the no yield flag to PeekMessage.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 3091aa5302a60e1efc6518b3205dca5d4b7a7b02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3091aa5302a60e1efc6518b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:38:21 2006 +0100 ole32: Pass the no yield flag to PeekMessage. Pass the no yield flag to PeekMessage since we sleep in MsgWaitForMultipleObjectsEx and the extra context switch is wasteful. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7057450..2528b61 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2703,7 +2703,7 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD)) { /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);

1 0

Robert Shearman : server: Store the token source.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: d18711e2823796a31ae5a6f62757ea14761c6308 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d18711e2823796a31ae5a6f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:37:39 2006 +0100 server: Store the token source. --- server/token.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/token.c b/server/token.c index 53bbc13..c350fc9 100644 --- a/server/token.c +++ b/server/token.c @@ -82,6 +82,7 @@ struct token SID *user; /* SID of user this token represents */ unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ + TOKEN_SOURCE source; /* source of the token */ }; struct privilege @@ -413,7 +414,7 @@ static void token_destroy( struct object static struct token *create_token( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, - const ACL *default_dacl ) + const ACL *default_dacl, TOKEN_SOURCE source ) { struct token *token = alloc_object( &token_ops ); if (token) @@ -472,6 +473,8 @@ static struct token *create_token( unsig } else token->default_dacl = NULL; + + token->source = source; } return token; } @@ -576,12 +579,13 @@ struct token *token_create_admin( void ) { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, }; + static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; /* note: we just set the user sid to be the interactive builtin sid - * we should really translate the UNIX user id to a sid */ token = create_token( TRUE, &interactive_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), - default_dacl ); + default_dacl, admin_source ); } if (alias_admins_sid) @@ -1006,7 +1010,10 @@ DECL_HANDLER(duplicate_token) &token_ops ))) { /* FIXME: use req->impersonation_level */ - struct token *token = create_token( req->primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl ); + struct token *token = create_token( req->primary, src_token->user, + NULL, 0, NULL, 0, + src_token->default_dacl, + src_token->source ); if (token) { struct privilege *privilege;

1 0

Huw Davies : include: Add DFC_POPUPMENU.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: a3ec0a9466872ceee4517a01e815f4230b1ce58c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3ec0a9466872ceee4517a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 29 16:31:57 2006 +0100 include: Add DFC_POPUPMENU. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 56cc5e3..96926d8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3318,6 +3318,7 @@ typedef struct { #define DFC_MENU 2 #define DFC_SCROLL 3 #define DFC_BUTTON 4 +#define DFC_POPUPMENU 5 /* uState's */

1 0

Mike McCormack : wininet: Clean up HTTP_GetCustomHeaderIndex.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 92ddc1c851a01773221d3863dbad38a344630b0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92ddc1c851a01773221d386… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:20:04 2006 +0900 wininet: Clean up HTTP_GetCustomHeaderIndex. --- dlls/wininet/http.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1e32e4c..e93a4d7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2988,7 +2988,8 @@ static void HTTP_CloseHTTPSessionHandle( * Return index of custom header from header array * */ -static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField,int requested_index, BOOL request_only) +static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField, + int requested_index, BOOL request_only) { DWORD index; @@ -2996,19 +2997,18 @@ static INT HTTP_GetCustomHeaderIndex(LPW for (index = 0; index < lpwhr->nCustHeaders; index++) { - if (!strcmpiW(lpwhr->pCustHeaders[index].lpszField, lpszField)) - { - if ((request_only && - !(lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))|| - (!request_only && - (lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))) + if (strcmpiW(lpwhr->pCustHeaders[index].lpszField, lpszField)) + continue; + + if (request_only && !(lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST)) + continue; + + if (!request_only && (lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST)) continue; if (requested_index == 0) - break; - else - requested_index --; - } + break; + requested_index --; } if (index >= lpwhr->nCustHeaders)

1 0

Mike McCormack : wininet: Use a lookup table sorted by index so we don' t need a loop to do lookups.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 7f5e273214bb4d75824efc7133b366b4703450a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f5e273214bb4d75824efc7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:02:54 2006 +0900 wininet: Use a lookup table sorted by index so we don't need a loop to do lookups. --- dlls/wininet/http.c | 156 ++++++++++++++++++++++++++------------------------- 1 files changed, 79 insertions(+), 77 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 70dfc38..1e32e4c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1163,12 +1163,6 @@ lend: return handle; } -typedef struct std_hdr_data -{ - const WCHAR* hdrStr; - INT hdrIndex; -} std_hdr_data; - static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; static const WCHAR szAccept_Charset[] = { 'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0 }; static const WCHAR szAccept_Encoding[] = { 'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',0 }; @@ -1223,65 +1217,82 @@ static const WCHAR szVia[] = { 'V','i',' static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; -static const std_hdr_data SORTED_STANDARD_HEADERS[] = { - {szAccept, HTTP_QUERY_ACCEPT,}, - {szAccept_Charset, HTTP_QUERY_ACCEPT_CHARSET,}, - {szAccept_Encoding, HTTP_QUERY_ACCEPT_ENCODING,}, - {szAccept_Language, HTTP_QUERY_ACCEPT_LANGUAGE,}, - {szAccept_Ranges, HTTP_QUERY_ACCEPT_RANGES,}, - {szAge, HTTP_QUERY_AGE,}, - {szAllow, HTTP_QUERY_ALLOW,}, - {szAuthorization, HTTP_QUERY_AUTHORIZATION,}, - {szCache_Control, HTTP_QUERY_CACHE_CONTROL,}, - {szConnection, HTTP_QUERY_CONNECTION,}, - {szContent_Base, HTTP_QUERY_CONTENT_BASE,}, - {szContent_Encoding, HTTP_QUERY_CONTENT_ENCODING,}, - {szContent_ID, HTTP_QUERY_CONTENT_ID,}, - {szContent_Language, HTTP_QUERY_CONTENT_LANGUAGE,}, - {szContent_Length, HTTP_QUERY_CONTENT_LENGTH,}, - {szContent_Location, HTTP_QUERY_CONTENT_LOCATION,}, - {szContent_MD5, HTTP_QUERY_CONTENT_MD5,}, - {szContent_Range, HTTP_QUERY_CONTENT_RANGE,}, - {szContent_Transfer_Encoding,HTTP_QUERY_CONTENT_TRANSFER_ENCODING,}, - {szContent_Type, HTTP_QUERY_CONTENT_TYPE,}, - {szCookie, HTTP_QUERY_COOKIE,}, - {szDate, HTTP_QUERY_DATE,}, - {szETag, HTTP_QUERY_ETAG,}, - {szExpect, HTTP_QUERY_EXPECT,}, - {szExpires, HTTP_QUERY_EXPIRES,}, - {szFrom, HTTP_QUERY_DERIVED_FROM,}, - {szHost, HTTP_QUERY_HOST,}, - {szIf_Match, HTTP_QUERY_IF_MATCH,}, - {szIf_Modified_Since, HTTP_QUERY_IF_MODIFIED_SINCE,}, - {szIf_None_Match, HTTP_QUERY_IF_NONE_MATCH,}, - {szIf_Range, HTTP_QUERY_IF_RANGE,}, - {szIf_Unmodified_Since, HTTP_QUERY_IF_UNMODIFIED_SINCE,}, - {szLast_Modified, HTTP_QUERY_LAST_MODIFIED,}, - {szLocation, HTTP_QUERY_LOCATION,}, - {szMax_Forwards, HTTP_QUERY_MAX_FORWARDS,}, - {szMime_Version, HTTP_QUERY_MIME_VERSION,}, - {szPragma, HTTP_QUERY_PRAGMA,}, - {szProxy_Authenticate, HTTP_QUERY_PROXY_AUTHENTICATE,}, - {szProxy_Authorization, HTTP_QUERY_PROXY_AUTHORIZATION,}, - {szProxy_Connection, HTTP_QUERY_PROXY_CONNECTION,}, - {szPublic, HTTP_QUERY_PUBLIC,}, - {szRange, HTTP_QUERY_RANGE,}, - {szReferer, HTTP_QUERY_REFERER,}, - {szRetry_After, HTTP_QUERY_RETRY_AFTER,}, - {szServer, HTTP_QUERY_SERVER,}, - {szSet_Cookie, HTTP_QUERY_SET_COOKIE,}, - {szStatus, HTTP_QUERY_STATUS_CODE,}, - {szTransfer_Encoding, HTTP_QUERY_TRANSFER_ENCODING,}, - {szUnless_Modified_Since, HTTP_QUERY_UNLESS_MODIFIED_SINCE,}, - {szUpgrade, HTTP_QUERY_UPGRADE,}, - {szURI, HTTP_QUERY_URI,}, - {szUser_Agent, HTTP_QUERY_USER_AGENT,}, - {szVary, HTTP_QUERY_VARY,}, - {szVia, HTTP_QUERY_VIA,}, - {szWarning, HTTP_QUERY_WARNING,}, - {szWWW_Authenticate, HTTP_QUERY_WWW_AUTHENTICATE,}, +static const LPCWSTR header_lookup[] = { + szMime_Version, /* HTTP_QUERY_MIME_VERSION = 0 */ + szContent_Type, /* HTTP_QUERY_CONTENT_TYPE = 1 */ + szContent_Transfer_Encoding,/* HTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */ + szContent_ID, /* HTTP_QUERY_CONTENT_ID = 3 */ + NULL, /* HTTP_QUERY_CONTENT_DESCRIPTION = 4 */ + szContent_Length, /* HTTP_QUERY_CONTENT_LENGTH = 5 */ + szContent_Language, /* HTTP_QUERY_CONTENT_LANGUAGE = 6 */ + szAllow, /* HTTP_QUERY_ALLOW = 7 */ + szPublic, /* HTTP_QUERY_PUBLIC = 8 */ + szDate, /* HTTP_QUERY_DATE = 9 */ + szExpires, /* HTTP_QUERY_EXPIRES = 10 */ + szLast_Modified, /* HTTP_QUERY_LAST_MODIFIED = 11 */ + NULL, /* HTTP_QUERY_MESSAGE_ID = 12 */ + szURI, /* HTTP_QUERY_URI = 13 */ + szFrom, /* HTTP_QUERY_DERIVED_FROM = 14 */ + NULL, /* HTTP_QUERY_COST = 15 */ + NULL, /* HTTP_QUERY_LINK = 16 */ + szPragma, /* HTTP_QUERY_PRAGMA = 17 */ + NULL, /* HTTP_QUERY_VERSION = 18 */ + szStatus, /* HTTP_QUERY_STATUS_CODE = 19 */ + NULL, /* HTTP_QUERY_STATUS_TEXT = 20 */ + NULL, /* HTTP_QUERY_RAW_HEADERS = 21 */ + NULL, /* HTTP_QUERY_RAW_HEADERS_CRLF = 22 */ + szConnection, /* HTTP_QUERY_CONNECTION = 23 */ + szAccept, /* HTTP_QUERY_ACCEPT = 24 */ + szAccept_Charset, /* HTTP_QUERY_ACCEPT_CHARSET = 25 */ + szAccept_Encoding, /* HTTP_QUERY_ACCEPT_ENCODING = 26 */ + szAccept_Language, /* HTTP_QUERY_ACCEPT_LANGUAGE = 27 */ + szAuthorization, /* HTTP_QUERY_AUTHORIZATION = 28 */ + szContent_Encoding, /* HTTP_QUERY_CONTENT_ENCODING = 29 */ + NULL, /* HTTP_QUERY_FORWARDED = 30 */ + NULL, /* HTTP_QUERY_FROM = 31 */ + szIf_Modified_Since, /* HTTP_QUERY_IF_MODIFIED_SINCE = 32 */ + szLocation, /* HTTP_QUERY_LOCATION = 33 */ + NULL, /* HTTP_QUERY_ORIG_URI = 34 */ + szReferer, /* HTTP_QUERY_REFERER = 35 */ + szRetry_After, /* HTTP_QUERY_RETRY_AFTER = 36 */ + szServer, /* HTTP_QUERY_SERVER = 37 */ + NULL, /* HTTP_TITLE = 38 */ + szUser_Agent, /* HTTP_QUERY_USER_AGENT = 39 */ + szWWW_Authenticate, /* HTTP_QUERY_WWW_AUTHENTICATE = 40 */ + szProxy_Authenticate, /* HTTP_QUERY_PROXY_AUTHENTICATE = 41 */ + szAccept_Ranges, /* HTTP_QUERY_ACCEPT_RANGES = 42 */ + szSet_Cookie, /* HTTP_QUERY_SET_COOKIE = 43 */ + szCookie, /* HTTP_QUERY_COOKIE = 44 */ + NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */ + NULL, /* HTTP_QUERY_REFRESH = 46 */ + NULL, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ + szAge, /* HTTP_QUERY_AGE = 48 */ + szCache_Control, /* HTTP_QUERY_CACHE_CONTROL = 49 */ + szContent_Base, /* HTTP_QUERY_CONTENT_BASE = 50 */ + szContent_Location, /* HTTP_QUERY_CONTENT_LOCATION = 51 */ + szContent_MD5, /* HTTP_QUERY_CONTENT_MD5 = 52 */ + szContent_Range, /* HTTP_QUERY_CONTENT_RANGE = 53 */ + szETag, /* HTTP_QUERY_ETAG = 54 */ + szHost, /* HTTP_QUERY_HOST = 55 */ + szIf_Match, /* HTTP_QUERY_IF_MATCH = 56 */ + szIf_None_Match, /* HTTP_QUERY_IF_NONE_MATCH = 57 */ + szIf_Range, /* HTTP_QUERY_IF_RANGE = 58 */ + szIf_Unmodified_Since, /* HTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */ + szMax_Forwards, /* HTTP_QUERY_MAX_FORWARDS = 60 */ + szProxy_Authorization, /* HTTP_QUERY_PROXY_AUTHORIZATION = 61 */ + szRange, /* HTTP_QUERY_RANGE = 62 */ + szTransfer_Encoding, /* HTTP_QUERY_TRANSFER_ENCODING = 63 */ + szUpgrade, /* HTTP_QUERY_UPGRADE = 64 */ + szVary, /* HTTP_QUERY_VARY = 65 */ + szVia, /* HTTP_QUERY_VIA = 66 */ + szWarning, /* HTTP_QUERY_WARNING = 67 */ + szExpect, /* HTTP_QUERY_EXPECT = 68 */ + szProxy_Connection, /* HTTP_QUERY_PROXY_CONNECTION = 69 */ + szUnless_Modified_Since, /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ }; +#define LAST_TABLE_HEADER (sizeof(header_lookup)/sizeof(header_lookup[0])) + /*********************************************************************** * HTTP_HttpQueryInfoW (internal) */ @@ -1384,20 +1395,11 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } default: - if (level >= 0 && level <= HTTP_QUERY_MAX ) - { - int i; - for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) - { - if (SORTED_STANDARD_HEADERS[i].hdrIndex == level) - { - index = HTTP_GetCustomHeaderIndex(lpwhr, - (LPWSTR)SORTED_STANDARD_HEADERS[i].hdrStr, - requested_index,request_only); - break; - } - } - } + assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); + + if (level >= 0 && level < LAST_TABLE_HEADER && header_lookup[level]) + index = HTTP_GetCustomHeaderIndex(lpwhr, header_lookup[level], + requested_index,request_only); } if (index >= 0)

1 0

Mike McCormack : WININET: Clean up HttpQueryInfo.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: ae300883faa29ddad5c65aeac5cad682380e4cd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae300883faa29ddad5c65ae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:01:48 2006 +0900 WININET: Clean up HttpQueryInfo. Fixes another return FALSE without SetLastError. --- dlls/wininet/http.c | 76 ++++++++++++++++++--------------------------------- 1 files changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 48026a0..70dfc38 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1291,28 +1291,18 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPHTTPHEADERW lphttpHdr = NULL; BOOL bSuccess = FALSE; BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS; - + INT requested_index = lpdwIndex ? *lpdwIndex : 0; + INT level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); + INT index = -1; /* Find requested header structure */ - if ((dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK) == HTTP_QUERY_CUSTOM) + switch (level) { - INT requested_index = (lpdwIndex)?(*lpdwIndex):0; - INT index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)lpBuffer, - requested_index,request_only); + case HTTP_QUERY_CUSTOM: + index = HTTP_GetCustomHeaderIndex(lpwhr, lpBuffer, requested_index, request_only); + break; - if (index < 0) - return bSuccess; - else - lphttpHdr = &lpwhr->pCustHeaders[index]; - - if (lpdwIndex) - (*lpdwIndex)++; - } - else - { - INT index = dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK; - - if (index == HTTP_QUERY_RAW_HEADERS_CRLF) + case HTTP_QUERY_RAW_HEADERS_CRLF: { DWORD len = strlenW(lpwhr->lpszRawHeaders); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1328,7 +1318,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_RAW_HEADERS) + case HTTP_QUERY_RAW_HEADERS: { static const WCHAR szCrLf[] = {'\r','\n',0}; LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(lpwhr->lpszRawHeaders, szCrLf); @@ -1361,7 +1351,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_STATUS_TEXT) + case HTTP_QUERY_STATUS_TEXT: { DWORD len = strlenW(lpwhr->lpszStatusText); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1377,7 +1367,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_VERSION) + case HTTP_QUERY_VERSION: { DWORD len = strlenW(lpwhr->lpszVersion); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1393,50 +1383,38 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index >= 0 && index <= HTTP_QUERY_MAX ) - { + default: + if (level >= 0 && level <= HTTP_QUERY_MAX ) + { int i; - for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) + for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) { - if (SORTED_STANDARD_HEADERS[i].hdrIndex == index) + if (SORTED_STANDARD_HEADERS[i].hdrIndex == level) { - INT requested_index = (lpdwIndex)?(*lpdwIndex):0; - INT index = HTTP_GetCustomHeaderIndex(lpwhr, + index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)SORTED_STANDARD_HEADERS[i].hdrStr, requested_index,request_only); - - if (index < 0) - break; - lphttpHdr = &lpwhr->pCustHeaders[index]; - - if (lpdwIndex) - (*lpdwIndex)++; - break; } } - - if (!lphttpHdr) - { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; - } - } - else - { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; } } + if (index >= 0) + lphttpHdr = &lpwhr->pCustHeaders[index]; + /* Ensure header satisifies requested attributes */ - if ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && - (~lphttpHdr->wFlags & HDR_ISREQUEST)) + if (!lphttpHdr || + ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && + (~lphttpHdr->wFlags & HDR_ISREQUEST))) { SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; + return bSuccess; } + if (lpdwIndex) + (*lpdwIndex)++; + /* coalesce value to reuqested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) {

1 0

Mike McCormack : ole32: Fix StgOpenStorage' s handling of the STGM_PRIORITY flag.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 50436da519531d3a6981ec22c22958a1f21fc1b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50436da519531d3a6981ec2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 17:09:25 2006 +0900 ole32: Fix StgOpenStorage's handling of the STGM_PRIORITY flag. --- dlls/ole32/storage32.c | 2 +- dlls/ole32/tests/storage32.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 215413e..bbb2d3c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5911,7 +5911,7 @@ HRESULT WINAPI StgOpenStorage( /* * Validate the sharing mode */ - if (!(grfMode & STGM_TRANSACTED)) + if (!(grfMode & (STGM_TRANSACTED|STGM_PRIORITY))) switch(STGM_SHARE_MODE(grfMode)) { case STGM_SHARE_EXCLUSIVE: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 4ac4144..7ed9655 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -448,6 +448,32 @@ static void test_open_storage(void) ok(r == 0, "wrong ref count\n"); } + /* open like visio 2003 */ + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_DENY_NONE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + + /* test other sharing modes with STGM_PRIORITY */ + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_DENY_READ, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + r = DeleteFileW(filename); ok(r, "file didn't exist\n"); }

1 0