January 2009 - Wine-Commits

Huw Davies : comdlg32: Update the original dialog structure rather than a temporary copy.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 00e5840eb0458805e43e9ed415b0c8e33d1cef3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e5840eb0458805e43e9ed41… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 13 12:18:23 2009 +0000 comdlg32: Update the original dialog structure rather than a temporary copy. --- dlls/comdlg32/printdlg.c | 85 ++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 44 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 69767e7..ebb62dc 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2413,7 +2413,6 @@ typedef struct { LPPAGESETUPDLGA dlga; /* Handler to user defined struct */ PRINTDLGA pdlg; HWND hDlg; /* Page Setup dialog handler */ - PAGESETUPDLGA curdlg; /* Stores the current dialog state */ RECT rtDrawRect; /* Drawing rect for page */ } PageSetupDataA; @@ -2586,14 +2585,13 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) { DEVMODEA *dm; DWORD paperword; - memcpy(pda->dlga, &pda->curdlg, sizeof(pda->curdlg)); pda->dlga->hDevMode = pda->pdlg.hDevMode; pda->dlga->hDevNames = pda->pdlg.hDevNames; dm = GlobalLock(pda->pdlg.hDevMode); /* Save paper orientation into device context */ - if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) + if(pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; else dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; @@ -2845,12 +2843,12 @@ PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda) LONG width, height, x, y; RECT rtTmp; - if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) { + if(pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) { width = pda->rtDrawRect.right - pda->rtDrawRect.left; - height = pda->curdlg.ptPaperSize.y * width / pda->curdlg.ptPaperSize.x; + height = pda->dlga->ptPaperSize.y * width / pda->dlga->ptPaperSize.x; } else { height = pda->rtDrawRect.bottom - pda->rtDrawRect.top; - width = pda->curdlg.ptPaperSize.x * height / pda->curdlg.ptPaperSize.y; + width = pda->dlga->ptPaperSize.x * height / pda->dlga->ptPaperSize.y; } x = (pda->rtDrawRect.right + pda->rtDrawRect.left - width) / 2; y = (pda->rtDrawRect.bottom + pda->rtDrawRect.top - height) / 2; @@ -2920,15 +2918,15 @@ PRINTDLG_PS_WMCommandA( return TRUE; case rad1: case rad2: - if((id == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || - (id == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + if((id == rad1 && pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) || + (id == rad2 && pda->dlga->ptPaperSize.y > pda->dlga->ptPaperSize.x)) { char TmpText[25]; char TmpText2[25]; - DWORD tmp = pda->curdlg.ptPaperSize.x; + DWORD tmp = pda->dlga->ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; + pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; + pda->dlga->ptPaperSize.y = tmp; GetDlgItemTextA(hDlg, edt4, TmpText, sizeof(TmpText)); GetDlgItemTextA(hDlg, edt5, TmpText2, sizeof(TmpText2)); @@ -2956,14 +2954,14 @@ PRINTDLG_PS_WMCommandA( DWORD paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA, SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) { - PRINTDLG_PaperSizeA(&(pda->pdlg), paperword,&(pda->curdlg.ptPaperSize)); - pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga,pda->curdlg.ptPaperSize.x); - pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga,pda->curdlg.ptPaperSize.y); + PRINTDLG_PaperSizeA(&(pda->pdlg), paperword,&(pda->dlga->ptPaperSize)); + pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.x); + pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.y); if (IsDlgButtonChecked(hDlg, rad2)) { - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; + DWORD tmp = pda->dlga->ptPaperSize.x; + pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; + pda->dlga->ptPaperSize.y = tmp; } PRINTDLG_PS_ChangePaperPrev(pda); } else @@ -2996,13 +2994,13 @@ PRINTDLG_PS_WMCommandA( DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); ClosePrinter(hPrinter); /* Changing paper */ - PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &(pda->curdlg.ptPaperSize)); - pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x); - pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y); + PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &(pda->dlga->ptPaperSize)); + pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga, pda->dlga->ptPaperSize.x); + pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga, pda->dlga->ptPaperSize.y); if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; + DWORD tmp = pda->dlga->ptPaperSize.x; + pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; + pda->dlga->ptPaperSize.y = tmp; CheckRadioButton(hDlg, rad1, rad2, rad2); } else @@ -3024,16 +3022,16 @@ PRINTDLG_PS_WMCommandA( break; } case edt4: - GETVAL(id, pda->curdlg.rtMargin.left); + GETVAL(id, pda->dlga->rtMargin.left); break; case edt5: - GETVAL(id, pda->curdlg.rtMargin.top); + GETVAL(id, pda->dlga->rtMargin.top); break; case edt6: - GETVAL(id, pda->curdlg.rtMargin.right); + GETVAL(id, pda->dlga->rtMargin.right); break; case edt7: - GETVAL(id, pda->curdlg.rtMargin.bottom); + GETVAL(id, pda->dlga->rtMargin.bottom); break; } InvalidateRect(GetDlgItem(hDlg, rct1), NULL, TRUE); @@ -3228,14 +3226,14 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rcClient); - scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x; - scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y; + scalx = rcClient.right / (double)pda->dlga->ptPaperSize.x; + scaly = rcClient.bottom / (double)pda->dlga->ptPaperSize.y; rcMargin = rcClient; - rcMargin.left += pda->curdlg.rtMargin.left * scalx; - rcMargin.top += pda->curdlg.rtMargin.top * scalx; - rcMargin.right -= pda->curdlg.rtMargin.right * scaly; - rcMargin.bottom -= pda->curdlg.rtMargin.bottom * scaly; + rcMargin.left += pda->dlga->rtMargin.left * scalx; + rcMargin.top += pda->dlga->rtMargin.top * scalx; + rcMargin.right -= pda->dlga->rtMargin.right * scaly; + rcMargin.bottom -= pda->dlga->rtMargin.bottom * scaly; /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); @@ -3309,7 +3307,6 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg == WM_INITDIALOG) { /*Init dialog*/ pda = (PageSetupDataA*)lParam; pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */ - pda->curdlg = *pda->dlga; hDrawWnd = GetDlgItem(hDlg, rct1); TRACE("set property to %p\n", pda); @@ -3376,10 +3373,10 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextA(hDlg,edt5,str); SetDlgItemTextA(hDlg,edt6,str); SetDlgItemTextA(hDlg,edt7,str); - pda->curdlg.rtMargin.left = size; - pda->curdlg.rtMargin.top = size; - pda->curdlg.rtMargin.right = size; - pda->curdlg.rtMargin.bottom = size; + pda->dlga->rtMargin.left = size; + pda->dlga->rtMargin.top = size; + pda->dlga->rtMargin.right = size; + pda->dlga->rtMargin.bottom = size; } /* if paper disabled */ if (pda->dlga->Flags & PSD_DISABLEPAPER) { @@ -3391,14 +3388,14 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) dm = GlobalLock(pda->pdlg.hDevMode); if(dm){ dm->u1.s1.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */ - PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &pda->curdlg.ptPaperSize); + PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &pda->dlga->ptPaperSize); GlobalUnlock(pda->pdlg.hDevMode); - pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x); - pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y); + pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga, pda->dlga->ptPaperSize.x); + pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga, pda->dlga->ptPaperSize.y); if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) { /* Landscape orientation */ - DWORD tmp = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = tmp; + DWORD tmp = pda->dlga->ptPaperSize.y; + pda->dlga->ptPaperSize.y = pda->dlga->ptPaperSize.x; + pda->dlga->ptPaperSize.x = tmp; } } else WARN("GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%p\n", pda->pdlg.hDevMode);

