July 2008 - Wine-Commits - list.winehq.org

Owen Rudge : shell32: Add status bar to control panel.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: 5800539bb68282e406ea0ad090a08714f1adfd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5800539bb68282e406ea0ad09… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 24 22:10:41 2008 +0100 shell32: Add status bar to control panel. --- dlls/shell32/control.c | 70 +++++++++++++++++++++++++++++++++++++++++++----- dlls/shell32/cpanel.h | 1 + 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 89a790a..642e611 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -166,6 +166,7 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) } #define IDC_LISTVIEW 1000 +#define IDC_STATUSBAR 1001 #define NUM_COLUMNS 2 #define LISTVIEW_DEFSTYLE (WS_CHILD | WS_VISIBLE | WS_TABSTOP |\ @@ -173,18 +174,20 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) static BOOL Control_CreateListView (CPanel *panel) { - RECT ws; + RECT ws, sb; WCHAR empty_string[] = {0}; WCHAR buf[MAX_STRING_LEN]; LVCOLUMNW lvc; /* Create list view */ + GetClientRect(panel->hWndStatusBar, &sb); GetClientRect(panel->hWnd, &ws); panel->hWndListView = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, empty_string, LISTVIEW_DEFSTYLE | LVS_ICON, - 0, 0, ws.right - ws.left, ws.bottom - ws.top, - panel->hWnd, (HMENU) IDC_LISTVIEW, panel->hInst, NULL); + 0, 0, ws.right - ws.left, ws.bottom - ws.top - + (sb.bottom - sb.top), panel->hWnd, + (HMENU) IDC_LISTVIEW, panel->hInst, NULL); if (!panel->hWndListView) return FALSE; @@ -233,15 +236,23 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) CPlItem *item; LVITEMW lvItem; INITCOMMONCONTROLSEX icex; + INT sb_parts; SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); panel->hWnd = hWnd; /* Initialise common control DLL */ icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_LISTVIEW_CLASSES; + icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; InitCommonControlsEx(&icex); + /* create the status bar */ + if (!(panel->hWndStatusBar = CreateStatusWindowW(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, NULL, hWnd, IDC_STATUSBAR))) + return; + + sb_parts = -1; + SendMessageW(panel->hWndStatusBar, SB_SETPARTS, 1, (LPARAM) &sb_parts); + /* create the list view */ if (!Control_CreateListView(panel)) return; @@ -491,6 +502,17 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, return 0; } + case LVN_ITEMCHANGED: + { + CPlItem *item = Control_GetCPlItem_From_ListView(panel); + + /* update the status bar if item is valid */ + if (item) + SetWindowTextW(panel->hWndStatusBar, + item->applet->info[item->id].szInfo); + + return 0; + } } break; @@ -499,12 +521,46 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, break; } + case WM_MENUSELECT: + /* check if this is an applet */ + if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && + (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) + { + CPlItem *item = Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1)); + + /* update the status bar if item is valid */ + if (item) + SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].szInfo); + } + else + SetWindowTextW(panel->hWndStatusBar, NULL); + + return 0; + case WM_SIZE: { - RECT rect; + HDWP hdwp; + RECT sb; + + hdwp = BeginDeferWindowPos(2); + + if (hdwp == NULL) + break; + + GetClientRect(panel->hWndStatusBar, &sb); + + hdwp = DeferWindowPos(hdwp, panel->hWndListView, NULL, 0, 0, + LOWORD(lParam2), HIWORD(lParam2) - (sb.bottom - sb.top), + SWP_NOZORDER | SWP_NOMOVE); + + if (hdwp == NULL) + break; + + hdwp = DeferWindowPos(hdwp, panel->hWndStatusBar, NULL, 0, 0, + LOWORD(lParam2), LOWORD(lParam1), SWP_NOZORDER | SWP_NOMOVE); - GetClientRect(hWnd, &rect); - MoveWindow(panel->hWndListView, 0, 0, rect.right, rect.bottom, TRUE); + if (hdwp != NULL) + EndDeferWindowPos(hdwp); return 0; } diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index b52ad97..23ec5e5 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -41,6 +41,7 @@ typedef struct CPanel { HWND hWndListView; HIMAGELIST hImageListLarge; HIMAGELIST hImageListSmall; + HWND hWndStatusBar; } CPanel; /* structure to reference an individual control panel item */

1 0

