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

Zac Brown : winhttp: Add stub implementation for WinHttpOpenRequest and fix function declaration .
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: ae1e79d43ee2ff2d6017e98757828c87706ceff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1e79d43ee2ff2d6017e9875… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jul 2 14:37:32 2008 -0700 winhttp: Add stub implementation for WinHttpOpenRequest and fix function declaration. --- dlls/winhttp/main.c | 14 ++++++++++++++ dlls/winhttp/winhttp.spec | 2 +- include/winhttp.h | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index c9f78cd..5e675d1 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -153,3 +153,17 @@ HINTERNET WINAPI WinHttpConnect (HINTERNET hSession, LPCWSTR pwszServerName, SetLastError(ERROR_NOT_SUPPORTED); return NULL; } + +/*********************************************************************** + * WinHttpOpenRequest (winhttp.@) + */ +HINTERNET WINAPI WinHttpOpenRequest (HINTERNET hConnect, LPCWSTR pwszVerb, LPCWSTR pwszObjectName, + LPCWSTR pwszVersion, LPCWSTR pwszReferrer, LPCWSTR* ppwszAcceptTypes, + DWORD dwFlags) +{ + FIXME("(%s, %s, %s, %s, 0x%x): stub\n", debugstr_w(pwszVerb), debugstr_w(pwszObjectName), + debugstr_w(pwszVersion), debugstr_w(pwszReferrer), dwFlags); + + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 42a3f9a..6fd06ea 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -13,7 +13,7 @@ @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stub WinHttpGetProxyForUrl @ stdcall WinHttpOpen(wstr long wstr wstr long) -@ stub WinHttpOpenRequest +@ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stub WinHttpQueryAuthSchemes @ stub WinHttpQueryDataAvailable @ stub WinHttpQueryHeaders diff --git a/include/winhttp.h b/include/winhttp.h index 730d2cb..c866df2 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -253,7 +253,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,DWORD); +HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD);

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpSendRequest.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: f094b4332d4941502e4dc836f1b6df2931da3ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f094b4332d4941502e4dc836f… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jul 2 14:37:35 2008 -0700 winhttp: Add stub implementation for WinHttpSendRequest. --- dlls/winhttp/main.c | 13 +++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 5e675d1..2b1c9b0 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -167,3 +167,16 @@ HINTERNET WINAPI WinHttpOpenRequest (HINTERNET hConnect, LPCWSTR pwszVerb, LPCWS SetLastError(ERROR_NOT_SUPPORTED); return NULL; } + +/*********************************************************************** + * WinHttpSendRequest (winhttp.@) + */ +BOOL WINAPI WinHttpSendRequest (HINTERNET hRequest, LPCWSTR pwszHeaders, DWORD dwHeadersLength, + LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwTotalLength, + DWORD_PTR dwContext) +{ + FIXME("(%s, %d, %d, %d): stub\n", debugstr_w(pwszHeaders), dwHeadersLength, dwOptionalLength, dwTotalLength); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 6fd06ea..780b99b 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -20,7 +20,7 @@ @ stub WinHttpQueryOption @ stub WinHttpReadData @ stub WinHttpReceiveResponse -@ stub WinHttpSendRequest +@ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) @ stub WinHttpSetCredentials @ stub WinHttpSetDefaultProxyConfiguration @ stub WinHttpSetOption

1 0

