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

appdb/. account.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26281 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 10:50:41 Modified files: . : account.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Add documentation to account.php Patch: http://cvs.winehq.org/patch.py?id=26281 Old revision New revision Changes Path 1.31 1.32 +7 -0 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.31 appdb/account.php:1.32 --- appdb/account.php:1.31 7 Jul 2006 15:50:41 -0000 +++ appdb/account.php 7 Jul 2006 15:50:41 -0000 @@ -5,6 +5,13 @@ * Mandatory parameters: * - sCmd, action to perform ("new", "do_new", "login", "do_login", "send_passwd", "logout") * + * Optional parameters: + * - sUserPassword, new password + * - sUserPassword2, new password confirmation + * - sUserEmail, e-mail address + * - sUserRealname, user's real name + * - sWineRelease, user's Wine release + * * TODO: * - replace sCmd with iAction and replace "new", "login", etc. with integer constants NEW, LOGIN, etc. * - move functions into their respective modules (probably static methods of user class)

1 0

appdb/ ./account.php include/form_new.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26280 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 10:45:48 Modified files: . : account.php include : form_new.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix account creation. Change cmd to sCmd like the account.php code expects Patch: http://cvs.winehq.org/patch.py?id=26280 Old revision New revision Changes Path 1.30 1.31 +1 -1 appdb/account.php 1.8 1.9 +1 -1 appdb/include/form_new.php Index: appdb/account.php diff -u -p appdb/account.php:1.30 appdb/account.php:1.31 --- appdb/account.php:1.30 7 Jul 2006 15:45:48 -0000 +++ appdb/account.php 7 Jul 2006 15:45:48 -0000 @@ -162,7 +162,7 @@ function cmd_send_passwd() { addmsg("Please enter your email address in the 'E-mail' field and re-request a new password", "green"); - util_redirect_and_exit(apidb_fullurl("account.php?cmd=login")); + util_redirect_and_exit(apidb_fullurl("account.php?sCmd=login")); } $shNote = '(<b>Note</b>: accounts for <b>appdb</b>.winehq.org and <b>bugs</b>.winehq.org ' Index: appdb/include/form_new.php diff -u -p appdb/include/form_new.php:1.8 appdb/include/form_new.php:1.9 --- appdb/include/form_new.php:1.8 7 Jul 2006 15:45:48 -0000 +++ appdb/include/form_new.php 7 Jul 2006 15:45:48 -0000 @@ -52,7 +52,7 @@ echo html_frame_start("Create New Applic <?php echo html_frame_end(" "); -echo '<input type="hidden" name="cmd" value="do_new">',"\n"; +echo '<input type="hidden" name="sCmd" value="do_new">',"\n"; echo '</form>',"\n"; echo p(),p(),p();

1 0

appdb/include incl.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26279 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 10:39:41 Modified files: include : incl.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> $_REQUEST['mode'] backwards compatibility Patch: http://cvs.winehq.org/patch.py?id=26279 Old revision New revision Changes Path 1.33 1.34 +5 -0 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.33 appdb/include/incl.php:1.34 --- appdb/include/incl.php:1.33 7 Jul 2006 15:39:41 -0000 +++ appdb/include/incl.php 7 Jul 2006 15:39:41 -0000 @@ -73,6 +73,11 @@ if(isset($_REQUEST['topic'])) $_REQUEST['sTopic'] = $_REQUEST['topic']; unset($_REQUEST['topic']); } +if(isset($_REQUEST['mode'])) +{ + $_REQUEST['sMode'] = $_REQUEST['mode']; + unset($_REQUEST['mode']); +} /* End backwards compatibility code */

1 0

Michael Stefaniuc : janitorial: Put "inline static" at the beginning of a declaration.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 00e779370f6cd582ddaedb556769a9ecdff5d712 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00e779370f6cd582ddaedb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 7 00:26:16 2006 +0200 janitorial: Put "inline static" at the beginning of a declaration. --- dlls/comctl32/trackbar.c | 52 ++++++++++++++++++++++---------------------- dlls/mlang/tests/mlang.c | 4 ++- dlls/msg711.acm/msg711.c | 2 +- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/user/driver16.c | 2 +- dlls/wined3d/drawprim.c | 4 ++- dlls/winex11.drv/wintab.c | 2 +- dlls/winmm/driver.c | 2 +- dlls/wintab32/context.c | 4 ++- 9 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=00e779370f6cd582dda…

