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

Maarten Lankhorst : include: Update aviriff header to use the right alignment.
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: a486ec907dda94b4e76ae605bdcda68286cc56cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a486ec907dda94b4e76ae605b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 21 13:31:35 2008 -0700 include: Update aviriff header to use the right alignment. --- include/aviriff.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/aviriff.h b/include/aviriff.h index eb8170d..d2cfa41 100644 --- a/include/aviriff.h +++ b/include/aviriff.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* All definitions here are packed structures of on-disk formats */ +#include <pshpack2.h> + typedef struct _riffchunk { FOURCC fcc; @@ -317,3 +320,5 @@ typedef struct _avifieldindex_chunk { DWORD dwOffsetField2; } aIndex[ANYSIZE_ARRAY]; } AVIFIELDINDEX, * PAVIFIELDINDEX; + +#include <poppack.h>

1 0

Maarten Lankhorst : winmm: Use HeapAlloc in the wave test instead of using strdup.
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 6589d9ab951d132aabfa1d455263585ded6d6a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6589d9ab951d132aabfa1d455… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 22 11:07:27 2008 -0700 winmm: Use HeapAlloc in the wave test instead of using strdup. --- dlls/winmm/tests/wave.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2844be4..6401fd3 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -885,7 +885,8 @@ static void wave_out_test_device(int device) HeapFree(GetProcessHeap(), 0, nameW); } else if (rc==MMSYSERR_NOTSUPPORTED) { - nameA=strdup("not supported"); + nameA=HeapAlloc(GetProcessHeap(), 0, sizeof("not supported")); + strcpy(nameA, "not supported"); } rc=waveOutGetDevCapsA(device,&capsA,sizeof(capsA));

1 0

