wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Jacek Caban : wininet: Don' t use INTERNET_SetLastError in InternetSetOptionW.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 31cb9cfa7903121582e0a0df9f7dbadef094f9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31cb9cfa7903121582e0a0df9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 13:59:18 2009 +0100 wininet: Don't use INTERNET_SetLastError in InternetSetOptionW. --- dlls/wininet/internet.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9d11561..dfbe032 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2282,11 +2282,11 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { if (!lpwhh) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); return FALSE; } WININET_Release(lpwhh); - INTERNET_SetLastError(ERROR_INTERNET_OPTION_NOT_SETTABLE); + SetLastError(ERROR_INTERNET_OPTION_NOT_SETTABLE); return FALSE; } case INTERNET_OPTION_HTTP_VERSION: @@ -2373,37 +2373,37 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_OPTION_HTTP_DECODING: FIXME("INTERNET_OPTION_HTTP_DECODING; STUB\n"); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; case INTERNET_OPTION_COOKIES_3RD_PARTY: FIXME("INTERNET_OPTION_COOKIES_3RD_PARTY; STUB\n"); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; case INTERNET_OPTION_SEND_UTF8_SERVERNAME_TO_PROXY: FIXME("INTERNET_OPTION_SEND_UTF8_SERVERNAME_TO_PROXY; STUB\n"); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; case INTERNET_OPTION_CODEPAGE_PATH: FIXME("INTERNET_OPTION_CODEPAGE_PATH; STUB\n"); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; case INTERNET_OPTION_CODEPAGE_EXTRA: FIXME("INTERNET_OPTION_CODEPAGE_EXTRA; STUB\n"); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; case INTERNET_OPTION_IDN: FIXME("INTERNET_OPTION_IDN; STUB\n"); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; default: FIXME("Option %d STUB\n",dwOption); - INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; } @@ -2510,7 +2510,7 @@ BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption, FIXME("Flags %08x ignored\n", dwFlags); if( dwFlags & ~ISO_VALID_FLAGS ) { - INTERNET_SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } return InternetSetOptionW( hInternet, dwOption, lpBuffer, dwBufferLength );

1 0

