December 2009 - Wine-commits

Alexandre Julliard : server: Set the idle event when retrieving a timer message.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 7265e89226993d28bbae6c4c6da22e3b8daf8562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7265e89226993d28bbae6c4c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 18:18:07 2009 +0100 server: Set the idle event when retrieving a timer message. --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 052bef2..d6d8b6a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12038,7 +12038,7 @@ static const struct { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, { 0, 0, FALSE }, -/* 10 */ { 0, 0, TRUE }, +/* 10 */ { 0, 0, FALSE }, { 0, 0, FALSE }, { 0, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, diff --git a/server/queue.c b/server/queue.c index 3ab8d00..d880dff 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1814,6 +1814,8 @@ DECL_HANDLER(get_message) reply->wparam = timer->id; reply->lparam = timer->lparam; reply->time = get_tick_count(); + if (!(req->flags & PM_NOYIELD) && current->process->idle_event) + set_event( current->process->idle_event ); return; }

1 0

Hans Leidekker : msi: Replace the string table hash with a sorted index.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 2c526b7fe73ebffff7ae13059b6db7a38b7f880f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c526b7fe73ebffff7ae13059… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 16 11:11:45 2009 +0100 msi: Replace the string table hash with a sorted index. --- dlls/msi/string.c | 105 ++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 71 insertions(+), 34 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index e5b5cc2..5359104 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -40,12 +40,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -#define HASH_SIZE 0x101 #define LONG_STR_BYTES 3 typedef struct _msistring { - int hash_next; UINT persistent_refcount; UINT nonpersistent_refcount; LPWSTR str; @@ -56,30 +54,15 @@ struct string_table UINT maxcount; /* the number of strings */ UINT freeslot; UINT codepage; - int hash[HASH_SIZE]; - msistring *strings; /* an array of strings (in the tree) */ + UINT sortcount; + BOOL valid_index; + msistring *strings; /* an array of strings */ + UINT *sorted; /* index */ }; -static UINT msistring_makehash( const WCHAR *str ) -{ - UINT hash = 0; - - if (str==NULL) - return hash; - - while( *str ) - { - hash ^= *str++; - hash *= 53; - hash = (hash<<5) | (hash>>27); - } - return hash % HASH_SIZE; -} - static string_table *init_stringtable( int entries, UINT codepage ) { string_table *st; - int i; if (codepage != CP_ACP && !IsValidCodePage(codepage)) { @@ -92,18 +75,26 @@ static string_table *init_stringtable( int entries, UINT codepage ) return NULL; if( entries < 1 ) entries = 1; + st->strings = msi_alloc_zero( sizeof (msistring) * entries ); if( !st->strings ) { msi_free( st ); return NULL; } + + st->sorted = msi_alloc( sizeof (UINT) * entries ); + if( !st->sorted ) + { + msi_free( st->strings ); + msi_free( st ); + return NULL; + } + st->maxcount = entries; st->freeslot = 1; st->codepage = codepage; - - for( i=0; i<HASH_SIZE; i++ ) - st->hash[i] = -1; + st->sortcount = 0; return st; } @@ -119,12 +110,13 @@ VOID msi_destroy_stringtable( string_table *st ) msi_free( st->strings[i].str ); } msi_free( st->strings ); + msi_free( st->sorted ); msi_free( st ); } static int st_find_free_entry( string_table *st ) { - UINT i, sz; + UINT i, sz, *s; msistring *p; TRACE("%p\n", st); @@ -146,7 +138,17 @@ static int st_find_free_entry( string_table *st ) p = msi_realloc_zero( st->strings, sz*sizeof(msistring) ); if( !p ) return -1; + + s = msi_realloc( st->sorted, sz*sizeof(UINT) ); + if( !s ) + { + msi_free( p ); + return -1; + } + st->strings = p; + st->sorted = s; + st->freeslot = st->maxcount; st->maxcount = sz; if( st->strings[st->freeslot].persistent_refcount || @@ -155,10 +157,40 @@ static int st_find_free_entry( string_table *st ) return st->freeslot; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) +static int find_insert_index( const string_table *st, UINT string_id ) { - UINT hash = msistring_makehash( str ); + int i, c, low = 0, high = st->sortcount - 1; + + while (low <= high) + { + i = (low + high) / 2; + c = lstrcmpW( st->strings[string_id].str, st->strings[st->sorted[i]].str ); + if (c < 0) + high = i - 1; + else if (c > 0) + low = i + 1; + else + return -1; /* already exists */ + } + return high + 1; +} + +static void insert_string_sorted( string_table *st, UINT string_id ) +{ + int i; + + i = find_insert_index( st, string_id ); + if (i == -1) + return; + + memmove( &st->sorted[i] + 1, &st->sorted[i], (st->sortcount - i) * sizeof(UINT) ); + st->sorted[i] = string_id; + st->sortcount++; +} + +static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) +{ if (persistence == StringPersistent) { st->strings[n].persistent_refcount = refcount; @@ -172,8 +204,7 @@ static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, e st->strings[n].str = str; - st->strings[n].hash_next = st->hash[hash]; - st->hash[hash] = n; + insert_string_sorted( st, n ); if( n < st->maxcount ) st->freeslot = n + 1; @@ -382,14 +413,20 @@ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT */ UINT msi_string2idW( const string_table *st, LPCWSTR str, UINT *id ) { - UINT n, hash = msistring_makehash( str ); - msistring *se = st->strings; + int i, c, low = 0, high = st->sortcount - 1; - for (n = st->hash[hash]; n != -1; n = st->strings[n].hash_next ) + while (low <= high) { - if ((str == se[n].str) || !lstrcmpW(str, se[n].str)) + i = (low + high) / 2; + c = lstrcmpW( str, st->strings[st->sorted[i]].str ); + + if (c < 0) + high = i - 1; + else if (c > 0) + low = i + 1; + else { - *id = n; + *id = st->sorted[i]; return ERROR_SUCCESS; } }

1 0

Alexandre Julliard : user32: Add a Wow handler for the mdi client class.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 314d2c3e1c3b45adba67ce1fce6083d87c74a4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314d2c3e1c3b45adba67ce1fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 13:22:08 2009 +0100 user32: Add a Wow handler for the mdi client class. --- dlls/user32/controls.h | 3 +++ dlls/user32/mdi.c | 31 +++++++------------------------ dlls/user32/msg16.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 2 ++ 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 9adb031..45dd2d0 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -65,6 +65,7 @@ struct wow_handlers16 LRESULT (*combo_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*edit_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*listbox_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); @@ -77,6 +78,7 @@ struct wow_handlers32 LRESULT (*combo_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*edit_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*listbox_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); WNDPROC (*alloc_winproc)(WNDPROC,WNDPROC); @@ -88,6 +90,7 @@ extern LRESULT ButtonWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE extern LRESULT ComboWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT EditWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT ListBoxWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; +extern LRESULT MDIClientWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT ScrollBarWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 7e017b0..e1910f8 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -93,7 +93,6 @@ #include "wingdi.h" #include "winuser.h" #include "wownt32.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "win.h" #include "controls.h" @@ -1045,8 +1044,7 @@ static void MDI_UpdateFrameText( HWND frame, HWND hClient, BOOL repaint, LPCWSTR /********************************************************************** * MDIClientWndProc_common */ -static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { MDICLIENTINFO *ci; @@ -1070,26 +1068,11 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, { /* Since we are using only cs->lpCreateParams, we can safely * cast to LPCREATESTRUCTA here */ - LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; - WND *wndPtr = WIN_GetPtr( hwnd ); - - /* Translation layer doesn't know what's in the cs->lpCreateParams - * so we have to keep track of what environment we're in. */ - - if( wndPtr->flags & WIN_ISWIN32 ) - { - LPCLIENTCREATESTRUCT ccs = cs->lpCreateParams; - ci->hWindowMenu = ccs->hWindowMenu; - ci->idFirstChild = ccs->idFirstChild; - } - else - { - LPCLIENTCREATESTRUCT16 ccs = MapSL(PtrToUlong(cs->lpCreateParams)); - ci->hWindowMenu = HMENU_32(ccs->hWindowMenu); - ci->idFirstChild = ccs->idFirstChild; - } - WIN_ReleasePtr( wndPtr ); + LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; + LPCLIENTCREATESTRUCT ccs = cs->lpCreateParams; + ci->hWindowMenu = ccs->hWindowMenu; + ci->idFirstChild = ccs->idFirstChild; ci->hwndChildMaximized = 0; ci->child = NULL; ci->nActiveChildren = 0; @@ -1294,7 +1277,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; - return MDIClientWndProc_common( hwnd, message, wParam, lParam, FALSE ); + return wow_handlers.mdiclient_proc( hwnd, message, wParam, lParam, FALSE ); } /*********************************************************************** @@ -1303,7 +1286,7 @@ static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; - return MDIClientWndProc_common( hwnd, message, wParam, lParam, TRUE ); + return wow_handlers.mdiclient_proc( hwnd, message, wParam, lParam, TRUE ); } /*********************************************************************** diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index a39c35c..27a47a4 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2493,6 +2493,42 @@ static LRESULT listbox_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam /*********************************************************************** + * mdiclient_proc16 + */ +static LRESULT mdiclient_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + if (msg == WM_CREATE) + { + LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; + WND *win; + BOOL is_win32; + + if (!(win = WIN_GetPtr( hwnd ))) return 0; + is_win32 = (win == WND_OTHER_PROCESS || win == WND_DESKTOP || (win->flags & WIN_ISWIN32)); + WIN_ReleasePtr( win ); + + /* Translation layer doesn't know what's in the cs->lpCreateParams + * so we have to keep track of what environment we're in. */ + if (!is_win32) + { + void *orig = cs->lpCreateParams; + LRESULT ret; + CLIENTCREATESTRUCT ccs; + CLIENTCREATESTRUCT16 *ccs16 = MapSL( PtrToUlong( orig )); + + ccs.hWindowMenu = HMENU_32(ccs16->hWindowMenu); + ccs.idFirstChild = ccs16->idFirstChild; + cs->lpCreateParams = &ccs; + ret = wow_handlers32.mdiclient_proc( hwnd, msg, wParam, lParam, unicode ); + cs->lpCreateParams = orig; + return ret; + } + } + return wow_handlers32.mdiclient_proc( hwnd, msg, wParam, lParam, unicode ); +} + + +/*********************************************************************** * scrollbar_proc16 */ static LRESULT scrollbar_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) @@ -2550,6 +2586,7 @@ void register_wow_handlers(void) combo_proc16, edit_proc16, listbox_proc16, + mdiclient_proc16, scrollbar_proc16, static_proc16, call_window_proc_Ato16, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 268bda5..0bde530 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1044,6 +1044,7 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->combo_proc = ComboWndProc_common; orig->edit_proc = EditWndProc_common; orig->listbox_proc = ListBoxWndProc_common; + orig->mdiclient_proc = MDIClientWndProc_common; orig->scrollbar_proc = ScrollBarWndProc_common; orig->static_proc = StaticWndProc_common; orig->alloc_winproc = WINPROC_AllocProc; @@ -1057,6 +1058,7 @@ struct wow_handlers16 wow_handlers = ComboWndProc_common, EditWndProc_common, ListBoxWndProc_common, + MDIClientWndProc_common, ScrollBarWndProc_common, StaticWndProc_common, NULL, /* call_window_proc */

1 0

Andrew Nguyen : clusapi: Don't trace the contents of output pointers.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 0cc09adf7ed331e2e9481ccb7a96f8a6d7a69890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc09adf7ed331e2e9481ccb7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 16 05:36:55 2009 -0600 clusapi: Don't trace the contents of output pointers. The issue was detected with Valgrind. --- dlls/clusapi/clusapi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index fa90de3..f782d43 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clusapi); */ DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState) { - FIXME("(%s,%p,%u) stub!\n",debugstr_w(lpszNodeName),pdwClusterState, *pdwClusterState); + FIXME("(%s,%p) stub!\n",debugstr_w(lpszNodeName),pdwClusterState); *pdwClusterState = 0; @@ -97,7 +97,7 @@ DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum) */ DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName) { - FIXME("(%p, %u, %u, %p, %u) stub!\n", hEnum, dwIndex, *lpdwType, lpszName, *lpcchName); + FIXME("(%p, %u, %p, %p, %u) stub!\n", hEnum, dwIndex, lpdwType, lpszName, *lpcchName); return ERROR_NO_MORE_ITEMS; }

