May 2010 - Wine-Commits - list.winehq.org

Jörg Höhle : winmm: WAVE/MIDI_MAPPER (-1) is a 32 bit UINT, not 16.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: e3869300b9d92592c6786f4ce8889ee34e95951a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3869300b9d92592c6786f4ce… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 9 21:47:52 2010 +0100 winmm: WAVE/MIDI_MAPPER (-1) is a 32 bit UINT, not 16. --- dlls/winmm/lolvldrv.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 193310f..50fc365 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -94,11 +94,11 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, WINE_MM_DRIVER_PART* part; WINE_LLTYPE* llType = &llTypes[mld->type]; - TRACE("(%s %u %u 0x%08lx 0x%08lx 0x%08lx)\n", + TRACE("(%s %d %u 0x%08lx 0x%08lx 0x%08lx)\n", llTypes[mld->type].typestr, mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); - if (mld->uDeviceID == (UINT16)-1) { + if ((UINT16)mld->uDeviceID == (UINT16)-1) { if (llType->nMapper == -1) { WARN("uDev=-1 requested on non-mapped ll type %s\n", llTypes[mld->type].typestr); @@ -116,7 +116,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, assert(part->fnMessage32); - TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n", + TRACE("Calling message(dev=%d msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n", mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); ret = part->fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); TRACE("=> %s\n", WINMM_ErrorToString(ret)); @@ -202,7 +202,6 @@ DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwFlags) WARN("Mapper not supported for type %s\n", llTypes[mld->type].typestr); return MMSYSERR_BADDEVICEID; } - mld->uDeviceID = (UINT16)-1; mld->mmdIndex = llType->lpMlds[-1].mmdIndex; TRACE("Setting mmdIndex to %u\n", mld->mmdIndex); dwRet = MMDRV_Message(mld, wMsg, dwParam1, dwFlags); @@ -403,7 +402,7 @@ static BOOL MMDRV_InitPerType(LPWINE_MM_DRIVER lpDrv, UINT type, UINT wMsg) /* re-build the translation table */ if (lpDrv->bIsMapper) { TRACE("%s:Trans[%d] -> %s\n", llTypes[type].typestr, -1, MMDrvs[llTypes[type].nMapper].drvname); - llTypes[type].lpMlds[-1].uDeviceID = (UINT16)-1; + llTypes[type].lpMlds[-1].uDeviceID = (UINT)-1; llTypes[type].lpMlds[-1].type = type; llTypes[type].lpMlds[-1].mmdIndex = llTypes[type].nMapper; llTypes[type].lpMlds[-1].dwDriverInstance = 0;

1 0

Scott Ritchie : Only support Ubuntu 9.10 and 10.04
by Jeremy Newman May 18, 2010

May 18, 2010

Module: website Branch: master Commit: e9f6e16ddbdad9b0154b512c991505993ec7fe36 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9f6e16ddbdad9b0154b51… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue May 18 09:17:59 2010 -0700 Only support Ubuntu 9.10 and 10.04 Modify downloads page to reflect the newer versions only. >From 73f1ccbaf5f7e39e8bc5477e97a328e2e9c4a2f7 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Tue, 18 May 2010 09:15:49 -0700 Subject: Only support Ubuntu 9.10 and 10.04 To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- templates/en/download.template | 2 +- templates/en/download/deb.template | 75 ++++++++---------------------------- 2 files changed, 17 insertions(+), 60 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index dd50dae..cdabcff 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Lucid (10.04), Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04) + - binary and source .debs for Ubuntu Lucid (10.04) and Karmic (9.10) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 15dc245..b059673 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -1,27 +1,25 @@ - - + + <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine for Ubuntu and Ubuntu derivatives <a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> -Ubuntu and other Debian-based distributions utilize a special tool for -managing packages known as APT. APT is able to automagically install all of -the needed dependencies for a software package, as well as keep the package up -to date, by scanning what are known as APT repositories. Ubuntu has its own -repository of software that includes Wine, however we keep our own repository -of the latest available beta packages here for download. +Ubuntu and Ubuntu derivatives (such as Kubuntu) obtain software from +packages which are stored in repositories. Ubuntu's default +repository includes Wine, however if you want to stay up to date with the +latest Wine beta package you can use WineHQ's by following these instructions. + -<h2>Warning: These are beta packages</h2> +<h2>Warning: These are beta packages for Ubuntu 9.10 or later</h2> The packages here are beta packages. This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an -update may break functionality in Wine. If the latest stable release of Wine -(currently Wine 1.0.1) works for you, then you may not want to use these -beta packages. +update may break functionality in Wine. If the Wine version provided with Ubuntu +works for you, then you may not want to use these beta packages. -<h2>Adding the WineHQ APT Repository:</h2> +<h2>Adding the WineHQ Repository:</h2> Open the Software Sources menu by going to System->Administration->Software Sources. Then select the Third @@ -29,33 +27,9 @@ Party Software tab and click Add. <img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> -Then, copy and paste one of the lines below depending on which -version you are running. +Then, copy and paste the line below. -For Ubuntu Lucid (10.04): ppa:ubuntu-wine/ppa -For Ubuntu Karmic (9.10): -ppa:ubuntu-wine/ppa -For Ubuntu Jaunty (9.04): -deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" -For Ubuntu Intrepid (8.10): -deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" -For Ubuntu Hardy (8.04): -deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" - -<h2>Trusting the WineHQ APT Repository (9.04 and earlier):</h2> - -After adding the repository, you also need to add the key for the repository -to your system's list of trusted keys. Ubuntu 9.10 users may skip this step. - -For Ubuntu 9.04 and earlier, -<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">download -and save Scott Ritchie's key</a> (right click -> save as) to your desktop. -Then open the Authentication tab, click import key file, and -select the key file you just saved (Scott Ritchie.gpg). It is safe to -delete this file after doing this step. - -<img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> <h2>Installing Wine:</h2> @@ -67,10 +41,10 @@ Wine or just <a href="apt://wine">click this link</a>. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 8.04 to -8.10, you will need to come back to this page and add the repository for the new -version above. The built in update manager will not switch the Wine repository -automatically. +If you are upgrading the entire system, such as going from Ubuntu 9.10 to +10.04, you will need to come back to this page and add the repository again. +The built in update manager will not switch the Wine repository automatically. + <h2>Older .deb packages</h2> @@ -86,25 +60,8 @@ the packages are available at line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. You will need to run these in a terminal window. -<h3>For 10.04 (Lucid) and 9.10 (Karmic):</h3> - sudo add-apt-repository ppa:ubuntu-wine/ppa -<h3>For 9.04 and earlier:</h3> -Add the repository's key to your system's list of trusted APT keys by copy -and pasting the following into your terminal: - -wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - - -Next, add the repository to your system's list of APT sources: - -For Ubuntu Jaunty (9.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Intrepid (8.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Hardy (8.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list - Then update APT's package information by running 'sudo apt-get update'. You can now install Wine normally or by typing 'sudo apt-get install wine' into the terminal.

1 0

Dmitry Timoshkov : gdi32: Do not use VDMX for mapping of negative font heights, based on a test case .
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 7d3cb53cf1a5f40094fbc3332524ec98781d3779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3cb53cf1a5f40094fbc3332… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 18 20:53:18 2010 +0900 gdi32: Do not use VDMX for mapping of negative font heights, based on a test case. --- dlls/gdi32/freetype.c | 19 ---------- dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 79 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 129245a..53732c4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3237,25 +3237,6 @@ static LONG load_VDMX(GdiFont *font, LONG height) ppem = 0; TRACE("ppem not found for height %d\n", height); } - } else { - ppem = -height; - if(ppem < startsz || ppem > endsz) - goto end; - - for(i = 0; i < recs; i++) { - USHORT yPelHeight; - yPelHeight = GET_BE_WORD(vTable[i * 3]); - - if(yPelHeight > ppem) - break; /* failed */ - - if(yPelHeight == ppem) { - font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]); - font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]); - TRACE("ppem %d found; yMax=%d yMin=%d\n", ppem, font->yMax, font->yMin); - break; - } - } } end: HeapFree(GetProcessHeap(), 0, vTable); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7982a73..72cf9be 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -30,6 +30,9 @@ #include "wine/test.h" +/* Do not allow more than 1 deviation here */ +#define match_off_by_1(a, b) (abs((a) - (b)) <= 1) + #define near_match(a, b) (abs((a) - (b)) <= 6) #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) @@ -1166,9 +1169,9 @@ static void test_GetKerningPairs(void) otm.otmSize = sizeof(otm); /* just in case for Win9x compatibility */ ok(GetOutlineTextMetricsW(hdc, sizeof(otm), &otm) == sizeof(otm), "GetOutlineTextMetricsW error %d\n", GetLastError()); - ok(kd[i].tmHeight == otm.otmTextMetrics.tmHeight, "expected %d, got %d\n", + ok(match_off_by_1(kd[i].tmHeight, otm.otmTextMetrics.tmHeight), "expected %d, got %d\n", kd[i].tmHeight, otm.otmTextMetrics.tmHeight); - ok(kd[i].tmAscent == otm.otmTextMetrics.tmAscent, "expected %d, got %d\n", + ok(match_off_by_1(kd[i].tmAscent, otm.otmTextMetrics.tmAscent), "expected %d, got %d\n", kd[i].tmAscent, otm.otmTextMetrics.tmAscent); ok(kd[i].tmDescent == otm.otmTextMetrics.tmDescent, "expected %d, got %d\n", kd[i].tmDescent, otm.otmTextMetrics.tmDescent); @@ -1183,13 +1186,13 @@ static void test_GetKerningPairs(void) kd[i].otmLineGap, otm.otmLineGap); ok(near_match(kd[i].otmMacDescent, otm.otmMacDescent), "expected %d, got %d\n", kd[i].otmMacDescent, otm.otmMacDescent); + ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", + kd[i].otmMacAscent, otm.otmMacAscent); todo_wine { ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - ok(kd[i].otmMacAscent == otm.otmMacAscent, "expected %d, got %d\n", - kd[i].otmMacAscent, otm.otmMacAscent); /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); @@ -1254,6 +1257,74 @@ todo_wine { ReleaseDC(0, hdc); } +static void test_height_selection(void) +{ + static const struct font_data + { + const char face_name[LF_FACESIZE]; + int requested_height; + int weight, height, ascent, descent, int_leading, ext_leading, dpi; + } fd[] = + { + {"Tahoma", -12, FW_NORMAL, 14, 12, 2, 2, 0, 96 }, + {"Tahoma", -24, FW_NORMAL, 29, 24, 5, 5, 0, 96 }, + {"Tahoma", -48, FW_NORMAL, 58, 48, 10, 10, 0, 96 }, + {"Tahoma", -96, FW_NORMAL, 116, 96, 20, 20, 0, 96 }, + {"Tahoma", -192, FW_NORMAL, 232, 192, 40, 40, 0, 96 }, + {"Tahoma", 12, FW_NORMAL, 12, 10, 2, 2, 0, 96 }, + {"Tahoma", 24, FW_NORMAL, 24, 20, 4, 4, 0, 96 }, + {"Tahoma", 48, FW_NORMAL, 48, 40, 8, 8, 0, 96 }, + {"Tahoma", 96, FW_NORMAL, 96, 80, 16, 17, 0, 96 }, + {"Tahoma", 192, FW_NORMAL, 192, 159, 33, 33, 0, 96 } + }; + HDC hdc; + LOGFONT lf; + HFONT hfont, old_hfont; + TEXTMETRIC tm; + INT ret, i; + + hdc = CreateCompatibleDC(0); + assert(hdc); + + for (i = 0; i < sizeof(fd)/sizeof(fd[0]); i++) + { + if (!is_truetype_font_installed(fd[i].face_name)) + { + skip("%s is not installed\n", fd[i].face_name); + continue; + } + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = fd[i].requested_height; + lf.lfWeight = fd[i].weight; + strcpy(lf.lfFaceName, fd[i].face_name); + + hfont = CreateFontIndirect(&lf); + assert(hfont); + + old_hfont = SelectObject(hdc, hfont); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %d\n", GetLastError()); + if(fd[i].dpi == tm.tmDigitizedAspectX) + { + trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); + ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmWeight, fd[i].weight); + ok(match_off_by_1(tm.tmHeight, fd[i].height), "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmHeight, fd[i].height); + ok(match_off_by_1(tm.tmAscent, fd[i].ascent), "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmAscent, fd[i].ascent); + ok(match_off_by_1(tm.tmDescent, fd[i].descent), "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmDescent, fd[i].descent); +#if 0 /* FIXME: calculation of tmInternalLeading in Wine doesn't match what Windows does */ + ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmInternalLeading, fd[i].int_leading); +#endif + ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmExternalLeading, fd[i].ext_leading); + } + + SelectObject(hdc, old_hfont); + DeleteObject(hfont); + } + + DeleteDC(hdc); +} + static void test_GetOutlineTextMetrics(void) { OUTLINETEXTMETRIC *otm; @@ -2965,7 +3036,7 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, DEFAULT_QUALITY, VARIABLE_PITCH, fontname); - ok( hf != NULL, "CreateFontA failed\n"); + ok( hf != NULL, "CreateFontA(%s, %d) failed\n", fontname, font_height); of = SelectObject( hdc, hf); ret = GetTextMetricsA( hdc, &tm); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); @@ -2988,7 +3059,7 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) SelectObject(hdc, of); DeleteObject(hf); - if (tm.tmAveCharWidth == ave_width || width / height > 200) + if (match_off_by_1(tm.tmAveCharWidth, ave_width) || width / height > 200) break; } @@ -3039,6 +3110,7 @@ static void test_CreateFontIndirect(void) START_TEST(font) { init(); + test_logfont(); test_bitmap_font(); test_outline_font(); @@ -3054,6 +3126,7 @@ START_TEST(font) test_GetFontUnicodeRanges(); test_nonexistent_font(); test_orientation(); + test_height_selection(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test.

1 0

Dmitry Timoshkov : user32: Paint button focus in the ODA_SELECT case too.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: cc870dc484c5b9f61db35ac15afae0873c2afc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc870dc484c5b9f61db35ac15… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 18 14:29:23 2010 +0900 user32: Paint button focus in the ODA_SELECT case too. --- dlls/user32/button.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 8066e9e..54d54dc 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -833,8 +833,7 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) SetTextColor( hDC, oldTxtColor ); draw_focus: - if ((action == ODA_FOCUS) || - ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) + if (action == ODA_FOCUS || (state & BUTTON_HASFOCUS)) { InflateRect( &rc, -2, -2 ); DrawFocusRect( hDC, &rc ); @@ -963,8 +962,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext); /* ... and focus */ - if ((action == ODA_FOCUS) || - ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) + if (action == ODA_FOCUS || (state & BUTTON_HASFOCUS)) { rtext.left--; rtext.right++; @@ -1072,8 +1070,7 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ) (WPARAM)hDC, (LPARAM)hwnd); FillRect( hDC, &rc, hBrush ); - if ((action == ODA_FOCUS) || - ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) + if (action == ODA_FOCUS || (state & BUTTON_HASFOCUS)) DrawFocusRect( hDC, &rc ); switch (action)