1 0

Hans Leidekker : setupapi: Enable reuse of create_inf_file in tests.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: b0f2bebc4ca6148cbd713e7c2f19a15a1f264725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f2bebc4ca6148cbd713e7c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 12 22:07:41 2009 +0100 setupapi: Enable reuse of create_inf_file in tests. --- dlls/setupapi/tests/query.c | 79 ++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 45 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index a1b7bd5..932ff30 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -43,48 +43,37 @@ static void get_directories(void) WIN_DIR[len-1] = 0; } -static void create_inf_file(LPSTR filename) +static const char inf_data1[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "AdvancedINF=2.5\n" + "[SourceDisksNames]\n" + "2 = %SrcDiskName%, LANCOM\\LANtools\\lanconf.cab\n" + "[SourceDisksFiles]\n" + "lanconf.exe = 2\n" + "[DestinationDirs]\n" + "DefaultDestDir = 24, %DefaultDest%\n" + "[Strings]\n" + "LangDir = english\n" + "DefaultDest = LANCOM\n" + "SrcDiskName = \"LANCOM Software CD\"\n"; + +static const char inf_data2[] = + "[SourceFileInfo]\n" + "sp1qfe\\bitsinst.exe=250B3702C7CCD7C2F9E4DAA1555C933E,000600060A28062C,27136,SP1QFE\n" + "sp1qfe\\bitsprx2.dll=4EBEA67F4BB4EB402E725CA7CA2857AE,000600060A280621,7680,SP1QFE\n" + "sp1qfe\\bitsprx3.dll=C788A1D9330DA011EF25E95D3BC7BDE5,000600060A280621,7168,SP1QFE\n" + "sp1qfe\\qmgr.dll=696AC82FB290A03F205901442E0E9589,000600060A280621,361984,SP1QFE\n" + "sp1qfe\\qmgrprxy.dll=8B5848144829E1BC985EA4C3D8CA7E3F,000600060A280621,17408,SP1QFE\n" + "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n" + "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"; + +static void create_inf_file(LPSTR filename, const char *data, DWORD size) { DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - static const char data[] = - "[Version]\n" - "Signature=\"$Chicago$\"\n" - "AdvancedINF=2.5\n" - "[SourceDisksNames]\n" - "2 = %SrcDiskName%, LANCOM\\LANtools\\lanconf.cab\n" - "[SourceDisksFiles]\n" - "lanconf.exe = 2\n" - "[DestinationDirs]\n" - "DefaultDestDir = 24, %DefaultDest%\n" - "[Strings]\n" - "LangDir = english\n" - "DefaultDest = LANCOM\n" - "SrcDiskName = \"LANCOM Software CD\"\n"; - - WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); - CloseHandle(hf); -} - -static void create_inf_file2(LPSTR filename) -{ - DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - static const char data[] = - "[SourceFileInfo]\n" - "sp1qfe\\bitsinst.exe=250B3702C7CCD7C2F9E4DAA1555C933E,000600060A28062C,27136,SP1QFE\n" - "sp1qfe\\bitsprx2.dll=4EBEA67F4BB4EB402E725CA7CA2857AE,000600060A280621,7680,SP1QFE\n" - "sp1qfe\\bitsprx3.dll=C788A1D9330DA011EF25E95D3BC7BDE5,000600060A280621,7168,SP1QFE\n" - "sp1qfe\\qmgr.dll=696AC82FB290A03F205901442E0E9589,000600060A280621,361984,SP1QFE\n" - "sp1qfe\\qmgrprxy.dll=8B5848144829E1BC985EA4C3D8CA7E3F,000600060A280621,17408,SP1QFE\n" - "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n" - "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"; - - WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); + WriteFile(hf, data, size, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } @@ -165,7 +154,7 @@ static void test_SetupGetInfInformation(void) ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); } - create_inf_file(inf_filename); + create_inf_file(inf_filename, inf_data1, sizeof(inf_data1) - 1); /* try an invalid search flag */ size = 0xdeadbeef; @@ -237,7 +226,7 @@ static void test_SetupGetInfInformation(void) lstrcpyA(inf_two, WIN_DIR); lstrcatA(inf_two, "\\system32\\"); lstrcatA(inf_two, "test.inf"); - create_inf_file(inf_two); + create_inf_file(inf_two, inf_data1, sizeof(inf_data1) - 1); HeapFree(GetProcessHeap(), 0, info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); @@ -252,7 +241,7 @@ static void test_SetupGetInfInformation(void) lstrcpyA(inf_one, WIN_DIR); lstrcatA(inf_one, "\\inf\\"); lstrcatA(inf_one, "test.inf"); - create_inf_file(inf_one); + create_inf_file(inf_one, inf_data1, sizeof(inf_data1) - 1); HeapFree(GetProcessHeap(), 0, info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); @@ -289,7 +278,7 @@ static void test_SetupGetSourceFileLocation(void) lstrcatA(inf_filename, "\\"); lstrcatA(inf_filename, "test.inf"); - create_inf_file(inf_filename); + create_inf_file(inf_filename, inf_data1, sizeof(inf_data1) - 1); hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); @@ -307,7 +296,7 @@ static void test_SetupGetSourceFileLocation(void) SetupCloseInfFile(hinf); DeleteFileA(inf_filename); - create_inf_file2(inf_filename); + create_inf_file(inf_filename, inf_data2, sizeof(inf_data2) - 1); SetLastError(0xdeadbeef); hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); @@ -336,7 +325,7 @@ static void test_SetupGetSourceInfo(void) lstrcatA(inf_filename, "\\"); lstrcatA(inf_filename, "test.inf"); - create_inf_file(inf_filename); + create_inf_file(inf_filename, inf_data1, sizeof(inf_data1) - 1); hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); @@ -384,7 +373,7 @@ static void test_SetupGetTargetPath(void) lstrcatA(inf_filename, "\\"); lstrcatA(inf_filename, "test.inf"); - create_inf_file(inf_filename); + create_inf_file(inf_filename, inf_data1, sizeof(inf_data1) - 1); hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n");

