August 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Add stub for I_CryptGetAsn1Decoder.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 0c4c1985b0e5e5a818ae1ccae634f5735cfe4a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4c1985b0e5e5a818ae1ccae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 9 13:20:00 2007 -0700 crypt32: Add stub for I_CryptGetAsn1Decoder. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c7c3c8d..8fbaecd 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -196,6 +196,7 @@ @ stdcall I_CryptFlushLruCache(ptr long long) @ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) +@ stdcall I_CryptGetAsn1Decoder(long) @ stdcall I_CryptGetDefaultCryptProv(long) @ stub I_CryptGetDefaultCryptProvForEncrypt @ stdcall I_CryptGetOssGlobal(long) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index c311ce9..72bdfac 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -206,6 +206,12 @@ BOOL WINAPI I_CryptUninstallAsn1Module(void *x) return TRUE; } +void *WINAPI I_CryptGetAsn1Decoder(long x) +{ + FIXME("%08lx\n", x); + return NULL; +} + BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, DWORD *pcbFormat)

1 0

Hans Leidekker : wininet: Implement INTERNET_OPTION_CALLBACK in InternetSetOption{A, W}.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 4332f418a5720024c997c8ff3a02538d8c6add54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4332f418a5720024c997c8ff3… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Aug 9 18:34:22 2007 +0200 wininet: Implement INTERNET_OPTION_CALLBACK in InternetSetOption{A, W}. --- dlls/wininet/internet.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d0228be..aa74c7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1556,6 +1556,19 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, return (hr == S_OK) ? TRUE : FALSE; } +static INTERNET_STATUS_CALLBACK set_status_callback( + LPWININETHANDLEHEADER lpwh, INTERNET_STATUS_CALLBACK callback, BOOL unicode) +{ + INTERNET_STATUS_CALLBACK ret; + + if (unicode) lpwh->dwInternalFlags |= INET_CALLBACKW; + else lpwh->dwInternalFlags &= ~INET_CALLBACKW; + + ret = lpwh->lpfnStatusCB; + lpwh->lpfnStatusCB = callback; + + return ret; +} /*********************************************************************** * InternetSetStatusCallbackA (WININET.@) @@ -1576,16 +1589,12 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackA( TRACE("0x%08x\n", (ULONG)hInternet); - lpwh = WININET_GetObject(hInternet); - if (!lpwh) + if (!(lpwh = WININET_GetObject(hInternet))) return INTERNET_INVALID_STATUS_CALLBACK; - lpwh->dwInternalFlags &= ~INET_CALLBACKW; - retVal = lpwh->lpfnStatusCB; - lpwh->lpfnStatusCB = lpfnIntCB; + retVal = set_status_callback(lpwh, lpfnIntCB, FALSE); WININET_Release( lpwh ); - return retVal; } @@ -1607,17 +1616,13 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW( LPWININETHANDLEHEADER lpwh; TRACE("0x%08x\n", (ULONG)hInternet); - - lpwh = WININET_GetObject(hInternet); - if (!lpwh) + + if (!(lpwh = WININET_GetObject(hInternet))) return INTERNET_INVALID_STATUS_CALLBACK; - lpwh->dwInternalFlags |= INET_CALLBACKW; - retVal = lpwh->lpfnStatusCB; - lpwh->lpfnStatusCB = lpfnIntCB; + retVal = set_status_callback(lpwh, lpfnIntCB, TRUE); WININET_Release( lpwh ); - return retVal; } @@ -2344,6 +2349,12 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, switch (dwOption) { + case INTERNET_OPTION_CALLBACK: + { + INTERNET_STATUS_CALLBACK callback = *(INTERNET_STATUS_CALLBACK *)lpBuffer; + ret = (set_status_callback(lpwhh, callback, TRUE) != INTERNET_INVALID_STATUS_CALLBACK); + break; + } case INTERNET_OPTION_HTTP_VERSION: { HTTP_VERSION_INFO* pVersion=(HTTP_VERSION_INFO*)lpBuffer; @@ -2466,6 +2477,16 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, switch( dwOption ) { + case INTERNET_OPTION_CALLBACK: + { + LPWININETHANDLEHEADER lpwh; + INTERNET_STATUS_CALLBACK callback = *(INTERNET_STATUS_CALLBACK *)lpBuffer; + + if (!(lpwh = (LPWININETHANDLEHEADER)WININET_GetObject(hInternet))) return FALSE; + r = (set_status_callback(lpwh, callback, FALSE) != INTERNET_INVALID_STATUS_CALLBACK); + WININET_Release(lpwh); + return r; + } case INTERNET_OPTION_PROXY: { LPINTERNET_PROXY_INFOA pi = (LPINTERNET_PROXY_INFOA) lpBuffer;

1 0

Hans Leidekker : wininet: Process caller supplied headers after inserting connection and authorization headers , not before.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: bb9413d77a2002c5a76f01b56c9ec1d5092d2c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9413d77a2002c5a76f01b56… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Aug 9 21:43:25 2007 +0200 wininet: Process caller supplied headers after inserting connection and authorization headers, not before. --- dlls/wininet/http.c | 13 ++++---- dlls/wininet/tests/http.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8c50ec9..33cfbb5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2596,6 +2596,12 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } HTTP_FixURL(lpwhr); + HTTP_ProcessHeader(lpwhr, szConnection, + lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + + HTTP_InsertAuthorization(lpwhr); + HTTP_InsertProxyAuthorization(lpwhr); /* add the headers the caller supplied */ if( lpszHeaders && dwHeaderLength ) @@ -2604,13 +2610,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } - HTTP_ProcessHeader(lpwhr, szConnection, - lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, - HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - - HTTP_InsertAuthorization(lpwhr); - HTTP_InsertProxyAuthorization(lpwhr); - requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE); TRACE("Request header -> %s\n", debugstr_w(requestString) ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9c1327c..5d0b0bb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1128,6 +1128,16 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char notokmsg[] = +"HTTP/1.0 400 Bad Request\r\n" +"Server: winetest\r\n" +"\r\n"; + +static const char noauthmsg[] = +"HTTP/1.0 401 Unauthorized\r\n" +"Server: winetest\r\n" +"\r\n"; + static const char proxymsg[] = "HTTP/1.1 407 Proxy Authentication Required\r\n" "Server: winetest\r\n" @@ -1210,6 +1220,22 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, proxymsg, sizeof proxymsg-1, 0); } + if (strstr(buffer, "/test3")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } + + if (strstr(buffer, "/test4")) + { + if (strstr(buffer, "Connection: Close")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1366,6 +1392,53 @@ static void test_proxy_direct(int port) InternetCloseHandle(hi); } +static void test_header_handling_order(int port) +{ + static char authorization[] = "Authorization: Basic dXNlcjpwd2Q="; + static char connection[] = "Connection: Close"; + + static const char *types[2] = { "*", NULL }; + HINTERNET session, connect, request; + DWORD size, status; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/test3", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(request, authorization, ~0UL, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(request); + + request = HttpOpenRequest(connect, NULL, "/test4", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(request, connection, ~0UL, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void test_http_connection(void) { struct server_info si; @@ -1386,6 +1459,7 @@ static void test_http_connection(void) test_basic_request(si.port, "/test1"); test_proxy_indirect(si.port); test_proxy_direct(si.port); + test_header_handling_order(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "/quit");

1 0

Hans Leidekker : wininet: Don' t crash on NULL first or last parameter in InternetCrackUrlW.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: d10891eab9a8f5b86d7308d3b138498bc46f8732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10891eab9a8f5b86d7308d3b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Aug 9 18:33:41 2007 +0200 wininet: Don't crash on NULL first or last parameter in InternetCrackUrlW. --- dlls/wininet/internet.c | 5 ++--- dlls/wininet/tests/url.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 36546b2..5e5bcea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1218,16 +1218,15 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR DWORD dwUrlLength = dwUrlLength_orig; const WCHAR lpszSeparators[3]={';','?',0}; const WCHAR lpszSlash[2]={'/',0}; - if(dwUrlLength==0) - dwUrlLength=strlenW(lpszUrl); TRACE("(%s %u %x %p)\n", debugstr_w(lpszUrl), dwUrlLength, dwFlags, lpUC); - if (!lpszUrl_orig || !*lpszUrl_orig) + if (!lpszUrl_orig || !*lpszUrl_orig || !lpUC) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + if (!dwUrlLength) dwUrlLength = strlenW(lpszUrl); if (dwFlags & ICU_DECODE) { diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 98442bb..125e641 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -238,6 +238,7 @@ static void InternetCrackUrlW_test(void) static const WCHAR url2[] = { '.','.','/','R','i','t','z','.','x','m','l',0 }; URL_COMPONENTSW comp; WCHAR scheme[20], host[20], user[20], pwd[20], urlpart[50], extra[50]; + DWORD error; BOOL r; urlpart[0]=0; @@ -261,6 +262,18 @@ static void InternetCrackUrlW_test(void) comp.lpszExtraInfo = extra; comp.dwExtraInfoLength = sizeof extra; + SetLastError(0xdeadbeef); + r = InternetCrackUrlW(NULL, 0, 0, &comp ); + error = GetLastError(); + ok( !r, "InternetCrackUrlW succeeded unexpectedly\n"); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + + SetLastError(0xdeadbeef); + r = InternetCrackUrlW(url, 0, 0, NULL ); + error = GetLastError(); + ok( !r, "InternetCrackUrlW succeeded unexpectedly\n"); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); ok( comp.dwSchemeLength == 4, "scheme length wrong\n");

1 0

Hans Leidekker : wininet: Also set last error on NULL first parameter in InternetCreateUrl{A, W}.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: c1c6f4ad6bce6221fa0413ddda606067a59172d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c6f4ad6bce6221fa0413ddd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Aug 9 18:34:09 2007 +0200 wininet: Also set last error on NULL first parameter in InternetCreateUrl{A, W}. --- dlls/wininet/internet.c | 10 ++-------- dlls/wininet/tests/url.c | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5e5bcea..d0228be 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3663,10 +3663,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); - if (!lpUrlComponents) - return FALSE; - - if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) + if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -3733,10 +3730,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); - if (!lpUrlComponents) - return FALSE; - - if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) + if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 125e641..6da48be 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -404,11 +404,11 @@ static void InternetCreateUrlA_test(void) host[] = "host"; /* test NULL lpUrlComponents */ - ret = InternetCreateUrlA(NULL, 0, NULL, &len); SetLastError(0xdeadbeef); + ret = InternetCreateUrlA(NULL, 0, NULL, &len); ok(!ret, "Expected failure\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(len == -1, "Expected len -1, got %d\n", len); /* test zero'ed lpUrlComponents */

1 0

Francois Gouget : mprapi: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 31c8f3e02bd1b45c8073bcd9b458243304513b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c8f3e02bd1b45c8073bcd9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:30:26 2007 +0200 mprapi: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e0a659b..f3000c2 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2312,6 +2312,16 @@ VOID LPCWSTR LPWSTR +%%mprapi.dll + +%long + +BOOL + +%wstr + +LPWSTR + %%msacm32.drv %long

1 0

Francois Gouget : wing32: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 910d1b01e8e900315cf358e2e4e4dc33e50b27cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=910d1b01e8e900315cf358e2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:30:30 2007 +0200 wing32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f3000c2..c3c33d8 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5444,6 +5444,26 @@ void LPCWSTR LPWSTR +%%wing32.dll + +%long + +BOOL +COLORREF +HBITMAP +HBRUSH +HDC +HPALETTE +INT +UINT + +%ptr + +BITMAPINFO * +RGBQUAD * +void * +void ** + %%wininet.dll %double

1 0

Francois Gouget : pdh: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 64de86dce7dc20c861a32669efcd823f4ca90ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64de86dce7dc20c861a32669e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:30:39 2007 +0200 pdh: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index c3c33d8..b9fe3cb 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3731,6 +3731,42 @@ LPCSTR void +%%pdh.dll + +%long + +BOOLEAN +DWORD +LONG +PDH_HCOUNTER +PDH_HQUERY +PDH_STATUS + +%long --pointer + +DWORD_PTR + +%ptr + +LONGLONG * +LPDWORD +PDH_HCOUNTER * +PDH_HQUERY * +PPDH_COUNTER_INFO_A +PPDH_COUNTER_INFO_W +PPDH_FMT_COUNTERVALUE +PPDH_RAW_COUNTER + +%str + +LPCSTR +LPSTR + +%wstr + +LPCWSTR +LPWSTR + %%powrprof.dll %long

1 0

Francois Gouget : kernel32/tests: Test the debugger startup and crashed processes exit code.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 6493c30c901e6fbe2d33832516a338b8db3bfa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6493c30c901e6fbe2d3383251… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 9 17:54:31 2007 +0200 kernel32/tests: Test the debugger startup and crashed processes exit code. --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/debugger.c | 291 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index ca3c608..d87e47d 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -13,6 +13,7 @@ CTESTS = \ codepage.c \ comm.c \ console.c \ + debugger.c \ directory.c \ drive.c \ environ.c \ diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c new file mode 100644 index 0000000..8b98e59 --- /dev/null +++ b/dlls/kernel32/tests/debugger.c @@ -0,0 +1,291 @@ +/* + * Unit tests for the debugger facility + * + * Copyright (c) 2007 Francois Gouget for CodeWeavers + * + * 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 + */ + +#include <stdio.h> +#include <assert.h> + +#include <windows.h> +#include <winreg.h> +#include "wine/test.h" + +static int myARGC; +static char** myARGV; + + +/* Copied from the process test */ +static void get_file_name(char* buf) +{ + char path[MAX_PATH]; + + buf[0] = '\0'; + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "wt", 0, buf); +} + +static void get_events(const char* name, HANDLE *start_event, HANDLE *done_event) +{ + const char* basename; + char* event_name; + + basename=strrchr(name, '\\'); + basename=(basename ? basename+1 : name); + event_name=HeapAlloc(GetProcessHeap(), 0, 6+strlen(basename)+1); + + sprintf(event_name, "start_%s", basename); + *start_event=CreateEvent(NULL, 0,0, event_name); + sprintf(event_name, "done_%s", basename); + *done_event=CreateEvent(NULL, 0,0, event_name); + HeapFree(GetProcessHeap(), 0, event_name); +} + +static void log_pid(const char* logfile, DWORD pid) +{ + HANDLE hFile; + DWORD written; + + hFile=CreateFileA(logfile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) + return; + WriteFile(hFile, &pid, sizeof(pid), &written, NULL); + CloseHandle(hFile); +} + +static DWORD get_logged_pid(const char* logfile) +{ + HANDLE hFile; + DWORD pid, read; + BOOL ret; + + hFile=CreateFileA(logfile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) + { + ok(0, "unable to open '%s'\n", logfile); + return 0; + } + pid=0; + read=sizeof(pid); + ret=ReadFile(hFile, &pid, sizeof(pid), &read, NULL); + ok(read == sizeof(pid), "wrong size for '%s': read=%d\n", logfile, read); + CloseHandle(hFile); + return pid; +} + +static void doCrash(int argc, char** argv) +{ + char* p; + const char* logfile; + + logfile=(argc >= 4 ? argv[3] : NULL); + log_pid(logfile, GetCurrentProcessId()); + + /* Just crash */ + trace("child: crashing...\n"); + p=NULL; + *p=0; +} + +static void doDebugger(int argc, char** argv) +{ + const char* logfile; + HANDLE start_event, done_event, debug_event; + DWORD pid; + + ok(argc == 6, "wrong debugger argument count: %d\n", argc); + logfile=(argc >= 4 ? argv[3] : NULL); + pid=(argc >= 5 ? atol(argv[4]) : 0); + debug_event=(argc >= 6 ? (HANDLE)atol(argv[5]) : NULL); + if (debug_event && strcmp(myARGV[2], "dbgnoevent") != 0) + { + ok(SetEvent(debug_event), "debugger: SetEvent(debug_event) failed\n"); + } + + log_pid(logfile, pid); + get_events(logfile, &start_event, &done_event); + if (strcmp(myARGV[2], "dbgnoevent") != 0) + { + trace("debugger: waiting for the start signal...\n"); + WaitForSingleObject(start_event, INFINITE); + } + + ok(SetEvent(done_event), "debugger: SetEvent(done_event) failed\n"); + trace("debugger: done debugging...\n"); + + /* Just exit with a known value */ + ExitProcess(0xdeadbeef); +} + +static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) +{ + DWORD ret; + HANDLE start_event, done_event; + char* cmd; + char dbglog[MAX_PATH]; + char childlog[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + DWORD exit_code; + DWORD pid1, pid2; + + ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); + + get_file_name(dbglog); + get_events(dbglog, &start_event, &done_event); + cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(debugger)+1+strlen(dbglog)+34+1); + sprintf(cmd, "%s debugger %s %s %%ld %%ld", argv0, debugger, dbglog); + ret=RegSetValueExA(hkey, "debugger", 0, REG_SZ, (BYTE*)cmd, strlen(cmd)+1); + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/debugger: ret=%d\n", ret); + HeapFree(GetProcessHeap(), 0, cmd); + + get_file_name(childlog); + cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+16+strlen(dbglog)+1); + sprintf(cmd, "%s debugger crash %s", argv0, childlog); + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + ret=CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess: err=%d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, cmd); + CloseHandle(info.hThread); + + /* The process exits... */ + trace("waiting for child exit...\n"); + ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); + ok(GetExitCodeProcess(info.hProcess, &exit_code), "GetExitCodeProcess failed: err=%d\n", GetLastError()); + ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); + CloseHandle(info.hProcess); + + /* ...before the debugger */ + if (strcmp(debugger, "dbgnoevent") != 0) + ok(SetEvent(start_event), "SetEvent(start_event) failed\n"); + + trace("waiting for the debugger...\n"); + ok(WaitForSingleObject(done_event, 60000) == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); + + pid1=get_logged_pid(dbglog); + pid2=get_logged_pid(childlog); + ok(pid1 == pid2, "the child and debugged pids don't match: %d != %d\n", pid1, pid2); + assert(DeleteFileA(dbglog) != 0); + assert(DeleteFileA(childlog) != 0); +} + +static void test_ExitCode(void) +{ + static const char* AeDebug="Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; + char test_exe[MAX_PATH]; + DWORD ret; + HKEY hkey; + DWORD disposition; + LPBYTE auto_val=NULL; + DWORD auto_size, auto_type; + LPBYTE debugger_val=NULL; + DWORD debugger_size, debugger_type; + + GetModuleFileNameA(GetModuleHandle(NULL), test_exe, sizeof(test_exe)); + if (GetFileAttributes(test_exe) == INVALID_FILE_ATTRIBUTES) + strcat(test_exe, ".so"); + if (GetFileAttributesA(test_exe) == INVALID_FILE_ATTRIBUTES) + { + ok(0, "could not find the test executable '%s'\n", test_exe); + return; + } + + ret=RegCreateKeyExA(HKEY_LOCAL_MACHINE, AeDebug, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disposition); + if (ret == ERROR_SUCCESS) + { + auto_size=0; + ret=RegQueryValueExA(hkey, "auto", NULL, &auto_type, NULL, &auto_size); + if (ret == ERROR_SUCCESS) + { + auto_val=HeapAlloc(GetProcessHeap(), 0, auto_size); + RegQueryValueExA(hkey, "auto", NULL, &auto_type, auto_val, &auto_size); + } + + debugger_size=0; + ret=RegQueryValueExA(hkey, "debugger", NULL, &debugger_type, NULL, &debugger_size); + if (ret == ERROR_SUCCESS) + { + debugger_val=HeapAlloc(GetProcessHeap(), 0, debugger_size); + RegQueryValueExA(hkey, "debugger", NULL, &debugger_type, debugger_val, &debugger_size); + } + } + else if (ret == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to change the debugger\n"); + return; + } + else if (ret != ERROR_FILE_NOT_FOUND) + { + ok(0, "could not open the AeDebug key: %d\n", ret); + return; + } + + ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); + crash_and_debug(hkey, test_exe, "dbgevent"); + crash_and_debug(hkey, test_exe, "dbgnoevent"); + + if (disposition == REG_CREATED_NEW_KEY) + { + RegCloseKey(hkey); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, AeDebug); + } + else + { + if (auto_val) + { + RegSetValueExA(hkey, "auto", 0, auto_type, auto_val, auto_size); + HeapFree(GetProcessHeap(), 0, auto_val); + } + else + RegDeleteValueA(hkey, "auto"); + if (debugger_val) + { + RegSetValueExA(hkey, "debugger", 0, debugger_type, debugger_val, debugger_size); + HeapFree(GetProcessHeap(), 0, debugger_val); + } + else + RegDeleteValueA(hkey, "debugger"); + RegCloseKey(hkey); + } +} + +START_TEST(debugger) +{ + + myARGC=winetest_get_mainargs(&myARGV); + + if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0) + { + doCrash(myARGC, myARGV); + } + else if (myARGC >= 3 && + (strcmp(myARGV[2], "dbgevent") == 0 || + strcmp(myARGV[2], "dbgnoevent") == 0)) + { + doDebugger(myARGC, myARGV); + } + else + { + test_ExitCode(); + } +}

1 0

Francois Gouget : kernel32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: f992b6360b58ef85570d625c60e011efbc7c1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f992b6360b58ef85570d625c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 17:23:45 2007 +0200 kernel32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 4944be2..78935ac 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1835,6 +1835,7 @@ GEOID GEOTYPE HANDLE HANDLE16 +HEAP_INFORMATION_CLASS HFILE HFILE16 HGLOBAL @@ -1875,6 +1876,7 @@ ULONG_PTR DWORDLONG LARGE_INTEGER +ULONGLONG %ptr @@ -1903,6 +1905,7 @@ ENUMRESNAMEPROCA ENUMRESNAMEPROCW ENUMRESTYPEPROCA ENUMRESTYPEPROCW +EXCEPTION_RECORD * FARPROC FARPROC * FARPROC16 @@ -1913,6 +1916,7 @@ GEO_ENUMPROC GET_FILEEX_INFO_LEVELS GUID * HANDLE * +HMODULE * IMAGE_DOS_HEADER * INPUT_RECORD * LANGGROUPLOCALE_ENUMPROCA

1 0