August 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : Revert "winebuild: Quote stdcall decored symbols."
by Alexandre Julliard Aug. 27, 2019

Aug. 27, 2019

Module: wine Branch: master Commit: 0fd3b1eab96b19f320a626f0991f92257fa12556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd3b1eab96b19f320a626f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 10:12:10 2019 +0200 Revert "winebuild: Quote stdcall decored symbols." This reverts commit a3e1fe936edc076168571da8ab4320cae22f64d4. It breaks with older binutils. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec16.c | 2 +- tools/winebuild/spec32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index d008aed..3a7e457 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -759,7 +759,7 @@ static void output_module16( DLLSPEC *spec ) if (!odp || !is_function( odp )) continue; output( ".L__wine_%s_%u:\n", spec->c_name, i ); output( "\tpushw %%bp\n" ); - output( "\tpushl $\"%s\"\n", + output( "\tpushl $%s\n", asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : get_link_name( odp ))); output( "\tcallw .L__wine_spec_callfrom16_%s\n", get_callfrom16_name( odp ) ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 727df53..f2567e8 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -570,7 +570,7 @@ void output_exports( DLLSPEC *spec ) output( "1:\tjmp *__imp_%s-1b(%%eax)\n", asm_name( get_link_name( odp ))); needs_get_pc_thunk = 1; } - else output( "\tjmp *\"__imp_%s\"\n", asm_name( get_link_name( odp ))); + else output( "\tjmp *__imp_%s\n", asm_name( get_link_name( odp ))); break; case CPU_x86_64: output( "\t.byte 0x48\n" ); /* hotpatch prolog */

1 0

Paul Gofman : user32: Return correct showCmd from GetWindowPlacement() for other process window.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 480bae108c96dfe370feba2680dbefc42ef97571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=480bae108c96dfe370feba26… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 26 13:57:00 2019 +0300 user32: Return correct showCmd from GetWindowPlacement() for other process window. Fixes black screen in SWTOR after window minimize / maximize or switching window in full screen mode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/winpos.c | 20 ++++++-- 2 files changed, 136 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 639eef4..c6fbd7c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11733,6 +11733,114 @@ static void test_arrange_iconic_windows(void) ok(ret, "failed to restore minimized metrics, error %u\n", GetLastError()); } +static void other_process_proc(HWND hwnd) +{ + HANDLE window_ready_event, test_done_event; + WINDOWPLACEMENT wp; + DWORD ret; + + window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); + ok(!!window_ready_event, "OpenEvent failed.\n"); + test_done_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_test"); + ok(!!test_done_event, "OpenEvent failed.\n"); + + /* SW_SHOW */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWNORMAL, "Unexpected showCmd %#x.\n", wp.showCmd); + ok(!wp.flags, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_SHOWMAXIMIZED */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_SHOWMINIMIZED */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMINIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_RESTORE */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + CloseHandle(window_ready_event); + CloseHandle(test_done_event); +} + +static void test_other_process_window(const char *argv0) +{ + HANDLE window_ready_event, test_done_event; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, + 100, 100, 100, 100, 0, 0, NULL, NULL); + ok(!!hwnd, "CreateWindowEx failed.\n"); + + window_ready_event = CreateEventA(NULL, FALSE, FALSE, "test_opw_window"); + ok(!!window_ready_event, "CreateEvent failed.\n"); + test_done_event = CreateEventA(NULL, FALSE, FALSE, "test_opw_test"); + ok(!!test_done_event, "CreateEvent failed.\n"); + + sprintf(cmd, "%s win test_other_process_window %p", argv0, hwnd); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + + ret = ShowWindow(hwnd, SW_SHOW); + ok(!ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_SHOWMINIMIZED); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + winetest_wait_child_process(info.hProcess); + CloseHandle(window_ready_event); + CloseHandle(test_done_event); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -11762,16 +11870,24 @@ START_TEST(win) pAdjustWindowRectExForDpi = (void *)GetProcAddress( user32, "AdjustWindowRectExForDpi" ); pSystemParametersInfoForDpi = (void *)GetProcAddress( user32, "SystemParametersInfoForDpi" ); - if (argc==4 && !strcmp(argv[2], "create_children")) + if (argc == 4) { HWND hwnd; sscanf(argv[3], "%p", &hwnd); - window_from_point_proc(hwnd); - return; + if (!strcmp(argv[2], "create_children")) + { + window_from_point_proc(hwnd); + return; + } + else if (!strcmp(argv[2], "test_other_process_window")) + { + other_process_proc(hwnd); + return; + } } - if (argc==3 && !strcmp(argv[2], "winproc_limit")) + if (argc == 3 && !strcmp(argv[2], "winproc_limit")) { test_winproc_limit(); return; @@ -11894,6 +12010,7 @@ START_TEST(win) test_IsWindowEnabled(); test_window_placement(); test_arrange_iconic_windows(); + test_other_process_window(argv[0]); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c17..bbbab60 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1280,17 +1280,27 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) } if (pWnd == WND_OTHER_PROCESS) { - if (!IsWindow( hwnd )) return FALSE; - FIXME( "not supported on other process window %p\n", hwnd ); - /* provide some dummy information */ + RECT normal_position; + DWORD style; + + if (!GetWindowRect(hwnd, &normal_position)) + return FALSE; + + FIXME("not fully supported on other process window %p.\n", hwnd); + wndpl->length = sizeof(*wndpl); - wndpl->showCmd = SW_SHOWNORMAL; + style = GetWindowLongW(hwnd, GWL_STYLE); + if (style & WS_MINIMIZE) + wndpl->showCmd = SW_SHOWMINIMIZED; + else + wndpl->showCmd = (style & WS_MAXIMIZE) ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL; + /* provide some dummy information */ wndpl->flags = 0; wndpl->ptMinPosition.x = -1; wndpl->ptMinPosition.y = -1; wndpl->ptMaxPosition.x = -1; wndpl->ptMaxPosition.y = -1; - GetWindowRect( hwnd, &wndpl->rcNormalPosition ); + wndpl->rcNormalPosition = normal_position; return TRUE; }