1 0

Andrey Turkin : httpapi: Add HttpDeleteServiceConfiguration, HttpQueryServiceConfiguration and HttpSetServiceConfiguration stubs.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 2f2723893d505f0d51cb746aa88124e494f03906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2723893d505f0d51cb746aa… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 12 21:01:57 2009 +0300 httpapi: Add HttpDeleteServiceConfiguration, HttpQueryServiceConfiguration and HttpSetServiceConfiguration stubs. --- dlls/httpapi/httpapi.spec | 6 ++-- dlls/httpapi/httpapi_main.c | 74 +++++++++++++++++++++++++++++++++++++++++++ include/http.h | 13 +++++++ 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 038fb05..a33286a 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,7 +7,7 @@ @ stub HttpCreateFilter @ stub HttpCreateHttpHandle @ stub HttpDeleteConfigGroup -@ stub HttpDeleteServiceConfiguration +@ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept @ stub HttpFilterAppRead @ stub HttpFilterAppWrite @@ -27,7 +27,7 @@ @ stub HttpQueryConfigGroupInformation @ stub HttpQueryControlChannelInformation @ stub HttpQueryServerContextInformation -@ stub HttpQueryServiceConfiguration +@ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate @ stub HttpReceiveHttpRequest @@ -44,7 +44,7 @@ @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation @ stub HttpSetServerContextInformation -@ stub HttpSetServiceConfiguration +@ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stub HttpShutdownAppPool @ stub HttpShutdownFilter @ stdcall HttpTerminate(long ptr) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index eb5662a..7b29a15 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -83,3 +83,77 @@ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) FIXME( "(0x%x, %p): stub!\n", flags, reserved ); return NO_ERROR; } + +/*********************************************************************** + * HttpDeleteServiceConfiguration (HTTPAPI.@) + * + * Remove configuration record from HTTP Server API configuration store + * + * PARAMS + * handle [I] reserved, must be 0 + * type [I] configuration record type + * config [I] buffer which contains configuration record information + * length [I] length of configuration record buffer + * overlapped [I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, + PVOID config, ULONG length, LPOVERLAPPED overlapped ) +{ + FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + return NO_ERROR; +} + +/*********************************************************************** + * HttpQueryServiceConfiguration (HTTPAPI.@) + * + * Retrieves configuration records from HTTP Server API configuration store + * + * PARAMS + * handle [ I] reserved, must be 0 + * type [ I] configuration records type + * query [ I] buffer which contains query data used to retrieve records + * query_len [ I] length of query buffer + * buffer [IO] buffer to store query results + * buffer_len [ I] length of output buffer + * data_len [ O] optional pointer to a buffer which receives query result length + * overlapped [ I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, + PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, + PULONG data_len, LPOVERLAPPED overlapped ) +{ + FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, + buffer, buffer_len, data_len, overlapped ); + return ERROR_FILE_NOT_FOUND; +} + +/*********************************************************************** + * HttpSetServiceConfiguration (HTTPAPI.@) + * + * Add configuration record to HTTP Server API configuration store + * + * PARAMS + * handle [I] reserved, must be 0 + * type [I] configuration record type + * config [I] buffer which contains configuration record information + * length [I] length of configuration record buffer + * overlapped [I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, + PVOID config, ULONG length, LPOVERLAPPED overlapped ) +{ + FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + return NO_ERROR; +} diff --git a/include/http.h b/include/http.h index c0b7b66..2e116e5 100644 --- a/include/http.h +++ b/include/http.h @@ -41,9 +41,22 @@ typedef struct _HTTPAPI_VERSION #define HTTP_INITIALIZE_SERVER 0x00000001 #define HTTP_INITIALIZE_CONFIG 0x00000002 +typedef enum _HTTP_SERVICE_CONFIG_ID +{ + HttpServiceConfigIPListenList, + HttpServiceConfigSSLCertInfo, + HttpServiceConfigUrlAclInfo, + HttpServiceConfigTimeout, + HttpServiceConfigMax +} HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; + ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); +ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); +ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); + #ifdef __cplusplus } #endif

1 0

Andrey Turkin : httpapi: Add HttpInitialize and HttpTerminate stubs.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 3104f77e4068b00d33a522264707c48d841fbac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3104f77e4068b00d33a522264… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 12 21:01:27 2009 +0300 httpapi: Add HttpInitialize and HttpTerminate stubs. --- dlls/httpapi/httpapi.spec | 4 +- dlls/httpapi/httpapi_main.c | 41 ++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/http.h | 51 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index aa8fea2..038fb05 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -18,7 +18,7 @@ @ stub HttpFilterRawWriteAndAppRead @ stub HttpFlushResponseCache @ stub HttpGetCounters -@ stub HttpInitialize +@ stdcall HttpInitialize(long long ptr) @ stub HttpInitializeServerContext @ stub HttpOpenAppPool @ stub HttpOpenControlChannel @@ -47,6 +47,6 @@ @ stub HttpSetServiceConfiguration @ stub HttpShutdownAppPool @ stub HttpShutdownFilter -@ stub HttpTerminate +@ stdcall HttpTerminate(long ptr) @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index b678e19..eb5662a 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "http.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(httpapi); @@ -42,3 +43,43 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) } return TRUE; } + +/*********************************************************************** + * HttpInitialize (HTTPAPI.@) + * + * Initializes HTTP Server API engine + * + * PARAMS + * version [ I] HTTP API version which caller will use + * flags [ I] initialization options which specify parts of API what will be used + * reserved [IO] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpInitialize( HTTPAPI_VERSION version, ULONG flags, PVOID reserved ) +{ + FIXME( "({%d,%d}, 0x%x, %p): stub!\n", version.HttpApiMajorVersion, + version.HttpApiMinorVersion, flags, reserved ); + return NO_ERROR; +} + +/*********************************************************************** + * HttpTerminate (HTTPAPI.@) + * + * Cleans up HTTP Server API engine resources allocated by HttpInitialize + * + * PARAMS + * flags [ I] options which specify parts of API what should be released + * reserved [IO] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) +{ + FIXME( "(0x%x, %p): stub!\n", flags, reserved ); + return NO_ERROR; +} diff --git a/include/Makefile.in b/include/Makefile.in index 8604b8f..09d7b3c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -228,6 +228,7 @@ SRCDIR_INCLUDES = \ guiddef.h \ hlguids.h \ htmlhelp.h \ + http.h \ i_cryptasn1tls.h \ icm.h \ icmpapi.h \ diff --git a/include/http.h b/include/http.h new file mode 100644 index 0000000..c0b7b66 --- /dev/null +++ b/include/http.h @@ -0,0 +1,51 @@ +/* + * HTTP Server API definitions + * + * Copyright (C) 2009 Andrey Turkin + * + * 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 + */ + +#ifndef __WINE_HTTP_H +#define __WINE_HTTP_H + +#include <winsock2.h> +#include <ws2tcpip.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _HTTPAPI_VERSION +{ + USHORT HttpApiMajorVersion; + USHORT HttpApiMinorVersion; +} HTTPAPI_VERSION, *PHTTPAPI_VERSION; + +#define HTTPAPI_VERSION_1 {1,0} +#define HTTPAPI_VERSION_2 {2,0} + +/* HttpInitialize and HttpTerminate flags */ +#define HTTP_INITIALIZE_SERVER 0x00000001 +#define HTTP_INITIALIZE_CONFIG 0x00000002 + +ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); +ULONG WINAPI HttpTerminate(ULONG,PVOID); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_HTTP_H */

