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

Ricardo Filipe : wineconsole: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 91dfbd5a825cf45409f8dac24c7d322e8c1b0fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dfbd5a825cf45409f8dac24… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 10:00:46 2009 -0700 wineconsole: Update Portuguese translation and convert to UTF8. --- programs/wineconsole/wineconsole_Pt.rc | 86 +++++++++++++++++++------------- 1 files changed, 51 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91dfbd5a825cf45409f8d…

1 0

Ricardo Filipe : winefile: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 9046d2816644c89e5cd82f32fed0c7b90feb347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9046d2816644c89e5cd82f32f… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 10:14:59 2009 -0700 winefile: Update Portuguese translation and convert to UTF8. --- programs/winefile/Pt.rc | 145 +++++++++++++++++++++++++++++++---------------- 1 files changed, 96 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9046d2816644c89e5cd82…

1 0

Frédéric Delanoy : serialui: Fix French translation & UI display.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 8907860f3e894224af2fa7f543af02b801c205e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8907860f3e894224af2fa7f54… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:32:28 2009 +0200 serialui: Fix French translation & UI display. --- dlls/serialui/Fr.rc | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/serialui/Fr.rc b/dlls/serialui/Fr.rc index 53c1fe3..8dc8fbb 100644 --- a/dlls/serialui/Fr.rc +++ b/dlls/serialui/Fr.rc @@ -3,7 +3,8 @@ * French language support * * Copyright 2000 Mike McCormack - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,25 +23,28 @@ #include "serialui.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 180, 150 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propri�t�s pour " +CAPTION "Propriétés pour " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vitesse de connexion", -1,5,20,55,10 - COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Parit�", -1,5,40,55,10 - COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Contr�le de flux", -1,5,60,55,10 - COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de donn�es", -1,5,80,55,10 - COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de stop", -1,5,100,55,10 - COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK,30,138,50,14 - PUSHBUTTON "Annuler", IDCANCEL,85,138,50,14 + LTEXT "Vitesse de transmission (bauds)", -1,5,19,70,18 + COMBOBOX IDC_BAUD, 80, 20, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Parité", -1,5,42,55,10 + COMBOBOX IDC_PARITY, 80, 40, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Contrôle de flux", -1,5,62,55,10 + COMBOBOX IDC_FLOW, 80, 60, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits de données", -1,5,82,55,10 + COMBOBOX IDC_DATA, 80, 80, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits d'arrêt", -1,5,102,55,10 + COMBOBOX IDC_STOP, 80, 100, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,125,50,14 + PUSHBUTTON "Annuler", IDCANCEL,93,125,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */ /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */

1 0

Frédéric Delanoy : avifil32: Fix French translation.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 34460a8242af5c37acc2bcd8bfb1d01d96a457a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34460a8242af5c37acc2bcd8b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:08:05 2009 +0200 avifil32: Fix French translation. --- dlls/avifil32/avifile_Fr.rc | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/avifil32/avifile_Fr.rc b/dlls/avifil32/avifile_Fr.rc index a04f0b4..d313226 100644 --- a/dlls/avifil32/avifile_Fr.rc +++ b/dlls/avifil32/avifile_Fr.rc @@ -2,8 +2,8 @@ * Avifil32 * French language support * - * Copyright 2002 Michael G�nnewig - * Copyright 2003 Vincent B�ron + * Copyright 2002 Michael Günnewig + * Copyright 2003 Vincent Béron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +22,9 @@ #include "avifile_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 @@ -29,28 +32,28 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Options de compression" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&S�lectionnez un flux :",-1,2,5,154,10 + LTEXT "&Sélectionnez un flux :",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Options...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Imbriquer � chaque",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + AUTOCHECKBOX "&Imbriquer toutes les",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL LTEXT "images",-1,129,43,36,9 - LTEXT "Format actuel:",-1,3,56,73,9 - LTEXT "Cet espace est � louer",IDC_FORMATTEXT,75,56,90,26 + LTEXT "Format actuel :",-1,3,56,73,9 + LTEXT "Cet espace est à louer",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Annuler",IDCANCEL,170,61,50,14 END STRINGTABLE DISCARDABLE { - IDS_WAVESTREAMFORMAT "Waveform�: %s" + IDS_WAVESTREAMFORMAT "Waveform : %s" IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "Tous les fichiers multim�dias" - IDS_ALLFILES "Tous les fichier (*.*)(a)*.*" - IDS_VIDEO "vid�o" + IDS_ALLMULTIMEDIA "Tous les fichiers multimédia" + IDS_ALLFILES "Tous les fichiers (*.*)(a)*.*" + IDS_VIDEO "vidéo" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "non compress�" + IDS_AVIFILETYPE "Gestionnaire de fichiers AVI par défaut de Wine" + IDS_UNCOMPRESSED "non compressé" }

