January 2007 - Wine-commits

Stefan Dösinger : wined3d: Do not free regularily locked surfaces.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 03389acc304e55f19bf5e5ddb7f340c3ad7582ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=03389acc304e55f19bf5e5ddb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 12 18:57:26 2007 +0100 wined3d: Do not free regularily locked surfaces. --- dlls/wined3d/surface.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index de263b9..ca9900a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -824,6 +824,19 @@ static HRESULT WINAPI IWineD3DSurfaceImp } } + /* Performance optimization: Count how often a surface is locked, if it is locked regularly do not throw away the system memory copy. + * This avoids the need to download the surface from opengl all the time. The surface is still downloaded if the opengl texture is + * changed + */ + if(!(This->Flags & SFLAG_DYNLOCK)) { + This->lockCount++; + /* MAXLOCKCOUNT is defined in wined3d_private.h */ + if(This->lockCount > MAXLOCKCOUNT) { + TRACE("Surface is locked regularily, not freeing the system memory copy any more\n"); + This->Flags |= SFLAG_DYNLOCK; + } + } + TRACE("returning memory@%p, pitch(%d) dirtyfied(%d)\n", pLockedRect->pBits, pLockedRect->Pitch, This->Flags & SFLAG_DIRTY ? 0 : 1); This->Flags |= SFLAG_LOCKED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fe7c71..6d99657 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -984,6 +984,8 @@ struct IWineD3DSurfaceImpl RECT lockedRect; RECT dirtyRect; + int lockCount; +#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ glDescriptor glDescription;

1 0