1 0

Huw Davies : comdlg32: Use the DEVMODE and DEVNAMES directly from the PAGESETUPDLG structure.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: c458f41aec4a10263976dc8c59afb540647e2c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c458f41aec4a10263976dc8c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 13 12:18:28 2009 +0000 comdlg32: Use the DEVMODE and DEVNAMES directly from the PAGESETUPDLG structure. --- dlls/comdlg32/printdlg.c | 222 ++++++++++++++++++++++----------------------- 1 files changed, 109 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c458f41aec4a10263976d…

1 0

Andrew Talbot : riched20: Declare some functions static.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 8ddf6c0a252498f2596ed0d4872e7942ecf0c7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddf6c0a252498f2596ed0d48… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 12 21:48:01 2009 +0000 riched20: Declare some functions static. --- dlls/riched20/caret.c | 53 ++++++------ dlls/riched20/editor.c | 215 ++++++++++++++++++++++++------------------------ dlls/riched20/editor.h | 12 --- 3 files changed, 134 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ddf6c0a252498f2596ed…

1 0

Jacek Caban : urlmon: Added https binding tests.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 66a7da71eec64dd00de7459bc1ce6518866accb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a7da71eec64dd00de7459bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 18:20:28 2009 +0100 urlmon: Added https binding tests. --- dlls/urlmon/tests/url.c | 117 +++++++++++++++++++++++++++------------------- 1 files changed, 69 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66a7da71eec64dd00de74…

