May 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winevdm: Move the DOS memory range check to not trigger for Win16 apps.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: f315d0291da898b47e3651b6fa2666b1d791010c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f315d0291da898b47e3651b6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 13:01:45 2008 +0200 winevdm: Move the DOS memory range check to not trigger for Win16 apps. --- programs/winevdm/winevdm.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 263f561..5491384 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -409,11 +409,6 @@ int main( int argc, char *argv[] ) WINE_MESSAGE( "winevdm: unable to exec '%s': DOS support unavailable\n", appname ); ExitProcess(1); } - if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE) - { - WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname ); - ExitProcess(1); - } if (*first_arg) first_arg++; /* skip program name */ cmdline = build_command_line( first_arg ); @@ -457,10 +452,18 @@ int main( int argc, char *argv[] ) /* first see if it is a .pif file */ if( ( p = strrchr( appname, '.' )) && !strcasecmp( p, ".pif")) pif_cmd( appname, cmdline + 1); - else + else + { + if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE) + { + WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname ); + ExitProcess(1); + } + /* try DOS format */ /* loader expects arguments to be regular C strings */ wine_load_dos_exe( appname, cmdline + 1 ); + } /* if we get back here it failed */ instance = GetLastError(); }

1 0

James Hawkins : fusion: Fix the type of an assembly struct member.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 4442306a847af82a03a5b579f752968c8623b24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4442306a847af82a03a5b579f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 3 21:14:34 2008 -0500 fusion: Fix the type of an assembly struct member. --- dlls/fusion/fusionpriv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index ca84a29..829a6b7 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -79,7 +79,7 @@ typedef struct typedef struct { - DWORD ResolutionScope; + WORD ResolutionScope; WORD Name; WORD Namespace; } TYPEREFTABLE;

1 0