Dylan Smith : comctl32: Added tests to show a ComboBoxEx bug caused by incorrect focus change.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: da0175ba71062a6963b53df3de4bbd1a1e3dd9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0175ba71062a6963b53df3d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 3 11:37:10 2008 -0400 comctl32: Added tests to show a ComboBoxEx bug caused by incorrect focus change. Certain WM_LBUTTONDOWN & WM_LBUTTONUP events should change focus to the ComboBox (a child of ComboBoxEx), but instead the focus was set to the Edit control. --- dlls/comctl32/tests/comboex.c | 102 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/combo.c | 88 +++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index ad58643..dbd9c6e 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -169,7 +169,106 @@ static void test_comboboxex(void) { /* Cleanup */ HeapFree(GetProcessHeap(), 0, textBuffer); + DestroyWindow(myHwnd); +} + +static void test_WM_LBUTTONDOWN(void) +{ + HWND hComboEx, hCombo, hEdit, hList; + COMBOBOXINFO cbInfo; + UINT x, y, item_height; + LRESULT result; + int i, idx; + RECT rect; + WCHAR buffer[3]; + static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; + static const WCHAR stringFormat[] = {'%','2','d','\0'}; + + hComboEx = CreateWindowExA(0, WC_COMBOBOXEXA, NULL, + WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, + hComboExParentWnd, NULL, hMainHinst, NULL); + + for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ + COMBOBOXEXITEMW cbexItem; + wsprintfW(buffer, stringFormat, choices[i]); + + memset(&cbexItem, 0x00, sizeof(cbexItem)); + cbexItem.mask = CBEIF_TEXT; + cbexItem.iItem = i; + cbexItem.pszText = buffer; + cbexItem.cchTextMax = 0; + ok(SendMessageW(hComboEx, CBEM_INSERTITEMW, 0, (LPARAM)&cbexItem) >= 0, + "Failed to add item %d\n", i); + } + hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + hEdit = (HWND)SendMessage(hComboEx, CBEM_GETEDITCONTROL, 0, 0); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + ok(result, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hList = cbInfo.hwndList; + + trace("hWnd=%p, hComboEx=%p, hCombo=%p, hList=%p, hEdit=%p\n", + hComboExParentWnd, hComboEx, hCombo, hList, hEdit); + ok(GetFocus() == hComboExParentWnd, + "Focus not on Main Window, instead on %p\n", GetFocus()); + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + result = SendMessage(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + todo_wine ok(GetFocus() == hCombo, + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + ok(SendMessage(hComboEx, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + idx = SendMessage(hCombo, CB_GETTOPINDEX, 0, 0); + ok(idx == 0, "For TopIndex expected %d, got %d\n", 0, idx); + + result = SendMessage(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + todo_wine ok(GetFocus() == hCombo, + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + + /* Click on the 5th item in the list */ + item_height = SendMessage(hCombo, CB_GETITEMHEIGHT, 0, 0); + ok(GetClientRect(hList, &rect), "Failed to get list's client rect.\n"); + x = rect.left + (rect.right-rect.left)/2; + y = item_height/2 + item_height*4; + result = SendMessage(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y)); + ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n", + GetLastError()); + todo_wine ok(GetFocus() == hCombo, + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + + result = SendMessage(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + todo_wine ok(GetFocus() == hCombo, + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + todo_wine ok(SendMessage(hComboEx, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should still be visible.\n"); + + result = SendMessage(hList, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hEdit, + "Focus not on ComboBoxEx's Edit Control, instead on %p\n", + GetFocus()); + ok(!SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have been rolled up.\n"); + idx = SendMessage(hComboEx, CB_GETCURSEL, 0, 0); + ok(idx == 4, "Current Selection: expected %d, got %d\n", 4, idx); + + DestroyWindow(hComboEx); } static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -217,7 +316,7 @@ static int init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); - hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW, + hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); assert(hComboExParentWnd != NULL); @@ -244,6 +343,7 @@ START_TEST(comboex) return; test_comboboxex(); + test_WM_LBUTTONDOWN(); cleanup(); } diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 34d8c7a..d47ff20 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -265,6 +265,93 @@ static void test_CBN_SELCHANGE(void) test_selection(CBS_DROPDOWNLIST, text, sel_2, sel_2); } +static void test_WM_LBUTTONDOWN(void) +{ + HWND hCombo, hEdit, hList; + COMBOBOXINFO cbInfo; + UINT x, y, item_height; + LRESULT result; + int i, idx; + RECT rect; + WCHAR buffer[3]; + static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; + static const WCHAR stringFormat[] = {'%','2','d','\0'}; + + hCombo = CreateWindow("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, + 0, 0, 200, 150, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ + wsprintfW(buffer, stringFormat, choices[i]); + ok(SendMessageW(hCombo, CB_ADDSTRING, 0, (LPARAM)&buffer) != CB_ERR, + "Failed to add item %d\n", i); + } + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + ok(result, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + hList = cbInfo.hwndList; + + trace("hMainWnd=%x, hCombo=%x, hList=%x, hEdit=%x\n", + (UINT)hMainWnd, (UINT)hCombo, (UINT)hList, (UINT)hEdit); + ok(GetFocus() == hMainWnd, "Focus not on Main Window, instead on %x\n", + (UINT)GetFocus()); + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + result = SendMessage(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + + ok(GetFocus() == hEdit, + "Focus not on ComboBox's Edit Control, instead on %x\n", + (UINT)GetFocus()); + result = SendMessage(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hEdit, + "Focus not on ComboBox's Edit Control, instead on %x\n", + (UINT)GetFocus()); + + /* Click on the 5th item in the list */ + item_height = SendMessage(hCombo, CB_GETITEMHEIGHT, 0, 0); + ok(GetClientRect(hList, &rect), "Failed to get list's client rect.\n"); + x = rect.left + (rect.right-rect.left)/2; + y = item_height/2 + item_height*4; + result = SendMessage(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hEdit, + "Focus not on ComboBox's Edit Control, instead on %x\n", + (UINT)GetFocus()); + + result = SendMessage(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y)); + ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hEdit, + "Focus not on ComboBox's Edit Control, instead on %x\n", + (UINT)GetFocus()); + ok(SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should still be visible.\n"); + + result = SendMessage(hList, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hEdit, + "Focus not on ComboBox's Edit Control, instead on %x\n", + (UINT)GetFocus()); + ok(!SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have been rolled up.\n"); + idx = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + ok(idx, "Current Selection: expected %d, got %d\n", 4, idx); + + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -275,6 +362,7 @@ START_TEST(combo) test_setitemheight(CBS_DROPDOWN); test_setitemheight(CBS_DROPDOWNLIST); test_CBN_SELCHANGE(); + test_WM_LBUTTONDOWN(); DestroyWindow(hMainWnd); }

1 0

Kai Blin : ws2_32: Prevent segfault in trace for NULL AddressString.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: 1d77d2a8260700526420776cc0355064afd2ced4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d77d2a8260700526420776cc… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Jul 3 19:52:14 2008 +0200 ws2_32: Prevent segfault in trace for NULL AddressString. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fa908b4..53478d6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4522,8 +4522,8 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, INT res=0; LPSTR workBuffer=NULL,ptrPort; - TRACE( "(%s, %x, %p, %p, %p)\n", AddressString, AddressFamily, lpProtocolInfo, - lpAddress, lpAddressLength ); + TRACE( "(%s, %x, %p, %p, %p)\n", debugstr_a(AddressString), AddressFamily, + lpProtocolInfo, lpAddress, lpAddressLength ); if (!lpAddressLength || !lpAddress) return SOCKET_ERROR;

1 0

Zac Brown : winhttp.h: Add WinHTTP error codes.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: 5db545965f8153f65b7216ebddec67fd3ee74439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db545965f8153f65b7216ebd… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Jul 3 10:06:54 2008 -0700 winhttp.h: Add WinHTTP error codes. --- include/winhttp.h | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index cedcea3..730d2cb 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -128,6 +128,41 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_NO_ADDITIONAL_HEADERS NULL #define WINHTTP_NO_REQUEST_DATA NULL +/* WinHTTP error codes */ +#define WINHTTP_ERROR_BASE 12000 +#define ERROR_WINHTTP_OUT_OF_HANDLES (WINHTTP_ERROR_BASE + 1) +#define ERROR_WINHTTP_TIMEOUT (WINHTTP_ERROR_BASE + 2) +#define ERROR_WINHTTP_INTERNAL_ERROR (WINHTTP_ERROR_BASE + 4) +#define ERROR_WINHTTP_INVALID_URL (WINHTTP_ERROR_BASE + 5) +#define ERROR_WINHTTP_UNRECOGNIZED_SCHEME (WINHTTP_ERROR_BASE + 6) +#define ERROR_WINHTTP_NAME_NOT_RESOLVED (WINHTTP_ERROR_BASE + 7) +#define ERROR_WINHTTP_INVALID_OPTION (WINHTTP_ERROR_BASE + 9) +#define ERROR_WINHTTP_OPTION_NOT_SETTABLE (WINHTTP_ERROR_BASE + 11) +#define ERROR_WINHTTP_SHUTDOWN (WINHTTP_ERROR_BASE + 12) +#define ERROR_WINHTTP_LOGIN_FAILURE (WINHTTP_ERROR_BASE + 15) +#define ERROR_WINHTTP_OPERATION_CANCELLED (WINHTTP_ERROR_BASE + 17) +#define ERROR_WINHTTP_INCORRECT_HANDLE_TYPE (WINHTTP_ERROR_BASE + 18) +#define ERROR_WINHTTP_INCORRECT_HANDLE_STATE (WINHTTP_ERROR_BASE + 19) +#define ERROR_WINHTTP_CANNOT_CONNECT (WINHTTP_ERROR_BASE + 29) +#define ERROR_WINHTTP_CONNECTION_ERROR (WINHTTP_ERROR_BASE + 30) +#define ERROR_WINHTTP_RESEND_REQUEST (WINHTTP_ERROR_BASE + 32) +#define ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED (WINHTTP_ERROR_BASE + 44) +#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN (WINHTTP_ERROR_BASE + 100) +#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND (WINHTTP_ERROR_BASE + 101) +#define ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND (WINHTTP_ERROR_BASE + 102) +#define ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN (WINHTTP_ERROR_BASE + 103) +#define ERROR_WINHTTP_HEADER_NOT_FOUND (WINHTTP_ERROR_BASE + 150) +#define ERROR_WINHTTP_INVALID_SERVER_RESPONSE (WINHTTP_ERROR_BASE + 152) +#define ERROR_WINHTTP_INVALID_HEADER (WINHTTP_ERROR_BASE + 153) +#define ERROR_WINHTTP_INVALID_QUERY_REQUEST (WINHTTP_ERROR_BASE + 154) +#define ERROR_WINHTTP_HEADER_ALREADY_EXISTS (WINHTTP_ERROR_BASE + 155) +#define ERROR_WINHTTP_REDIRECT_FAILED (WINHTTP_ERROR_BASE + 156) +#define ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT (WINHTTP_ERROR_BASE + 166) +#define ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT (WINHTTP_ERROR_BASE + 167) +#define ERROR_WINHTTP_NOT_INITIALIZED (WINHTTP_ERROR_BASE + 172) +#define ERROR_WINHTTP_SECURE_FAILURE (WINHTTP_ERROR_BASE + 175) +#define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) + typedef struct { DWORD dwStructSize;

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpConnect.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: ca627f5b7df7cf69ed9f3623146e22c638c65eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca627f5b7df7cf69ed9f36231… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jul 2 14:37:28 2008 -0700 winhttp: Add stub implementation for WinHttpConnect. --- dlls/winhttp/main.c | 13 +++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index e90d6b4..c9f78cd 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -140,3 +140,16 @@ HINTERNET WINAPI WinHttpOpen(LPCWSTR pwszUserAgent, DWORD dwAccessType, SetLastError(ERROR_NOT_SUPPORTED); return NULL; } + +/*********************************************************************** + * WinHttpConnect (winhttp.@) + */ + +HINTERNET WINAPI WinHttpConnect (HINTERNET hSession, LPCWSTR pwszServerName, + INTERNET_PORT nServerPort, DWORD dwReserved) +{ + FIXME("(%s, %d, 0x%x): stub\n", debugstr_w(pwszServerName), nServerPort, dwReserved); + + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 912ff6a..42a3f9a 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -5,7 +5,7 @@ @ stub WinHttpAddRequestHeaders @ stdcall WinHttpCheckPlatform() @ stub WinHttpCloseHandle -@ stub WinHttpConnect +@ stdcall WinHttpConnect(ptr wstr long long) @ stub WinHttpCrackUrl @ stub WinHttpCreateUrl @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr)

1 0

Maarten Lankhorst : quartz: Set filesource initial state to stopped.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: ee317b19b2a3cfb3d3558ea079738845ca1d018e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee317b19b2a3cfb3d3558ea07… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 3 18:21:37 2008 -0700 quartz: Set filesource initial state to stopped. Fixes a bug valgrind found. --- dlls/quartz/filesource.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ffb5bce..99f8852 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -355,6 +355,7 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) pAsyncRead->filterInfo.pGraph = NULL; pAsyncRead->pOutputPin = NULL; pAsyncRead->lastpinchange = GetTickCount(); + pAsyncRead->state = State_Stopped; InitializeCriticalSection(&pAsyncRead->csFilter); pAsyncRead->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AsyncReader.csFilter");

1 0

Jacek Caban : mshtml: Don't mix nsresult with HRESULT.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: 047e5aaad562e65c8a976c3c86bc753d9e0ff359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047e5aaad562e65c8a976c3c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 17:23:51 2008 +0200 mshtml: Don't mix nsresult with HRESULT. --- dlls/mshtml/htmlwindow.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e3f8e75..043e4e9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -642,15 +642,29 @@ static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String) static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, long x, long y) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); + nsresult nsres; + TRACE("(%p)->(%ld %ld)\n", This, x, y); - return nsIDOMWindow_ScrollBy(This->nswindow, x, y); + + nsres = nsIDOMWindow_ScrollBy(This->nswindow, x, y); + if(NS_FAILED(nsres)) + ERR("ScrollBy failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, long x, long y) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); + nsresult nsres; + TRACE("(%p)->(%ld %ld)\n", This, x, y); - return nsIDOMWindow_ScrollTo(This->nswindow, x, y); + + nsres = nsIDOMWindow_ScrollTo(This->nswindow, x, y); + if(NS_FAILED(nsres)) + ERR("ScrollTo failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLWindow2_moveTo(IHTMLWindow2 *iface, long x, long y)

1 0

Jon Griffiths : c2man: Don't mangle 'dll' when its part of another word.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: dcabc064fc520280352cd851cba26d07d4c84648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcabc064fc520280352cd851c… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Thu Jul 3 14:25:38 2008 -0700 c2man: Don't mangle 'dll' when its part of another word. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 30c2186..4272b73 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -513,7 +513,7 @@ sub process_comment_text($) # Preferred capitalisations s/ wine| WINE/ Wine/g; s/ API | api / Api /g; - s/DLL|Dll/dll /g; + s/ DLL | Dll / dll /g; s/ URL | url / Url /g; s/WIN16|win16/Win16/g; s/WIN32|win32/Win32/g;

1 0

Alexandre Julliard : ntdll: Split the signal setup into process-wide and thread-specific routines.
by Alexandre Julliard 04 Jul '08

04 Jul '08

Module: wine Branch: master Commit: 531ff0be2601f1e25f01822f0bb0fcd2a655664e URL: http://source.winehq.org/git/wine.git/?a=commit;h=531ff0be2601f1e25f01822f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 20:18:23 2008 +0200 ntdll: Split the signal setup into process-wide and thread-specific routines. --- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/server.c | 2 +- dlls/ntdll/signal_i386.c | 25 ++++++++++++++----------- dlls/ntdll/signal_powerpc.c | 17 ++++++++++++----- dlls/ntdll/signal_sparc.c | 16 ++++++++++++---- dlls/ntdll/signal_x86_64.c | 16 ++++++++++++---- dlls/ntdll/thread.c | 2 +- 7 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 6f428e0..3317a6a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -53,7 +53,8 @@ extern NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handl const LARGE_INTEGER *timeout, HANDLE signal_object ); /* init routines */ -extern BOOL SIGNAL_Init(void); +extern void signal_init_thread(void); +extern void signal_init_process(void); extern size_t get_signal_stack_total_size(void); extern void version_init( const WCHAR *appname ); extern void debug_init(void); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3d8beee..6e41eb5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -985,7 +985,7 @@ NTSTATUS server_init_process_done(void) * We do need the handlers in place by the time the request is over, so * we set them up here. If we segfault between here and the server call * something is very wrong... */ - if (!SIGNAL_Init()) exit(1); + signal_init_process(); /* Signal the parent process to continue */ SERVER_START_REQ( init_process_done ) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9edbaa1..4351844 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1533,12 +1533,10 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) { - struct sigaction sig_act; - #ifdef HAVE_SIGALTSTACK stack_t ss; @@ -1553,12 +1551,16 @@ BOOL SIGNAL_Init(void) ss.ss_sp = get_signal_stack(); ss.ss_size = signal_stack_size; ss.ss_flags = 0; - if (sigaltstack(&ss, NULL) == -1) - { - perror( "sigaltstack" ); - return FALSE; - } + if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); #endif /* HAVE_SIGALTSTACK */ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) +{ + struct sigaction sig_act; sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART; @@ -1594,11 +1596,12 @@ BOOL SIGNAL_Init(void) if (sigaction( SIGUSR2, &sig_act, NULL ) == -1) goto error; #endif - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index a468754..e65591b 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -648,9 +648,16 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) +{ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) { if (set_handler( SIGINT, (void (*)())int_handler ) == -1) goto error; if (set_handler( SIGFPE, (void (*)())fpe_handler ) == -1) goto error; @@ -665,12 +672,12 @@ BOOL SIGNAL_Init(void) #ifdef SIGTRAP if (set_handler( SIGTRAP, (void (*)())trap_handler ) == -1) goto error; #endif - - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index d72269a..d3896f3 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -457,9 +457,16 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) +{ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) { if (set_handler( SIGINT, (void (*)())int_handler ) == -1) goto error; if (set_handler( SIGFPE, (void (*)())fpe_handler ) == -1) goto error; @@ -476,11 +483,12 @@ BOOL SIGNAL_Init(void) this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ asm("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8225c6a..a7a0d3b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -481,9 +481,16 @@ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) /********************************************************************** - * SIGNAL_Init + * signal_init_thread */ -BOOL SIGNAL_Init(void) +void signal_init_thread(void) +{ +} + +/********************************************************************** + * signal_init_process + */ +void signal_init_process(void) { if (set_handler( SIGINT, (void (*)())int_handler ) == -1) goto error; if (set_handler( SIGFPE, (void (*)())fpe_handler ) == -1) goto error; @@ -498,11 +505,12 @@ BOOL SIGNAL_Init(void) #ifdef SIGTRAP if (set_handler( SIGTRAP, (void (*)())trap_handler ) == -1) goto error; #endif - return TRUE; + signal_init_thread(); + return; error: perror("sigaction"); - return FALSE; + exit(1); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 4298e95..9411db1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -424,7 +424,7 @@ static void start_thread( struct wine_pthread_thread_info *info ) thread_data->debug_info = &debug_info; pthread_functions.init_current_teb( info ); - SIGNAL_Init(); + signal_init_thread(); server_init_thread( info->pid, info->tid, func ); pthread_functions.init_thread( info ); virtual_alloc_thread_stack( info->stack_base, info->stack_size );

1 0