John Reiser : ntdll: Tell valgrind to load the . pdb debugging info for the module that was just loaded.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: adda48593311997454a97d5da8bdcc2f9d5b126a URL: http://source.winehq.org/git/wine.git/?a=commit;h=adda48593311997454a97d5da… Author: John Reiser <jreiser(a)BitWagon.com> Date: Thu Jul 24 10:21:33 2008 -0700 ntdll: Tell valgrind to load the .pdb debugging info for the module that was just loaded. --- dlls/ntdll/virtual.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ef97eb2..78e38dc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -41,8 +41,8 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif -#ifdef HAVE_VALGRIND_MEMCHECK_H -# include <valgrind/memcheck.h> +#ifdef HAVE_VALGRIND_VALGRIND_H +# include <valgrind/valgrind.h> #endif #define NONAMELESSUNION @@ -898,6 +898,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz struct stat st; struct file_view *view = NULL; char *ptr, *header_end; + int delta = 0; /* zero-map the whole range */ @@ -1088,7 +1089,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !NtCurrentTeb()->Peb->ImageBaseAddress) ) { - int delta = ptr - base; IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; @@ -1106,6 +1106,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); + delta = ptr - base; while (rel <= end - 1 && rel->SizeOfBlock) { @@ -1154,6 +1155,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz server_leave_uninterrupted_section( &csVirtual, &sigset ); *addr_ptr = ptr; +#ifdef VALGRIND_LOAD_PDB_DEBUGINFO + VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta); +#endif return STATUS_SUCCESS; error:

1 0