1 0

André Hentschel : wmc: Remove 10 year old unmaintained file.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 7c785581061119e7467baaefb0ccd3ff584c56c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c785581061119e7467baaefb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 18 17:29:28 2010 +0200 wmc: Remove 10 year old unmaintained file. --- tools/wmc/CHANGES | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/tools/wmc/CHANGES b/tools/wmc/CHANGES deleted file mode 100644 index bec49ca..0000000 --- a/tools/wmc/CHANGES +++ /dev/null @@ -1,5 +0,0 @@ ---------------------------------------------------------------------------- -Version 1.0.0 (12-Jun-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Initial release

1 0

Maarten Lankhorst : mciqtz32: Implement MCI_STATUS_LENGTH.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: e331a84fc0daddf2e38de84f0d0b4d5f047f6841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e331a84fc0daddf2e38de84f0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 15:08:31 2010 +0200 mciqtz32: Implement MCI_STATUS_LENGTH. --- dlls/mciqtz32/mciqtz.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 37af196..36a7fcb 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -505,6 +505,7 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) { WINE_MCIQTZ* wma; + HRESULT hr; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -521,14 +522,41 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS } switch (lpParms->dwItem) { - case MCI_STATUS_LENGTH: - FIXME("MCI_STATUS_LENGTH not implemented yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; - case MCI_STATUS_POSITION: - { - HRESULT hr; - REFTIME curpos; + case MCI_STATUS_LENGTH: { + IMediaSeeking *seek; + LONGLONG duration = -1; + GUID format; + switch (wma->time_format) { + case MCI_FORMAT_MILLISECONDS: format = TIME_FORMAT_MEDIA_TIME; break; + case MCI_FORMAT_FRAMES: format = TIME_FORMAT_FRAME; break; + default: ERR("Unhandled format %x\n", wma->time_format); break; + } + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaSeeking, (void**)&seek); + if (FAILED(hr)) { + FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + hr = IMediaSeeking_SetTimeFormat(seek, &format); + if (FAILED(hr)) { + IMediaSeeking_Release(seek); + FIXME("Cannot set time format (hr = %x)\n", hr); + lpParms->dwReturn = 0; + break; + } + hr = IMediaSeeking_GetDuration(seek, &duration); + IMediaSeeking_Release(seek); + if (FAILED(hr) || duration < 0) { + FIXME("Cannot read duration (hr = %x)\n", hr); + lpParms->dwReturn = 0; + } else if (wma->time_format != MCI_FORMAT_MILLISECONDS) + lpParms->dwReturn = duration; + else + lpParms->dwReturn = duration / 10000; + break; + } + case MCI_STATUS_POSITION: { IMediaPosition* pmpos; + REFTIME curpos; hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); if (FAILED(hr)) {

1 0

Andrew Eikum : comctl32/listview: Derive subitem rect from listview origin.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: fe92119f5358f3033c3b1565e67c4ea2a0929f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe92119f5358f3033c3b1565e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 18 10:38:23 2010 -0500 comctl32/listview: Derive subitem rect from listview origin. --- dlls/comctl32/listview.c | 4 +- dlls/comctl32/tests/listview.c | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dcb9207..7395bb3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6986,7 +6986,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR } } - if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; + LISTVIEW_GetOrigin(infoPtr, &Position); if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; @@ -7011,7 +7011,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return FALSE; } - OffsetRect(lprc, Position.x - REPORT_MARGINX, Position.y); + OffsetRect(lprc, Position.x, Position.y); return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ecad7b1..929583d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2090,6 +2090,7 @@ static void test_subitem_rect(void) DWORD r; LVCOLUMN col; RECT rect; + INT arr[3]; /* test LVM_GETSUBITEMRECT for header */ hwnd = create_listview_control(LVS_REPORT); @@ -2181,6 +2182,59 @@ todo_wine DestroyWindow(hwnd); + /* test subitem rects after re-arranging columns */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + memset(&col, 0, sizeof(LVCOLUMN)); + col.mask = LVCF_WIDTH; + + col.cx = 100; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 0, (LPARAM)&col); + expect(0, r); + + col.cx = 200; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 1, (LPARAM)&col); + expect(1, r); + + col.cx = 300; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 2, (LPARAM)&col); + expect(2, r); + + insert_item(hwnd, 0); + + arr[0] = 1; arr[1] = 0; arr[2] = 2; + r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 3, (LPARAM)arr); + expect(TRUE, r); + + rect.left = LVIR_BOUNDS; + rect.top = 0; + rect.right = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + expect(0, rect.left); + expect(600, rect.right); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + expect(0, rect.left); + expect(200, rect.right); + + rect.left = LVIR_BOUNDS; + rect.top = 2; + rect.right = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + expect(300, rect.left); + expect(600, rect.right); + + DestroyWindow(hwnd); + /* try it for non LVS_REPORT style */ hwnd = CreateWindow("SysListView32", "Test", LVS_ICON, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0);