1 0

André Hentschel : msvcrtd: Remove unnecessary trace output.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: f27ba37bb8fdde33cf9c27fd9a1e3ff06f4d98d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27ba37bb8fdde33cf9c27fd9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 16 15:24:20 2009 +0100 msvcrtd: Remove unnecessary trace output. --- dlls/msvcrtd/debug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c index 7e2fa0d..3ddfbbc 100644 --- a/dlls/msvcrtd/debug.c +++ b/dlls/msvcrtd/debug.c @@ -47,7 +47,7 @@ void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse, { void *retval = NULL; - TRACE("(%lu, %d, '%s', %d) returning %p\n", nSize, nBlockUse, szFileName, nLine, retval); + TRACE("(%lu, %d, '%s', %d)\n", nSize, nBlockUse, szFileName, nLine); switch(_BLOCK_TYPE(nBlockUse)) {

1 0

Paul Vriens : cryptnet/tests: Fix some test failures on W2K with just SP3 or SP4.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 19e63d11ceaeb1c2bd07ffe41ba8b64fb2a0598e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e63d11ceaeb1c2bd07ffe41… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 14:00:01 2009 +0100 cryptnet/tests: Fix some test failures on W2K with just SP3 or SP4. --- dlls/cryptnet/tests/cryptnet.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 83060b6..1cdafa4 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -670,9 +670,12 @@ static void test_verifyRevocation(void) revPara.pftTimeToUse = &time; ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, + ok(!ret, "Expected failure\n"); + ok(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + broken(GetLastError() == CRYPT_E_REVOKED), /* W2K SP3/SP4 */ "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + broken(GetLastError() == CRYPT_E_REVOKED), /* W2K SP3/SP4 */ "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0);

1 0

Paul Vriens : ntdll/tests: Fix a test failure on NT4/W2K.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 8199784eaf791b1464e28d7d851620527198c0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8199784eaf791b1464e28d7d8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 14:48:52 2009 +0100 ntdll/tests: Fix a test failure on NT4/W2K. --- dlls/ntdll/tests/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index c16b461..a77a4b4 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -175,7 +175,7 @@ static void test_NtQueryDirectoryFile(void) ok(0,"RtlDosPathNametoNtPathName_U failed\n"); goto done; } - InitializeObjectAttributes(&attr, &ntdirname, 0, 0, NULL); + InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE);