John Reiser : ntdll: When tracking allocated blocks, RtlDestroyHeap must notify that all the blocks are being freed.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: d6f469110674c1d89b3344de62bc421c5051918a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f469110674c1d89b3344de6… Author: John Reiser <jreiser(a)BitWagon.com> Date: Thu Jul 24 10:21:01 2008 -0700 ntdll: When tracking allocated blocks, RtlDestroyHeap must notify that all the blocks are being freed. --- dlls/ntdll/heap.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d57db49..44b88b2 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -193,13 +193,39 @@ static inline void notify_alloc( void *ptr, SIZE_T size, BOOL init ) } /* notify that a block of memory has been freed for debugging purposes */ -static inline void notify_free( void *ptr ) +static inline void notify_free( void const *ptr ) { #ifdef VALGRIND_FREELIKE_BLOCK VALGRIND_FREELIKE_BLOCK( ptr, 0 ); #endif } +static void subheap_notify_free_all(SUBHEAP const *subheap) +{ +#ifdef VALGRIND_FREELIKE_BLOCK + char const *ptr = (char const *)subheap->base + subheap->headerSize; + + if (!RUNNING_ON_VALGRIND) return; + + while (ptr < (char const *)subheap->base + subheap->size) + { + if (*(const DWORD *)ptr & ARENA_FLAG_FREE) + { + ARENA_FREE const *pArena = (ARENA_FREE const *)ptr; + if (pArena->magic!=ARENA_FREE_MAGIC) ERR("bad free_magic @%p\n", pArena); + ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); + } + else + { + ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; + if (pArena->magic!=ARENA_INUSE_MAGIC) ERR("bad inuse_magic @%p\n", pArena); + notify_free(pArena + 1); + ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); + } + } +#endif +} + /* locate a free list entry of the appropriate size */ /* size is the size of the whole block including the arena header */ static inline unsigned int get_freelist_index( SIZE_T size ) @@ -1148,11 +1174,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) LIST_FOR_EACH_ENTRY_SAFE( subheap, next, &heapPtr->subheap_list, SUBHEAP, entry ) { if (subheap == &heapPtr->subheap) continue; /* do this one last */ + subheap_notify_free_all(subheap); list_remove( &subheap->entry ); size = 0; addr = subheap->base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } + subheap_notify_free_all(&heapPtr->subheap); size = 0; addr = heapPtr->subheap.base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE );

1 0

John Reiser : configure: Add check for valgrind/valgrind.h.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: 0a2c94e823c6fd8d50b075bcb4fd8c2bc3cefaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2c94e823c6fd8d50b075bcb… Author: John Reiser <jreiser(a)BitWagon.com> Date: Thu Jul 24 13:31:53 2008 -0700 configure: Add check for valgrind/valgrind.h. --- configure | 4 +++- configure.ac | 3 ++- include/config.h.in | 3 +++ loader/kthread.c | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b5c34de..7bb0385 100755 --- a/configure +++ b/configure @@ -7210,6 +7210,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7320,7 +7321,8 @@ for ac_header in \ termios.h \ unistd.h \ utime.h \ - valgrind/memcheck.h + valgrind/memcheck.h \ + valgrind/valgrind.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 457f32e..9aaacab 100644 --- a/configure.ac +++ b/configure.ac @@ -335,7 +335,8 @@ AC_CHECK_HEADERS(\ termios.h \ unistd.h \ utime.h \ - valgrind/memcheck.h + valgrind/memcheck.h \ + valgrind/valgrind.h ) AC_HEADER_STAT() diff --git a/include/config.h.in b/include/config.h.in index c4f30c9..1245197 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -918,6 +918,9 @@ /* Define to 1 if you have the <valgrind/memcheck.h> header file. */ #undef HAVE_VALGRIND_MEMCHECK_H +/* Define to 1 if you have the <valgrind/valgrind.h> header file. */ +#undef HAVE_VALGRIND_VALGRIND_H + /* Define if we have va_copy */ #undef HAVE_VA_COPY diff --git a/loader/kthread.c b/loader/kthread.c index efffd99..cc51cc0 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -52,8 +52,8 @@ struct _pthread_cleanup_buffer; #ifdef HAVE_RESOLV_H # include <resolv.h> #endif -#ifdef HAVE_VALGRIND_MEMCHECK_H -#include <valgrind/memcheck.h> +#ifdef HAVE_VALGRIND_VALGRIND_H +#include <valgrind/valgrind.h> #endif #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h>

1 0

Reece Dunn : oleaut32: Fix the SafeArrayGetVartype tests on Vista and use that behaviour.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: e22e480f1626824227813c58b33293781cf04dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22e480f1626824227813c58b… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Jul 24 23:32:35 2008 +0100 oleaut32: Fix the SafeArrayGetVartype tests on Vista and use that behaviour. --- dlls/oleaut32/safearray.c | 2 ++ dlls/oleaut32/tests/safearray.c | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 34cfd91..a19d599 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1500,6 +1500,8 @@ HRESULT WINAPI SafeArrayGetVartype(SAFEARRAY* psa, VARTYPE* pvt) if (psa->fFeatures & FADF_RECORD) *pvt = VT_RECORD; + else if ((psa->fFeatures & (FADF_HAVEIID|FADF_DISPATCH)) == (FADF_HAVEIID|FADF_DISPATCH)) + *pvt = VT_DISPATCH; else if (psa->fFeatures & FADF_HAVEIID) *pvt = VT_UNKNOWN; else if (psa->fFeatures & FADF_HAVEVARTYPE) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 53896ef..969d696 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -490,12 +490,8 @@ static void test_safearray(void) { hres = pSafeArrayGetVartype(a, &vt); ok(hres == S_OK, "SAGVT of arra y with vt %d failed with %x\n", vttypes[i].vt, hres); - if (vttypes[i].vt == VT_DISPATCH) { - /* Special case. Checked against Windows. */ - ok(vt == VT_UNKNOWN, "SAGVT of array with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); - } else { - ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); - } + /* Windows prior to Vista returns VT_UNKNOWN instead of VT_DISPATCH */ + ok(broken(vt == VT_UNKNOWN) || vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); } hres = SafeArrayCopy(a, &c); @@ -509,12 +505,8 @@ static void test_safearray(void) if (pSafeArrayGetVartype) { hres = pSafeArrayGetVartype(c, &vt); ok(hres == S_OK, "SAGVT of array with vt %d failed with %x\n", vttypes[i].vt, hres); - if (vttypes[i].vt == VT_DISPATCH) { - /* Special case. Checked against Windows. */ - ok(vt == VT_UNKNOWN, "SAGVT of array with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); - } else { - ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); - } + /* Windows prior to Vista returns VT_UNKNOWN instead of VT_DISPATCH */ + ok(broken(vt == VT_UNKNOWN) || vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); } if (pSafeArrayCopyData) {

1 0

Reece Dunn : crypt32/tests: fix the protectdata tests on Vista.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: f46a42d66f09a333d99e76f11d2e46e7d15e04a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46a42d66f09a333d99e76f11… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Jul 24 19:52:19 2008 +0100 crypt32/tests: fix the protectdata tests on Vista. --- dlls/crypt32/tests/protectdata.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index b77b81b..30b55b4 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -82,10 +82,6 @@ static void test_cryptprotectdata(void) SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,desc,&entropy,NULL,NULL,0,&cipher_entropy); ok(protected, "Encrypting with entropy.\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS || - r == ERROR_IO_PENDING, /* win2k */ - "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %d\n",r); cipher_no_desc.pbData=NULL; cipher_no_desc.cbData=0; @@ -95,16 +91,11 @@ static void test_cryptprotectdata(void) plain.cbData=strlen(secret2)+1; SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,NULL,&entropy,NULL,NULL,0,&cipher_no_desc); - r = GetLastError(); - if (protected) - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } - else + if (!protected) { /* fails in win2k */ - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } } @@ -158,8 +149,6 @@ static void test_cryptunprotectdata(void) SetLastError(0xDEADBEEF); okay = pCryptUnprotectData(&cipher,&data_desc,NULL,NULL,NULL,0,&plain); ok(okay,"Decrypting without entropy\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); @@ -185,8 +174,6 @@ static void test_cryptunprotectdata(void) SetLastError(0xDEADBEEF); okay = pCryptUnprotectData(&cipher_entropy,&data_desc,&entropy,NULL,NULL,0,&plain); ok(okay,"Decrypting with entropy\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); @@ -205,8 +192,6 @@ static void test_cryptunprotectdata(void) SetLastError(0xDEADBEEF); okay = pCryptUnprotectData(&cipher_no_desc,&data_desc,&entropy,NULL,NULL,0,&plain); ok(okay,"Decrypting with entropy and no description\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); ok(plain.cbData==strlen(secret2)+1,"Plain DATA_BLOB wrong length\n");