1 0

Sven Baars : setupapi: Fix Dutch translation.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 4ad98744ce8013b204012d866e632428c14cce44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad98744ce8013b204012d866… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 18 16:38:49 2010 +0200 setupapi: Fix Dutch translation. --- dlls/setupapi/Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/Nl.rc b/dlls/setupapi/Nl.rc index 019d6cc..efec8bf 100644 --- a/dlls/setupapi/Nl.rc +++ b/dlls/setupapi/Nl.rc @@ -33,7 +33,7 @@ STRINGTABLE DISCARDABLE COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Bestanden worden gekopi�erd..." +CAPTION "Bestanden worden gekopieerd..." FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -49,9 +49,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bestanden benodigd" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Voer de installatie disk van de fabrikant in, en zorg\ndan dat de correcte schijf is geselecteerd hieronder", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Voer de installatiedisk van de fabrikant in, en zorg\ndan dat de correcte schijf hieronder geselecteerd is", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Kopieer de fabrikant's bestanden van:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopieer bestanden van de fabrikant van:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP

1 0

André Hentschel : progman: Remove redundant license info.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: be5a62852bca280fd342b24dad5e3bae14ef9f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a62852bca280fd342b24da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 18 17:49:14 2010 +0200 progman: Remove redundant license info. --- programs/progman/Cs.rc | 1 - programs/progman/Da.rc | 15 --------------- programs/progman/De.rc | 18 ------------------ programs/progman/En.rc | 15 --------------- programs/progman/Es.rc | 15 --------------- programs/progman/Fr.rc | 16 ---------------- programs/progman/Hu.rc | 1 - programs/progman/It.rc | 15 --------------- programs/progman/Ko.rc | 15 --------------- programs/progman/Lt.rc | 17 ----------------- programs/progman/Nl.rc | 17 ----------------- programs/progman/No.rc | 15 --------------- programs/progman/Pl.rc | 15 --------------- programs/progman/Pt.rc | 16 ---------------- programs/progman/Ru.rc | 1 - programs/progman/Si.rc | 15 --------------- programs/progman/Sv.rc | 15 --------------- programs/progman/Tr.rc | 1 - programs/progman/Zh.rc | 2 -- programs/progman/main.c | 13 ------------- programs/progman/progman.h | 3 --- 21 files changed, 0 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be5a62852bca280fd342b…

1 0

Maarten Lankhorst : mciqtz32: Add command table from mciavi32.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: f65d4c5a4752c42811025e3bac9f2b904e85593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65d4c5a4752c42811025e3ba… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 15:07:34 2010 +0200 mciqtz32: Add command table from mciavi32. --- dlls/mciqtz32/Makefile.in | 4 +- dlls/mciqtz32/mciavi_res.rc | 573 ++++++++++++++++++++++++++++++++++++++++ dlls/mciqtz32/mciqtz.c | 4 + dlls/mciqtz32/mciqtz_private.h | 1 + 4 files changed, 581 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f65d4c5a4752c42811025…

1 0