1 0

Michael Stefaniuc : riched20: Replace an if-statement with empty body with a FIXME comment.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: c3f112e52dbecbb2c1785cfbd8491d6f34814a93 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3f112e52dbecbb2c1785cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 7 00:29:03 2006 +0200 riched20: Replace an if-statement with empty body with a FIXME comment. --- dlls/riched20/caret.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 057e5d8..da52288 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -765,8 +765,8 @@ void ME_MouseMove(ME_TextEditor *editor, y += ME_GetYScrollPos(editor); tmp_cursor = editor->pCursors[0]; - if (!ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd)) - /* return */; + /* FIXME: do something with the return value of ME_FindPixelPos */ + ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd); if (tmp_cursor.pRun == editor->pCursors[0].pRun && tmp_cursor.nOffset == editor->pCursors[0].nOffset)

1 0

Michael Stefaniuc : janitorial: Move the storage specifier to the beginning of the declaration.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 32b1a245010d7c2471e0817adc627fcf05fcdad9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32b1a245010d7c2471e0817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 7 00:23:14 2006 +0200 janitorial: Move the storage specifier to the beginning of the declaration. --- dlls/shell32/systray.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- programs/explorer/systray.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index f4bb6ed..8439e6f 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -36,7 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(systray); -const static WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T','r','a','y','W','n','d','\0'}; +static const WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T','r','a','y','W','n','d','\0'}; /************************************************************************* * Shell_NotifyIcon [SHELL32.296] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a71539a..50b2503 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -92,7 +92,7 @@ typedef struct _WINED3DGLTYPE { } WINED3DGLTYPE; /* NOTE: Make sure these are in the correct numerical order. (see /include/d3d9types.h typedef enum _D3DDECLTYPE) */ -WINED3DGLTYPE static const glTypeLookup[D3DDECLTYPE_UNUSED] = { +static WINED3DGLTYPE const glTypeLookup[D3DDECLTYPE_UNUSED] = { {D3DDECLTYPE_FLOAT1, 1, GL_FLOAT , GL_FALSE ,sizeof(float)}, {D3DDECLTYPE_FLOAT2, 2, GL_FLOAT , GL_FALSE ,sizeof(float)}, {D3DDECLTYPE_FLOAT3, 3, GL_FLOAT , GL_FALSE ,sizeof(float)}, diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 38e8ab3..70d29bf 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define IS_OPTION_FALSE(ch) \ ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') -const static WCHAR adaptor_classname[] = /* Adaptor */ {'A','d','a','p','t','o','r',0}; +static const WCHAR adaptor_classname[] = /* Adaptor */ {'A','d','a','p','t','o','r',0}; /* tray state */ struct tray @@ -192,7 +192,7 @@ static void add_icon(const NOTIFYICONDAT { RECT rect; struct icon *icon; - const static WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; + static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd);

1 0

Thomas Kho : notepad: Change window classname from NPClass to Notepad.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 0796fe256be7205ee336f2746c91daeb319938f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0796fe256be7205ee336f27… Author: Thomas Kho <tkho(a)ucla.edu> Date: Thu Jul 6 17:40:47 2006 -0500 notepad: Change window classname from NPClass to Notepad. --- programs/notepad/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 3e10aa9..d4ba472 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -370,7 +370,7 @@ int PASCAL WinMain(HINSTANCE hInstance, MSG msg; HACCEL hAccel; WNDCLASSEX class; - static const WCHAR className[] = {'N','P','C','l','a','s','s',0}; + static const WCHAR className[] = {'N','o','t','e','p','a','d',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; aFINDMSGSTRING = RegisterWindowMessage(FINDMSGSTRING);

1 0

Jacek Caban : urlmon: Added image/x-png mime filter.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 6ce4833479c00637a56b3408424c89fecbf93612 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ce4833479c00637a56b340… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 21:11:04 2006 +0200 urlmon: Added image/x-png mime filter. --- dlls/urlmon/tests/misc.c | 13 ++++++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ad1b2bd..6e034c0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -333,6 +333,7 @@ static const WCHAR mimeAppOctetStream[] static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; +static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; static const struct { LPCWSTR url; @@ -380,6 +381,11 @@ static BYTE data30[] = {0x42,0x4d,'x','x static BYTE data31[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'<','h','t','m','l','>'}; static BYTE data32[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x'}; static BYTE data33[] = {0x00,0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x'}; +static BYTE data34[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x'}; +static BYTE data35[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x','x','x','x',0}; +static BYTE data36[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,'x','x'}; +static BYTE data37[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'<','h','t','m','l','>'}; +static BYTE data38[] = {0x00,0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x'}; static const struct { BYTE *data; @@ -418,7 +424,12 @@ static const struct { {data30, sizeof(data30), mimeAppOctetStream}, {data31, sizeof(data31), mimeTextHtml}, {data32, sizeof(data32), mimeAppOctetStream}, - {data33, sizeof(data32), mimeAppOctetStream} + {data33, sizeof(data33), mimeAppOctetStream}, + {data34, sizeof(data34), mimeImageXPng}, + {data35, sizeof(data35), mimeImageXPng}, + {data36, sizeof(data36), mimeAppOctetStream}, + {data37, sizeof(data37), mimeTextHtml}, + {data38, sizeof(data38), mimeAppOctetStream} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 9cd6daa..168d9c4 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -434,6 +434,12 @@ static BOOL image_pjpeg_filter(LPVOID bu return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; } +static BOOL image_xpng_filter(LPVOID buf, DWORD size) +{ + static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; + return size > sizeof(xpng_header) && !memcmp(buf, xpng_header, sizeof(xpng_header)); +} + static BOOL image_bmp_filter(LPVOID buf, DWORD size) { return size >= 14 @@ -496,6 +502,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; + static const WCHAR wszImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', @@ -508,6 +515,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszTextHtml, text_html_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, + {wszImageXPng, image_xpng_filter}, {wszImageBmp, image_bmp_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter}

1 0

Jacek Caban : urlmon: Added image/bmp filter.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 682944ad2d50d181afa1571d3440e53b2fe78ff1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=682944ad2d50d181afa1571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 20:38:27 2006 +0200 urlmon: Added image/bmp filter. --- dlls/urlmon/tests/misc.c | 16 ++++++++++++++-- dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 24b703a..ad1b2bd 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -332,6 +332,7 @@ static const WCHAR mimeAppOctetStream[] 'o','c','t','e','t','-','s','t','r','e','a','m',0}; static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; +static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const struct { LPCWSTR url; @@ -373,7 +374,12 @@ static BYTE data24[] = {'g','i','f','8', static BYTE data25[] = {'G','i','F','8','7','A'}; static BYTE data26[] = {'G','i','F','8','7','a','<','h','t','m','l','>'}; static BYTE data27[] = {0x30,'G','i','F','8','7','A'}; - +static BYTE data28[] = {0x42,0x4d,0x6e,0x42,0x1c,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00}; +static BYTE data29[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x','x'}; +static BYTE data30[] = {0x42,0x4d,'x','x','x','x',0x00,0x01,0x00,0x00,'x','x','x','x'}; +static BYTE data31[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'<','h','t','m','l','>'}; +static BYTE data32[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x'}; +static BYTE data33[] = {0x00,0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x'}; static const struct { BYTE *data; @@ -406,7 +412,13 @@ static const struct { {data24, sizeof(data24), mimeImageGif}, {data25, sizeof(data25), mimeImageGif}, {data26, sizeof(data26), mimeTextHtml}, - {data27, sizeof(data27), mimeTextPlain} + {data27, sizeof(data27), mimeTextPlain}, + {data28, sizeof(data28), mimeImageBmp}, + {data29, sizeof(data29), mimeImageBmp}, + {data30, sizeof(data30), mimeAppOctetStream}, + {data31, sizeof(data31), mimeTextHtml}, + {data32, sizeof(data32), mimeAppOctetStream}, + {data33, sizeof(data32), mimeAppOctetStream} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 742eb70..9cd6daa 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -434,6 +434,14 @@ static BOOL image_pjpeg_filter(LPVOID bu return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; } +static BOOL image_bmp_filter(LPVOID buf, DWORD size) +{ + return size >= 14 + && *(BYTE*)buf == 0x42 + && *((BYTE*)buf+1) == 0x4d + && *(DWORD*)((BYTE*)buf+6) == 0; +} + static BOOL text_plain_filter(LPVOID buf, DWORD size) { UCHAR *ptr; @@ -488,6 +496,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; + static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -499,6 +508,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszTextHtml, text_html_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, + {wszImageBmp, image_bmp_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} };

1 0

Jacek Caban : urlmon: Added image/gif filter.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 32405d635f27474381f4b6ecb4395a813fb51239 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32405d635f27474381f4b6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 20:04:26 2006 +0200 urlmon: Added image/gif filter. --- dlls/urlmon/tests/misc.c | 22 +++++++++++++++++++++- dlls/urlmon/urlmon_main.c | 15 +++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 1a7f078..24b703a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -331,6 +331,7 @@ static const WCHAR mimeTextPlain[] = {'t static const WCHAR mimeAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m',0}; static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; +static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const struct { LPCWSTR url; @@ -363,6 +364,16 @@ static BYTE data15[] = {0xff,0xd8}; static BYTE data16[] = {0xff,0xd8,'h'}; static BYTE data17[] = {0,0xff,0xd8}; static BYTE data18[] = {0xff,0xd8,'<','h','t','m','l','>'}; +static BYTE data19[] = {'G','I','F','8','7','a'}; +static BYTE data20[] = {'G','I','F','8','9','a'}; +static BYTE data21[] = {'G','I','F','8','7'}; +static BYTE data22[] = {'G','i','F','8','7','a'}; +static BYTE data23[] = {'G','i','F','8','8','a'}; +static BYTE data24[] = {'g','i','f','8','7','a'}; +static BYTE data25[] = {'G','i','F','8','7','A'}; +static BYTE data26[] = {'G','i','F','8','7','a','<','h','t','m','l','>'}; +static BYTE data27[] = {0x30,'G','i','F','8','7','A'}; + static const struct { BYTE *data; @@ -386,7 +397,16 @@ static const struct { {data15, sizeof(data15), mimeTextPlain}, {data16, sizeof(data16), mimeImagePjpeg}, {data17, sizeof(data17), mimeAppOctetStream}, - {data18, sizeof(data18), mimeTextHtml} + {data18, sizeof(data18), mimeTextHtml}, + {data19, sizeof(data19), mimeImageGif}, + {data20, sizeof(data20), mimeImageGif}, + {data21, sizeof(data21), mimeTextPlain}, + {data22, sizeof(data22), mimeImageGif}, + {data23, sizeof(data23), mimeTextPlain}, + {data24, sizeof(data24), mimeImageGif}, + {data25, sizeof(data25), mimeImageGif}, + {data26, sizeof(data26), mimeTextHtml}, + {data27, sizeof(data27), mimeTextPlain} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 2adafe9..742eb70 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -416,6 +416,19 @@ static BOOL text_html_filter(LPVOID buf, return FALSE; } +static BOOL image_gif_filter(LPVOID buf, DWORD size) +{ + const BYTE const *b = buf; + + return size >= 6 + && (b[0] == 'G' || b[0] == 'g') + && (b[1] == 'I' || b[1] == 'i') + && (b[2] == 'F' || b[2] == 'f') + && b[3] == '8' + && (b[4] == '7' || b[4] == '9') + && (b[5] == 'A' || b[5] == 'a'); +} + static BOOL image_pjpeg_filter(LPVOID buf, DWORD size) { return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; @@ -473,6 +486,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC int i; static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', @@ -483,6 +497,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC BOOL (*filter)(LPVOID,DWORD); } mime_filters[] = { {wszTextHtml, text_html_filter}, + {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter}

1 0