October 2006 - Wine-commits

Michael Stefaniuc : winecfg: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 381fa6588f844be1b40483b2031ad3da0e11d0f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=381fa6588f844be1b40483b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:19:18 2006 +0200 winecfg: Win64 printf format warning fixes. --- programs/winecfg/Makefile.in | 1 - programs/winecfg/appdefaults.c | 6 +++--- programs/winecfg/drive.c | 6 +++--- programs/winecfg/winecfg.c | 12 ++++++------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 2cd4bad..74c18b3 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -6,7 +6,6 @@ MODULE = winecfg.exe APPMODE = -mwindows IMPORTS = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ appdefaults.c \ diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index ad6b7cc..e71055f 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -360,7 +360,7 @@ static void on_winver_change(HWND dialog switch (win_versions[selection].dwPlatformId) { case VER_PLATFORM_WIN32_WINDOWS: - snprintf(Buffer, sizeof(Buffer), "%ld.%ld.%ld", win_versions[selection].dwMajorVersion, + snprintf(Buffer, sizeof(Buffer), "%d.%d.%d", win_versions[selection].dwMajorVersion, win_versions[selection].dwMinorVersion, win_versions[selection].dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", win_versions[selection].szCSDVersion); @@ -374,11 +374,11 @@ static void on_winver_change(HWND dialog break; case VER_PLATFORM_WIN32_NT: - snprintf(Buffer, sizeof(Buffer), "%ld.%ld", win_versions[selection].dwMajorVersion, + snprintf(Buffer, sizeof(Buffer), "%d.%d", win_versions[selection].dwMajorVersion, win_versions[selection].dwMinorVersion); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); - snprintf(Buffer, sizeof(Buffer), "%ld", win_versions[selection].dwBuildNumber); + snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", win_versions[selection].szProductType); set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 0b0cb84..34fee36 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -322,7 +322,7 @@ void load_drives() serial = 0; } - WINE_TRACE("serial: '0x%lX'\n", serial); + WINE_TRACE("serial: '0x%X'\n", serial); /* build rootpath for GetDriveType() */ lstrcpynA(rootpath, devices, sizeof(rootpath)); @@ -343,7 +343,7 @@ void load_drives() c = targetpath; do if (*c == '\\') *c = '/'; while (*c++); - snprintf(serialstr, sizeof(serialstr), "%lX", serial); + snprintf(serialstr, sizeof(serialstr), "%X", serial); WINE_TRACE("serialstr: '%s'\n", serialstr); add_drive(*devices, targetpath, volname, serialstr, get_drive_type(devices[0]) ); @@ -486,7 +486,7 @@ void apply_drive_changes(void) if (drives[i].label && strcmp(drives[i].label, volumeNameBuffer)) set_drive_label( drives[i].letter, drives[i].label ); - snprintf(newSerialNumberText, sizeof(newSerialNumberText), "%lX", serialNumber); + snprintf(newSerialNumberText, sizeof(newSerialNumberText), "%X", serialNumber); if (drives[i].serial && drives[i].serial[0] && strcmp(drives[i].serial, newSerialNumberText)) set_drive_serial( drives[i].letter, drives[i].serial ); diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index d383482..42f03fb 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -119,7 +119,7 @@ static char *get_config_key (HKEY root, } else { - WINE_ERR("RegOpenKey failed on wine config key (res=%ld)\n", res); + WINE_ERR("RegOpenKey failed on wine config key (res=%d)\n", res); } goto end; } @@ -132,7 +132,7 @@ static char *get_config_key (HKEY root, goto end; } else if (res != ERROR_SUCCESS) { - WINE_ERR("Couldn't query value's length (res=%ld)\n", res); + WINE_ERR("Couldn't query value's length (res=%d)\n", res); goto end; } @@ -162,7 +162,7 @@ static int set_config_key(HKEY root, con DWORD res = 1; HKEY key = NULL; - WINE_TRACE("subkey=%s: name=%s, value=%p, type=%ld\n", subkey, name, value, type); + WINE_TRACE("subkey=%s: name=%s, value=%p, type=%d\n", subkey, name, value, type); assert( subkey != NULL ); @@ -184,7 +184,7 @@ static int set_config_key(HKEY root, con res = 0; end: if (key && key != root) RegCloseKey(key); - if (res != 0) WINE_ERR("Unable to set configuration key %s in section %s, res=%ld\n", name, subkey, res); + if (res != 0) WINE_ERR("Unable to set configuration key %s in section %s, res=%d\n", name, subkey, res); return res; } @@ -492,7 +492,7 @@ char **enumerate_values(HKEY root, char } else { - WINE_WARN("failed opening registry key %s, res=0x%lx\n", path, res); + WINE_WARN("failed opening registry key %s, res=0x%x\n", path, res); } WINE_TRACE("adding settings in list but not registry\n"); @@ -629,7 +629,7 @@ int initialize(HINSTANCE hInstance) DWORD res = RegCreateKey(HKEY_CURRENT_USER, WINE_KEY_ROOT, &config_key); if (res != ERROR_SUCCESS) { - WINE_ERR("RegOpenKey failed on wine config key (%ld)\n", res); + WINE_ERR("RegOpenKey failed on wine config key (%d)\n", res); return 1; }

1 0

Michael Stefaniuc : winhelp: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 3dbe7152cdbc285e78e766725d3b814095adc8b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dbe7152cdbc285e78e7667… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:20:26 2006 +0200 winhelp: Win64 printf format warning fixes. --- programs/winhelp/Makefile.in | 1 - programs/winhelp/hlpfile.c | 20 ++++++++-------- programs/winhelp/macro.c | 52 +++++++++++++++++++++--------------------- programs/winhelp/winhelp.c | 6 ++--- 4 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3dbe7152cdbc285e78e…

1 0

Michael Stefaniuc : cmdlgtst: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: c8123e9d49e3c48402827bcee96c3beb9ad62939 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8123e9d49e3c48402827bc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:20:53 2006 +0200 cmdlgtst: Win64 printf format warning fixes. --- programs/cmdlgtst/Makefile.in | 1 - programs/cmdlgtst/cmdlgtst.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index fa084f8..b22d10e 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = cmdlgtst.exe APPMODE = -mwindows IMPORTS = comdlg32 user32 gdi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ cmdlgtst.c diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index e4697ad..09a9aee 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -347,7 +347,7 @@ static void mw_checkError(HWND hWnd, BOO if(errval) { char errbuf[80]; - sprintf(errbuf, "CommDlgExtendedError(): error code %ld (0x%lx)", errval, errval); + sprintf(errbuf, "CommDlgExtendedError(): error code %d (0x%x)", errval, errval); MessageBox(hWnd, errbuf, "Error", MB_ICONEXCLAMATION | MB_OK); } else { @@ -493,7 +493,7 @@ static void mw_PageSetup(HWND hWnd) WINE_TRACE(" dmDriverVersion =%#x\n", dm->dmDriverVersion); WINE_TRACE(" dmSize =%#x\n", dm->dmSize); WINE_TRACE(" dmDriverExtra =%#x\n", dm->dmDriverExtra); - WINE_TRACE(" dmFields =%#lx\n", dm->dmFields); + WINE_TRACE(" dmFields =%#x\n", dm->dmFields); OF("dmOrientation", u1.s1.dmOrientation, DM_ORIENTATION) OF("dmPaperSize", u1.s1.dmPaperSize, DM_PAPERSIZE); OF("dmPaperLength", u1.s1.dmPaperLength, DM_PAPERLENGTH); @@ -503,7 +503,7 @@ static void mw_PageSetup(HWND hWnd) OF("dmDefaultSource", dmDefaultSource,DM_DEFAULTSOURCE); OF("dmPrintQuality", dmPrintQuality, DM_PRINTQUALITY); if(dm->dmFields & DM_POSITION) - WINE_TRACE(" dmPosition(%ld, %ld)\n", dm->u1.dmPosition.x, dm->u1.dmPosition.y); + WINE_TRACE(" dmPosition(%d, %d)\n", dm->u1.dmPosition.x, dm->u1.dmPosition.y); else WINE_TRACE(" dmPosition NOT SET!\n"); OF("dmColor", dmColor, DM_COLOR); @@ -516,7 +516,7 @@ static void mw_PageSetup(HWND hWnd) else WINE_TRACE(" dmFormName NOT SET!\n"); if(dm->dmFields & DM_ICMMETHOD) - WINE_TRACE(" dmICMMethod = %#lx\n", dm->dmICMMethod); + WINE_TRACE(" dmICMMethod = %#x\n", dm->dmICMMethod); else WINE_TRACE(" dmICMMethod NOT SET!"); @@ -526,8 +526,8 @@ static void mw_PageSetup(HWND hWnd) WINE_TRACE("dm == NULL\n"); WINE_TRACE("\nPAGESETUPDLG struct\n"); - WINE_TRACE(" ptPaperSize(%ld, %ld)\n", psd.ptPaperSize.x, psd.ptPaperSize.y); - WINE_TRACE(" rtMargin(%ld, %ld, %ld, %ld)\n", + WINE_TRACE(" ptPaperSize(%d, %d)\n", psd.ptPaperSize.x, psd.ptPaperSize.y); + WINE_TRACE(" rtMargin(%d, %d, %d, %d)\n", psd.rtMargin.left, psd.rtMargin.top, psd.rtMargin.right, psd.rtMargin.bottom); WINE_TRACE("\nDEVNAMES struct\n");

1 0

Michael Stefaniuc : eject: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: fe23cd26df2c0b0f9936ee6aa46fc6e26f2e9ba7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe23cd26df2c0b0f9936ee6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:21:17 2006 +0200 eject: Win64 printf format warning fixes. --- programs/eject/Makefile.in | 1 - programs/eject/eject.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index a0ea47c..d4f1b00 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = eject.exe APPMODE = -mconsole IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = eject.c diff --git a/programs/eject/eject.c b/programs/eject/eject.c index cd5fd42..02ff4ba 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -74,16 +74,16 @@ static BOOL eject_cd( WCHAR drive ) WINE_TRACE( "ejecting %c:\n", (char)drive ); if (!DeviceIoControl( handle, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &result, NULL )) - WINE_WARN( "FSCTL_DISMOUNT_VOLUME failed with err %ld\n", GetLastError() ); + WINE_WARN( "FSCTL_DISMOUNT_VOLUME failed with err %d\n", GetLastError() ); removal.PreventMediaRemoval = FALSE; if (!DeviceIoControl( handle, IOCTL_STORAGE_MEDIA_REMOVAL, &removal, sizeof(removal), NULL, 0, &result, NULL )) - WINE_WARN( "IOCTL_STORAGE_MEDIA_REMOVAL failed with err %ld\n", GetLastError() ); + WINE_WARN( "IOCTL_STORAGE_MEDIA_REMOVAL failed with err %d\n", GetLastError() ); if (!unmount_only) { if (!DeviceIoControl( handle, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, &result, NULL )) - WINE_WARN( "IOCTL_STORAGE_EJECT_MEDIA failed with err %ld\n", GetLastError() ); + WINE_WARN( "IOCTL_STORAGE_EJECT_MEDIA failed with err %d\n", GetLastError() ); } CloseHandle( handle );

1 0

lostwages/news 2006100201.xml
by WineHQ 02 Oct '06

02 Oct '06

ChangeSet ID: 28448 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/10/02 18:43:19 Added files: news : 2006100201.xml Log message: News on Wine 0.9.22 Patch: http://cvs.winehq.org/patch.py?id=28448 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006100201.xml Index: lostwages/news/2006100201.xml diff -u -p /dev/null lostwages/news/2006100201.xml:1.1 --- /dev/null 2 Oct 2006 23:43:19 -0000 +++ lostwages/news/2006100201.xml 2 Oct 2006 23:43:19 -0000 @@ -0,0 +1,27 @@ +<news> + <date>September 28, 2006</date> + <title>Wine 0.9.22 Released</title> + <body> +<p> +Wine 0.9.22 came out last week with these changes: + +<ul> +<li> The usual assortment of MSI improvements.</li> +<li> Several bug fixes to the various common controls.</li> +<li> Pixel shaders enabled by default in D3D.</li> +<li> Various improvements to the build process.</li> +<li> Many translation updates.</li> +</ul></p> + +<p> + Binary packages are in the process of being built and it may take a few days + for them to appear, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.22.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.126">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + + </body> +</news>

1 0

Jacek Caban : shdocvw: Silence common invalid QueryInterface FIXMEs.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 8302f073b6d81ea496e6242715c8c24c83e2d9d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8302f073b6d81ea496e6242… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 21:07:31 2006 +0200 shdocvw: Silence common invalid QueryInterface FIXMEs. --- dlls/shdocvw/tests/webbrowser.c | 16 ++++++++++++++++ dlls/shdocvw/webbrowser.c | 6 ++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index a21d732..0525dd5 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -936,6 +936,21 @@ static void test_Extent(IUnknown *unk) IOleObject_Release(oleobj); } +static void test_QueryInterface(IUnknown *unk) +{ + IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; + IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); + ok(qa == NULL, "qa=%p, ezpected NULL\n", qa); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&runnable); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); + ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable); +} + static void test_WebBrowser(void) { IUnknown *unk = NULL; @@ -948,6 +963,7 @@ static void test_WebBrowser(void) if(FAILED(hres)) return; + test_QueryInterface(unk); test_ClassInfo(unk); test_ClientSite(unk, &ClientSite); test_Extent(unk); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 3740aab..9a61613 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -99,6 +99,12 @@ static HRESULT WINAPI WebBrowser_QueryIn }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = HLINKFRAME(This); + }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { + TRACE("(%p)->(IID_IQuickActivate %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IRunnableObject, riid)) { + TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; } if(*ppv) {

1 0

Jacek Caban : mshtml: Silence common invalid QueryInterface FIXME.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 463d010531fa784653a4877127533a94f0d19f5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=463d010531fa784653a4877… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 21:07:46 2006 +0200 mshtml: Silence common invalid QueryInterface FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 18bd05f..c8d68c4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -116,6 +116,9 @@ static HRESULT WINAPI HTMLDocument_Query }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppvObject); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IRunnableObject, riid)) { + TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppvObject); + return E_NOINTERFACE; } if(*ppvObject) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index c6fb288..19151a0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2535,6 +2535,16 @@ static void test_Navigate(IUnknown *unk) IHlinkTarget_Release(hlink); } +static void test_QueryInterface(IUnknown *unk) +{ + IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&runnable); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); + ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable); +} + static void init_test(enum load_state_t ls) { hwnd = last_hwnd = NULL; set_clientsite = FALSE; @@ -2556,6 +2566,7 @@ static void test_HTMLDocument(enum load_ if(FAILED(hres)) return; + test_QueryInterface(unk); test_ConnectionPointContainer(unk); test_Persist(unk); if(load_state == LD_NO)

1 0

Jacek Caban : mshtml: Added begining implementation of IPersistStreamInit:: Save.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 1a4c366f1112c9d4390929f9c786091b80c9a214 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a4c366f1112c9d4390929f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 20:33:08 2006 +0200 mshtml: Added begining implementation of IPersistStreamInit::Save. --- dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsembed.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 63 +++++++++++++++++++++++++++ dlls/mshtml/persist.c | 50 +++++++++++++++++++++ 4 files changed, 209 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b4ed556..b3ad479 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -318,6 +318,7 @@ void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); nsICommandParams *create_nscommand_params(void); +void nsnode_to_nsstring(nsIDOMNode*,nsAString*); BSCallback *create_bscallback(IMoniker*); HRESULT start_binding(BSCallback*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 265150c..393e1d9 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -41,6 +41,7 @@ #define NS_PROFILE_CONTRACTID "@mozilla. #define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" #define NS_STRINGSTREAM_CONTRACTID "@mozilla.org/io/string-input-stream;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" +#define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define APPSTARTUP_TOPIC "app-startup" @@ -464,6 +465,103 @@ nsICommandParams *create_nscommand_param return ret; } +static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode *nsnode, nsAString *str) +{ + nsIDOMNodeList *node_list = NULL; + PRBool has_children = FALSE; + PRUint16 type; + nsresult nsres; + + nsIDOMNode_HasChildNodes(nsnode, &has_children); + + nsres = nsIDOMNode_GetNodeType(nsnode, &type); + if(NS_FAILED(nsres)) { + ERR("GetType failed: %08lx\n", nsres); + return; + } + + switch(type) { + case ELEMENT_NODE: { + nsIDOMElement *nselem; + nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + nsIContentSerializer_AppendElementStart(serializer, nselem, has_children, str); + nsIDOMElement_Release(nselem); + break; + } + case TEXT_NODE: { + nsIDOMText *nstext; + nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&nstext); + nsIContentSerializer_AppendText(serializer, nstext, 0, -1, str); + nsIDOMText_Release(nstext); + break; + } + case DOCUMENT_NODE: { + nsIDOMDocument *nsdoc; + nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMDocument, (void**)&nsdoc); + nsIContentSerializer_AppendDocumentStart(serializer, nsdoc, str); + nsIDOMDocument_Release(nsdoc); + } + default: + FIXME("Unhandled type %u\n", type); + } + + if(has_children) { + PRUint32 child_cnt, i; + nsIDOMNode *child_node; + + nsIDOMNode_GetChildNodes(nsnode, &node_list); + nsIDOMNodeList_GetLength(node_list, &child_cnt); + + for(i=0; i<child_cnt; i++) { + nsres = nsIDOMNodeList_Item(node_list, i, &child_node); + if(NS_SUCCEEDED(nsres)) { + nsnode_to_nsstring_rec(serializer, child_node, str); + nsIDOMNode_Release(child_node); + }else { + ERR("Item failed: %08lx\n", nsres); + } + } + + nsIDOMNodeList_Release(node_list); + } + + if(type == ELEMENT_NODE) { + nsIDOMElement *nselem; + nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + nsIContentSerializer_AppendElementEnd(serializer, nselem, str); + nsIDOMElement_Release(nselem); + } +} + +void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) +{ + nsIContentSerializer *serializer; + nsIDOMNode *nsnode; + nsresult nsres; + + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, + NS_HTMLSERIALIZER_CONTRACTID, NULL, &IID_nsIContentSerializer, + (void**)&serializer); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIContentSerializer: %08lx\n", nsres); + return; + } + + nsres = nsIContentSerializer_Init(serializer, 0, 100, NULL, FALSE); + if(NS_FAILED(nsres)) + ERR("Init failed: %08lx\n", nsres); + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); + nsnode_to_nsstring_rec(serializer, nsnode, str); + nsIDOMNode_Release(nsnode); + + nsres = nsIContentSerializer_Flush(serializer, str); + if(NS_FAILED(nsres)) + ERR("Flush failed: %08lx\n", nsres); + + nsIContentSerializer_Release(serializer); +} + void close_gecko() { TRACE("()\n"); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 601e54e..0e59bc9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -100,7 +100,6 @@ typedef nsISupports nsIDOMAttr; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMDocumentFragment; -typedef nsISupports nsIDOMText; typedef nsISupports nsIDOMComment; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; @@ -110,6 +109,7 @@ typedef nsISupports nsIDOMHTMLOptionsCol typedef nsISupports nsIDOMHTMLCollection; typedef nsISupports nsIDOMRange; typedef nsISupports nsIEditor; +typedef nsISupports nsIWebProgressListener; [ object, @@ -391,6 +391,21 @@ interface nsIDOMNodeList : nsISupports ] interface nsIDOMNode : nsISupports { + enum NSNODETYPE { + ELEMENT_NODE = 1, + ATTRIBUTE_NODE = 2, + TEXT_NODE = 3, + CDATA_SELECTION_NODE = 4, + ENTITY_REFERENCE_NODE = 5, + ENTITY_NODE = 6, + PROCESSING_INSTRUCTION_NODE = 7, + COMMENT_NODE = 8, + DOCUMENT_NODE = 9, + DOCUMENT_TYPE_NODE = 10, + DOCUMENT_FRAGMENT_NODE = 11, + NOTATION_NODE = 12 + }; + nsresult GetNodeName(nsAString *aNodeName); nsresult GetNodeValue(nsAString *aNodeValue); nsresult SetNodeValue(const nsAString *aNodeValue); @@ -493,6 +508,31 @@ interface nsIDOMNSHTMLElement : nsISuppo [ object, + uuid(a6cf9072-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMCharacterData : nsIDOMNode +{ + nsresult GetData(nsAString *aData); + nsresult SetData(const nsAString *aData); + nsresult GetLength(PRUint32 *aLength); + nsresult SubstringData(PRUint32 offset, PRUint32 count, nsAString *_retval); + nsresult AppendData(const nsAString *arg); + nsresult InsertData(PRUint32 offset, const nsAString *arg); + nsresult DeleteData(PRUint32 offset, PRUint32 count); + nsresult ReplaceData(PRUint32 offset, PRUint32 count, const nsAString *arg); +} + +[ + object, + uuid(a6cf9082-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMText : nsIDOMCharacterData +{ + nsresult SplitText(PRUint32 offset, nsIDOMText **_retval); +} + +[ + object, uuid(a6cf9075-15b3-11d2-932e-00805f8add32) ] interface nsIDOMDocument : nsIDOMNode @@ -1216,6 +1256,27 @@ interface nsICommandManager : nsISupport nsIDOMWindow *aTargetWindow); } +[ + object, + uuid(d650439a-ca29-410d-a906-b0557fb62fcd) +] +interface nsIContentSerializer : nsISupports +{ + nsresult Init(PRUint32 flags, PRUint32 aWrapColumn, const char* aCharSet, PRBool aIsCopying); + nsresult AppendText(nsIDOMText *aText, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); + nsresult AppendCDATASection(nsIDOMCDATASection *aCDATASection, PRInt32 aStartOffset, + PRInt32 aEndOffset, nsAString *aStr); + nsresult AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, + PRInt32 aEndOffset, nsAString *aStr); + nsresult AppendComment(nsIDOMComment *aComment, PRInt32 aStartOffset, PRInt32 aEndOffset, + nsAString *aStr); + nsresult AppendDoctype(nsIDOMDocumentType *aDoctype, nsAString *aStr); + nsresult AppendElementStart(nsIDOMElement *aElement, PRBool aHasChildren, nsAString *aStr); + nsresult AppendElementEnd(nsIDOMElement *aElement, nsAString *aStr); + nsresult Flush(nsAString *aStr); + nsresult AppendDocumentStart(nsIDOMDocument *aDocument, nsAString *aStr); +} + /* * NOTE: * This is a private Wine interface that is implemented by our implementation diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d9eb099..407d7c5 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -464,8 +464,54 @@ static HRESULT WINAPI PersistStreamInit_ BOOL fClearDirty) { HTMLDocument *This = PERSTRINIT_THIS(iface); - FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + nsIDOMNode *nsnode; + nsAString nsstr; + LPCWSTR strw; + char *str; + DWORD len, written=0; + nsresult nsres; + HRESULT hres; + + WARN("(%p)->(%p %x) needs more work\n", This, pStm, fClearDirty); + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08lx\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNode failed: %08lx\n", nsres); + return E_FAIL; + } + + nsAString_Init(&nsstr, NULL); + nsnode_to_nsstring(nsnode, &nsstr); + nsIDOMNode_Release(nsnode); + + nsAString_GetData(&nsstr, &strw, NULL); + + len = WideCharToMultiByte(CP_ACP, 0, strw, -1, NULL, 0, NULL, NULL); + str = mshtml_alloc(len); + WideCharToMultiByte(CP_ACP, 0, strw, -1, str, len, NULL, NULL); + + nsAString_Finish(&nsstr); + + ERR("%s\n", debugstr_a(str)); + + hres = IStream_Write(pStm, str, len, &written); + if(FAILED(hres)) + FIXME("Write failed: %08lx\n", hres); + + mshtml_free(str); + + return S_OK; } static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface,

1 0

Jacek Caban : mshtml: Code cleanup.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: e947b948a117ef4bdfa0e24d4b841495199d54bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e947b948a117ef4bdfa0e24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 20:07:13 2006 +0200 mshtml: Code cleanup. --- dlls/mshtml/nsembed.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index cf5fe20..265150c 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -315,10 +315,9 @@ static BOOL load_gecko(void) } } - NS_StringContainerInit(&path); - NS_StringSetData(&path, gre_path, PR_UINT32_MAX); + nsAString_Init(&path, gre_path); nsres = NS_NewLocalFile(&path, FALSE, &gre_dir); - NS_StringContainerFinish(&path); + nsAString_Finish(&path); if(NS_FAILED(nsres)) { ERR("NS_NewLocalFile failed: %08lx\n", nsres); FreeLibrary(hXPCOM);

1 0

H. Verbeet : wined3d: Report the correct number of available 4-component float vectors for GLSL.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 80afd749337db94f40b2b53aae5d532792658ef5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80afd749337db94f40b2b53… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 2 20:06:32 2006 +0200 wined3d: Report the correct number of available 4-component float vectors for GLSL. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4f76e98..0563918 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -546,6 +546,7 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_ARB_fragment_shader") == 0) { gl_info->supported[ARB_FRAGMENT_SHADER] = TRUE; glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); + gl_max /= 4; TRACE_(d3d_caps)(" FOUND: ARB_fragment_shader (GLSL) support - max float ps constants=%u\n", gl_max); gl_info->ps_glsl_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_imaging") == 0) { @@ -618,6 +619,7 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_ARB_vertex_shader") == 0) { gl_info->supported[ARB_VERTEX_SHADER] = TRUE; glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); + gl_max /= 4; TRACE_(d3d_caps)(" FOUND: ARB_vertex_shader (GLSL) support - max float vs constants=%u\n", gl_max); gl_info->vs_glsl_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_vertex_blend") == 0) {

1 0