June 2007 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Switch to Wine Gecko 0.1.0.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: 76de315e736f95bed56c954a5f5829fbfade328d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76de315e736f95bed56c954a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 00:27:07 2007 +0200 mshtml: Switch to Wine Gecko 0.1.0. --- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsiface.idl | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c7acfde..2040e03 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -243,6 +243,7 @@ static BOOL load_wine_gecko(PRUnichar *gre_path) return FALSE; ret = load_wine_gecko_v(gre_path, hkey, GECKO_VERSION, GECKO_VERSION_STRING) + || load_wine_gecko_v(gre_path, hkey, "0.0.1", "Wine Gecko 0.0.1\n") || load_wine_gecko_v(gre_path, hkey, NULL, "Wine Gecko 0.0.1\n"); RegCloseKey(hkey); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 2a22b23..73fc1e2 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,8 +23,8 @@ * useable in C code. */ -cpp_quote("#define GECKO_VERSION \"0.0.1\""); -cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION \"\n\""); +cpp_quote("#define GECKO_VERSION \"0.1.0\""); +cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION"); import "wtypes.idl"; @@ -557,6 +557,10 @@ interface nsIDOMNSHTMLElement : nsISupports nsresult GetScrollWidth(PRInt32 *aScrollWidth); nsresult GetClientHeight(PRInt32 *aClientHeight); nsresult GetClientWidth(PRInt32 *aClientWidth); + nsresult GetTabIndex(PRInt32 *aTabIndex); + nsresult SetTabIndex(PRInt32 aTabIndex); + nsresult blur(); + nsresult focus(); nsresult ScrollIntoView(PRBool top); } @@ -590,7 +594,7 @@ interface nsIDOMText : nsIDOMCharacterData [ object, uuid(a6cf9076-15b3-11d2-932e-00805f8add32) - /* NOT_FROZEN */ + /* FROZEN */ ] interface nsIDOMDocumentFragment : nsIDOMNode {

1 0

Jacek Caban : mshtml: Fix debug trace.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: a43f4e7a42588e7a88d9e77ffa75542c21ffc149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43f4e7a42588e7a88d9e77ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 00:29:29 2007 +0200 mshtml: Fix debug trace. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 75add6f..399eb6e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1985,7 +1985,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * nsIWineURI_GetNSContainer(base_wine_uri, &nscontainer); nsIWineURI_GetWineURL(base_wine_uri, &base_wine_url); }else { - ERR("Could not get nsIWineURI: %08x\n", nsres); + TRACE("Could not get base nsIWineURI: %08x\n", nsres); } }

1 0

appdb/cron cleanup.php
by WineHQ 08 Jun '07

08 Jun '07

ChangeSet ID: 31163 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/07 19:42:06 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Activte the deletion portion of the 'screenshots with missing files' cleanup Patch: http://cvs.winehq.org/patch.py?id=31163 Old revision New revision Changes Path 1.34 1.35 +6 -8 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.34 appdb/cron/cleanup.php:1.35 --- appdb/cron/cleanup.php:1.34 8 Jun 2007 0:42: 6 -0000 +++ appdb/cron/cleanup.php 8 Jun 2007 0:42: 6 -0000 @@ -283,8 +283,7 @@ function removeScreenshotsWithMissingFil // build the email to admins about what we are doing $sMsg = "Found ".count($aMissingScreenshotIds)." screenshots with missing files.\r\n"; - //FIXME: uncomment the below line when we uncomment the below lines in the script - // $sMsg.= "Deleting these screenshots.\r\n"; + $sMsg.= "Deleting these screenshots.\r\n"; $sSubject = "Screenshots deleted\r\n"; @@ -292,12 +291,11 @@ function removeScreenshotsWithMissingFil if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); - //FIXME: activate this after we see the results from the nightly cron script email // remove the screenshots with missing files - // foreach($aMissingScreenshotIds as $iScreenshotId) - // { - // $oScreenshot = new Screenshot($iScreenshotId); - // $oScreenshot->delete(true); // delete the screenshot silently - // } + foreach($aMissingScreenshotIds as $iScreenshotId) + { + $oScreenshot = new Screenshot($iScreenshotId); + $oScreenshot->delete(true); // delete the screenshot silently + } } ?>