Stefan Dösinger : wined3d: Better tracking of vertex buffer assignments.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: e328e24daa63269117f69badaa3887d4d6358089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e328e24daa63269117f69bada… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 12 19:01:59 2007 +0100 wined3d: Better tracking of vertex buffer assignments. --- dlls/wined3d/device.c | 8 ++------ dlls/wined3d/vertexbuffer.c | 2 +- dlls/wined3d/wined3d_private.h | 7 +++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a02e31..1845446 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2243,14 +2243,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl so for now, just count internally */ if (pStreamData != NULL) { IWineD3DVertexBufferImpl *vbImpl = (IWineD3DVertexBufferImpl *) pStreamData; - if( (vbImpl->Flags & VBFLAG_STREAM) && vbImpl->stream != StreamNumber) { - WARN("Assigning a Vertex Buffer to stream %d which is already assigned to stream %d\n", StreamNumber, vbImpl->stream); - } - vbImpl->stream = StreamNumber; - vbImpl->Flags |= VBFLAG_STREAM; + InterlockedIncrement(&vbImpl->bindCount); } if (oldSrc != NULL) { - ((IWineD3DVertexBufferImpl *) oldSrc)->Flags &= ~VBFLAG_STREAM; + InterlockedDecrement(&((IWineD3DVertexBufferImpl *) oldSrc)->bindCount); } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index c7a8a97..6ef7533 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -266,7 +266,7 @@ static void WINAPI IWineD3DVertexBuf } /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if(This->resource.wineD3DDevice->isInDraw && This->Flags & VBFLAG_STREAM) { + if(This->resource.wineD3DDevice->isInDraw && This->bindCount > 0) { declChanged = IWineD3DVertexBufferImpl_FindDecl(This); } else if(This->Flags & VBFLAG_HASDESC) { /* Reuse the declaration stored in the buffer. It will most likely not change, and if it does diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d99657..3611f87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -751,7 +751,7 @@ typedef struct IWineD3DVertexBufferImpl /* Vertex buffer object support */ GLuint vbo; BYTE Flags; - UINT stream; + LONG bindCount; UINT dirtystart, dirtyend; LONG lockcount; @@ -766,9 +766,8 @@ extern const IWineD3DVertexBufferVtbl IW #define VBFLAG_LOAD 0x01 /* Data is written from allocatedMemory to the VBO */ #define VBFLAG_OPTIMIZED 0x02 /* Optimize has been called for the VB */ #define VBFLAG_DIRTY 0x04 /* Buffer data has been modified */ -#define VBFLAG_STREAM 0x08 /* The vertex buffer is in a stream */ -#define VBFLAG_HASDESC 0x10 /* A vertex description has been found */ -#define VBFLAG_VBOCREATEFAIL 0x20 /* An attempt to create a vbo has failed */ +#define VBFLAG_HASDESC 0x08 /* A vertex description has been found */ +#define VBFLAG_VBOCREATEFAIL 0x10 /* An attempt to create a vbo has failed */ /***************************************************************************** * IWineD3DIndexBuffer implementation structure (extends IWineD3DResourceImpl)

1 0

Mikołaj Zalewski : msi: Add Polish translation.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: c38c5fb2fc254e37da51a576e0159c685095d96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c5fb2fc254e37da51a576e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jan 15 09:32:28 2007 +0100 msi: Add Polish translation. --- dlls/msi/msi.rc | 1 + dlls/msi/msi_Pl.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 822a531..ed818ad 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -39,6 +39,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "msi_Ko.rc" #include "msi_Nl.rc" #include "msi_No.rc" +#include "msi_Pl.rc" #include "msi_Pt.rc" #include "msi_Ru.rc" #include "msi_Tr.rc" diff --git a/dlls/msi/msi_Pl.rc b/dlls/msi/msi_Pl.rc new file mode 100644 index 0000000..00eb535 --- /dev/null +++ b/dlls/msi/msi_Pl.rc @@ -0,0 +1,35 @@ +/* + * Polish resources for MSI + * + * Copyright 2005 Mike McCormack + * Copyright 2007 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 4 "Nie uda�o si� otworzy� wybranego pakietu instalacyjnego. Sprawd� czy �cie�ka jest poprawna i spr�buj ponownie." + 5 "�cie�ka '%s' nie zosta�a odnaleziona" + 9 "w�� dysk '%s'" + 10 "z�e parametry" + 11 "wprowad� sice�k� do folderu zawieraj�cego '%s'" + 12 "�r�d�o danych zawieraj�ce ��dan� funkcj� jest niedost�pne" + 13 "dysk siecowy zawieraj�cy ��dan� funckje jest niedost�pny" + 14 "funkcja z:" + 15 "wybierz folder zawieraj�cy '%s'" +}

1 0

Mikołaj Zalewski : mpr: Add Polish translation.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: fc6c6386a945675d3b6a9bdbaa23979736f08b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6c6386a945675d3b6a9bdba… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jan 15 09:32:53 2007 +0100 mpr: Add Polish translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Pl.rc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index aa7db7f..338ae7b 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -37,5 +37,6 @@ #include "mpr_Ko.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" +#include "mpr_Pl.rc" #include "mpr_Pt.rc" #include "mpr_Tr.rc" diff --git a/dlls/mpr/mpr_Pl.rc b/dlls/mpr/mpr_Pl.rc new file mode 100644 index 0000000..40263b0 --- /dev/null +++ b/dlls/mpr/mpr_Pl.rc @@ -0,0 +1,47 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Ca�a sie�" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wprowad� has�o do sieci" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Prosz� wprowadzi� nazw� u�ytkownika i has�o:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Obszar", -1, 40, 46, 50, 10 */ + LTEXT "U�ytkownik", -1, 40, 66, 50, 10 + LTEXT "Has�o", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Zapami�taj to has�o (nie bezpieczne)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

Mikołaj Zalewski : wordpad: Add Polish translation.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 5723151c04ffaae9ecd965c188e29c9cdb923914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5723151c04ffaae9ecd965c18… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jan 13 23:51:55 2007 +0100 wordpad: Add Polish translation. --- programs/wordpad/Pl.rc | 67 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc new file mode 100644 index 0000000..3f0bf06 --- /dev/null +++ b/programs/wordpad/Pl.rc @@ -0,0 +1,67 @@ +/* + * Copyright 2004 by Krzysztof Foltman + * Copyright 2006 by Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW + MENUITEM "&Otw�rz\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Zapisz\tCtrl+S", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "Za&ko�cz", ID_FILE_EXIT + END + POPUP "&Edycja" + BEGIN + MENUITEM "&Cofnij\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Powt�rz\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&Zaznacz wszystko\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Wy&tnij\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopiuj\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "Tylko do &odczytu", ID_EDIT_READONLY + MENUITEM "&Zmodifykowany", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Dodatki" + BEGIN + MENUITEM "Zaznaczenie - &info", ID_EDIT_SELECTIONINFO + MENUITEM "&Format znak�w", ID_EDIT_CHARFORMAT + MENUITEM "&Standardowy format znak�w", ID_EDIT_DEFCHARFORMAT + MENUITEM "Format aka&pitu", ID_EDIT_PARAFORMAT + MENUITEM "&Pobie� tekst", ID_EDIT_GETTEXT + END + END + POPUP "F&ormat" + BEGIN + POPUP "&T�o" + BEGIN + MENUITEM "&System\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat (��ty)\tCtrl+2", ID_BACK_2 + END + POPUP "&Wyr�wnanie" + BEGIN + MENUITEM "Do &lewej\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "&Wy�rodkowanie\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "Do &Prawej\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index ca3bf51..a4c57e5 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -83,5 +83,6 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Pl.rc" #include "Ru.rc" #include "Tr.rc"

1 0

Mikołaj Zalewski : wininet: Add Polish translation.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: b8e1dcb374365850179a5d93c2c2c5842951ad0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e1dcb374365850179a5d93c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jan 13 23:52:34 2007 +0100 wininet: Add Polish translation. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Pl.rc | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index 44c327c..a9c055f 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -54,6 +54,7 @@ #include "wininet_Ko.rc" #include "wininet_Nl.rc" #include "wininet_No.rc" +#include "wininet_Pl.rc" #include "wininet_Pt.rc" #include "wininet_Ru.rc" #include "wininet_Si.rc" diff --git a/dlls/wininet/wininet_Pl.rc b/dlls/wininet/wininet_Pl.rc new file mode 100644 index 0000000..7ddb399 --- /dev/null +++ b/dlls/wininet/wininet_Pl.rc @@ -0,0 +1,45 @@ +/* + * Copyright 2003 Mike McCormack for CodeWeavers + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wprowad� has�o do sieci" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Prosz� wprowadzi� nazw� u�ytkownika i has�o:", -1, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Obszar", -1, 40, 46, 50, 10 + LTEXT "U�ytkonik", -1, 40, 66, 50, 10 + LTEXT "Has�o", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Zapami�taj to has�o (nie bezpieczne)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "Po��czenie LAN" +}

1 0

Mikołaj Zalewski : cmdlgtst: Add Polish translation.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: f37322ae6784f4107934d81f06ea9402c0d588c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37322ae6784f4107934d81f0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jan 13 23:52:55 2007 +0100 cmdlgtst: Add Polish translation. --- programs/cmdlgtst/Pl.rc | 296 +++++++++++++++++++++++++++++++++++++++++++ programs/cmdlgtst/cmdlgr.rc | 1 + 2 files changed, 297 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f37322ae6784f4107934d…

1 0

Jacek Caban : itss: Close chm file when destroying Storage.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 05d2aa450605dc46c598bee3826055a06063f170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d2aa450605dc46c598bee38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 13 12:47:27 2007 +0100 itss: Close chm file when destroying Storage. --- dlls/itss/storage.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 9d1b343..6c163ad 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -296,6 +296,7 @@ static ULONG WINAPI ITSS_IStorageImpl_Re if (ref == 0) { + chm_close(This->chmfile); HeapFree(GetProcessHeap(), 0, This); ITSS_UnlockModule(); }

1 0

Jacek Caban : itss: Added more protocol tests.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 6489a1c2423f7153bcf870ed6ca568b7b9996419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6489a1c2423f7153bcf870ed6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 13 12:47:57 2007 +0100 itss: Added more protocol tests. --- dlls/itss/tests/protocol.c | 77 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 67 insertions(+), 10 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 02a0ca0..4b594b2 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -60,11 +60,18 @@ DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(ReportProgress_BEGINDOWNLOADDATA); DEFINE_EXPECT(ReportProgress_SENDINGREQUEST); DEFINE_EXPECT(ReportProgress_MIMETYPEAVAILABLE); +DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); +DEFINE_EXPECT(ReportProgress_DIRECTBIND); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); static HRESULT expect_hrResult; +static enum { + ITS_PROTOCOL, + MK_PROTOCOL +} test_protocol; + static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -95,6 +102,8 @@ static HRESULT WINAPI ProtocolSink_Repor { static const WCHAR blank_html[] = {'b','l','a','n','k','.','h','t','m','l',0}; static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR cache_file[] = + {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; switch(ulStatusCode) { case BINDSTATUS_BEGINDOWNLOADDATA: @@ -103,12 +112,23 @@ static HRESULT WINAPI ProtocolSink_Repor break; case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); - ok(!lstrcmpW(szStatusText, blank_html), "unexpected szStatusText\n"); + if(test_protocol == ITS_PROTOCOL) + ok(!lstrcmpW(szStatusText, blank_html), "unexpected szStatusText\n"); + else + ok(szStatusText == NULL, "szStatusText != NULL\n"); break; case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); ok(!lstrcmpW(szStatusText, text_html), "unexpected szStatusText\n"); break; + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + ok(!lstrcmpW(szStatusText, cache_file), "unexpected szStatusText\n"); + break; + case BINDSTATUS_DIRECTBIND: + CHECK_EXPECT(ReportProgress_DIRECTBIND); + ok(!szStatusText, "szStatusText != NULL\n"); + break; default: ok(0, "unexpected ulStatusCode %d\n", ulStatusCode); break; @@ -123,7 +143,10 @@ static HRESULT WINAPI ProtocolSink_Repor CHECK_EXPECT(ReportData); ok(ulProgress == ulProgressMax, "ulProgress != ulProgressMax\n"); - ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE), "grcf = %08x\n", grfBSCF); + if(test_protocol == ITS_PROTOCOL) + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE), "grcf = %08x\n", grfBSCF); + else + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION), "grcf = %08x\n", grfBSCF); return S_OK; } @@ -225,10 +248,15 @@ static void protocol_start(IInternetProt HRESULT hres; SET_EXPECT(GetBindInfo); + if(test_protocol == MK_PROTOCOL) + SET_EXPECT(ReportProgress_DIRECTBIND); SET_EXPECT(ReportProgress_SENDINGREQUEST); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + if(test_protocol == MK_PROTOCOL) + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); SET_EXPECT(ReportData); - SET_EXPECT(ReportProgress_BEGINDOWNLOADDATA); + if(test_protocol == ITS_PROTOCOL) + SET_EXPECT(ReportProgress_BEGINDOWNLOADDATA); SET_EXPECT(ReportResult); expect_hrResult = S_OK; @@ -236,14 +264,19 @@ static void protocol_start(IInternetProt ok(hres == S_OK, "Start failed: %08x\n", hres); CHECK_CALLED(GetBindInfo); + if(test_protocol == MK_PROTOCOL) + CHECK_CALLED(ReportProgress_DIRECTBIND); CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(test_protocol == MK_PROTOCOL) + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); CHECK_CALLED(ReportData); - CHECK_CALLED(ReportProgress_BEGINDOWNLOADDATA); + if(test_protocol == ITS_PROTOCOL) + CHECK_CALLED(ReportProgress_BEGINDOWNLOADDATA); CHECK_CALLED(ReportResult); } -static void test_its_protocol_url(IClassFactory *factory, LPCWSTR url) +static void test_protocol_url(IClassFactory *factory, LPCWSTR url) { IInternetProtocol *protocol; BYTE buf[512]; @@ -270,8 +303,8 @@ static void test_its_protocol_url(IClass cb = 0xdeadbeef; hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == INET_E_DATA_NOT_AVAILABLE, - "Read returned %08x expected INET_E_DATA_NOT_AVAILABLE\n", hres); + ok(hres == (test_protocol == ITS_PROTOCOL ? INET_E_DATA_NOT_AVAILABLE : E_FAIL), + "Read returned %08x\n", hres); ok(cb == 0xdeadbeef, "cb=%u expected 0xdeadbeef\n", cb); protocol_start(protocol, url); @@ -358,6 +391,8 @@ static void test_its_protocol(void) static const WCHAR wrong_url5[] = {'f','i','l','e',':', 't','e','s','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + test_protocol = ITS_PROTOCOL; + hres = CoGetClassObject(&CLSID_ITSProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); if(!SUCCEEDED(hres)) @@ -386,9 +421,9 @@ static void test_its_protocol(void) ref = IInternetProtocol_Release(protocol); ok(!ref, "protocol ref=%d\n", ref); - test_its_protocol_url(factory, blank_url1); - test_its_protocol_url(factory, blank_url2); - test_its_protocol_url(factory, blank_url3); + test_protocol_url(factory, blank_url1); + test_protocol_url(factory, blank_url2); + test_protocol_url(factory, blank_url3); } IClassFactory_Release(factory); @@ -397,6 +432,27 @@ static void test_its_protocol(void) IUnknown_Release(unk); } +static void test_mk_protocol(void) +{ + IClassFactory *cf; + HRESULT hres; + + static const WCHAR blank_url[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', + 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + + test_protocol = MK_PROTOCOL; + + hres = CoGetClassObject(&CLSID_MkProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, + (void**)&cf); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + if(!SUCCEEDED(hres)) + return; + + test_protocol_url(cf, blank_url); + + IClassFactory_Release(cf); +} + static BOOL create_chm(void) { HANDLE file; @@ -433,6 +489,7 @@ START_TEST(protocol) return; test_its_protocol(); + test_mk_protocol(); delete_chm(); OleUninitialize();

1 0

Rob Shearman : wininet: Allow a NULL value to be passed into HTTP_ProcessHeader
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 7b002a39b88dee3047db2ae7f06fb303faf91868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b002a39b88dee3047db2ae7f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 12 19:16:49 2007 -0600 wininet: Allow a NULL value to be passed into HTTP_ProcessHeader instead of crashing so that when used with the replace flag it will delete an existing value. --- dlls/wininet/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 07dc596..9a2e739 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2873,6 +2873,8 @@ static BOOL HTTP_ProcessHeader(LPWININET return HTTP_InsertCustomHeader(lpwhr, &hdr); } + /* no value to delete */ + else return TRUE; if (dwModifier & HTTP_ADDHDR_FLAG_REQ) lphttpHdr->wFlags |= HDR_ISREQUEST;

1 0