January 2007 - Wine-Commits

Stefan Dösinger : wined3d: Revert "wined3d: Do not preload vertex buffers in unlock.".
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: a7916d8011a1b63306474ed1e958c519a385e1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7916d8011a1b63306474ed1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 12 18:55:16 2007 +0100 wined3d: Revert "wined3d: Do not preload vertex buffers in unlock.". This reverts commit 6fb1869b98265a30a285c6f94a768934476a8c2a. --- dlls/wined3d/vertexbuffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index da22469..c7a8a97 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -498,6 +498,8 @@ HRESULT WINAPI IWineD3DVertexBufferImpl GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); checkGLcall("glUnmapBufferARB"); LEAVE_GL(); + } else if(This->Flags & VBFLAG_HASDESC){ + IWineD3DVertexBufferImpl_PreLoad(iface); } return WINED3D_OK; }

1 0

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

Jan. 15, 2007

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

Mikołaj Zalewski : msi: Add Polish translation.
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

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 Jan. 15, 2007

Jan. 15, 2007

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 : cmdlgtst: Add Polish translation.
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

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

Mikołaj Zalewski : wininet: Add Polish translation.
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

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 : wordpad: Add Polish translation.
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

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

Rob Shearman : wininet: Change HTTP_EncodeBase64 to operate on a series of bytes, instead of text .
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: a9ebc706e353c06391cc80b8c813e1dd661268de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ebc706e353c06391cc80b8c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 12 19:17:20 2007 -0600 wininet: Change HTTP_EncodeBase64 to operate on a series of bytes, instead of text. Change HTTP_EncodeBasicAuth to convert the username and password into utf8 before base64 encoding. --- dlls/wininet/http.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c4c8fe4..dd56560 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -846,22 +846,22 @@ end: } /*********************************************************************** - * HTTP_DecodeBase64 + * HTTP_EncodeBase64 */ -static UINT HTTP_EncodeBase64( LPCWSTR bin, LPWSTR base64 ) +static UINT HTTP_EncodeBase64( LPCSTR bin, unsigned int len, LPWSTR base64 ) { UINT n = 0, x; static LPCSTR HTTP_Base64Enc = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - while( bin[0] ) + while( len > 0 ) { /* first 6 bits, all from bin[0] */ base64[n++] = HTTP_Base64Enc[(bin[0] & 0xfc) >> 2]; x = (bin[0] & 3) << 4; /* next 6 bits, 2 from bin[0] and 4 from bin[1] */ - if( !bin[1] ) + if( len == 1 ) { base64[n++] = HTTP_Base64Enc[x]; base64[n++] = '='; @@ -872,7 +872,7 @@ static UINT HTTP_EncodeBase64( LPCWSTR b x = ( bin[1] & 0x0f ) << 2; /* next 6 bits 4 from bin[1] and 2 from bin[2] */ - if( !bin[2] ) + if( len == 2 ) { base64[n++] = HTTP_Base64Enc[x]; base64[n++] = '='; @@ -883,6 +883,7 @@ static UINT HTTP_EncodeBase64( LPCWSTR b /* last 6 bits, all from bin [2] */ base64[n++] = HTTP_Base64Enc[ bin[2] & 0x3f ]; bin += 3; + len -= 3; } base64[n] = 0; return n; @@ -896,12 +897,13 @@ static UINT HTTP_EncodeBase64( LPCWSTR b static LPWSTR HTTP_EncodeBasicAuth( LPCWSTR username, LPCWSTR password) { UINT len; - LPWSTR in, out; + char *in; + LPWSTR out; static const WCHAR szBasic[] = {'B','a','s','i','c',' ',0}; - static const WCHAR szColon[] = {':',0}; - len = lstrlenW( username ) + 1 + lstrlenW ( password ) + 1; - in = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + len = WideCharToMultiByte(CP_UTF8, 0, username, lstrlenW(username), NULL, 0, NULL, NULL) + + 1 + WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); + in = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(CHAR) ); if( !in ) return NULL; @@ -910,11 +912,11 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW out = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); if( out ) { - lstrcpyW( in, username ); - lstrcatW( in, szColon ); - lstrcatW( in, password ); + WideCharToMultiByte(CP_UTF8, 0, username, -1, NULL, 0, NULL, NULL); + strcat(in, ":"); + WideCharToMultiByte(CP_UTF8, 0, password, -1, NULL, 0, NULL, NULL); lstrcpyW( out, szBasic ); - HTTP_EncodeBase64( in, &out[strlenW(out)] ); + HTTP_EncodeBase64( in, len, &out[strlenW(out)] ); } HeapFree( GetProcessHeap(), 0, in );

1 0

Rob Shearman : wininet: HTTP_HttpQueryInfoW deals with bytes, not characters so update the callers that have this wrong assumption.
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: 9efe083ec52ebe362ee54dfb35e8d7c8915c301e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efe083ec52ebe362ee54dfb3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 12 19:19:18 2007 -0600 wininet: HTTP_HttpQueryInfoW deals with bytes, not characters so update the callers that have this wrong assumption. --- dlls/wininet/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9a2e739..c4c8fe4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -665,7 +665,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR (dwCode==302 || dwCode==301)) { WCHAR szNewLocation[2048]; - dwBufferSize=2048; + dwBufferSize=sizeof(szNewLocation); if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { static const WCHAR szGET[] = { 'G','E','T', 0 }; @@ -2373,7 +2373,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI { DWORD dwCode,dwCodeLength=sizeof(DWORD); WCHAR szNewLocation[2048]; - dwBufferSize=2048; + dwBufferSize=sizeof(szNewLocation); if (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && (dwCode==HTTP_STATUS_REDIRECT || dwCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) @@ -2988,7 +2988,7 @@ static VOID HTTP_CloseConnection(LPWININ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) { WCHAR szConnectionResponse[20]; - DWORD dwBufferSize = sizeof(szConnectionResponse)/sizeof(szConnectionResponse[0]); + DWORD dwBufferSize = sizeof(szConnectionResponse); TRACE("\n");

1 0

Rob Shearman : wininet: Allow a NULL value to be passed into HTTP_ProcessHeader
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

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