1 0

Frédéric Delanoy : iccvid: Fix French translation .
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: e662cf21078eb5fe85a94a69aa5377e2f884af6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e662cf21078eb5fe85a94a69a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:42:45 2009 +0200 iccvid: Fix French translation. --- dlls/iccvid/iccvid_Fr.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid_Fr.rc b/dlls/iccvid/iccvid_Fr.rc index f3862be..79d9cfd 100644 --- a/dlls/iccvid/iccvid_Fr.rc +++ b/dlls/iccvid/iccvid_Fr.rc @@ -18,10 +18,13 @@ #include "iccvid_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_NAME "codec vid�o Cinepak" - IDS_DESCRIPTION "codec vid�o Cinepak" + IDS_NAME "Codec vidéo Cinepak" + IDS_DESCRIPTION "Codec vidéo Cinepak" }

1 0

Frédéric Delanoy : oledlg: Fix French translation & UI display.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 569aa66f5e971cfc303edf1ad22b97df46fde231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569aa66f5e971cfc303edf1ad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 18:48:33 2009 +0200 oledlg: Fix French translation & UI display. --- dlls/oledlg/oledlg_Fr.rc | 90 ++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=569aa66f5e971cfc303ed…

1 0

Frédéric Delanoy : wineps.drv: Fix French translation & UI display.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 002b92e19127876267f35ab7d53c68495e701040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002b92e19127876267f35ab7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 19:05:34 2009 +0200 wineps.drv: Fix French translation & UI display. --- dlls/wineps.drv/wps_Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/wps_Fr.rc b/dlls/wineps.drv/wps_Fr.rc index 5bac15c..c48f568 100644 --- a/dlls/wineps.drv/wps_Fr.rc +++ b/dlls/wineps.drv/wps_Fr.rc @@ -21,6 +21,9 @@ #include "psdlg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 @@ -29,14 +32,14 @@ CAPTION "Papier" FONT 8, "MS Shell Dlg" { LTEXT "&Taille du papier :", -1, 10, 6, 100, 8 - LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + LISTBOX IDD_PAPERS, 10, 17, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Orientation", -1, 10, 80, 200, 50 CONTROL "&Portrait", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | - WS_TABSTOP, 20, 90, 60, 10 + WS_TABSTOP, 20, 93, 60, 10 CONTROL "P&aysage", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "Recto-verso:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "Recto-verso :", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Frédéric Delanoy : setupapi: Fix French translation & UI display.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: c71454db688f87d61e268557412a68b81e61b325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71454db688f87d61e2685574… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 19:15:51 2009 +0200 setupapi: Fix French translation & UI display. --- dlls/setupapi/Fr.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/Fr.rc b/dlls/setupapi/Fr.rc index e18fa85..24095e5 100644 --- a/dlls/setupapi/Fr.rc +++ b/dlls/setupapi/Fr.rc @@ -2,7 +2,7 @@ * French resources for SETUPAPI * * Copyright 2001 Andreas Mohr - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * Copyright 2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or @@ -22,13 +22,16 @@ #include "setupapi_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_PROMPTDISK "Le fichier ��%s�� sur %s est requis" + IDS_PROMPTDISK "Le fichier « %s » sur %s est requis" IDS_UNKNOWN "Inconnu" - IDS_COPYFROM "Copier les fichiers depuis�:" + IDS_COPYFROM "Copier les fichiers depuis :" IDS_INFO "Saisissez le chemin du fichier, puis cliquez sur OK." } @@ -38,9 +41,9 @@ CAPTION "Copie de fichiers..." FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source�:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Source :", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination�:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination :", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -50,9 +53,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Fichiers requis" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Veuillez ins�rer le disque d'installation du fabriquant et\nassurez vous que le lecteur correct est s�lectionn� ci-dessous", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Veuillez insérer le disque d'installation du fabricant et\nassurez vous que le lecteur correct est sélectionné ci-dessous", IDC_FILENEEDED, 10, 10, 175, 25, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Copier les fichiers du fabriquan depuis�:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copier les fichiers du fabricant depuis :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP

1 0

Jacek Caban : urlmon: Ignore QueryInterface call for an undocumented interface.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: a21c1f3c313c037c20582bdd673a06b9bc2c5680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21c1f3c313c037c20582bdd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 20:15:52 2009 +0200 urlmon: Ignore QueryInterface call for an undocumented interface. --- dlls/urlmon/tests/protocol.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f1e3b53..81eed27 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -853,6 +853,8 @@ static IInternetProtocolSink mime_protocol_sink = { &mime_protocol_sink_vtbl }; static HRESULT QueryInterface(REFIID riid, void **ppv) { + static const IID IID_undocumented = {0x58DFC7D0,0x5381,0x43E5,{0x9D,0x72,0x4C,0xDD,0xE4,0xCB,0x0F,0x1A}}; + *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) @@ -862,6 +864,10 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUriContainer, riid)) return E_NOINTERFACE; /* TODO */ + /* NOTE: IE8 queries for undocumented {58DFC7D0-5381-43E5-9D72-4CDDE4CB0F1A} interface. */ + if(IsEqualGUID(&IID_undocumented, riid)) + return E_NOINTERFACE; + if(*ppv) return S_OK;

