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

Hans Leidekker : winhttp, wininet: Load i2d_X509 from libcrypto.so.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: a7b70911b348cb15244379cb6eaec1c4841b08c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b70911b348cb15244379cb6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 5 10:46:10 2009 +0100 winhttp, wininet: Load i2d_X509 from libcrypto.so. --- dlls/winhttp/net.c | 4 ++-- dlls/wininet/netconnection.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 201a1cb..79e6789 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -103,11 +103,11 @@ MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_get_timeout ); MAKE_FUNCPTR( SSL_CTX_set_timeout ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); -MAKE_FUNCPTR( i2d_X509 ); MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); +MAKE_FUNCPTR( i2d_X509 ); #undef MAKE_FUNCPTR #endif @@ -221,7 +221,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_CTX_get_timeout ); LOAD_FUNCPTR( SSL_CTX_set_timeout ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); - LOAD_FUNCPTR( i2d_X509 ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -234,6 +233,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( BIO_new_fp ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); + LOAD_FUNCPTR( i2d_X509 ); #undef LOAD_FUNCPTR pSSL_library_init(); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ccf2928..3c55528 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -124,12 +124,12 @@ MAKE_FUNCPTR(SSL_get_peer_certificate); MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); -MAKE_FUNCPTR(i2d_X509); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(i2d_X509); #undef MAKE_FUNCPTR #endif @@ -188,7 +188,6 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_get_timeout); DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); - DYNSSL(i2d_X509); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -202,6 +201,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(BIO_new_fp); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(i2d_X509); #undef DYNCRYPTO pSSL_library_init();

1 0