1 0

Piotr Caban : urlmon: Added PARSE_ROOTDOCUMENT to CoInternetParseUrl.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 18069b2d0d276582343c618af65f4915c332cbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18069b2d0d276582343c618af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:48:09 2009 +0100 urlmon: Added PARSE_ROOTDOCUMENT to CoInternetParseUrl. --- dlls/urlmon/internet.c | 72 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/urlmon/tests/misc.c | 23 +++++++++++---- 2 files changed, 86 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index c72ac42..6a79e48 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -38,6 +38,9 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, if(ptr) len = ptr-url; + if(rsize) + *rsize = len; + if(len >= size) return E_POINTER; @@ -45,9 +48,6 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, memcpy(result, url, len*sizeof(WCHAR)); result[len] = 0; - if(rsize) - *rsize = len; - return S_OK; } @@ -200,6 +200,70 @@ static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result, return S_OK; } +static HRESULT parse_rootdocument(LPCWSTR url, DWORD flags, LPWSTR result, + DWORD size, DWORD *rsize) +{ + IInternetProtocolInfo *protocol_info; + PARSEDURLW url_info; + HRESULT hres; + + TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + + protocol_info = get_protocol_info(url); + + if(protocol_info) { + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_ROOTDOCUMENT, + flags, result, size, rsize, 0); + IInternetProtocolInfo_Release(protocol_info); + if(SUCCEEDED(hres)) + return hres; + } + + url_info.cbSize = sizeof(url_info); + if(FAILED(ParseURLW(url, &url_info))) + return E_FAIL; + + switch(url_info.nScheme) { + case URL_SCHEME_FTP: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + if(url_info.cchSuffix<3 || *(url_info.pszSuffix)!='/' + || *(url_info.pszSuffix+1)!='/') + return E_FAIL; + + if(size < url_info.cchProtocol+3) { + size = 0; + hres = UrlGetPartW(url, result, &size, URL_PART_HOSTNAME, flags); + + if(rsize) + *rsize = size+url_info.cchProtocol+3; + + if(hres == E_POINTER) + return S_FALSE; + + return hres; + } + + size -= url_info.cchProtocol+3; + hres = UrlGetPartW(url, result+url_info.cchProtocol+3, + &size, URL_PART_HOSTNAME, flags); + + if(hres == E_POINTER) + return S_FALSE; + + if(FAILED(hres)) + return E_FAIL; + + if(rsize) + *rsize = size+url_info.cchProtocol+3; + + memcpy(result, url, (url_info.cchProtocol+3)*sizeof(WCHAR)); + return hres; + default: + return E_FAIL; + } +} + /************************************************************************** * CoInternetParseUrl (URLMON.@) */ @@ -224,6 +288,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD return parse_security_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_DOMAIN: return parse_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); + case PARSE_ROOTDOCUMENT: + return parse_rootdocument(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); default: FIXME("not supported action %d\n", ParseAction); } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index f6d5c87..f9c2de9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -271,6 +271,8 @@ static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; static const WCHAR wszEmpty[] = {0}; static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR wszHttpWineHQ[] = {'h','t','t','p',':','/','/','w','w','w','.', + 'w','i','n','e','h','q','.','o','r','g',0}; struct parse_test { LPCWSTR url; @@ -281,15 +283,17 @@ struct parse_test { LPCWSTR schema; LPCWSTR domain; HRESULT domain_hres; + LPCWSTR rootdocument; + HRESULT rootdocument_hres; }; static const struct parse_test parse_tests[] = { - {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes, NULL, E_FAIL}, - {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL}, - {url3, E_FAIL, url3, S_OK, path3, wszFile, wszEmpty, S_OK}, - {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK}, - {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK}, - {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL} + {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes, NULL, E_FAIL, NULL, E_FAIL}, + {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL, NULL, E_FAIL}, + {url3, E_FAIL, url3, S_OK, path3, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, + {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, + {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK, wszHttpWineHQ, S_OK}, + {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL, NULL, E_FAIL}, }; static void test_CoInternetParseUrl(void) @@ -342,6 +346,13 @@ static void test_CoInternetParseUrl(void) ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); if(parse_tests[i].domain) ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); + + memset(buf, 0xf0, sizeof(buf)); + hres = CoInternetParseUrl(parse_tests[i].url, PARSE_ROOTDOCUMENT, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == parse_tests[i].rootdocument_hres, "[%d] rootdocument failed: %08x\n", i, hres); + if(parse_tests[i].rootdocument) + ok(!lstrcmpW(parse_tests[i].rootdocument, buf), "[%d] wrong rootdocument, received %s\n", i, wine_dbgstr_w(buf)); } }