1 0

Akihiro Sagawa : comctl32/tests: Add tests to show no NM_RELEASEDCAPTURE notifications in the updown control.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 5555044aa62758a6de45d524a606d62fa45d3c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5555044aa62758a6de45d524… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 25 19:27:02 2019 +0900 comctl32/tests: Add tests to show no NM_RELEASEDCAPTURE notifications in the updown control. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/updown.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 1f4e38f..e48a868 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -28,7 +28,6 @@ * - check UDM_SETBUDDY message * - check UDM_GETBUDDY message * - up-down control and buddy control must have the same parent - * - up-down control notifies its parent window when its position changes with UDN_DELTAPOS + WM_VSCROLL or WM_HSCROLL * - check UDS_ALIGN[LEFT,RIGHT]...check that width of buddy window is decreased * - check that UDS_SETBUDDYINT sets the caption of the buddy window when it is changed * - check that the thousands operator is set for large numbers @@ -165,6 +164,32 @@ static const struct message test_updown_pos_nochange_seq[] = { { 0 } }; +static const struct message test_updown_pos_notifications_seq[] = { + { WM_CTLCOLOREDIT, sent|optional }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_SETFOCUS) }, + { WM_NOTIFY, sent|id, 0, 0, UDN_DELTAPOS }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_UPDATE) }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_CHANGE) }, + { WM_VSCROLL, sent|wparam, MAKELONG(SB_THUMBPOSITION, 51) }, + { WM_CTLCOLOREDIT, sent|optional }, + { WM_VSCROLL, sent|wparam, MAKELONG(SB_ENDSCROLL, 51) }, + /* no WM_NOTIFY(NM_RELEASEDCAPTURE) message */ + { 0 } +}; + +static const struct message test_updown_pos_notifications_horz_seq[] = { + { WM_CTLCOLOREDIT, sent|optional }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_SETFOCUS) }, + { WM_NOTIFY, sent|id, 0, 0, UDN_DELTAPOS }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_UPDATE) }, + { WM_COMMAND, sent|wparam, MAKELONG(0, EN_CHANGE) }, + { WM_HSCROLL, sent|wparam, MAKELONG(SB_THUMBPOSITION, 51) }, + { WM_CTLCOLOREDIT, sent|optional }, + { WM_HSCROLL, sent|wparam, MAKELONG(SB_ENDSCROLL, 51) }, + /* no WM_NOTIFY(NM_RELEASEDCAPTURE) message */ + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -186,6 +211,8 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + if (message == WM_NOTIFY && lParam) + msg.id = ((NMHDR*)lParam)->code; add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -900,6 +927,52 @@ static void test_CreateUpDownControl(void) DestroyWindow(updown); } +static void test_updown_pos_notifications(void) +{ + HWND updown; + RECT rect; + UINT x, y; + int result; + + /* test updown control notifications without UDS_HORZ style */ + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + SetFocus(updown); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* click on the up-arrow button */ + GetClientRect(updown, &rect); + x = rect.left + (rect.right - rect.left) / 2; + y = rect.top + (rect.bottom - rect.top) / 4; + result = SendMessageA(updown, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + expect(result, 0); + result = SendMessageA(updown, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + expect(result, 0); + + ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_seq, + "test updown to parent notify (vertical)", TRUE); + + DestroyWindow(updown); + + /* test updown control notifications with UDS_HORZ style */ + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_HORZ, g_edit); + SetFocus(updown); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* click on the right-arrow button */ + GetClientRect(updown, &rect); + x = rect.left + (rect.right - rect.left) * 3 / 4; + y = rect.top + (rect.bottom - rect.top) / 2; + result = SendMessageA(updown, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + expect(result, 0); + result = SendMessageA(updown, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + expect(result, 0); + + ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_horz_seq, + "test updown to parent notify (horizontal)", TRUE); + + DestroyWindow(updown); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -931,6 +1004,7 @@ START_TEST(updown) test_updown_unicode(); test_UDS_SETBUDDYINT(); test_CreateUpDownControl(); + test_updown_pos_notifications(); DestroyWindow(g_edit); DestroyWindow(parent_wnd);

1 0

Jacek Caban : vbscript: Suport + sign in exponential literals.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 0131a9c47b6ceb36a03171661a50005569836c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0131a9c47b6ceb36a0317166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 26 17:04:32 2019 +0200 vbscript: Suport + sign in exponential literals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 5 ++++- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index c628934..4bcf810 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -302,9 +302,12 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) if(*ctx->ptr == 'e' || *ctx->ptr == 'E') { int e = 0, sign = 1; - if(*++ctx->ptr == '-') { + ctx->ptr++; + if(*ctx->ptr == '-') { ctx->ptr++; sign = -1; + }else if(*ctx->ptr == '+') { + ctx->ptr++; } if(!iswdigit(*ctx->ptr)) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 49c673a..6b45865 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -41,6 +41,7 @@ Call ok(10. = 10, "10. <> 10") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(34e5 = 3400000, "34e5 <> 3400000") +Call ok(34e+5 = 3400000, "34e+5 <> 3400000") Call ok(56.789e5 = 5678900, "56.789e5 = 5678900") Call ok(56.789e-2 = 0.56789, "56.789e-2 <> 0.56789") Call ok(1e-94938484 = 0, "1e-... <> 0")

1 0

Akihiro Sagawa : comctl32/updown: Suppress the NM_RELEASEDCAPTURE notification.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 9dbe886e3ffd1c38a89f9cf256b7d172e408ec58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dbe886e3ffd1c38a89f9cf2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 25 19:27:04 2019 +0900 comctl32/updown: Suppress the NM_RELEASEDCAPTURE notification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47427 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/updown.c | 4 ++-- dlls/comctl32/updown.c | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index e48a868..e7ceeff 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -949,7 +949,7 @@ static void test_updown_pos_notifications(void) expect(result, 0); ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_seq, - "test updown to parent notify (vertical)", TRUE); + "test updown to parent notify (vertical)", FALSE); DestroyWindow(updown); @@ -968,7 +968,7 @@ static void test_updown_pos_notifications(void) expect(result, 0); ok_sequence(sequences, PARENT_SEQ_INDEX, test_updown_pos_notifications_horz_seq, - "test updown to parent notify (horizontal)", TRUE); + "test updown to parent notify (horizontal)", FALSE); DestroyWindow(updown); } diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 147d9b2..54fc3f3 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -783,14 +783,8 @@ static BOOL UPDOWN_CancelMode (UPDOWN_INFO *infoPtr) KillTimer (infoPtr->Self, TIMER_ACCEL); KillTimer (infoPtr->Self, TIMER_AUTOPRESS); - if (GetCapture() == infoPtr->Self) { - NMHDR hdr; - hdr.hwndFrom = infoPtr->Self; - hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); - hdr.code = NM_RELEASEDCAPTURE; - SendMessageW(infoPtr->Notify, WM_NOTIFY, hdr.idFrom, (LPARAM)&hdr); + if (GetCapture() == infoPtr->Self) ReleaseCapture(); - } infoPtr->Flags &= ~FLAG_PRESSED; InvalidateRect (infoPtr->Self, NULL, FALSE);