1 0

Detlef Riekenberg : cryptnet/tests: Make the tests usable on win9x.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: be5db33c305af2e8ad61916c75d48f50c08bf4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5db33c305af2e8ad61916c7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 24 20:34:26 2008 +0200 cryptnet/tests: Make the tests usable on win9x. --- dlls/cryptnet/tests/cryptnet.c | 49 ++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 25edaa6..0907a53 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -263,10 +263,11 @@ static void test_retrieveObjectByUrl(void) FILETIME ft = { 0 }; SetLastError(0xdeadbeef); - ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, - NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); + ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == E_INVALIDARG), + "got 0x%x/%u (expected ERROR_INVALID_PARAMETER or E_INVALIDARG)\n", + GetLastError(), GetLastError()); make_tmp_file(tmpfile); ptr = strchr(tmpfile, ':'); @@ -305,9 +306,21 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, - "Expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); - ok(crl == NULL, "Expected CRL to be NULL\n"); + /* vista: ERROR_NOT_SUPPORTED, w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, + 95: OSS_DATA_ERROR */ + ok(!ret && (GetLastError() == ERROR_NOT_SUPPORTED || + GetLastError() == CRYPT_E_NO_MATCH || + GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR), + "got 0x%x/%u (expected CRYPT_E_NO_MATCH or CRYPT_E_ASN1_BADTAG or " + "OSS_DATA_ERROR)\n", GetLastError(), GetLastError()); + + /* only newer versions of cryptnet do the cleanup */ + if(!ret && GetLastError() != CRYPT_E_ASN1_BADTAG && + GetLastError() != OSS_DATA_ERROR) { + ok(crl == NULL, "Expected CRL to be NULL\n"); + } + if (crl && crl != (PCCRL_CONTEXT)0xdeadbeef) CertFreeCRLContext(crl); store = (HCERTSTORE)0xdeadbeef; @@ -328,20 +341,38 @@ static void test_retrieveObjectByUrl(void) CertCloseStore(store, 0); } /* Are file URLs cached? */ + cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, CRYPT_CACHE_ONLY_RETRIEVAL, 0, (void **)&cert, NULL, NULL, NULL, NULL); ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); + + cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); + /* w2k: success, 9x: fail with E_INVALIDARG */ + ok(ret || (GetLastError() == E_INVALIDARG), + "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + ret, GetLastError(), GetLastError()); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); + + cert = (PCCERT_CONTEXT)0xdeadbeef; aux.cbSize = sizeof(aux); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); + /* w2k: success, 9x: fail with E_INVALIDARG */ + ok(ret || (GetLastError() == E_INVALIDARG), + "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + ret, GetLastError(), GetLastError()); + if (!ret) { + /* no more tests useful */ + DeleteFileA(tmpfile); + skip("no usable CertificateContext\n"); + return; + } + aux.pLastSyncTime = &ft; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux);

1 0

Ulrich Hecht : dsound: Fix notification order.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: 335dec27b7e067defa9aea893477d3c2ad06fe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335dec27b7e067defa9aea893… Author: Ulrich Hecht <uli(a)suse.de> Date: Thu Jul 24 13:12:39 2008 +0200 dsound: Fix notification order. --- dlls/dsound/mixer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 7ac6e67..7fe9423 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -240,6 +240,8 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len i, offset, event->hEventNotify); /* DSBPN_OFFSETSTOP has to be the last element. So this is */ /* OK. [Inside DirectX, p274] */ + /* Windows does not seem to enforce this, and some apps rely */ + /* on that, so we can't stop there. */ /* */ /* This also means we can't sort the entries by offset, */ /* because DSBPN_OFFSETSTOP == -1 */ @@ -247,9 +249,8 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len if (dsb->state == STATE_STOPPED) { SetEvent(event->hEventNotify); TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - return; - } else - return; + } + continue; } if ((playpos + len) >= dsb->buflen) { if ((offset < ((playpos + len) % dsb->buflen)) ||

1 0

Francois Gouget : configure: Use cups-config to probe for cups support.
by Alexandre Julliard July 25, 2008

July 25, 2008

Module: wine Branch: master Commit: 289ea33803bf936885a87c2d142230ddf604a68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=289ea33803bf936885a87c2d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:09:07 2008 +0200 configure: Use cups-config to probe for cups support. --- configure | 165 +++++++++++++++++++++++++++++++++++++++-- configure.ac | 17 +++- dlls/wineps.drv/Makefile.in | 2 +- dlls/winspool.drv/Makefile.in | 1 + 4 files changed, 172 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=289ea33803bf936885a87…

1 0

Mikołaj Zalewski : advapi32: Remove access checks from advapi32 (makes KEY_WOW64_* work).
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: daafda22f840edc9a584abc7925f9ee17ef18228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daafda22f840edc9a584abc79… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 24 12:19:17 2008 +0200 advapi32: Remove access checks from advapi32 (makes KEY_WOW64_* work). --- dlls/advapi32/registry.c | 5 ----- dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 55607c2..4c97ed1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -44,9 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -/* allowed bits for access mask */ -#define KEY_ACCESS_MASK (KEY_ALL_ACCESS | MAXIMUM_ALLOWED) - #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA #define NB_SPECIAL_ROOT_KEYS ((UINT)HKEY_SPECIAL_ROOT_LAST - (UINT)HKEY_SPECIAL_ROOT_FIRST + 1) @@ -188,7 +185,6 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR UNICODE_STRING nameW, classW; if (reserved) return ERROR_INVALID_PARAMETER; - if (!(access & KEY_ACCESS_MASK) || (access & ~KEY_ACCESS_MASK)) return ERROR_ACCESS_DENIED; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); @@ -243,7 +239,6 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ if (name && *name == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ } - else if (!(access & KEY_ACCESS_MASK) || (access & ~KEY_ACCESS_MASK)) return ERROR_ACCESS_DENIED; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9d5d4c2..ac0cd08 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -949,6 +949,17 @@ static void test_reg_open_key(void) ok(ret == ERROR_BAD_PATHNAME || /* NT/2k/XP */ ret == ERROR_FILE_NOT_FOUND /* Win9x,ME */ , "expected ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %d\n", ret); + + /* WOW64 flags */ + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WOW64_32KEY, &hkResult); + ok(ret == ERROR_SUCCESS && hkResult != NULL, "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + RegCloseKey(hkResult); + + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WOW64_64KEY, &hkResult); + ok(ret == ERROR_SUCCESS && hkResult != NULL, "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + RegCloseKey(hkResult); } static void test_reg_create_key(void) @@ -974,6 +985,17 @@ static void test_reg_create_key(void) ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); RegDeleteKey(hkey1, NULL); } + + /* WOW64 flags - open an existing key */ + hkey1 = NULL; + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS && hkey1 != NULL, "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + RegCloseKey(hkey1); + + hkey1 = NULL; + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS && hkey1 != NULL, "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + RegCloseKey(hkey1); } static void test_reg_close_key(void)

1 0