Michael Stefaniuc : netapi32: Remove superfluous pointer casts.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: a8510589c3792930f3027cab083ba06c9f1d4cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8510589c3792930f3027cab0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 5 09:39:01 2009 +0100 netapi32: Remove superfluous pointer casts. --- dlls/netapi32/access.c | 5 ++--- dlls/netapi32/nbt.c | 26 +++++++++++++------------- dlls/netapi32/netbios.c | 2 +- dlls/netapi32/tests/apibuf.c | 14 +++++++------- dlls/netapi32/wksta.c | 3 +-- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 84d280b..db22655 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -658,7 +658,7 @@ NetQueryDisplayInformation( admin_size - sizeof(NET_DISPLAY_USER) + guest_size - sizeof(NET_DISPLAY_USER), SortedBuffer); - inf = (PNET_DISPLAY_USER) *SortedBuffer; + inf = *SortedBuffer; str = (LPWSTR) ((PBYTE) inf + sizeof(NET_DISPLAY_USER) * records); inf->usri1_name = str; str = (LPWSTR) ( @@ -826,8 +826,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( } umi = (USER_MODALS_INFO_2 *) *pbuffer; - umi->usrmod2_domain_id = (PSID)(*pbuffer + - sizeof(USER_MODALS_INFO_2)); + umi->usrmod2_domain_id = *pbuffer + sizeof(USER_MODALS_INFO_2); umi->usrmod2_domain_name = (LPWSTR)(*pbuffer + sizeof(USER_MODALS_INFO_2) + GetLengthSid(domainIdentifier)); diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index b840a41..0bddd94 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -400,7 +400,7 @@ typedef struct _NetBTNameQueryData { static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount, WORD answerIndex, PUCHAR rData, WORD rLen) { - NetBTNameQueryData *queryData = (NetBTNameQueryData *)pVoid; + NetBTNameQueryData *queryData = pVoid; BOOL ret; if (queryData) @@ -696,7 +696,7 @@ typedef struct _NetBTNodeQueryData static BOOL NetBTNodeStatusAnswerCallback(void *pVoid, WORD answerCount, WORD answerIndex, PUCHAR rData, WORD rLen) { - NetBTNodeQueryData *data = (NetBTNodeQueryData *)pVoid; + NetBTNodeQueryData *data = pVoid; if (data && !data->gotResponse && rData && rLen >= 1) { @@ -811,7 +811,7 @@ static UCHAR NetBTAstatRemote(NetBTAdapter *adapter, PNCB ncb) static UCHAR NetBTAstat(void *adapt, PNCB ncb) { - NetBTAdapter *adapter = (NetBTAdapter *)adapt; + NetBTAdapter *adapter = adapt; UCHAR ret; TRACE("adapt %p, NCB %p\n", adapt, ncb); @@ -856,7 +856,7 @@ static UCHAR NetBTAstat(void *adapt, PNCB ncb) static UCHAR NetBTFindName(void *adapt, PNCB ncb) { - NetBTAdapter *adapter = (NetBTAdapter *)adapt; + NetBTAdapter *adapter = adapt; UCHAR ret; const NBNameCacheEntry *cacheEntry = NULL; PFIND_NAME_HEADER foundName; @@ -973,7 +973,7 @@ static UCHAR NetBTSessionReq(SOCKET fd, const UCHAR *calledName, static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) { - NetBTAdapter *adapter = (NetBTAdapter *)adapt; + NetBTAdapter *adapter = adapt; UCHAR ret; const NBNameCacheEntry *cacheEntry = NULL; @@ -1074,8 +1074,8 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) */ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb) { - NetBTAdapter *adapter = (NetBTAdapter *)adapt; - NetBTSession *session = (NetBTSession *)sess; + NetBTAdapter *adapter = adapt; + NetBTSession *session = sess; UCHAR buffer[NBSS_HDRSIZE], ret; int r; WSABUF wsaBufs[2]; @@ -1123,8 +1123,8 @@ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb) static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb) { - NetBTAdapter *adapter = (NetBTAdapter *)adapt; - NetBTSession *session = (NetBTSession *)sess; + NetBTAdapter *adapter = adapt; + NetBTSession *session = sess; UCHAR buffer[NBSS_HDRSIZE], ret; int r; WSABUF wsaBufs[2]; @@ -1231,7 +1231,7 @@ error: static UCHAR NetBTHangup(void *adapt, void *sess) { - NetBTSession *session = (NetBTSession *)sess; + NetBTSession *session = sess; TRACE("adapt %p, session %p\n", adapt, session); @@ -1255,7 +1255,7 @@ static void NetBTCleanupAdapter(void *adapt) TRACE("adapt %p\n", adapt); if (adapt) { - NetBTAdapter *adapter = (NetBTAdapter *)adapt; + NetBTAdapter *adapter = adapt; if (adapter->nameCache) NBNameCacheDestroy(adapter->nameCache); @@ -1310,7 +1310,7 @@ static BOOL NetBTEnumCallback(UCHAR totalLANAs, UCHAR lanaIndex, ULONG transport, const NetBIOSAdapterImpl *data, void *closure) { BOOL ret; - PMIB_IPADDRTABLE table = (PMIB_IPADDRTABLE)closure; + PMIB_IPADDRTABLE table = closure; if (table && data) { @@ -1319,7 +1319,7 @@ static BOOL NetBTEnumCallback(UCHAR totalLANAs, UCHAR lanaIndex, ret = FALSE; for (ndx = 0; !ret && ndx < table->dwNumEntries; ndx++) { - const NetBTAdapter *adapter = (const NetBTAdapter *)data->data; + const NetBTAdapter *adapter = data->data; if (table->table[ndx].dwIndex == adapter->ipr.dwIndex) { diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index 8d0de1f..89b2c2a 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -762,7 +762,7 @@ static UCHAR nbDispatch(NetBIOSAdapter *adapter, PNCB ncb) static DWORD WINAPI nbCmdThread(LPVOID lpVoid) { - PNCB ncb = (PNCB)lpVoid; + PNCB ncb = lpVoid; if (ncb) { diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 2438ecd..0972e76 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -42,12 +42,12 @@ static void run_apibuf_tests(void) NET_API_STATUS res; /* test normal logic */ - ok(pNetApiBufferAllocate(1024, (LPVOID *)&p) == NERR_Success, + ok(pNetApiBufferAllocate(1024, &p) == NERR_Success, "Reserved memory\n"); ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok(dwSize >= 1024, "The size is correct\n"); - ok(pNetApiBufferReallocate(p, 1500, (LPVOID *) &p) == NERR_Success, + ok(pNetApiBufferReallocate(p, 1500, &p) == NERR_Success, "Reallocated\n"); ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok(dwSize >= 1500, "The size is correct\n"); @@ -58,14 +58,14 @@ static void run_apibuf_tests(void) ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer\n"); /* border reallocate cases */ - ok(pNetApiBufferReallocate(0, 1500, (LPVOID *) &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n"); + ok(pNetApiBufferReallocate(0, 1500, &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n"); ok(p != NULL, "No memory got allocated\n"); - ok(pNetApiBufferAllocate(1024, (LPVOID *)&p) == NERR_Success, "Memory not reserved\n"); - ok(pNetApiBufferReallocate(p, 0, (LPVOID *) &p) == NERR_Success, "Not freed\n"); + ok(pNetApiBufferAllocate(1024, &p) == NERR_Success, "Memory not reserved\n"); + ok(pNetApiBufferReallocate(p, 0, &p) == NERR_Success, "Not freed\n"); ok(p == NULL, "Pointer not cleared\n"); - + /* 0-length buffer */ - ok(pNetApiBufferAllocate(0, (LPVOID *)&p) == NERR_Success, + ok(pNetApiBufferAllocate(0, &p) == NERR_Success, "Reserved memory\n"); ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok(dwSize < 0xFFFFFFFF, "The size of the 0-length buffer\n"); diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 7b39fd9..67690b8 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -157,8 +157,7 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, ULONG transport, const NetBIOSAdapterImpl *data, void *closure) { BOOL ret; - struct WkstaTransportEnumData *enumData = (struct WkstaTransportEnumData *) - closure; + struct WkstaTransportEnumData *enumData = closure; if (enumData && enumData->pbuf) {

1 0

Nikolay Sivov : user32: Use 1 unit caret width for Edit control.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: 258d953a3fd015017bbbe5318c439522b2fff746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258d953a3fd015017bbbe5318… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Mar 4 18:03:55 2009 -0500 user32: Use 1 unit caret width for Edit control. --- dlls/user32/edit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ee9fb3f..eadcc3d 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3902,7 +3902,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) ReleaseDC(es->hwndSelf, hdc); } - CreateCaret(es->hwndSelf, 0, 2, es->line_height); + CreateCaret(es->hwndSelf, 0, 1, es->line_height); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); @@ -3952,7 +3952,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) EDIT_UpdateText(es, NULL, TRUE); if (es->flags & EF_FOCUSED) { DestroyCaret(); - CreateCaret(es->hwndSelf, 0, 2, es->line_height); + CreateCaret(es->hwndSelf, 0, 1, es->line_height); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf);

1 0

Alexandre Julliard : ddraw/tests: Allow IDirectDrawSurface_AddAttachedSurface failure on Windows.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: e047edb0805d88496b594d5934ae104c26e420ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e047edb0805d88496b594d593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 12:47:02 2009 +0100 ddraw/tests: Allow IDirectDrawSurface_AddAttachedSurface failure on Windows. --- dlls/ddraw/tests/dsurface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a12b968..f246807 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1389,7 +1389,8 @@ static void AttachmentTest(void) hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); /* Fails on refrast */ - ok(hr == DD_OK, "Attaching an offscreen plain surface to another offscreen plain surface returned %08x\n", hr); + ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching an offscreen plain surface to another offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) { hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3);

1 0

Paul Vriens : programs/winetest: Show dll versions again for Win9x/WinME.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: 6bbe4604d7c5a02e4d64027bb885ef74e1e4969e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbe4604d7c5a02e4d64027bb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 5 10:07:37 2009 +0100 programs/winetest: Show dll versions again for Win9x/WinME. --- programs/winetest/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2df81fa..a07e3d9 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -564,6 +564,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, *strstr(dllname, testexe) = 0; wine_tests[nr_of_files].maindllpath = NULL; + strcpy(filename, dllname); dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); if (!dll && pLoadLibraryShim) { @@ -580,6 +581,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, * the tests for this dll. */ GetModuleFileNameA(dll, dllpath, MAX_PATH); + strcpy(filename, dllpath); *strrchr(dllpath, '\\') = '\0'; wine_tests[nr_of_files].maindllpath = xstrdup( dllpath ); } @@ -594,7 +596,6 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, xprintf (" %s=load error Gecko is not installed\n", dllname); return TRUE; } - GetModuleFileNameA(dll, filename, MAX_PATH); FreeLibrary(dll); if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName )))

1 0

Alexandre Julliard : kernel32/tests: Stop testing integer atoms if the first one doesn't work.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: 598e6f09c880cd06d347d30b3e90ebf4c1cd0a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598e6f09c880cd06d347d30b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 12:47:18 2009 +0100 kernel32/tests: Stop testing integer atoms if the first one doesn't work. --- dlls/kernel32/tests/atom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index cae3601..c739850 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -201,6 +201,7 @@ static void test_get_atom_name(void) sprintf( res, "#%d", i ); memset( res + strlen(res) + 1, 'a', 10 ); ok( !memcmp( res, buf, 10 ), "bad buffer contents %s\n", buf ); + if (len <= 1 || len >= 7) break; /* don't bother testing all of them */ } else ok( !len, "bad length %d\n", len ); @@ -283,6 +284,7 @@ static void test_get_atom_name(void) print_integral( res, i ); memset( res + lstrlenW(res) + 1, 'a', 10 * sizeof(WCHAR)); ok( !memcmp( res, outW, 10 * sizeof(WCHAR) ), "bad buffer contents for %d\n", i ); + if (len <= 1 || len >= 7) break; /* don't bother testing all of them */ } else ok( !len, "bad length %d\n", len );

1 0

Nikolay Sivov : user32: Disable scroll bar control window when both buttons disabled.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: 032356ec379fbac733d4009381338e882672126e URL: http://source.winehq.org/git/wine.git/?a=commit;h=032356ec379fbac733d400938… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Mar 4 17:38:41 2009 -0500 user32: Disable scroll bar control window when both buttons disabled. --- dlls/user32/scroll.c | 3 +++ dlls/user32/tests/scroll.c | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index b243e27..93f85f2 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2069,6 +2069,9 @@ BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) if (bFineWithMe && infoPtr->flags == flags) return FALSE; infoPtr->flags = flags; + if (nBar == SB_CTL && (flags == ESB_DISABLE_BOTH || flags == ESB_ENABLE_BOTH)) + EnableWindow(hwnd, flags == ESB_ENABLE_BOTH); + SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); return TRUE; } diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 9547d54..46080ca 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -54,15 +54,26 @@ static void scrollbar_test1(void) ret = EnableScrollBar( hScroll, SB_CTL, ESB_DISABLE_BOTH ); ok( ret, "The scrollbar should be disabled.\n" ); - todo_wine - { - ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); - } + ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + /* test buttons separately */ + ret = EnableScrollBar( hScroll, SB_CTL, ESB_DISABLE_LTUP ); + ok( ret, "The scrollbar LTUP button should be disabled.\n" ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "The scrollbar should be enabled.\n" ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_DISABLE_RTDN ); + ok( ret, "The scrollbar RTDN button should be disabled.\n" ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "The scrollbar should be enabled.\n" ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); } static void scrollbar_test2(void)

1 0

Michael Stefaniuc : msctf: Remove superfluous pointer casts.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: cf56483f145aee549a98d1b71fe509d36f9ae0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf56483f145aee549a98d1b71… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 5 09:39:10 2009 +0100 msctf: Remove superfluous pointer casts. --- dlls/msctf/msctf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 1f5e35b..e77c749 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -148,7 +148,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->vtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = (LPVOID)This; + *ppvOut = This; TRACE("Created class factory %p\n", This); MSCTF_refCount++; return S_OK; @@ -217,7 +217,7 @@ HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim) HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim) { TRACE("\n"); - *pptim = (ITfThreadMgr*)TlsGetValue(tlsIndex); + *pptim = TlsGetValue(tlsIndex); if (*pptim) ITfThreadMgr_AddRef(*pptim);

1 0

Paul Vriens : shell32/tests: Use the correct directory on Win95.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: 575b93c5ebfbb888d51ef3600a4ba2c980715d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=575b93c5ebfbb888d51ef3600… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 4 21:18:58 2009 +0100 shell32/tests: Use the correct directory on Win95. --- dlls/shell32/tests/shlfolder.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index b8a78f8..7a29626 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -969,8 +969,8 @@ static void test_EnumObjects_and_CompareIDs(void) ITEMIDLIST *newPIDL; IShellFolder *IDesktopFolder, *testIShellFolder; char cCurrDirA [MAX_PATH] = {0}; - WCHAR cCurrDirW [MAX_PATH]; - static const WCHAR cTestDirW[] = {'\\','t','e','s','t','d','i','r',0}; + static const CHAR cTestDirA[] = "\\testdir"; + WCHAR cTestDirW[MAX_PATH]; int len; HRESULT hr; @@ -978,21 +978,21 @@ static void test_EnumObjects_and_CompareIDs(void) len = lstrlenA(cCurrDirA); if(len == 0) { - trace("GetCurrentDirectoryA returned empty string. Skipping test_EnumObjects_and_CompareIDs\n"); + win_skip("GetCurrentDirectoryA returned empty string. Skipping test_EnumObjects_and_CompareIDs\n"); return; } if(cCurrDirA[len-1] == '\\') cCurrDirA[len-1] = 0; - MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); - lstrcatW(cCurrDirW, cTestDirW); + lstrcatA(cCurrDirA, cTestDirA); + MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cTestDirW, MAX_PATH); hr = SHGetDesktopFolder(&IDesktopFolder); ok(hr == S_OK, "SHGetDesktopfolder failed %08x\n", hr); CreateFilesFolders(); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0); + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, (REFIID)&IID_IShellFolder, (LPVOID *)&testIShellFolder);