1 0

Nikolay Sivov : oleaut32: Reduce noise in SAFEARRAY traces.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 3bca8c3a827760d750ff5d5d4995659c77d1d721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bca8c3a827760d750ff5d5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 26 22:08:36 2019 +0300 oleaut32: Reduce noise in SAFEARRAY traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/safearray.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 2c6c11d..0b76935 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -523,8 +523,8 @@ HRESULT WINAPI SafeArrayAllocDescriptorEx(VARTYPE vt, UINT cDims, SAFEARRAY **pp ULONG cbElements; HRESULT hRet; - TRACE("(%d->%s,%d,%p)\n", vt, debugstr_vt(vt), cDims, ppsaOut); - + TRACE("(%s,%u,%p)\n", debugstr_vt(vt), cDims, ppsaOut); + cbElements = SAFEARRAY_GetVTSize(vt); if (!cbElements) WARN("Creating a descriptor with an invalid VARTYPE!\n"); @@ -599,7 +599,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa) */ SAFEARRAY* WINAPI SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound) { - TRACE("(%d->%s,%d,%p)\n", vt, debugstr_vt(vt), cDims, rgsabound); + TRACE("(%s,%u,%p)\n", debugstr_vt(vt), cDims, rgsabound); if (vt == VT_RECORD) return NULL; @@ -631,7 +631,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa IRecordInfo* iRecInfo = pvExtra; SAFEARRAY* psa; - TRACE("(%d->%s,%d,%p,%p)\n", vt, debugstr_vt(vt), cDims, rgsabound, pvExtra); + TRACE("(%s,%u,%p,%p)\n", debugstr_vt(vt), cDims, rgsabound, pvExtra); if (vt == VT_RECORD) { @@ -676,8 +676,8 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa */ SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements) { - TRACE("(%d->%s,%d,%d\n", vt, debugstr_vt(vt), lLbound, cElements); - + TRACE("(%s,%d,%u)\n", debugstr_vt(vt), lLbound, cElements); + if (vt == VT_RECORD) return NULL; @@ -708,8 +708,8 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme IRecordInfo* iRecInfo = pvExtra; SAFEARRAY* psa; - TRACE("(%d->%s,%d,%d,%p\n", vt, debugstr_vt(vt), lLbound, cElements, pvExtra); - + TRACE("(%s,%d,%u,%p)\n", debugstr_vt(vt), lLbound, cElements, pvExtra); + if (vt == VT_RECORD) { if (!iRecInfo)

1 0

Alistair Leslie-Hughes : include: Allow compiling against IDirectSound*8 interfaces.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 06c43eac6fe4a57cdb6fd7e89fcdabc3debe680a URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c43eac6fe4a57cdb6fd7e8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 26 04:49:17 2019 +0000 include: Allow compiling against IDirectSound*8 interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index 43fffce..44bfccf 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -133,43 +133,43 @@ DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11C5C73B,0x66E9,0x4BA1,0xA0,0xBA,0 DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5AB0882E,0x7274,0x4516,0x87,0x7D,0x4E,0xEE,0x99,0xBA,0x4F,0xD0); DEFINE_GUID(IID_IDirectSoundFXGargle, 0xd616f352,0xd622,0x11ce,0xaa,0xc5,0x00,0x20,0xaf,0x0b,0x99,0xa3); -typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8; #define IDirectSoundFXGargle8 IDirectSoundFXGargle +typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8; #define IID_IDirectSoundFXGargle8 IID_IDirectSoundFXGargle DEFINE_GUID(IID_IDirectSoundFXChorus, 0x880842e3,0x145f,0x43e6,0xa9,0x34,0xa7,0x18,0x06,0xe5,0x05,0x47); -typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8; #define IDirectSoundFXChorus8 IDirectSoundFXChorus +typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8; #define IID_IDirectSoundFXChorus8 IID_IDirectSoundFXChorus DEFINE_GUID(IID_IDirectSoundFXFlanger, 0x903e9878,0x2c92,0x4072,0x9b,0x2c,0xea,0x68,0xf5,0x39,0x67,0x83); -typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8; #define IDirectSoundFXFlanger8 IDirectSoundFXFlanger +typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8; #define IID_IDirectSoundFXFlanger8 IID_IDirectSoundFXFlanger DEFINE_GUID(IID_IDirectSoundFXEcho, 0x8bd28edf,0x50db,0x4e92,0xa2,0xbd,0x44,0x54,0x88, 0xd1,0xed,0x42); -typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8; #define IDirectSoundFXEcho8 IDirectSoundFXEcho +typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8; #define IID_IDirectSoundFXEcho8 IID_IDirectSoundFXEcho DEFINE_GUID(IID_IDirectSoundFXDistortion, 0x8ecf4326,0x455f,0x4d8b,0xbd,0xa9,0x8d,0x5d,0x3e,0x9e,0x3e,0x0b); -typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8; #define IDirectSoundFXDistortion8 IDirectSoundFXDistortion +typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8; #define IID_IDirectSoundFXDistortion8 IID_IDirectSoundFXDistortion DEFINE_GUID(IID_IDirectSoundFXCompressor, 0x4bbd1154,0x62f6,0x4e2c,0xa1,0x5c,0xd3,0xb6,0xc4,0x17,0xf7,0xa0); -typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8; #define IDirectSoundFXCompressor8 IDirectSoundFXCompressor +typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8; #define IID_IDirectSoundFXCompressor8 IID_IDirectSoundFXCompressor DEFINE_GUID(IID_IDirectSoundFXParamEq, 0xc03ca9fe,0xfe90,0x4204,0x80,0x78,0x82,0x33,0x4c,0xd1,0x77,0xda); -typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8; #define IDirectSoundFXParamEq8 IDirectSoundFXParamEq +typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8; #define IID_IDirectSoundFXParamEq8 IID_IDirectSoundFXParamEq DEFINE_GUID(IID_IDirectSoundFXWavesReverb, 0x46858c3a,0x0dc6,0x45e3,0xb7,0x60,0xd4,0xee,0xf1,0x6c,0xb3,0x25); -typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8; #define IDirectSoundFXWavesReverb8 IDirectSoundFXWavesReverb +typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8; #define IID_IDirectSoundFXWavesReverb8 IID_IDirectSoundFXWavesReverb #define _FACDS 0x878

1 0

Zebediah Figura : http.sys: Allow receiving parsed HTTP requests.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 7a73d01f88366d1d479053cd11577eb6109c5f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a73d01f88366d1d479053cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:18 2019 -0500 http.sys: Allow receiving parsed HTTP requests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/http.h | 9 +++ 2 files changed, 208 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4b83cc6..a41b464 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "wine/http.h" @@ -32,6 +33,108 @@ static DEVICE_OBJECT *device_obj; WINE_DEFAULT_DEBUG_CHANNEL(http); +/* We have to return the HTTP_REQUEST structure to userspace exactly as it will + * be consumed; httpapi has no opportunity to massage it. Since it contains + * pointers, this is somewhat nontrivial. */ + +struct http_request_32 +{ + ULONG Flags; + HTTP_CONNECTION_ID ConnectionId; + HTTP_REQUEST_ID RequestId; + HTTP_URL_CONTEXT UrlContext; + HTTP_VERSION Version; + HTTP_VERB Verb; + USHORT UnknownVerbLength; + USHORT RawUrlLength; + ULONG pUnknownVerb; /* char string */ + ULONG pRawUrl; /* char string */ + struct + { + USHORT FullUrlLength; + USHORT HostLength; + USHORT AbsPathLength; + USHORT QueryStringLength; + ULONG pFullUrl; /* WCHAR string */ + ULONG pHost; /* pointer to above */ + ULONG pAbsPath; /* pointer to above */ + ULONG pQueryString; /* pointer to above */ + } CookedUrl; + struct + { + ULONG pRemoteAddress; /* SOCKADDR */ + ULONG pLocalAddress; /* SOCKADDR */ + } Address; + struct + { + USHORT UnknownHeaderCount; + ULONG pUnknownHeaders; /* struct http_unknown_header_32 */ + USHORT TrailerCount; + ULONG pTrailers; /* NULL */ + struct + { + USHORT RawValueLength; + ULONG pRawValue; /* char string */ + } KnownHeaders[HttpHeaderRequestMaximum]; + } Headers; + ULONGLONG BytesReceived; + USHORT EntityChunkCount; + ULONG pEntityChunks; /* struct http_data_chunk_32 */ + HTTP_RAW_CONNECTION_ID RawConnectionId; + ULONG pSslInfo; /* NULL (FIXME) */ + USHORT RequestInfoCount; + ULONG pRequestInfo; /* NULL (FIXME) */ +}; + +struct http_request_64 +{ + ULONG Flags; + HTTP_CONNECTION_ID ConnectionId; + HTTP_REQUEST_ID RequestId; + HTTP_URL_CONTEXT UrlContext; + HTTP_VERSION Version; + HTTP_VERB Verb; + USHORT UnknownVerbLength; + USHORT RawUrlLength; + ULONGLONG pUnknownVerb; /* char string */ + ULONGLONG pRawUrl; /* char string */ + struct + { + USHORT FullUrlLength; + USHORT HostLength; + USHORT AbsPathLength; + USHORT QueryStringLength; + ULONGLONG pFullUrl; /* WCHAR string */ + ULONGLONG pHost; /* pointer to above */ + ULONGLONG pAbsPath; /* pointer to above */ + ULONGLONG pQueryString; /* pointer to above */ + } CookedUrl; + struct + { + ULONGLONG pRemoteAddress; /* SOCKADDR */ + ULONGLONG pLocalAddress; /* SOCKADDR */ + } Address; + struct + { + USHORT UnknownHeaderCount; + ULONGLONG pUnknownHeaders; /* struct http_unknown_header_32 */ + USHORT TrailerCount; + ULONGLONG pTrailers; /* NULL */ + struct + { + USHORT RawValueLength; + ULONGLONG pRawValue; /* char string */ + } KnownHeaders[HttpHeaderRequestMaximum]; + } Headers; + ULONGLONG BytesReceived; + USHORT EntityChunkCount; + ULONGLONG pEntityChunks; /* struct http_data_chunk_32 */ + HTTP_RAW_CONNECTION_ID RawConnectionId; + ULONGLONG pSslInfo; /* NULL (FIXME) */ + USHORT RequestInfoCount; + ULONGLONG pRequestInfo; /* NULL (FIXME) */ +}; + #define DECLARE_CRITICAL_SECTION(cs) \ static CRITICAL_SECTION cs; \ static CRITICAL_SECTION_DEBUG cs##_debug = \ @@ -161,6 +264,73 @@ static int parse_token(const char *str, const char *end) return p - str; } +static NTSTATUS complete_irp(struct connection *conn, IRP *irp) +{ + const struct http_receive_request_params params + = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; + DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG offset; + + TRACE("Completing IRP %p.\n", irp); + + /* First calculate the total buffer size needed for this IRP. */ + + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + irp->IoStatus.Information = irp_size; + + memset(irp->AssociatedIrp.SystemBuffer, 0, output_len); + + if (output_len < irp_size) + { + if (params.bits == 32) + { + struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; + req->ConnectionId = (ULONG_PTR)conn; + } + else + { + struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; + req->ConnectionId = (ULONG_PTR)conn; + } + return STATUS_BUFFER_OVERFLOW; + } + + if (params.bits == 32) + { + struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; + + offset = sizeof(*req); + + req->ConnectionId = (ULONG_PTR)conn; + req->UrlContext = conn->queue->context; + req->Version = conn->version; + req->Verb = conn->verb; + req->BytesReceived = conn->req_len; + } + else + { + struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; + + offset = sizeof(*req); + + req->ConnectionId = (ULONG_PTR)conn; + req->UrlContext = conn->queue->context; + req->Version = conn->version; + req->Verb = conn->verb; + req->BytesReceived = conn->req_len; + } + + assert(offset == irp->IoStatus.Information); + + conn->available = FALSE; + memmove(conn->buffer, conn->buffer + conn->req_len, conn->len - conn->req_len); + conn->len -= conn->req_len; + + return STATUS_SUCCESS; +} + /* Return 1 if str matches expect, 0 if str is incomplete, -1 if they don't match. */ static int compare_exact(const char *str, const char *expect, const char *end) { @@ -507,6 +677,32 @@ static NTSTATUS http_remove_url(struct request_queue *queue, IRP *irp) return STATUS_SUCCESS; } +static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) +{ + const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; + struct connection *conn; + NTSTATUS ret; + + TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr), + wine_dbgstr_longlong(params->id), params->flags, params->bits); + + EnterCriticalSection(&http_cs); + + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->available && conn->queue == queue) + { + ret = complete_irp(conn, irp); + LeaveCriticalSection(&http_cs); + return ret; + } + } + + LeaveCriticalSection(&http_cs); + + return STATUS_PENDING; +} + static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -521,6 +717,9 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HTTP_REMOVE_URL: ret = http_remove_url(queue, irp); break; + case IOCTL_HTTP_RECEIVE_REQUEST: + ret = http_receive_request(queue, irp); + break; default: FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/http.h b/include/wine/http.h index 354c289..1145cab 100644 --- a/include/wine/http.h +++ b/include/wine/http.h @@ -25,6 +25,7 @@ #define IOCTL_HTTP_ADD_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, 0) #define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) struct http_add_url_params { @@ -32,4 +33,12 @@ struct http_add_url_params char url[1]; }; +struct http_receive_request_params +{ + ULONGLONG addr; /* user-mode buffer address */ + HTTP_REQUEST_ID id; + ULONG flags; + ULONG bits; +}; + #endif

1 0

Zebediah Figura : http.sys: Find a request queue to assign new HTTP requests to.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 85f5338eff0705125f41ef8558d34910e7108ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f5338eff0705125f41ef85… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:17 2019 -0500 http.sys: Find a request queue to assign new HTTP requests to. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 81f5d34..4b83cc6 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -54,6 +54,7 @@ struct connection unsigned int len, size; BOOL available; + struct request_queue *queue; /* Things we already parsed out of the request header in parse_request(). * These are valid only if "available" is TRUE. */ @@ -180,12 +181,20 @@ static int parse_number(const char *str, const char **endptr, const char *end) return n; } +static BOOL host_matches(const struct connection *conn, const struct request_queue *queue) +{ + const char *conn_host = (conn->url[0] == '/') ? conn->host : conn->url + 7; + + return !memicmp(queue->url + 7, conn_host, strlen(queue->url) - 8 /* strip final slash */); +} + /* Upon receiving a request, parse it to ensure that it is a valid HTTP request, * and mark down some information that we will use later. Returns 1 if we parsed * a complete request, 0 if incomplete, -1 if invalid. */ static int parse_request(struct connection *conn) { const char *const req = conn->buffer, *const end = conn->buffer + conn->len; + struct request_queue *queue; const char *p = req, *q; int len, ret; @@ -275,6 +284,18 @@ static int parse_request(struct connection *conn) TRACE("Received a full request, length %u bytes.\n", conn->req_len); + conn->queue = NULL; + /* Find a queue which can receive this request. */ + LIST_FOR_EACH_ENTRY(queue, &request_queues, struct request_queue, entry) + { + if (host_matches(conn, queue)) + { + TRACE("Assigning request to queue %p.\n", queue); + conn->queue = queue; + break; + } + } + /* Stop selecting on incoming data until a response is queued. */ WSAEventSelect(conn->socket, request_event, FD_CLOSE); @@ -376,6 +397,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) { const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; struct sockaddr_in addr; + struct connection *conn; char *url, *endptr; int s, count = 0; ULONG true = 1; @@ -453,6 +475,13 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) queue->url = url; queue->context = params->context; + /* See if any pending requests now match this queue. */ + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->available && !conn->queue && host_matches(conn, queue)) + conn->queue = queue; + } + LeaveCriticalSection(&http_cs); return STATUS_SUCCESS;