1 0

Juan Lang : comdlg32: Check file dialog's FOIShellView before accessing it.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: e14b6dcf7c02b79344476023daa4555e497cfc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14b6dcf7c02b79344476023d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jun 7 12:28:32 2007 -0700 comdlg32: Check file dialog's FOIShellView before accessing it. --- dlls/comdlg32/filedlg.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5409b91..11c4502 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2021,7 +2021,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } else if( nOpenAction == ONOPEN_SEARCH ) { - IShellView_Refresh(fodInfos->Shell.FOIShellView); + if (fodInfos->Shell.FOIShellView) + IShellView_Refresh(fodInfos->Shell.FOIShellView); } COMDLG32_SHFree(pidlCurrent); SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); @@ -2322,8 +2323,11 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) COMDLG32_SHFree(fodInfos->ShellInfos.pidlAbsCurrent); /* clean Shell interfaces */ - IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); - IShellView_Release(fodInfos->Shell.FOIShellView); + if (fodInfos->Shell.FOIShellView) + { + IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); + IShellView_Release(fodInfos->Shell.FOIShellView); + } IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) @@ -2483,7 +2487,8 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) } /* Refresh the actual view to display the included items*/ - IShellView_Refresh(fodInfos->Shell.FOIShellView); + if (fodInfos->Shell.FOIShellView) + IShellView_Refresh(fodInfos->Shell.FOIShellView); } } return FALSE;

1 0

Christian Costa : winealsa.drv: Use correct tests for synthesizer/ port enumeration order.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 11b53529ee23b8b0606ef0fe1390b4dff8cfd3b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b53529ee23b8b0606ef0fe1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Jun 7 21:53:08 2007 +0200 winealsa.drv: Use correct tests for synthesizer/port enumeration order. --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index eecb406..4f6d77b 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1256,7 +1256,7 @@ LONG ALSA_MidiInit(void) while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { int cap = snd_seq_port_info_get_capability(pinfo); int type = snd_seq_port_info_get_type(pinfo); - if (type != SND_SEQ_PORT_TYPE_MIDI_GENERIC) + if (!(type & SND_SEQ_PORT_TYPE_PORT)) ALSA_AddMidiPort(cinfo, pinfo, cap, type); } } @@ -1269,7 +1269,7 @@ LONG ALSA_MidiInit(void) while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { int cap = snd_seq_port_info_get_capability(pinfo); int type = snd_seq_port_info_get_type(pinfo); - if (type == SND_SEQ_PORT_TYPE_MIDI_GENERIC) + if (type & SND_SEQ_PORT_TYPE_PORT) ALSA_AddMidiPort(cinfo, pinfo, cap, type); } }

1 0