Jacek Caban : wininet: Return error directly from HTTP_Connect.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: b73e31c6597ee8f468a35b3f285b3bab426f2fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73e31c6597ee8f468a35b3f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 13:58:53 2009 +0100 wininet: Return error directly from HTTP_Connect. --- dlls/wininet/http.c | 32 +++++++++++++++----------------- dlls/wininet/internet.c | 23 ++++++++++++++--------- dlls/wininet/internet.h | 8 ++++---- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 882c89b..70f5f6a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3880,7 +3880,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, header = HeapAlloc(GetProcessHeap(),0,headerlen*sizeof(WCHAR)); if (!(BuffersInW.lpcszHeader = header)) { - INTERNET_SetLastError(ERROR_OUTOFMEMORY); + SetLastError(ERROR_OUTOFMEMORY); return FALSE; } BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, @@ -4203,30 +4203,25 @@ static const object_vtbl_t HTTPSESSIONVtbl = { * NULL on failure * */ -HINTERNET HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, - INTERNET_PORT nServerPort, LPCWSTR lpszUserName, - LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, - DWORD dwInternalFlags) +DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, + INTERNET_PORT nServerPort, LPCWSTR lpszUserName, + LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, + DWORD dwInternalFlags, HINTERNET *ret) { http_session_t *lpwhs = NULL; HINTERNET handle = NULL; + DWORD res = ERROR_SUCCESS; TRACE("-->\n"); if (!lpszServerName || !lpszServerName[0]) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - goto lerror; - } + return ERROR_INVALID_PARAMETER; assert( hIC->hdr.htype == WH_HINIT ); lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(http_session_t)); - if (NULL == lpwhs) - { - INTERNET_SetLastError(ERROR_OUTOFMEMORY); - goto lerror; - } + if (!lpwhs) + return ERROR_OUTOFMEMORY; /* * According to my tests. The name is not resolved until a request is sent @@ -4248,8 +4243,8 @@ HINTERNET HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if (NULL == handle) { ERR("Failed to alloc handle\n"); - INTERNET_SetLastError(ERROR_OUTOFMEMORY); - goto lerror; + res = ERROR_OUTOFMEMORY; + goto lerror; } if(hIC->lpszProxy && hIC->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { @@ -4288,7 +4283,10 @@ lerror: */ TRACE("%p --> %p (%p)\n", hIC, handle, lpwhs); - return handle; + + if(res == ERROR_SUCCESS) + *ret = handle; + return res; } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4e6d2b0..9d11561 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -949,6 +949,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, { appinfo_t *hIC; HINTERNET rc = NULL; + DWORD res = ERROR_SUCCESS; TRACE("(%p, %s, %i, %s, %s, %i, %i, %lx)\n", hInternet, debugstr_w(lpszServerName), nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), @@ -956,16 +957,14 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, if (!lpszServerName) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - /* Clear any error information */ - INTERNET_SetLastError(0); hIC = (appinfo_t*)WININET_GetObject( hInternet ); if ( (hIC == NULL) || (hIC->hdr.htype != WH_HINIT) ) { - INTERNET_SetLastError(ERROR_INVALID_HANDLE); + res = ERROR_INVALID_HANDLE; goto lend; } @@ -974,11 +973,13 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, case INTERNET_SERVICE_FTP: rc = FTP_Connect(hIC, lpszServerName, nServerPort, lpszUserName, lpszPassword, dwFlags, dwContext, 0); + if(!rc) + res = INTERNET_GetLastError(); break; case INTERNET_SERVICE_HTTP: - rc = HTTP_Connect(hIC, lpszServerName, nServerPort, - lpszUserName, lpszPassword, dwFlags, dwContext, 0); + res = HTTP_Connect(hIC, lpszServerName, nServerPort, + lpszUserName, lpszPassword, dwFlags, dwContext, 0, &rc); break; case INTERNET_SERVICE_GOPHER: @@ -990,6 +991,7 @@ lend: WININET_Release( &hIC->hdr ); TRACE("returning %p\n", rc); + SetLastError(res); return rc; } @@ -2835,6 +2837,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; WCHAR password[1024], path[2048], extra[1024]; HINTERNET client = NULL, client1 = NULL; + DWORD res; TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), dwHeadersLength, dwFlags, dwContext); @@ -2882,10 +2885,12 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, if (urlComponents.nScheme == INTERNET_SCHEME_HTTPS) dwFlags |= INTERNET_FLAG_SECURE; /* FIXME: should use pointers, not handles, as handles are not thread-safe */ - client = HTTP_Connect(hIC, hostName, urlComponents.nPort, - userName, password, dwFlags, dwContext, INET_OPENURL); - if(client == NULL) + res = HTTP_Connect(hIC, hostName, urlComponents.nPort, + userName, password, dwFlags, dwContext, INET_OPENURL, &client); + if(res != ERROR_SUCCESS) { + INTERNET_SetLastError(res); break; + } if (urlComponents.dwExtraInfoLength) { WCHAR *path_extra; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5b05676..cb6933c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -397,10 +397,10 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags); -HINTERNET HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, - INTERNET_PORT nServerPort, LPCWSTR lpszUserName, - LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, - DWORD dwInternalFlags); +DWORD HTTP_Connect(appinfo_t*,LPCWSTR, + INTERNET_PORT nServerPort, LPCWSTR lpszUserName, + LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, + DWORD dwInternalFlags, HINTERNET*); BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len);

1 0

Jacek Caban : wininet: Don't use INTERNET_SetLastError in HttpSendRequestA.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: e1958a67d681ec6b9f9fea48d50200b1ec52cee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1958a67d681ec6b9f9fea48d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 13:58:18 2009 +0100 wininet: Don't use INTERNET_SetLastError in HttpSendRequestA. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aa5a449..882c89b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3770,7 +3770,7 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, if (lpBuffersOut) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0