1 0

Zebediah Figura : http.sys: Parse salient data from request headers.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: c582cca1835527b24cf6b45af4690f7e78adad6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c582cca1835527b24cf6b45a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:15 2019 -0500 http.sys: Parse salient data from request headers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5e29db0..506aefc 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -52,6 +52,13 @@ struct connection char *buffer; unsigned int len, size; + + /* Things we already parsed out of the request header in parse_request(). */ + unsigned int req_len; + HTTP_VERB verb; + HTTP_VERSION version; + const char *url, *host; + ULONG unk_verb_len, url_len, content_len; }; static struct list connections = LIST_INIT(connections); @@ -99,19 +106,173 @@ static void accept_connection(int socket) static void close_connection(struct connection *conn) { + heap_free(conn->buffer); shutdown(conn->socket, SD_BOTH); closesocket(conn->socket); list_remove(&conn->entry); heap_free(conn); } +static HTTP_VERB parse_verb(const char *verb, int len) +{ + static const char *const verbs[] = + { + "OPTIONS", + "GET", + "HEAD", + "POST", + "PUT", + "DELETE", + "TRACE", + "CONNECT", + "TRACK", + "MOVE", + "COPY", + "PROPFIND", + "PROPPATCH", + "MKCOL", + "LOCK", + "UNLOCK", + "SEARCH", + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(verbs); ++i) + { + if (!strncmp(verb, verbs[i], len)) + return HttpVerbOPTIONS + i; + } + return HttpVerbUnknown; +} + +/* Return the length of a token, as defined in RFC 2616 section 2.2. */ +static int parse_token(const char *str, const char *end) +{ + const char *p; + for (p = str; !end || p < end; ++p) + { + if (!isgraph(*p) || strchr("()<>@,;:\\\"/[]?={}", *p)) + break; + } + return p - str; +} + +/* Return 1 if str matches expect, 0 if str is incomplete, -1 if they don't match. */ +static int compare_exact(const char *str, const char *expect, const char *end) +{ + while (*expect) + { + if (str >= end) return 0; + if (*str++ != *expect++) return -1; + } + return 1; +} + +static int parse_number(const char *str, const char **endptr, const char *end) +{ + int n = 0; + while (str < end && isdigit(*str)) + n = n * 10 + (*str++ - '0'); + *endptr = str; + return n; +} + /* Upon receiving a request, parse it to ensure that it is a valid HTTP request, * and mark down some information that we will use later. Returns 1 if we parsed * a complete request, 0 if incomplete, -1 if invalid. */ static int parse_request(struct connection *conn) { - FIXME("Not implemented.\n"); - return -1; + const char *const req = conn->buffer, *const end = conn->buffer + conn->len; + const char *p = req, *q; + int len, ret; + + if (!conn->len) return 0; + + TRACE("%s\n", wine_dbgstr_an(conn->buffer, conn->len)); + + len = parse_token(p, end); + if (p + len >= end) return 0; + if (!len || p[len] != ' ') return -1; + + /* verb */ + if ((conn->verb = parse_verb(p, len)) == HttpVerbUnknown) + conn->unk_verb_len = len; + p += len + 1; + + TRACE("Got verb %u (%s).\n", conn->verb, debugstr_an(req, len)); + + /* URL */ + conn->url = p; + while (p < end && isgraph(*p)) ++p; + conn->url_len = p - conn->url; + if (p >= end) return 0; + if (!conn->url_len) return -1; + + TRACE("Got URI %s.\n", debugstr_an(conn->url, conn->url_len)); + + /* version */ + if ((ret = compare_exact(p, " HTTP/", end)) <= 0) return ret; + p += 6; + conn->version.MajorVersion = parse_number(p, &q, end); + if (q >= end) return 0; + if (q == p || *q != '.') return -1; + p = q + 1; + if (p >= end) return 0; + conn->version.MinorVersion = parse_number(p, &q, end); + if (q >= end) return 0; + if (q == p) return -1; + p = q; + if ((ret = compare_exact(p, "\r\n", end)) <= 0) return ret; + p += 2; + + TRACE("Got version %hu.%hu.\n", conn->version.MajorVersion, conn->version.MinorVersion); + + /* headers */ + conn->host = NULL; + conn->content_len = 0; + for (;;) + { + const char *name = p; + + if (!(ret = compare_exact(p, "\r\n", end))) return 0; + else if (ret > 0) break; + + len = parse_token(p, end); + if (p + len >= end) return 0; + if (!len) return -1; + p += len; + while (p < end && (*p == ' ' || *p == '\t')) ++p; + if (p >= end) return 0; + if (*p != ':') return -1; + ++p; + while (p < end && (*p == ' ' || *p == '\t')) ++p; + + TRACE("Got %s header.\n", debugstr_an(name, len)); + + if (!strncmp(name, "Host", len)) + conn->host = p; + else if (!strncmp(name, "Content-Length", len)) + { + conn->content_len = parse_number(p, &q, end); + if (q >= end) return 0; + if (q == p) return -1; + } + else if (!strncmp(name, "Transfer-Encoding", len)) + FIXME("Unhandled Transfer-Encoding header.\n"); + while (p < end && (isprint(*p) || *p == '\t')) ++p; + if ((ret = compare_exact(p, "\r\n", end)) <= 0) return ret; + p += 2; + } + p += 2; + if (conn->url[0] == '/' && !conn->host) return -1; + + if (end - p < conn->content_len) return 0; + + conn->req_len = (p - req) + conn->content_len; + + TRACE("Received a full request, length %u bytes.\n", conn->req_len); + + return 1; } static void receive_data(struct connection *conn)

1 0