1 0

Jacek Caban : urlmon: Moved more initialization code to init_test.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: e34916521401c2d71f792dd6d8aee111dd468627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34916521401c2d71f792dd6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 21:00:54 2009 +0200 urlmon: Moved more initialization code to init_test. --- dlls/urlmon/tests/protocol.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 81eed27..26ed8de 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1801,8 +1801,9 @@ static const IClassFactoryVtbl MimeFilterCFVtbl = { static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; -#define TEST_BINDING 1 -#define TEST_FILTER 2 +#define TEST_BINDING 0x01 +#define TEST_FILTER 0x02 +#define TEST_FIRST_HTTP 0x04 static void init_test(int prot, DWORD flags) { @@ -1818,6 +1819,9 @@ static void init_test(int prot, DWORD flags) ResetEvent(event_complete2); async_protocol = binding_protocol = filtered_protocol = NULL; filtered_sink = NULL; + http_is_first = (flags & TEST_FIRST_HTTP) != 0; + first_data_notif = TRUE; + state = 0; } static void test_priority(IInternetProtocol *protocol) @@ -2143,14 +2147,11 @@ static void test_file_protocol(void) { test_file_protocol_fail(); } -static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) +static BOOL http_protocol_start(LPCWSTR url) { static BOOL got_user_agent = FALSE; HRESULT hres; - first_data_notif = TRUE; - state = 0; - SET_EXPECT(GetBindInfo); if (!(bindf & BINDF_FROMURLMON)) SET_EXPECT(ReportProgress_DIRECTBIND); @@ -2235,17 +2236,17 @@ static void test_http_info(IInternetProtocol *protocol) /* 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_https, BOOL is_first) +static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) { IInternetProtocolInfo *protocol_info; IClassFactory *factory; IUnknown *unk; HRESULT hres; + init_test(prot, flags); http_url = url; - http_is_first = is_first; - hres = CoGetClassObject(is_https ? &CLSID_HttpSProtocol : &CLSID_HttpProtocol, + hres = CoGetClassObject(prot == HTTPS_TEST ? &CLSID_HttpSProtocol : &CLSID_HttpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) @@ -2277,7 +2278,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(ReportProgress_CONNECTING); SET_EXPECT(ReportProgress_SENDINGREQUEST); SET_EXPECT(ReportProgress_PROXYDETECTING); - if(! is_https) + if(prot == HTTP_TEST) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); else SET_EXPECT(QueryService_HttpSecurity); @@ -2289,7 +2290,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(Switch); } - if(!http_protocol_start(url, is_first)) + if(!http_protocol_start(url)) return; SET_EXPECT(ReportResult); @@ -2304,7 +2305,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) CHECK_CALLED(Switch); else CHECK_CALLED(ReportData); - if (is_https) + if(prot == HTTPS_TEST) CLEAR_CALLED(QueryService_HttpSecurity); while(1) { @@ -2332,7 +2333,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); - if (is_https) + if(prot == HTTPS_TEST) CLEAR_CALLED(ReportProgress_SENDINGREQUEST); test_protocol_terminate(async_protocol); @@ -2354,24 +2355,23 @@ static void test_http_protocol(void) 'p','o','s','t','t','e','s','t','.','p','h','p',0}; 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, FALSE, TRUE); + test_http_protocol_url(winehq_url, HTTP_TEST, TEST_FIRST_HTTP); trace("Testing http protocol (from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; - test_http_protocol_url(winehq_url, FALSE, FALSE); + test_http_protocol_url(winehq_url, HTTP_TEST, 0); 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, FALSE); + test_http_protocol_url(winehq_url, HTTP_TEST, 0); 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, FALSE, TRUE); + test_http_protocol_url(posttest_url, HTTP_TEST, TEST_FIRST_HTTP); http_post_test = FALSE; } @@ -2382,9 +2382,8 @@ static void test_https_protocol(void) '.','c','o','m','/','t','e','s','t','.','h','t','m','l',0}; trace("Testing https protocol (from urlmon)...\n"); - init_test(HTTPS_TEST, 0); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; - test_http_protocol_url(codeweavers_url, TRUE, TRUE); + test_http_protocol_url(codeweavers_url, HTTPS_TEST, TEST_FIRST_HTTP); }

1 0