Maarten Lankhorst : msacm32.drv: Check for message type before comparing handles.
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 63699cf58c617de4f555fd15d45bf1062eef2e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63699cf58c617de4f555fd15d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 22 11:08:48 2008 -0700 msacm32.drv: Check for message type before comparing handles. Fixes a valgrind warning. --- dlls/msacm32.drv/wavemap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 9e58a3d..96f4626 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -88,7 +88,7 @@ static void CALLBACK wodCallback(HWAVEOUT hWave, UINT uMsg, DWORD_PTR dwInstance return; } - if (hWave != wom->u.out.hInnerWave && uMsg != WOM_OPEN) + if (uMsg != WOM_OPEN && hWave != wom->u.out.hInnerWave) ERR("Shouldn't happen (%p %p)\n", hWave, wom->u.out.hInnerWave); switch (uMsg) {

1 0

Alexandre Julliard : gdi32: Perform coordinate transformations using doubles instead of floats to avoid precision loss .
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 93cbb7a5db2af94c926fc012b3925227d3e64bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=93cbb7a5db2af94c926fc012b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 22 17:43:01 2008 +0200 gdi32: Perform coordinate transformations using doubles instead of floats to avoid precision loss. --- dlls/gdi32/bitblt.c | 4 ++-- dlls/gdi32/dc.c | 16 ++++++++-------- dlls/gdi32/enhmetafile.c | 34 +++++++++++++++++----------------- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/mapping.c | 8 ++++---- dlls/gdi32/path.c | 30 +++++++++++++++--------------- dlls/gdi32/region.c | 4 ++-- 9 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93cbb7a5db2af94c926fc…

1 0

Alexandre Julliard : wineinstall: Remove a lot of no longer needed code.
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 70949a6ba5d1f4b05921e6b04ef6454462b4122c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70949a6ba5d1f4b05921e6b04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 22 20:44:18 2008 +0200 wineinstall: Remove a lot of no longer needed code. --- tools/wineinstall | 264 +++++++++++++++------------------------------------- 1 files changed, 76 insertions(+), 188 deletions(-) diff --git a/tools/wineinstall b/tools/wineinstall index 6602477..636be55 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -21,10 +21,6 @@ #--- defaults (change these if you are a packager) CONFARGS="" # configure args, e.g. --prefix=/usr -prefix=/usr/local # installation prefix -bindir=$prefix/bin # where winelib apps will be (or are) installed -libdir=$prefix/lib # where libwine.so will be (or is) installed -BINDIST=no # whether called from a binary package config script # functions @@ -32,27 +28,6 @@ function std_sleep { sleep 1 } -function conf_question { - # parameters: $1 = importance, $2 = question-id, $3+ = message lines - # the first two parameters can be used by e.g. debconf in debian packages - # but here we just print the message - shift 2 - echo - local LINE="$1" - while [ $# -gt 0 ] && shift - do { - echo "$LINE" - LINE="$1" - } - done -} - -function conf_reset_question { - # parameters: $1 = question-id - # this is used to flush any cached answers and "already-displayed" flags - shift # dummy command -} - function conf_yesno_answer { unset ANSWER while [ "$ANSWER" != 'yes' ] && [ "$ANSWER" != 'no' ] @@ -63,24 +38,16 @@ function conf_yesno_answer { done } -function conf_string_answer { - echo -n "$1" - read ANSWER -} - # startup... -echo "WINE Installer v0.75" +echo "Wine Installer v1.0" echo -if [ "$BINDIST" = 'no' ] -then { - - if ! [ -f configure ] - then { +if ! [ -f configure ] +then if [ -f ../configure ] then { - pushd .. + cd .. } else { echo "You're running this from the wrong directory." @@ -88,29 +55,26 @@ then { exit 1 } fi - } - fi +fi - if [ `whoami` = 'root' ] - then { +if [ `whoami` = 'root' ] +then echo "You are running wineinstall as root, this is not advisable. Please rerun as a user." echo "Aborting." exit 1 - } - fi +fi - if [ ! -w . ] - then { +if [ ! -w . ] +then echo "The source directory is not writable. You probably extracted the sources as root." echo "You should remove the source tree and extract it again as a normal user." exit 1 - } - fi +fi - # check whether RPM installed, and if it is, remove any old wine rpm. - hash rpm &>/dev/null - RET=$? - if [ $RET -eq 0 ]; then +# check whether RPM installed, and if it is, remove any old wine rpm. +hash rpm &>/dev/null +RET=$? +if [ $RET -eq 0 ]; then if [ -n "`rpm -qi wine 2>/dev/null|grep "^Name"`" ]; then echo "Warning: Old Wine RPM install detected. Do you want to remove it first?" conf_yesno_answer "(yes/no) " @@ -133,175 +97,99 @@ then { exit 1 fi fi - fi +fi - # check whether wine binary still available - if [ -n "`wine --version 2>/dev/null`" ] - then +# check whether wine binary still available +if [ -n "`wine --version 2>/dev/null`" ] +then echo "Warning !! wine binary (still) found, which may indicate" echo "a (conflicting) previous installation." echo "You might want to abort and uninstall Wine first." echo "(If you previously tried to install from source manually, " echo "run 'make uninstall' from the wine root directory)" std_sleep - fi +fi - # run the configure script, if necessary +# run the configure script, if necessary - if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ] - then { - echo - echo "I see that WINE has already been configured, so I'll skip that." +if [ -f Makefile ] +then + echo "I see that Wine has already been configured, so I'll skip that." std_sleep - # load configure results - . ./config.cache - } - else { +else echo "Running configure..." echo - if ! ./configure -C $CONFARGS --prefix=$prefix + if ! ./configure $CONFARGS then { echo echo "Configure failed, aborting install." - rm -f config.cache - exit 1 - } - fi - # load configure results - . ./config.cache - # make sure X was found - eval "$ac_cv_have_x" - if [ "$have_x" != "yes" ] - then { - echo "Install the X development headers and try again." - rm -f config.cache exit 1 } fi - } - fi - - # now do the compilation and install, we need to always do this because we - # don't want the 'make install' command we might run to run 'make' as root - if [ `whoami` != 'root' ] - then { - # ask the user if they want to build and install wine - echo - echo "We need to install wine as root user, do you want us to build wine," - echo "'su root' and install Wine? Enter 'no' to continue without installing" - conf_yesno_answer "(yes/no) " - ROOTINSTALL="$ANSWER" - - if [ "$ROOTINSTALL" = "yes" ] - then { - # start out with the basic command - sucommand="make install" - - # if the user doesn't have $libdir in their ld.so.conf add this - # to our sucommand string - if [ -f /etc/ld.so.conf ] - then - if ! grep -s "$libdir" /etc/ld.so.conf >/dev/null 2>&1 - then { - echo - echo "$libdir doesn't exist in your /etc/ld.so.conf, it will be added" - echo "when we perform the install..." - sucommand="$sucommand;echo $libdir>>/etc/ld.so.conf" - } - fi - # run ldconfig always just in case some updated files don't get linked - sucommand="$sucommand;$ac_cv_path_LDCONFIG" - fi - } - fi # [ "$ROOTINSTALL" = "yes" ] - - echo - - echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever," - echo "in the meantime..." - echo - std_sleep - - # try to just make wine, if this fails 'make depend' and try to remake - if ! { make; } - then { - if ! { make depend && make; } - then { - echo - echo "Compilation failed, aborting install." - exit 1 - } - fi - } - fi +fi - if [ "$ROOTINSTALL" = "yes" ] - then { - echo +# now do the compilation and install, we need to always do this because we +# don't want the 'make install' command we might run to run 'make' as root - echo "Performing 'make install' as root to install binaries, enter root password" +# ask the user if they want to build and install wine +echo +echo "We need to install wine as root user, do you want us to build wine," +echo "'su root' and install Wine? Enter 'no' to continue without installing" +conf_yesno_answer "(yes/no) " +ROOTINSTALL="$ANSWER" - std_sleep +if [ "$ROOTINSTALL" = "yes" ] +then sucommand="make install" +fi - if ! su root -c "$sucommand" - then { - echo - echo "Incorrect root password. If you are running Ubuntu or a similar distribution," - echo "'make install' needs to be run via the sudo wrapper, so trying that one now" - if ! sudo su root -c "$sucommand" - then { - echo - echo "Either you entered an incorrect password or we failed to" - echo "run '$sucommand' correctly." - echo "If you didn't enter an incorrect password then please" - echo "report this error and any steps to possibly reproduce it to" - echo "http://bugs.winehq.org/" - echo - echo "Installation failed, aborting." - exit 1 - } - fi - } - fi +echo +echo "Compiling Wine. Grab a lunch or two, rent a video, or whatever," +echo "in the meantime..." +echo +std_sleep +# try to just make wine, if this fails 'make depend' and try to remake +if ! { make; } +then + if ! { make depend && make; } + then echo + echo "Compilation failed, aborting install." + exit 1 + fi +fi - # see if wine is installed on the users system, if not prompt them - # and then exit - if [ -z "`wine --version 2>/dev/null`" ] - then - echo "Could not find wine on your system. Run wineinstall as root to install wine" - echo "before re-running wineinstall as a user." - echo - echo "Exiting wineinstall" - exit 1; - fi - - WINEINSTALLED=yes - } - else { - WINEINSTALLED=no - } - fi # [ "$ROOTINSTALL" = "yes" ] - } - fi # [ `whoami` != 'root' ] - -} -fi # BINDIST - -if [ "$WINEINSTALLED" = 'no' ] +if [ "$ROOTINSTALL" = "no" ] then - tools/wineprefixcreate --use-wine-tree . -else - wineprefixcreate + exit 0 fi + echo +echo "Performing 'make install' as root to install binaries, enter root password" +if ! su root -c "$sucommand" +then + echo + echo "Incorrect root password. If you are running Ubuntu or a similar distribution," + echo "'make install' needs to be run via the sudo wrapper, so trying that one now" + if ! sudo su root -c "$sucommand" + then + echo + echo "Either you entered an incorrect password or we failed to" + echo "run '$sucommand' correctly." + echo "If you didn't enter an incorrect password then please" + echo "report this error and any steps to possibly reproduce it to" + echo "http://bugs.winehq.org/" + echo + echo "Installation failed, aborting." + exit 1 + fi +fi # it's a wrap echo -echo "Installation complete for now. Good luck (this is still beta software)." -echo "If you have problems with WINE, please read the documentation first," +echo "Installation complete." +echo "If you have problems with Wine, please read the documentation first," echo "as many kinds of potential problems are explained there." exit 0

1 0

Alexandre Julliard : user32: Return reasonable values in GetWindowPlacement for the desktop window.
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 688febb8ce81ae701c76fe46170982394b8c7d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688febb8ce81ae701c76fe461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 22 17:04:22 2008 +0200 user32: Return reasonable values in GetWindowPlacement for the desktop window. --- dlls/user32/winpos.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 916cac5..621f89a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1172,7 +1172,20 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { WND *pWnd = WIN_GetPtr( hwnd ); - if (!pWnd || pWnd == WND_DESKTOP) return FALSE; + if (!pWnd) return FALSE; + + if (pWnd == WND_DESKTOP) + { + wndpl->length = sizeof(*wndpl); + wndpl->showCmd = SW_SHOWNORMAL; + wndpl->flags = 0; + wndpl->ptMinPosition.x = -1; + wndpl->ptMinPosition.y = -1; + wndpl->ptMaxPosition.x = -1; + wndpl->ptMaxPosition.y = -1; + GetWindowRect( hwnd, &wndpl->rcNormalPosition ); + return TRUE; + } if (pWnd == WND_OTHER_PROCESS) { if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd );

1 0

Alexandre Julliard : winex11: Add support for X11 mouse buttons 8 and 9.
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 62b0e91c38510406c2f01f0a2f527bc096c0a57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b0e91c38510406c2f01f0a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 22 20:45:30 2008 +0200 winex11: Add support for X11 mouse buttons 8 and 9. --- dlls/winex11.drv/mouse.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ab9ea8..354f74c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -57,7 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cursor); #define Button7Mask (1<<14) #endif -#define NB_BUTTONS 7 /* Windows can handle 5 buttons and the wheel too */ +#define NB_BUTTONS 9 /* Windows can handle 5 buttons and the wheel too */ static const UINT button_down_flags[NB_BUTTONS] = { @@ -66,6 +66,8 @@ static const UINT button_down_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_WHEEL, MOUSEEVENTF_WHEEL, + MOUSEEVENTF_XDOWN, /* FIXME: horizontal wheel */ + MOUSEEVENTF_XDOWN, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XDOWN }; @@ -78,6 +80,8 @@ static const UINT button_up_flags[NB_BUTTONS] = 0, 0, MOUSEEVENTF_XUP, + MOUSEEVENTF_XUP, + MOUSEEVENTF_XUP, MOUSEEVENTF_XUP }; @@ -1038,6 +1042,12 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) case 6: wData = XBUTTON2; break; + case 7: + wData = XBUTTON1; + break; + case 8: + wData = XBUTTON2; + break; } update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); @@ -1068,6 +1078,12 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) case 6: wData = XBUTTON2; break; + case 7: + wData = XBUTTON1; + break; + case 8: + wData = XBUTTON2; + break; } update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );

1 0

Alexandre Julliard : gdi32: Use atan2 to compute angles in WidenPath without triggering floating point errors .
by Alexandre Julliard May 23, 2008

May 23, 2008

Module: wine Branch: master Commit: 00388c1b6abbf0b75cab027454e6847c182095e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00388c1b6abbf0b75cab02745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 22 20:43:55 2008 +0200 gdi32: Use atan2 to compute angles in WidenPath without triggering floating point errors. --- dlls/gdi32/path.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 2a87def..1e953cb 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1967,9 +1967,8 @@ static BOOL PATH_WidenPath(DC *dc) /* Beginning or end of the path if not closed */ if((!(pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE)) && (j == 0 || j == pStrokes[i]->numEntriesUsed - 1) ) { /* Compute segment angle */ - double xo, yo, xa, ya; + double xo, yo, xa, ya, theta; POINT pt; - double theta, scalarProduct; FLOAT_POINT corners[2]; if(j == 0) { xo = pStrokes[i]->pPoints[j].x; @@ -1983,11 +1982,7 @@ static BOOL PATH_WidenPath(DC *dc) xo = pStrokes[i]->pPoints[j].x; yo = pStrokes[i]->pPoints[j].y; } - scalarProduct = (xa - xo) /sqrt(pow((xa - xo), 2) + pow((ya - yo), 2)); - theta = acos(scalarProduct); - if( (ya - yo) < 0) { - theta = -theta; - } + theta = atan2( ya - yo, xa - xo ); switch(endcap) { case PS_ENDCAP_SQUARE : pt.x = xo + round(sqrt(2) * penWidthOut * cos(M_PI_4 + theta)); @@ -2023,8 +2018,7 @@ static BOOL PATH_WidenPath(DC *dc) /* Compute angle */ INT previous, next; double xa, ya, xb, yb, xo, yo; - double alpha, theta; - double scalarProduct, oa, ob, miterWidth; + double alpha, theta, miterWidth; DWORD _joint = joint; POINT pt; GdiPath *pInsidePath, *pOutsidePath; @@ -2046,18 +2040,10 @@ static BOOL PATH_WidenPath(DC *dc) ya = pStrokes[i]->pPoints[previous].y; xb = pStrokes[i]->pPoints[next].x; yb = pStrokes[i]->pPoints[next].y; - oa = sqrt(pow((xa - xo), 2) + pow((ya - yo), 2)); - ob = sqrt(pow((xb - xo), 2) + pow((yb - yo), 2)); - scalarProduct = ((xa - xo) * (xb - xo) + (ya - yo) * (yb - yo))/ (oa * ob); - alpha = acos(scalarProduct); - if(( (xa - xo) * (yb - yo) - (ya - yo) * (xb - xo) ) < 0) { - alpha = -alpha; - } - scalarProduct = (xo - xa) / oa; - theta = acos(scalarProduct); - if( (yo - ya) < 0) { - theta = -theta; - } + theta = atan2( yo - ya, xo - xa ); + alpha = atan2( yb - yo, xb - xo ) - theta; + if (alpha > 0) alpha -= M_PI; + else alpha += M_PI; if(_joint == PS_JOIN_MITER && dc->miterLimit < fabs(1 / sin(alpha/2))) { _joint = PS_JOIN_BEVEL; }

1 0

Alexander Nicolaysen Sørnes : Add ability to e-mail all maintainers
by Chris Morgan May 23, 2008

May 23, 2008

Module: appdb Branch: master Commit: c547b5532d3819a8d235a9077324f94ba6d20e2f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c547b5532d3819a8d235a907… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon May 12 21:36:51 2008 +0200 Add ability to e-mail all maintainers --- admin/adminMaintainers.php | 169 ++++++++++++++++++++++---------------------- contact.php | 84 ++++++++++++++++------ include/maintainer.php | 19 +++++ 3 files changed, 165 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=c547b5532d3819a8d235…

1 0

James Hawkins : mlang: Fix all test failures for NT+ platforms.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 03a7ddb73c74e41916ba8da17dc4cd47d102d957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a7ddb73c74e41916ba8da17… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 21 20:29:00 2008 -0500 mlang: Fix all test failures for NT+ platforms. --- dlls/mlang/tests/mlang.c | 62 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index dcb8d7d..e826a01 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -266,6 +266,32 @@ static const char *dump_mime_flags(DWORD flags) } #endif +static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) +{ + CHAR convert[MAX_PATH]; + BYTE dest[MAX_PATH]; + HRESULT hr; + UINT srcsz, destsz; + + static WCHAR strW[] = {'a','b','c',0}; + + srcsz = -1; + destsz = MAX_PATH; + hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, from, strW, + &srcsz, convert, &destsz); + if (hr != S_OK) + return FALSE; + + srcsz = -1; + destsz = MAX_PATH; + hr = IMultiLanguage2_ConvertString(iML2, NULL, from, to, (BYTE *)convert, + &srcsz, dest, &destsz); + if (hr != S_OK) + return FALSE; + + return TRUE; +} + static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) { IEnumCodePage *iEnumCP = NULL; @@ -327,6 +353,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) CPINFOEXA cpinfoex; CHARSETINFO csi; MIMECSETINFO mcsi; + BOOL convertible; + HRESULT check = S_OK; static const WCHAR autoW[] = {'_','a','u','t','o',0}; #ifdef DUMP_CP_INFO @@ -387,12 +415,16 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ret = IMultiLanguage2_IsConvertible(iML2, CP_UNICODE, cpinfo[i].uiCodePage); ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + convertible = check_convertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); + if (!convertible) + check = S_FALSE; + TRACE_2("Call IMultiLanguage2_IsConvertible\n"); ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); - ok(ret == S_OK, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); + ok(ret == check, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); TRACE_2("Call IMultiLanguage2_IsConvertible\n"); ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, cpinfo[i].uiCodePage); - ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + ok(ret == check, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); } else trace("IsValidCodePage failed for cp %u\n", cpinfo[i].uiCodePage); @@ -665,12 +697,26 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(CodePage == 1252, "Incorrect CodePage Returned (%i)\n",CodePage); } +/* copied from libs/wine/string.c */ +WCHAR *strstrW(const WCHAR *str, const WCHAR *sub) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + static void test_rfc1766(IMultiLanguage2 *iML2) { IEnumRfc1766 *pEnumRfc1766; RFC1766INFO info; ULONG n; HRESULT ret; + BSTR rfcstr; ret = IMultiLanguage2_EnumRfc1766(iML2, LANG_NEUTRAL, &pEnumRfc1766); ok(ret == S_OK, "IMultiLanguage2_EnumRfc1766 error %08x\n", ret); @@ -686,7 +732,17 @@ static void test_rfc1766(IMultiLanguage2 *iML2) #endif ok(n == 1, "couldn't fetch 1 RFC1766INFO structure\n"); - ok(IsValidLocale(info.lcid, LCID_SUPPORTED), "invalid lcid %04x\n", info.lcid); + + /* verify the Rfc1766 value */ + ret = IMultiLanguage2_GetRfc1766FromLcid(iML2, info.lcid, &rfcstr); + ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + + /* not an exact 1:1 correspondence between lcid and rfc1766 in the + * mlang database, e.g., nb-no -> 1044 -> no */ + ok(strstrW(info.wszRfc1766, rfcstr) != NULL, + "Expected matching locale names\n"); + + SysFreeString(rfcstr); } IEnumRfc1766_Release(pEnumRfc1766); }

1 0