Jacek Caban : wininet: Return error directly from INTERNET_AsyncCall.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 88ac3a381be22bf2a010c1d0f5b4651da84da7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ac3a381be22bf2a010c1d0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 13:57:49 2009 +0100 wininet: Return error directly from INTERNET_AsyncCall. --- dlls/wininet/ftp.c | 23 +++++++++++++++-------- dlls/wininet/internet.c | 8 ++++---- dlls/wininet/internet.h | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 6c9765f..1f03199 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -217,6 +217,13 @@ static BOOL FTP_FtpGetFileW(ftp_session_t*, LPCWSTR lpszRemoteFile, LPCWSTR lpsz BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD_PTR dwContext); +/* A temporary helper until we get rid of INTERNET_GetLastError calls */ +static BOOL res_to_le(DWORD res) +{ + if(res != ERROR_SUCCESS) + INTERNET_SetLastError(res); + return res == ERROR_SUCCESS; +} /*********************************************************************** * FtpPutFileA (WININET.@) @@ -319,7 +326,7 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, req->dwFlags = dwFlags; req->dwContext = dwContext; - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -489,7 +496,7 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) req = &workRequest.u.FtpSetCurrentDirectoryW; req->lpszDirectory = heap_strdupW(lpszDirectory); - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -639,7 +646,7 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) req = &workRequest.u.FtpCreateDirectoryW; req->lpszDirectory = heap_strdupW(lpszDirectory); - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -1000,7 +1007,7 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir req->lpszDirectory = lpszCurrentDirectory; req->lpdwDirectory = lpdwCurrentDirectory; - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -1658,7 +1665,7 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lps req->dwFlags = dwInternetFlags; req->dwContext = dwContext; - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -1847,7 +1854,7 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName) req = &workRequest.u.FtpDeleteFileW; req->lpszFilename = heap_strdupW(lpszFileName); - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -1992,7 +1999,7 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory) req = &workRequest.u.FtpRemoveDirectoryW; req->lpszDirectory = heap_strdupW(lpszDirectory); - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { @@ -2143,7 +2150,7 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD req->lpszSrcFile = heap_strdupW(lpszSrc); req->lpszDestFile = heap_strdupW(lpszDest); - r = INTERNET_AsyncCall(&workRequest); + r = res_to_le(INTERNET_AsyncCall(&workRequest)); } else { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d749e53..4e6d2b0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3141,7 +3141,7 @@ static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam) * RETURNS * */ -BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) +DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) { BOOL bSuccess; LPWORKREQUEST lpNewRequest; @@ -3150,7 +3150,7 @@ BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) lpNewRequest = HeapAlloc(GetProcessHeap(), 0, sizeof(WORKREQUEST)); if (!lpNewRequest) - return FALSE; + return ERROR_OUTOFMEMORY; *lpNewRequest = *lpWorkRequest; @@ -3158,10 +3158,10 @@ BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) if (!bSuccess) { HeapFree(GetProcessHeap(), 0, lpNewRequest); - INTERNET_SetLastError(ERROR_INTERNET_ASYNC_THREAD_FAILED); + return ERROR_INTERNET_ASYNC_THREAD_FAILED; } - return bSuccess; + return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e5b9dc3..5b05676 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -407,7 +407,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, void INTERNET_SetLastError(DWORD dwError); DWORD INTERNET_GetLastError(void); -BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest); +DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest); LPSTR INTERNET_GetResponseBuffer(void); LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen);

1 0

Nikolay Sivov : kernel32/tests: Fix LocalAlloc() allocated leaks.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 8b805e48fbae87ce8b17c99e57dc3912c2abde9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b805e48fbae87ce8b17c99e5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 21 14:59:49 2009 +0300 kernel32/tests: Fix LocalAlloc() allocated leaks. --- dlls/kernel32/tests/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 56751ae..3493ff3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -202,6 +202,8 @@ static void test__hwrite( void ) ret = DeleteFileA( filename ); ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError( ) ); + + LocalFree( contents ); } @@ -563,6 +565,8 @@ static void test__lwrite( void ) ret = DeleteFileA( filename ); ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) ); + + LocalFree( contents ); } static void test_CopyFileA(void)

1 0

