Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

WebView: fix F5, filesize

Browse Source 
git-svn-id: svn://kolibrios.org@4688 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2014-03-23 18:48:16 +00:00
parent a2554b0cac
commit c3ace6a161
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/cmm/TWB/TWB.c
View File

@ -100,15 +100,6 @@ void BufEncode(int set_new_encoding)
cur_encoding = set_new_encoding; cur_encoding = set_new_encoding;
if (o_bufpointer==0) if (o_bufpointer==0)
{ {
bufpointer_realsize = strlen(bufpointer);
if (bufpointer_realsize > bufsize)
{
debug("bufsize: ");
debugi(bufsize);
debug("bufpointer_realsize: ");
debugi(bufpointer_realsize);
bufsize = bufpointer_realsize;
}
o_bufpointer = malloc(bufsize); o_bufpointer = malloc(bufsize);
strcpy(o_bufpointer, bufpointer); strcpy(o_bufpointer, bufpointer);
} }

2
programs/cmm/TWB/parce_tag.h
View File

@ -1,6 +1,6 @@
unsigned int GetNextParam() unsigned int GetNextParam()
{ {
byte kavichki = false; byte kavichki=0;
int i = strlen(#tagparam) - 1; int i = strlen(#tagparam) - 1;
if (!tagparam) return 0; if (!tagparam) return 0;

4
programs/cmm/browser/WebView.c
View File

@ -382,9 +382,7 @@ void Scan(int id)
} }
return; return;
case 054: //F5 case 054: //F5
IF(address_box.flags & 0b10) WB1.Parse(); IF(address_box.flags & 0b10) return;
return;
case REFRESH: case REFRESH:
if (http_transfer > 0) if (http_transfer > 0)
{ {

42
programs/cmm/lib/strings.h
View File

@ -272,7 +272,7 @@ unsigned int strcpyb(dword search_in, copyin, startstr, endstr)
} }
/*void strcat(char *to, char *from) //òîæå ðàáîòàåò /*void strcat(char *to, char *from) //òîæå ðàáîòàåò
{ {
while(*to) to++; while(*to) to++;
while(*from) while(*from)
@ -313,8 +313,8 @@ inline fastcall strupr( ESI)
do{ do{
AL=DSBYTE[ESI]; AL=DSBYTE[ESI];
IF(AL>='a')IF(AL<='z')DSBYTE[ESI]=AL&0x5f; IF(AL>='a')IF(AL<='z')DSBYTE[ESI]=AL&0x5f;
IF (AL>=160) && (AL<=175) DSBYTE[ESI] = AL - 32; //à-ï IF (AL>=160) && (AL<=175) DSBYTE[ESI] = AL - 32; //à-ï
IF (AL>=224) && (AL<=239) DSBYTE[ESI] = AL - 80; //à-ï IF (AL>=224) && (AL<=239) DSBYTE[ESI] = AL - 80; //à-ï
ESI++; ESI++;
}while(AL!=0); }while(AL!=0);
} }
@ -335,17 +335,45 @@ inline fastcall strttl( EDX)
{ {
AL=DSBYTE[EDX]; AL=DSBYTE[EDX];
IF(AL>='a')&&(AL<='z')DSBYTE[EDX]=AL&0x5f; IF(AL>='a')&&(AL<='z')DSBYTE[EDX]=AL&0x5f;
IF (AL>=160) && (AL<=175) DSBYTE[EDX] = AL - 32; //à-ï IF (AL>=160) && (AL<=175) DSBYTE[EDX] = AL - 32; //à-ï
IF (AL>=224) && (AL<=239) DSBYTE[EDX] = AL - 80; //à-ï IF (AL>=224) && (AL<=239) DSBYTE[EDX] = AL - 80; //à-ï
do{ do{
EDX++; EDX++;
AL=DSBYTE[EDX]; AL=DSBYTE[EDX];
IF(AL>='A')&&(AL<='Z'){DSBYTE[EDX]=AL|0x20; CONTINUE;} IF(AL>='A')&&(AL<='Z'){DSBYTE[EDX]=AL|0x20; CONTINUE;}
IF(AL>='€')&&(AL<='<EFBFBD>')DSBYTE[EDX]=AL|0x20; // -¯ IF(AL>='€')&&(AL<='')DSBYTE[EDX]=AL|0x20; // -¯
IF (AL>=144) && (AL<=159) DSBYTE[EDX] = AL + 80; //à-ï IF (AL>=144) && (AL<=159) DSBYTE[EDX] = AL + 80; //à-ï
}while(AL!=0); }while(AL!=0);
} }
void trim(char *s)
{
// удаляем пробелы и табы с начала строки:
int i=0,j;
while((s[i]==' ')||(s[i]=='\t')||(s[i]=='\r')||(s[i]=='\n'))
{
i++;
}
if(i>0)
{
for(j=0;j<strlen(s);j++)
{
s[j]=s[j+i];
}
s[j]='\0';
}
// удаляем пробелы и табы с конца строки:
i=strlen(s)-1;
while((s[i]==' ')||(s[i]=='\t')||(s[i]=='\r')||(s[i]=='\n'))
{
i--;
}
if(i<strlen(s)-1)
{
s[i+1]='\0';
}
}
dword itoa( ESI) dword itoa( ESI)
{ {