1 0

Jacek Caban : urlmon: Use pluggable protocol handler for https binding.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 1876f46bcf4aaa9c66878f0694df7030895d19ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1876f46bcf4aaa9c66878f069… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 18:20:21 2009 +0100 urlmon: Use pluggable protocol handler for https binding. --- dlls/urlmon/umon.c | 32 +------------------------------- 1 files changed, 1 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 01266dd..b5ffa2a 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -532,7 +532,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, if(SUCCEEDED(hres)) { URL_COMPONENTSW url; WCHAR *host, *path, *user, *pass; - DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -597,12 +596,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, url.nPort = INTERNET_DEFAULT_GOPHER_PORT; dwService = INTERNET_SERVICE_GOPHER; break; - - case INTERNET_SCHEME_HTTPS: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_HTTPS_PORT; - dwService = INTERNET_SERVICE_HTTP; - break; } bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, @@ -648,28 +641,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, else hres = HRESULT_FROM_WIN32(GetLastError()); break; - - case INTERNET_SERVICE_HTTP: - bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD_PTR)bind); - if (!bind->hrequest) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - } - else if (!HttpSendRequestW(bind->hrequest, NULL, 0, NULL, 0)) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - InternetCloseHandle(bind->hrequest); - } - else - { - HttpQueryInfoW(bind->hrequest, - HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, - &bind->expected_size, - &lensz, - NULL); - bSuccess = TRUE; - } - break; } if(bSuccess) { @@ -734,8 +705,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, } if(IsEqualGUID(&IID_IStream, riid) && - ( url.nScheme == INTERNET_SCHEME_HTTPS - || url.nScheme == INTERNET_SCHEME_FTP + ( url.nScheme == INTERNET_SCHEME_FTP || url.nScheme == INTERNET_SCHEME_GOPHER)) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, ppvObject);