1 0

Piotr Caban : urlmon: Added CoInternetGetSecurityUrl implementation.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 73c3160674ef454711613486b79c831251e05e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c3160674ef454711613486b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:48:23 2009 +0100 urlmon: Added CoInternetGetSecurityUrl implementation. --- dlls/urlmon/sec_mgr.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++- include/urlmon.idl | 1 + 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 968a987..c242274 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1234,6 +1234,64 @@ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneM */ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) { - FIXME("(%p,%p,%u,%u): stub\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); - return E_NOTIMPL; + WCHAR url[INTERNET_MAX_URL_LENGTH], domain[INTERNET_MAX_URL_LENGTH]; + DWORD len; + HRESULT hres; + + TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); + + hres = CoInternetParseUrl(pwzUrl, PARSE_SECURITY_URL, 0, url, INTERNET_MAX_URL_LENGTH, &len, 0); + if(hres==S_OK) { + if(psuAction == PSU_DEFAULT) + hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, domain, + INTERNET_MAX_URL_LENGTH, &len, 0); + + if(psuAction==PSU_SECURITY_URL_ONLY || hres!=S_OK) { + len = lstrlenW(url)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; + + memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); + return S_OK; + } + + len++; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; + + memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); + return S_OK; + } + + if(psuAction == PSU_DEFAULT) { + hres = CoInternetParseUrl(pwzUrl, PARSE_ROOTDOCUMENT, 0, url, 0, &len, 0); + if(hres == S_FALSE) { + hres = CoInternetParseUrl(pwzUrl, PARSE_SCHEMA, 0, domain, + INTERNET_MAX_URL_LENGTH, &len, 0); + if(hres == S_OK) { + domain[len] = ':'; + hres = CoInternetParseUrl(pwzUrl, PARSE_DOMAIN, 0, domain+len+1, + INTERNET_MAX_URL_LENGTH-len-1, &len, 0); + if(hres == S_OK) { + len = lstrlenW(domain)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; + + memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); + return S_OK; + } + } + } + } + + len = lstrlenW(pwzUrl)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; + + memcpy(*ppwzSecUrl, pwzUrl, len*sizeof(WCHAR)); + return S_OK; } diff --git a/include/urlmon.idl b/include/urlmon.idl index 78afd16..828cbd2 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1758,6 +1758,7 @@ cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IIntern cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") +cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

Maarten Lankhorst : include: Add endpointvolume.idl.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: cd6d9e8359cc361e996da50d217f9f1f52eb323f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6d9e8359cc361e996da50d2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 16 10:36:03 2009 +0100 include: Add endpointvolume.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/endpointvolume.idl | 148 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index dcf494f..4b1166a 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,7 @@ include/docobj.h include/downloadmgr.h include/dxgi.h include/dxgitype.h +include/endpointvolume.h include/exdisp.h include/fusion.h include/hlink.h diff --git a/include/Makefile.in b/include/Makefile.in index b640428..f957a7b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -32,6 +32,7 @@ PUBLIC_IDL_H_SRCS = \ downloadmgr.idl \ dxgi.idl \ dxgitype.idl \ + endpointvolume.idl \ exdisp.idl \ fusion.idl \ hlink.idl \ diff --git a/include/endpointvolume.idl b/include/endpointvolume.idl new file mode 100644 index 0000000..f58450a --- /dev/null +++ b/include/endpointvolume.idl @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "devicetopology.idl"; + +typedef struct AUDIO_VOLUME_NOTIFICATION_DATA +{ + GUID guidEventContext; + BOOL bMuted; + FLOAT fMasterVolume; + UINT nChannels; + FLOAT afChannelVolumes[1]; +} AUDIO_VOLUME_NOTIFICATION_DATA; + +cpp_quote("typedef struct AUDIO_VOLUME_NOTIFICATION_DATA *PAUDIO_VOLUME_NOTIFICATION_DATA;") + +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_VOLUME 0x1\n") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_MUTE 0x2\n") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_METER 0x4\n") + +interface IAudioEndpointVolumeCallback; +interface IAudioEndpointVolume; +interface IAudioEndpointVolumeEx; +interface IAudioMeterInformation; + +[ + pointer_default(unique), + nonextensible, + uuid(657804fa-d6ad-4496-8a60-352752af4f89), + local, + object +] +interface IAudioEndpointVolumeCallback : IUnknown +{ + HRESULT OnNotify( + AUDIO_VOLUME_NOTIFICATION_DATA *pNotify + ); +} + +[ + pointer_default(unique), + nonextensible, + uuid(5cdf2c82-841e-4546-9722-0cf74078229a), + local, + object +] +interface IAudioEndpointVolume : IUnknown +{ + HRESULT RegisterControlChangeNotify( + [in] IAudioEndpointVolumeCallback *pNotify + ); + HRESULT UnregisterControlChangeNotify( + [in] IAudioEndpointVolumeCallback *pNotify + ); + HRESULT GetChannelCount( + [out] UINT *pnChannelCount + ); + HRESULT SetMasterVolumeLevel( + [in] FLOAT fLevelDB, + [unique,in] LPCGUID pguidEventContext + ); + HRESULT SetMasterVolumeLevelScalar( + [in] FLOAT fLevel, + [unique,in] LPCGUID pguidEventContext + ); + HRESULT GetMasterVolumeLevel( + [out] FLOAT *fLevelDB + ); + HRESULT GetMasterVolumeLevelScalar( + [out] FLOAT *fLevel + ); + HRESULT SetChannelVolumeLevel( + [in] UINT nChannel, + [in] FLOAT fLevelDB, + [unique,in] LPCGUID pguidEventContext + ); + HRESULT SetChannelVolumeLevelScalar( + [in] UINT nChannel, + [in] FLOAT fLevel, + [unique,in] LPCGUID pguidEventContext + ); + HRESULT GetChannelVolumeLevel( + [in] UINT nChannel, + [out] FLOAT *fLevelDB + ); + HRESULT GetChannelVolumeLevelScalar( + [in] UINT nChannel, + [out] FLOAT *fLevel + ); + HRESULT SetMute( + [in] BOOL bMute, + [unique,in] LPCGUID pguidEventContext + ); + HRESULT GetMute( + [out] BOOL *bMute + ); + HRESULT GetVolumeStepInfo( + [out] UINT *pnStep, + [out] UINT *pnStepCount + ); + HRESULT VolumeStepUp( + [unique,in] LPCGUID pguidEventContext + ); + HRESULT VolumeStepDown( + [unique,in] LPCGUID pguidEventContext + ); + HRESULT QueryHardwareSupport( + [out] DWORD *pdwHardwareSupportMask + ); + HRESULT GetVolumeRange( + [out] FLOAT *pflVolumeMindB, + [out] FLOAT *pflVolumeMaxdB, + [out] FLOAT *pflVolumeIncrementdB + ); +} + +[ + pointer_default(unique), + nonextensible, + uuid(66e11784-f695-4f28-a505-a7080081a78f), + local, + object +] +interface IAudioEndpointVolumeEx : IAudioEndpointVolume +{ + HRESULT GetVolumeRangeChannel( + [in] UINT iChannel, + [out] FLOAT *pflVolumeMindB, + [out] FLOAT *pflVolumeMaxdB, + [out] FLOAT *pflVolumeIncrementdB + ); +}

1 0