1 0

Paul Vriens : shell32/tests: Make sure we test on Win95.
by Alexandre Julliard March 5, 2009

March 5, 2009

Module: wine Branch: master Commit: b24e378f52ad78f6db06b1420c5b4428cf29af9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24e378f52ad78f6db06b1420… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 4 21:53:16 2009 +0100 shell32/tests: Make sure we test on Win95. --- dlls/shell32/tests/shlfolder.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7a29626..9de37bd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -707,7 +707,6 @@ static void test_GetAttributesOf(void) char cCurrDirA [MAX_PATH] = {0}; WCHAR cCurrDirW [MAX_PATH]; static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; - static const WCHAR cBackSlash[] = {'\\',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; int len; @@ -768,19 +767,19 @@ static void test_GetAttributesOf(void) IShellFolder_Release(psfMyComputer); - /* create test directory */ - CreateFilesFolders(); - GetCurrentDirectoryA(MAX_PATH, cCurrDirA); len = lstrlenA(cCurrDirA); if (len == 0) { - trace("GetCurrentDirectoryA returned empty string. Skipping test_EnumObjects_and_CompareIDs\n"); + win_skip("GetCurrentDirectoryA returned empty string. Skipping test_GetAttributesOf\n"); return; } if(cCurrDirA[len-1] == '\\') cCurrDirA[len-1] = 0; + /* create test directory */ + CreateFilesFolders(); + MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); hr = SHGetDesktopFolder(&IDesktopFolder); @@ -808,8 +807,8 @@ static void test_GetAttributesOf(void) IMalloc_Free(ppM, newPIDL); /* append testdirectory name to path */ - lstrcatW(cCurrDirW, cBackSlash); - lstrcatW(cCurrDirW, cTestDirW); + lstrcatA(cCurrDirA, "\\testdir"); + MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0); ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr);

1 0