1 0

Jacek Caban : urlmon: Ignore ReportProgress(BINDSTATUS_ACCEPTRANGES) calls.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: d4ce90e688f26dcac01b77262ccb95d4cfa08855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ce90e688f26dcac01b77262… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 18:20:14 2009 +0100 urlmon: Ignore ReportProgress(BINDSTATUS_ACCEPTRANGES) calls. --- dlls/urlmon/binding.c | 2 ++ dlls/urlmon/bindprot.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e0f0085..41fa677 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1183,6 +1183,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_DIRECTBIND: This->report_mime = FALSE; break; + case BINDSTATUS_ACCEPTRANGES: + break; default: FIXME("Unhandled status code %d\n", ulStatusCode); return E_NOTIMPL; diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 81dfabf..07f2722 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -486,6 +486,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin case BINDSTATUS_SENDINGREQUEST: case BINDSTATUS_CACHEFILENAMEAVAILABLE: case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_ACCEPTRANGES: case BINDSTATUS_MIMETYPEAVAILABLE: if(!This->protocol_sink) return S_OK;

1 0

Jacek Caban : urlmon: Added HttpSProtocol object tests.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 3b84a40cf1c211c015ed6c98a7c2f4781bf8aaf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b84a40cf1c211c015ed6c98a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 18:20:06 2009 +0100 urlmon: Added HttpSProtocol object tests. --- dlls/urlmon/tests/protocol.c | 75 ++++++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 55a6052..1fff2e4 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -74,6 +74,8 @@ DEFINE_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); DEFINE_EXPECT(ReportProgress_PROTOCOLCLASSID); DEFINE_EXPECT(ReportProgress_COOKIE_SENT); DEFINE_EXPECT(ReportProgress_REDIRECTING); +DEFINE_EXPECT(ReportProgress_ENCODING); +DEFINE_EXPECT(ReportProgress_ACCEPTRANGES); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); DEFINE_EXPECT(GetBindString_ACCEPT_MIMES); @@ -124,6 +126,7 @@ static DWORD prot_read; static enum { FILE_TEST, HTTP_TEST, + HTTPS_TEST, MK_TEST, BIND_TEST } tested_protocol; @@ -163,6 +166,13 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) @@ -355,6 +365,8 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL } CHECK_CALLED(ReportProgress_SENDINGREQUEST); SET_EXPECT(OnResponse); + if(tested_protocol == HTTPS_TEST) + SET_EXPECT(ReportProgress_ACCEPTRANGES); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -368,6 +380,8 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL if (!state) { state = 1; CHECK_CALLED(OnResponse); + if(tested_protocol == HTTPS_TEST) + CHECK_CALLED(ReportProgress_ACCEPTRANGES); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -384,9 +398,6 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; - static const WCHAR post_host[] = - {'c','r','o','s','s','o','v','e','r','.','c','o','d','e', - 'w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR wszCrossoverIP[] = {'2','0','9','.','4','6','.','2','5','.','1','3','2',0}; /* I'm not sure if it's a good idea to hardcode here the IP address... */ @@ -437,11 +448,12 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) { - if (!http_post_test) - ok(!lstrcmpW(szStatusText, hostW), - "szStatustext != \"www.winehq.org\"\n"); + if(tested_protocol == HTTPS_TEST) + ok(!strcmp_wa(szStatusText, "www.codeweavers.com"), "szStatustext = %s\n", debugstr_w(szStatusText)); + else if(!http_post_test) + ok(!strcmp_wa(szStatusText, "www.winehq.org"), "szStatustext != \"www.winehq.org\"\n"); else - ok(!lstrcmpW(szStatusText, post_host), + ok(!strcmp_wa(szStatusText, "crossover.codeweavers.com"), "szStatustext != \"crossover.codeweavers.com\"\n"); } break; @@ -449,9 +461,8 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_CONNECTING); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!lstrcmpW(szStatusText, http_post_test ? - wszCrossoverIP : winehq_ipW), - "Unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, http_post_test || tested_protocol == HTTPS_TEST ? wszCrossoverIP : winehq_ipW), + "Unexpected szStatusText %s\n", debugstr_w(szStatusText)); break; case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); @@ -478,7 +489,15 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, break; case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); - ok(szStatusText == NULL, "szStatusText != NULL\n"); + ok(szStatusText == NULL, "szStatusText = %s\n", debugstr_w(szStatusText)); + break; + case BINDSTATUS_ENCODING: + CHECK_EXPECT(ReportProgress_ENCODING); + ok(!strcmp_wa(szStatusText, "gzip"), "szStatusText = %s\n", debugstr_w(szStatusText)); + break; + case BINDSTATUS_ACCEPTRANGES: + CHECK_EXPECT(ReportProgress_ACCEPTRANGES); + ok(!szStatusText, "szStatusText = %s\n", debugstr_w(szStatusText)); break; default: ok(0, "Unexpected status %d\n", ulStatusCode); @@ -498,7 +517,7 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR ok(ulProgressMax == 13, "ulProgressMax=%d, expected 13\n", ulProgressMax); ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION), "grcfBSCF = %08x\n", grfBSCF); - }else if(!binding_test && tested_protocol == HTTP_TEST) { + }else if(!binding_test && (tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST)) { if(!(grfBSCF & BSCF_LASTDATANOTIFICATION)) CHECK_EXPECT(ReportData); else if (http_post_test) @@ -870,7 +889,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(hres == S_OK, "ReportProgress(BINDSTATUS_SENDINGREQUEST) failed: %08x\n", hres); CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(tested_protocol == HTTP_TEST) { + if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; IHttpNegotiate2 *http_negotiate2; @@ -1084,7 +1103,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, } if((b = !b)) - return tested_protocol == HTTP_TEST ? E_PENDING : S_FALSE; + return tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST ? E_PENDING : S_FALSE; memset(pv, 'x', 100); prot_read += *pcbRead = 100; @@ -1547,7 +1566,7 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) /* is_first refers to whether this is the first call to this function * _for this url_ */ -static void test_http_protocol_url(LPCWSTR url, BOOL is_first) +static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) { IInternetProtocolInfo *protocol_info; IClassFactory *factory; @@ -1557,7 +1576,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) http_url = url; http_is_first = is_first; - hres = CoGetClassObject(&CLSID_HttpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); + hres = CoGetClassObject(is_https ? &CLSID_HttpSProtocol : &CLSID_HttpProtocol, + CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1676,25 +1696,37 @@ static void test_http_protocol(void) trace("Testing http protocol (not from urlmon)...\n"); tested_protocol = HTTP_TEST; bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; - test_http_protocol_url(winehq_url, TRUE); + test_http_protocol_url(winehq_url, FALSE, TRUE); trace("Testing http protocol (from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; - test_http_protocol_url(winehq_url, FALSE); + test_http_protocol_url(winehq_url, FALSE, FALSE); trace("Testing http protocol (to file)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NEEDFILE; - test_http_protocol_url(winehq_url, FALSE); + test_http_protocol_url(winehq_url, FALSE, FALSE); trace("Testing http protocol (post data)...\n"); http_post_test = TRUE; /* Without this flag we get a ReportProgress_CACHEFILENAMEAVAILABLE * notification with BINDVERB_POST */ bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; - test_http_protocol_url(posttest_url, TRUE); + test_http_protocol_url(posttest_url, FALSE, TRUE); http_post_test = FALSE; } +static void test_https_protocol(void) +{ + static const WCHAR codeweavers_url[] = + {'h','t','t','p','s',':','/','/','w','w','w','.','c','o','d','e','w','e','a','v','e','r','s', + '.','c','o','m','/','t','e','s','t','.','h','t','m','l',0}; + + trace("Testing https protocol (from urlmon)...\n"); + tested_protocol = HTTPS_TEST; + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + test_http_protocol_url(codeweavers_url, TRUE, TRUE); +} + static void test_mk_protocol(void) { IInternetProtocolInfo *protocol_info; @@ -1939,7 +1971,7 @@ static void test_binding(int prot) CHECK_CALLED(SetPriority); CHECK_CALLED(Start); - if(prot == HTTP_TEST) { + if(prot == HTTP_TEST || prot == HTTPS_TEST) { while(prot_state < 4) { WaitForSingleObject(event_complete, INFINITE); SET_EXPECT(Continue); @@ -1981,6 +2013,7 @@ START_TEST(protocol) test_file_protocol(); test_http_protocol(); + test_https_protocol(); test_mk_protocol(); test_CreateBinding(); test_binding(FILE_TEST);

1 0