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

Jacek Caban : mshtml: Added createRange implementation.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 6e8e19569a32b16d1beb7d918b72771c95fe3785 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e8e19569a32b16d1beb7d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 5 22:38:15 2006 +0200 mshtml: Added createRange implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/selection.c | 7 + dlls/mshtml/txtrange.c | 419 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 426 insertions(+), 2 deletions(-) create mode 100644 dlls/mshtml/txtrange.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6e8e19569a32b16d1be…

1 0

Jacek Caban : mshtml: Added get_type implementation.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: ce7c9415102ec0554b64d81f795aff8c674ebeaf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce7c9415102ec0554b64d81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 5 22:38:04 2006 +0200 mshtml: Added get_type implementation. --- dlls/mshtml/selection.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index cce8a71..24ef88e 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -160,8 +160,18 @@ static HRESULT WINAPI HTMLSelectionObjec static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, BSTR *p) { HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 range_cnt = 0; + + static const WCHAR wszNone[] = {'N','o','n','e',0}; + static const WCHAR wszText[] = {'T','e','x','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsselection) + nsISelection_GetRangeCount(This->nsselection, &range_cnt); + + *p = SysAllocString(range_cnt ? wszText : wszNone); /* FIXME: control */ + return S_OK; } #undef HTMLSELOBJ_THIS

1 0

Jacek Caban : mshtml: Added get_selection implementation.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 489b0f50d569cbdf00f2afb8aa864c9dea5cd692 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=489b0f50d569cbdf00f2afb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 5 22:37:39 2006 +0200 mshtml: Added get_selection implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 19 ++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 31 ++++++- dlls/mshtml/selection.c | 192 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+), 4 deletions(-) create mode 100644 dlls/mshtml/selection.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=489b0f50d569cbdf00f…

1 0

Jacek Caban : mshtml: Return S_OK in Exec(IDM_BASELINEFONT3).
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 6e7e6efedded9af80a548cb54f2fb0964269cf6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e7e6efedded9af80a548cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 5 22:37:16 2006 +0200 mshtml: Return S_OK in Exec(IDM_BASELINEFONT3). --- dlls/mshtml/olecmd.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 95d8646..67369cd 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -247,6 +247,12 @@ static HRESULT exec_browsemode(HTMLDocum return S_OK; } +static HRESULT exec_baselinefont3(HTMLDocument *This) +{ + FIXME("(%p)\n", This); + return S_OK; +} + static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); @@ -387,6 +393,8 @@ static HRESULT WINAPI OleCommandTarget_E switch(nCmdID) { case IDM_BROWSEMODE: return exec_browsemode(This); + case IDM_BASELINEFONT3: + return exec_baselinefont3(This); default: FIXME("unsupported nCmdID %ld of CGID_MSHTML group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED;

1 0

Stefan Dösinger : wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 1a82976908a3753baf10bf130b49ce60cb7d139f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a82976908a3753baf10bf1… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jul 5 18:31:38 2006 +0200 wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e3c8682..b86dd7b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -883,7 +883,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp case WINED3DFMT_R8G8B8: { glDrawPixels(This->lockedRect.right - This->lockedRect.left, (This->lockedRect.bottom - This->lockedRect.top)-1, - GL_RGB, GL_UNSIGNED_BYTE, This->resource.allocatedMemory); + GL_BGR, GL_UNSIGNED_BYTE, This->resource.allocatedMemory); vcheckGLcall("glDrawPixels"); } break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6a16729..a729344 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -60,7 +60,7 @@ static const PixelFormatDesc formats[] = {WINED3DFMT_A8P8 ,0x0000ff00 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_P8 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_BYTE }, /* Standard ARGB formats. Keep WINED3DFMT_R8G8B8(=20) at position 20 */ - {WINED3DFMT_R8G8B8 ,0x0 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,3 ,FALSE ,GL_RGB8 ,GL_RGB ,GL_UNSIGNED_BYTE }, + {WINED3DFMT_R8G8B8 ,0x0 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,3 ,FALSE ,GL_RGB8 ,GL_BGR ,GL_UNSIGNED_BYTE }, {WINED3DFMT_A8R8G8B8 ,0xff000000 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,4 ,FALSE ,GL_RGBA8 ,GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_X8R8G8B8 ,0x0 ,0x00ff0000 ,0x0000ff00 ,0x000000ff ,4 ,FALSE ,GL_RGB8 ,GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_R5G6B5 ,0x0 ,0x0000F800 ,0x000007e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5 ,GL_RGB ,GL_UNSIGNED_SHORT_5_6_5 },

1 0

Mike McCormack : msi: Forward MsiUseFeature to MsiUseFeatureEx.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 17518ca910aeddff41126fa14feb840f3ffabbb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17518ca910aeddff41126fa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 5 18:34:13 2006 +0900 msi: Forward MsiUseFeature to MsiUseFeatureEx. --- dlls/msi/msi.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 05d9380..119a4f9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1497,35 +1497,20 @@ end: return ret; } +/*********************************************************************** + * MsiUseFeatureW [MSI.@] + */ INSTALLSTATE WINAPI MsiUseFeatureW( LPCWSTR szProduct, LPCWSTR szFeature ) { - FIXME("%s %s\n", debugstr_w(szProduct), debugstr_w(szFeature)); - - return INSTALLSTATE_LOCAL; + return MsiUseFeatureExW(szProduct, szFeature, 0, 0); } +/*********************************************************************** + * MsiUseFeatureA [MSI.@] + */ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature ) { - INSTALLSTATE ret = INSTALLSTATE_UNKNOWN; - LPWSTR prod = NULL, feat = NULL; - - TRACE("%s %s\n", debugstr_a(szProduct), debugstr_a(szFeature) ); - - prod = strdupAtoW( szProduct ); - if (szProduct && !prod) - goto end; - - feat = strdupAtoW( szFeature ); - if (szFeature && !feat) - goto end; - - ret = MsiUseFeatureW( prod, feat ); - -end: - msi_free( prod ); - msi_free( feat ); - - return ret; + return MsiUseFeatureExA(szProduct, szFeature, 0, 0); } /***********************************************************************

1 0

Dmitry Timoshkov : fonts: Fix a copy/ paste bug preventing correct generation of the
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 8698fe8f3c5fff8d9fcbe7d9232c5ccfc36c19f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8698fe8f3c5fff8d9fcbe7d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 5 14:38:12 2006 +0900 fonts: Fix a copy/paste bug preventing correct generation of the System font for codepages 1256 and 1257. --- fonts/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index ef9ab8c..68ddf1d 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -334,10 +334,10 @@ vgas1255.fon: system-1255-96-16.fnt $(FN $(FNT2FON) system-1255-96-16.fnt $@ vgas1256.fon: system-1256-96-16.fnt $(FNT2FON) - $(FNT2FON) system-1255-96-16.fnt $@ + $(FNT2FON) system-1256-96-16.fnt $@ vgas1257.fon: system-1257-96-16.fnt $(FNT2FON) - $(FNT2FON) system-1255-96-16.fnt $@ + $(FNT2FON) system-1257-96-16.fnt $@ vgas874.fon: system-874-96-16.fnt $(FNT2FON) $(FNT2FON) system-874-96-16.fnt $@

1 0

James Hawkins : wininet: Error out if hInternet is a bad handle.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 545309c97fef6272b86563ca7bd7dbc856681038 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=545309c97fef6272b86563c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 3 14:08:11 2006 -0700 wininet: Error out if hInternet is a bad handle. --- dlls/wininet/internet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 11651e5..332e4f7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1989,6 +1989,11 @@ static BOOL INET_QueryOptionHelper(BOOL TRACE("(%p, 0x%08lx, %p, %p)\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); + if (!lpwhh) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } switch (dwOption) {

1 0

James Hawkins : wininet: Use a blank password if none is provided in FTP_Connect.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 8e96015ebb47c86625f70efac6b702122968636e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e96015ebb47c86625f70ef… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 3 14:09:03 2006 -0700 wininet: Use a blank password if none is provided in FTP_Connect. --- dlls/wininet/ftp.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0970c95..7589a78 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1674,6 +1674,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW { static const WCHAR szDefaultUsername[] = {'a','n','o','n','y','m','o','u','s','\0'}; static const WCHAR szDefaultPassword[] = {'u','s','e','r','@','s','e','r','v','e','r','\0'}; + static const WCHAR szEmpty[] = {'\0'}; struct sockaddr_in socketAddr; INT nsocket = -1; UINT sock_namelen; @@ -1733,7 +1734,11 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW } else { lpwfs->lpszUserName = WININET_strdupW(lpszUserName); - lpwfs->lpszPassword = WININET_strdupW(lpszPassword); + + if (lpszPassword) + lpwfs->lpszPassword = WININET_strdupW(lpszPassword); + else + lpwfs->lpszPassword = WININET_strdupW(szEmpty); } /* Don't send a handle created callback if this handle was created with InternetOpenUrl */

1 0

Detlef Riekenberg : comdlg32: Add initial test.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 955fe0da752668f44927d5f757e3fcae3ff16e96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=955fe0da752668f44927d5f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 3 22:55:53 2006 +0200 comdlg32: Add initial test. --- configure | 3 + configure.ac | 1 dlls/comdlg32/Makefile.in | 2 + dlls/comdlg32/tests/.gitignore | 3 + dlls/comdlg32/tests/Makefile.in | 13 ++++++ dlls/comdlg32/tests/printdlg.c | 84 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + 7 files changed, 108 insertions(+), 1 deletions(-) create mode 100644 dlls/comdlg32/tests/.gitignore create mode 100644 dlls/comdlg32/tests/Makefile.in create mode 100644 dlls/comdlg32/tests/printdlg.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=955fe0da752668f4492…

1 0