Nikolay Sivov : kernel32/tests: Fix some find handle leaks.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: f33db8a02d488ce5b310be17237e9a62b2d95e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33db8a02d488ce5b310be172… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 21 14:51:08 2009 +0300 kernel32/tests: Fix some find handle leaks. --- dlls/kernel32/tests/file.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 90fdee2..56751ae 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -251,7 +251,9 @@ static void test__lcreat( void ) ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); - ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should be able to find file\n" ); + find = FindFirstFileA( filename, &search_results ); + ok( INVALID_HANDLE_VALUE != find, "should be able to find file\n" ); + FindClose( find ); ret = DeleteFileA(filename); ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError()); @@ -263,7 +265,9 @@ static void test__lcreat( void ) ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); - ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should be able to find file\n" ); + find = FindFirstFileA( filename, &search_results ); + ok( INVALID_HANDLE_VALUE != find, "should be able to find file\n" ); + FindClose( find ); ok( 0 == DeleteFileA( filename ), "shouldn't be able to delete a readonly file\n" ); @@ -282,7 +286,9 @@ static void test__lcreat( void ) ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); - ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should STILL be able to find file\n" ); + find = FindFirstFileA( filename, &search_results ); + ok( INVALID_HANDLE_VALUE != find, "should STILL be able to find file\n" ); + FindClose( find ); ret = DeleteFileA( filename ); ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) ); @@ -298,7 +304,9 @@ static void test__lcreat( void ) ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); - ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should STILL be able to find file\n" ); + find = FindFirstFileA( filename, &search_results ); + ok( INVALID_HANDLE_VALUE != find, "should STILL be able to find file\n" ); + FindClose( find ); ret = DeleteFileA( filename ); ok( ret, "DeleteFile failed (%d)\n", GetLastError( ) );

1 0

Alexandre Julliard : user32: Move a number of 16-bit cursor/ icon functions to user16.c.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 3806f9aee9ddb482653ee881b9736497f717d220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3806f9aee9ddb482653ee881b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 14:30:19 2009 +0100 user32: Move a number of 16-bit cursor/icon functions to user16.c. --- dlls/user32/cursoricon.c | 161 ----------------------------------------- dlls/user32/user16.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3806f9aee9ddb482653ee…

1 0

Alexandre Julliard : user32: Get rid of the CURSORICON_Copy internal function.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 671b4d129d21cf5b12e44f6eb0aa526cfb6725c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671b4d129d21cf5b12e44f6eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 14:21:00 2009 +0100 user32: Get rid of the CURSORICON_Copy internal function. --- dlls/user32/cursoricon.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ce0de37..9f4d772 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1257,29 +1257,6 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, return hIcon; } -/*********************************************************************** - * CURSORICON_Copy - * - * Make a copy of a cursor or icon. - */ -static HICON CURSORICON_Copy( HINSTANCE16 hInst16, HICON hIcon ) -{ - char *ptrOld, *ptrNew; - int size; - HICON16 hOld = HICON_16(hIcon); - HICON16 hNew; - - if (!(ptrOld = GlobalLock16( hOld ))) return 0; - if (hInst16 && !(hInst16 = GetExePtr( hInst16 ))) return 0; - size = GlobalSize16( hOld ); - hNew = GlobalAlloc16( GMEM_MOVEABLE, size ); - FarSetOwner16( hNew, hInst16 ); - ptrNew = GlobalLock16( hNew ); - memcpy( ptrNew, ptrOld, size ); - GlobalUnlock16( hOld ); - GlobalUnlock16( hNew ); - return HICON_32(hNew); -} /************************************************************************* * CURSORICON_ExtCopy @@ -1329,7 +1306,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType, */ if(pIconCache == NULL) { - hNew = CURSORICON_Copy(0, hIcon); + hNew = CopyIcon( hIcon ); if(nFlags & LR_COPYFROMRESOURCE) { TRACE_(icon)("LR_COPYFROMRESOURCE: Failed to load from cache\n"); @@ -1418,7 +1395,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType, FreeResource(hMem); } } - else hNew = CURSORICON_Copy(0, hIcon); + else hNew = CopyIcon( hIcon ); return hNew; } @@ -1571,8 +1548,20 @@ HICON16 WINAPI CopyIcon16( HINSTANCE16 hInstance, HICON16 hIcon ) */ HICON WINAPI CopyIcon( HICON hIcon ) { - TRACE_(icon)("%p\n", hIcon ); - return CURSORICON_Copy( 0, hIcon ); + char *ptrOld, *ptrNew; + int size; + HICON16 hOld = HICON_16(hIcon); + HICON16 hNew; + + if (!(ptrOld = GlobalLock16( hOld ))) return 0; + size = GlobalSize16( hOld ); + hNew = GlobalAlloc16( GMEM_MOVEABLE, size ); + FarSetOwner16( hNew, 0 ); + ptrNew = GlobalLock16( hNew ); + memcpy( ptrNew, ptrOld, size ); + GlobalUnlock16( hOld ); + GlobalUnlock16( hNew ); + return HICON_32(hNew); }

