wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Eric Pouech : riched20: Handle the zoom in OLE objects.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 00b48f1d21c59317210235f6ee7ab94c9a51d91c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b48f1d21c59317210235f6e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:01:50 2008 +0100 riched20: Handle the zoom in OLE objects. --- dlls/riched20/richole.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3bc9b8d..2926dd9 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -603,6 +603,11 @@ void ME_GetOLEObjectSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize) break; } IDataObject_Release(ido); + if (editor->nZoomNumerator != 0) + { + pSize->cx = MulDiv(pSize->cx, editor->nZoomNumerator, editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, editor->nZoomNumerator, editor->nZoomDenominator); + } } void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, @@ -645,16 +650,37 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); hMemDC = CreateCompatibleDC(c->hDC); SelectObject(hMemDC, stgm.u.hBitmap); - BitBlt(c->hDC, x, y - dibsect.dsBm.bmHeight, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, hMemDC, 0, 0, SRCCOPY); - DeleteDC(hMemDC); + if (c->editor->nZoomNumerator == 0) + BitBlt(c->hDC, x, y - dibsect.dsBm.bmHeight, + dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, + hMemDC, 0, 0, SRCCOPY); + else + { + int w = MulDiv(dibsect.dsBm.bmWidth, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + int h = MulDiv(dibsect.dsBm.bmHeight, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + StretchBlt(c->hDC, x, y - h, w, h, + hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); + } if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); rc.left = x; - rc.top = y - (emh.rclBounds.bottom - emh.rclBounds.top); - rc.right = x + emh.rclBounds.right - emh.rclBounds.left; rc.bottom = y; + if (c->editor->nZoomNumerator == 0) + { + rc.top = y - (emh.rclBounds.bottom - emh.rclBounds.top); + rc.right = x + (emh.rclBounds.right - emh.rclBounds.left); + } + else + { + rc.top = y - MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + rc.right = x + MulDiv(emh.rclBounds.right - emh.rclBounds.left, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break;

1 0

Eric Pouech : riched20: Start handling OLE objects inside richedit.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 00de77517a8aac32183ff62a8402e2d102595379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00de77517a8aac32183ff62a8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:01:41 2008 +0100 riched20: Start handling OLE objects inside richedit. --- dlls/riched20/caret.c | 14 +++-- dlls/riched20/editor.h | 9 ++- dlls/riched20/editstr.h | 1 + dlls/riched20/list.c | 1 + dlls/riched20/paint.c | 30 +--------- dlls/riched20/richole.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/run.c | 22 ++------ dlls/riched20/undo.c | 6 ++ 8 files changed, 170 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00de77517a8aac32183ff…

1 0

Jeremy Newman : remove dead link and replace it with a alternative
by Jeremy Newman 04 Feb '08

04 Feb '08

Module: website Branch: master Commit: 6aeb4301bbd737ce3d216e294a00c29318ed42e1 URL: http://source.winehq.org/git/website.git/?a=commit;h=6aeb4301bbd737ce3d216e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Feb 4 11:23:18 2008 -0600 remove dead link and replace it with a alternative Author: Tom Wickline <twickline(a)gmail.com> --- templates/en/screenshots.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/screenshots.template b/templates/en/screenshots.template index b290786..e8fd662 100644 --- a/templates/en/screenshots.template +++ b/templates/en/screenshots.template @@ -57,7 +57,7 @@ <p>Links to other Screenshots <ul> <li> Browse the <a href="http://appdb.winehq.org">Wine Application Database</a> - <li> Ian Schmidt's <a href="http://wine.godmonkey.com">Unofficial WINE Screenshots</a> + <li> Wine-Review <a href="http://wine-review.blogspot.com/">Wine Screenshots and Screencast</a> <li> Nathan Lineback's <a href="http://toastytech.com/guis/wine.html">Wine Screen Shots</a> <li> Thomas Elger's <a href="http://www.nek.lu.se/nektel/gif/wine.htm">Wine Screenshots</a> <li> Andreas Mohr's <a href="http://home.nexgo.de/andi.mohr/wineshots/">miscellaneous screenshots</a>

1 0

Jeremy Newman : Add another Wine how-to site
by Jeremy Newman 04 Feb '08

04 Feb '08

Module: appdb Branch: master Commit: 438fbc9ac1b0042bcd0964fe302b72e0af82bbb1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=438fbc9ac1b0042bcd0964fe… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Feb 4 11:26:00 2008 -0600 Add another Wine how-to site Author: Tom Wickline <twickline(a)gmail.com> --- index.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/index.php b/index.php index 2fabed0..4038600 100644 --- a/index.php +++ b/index.php @@ -150,7 +150,9 @@ if(!$_SESSION['current']->isLoggedIn()) <h2>Other Wine Application Compatibility Sites</h2> <p> <a href="http://frankscorner.org"><b>Frank's Corner</b></a>: Frank has a fantastic Wine -application site, with tips and how-to's on getting listed apps to run. +application site, with tips and how-to's on getting listed apps to run.<br /> +<a href="http://wine-review.blogspot.com/"><b>Wine-Review</b></a>: Is a Wine application and game +Blog, with tips and how-to's on getting listed applications and games to run. </p> </div>

1 0

Alexandre Julliard : shell32: Fix permissions of newly-created directories.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: fb6ea6764ccea7e26b2e7b5dc3e97989240709c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6ea6764ccea7e26b2e7b5dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 4 15:25:18 2008 +0100 shell32: Fix permissions of newly-created directories. --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index ab1f78a..5f30cd9 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1761,7 +1761,7 @@ static HRESULT WINAPI UnixFolder_ISFHelper_AddFolder(ISFHelper* iface, HWND hwnd cBaseLen = lstrlenA(szNewDir); WideCharToMultiByte(CP_UNIXCP, 0, pwszName, -1, szNewDir+cBaseLen, FILENAME_MAX-cBaseLen, 0, 0); - if (mkdir(szNewDir, 0755)) { + if (mkdir(szNewDir, 0777)) { char szMessage[256 + FILENAME_MAX]; char szCaption[256];

1 0

Alexandre Julliard : winex11: Remove unneeded check on bitmap depth, screen bpp cannot be 15.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: cef1f21624dc3af3b9719bab0fa40cabc8eec681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef1f21624dc3af3b9719bab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 4 14:37:00 2008 +0100 winex11: Remove unneeded check on bitmap depth, screen bpp cannot be 15. --- dlls/winex11.drv/bitmap.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index fffcab1..0bcb087 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -122,9 +122,7 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit if (bitmap.bmPlanes != 1) return FALSE; /* check if bpp is compatible with screen depth */ - if (!((bitmap.bmBitsPixel == 1) || - (bitmap.bmBitsPixel == screen_bpp) || - (bitmap.bmBitsPixel == 16 && screen_bpp == 15))) /* TODO: Confirm this */ + if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_bpp))) { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel);

1 0

Alexandre Julliard : winex11: Abstract the depth-> bpp conversion and use it in X11DRV_DIB_CreateDIBFromPixmap.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 0d30daa8e4221a40a295c6714777b05959570af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d30daa8e4221a40a295c6714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 4 14:36:18 2008 +0100 winex11: Abstract the depth->bpp conversion and use it in X11DRV_DIB_CreateDIBFromPixmap. --- dlls/winex11.drv/dib.c | 2 +- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 61 +++++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 2f0bbc9..b05d904 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4856,7 +4856,7 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) * Create an HBITMAP with the same dimensions and BPP as the pixmap, * and make it a container for the pixmap passed. */ - hBmp = CreateBitmap( width, height, 1, depth, NULL ); + if (!(hBmp = CreateBitmap( width, height, 1, depth_to_bpp(depth), NULL ))) return 0; /* force bitmap to be owned by a screen DC */ hdcMem = CreateCompatibleDC( hdc ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ffd0469..7af082c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -463,6 +463,8 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color); extern COLORREF X11DRV_PALETTE_ToLogical(int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); +extern unsigned int depth_to_bpp( unsigned int depth ); + /* GDI escapes */ #define X11DRV_ESCAPE 6789 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8d822ef..6f682c2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -278,6 +278,37 @@ void wine_tsx11_unlock(void) /*********************************************************************** + * depth_to_bpp + * + * Convert X11-reported depth to the BPP value that Windows apps expect to see. + */ +unsigned int depth_to_bpp( unsigned int depth ) +{ + switch (depth) + { + case 1: + case 8: + return depth; + case 15: + case 16: + return 16; + case 24: + /* This is not necessarily right. X11 always has 24 bits per pixel, but it can run + * with 24 bit framebuffers and 32 bit framebuffers. It doesn't make any difference + * for windowing, but gl applications can get visuals with alpha channels. So we + * should check the framebuffer and/or opengl formats available to find out what the + * framebuffer actually does + */ + case 32: + return 32; + default: + FIXME( "Unexpected X11 depth %d bpp, what to report to app?\n", depth ); + return depth; + } +} + + +/*********************************************************************** * get_config_key * * Get a config key from either the app-specific or the default config @@ -491,35 +522,7 @@ static BOOL process_attach(void) screen_depth = desktop_vi->depth; XFree(desktop_vi); } - - switch(screen_depth) { - case 8: - screen_bpp = 8; - break; - - case 15: - /* In GetDeviceCaps MSDN description explicitly states that - * in 15 bpp mode 16 is returned. - */ - /* fall through */ - case 16: - screen_bpp = 16; - break; - - case 24: - /* This is not necessarily right. X11 always has 24 bits per pixel, but it can run - * with 24 bit framebuffers and 32 bit framebuffers. It doesn't make any difference - * for windowing, but gl applications can get visuals with alpha channels. So we - * should check the framebuffer and/or opengl formats available to find out what the - * framebuffer actually does - */ - screen_bpp = 32; - break; - - default: - FIXME("Unexpected X11 depth %d bpp, what to report to app?\n", screen_depth); - screen_bpp = screen_depth; - } + screen_bpp = depth_to_bpp( screen_depth ); XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms );

1 0

Andrew Talbot : winex11.drv: Remove unneeded casts.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 68feed7e77d79c62c147f5e026ac559f10d936af URL: http://source.winehq.org/git/wine.git/?a=commit;h=68feed7e77d79c62c147f5e02… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 2 17:27:19 2008 +0000 winex11.drv: Remove unneeded casts. --- dlls/winex11.drv/bitblt.c | 10 +++++----- dlls/winex11.drv/clipboard.c | 14 ++++++-------- dlls/winex11.drv/dib.c | 2 +- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/opengl.c | 36 ++++++++++++++++++------------------ dlls/winex11.drv/wintab.c | 2 +- 6 files changed, 33 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68feed7e77d79c62c147f…

1 0

Andrew Talbot : wineps.drv: Remove unneeded casts.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: f44d2eddcbffc52e258c32e44a490b876f90cbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44d2eddcbffc52e258c32e44… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 2 17:27:14 2008 +0000 wineps.drv: Remove unneeded casts. --- dlls/wineps.drv/driver.c | 4 ++-- dlls/wineps.drv/type1afm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index b4f98fb..42e537a 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -550,8 +550,8 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP LONG *lp = (LONG*)lpszOutput; if(lpszOutput != NULL) { - lp[0] = (LONG)pi->ppd->DefaultResolution; - lp[1] = (LONG)pi->ppd->DefaultResolution; + lp[0] = pi->ppd->DefaultResolution; + lp[1] = pi->ppd->DefaultResolution; } return 1; } diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index dd79eee..dd7e0ce 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -861,7 +861,7 @@ static VOID Unicodify(AFM *afm, OLD_AFMMETRICS *metrics) { if (metrics[i].C >= 0x20 && metrics[i].C <= 0xff) { - metrics[i].UV = ((LONG)(metrics[i].C)) | 0xf000L; + metrics[i].UV = metrics[i].C | 0xf000L; } else {

1 0

Andrew Talbot : winemp3.acm: Remove unneeded casts.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: b2862891808dd1ff6dc8b17b06f26e6d22e67ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2862891808dd1ff6dc8b17b0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 2 17:27:11 2008 +0000 winemp3.acm: Remove unneeded casts. --- dlls/winemp3.acm/interface.c | 6 +++--- dlls/winemp3.acm/layer2.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 2ac120a..336a4f8 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -204,13 +204,13 @@ int decodeMP3(struct mpstr *mp,const unsigned char *in,int isize,unsigned char * getbits(16); switch(mp->fr.lay) { case 1: - do_layer1(&mp->fr,(unsigned char *) out,done); + do_layer1(&mp->fr,out,done); break; case 2: - do_layer2(&mp->fr,(unsigned char *) out,done); + do_layer2(&mp->fr,out,done); break; case 3: - do_layer3(&mp->fr,(unsigned char *) out,done); + do_layer3(&mp->fr,out,done); break; } diff --git a/dlls/winemp3.acm/layer2.c b/dlls/winemp3.acm/layer2.c index d3cd463..535d90c 100644 --- a/dlls/winemp3.acm/layer2.c +++ b/dlls/winemp3.acm/layer2.c @@ -174,7 +174,7 @@ static void II_step_two(unsigned int *bit_alloc, real fraction[2][4][SBLIMIT], { static int *table[] = { 0,0,0,grp_3tab,0,grp_5tab,0,0,0,grp_9tab }; unsigned int idx,*tab,m=scale[x1]; - idx = (unsigned int) getbits(k); + idx = getbits(k); tab = (unsigned int *) (table[d1] + idx + idx + idx); fraction[j][0][i] = muls[*tab++][m]; fraction[j][1][i] = muls[*tab++][m]; @@ -209,7 +209,7 @@ static void II_step_two(unsigned int *bit_alloc, real fraction[2][4][SBLIMIT], static int *table[] = { 0,0,0,grp_3tab,0,grp_5tab,0,0,0,grp_9tab }; unsigned int idx,*tab,m1,m2; m1 = scale[x1]; m2 = scale[x1+3]; - idx = (unsigned int) getbits(k); + idx = getbits(k); tab = (unsigned int *) (table[d1] + idx + idx + idx); fraction[0][0][i] = muls[*tab][m1]; fraction[1][0][i] = muls[*tab++][m2]; fraction[0][1][i] = muls[*tab][m1]; fraction[1][1][i] = muls[*tab++][m2];

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2008