Alexandre Julliard : services: Fixed the result check for the control mutex wait.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: d760cba09095221c9f5ebf1e05c3194ad5bda8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d760cba09095221c9f5ebf1e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 13:01:15 2008 +0200 services: Fixed the result check for the control mutex wait. --- programs/services/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index baeab19..616daa9 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -833,7 +833,7 @@ DWORD svcctl_ControlService( service_unlock(service->service_entry); ret = WaitForSingleObject(control_mutex, 30000); - if (ret) + if (ret == WAIT_OBJECT_0) { DWORD result = ERROR_SUCCESS;

1 0

Alexandre Julliard : services: Use the correct invalid handle value for the control pipe.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 8ae87c7f0ec59fb82f6e4cd5558581ca7fc24a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae87c7f0ec59fb82f6e4cd55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 13:00:49 2008 +0200 services: Use the correct invalid handle value for the control pipe. --- programs/services/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3f6ee40..baeab19 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -827,7 +827,7 @@ DWORD svcctl_ControlService( if (dwControl == SERVICE_CONTROL_STOP) { service->service_entry->control_mutex = NULL; - service->service_entry->control_pipe = NULL; + service->service_entry->control_pipe = INVALID_HANDLE_VALUE; } service_unlock(service->service_entry);

1 0

Jacek Caban : mshtml: Added DispHTMLSelectElement declaration.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 7584f2793d320dfef441f6dc6b0b3d455a80a4ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7584f2793d320dfef441f6dc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 4 19:20:25 2008 +0200 mshtml: Added DispHTMLSelectElement declaration. --- include/mshtmdid.h | 6 + include/mshtml.idl | 928 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 934 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7584f2793d320dfef441f…

1 0

Jacek Caban : mshtml: Added more script tests.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 19ec36c92b37725f70dbdd63303f7a51b91a238d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ec36c92b37725f70dbdd633… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 4 19:20:40 2008 +0200 mshtml: Added more script tests. --- dlls/mshtml/tests/script.c | 365 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 352 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19ec36c92b37725f70dbd…

1 0

Jacek Caban : mshtml: Added IMG element tests.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 29d8c366bb278a6b73c3669817063087d7cd080d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d8c366bb278a6b73c366981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 4 19:22:46 2008 +0200 mshtml: Added IMG element tests. --- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1039ab5..a3d0701 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -48,6 +48,7 @@ static const char elem_test_str[] = "<table><tbody></tbody></table>" "<script id=\"sc\" type=\"text/javascript\"></script>" "<test />" + "<img /" "</body></html>"; static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; @@ -81,7 +82,8 @@ typedef enum { ET_TBODY, ET_SCRIPT, ET_TEST, - ET_COMMENT + ET_COMMENT, + ET_IMG } elem_type_t; static REFIID const none_iids[] = { @@ -221,6 +223,17 @@ static REFIID const comment_iids[] = { NULL }; +static REFIID const img_iids[] = { + &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, + &IID_IHTMLElement, + &IID_IHTMLElement2, + &IID_IDispatchEx, + &IID_IHTMLImgElement, + &IID_IConnectionPointContainer, + NULL +}; + typedef struct { const char *tag; REFIID *iids; @@ -246,7 +259,8 @@ static const elem_type_info_t elem_type_infos[] = { {"TBODY", elem_iids, NULL}, {"SCRIPT", script_iids, NULL}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, - {"!", comment_iids, &DIID_DispHTMLCommentElement} + {"!", comment_iids, &DIID_DispHTMLCommentElement}, + {"IMG", img_iids, &DIID_DispHTMLImg} }; static const char *dbgstr_w(LPCWSTR str) @@ -1524,6 +1538,7 @@ static void test_elems(IHTMLDocument2 *doc) ET_TBODY, ET_SCRIPT, ET_TEST, + ET_IMG }; static const elem_type_t item_types[] = {

1 0

Dmitry Timoshkov : winecfg: Fix coordinates and sizes of controls in French Graphics dialog.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 681146c9f08a7601fe2e89c9bb4d3e9185c99ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681146c9f08a7601fe2e89c9b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 5 13:13:57 2008 +0900 winecfg: Fix coordinates and sizes of controls in French Graphics dialog. --- programs/winecfg/Fr.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index a83c029..26c0c39 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -60,27 +60,27 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Param�tres des fen�tres ",IDC_STATIC,8,4,244,180 - CONTROL "Permettre aux applications DirectX d'emp�cher la souris de quitter leur fen�tre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Permettre au gestionnaire de &fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + GROUPBOX " Param�tres des fen�tres ",IDC_STATIC,8,4,244,92 + CONTROL "Permettre aux applications DirectX d'emp�cher la souris de quitter leur fen�tre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,20,230,16 + CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + CONTROL "Permettre au gestionnaire de &fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,230,8 CONTROL "�muler un bureau virtuel",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Taille du bureau :",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + BS_AUTOCHECKBOX | WS_TABSTOP,15,64,230,8 + LTEXT "Taille du bureau:",IDC_DESKTOP_SIZE,15,78,54,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,119,78,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,74,76,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,127,76,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Support du Vertex Shader : ",IDC_STATIC,15,110,80,32 - COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Permettre le Pixel Shader (si support� par le mat�riel)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 + GROUPBOX " Direct3D ",IDC_STATIC,8,103,244,49 + LTEXT "Support du Vertex Shader: ",IDC_STATIC,15,118,90,32 + COMBOBOX IDC_D3D_VSHADER_MODE,110,116,135,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Permettre le Pixel Shader (si support� par le mat�riel)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,134,230,10 - GROUPBOX " R�solution de l'�cran ",IDC_STATIC,8,151,244,93 - CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 - EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP - LTEXT "ppp",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + GROUPBOX " R�solution de l'�cran ",IDC_STATIC,8,159,244,93 + CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,169,187,15 + EDITTEXT IDC_RES_DPIEDIT,204,169,23,13,ES_NUMBER|WS_TABSTOP + LTEXT "ppp",IDC_STATIC,233,171,12,8 + LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,189,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Alexandre Julliard : spoolsv: Improve the service stub so that it can be started and stopped.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: ff0099df0d636586075fb69adefc7a18119202cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0099df0d636586075fb69ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 12:57:04 2008 +0200 spoolsv: Improve the service stub so that it can be started and stopped. --- programs/spoolsv/main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 3 deletions(-) diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 365aff0..10a227f 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -24,16 +24,73 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); +static WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + static void WINAPI serv_main(DWORD argc, LPWSTR *argv) { - WINE_FIXME("(%d %p)\n", argc, argv); + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( spoolerW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); } int main(int argc, char **argv) { - static WCHAR wszSPOOLER[] = {'S','P','O','O','L','E','R',0}; static const SERVICE_TABLE_ENTRYW servtbl[] = { - {wszSPOOLER, serv_main}, + {spoolerW, serv_main}, {NULL, NULL} };

1 0

Vitaliy Margolen : mshtml: Don' t overwrite file types that could be changed by user.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: eed3bd38956a8cce2090595e2157d8bc56261680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed3bd38956a8cce2090595e2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 4 00:18:42 2008 -0600 mshtml: Don't overwrite file types that could be changed by user. --- dlls/mshtml/mshtml.inf | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index e0098ce..f288236 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -290,7 +290,7 @@ HKCR,"MIME\Database\Content Type\image/gif","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/gif","Extension",,".gif" HKCR,"MIME\Database\Content Type\image/gif","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" HKCR,"MIME\Database\Content Type\image/gif\Bits","0",1,04,00,00,00,FF,FF,FF,FF,47,49,46,38 -HKCR,".gif",,,"giffile" +HKCR,".gif",,2,"giffile" HKCR,".gif","Content Type",,"image/gif" HKCR,"giffile",,,"GIF Image" HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%" @@ -329,7 +329,7 @@ HKCR,"MIME\Database\Content Type\image/x-icon","Image Filter CLSID",,"%CLSID_IIm HKCR,".ico","Content Type",,"image/x-icon" ;; JPE -HKCR,".jpe",,,"jpegfile" +HKCR,".jpe",,2,"jpegfile" HKCR,".jpe","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" @@ -344,7 +344,7 @@ HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/jpeg","Extension",,".jpg" HKCR,"MIME\Database\Content Type\image/jpeg\Bits","0",1,02,00,00,00,FF,FF,FF,D8 HKCR,"MIME\Database\Content Type\image/jpeg","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" -HKCR,".jpeg",,,"jpegfile" +HKCR,".jpeg",,2,"jpegfile" HKCR,".jpeg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" @@ -355,7 +355,7 @@ HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" ;; JPG -HKCR,".jpg",,,"jpegfile" +HKCR,".jpg",,2,"jpegfile" HKCR,".jpg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" @@ -367,9 +367,9 @@ HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; MHTML HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%" -HKCR,".mhtml",,,"mhtmlfile" +HKCR,".mhtml",,2,"mhtmlfile" HKCR,".mhtml","Content Type",,"message/rfc822" -HKCR,".mht",,,"mhtmlfile" +HKCR,".mht",,2,"mhtmlfile" HKCR,".mht","Content Type",,"message/rfc822" HKCR,"mhtmlfile",,,"MHTML Document" HKCR,"mhtmlfile\BrowseInPlace",,,"" @@ -380,7 +380,7 @@ HKCR,"MIME\Database\Content Type\image/pjpeg","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/pjpeg","Extension",,".jpg" HKCR,"MIME\Database\Content Type\image/pjpeg\Bits","0",1,02,00,00,00,FF,FF,FF,D8 HKCR,"MIME\Database\Content Type\image/pjpeg","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" -HKCR,".jfif",,,"pjpegfile" +HKCR,".jfif",,2,"pjpegfile" HKCR,".jfif","Content Type",,"image/jpeg" HKCR,"pjpegfile",,,"JPEG Image" HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%" @@ -393,7 +393,7 @@ HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; PNG HKCR,"MIME\Database\Content Type\image/png","Extension",,".png" HKCR,"MIME\Database\Content Type\image/x-png","Extension",,".png" -HKCR,".png",,,"pngfile" +HKCR,".png",,2,"pngfile" HKCR,".png","Content Type",,"image/png" HKCR,"pngfile",,,"PNG Image" HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%"

1 0