1 0

Alexandre Julliard : user32: Reimplement CopyIcon16/ CopyCursor16 using CreateCursorIconIndirect16.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 7de210fb5c58ec3e69388f8af450a4e93c78f551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de210fb5c58ec3e69388f8af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 14:12:57 2009 +0100 user32: Reimplement CopyIcon16/CopyCursor16 using CreateCursorIconIndirect16. --- dlls/user32/cursoricon.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 37bbcda..ce0de37 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1557,8 +1557,12 @@ HGLOBAL16 WINAPI CreateCursorIconIndirect16( HINSTANCE16 hInstance, */ HICON16 WINAPI CopyIcon16( HINSTANCE16 hInstance, HICON16 hIcon ) { - TRACE_(icon)("%04x %04x\n", hInstance, hIcon ); - return HICON_16(CURSORICON_Copy(hInstance, HICON_32(hIcon))); + CURSORICONINFO *info = GlobalLock16( hIcon ); + void *and_bits = info + 1; + void *xor_bits = (BYTE *)and_bits + info->nHeight * get_bitmap_width_bytes( info->nWidth, 1 ); + HGLOBAL16 ret = CreateCursorIconIndirect16( hInstance, info, and_bits, xor_bits ); + GlobalUnlock16( hIcon ); + return ret; } @@ -1577,10 +1581,15 @@ HICON WINAPI CopyIcon( HICON hIcon ) */ HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor ) { - TRACE_(cursor)("%04x %04x\n", hInstance, hCursor ); - return HICON_16(CURSORICON_Copy(hInstance, HCURSOR_32(hCursor))); + CURSORICONINFO *info = GlobalLock16( hCursor ); + void *and_bits = info + 1; + void *xor_bits = (BYTE *)and_bits + info->nHeight * get_bitmap_width_bytes( info->nWidth, 1 ); + HGLOBAL16 ret = CreateCursorIconIndirect16( hInstance, info, and_bits, xor_bits ); + GlobalUnlock16( hCursor ); + return ret; } + /********************************************************************** * DestroyIcon32 (USER.610) *

1 0

Alexandre Julliard : user32: Use CreateIconIndirect to implement CreateCursor.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 001abc3c62c125d93ebbd558ecd7e750ccc9fe28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001abc3c62c125d93ebbd558e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 14:10:06 2009 +0100 user32: Use CreateIconIndirect to implement CreateCursor. --- dlls/user32/cursoricon.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 631c469..37bbcda 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1431,20 +1431,21 @@ HCURSOR WINAPI CreateCursor( HINSTANCE hInstance, INT nWidth, INT nHeight, LPCVOID lpANDbits, LPCVOID lpXORbits ) { - CURSORICONINFO info; + ICONINFO info; + HCURSOR hCursor; TRACE_(cursor)("%dx%d spot=%d,%d xor=%p and=%p\n", nWidth, nHeight, xHotSpot, yHotSpot, lpXORbits, lpANDbits); - info.ptHotSpot.x = xHotSpot; - info.ptHotSpot.y = yHotSpot; - info.nWidth = nWidth; - info.nHeight = nHeight; - info.nWidthBytes = 0; - info.bPlanes = 1; - info.bBitsPerPixel = 1; - - return HICON_32(CreateCursorIconIndirect16(0, &info, lpANDbits, lpXORbits)); + info.fIcon = FALSE; + info.xHotspot = xHotSpot; + info.yHotspot = yHotSpot; + info.hbmMask = CreateBitmap( nWidth, nHeight, 1, 1, lpANDbits ); + info.hbmColor = CreateBitmap( nWidth, nHeight, 1, 1, lpXORbits ); + hCursor = CreateIconIndirect( &info ); + DeleteObject( info.hbmMask ); + DeleteObject( info.hbmColor ); + return hCursor; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009