Aric Stewart : ole32: Implementation of state bits for IStorage.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: f8c8355d8552634419e8301ac32411281bfc3bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c8355d8552634419e8301ac… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 7 13:17:56 2007 -0500 ole32: Implementation of state bits for IStorage. --- dlls/ole32/storage32.c | 6 ++++-- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 623516e..bda5bdc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -753,6 +753,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( grfStatFlag); pstatstg->grfMode = This->openFlags; + pstatstg->grfStateBits = This->stateBits; res = S_OK; goto end; @@ -2352,8 +2353,9 @@ static HRESULT WINAPI StorageImpl_SetStateBits( DWORD grfStateBits,/* [in] */ DWORD grfMask) /* [in] */ { - FIXME("not implemented!\n"); - return E_NOTIMPL; + StorageImpl* const This = (StorageImpl*)iface; + This->base.stateBits = (This->base.stateBits & ~grfMask) | (grfStateBits & grfMask); + return S_OK; } /* diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index ffad550..6892996 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -245,6 +245,11 @@ struct StorageBaseImpl * flags that this storage was opened or created with */ DWORD openFlags; + + /* + * State bits appear to only be preserved while running. No in the stream + */ + DWORD stateBits; }; /****************************************************************************

1 0

Juan Lang : comdlg32: Initialize file dialog controls before creating dialog.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 13f18ee7593364a2a685fed2bdfa814431906f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f18ee7593364a2a685fed2b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jun 7 12:27:11 2007 -0700 comdlg32: Initialize file dialog controls before creating dialog. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index f63e64f..5409b91 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1037,11 +1037,11 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l so it will be easily accessible through a GetPropA(...) */ SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos); + FILEDLG95_InitControls(hwnd); + fodInfos->DlgInfos.hwndCustomDlg = CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd); - FILEDLG95_InitControls(hwnd); - if (fodInfos->DlgInfos.hwndCustomDlg) { RECT rc;

1 0

H. Verbeet : wined3d: Fix GLSL definitions.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 1d6d831099148f0d42cb876ab5f7c1ce83de91e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6d831099148f0d42cb876ab… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 7 18:57:19 2007 +0200 wined3d: Fix GLSL definitions. --- include/wine/wined3d_gl.h | 58 +++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 25 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index bcaf666..1fbbfe8 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -784,6 +784,9 @@ typedef void (APIENTRY * PGLFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei st #define GL_ARB_shader_objects 1 typedef char GLcharARB; typedef unsigned int GLhandleARB; +#define GL_PROGRAM_OBJECT_ARB 0x8B40 +#define GL_OBJECT_TYPE_ARB 0x8B4E +#define GL_OBJECT_SUBTYPE_ARB 0x8B4F #define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 #define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 #define GL_OBJECT_LINK_STATUS_ARB 0x8B82 @@ -793,6 +796,28 @@ typedef unsigned int GLhandleARB; #define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 #define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 #define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 +#define GL_SHADER_OBJECT_ARB 0x8B48 +#define GL_FLOAT_VEC2_ARB 0x8B50 +#define GL_FLOAT_VEC3_ARB 0x8B51 +#define GL_FLOAT_VEC4_ARB 0x8B52 +#define GL_INT_VEC2_ARB 0x8B53 +#define GL_INT_VEC3_ARB 0x8B54 +#define GL_INT_VEC4_ARB 0x8B55 +#define GL_BOOL_ARB 0x8B56 +#define GL_BOOL_VEC2_ARB 0x8B57 +#define GL_BOOL_VEC3_ARB 0x8B58 +#define GL_BOOL_VEC4_ARB 0x8B59 +#define GL_FLOAT_MAT2_ARB 0x8B5A +#define GL_FLOAT_MAT3_ARB 0x8B5B +#define GL_FLOAT_MAT4_ARB 0x8B5C +#define GL_SAMPLER_1D_ARB 0x8B5D +#define GL_SAMPLER_2D_ARB 0x8B5E +#define GL_SAMPLER_3D_ARB 0x8B5F +#define GL_SAMPLER_CUBE_ARB 0x8B60 +#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 +#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 +#define GL_SAMPLER_2D_RECT_ARB 0x8B63 +#define GL_SAMPELR_2D_RECT_SHADOW_ARB 0x8B64 #endif #ifndef GL_ARB_shading_language_100 #define GL_ARB_shading_language_100 1 @@ -802,34 +827,17 @@ typedef unsigned int GLhandleARB; #define GL_ARB_fragment_shader 1 #define GL_FRAGMENT_SHADER_ARB 0x8B30 #define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B #endif #ifndef GL_ARB_vertex_shader #define GL_ARB_vertex_shader 1 -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 +#define GL_VERTEX_SHADER_ARB 0x8B31 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A +#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D +#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 +#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A #endif typedef void (APIENTRY * WINED3D_PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); typedef void (APIENTRY * WINED3D_PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);

1 0

Ulrich Czekalla : ole32: Remove stack-based string buffer inFileMonikerImpl_DecomposePath.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: c2fdea600ab19822ecd23441838900fc6699c2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2fdea600ab19822ecd234418… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Jun 7 13:43:41 2007 -0400 ole32: Remove stack-based string buffer inFileMonikerImpl_DecomposePath. --- dlls/ole32/filemoniker.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 7578836..4ef7d59 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1011,19 +1011,27 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) { static const WCHAR bSlash[] = {'\\',0}; - WCHAR word[MAX_PATH]; - int i=0,j,tabIndex=0; + LPOLESTR word; + int i=0,j,tabIndex=0, ret=0; LPOLESTR *strgtable ; int len=lstrlenW(str); TRACE("%s, %p\n", debugstr_w(str), *stringTable); - strgtable =CoTaskMemAlloc(len*sizeof(LPOLESTR)); + strgtable = CoTaskMemAlloc(len*sizeof(WCHAR)); if (strgtable==NULL) return E_OUTOFMEMORY; + word = CoTaskMemAlloc((len + 1)*sizeof(WCHAR)); + + if (word==NULL) + { + ret = E_OUTOFMEMORY; + goto lend; + } + while(str[i]!=0){ if(str[i]==bSlash[0]){ @@ -1031,7 +1039,10 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) strgtable[tabIndex]=CoTaskMemAlloc(2*sizeof(WCHAR)); if (strgtable[tabIndex]==NULL) - return E_OUTOFMEMORY; + { + ret = E_OUTOFMEMORY; + goto lend; + } strcpyW(strgtable[tabIndex++],bSlash); @@ -1048,7 +1059,10 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) strgtable[tabIndex]=CoTaskMemAlloc(sizeof(WCHAR)*(j+1)); if (strgtable[tabIndex]==NULL) - return E_OUTOFMEMORY; + { + ret = E_OUTOFMEMORY; + goto lend; + } strcpyW(strgtable[tabIndex++],word); } @@ -1057,7 +1071,21 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) *stringTable=strgtable; - return tabIndex; + ret = tabIndex; + +lend: + if (ret < 0) + { + for (i = 0; i < tabIndex; i++) + CoTaskMemFree(strgtable[i]); + + CoTaskMemFree(strgtable); + } + + if (word) + CoTaskMemFree(word); + + return ret; } /******************************************************************************

1 0

Misha Koshelev : winebrowser: Add DDE support.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 07ad5c4c8a427ab9fa06df21b298ba74d280d762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ad5c4c8a427ab9fa06df21b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 7 10:33:35 2007 -0500 winebrowser: Add DDE support. --- programs/winebrowser/Makefile.in | 4 +- programs/winebrowser/main.c | 152 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 146 insertions(+), 10 deletions(-) diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index cfc6627..f8be2e3 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winebrowser.exe -APPMODE = -mconsole -IMPORTS = shlwapi advapi32 kernel32 +APPMODE = -mwindows +IMPORTS = shlwapi user32 advapi32 kernel32 C_SRCS = \ main.c diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 6e8b8c8..976e465 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -42,6 +42,7 @@ #include <windows.h> #include <shlwapi.h> +#include <ddeml.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -121,6 +122,128 @@ static int open_mailto_url( const char *url ) } /***************************************************************************** + * DDE helper functions. + */ + +static char *ddeExec = NULL; +static HSZ hszTopic = 0; + +/* Dde callback, save the execute string for processing */ +static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, + HSZ hsz1, HSZ hsz2, HDDEDATA hData, + ULONG_PTR dwData1, ULONG_PTR dwData2) +{ + DWORD size = 0; + + WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", + uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); + + switch (uType) + { + case XTYP_CONNECT: + if (!DdeCmpStringHandles(hsz1, hszTopic)) + return (HDDEDATA)TRUE; + return (HDDEDATA)FALSE; + + case XTYP_EXECUTE: + if (!(size = DdeGetData(hData, NULL, 0, 0))) + WINE_ERR("DdeGetData returned zero size of execute string\n"); + else if (!(ddeExec = HeapAlloc(GetProcessHeap(), 0, size))) + WINE_ERR("Out of memory\n"); + else if (DdeGetData(hData, (LPBYTE)ddeExec, size, 0) != size) + WINE_WARN("DdeGetData did not return %d bytes\n", size); + DdeFreeDataHandle(hData); + return (HDDEDATA)DDE_FACK; + + default: + return NULL; + } +} + +static char *get_url_from_dde(void) +{ + static const char szApplication[] = "IExplore"; + static const char szTopic[] = "WWW_OpenURL"; + + HSZ hszApplication = 0; + DWORD ddeInst = 0; + UINT_PTR timer = 0; + int rc; + char *ret = NULL; + + rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | + CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); + if (rc != DMLERR_NO_ERROR) + { + WINE_ERR("Unable to initialize DDE, DdeInitialize returned %d\n", rc); + goto done; + } + + hszApplication = DdeCreateStringHandleA(ddeInst, szApplication, CP_WINANSI); + if (!hszApplication) + { + WINE_ERR("Unable to initialize DDE, DdeCreateStringHandle failed\n"); + goto done; + } + + hszTopic = DdeCreateStringHandleA(ddeInst, szTopic, CP_WINANSI); + if (!hszTopic) + { + WINE_ERR("Unable to initialize DDE, DdeCreateStringHandle failed\n"); + goto done; + } + + if (!DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER)) + { + WINE_ERR("Unable to initialize DDE, DdeNameService failed\n"); + goto done; + } + + timer = SetTimer(NULL, 0, 5000, NULL); + if (!timer) + { + WINE_ERR("SetTimer failed to create timer\n"); + goto done; + } + + while (!ddeExec) + { + MSG msg; + if (!GetMessage(&msg, NULL, 0, 0)) break; + if (msg.message == WM_TIMER) break; + DispatchMessage(&msg); + } + + if (ddeExec) + { + if (*ddeExec == '"') + { + char *endquote = strchr(ddeExec+1, '"'); + if (!endquote) + { + WINE_ERR("Unabled to retrieve URL from string '%s'\n", ddeExec); + goto done; + } + *endquote = 0; + ret = ddeExec+1; + } + else + ret = ddeExec; + } + +done: + if (timer) KillTimer(NULL, timer); + if (ddeInst) + { + if (hszTopic && hszApplication) DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + if (hszTopic) DdeFreeStringHandle(ddeInst, hszTopic); + if (hszApplication) DdeFreeStringHandle(ddeInst, hszApplication); + DdeUninitialize(ddeInst); + } + return ret; +} + +/***************************************************************************** * Main entry point. This is a console application so we have a main() not a * winmain(). */ @@ -128,11 +251,17 @@ int main(int argc, char *argv[]) { char *url = argv[1]; wine_get_unix_file_name_t wine_get_unix_file_name_ptr; + int ret = 1; - if (argc == 1) + /* DDE used only if -nohome is specified; avoids delay in printing usage info + * when no parameters are passed */ + if (url && !strcasecmp( url, "-nohome" )) + url = argc > 2 ? argv[2] : get_url_from_dde(); + + if (!url) { fprintf( stderr, "Usage: winebrowser URL\n" ); - return 1; + goto done; } /* handle an RFC1738 file URL */ @@ -144,7 +273,7 @@ int main(int argc, char *argv[]) if (UrlUnescapeA( url, NULL, &len, URL_UNESCAPE_INPLACE ) != S_OK) { fprintf( stderr, "winebrowser: unescaping URL failed: %s\n", url ); - return 1; + goto done; } /* look for a Windows path after 'file:' */ @@ -157,7 +286,7 @@ int main(int argc, char *argv[]) if (!*p) { fprintf( stderr, "winebrowser: no valid Windows path in: %s\n", url ); - return 1; + goto done; } if (p[1] == '|') p[1] = ':'; @@ -189,13 +318,20 @@ int main(int argc, char *argv[]) struct stat dummy; if (stat( unixpath, &dummy ) >= 0) - return open_http_url( unixpath ); + { + ret = open_http_url( unixpath ); + goto done; + } } } if (!strncasecmp( url, "mailto:", 7 )) - return open_mailto_url( url ); + ret = open_mailto_url( url ); + else + /* let the browser decide how to handle the given url */ + ret = open_http_url( url ); - /* let the browser decide how to handle the given url */ - return open_http_url( url ); +done: + HeapFree(GetProcessHeap(), 0, ddeExec); + return ret; }

1 0