September 2010 - Wine-Commits

Henri Verbeet : wined3d: Do not mark invalid blend matrices dirty.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: e998fffc8f19b860102341b50847367f6d98e15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e998fffc8f19b860102341b50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:02 2010 +0200 wined3d: Do not mark invalid blend matrices dirty. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 517e873..5116961 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2431,7 +2431,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, W /* Handled by the state manager */ } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TRANSFORM(d3dts)); + if (d3dts < WINED3DTS_WORLDMATRIX(This->adapter->gl_info.limits.blends)) + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TRANSFORM(d3dts)); + return WINED3D_OK; }

1 0

Jörg Höhle : winmm/tests: Share common function dbg_mcierr.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: c6a655622cb5b5f32bb32fc207ded39b09acda99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a655622cb5b5f32bb32fc20… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 2 06:50:23 2010 +0200 winmm/tests: Share common function dbg_mcierr. --- dlls/winmm/tests/mci.c | 2 +- dlls/winmm/tests/mcicda.c | 71 +-------------------------------------------- 2 files changed, 2 insertions(+), 71 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index d490a04..382ff6a 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -39,7 +39,7 @@ typedef union { MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; -static const char* dbg_mcierr(MCIERROR err) +const char* dbg_mcierr(MCIERROR err) { switch (err) { case 0: return "0=NOERROR"; diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index b6bb0bf..c396a01 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -33,76 +33,7 @@ typedef union { MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; -static const char* dbg_mcierr(MCIERROR err) -{ - switch (err) { - case 0: return "0=NOERROR"; -#define X(label) case label: return #label ; - X(MCIERR_INVALID_DEVICE_ID) - X(MCIERR_UNRECOGNIZED_KEYWORD) - X(MCIERR_UNRECOGNIZED_COMMAND) - X(MCIERR_HARDWARE) - X(MCIERR_INVALID_DEVICE_NAME) - X(MCIERR_OUT_OF_MEMORY) - X(MCIERR_DEVICE_OPEN) - X(MCIERR_CANNOT_LOAD_DRIVER) - X(MCIERR_MISSING_COMMAND_STRING) - X(MCIERR_PARAM_OVERFLOW) - X(MCIERR_MISSING_STRING_ARGUMENT) - X(MCIERR_BAD_INTEGER) - X(MCIERR_PARSER_INTERNAL) - X(MCIERR_DRIVER_INTERNAL) - X(MCIERR_MISSING_PARAMETER) - X(MCIERR_UNSUPPORTED_FUNCTION) - X(MCIERR_FILE_NOT_FOUND) - X(MCIERR_DEVICE_NOT_READY) - X(MCIERR_INTERNAL) - X(MCIERR_DRIVER) - X(MCIERR_CANNOT_USE_ALL) - X(MCIERR_MULTIPLE) - X(MCIERR_EXTENSION_NOT_FOUND) - X(MCIERR_OUTOFRANGE) - X(MCIERR_FLAGS_NOT_COMPATIBLE) - X(MCIERR_FILE_NOT_SAVED) - X(MCIERR_DEVICE_TYPE_REQUIRED) - X(MCIERR_DEVICE_LOCKED) - X(MCIERR_DUPLICATE_ALIAS) - X(MCIERR_BAD_CONSTANT) - X(MCIERR_MUST_USE_SHAREABLE) - X(MCIERR_MISSING_DEVICE_NAME) - X(MCIERR_BAD_TIME_FORMAT) - X(MCIERR_NO_CLOSING_QUOTE) - X(MCIERR_DUPLICATE_FLAGS) - X(MCIERR_INVALID_FILE) - X(MCIERR_NULL_PARAMETER_BLOCK) - X(MCIERR_UNNAMED_RESOURCE) - X(MCIERR_NEW_REQUIRES_ALIAS) - X(MCIERR_NOTIFY_ON_AUTO_OPEN) - X(MCIERR_NO_ELEMENT_ALLOWED) - X(MCIERR_NONAPPLICABLE_FUNCTION) - X(MCIERR_ILLEGAL_FOR_AUTO_OPEN) - X(MCIERR_FILENAME_REQUIRED) - X(MCIERR_EXTRA_CHARACTERS) - X(MCIERR_DEVICE_NOT_INSTALLED) - X(MCIERR_GET_CD) - X(MCIERR_SET_CD) - X(MCIERR_SET_DRIVE) - X(MCIERR_DEVICE_LENGTH) - X(MCIERR_DEVICE_ORD_LENGTH) - X(MCIERR_NO_INTEGER) - X(MCIERR_NO_WINDOW) - X(MCIERR_CREATEWINDOW) - X(MCIERR_FILE_READ) - X(MCIERR_FILE_WRITE) - X(MCIERR_NO_IDENTITY) -#undef X - default: { - static char name[20]; /* Not to be called twice in a parameter list! */ - sprintf(name, "MMSYSERR %u", err); - return name; - } - } -} +extern const char* dbg_mcierr(MCIERROR err); /* from mci.c */ static BOOL spurious_message(LPMSG msg) {

1 0

Henri Verbeet : wined3d: Explicitly document some more consequences of GL locking policy.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: bc2db78c3a659986d2f5e2b8e503ab5267cdf29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2db78c3a659986d2f5e2b8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:00 2010 +0200 wined3d: Explicitly document some more consequences of GL locking policy. The basic rule is that you can't call anything that takes the user32 / gdi32 lock while under the GL (winex11) lock. As a consequence, you can't call anything like context_acquire() or context_destroy() either. --- dlls/wined3d/buffer.c | 3 ++ dlls/wined3d/context.c | 54 +++++----------------------------------- dlls/wined3d/cubetexture.c | 4 +++ dlls/wined3d/device.c | 8 +++++- dlls/wined3d/directx.c | 3 ++ dlls/wined3d/shader.c | 3 ++ dlls/wined3d/surface.c | 3 ++ dlls/wined3d/swapchain.c | 4 ++- dlls/wined3d/swapchain_base.c | 4 ++- dlls/wined3d/texture.c | 4 +++ dlls/wined3d/volume.c | 3 ++ dlls/wined3d/volumetexture.c | 3 ++ dlls/wined3d/wined3d_main.c | 1 + 13 files changed, 47 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc2db78c3a659986d2f5e…

1 0

Alexandre Julliard : user32/tests: Fix a number of test failures on Windows 7.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: cd56299e2f8dee91535c7334bfeebde689877097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd56299e2f8dee91535c7334b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 11:04:33 2010 +0200 user32/tests: Fix a number of test failures on Windows 7. --- dlls/user32/tests/win.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 02d4e7f..eeab8b0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -678,8 +678,12 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR /* Win9x does not fixup cx/xy for WM_WINDOWPOSCHANGING */ if (!(winpos->flags & SWP_NOSIZE) && !is_win9x) { - ok(winpos->cx >= 0 && winpos->cx <= 32767, "bad winpos->cx %d\n", winpos->cx); - ok(winpos->cy >= 0 && winpos->cy <= 32767, "bad winpos->cy %d\n", winpos->cy); + ok((winpos->cx >= 0 && winpos->cx <= 32767) || + winpos->cx == 32768, /* win7 doesn't truncate */ + "bad winpos->cx %d\n", winpos->cx); + ok((winpos->cy >= 0 && winpos->cy <= 32767) || + winpos->cy == 40000, /* win7 doesn't truncate */ + "bad winpos->cy %d\n", winpos->cy); } break; } @@ -693,8 +697,12 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); ok(winpos->y >= -32768 && winpos->y <= 32767, "bad winpos->y %d\n", winpos->y); - ok(winpos->cx >= 0 && winpos->cx <= 32767, "bad winpos->cx %d\n", winpos->cx); - ok(winpos->cy >= 0 && winpos->cy <= 32767, "bad winpos->cy %d\n", winpos->cy); + ok((winpos->cx >= 0 && winpos->cx <= 32767) || + winpos->cx == 32768, /* win7 doesn't truncate */ + "bad winpos->cx %d\n", winpos->cx); + ok((winpos->cy >= 0 && winpos->cy <= 32767) || + winpos->cy == 40000, /* win7 doesn't truncate */ + "bad winpos->cy %d\n", winpos->cy); GetWindowRect(hwnd, &rc1); SetRect(&rc2, winpos->x, winpos->y, winpos->x + winpos->cx, winpos->y + winpos->cy); @@ -4471,6 +4479,8 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM "wrong y size %d/%d\n", cs->cy, expected_cy ); ok( (rect.right - rect.left == expected_rect.right - expected_rect.left && rect.bottom - rect.top == expected_rect.bottom - expected_rect.top) || + (rect.right - rect.left == min( 65535, expected_rect.right - expected_rect.left ) && + rect.bottom - rect.top == min( 65535, expected_rect.bottom - expected_rect.top )) || broken( rect.right - rect.left == broken_rect.right - broken_rect.left && rect.bottom - rect.top == broken_rect.bottom - broken_rect.top) || broken( rect.right - rect.left == (short)broken_rect.right - (short)broken_rect.left && @@ -4772,8 +4782,10 @@ static void test_CreateWindow(void) hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 300000, 300000, 200000, 200000, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); - ok( rc.right == 200000 || broken(rc.right == (short)200000), "invalid rect right %u\n", rc.right ); - ok( rc.bottom == 200000 || broken(rc.bottom == (short)200000), "invalid rect bottom %u\n", rc.bottom ); + ok( rc.right == 200000 || rc.right == 65535 || broken(rc.right == (short)200000), + "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 200000 || rc.bottom == 65535 || broken(rc.bottom == (short)200000), + "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); expected_cx = expected_cy = -10; @@ -4809,7 +4821,8 @@ static void test_CreateWindow(void) ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); ok( rc.right == 100, "invalid rect right %u\n", rc.right ); - ok( rc.bottom == 0x7fffffff - 10 || broken(rc.bottom == 0), "invalid rect bottom %u\n", rc.bottom ); + ok( rc.bottom == 0x7fffffff - 10 || rc.bottom ==65535 || broken(rc.bottom == 0), + "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); expected_cx = 0x7fffffff; @@ -4819,8 +4832,10 @@ static void test_CreateWindow(void) hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 20, 10, 0x7fffffff, 0x7fffffff, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); - ok( rc.right == 0x7fffffff - 20 || broken(rc.right == 0), "invalid rect right %u\n", rc.right ); - ok( rc.bottom == 0x7fffffff - 10 || broken(rc.bottom == 0), "invalid rect bottom %u\n", rc.bottom ); + ok( rc.right == 0x7fffffff - 20 || rc.right == 65535 || broken(rc.right == 0), + "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 0x7fffffff - 10 || rc.right == 65535 || broken(rc.bottom == 0), + "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); /* top level window */ @@ -4850,6 +4865,10 @@ static void test_CreateWindow(void) ok( hwnd != 0, "creation failed err %u\n", GetLastError()); expect_ex_style( hwnd, WS_EX_LAYOUTRTL ); DestroyWindow( hwnd ); + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 20, 20, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + expect_ex_style( hwnd, 0 ); + DestroyWindow( hwnd ); SetWindowLongW( parent, GWL_EXSTYLE, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL | WS_EX_NOINHERITLAYOUT ); hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 20, 20, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError());

1 0

Frédéric Delanoy : Add French translation of Debian package download page
by Jeremy Newman Sept. 3, 2010

Sept. 3, 2010

Module: website Branch: master Commit: 5abc9de4842fa74ef7bfbc1bd0426020d19d25ed URL: http://source.winehq.org/git/website.git/?a=commit;h=5abc9de4842fa74ef7bfbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 3 15:33:09 2010 +0200 Add French translation of Debian package download page --- templates/fr/download/deblenny.template | 73 +++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/templates/fr/download/deblenny.template b/templates/fr/download/deblenny.template new file mode 100644 index 0000000..b291636 --- /dev/null +++ b/templates/fr/download/deblenny.template @@ -0,0 +1,73 @@ + + + +<h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> +Wine pour Debian Lenny, Squeeze et Sid +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> + +<p>Les distributions basées sur Debian utilisent un outil spécial de gestion des +paquets appelé APT, qui est capable d'installer automagiquement toutes les +dépendances requises pour un paquet logiciel donné, ainsi que de garder le +paquet à jour, en inventoriant ce que l'on connaît sous le nom de « dépôts +APT ».<br>Elles proposent leurs propres dépôts de logiciels qui incluent +Wine, mais nous gérons néanmoins notre propre dépôt offrant les paquets bêta +les plus récents en téléchargement.</p> + +<p><b>Avertissement : ce sont des paquets bêta</b><br> +<i>Cela signifie qu'ils peuvent à l'occasion souffrir de +<a href="http://wiki.winehq.org/Regression">régressions</a>. Par conséquent, une +mise à jour peut casser une fonctionnalité dans Wine. Si la dernière version +stable de Wine (actuellement 1.2) fonctionne dans votre cas, vous ne devriez pas +utiliser ces paquets bêta.</i></p> + +<p>Ce dépôt contient des paquets pour les architectures i386 et amd64.</p> + +<p>Pour installer Wine, il y a deux méthodes : ajouter le dépôt ou +télécharger un paquet .deb et l'installer manuellement, mais vous devrez au +préalable supprimer toute ancienne version de Wine. Si vous utilisez la première +méthode, Wine sera mis à jour automatiquement par apt ; sinon, vous devrez +télécharger et installer manuellement chaque nouvelle version de Wine.</p> + +<h2>Supprimer une ancienne version</h2> +<div style="position:relative;left:20px">Ouvrir un terminal</div> +<div style="position:relative;left:20px"><i>su</i> <font color="gray"># +se connecter comme root</font></div> +<div style="position:relative;left:20px"><i>apt-get remove libwine wine</i> +<font color="gray"># supprimer une ancienne version de Wine</font></div><p></p> +<h2>Méthode 1 : ajouter le dépôt</h2> +<div style="position:relative;left:20px">Ouvrir un terminal</div> +<div style="position:relative;left:20px"><i>su</i> <font color="gray"># se +connecter comme root</font></div> +<div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> +<font color="gray"># ouvrir le fichier de dépôts avec un éditeur de texte +(gedit ou autre)</font></div> +<div style="position:relative;left:20px">Ajouter cette ligne pour Lenny : <i>deb http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Ajouter cette ligne pour Squeeze : <i>deb http://www.lamaresh.net/apt squeeze main</i></div> +<div style="position:relative;left:20px">Ajouter cette ligne pour Sid : <i>deb http://www.lamaresh.net/apt sid main</i></div> +<div style="position:relative;left:20px">Enregistrer et fermer sources.list</div> +<div style="position:relative;left:20px"><i>wget -O - +http://www.lamaresh.net/apt/key.gpg | apt-key add - </i> <font color="gray"># +ajouter la clé GPG</font></div> +<div style="position:relative;left:20px"><i>apt-get update</i> <font +color="gray"># mettre à jour la liste des paquets</font></div> +<div style="position:relative;left:20px"><i>apt-get install wine</i> <font +color="gray"># installer la version la plus récente de Wine</font></div><p></p> +<h2>Méthode 2 : télécharger un paquet .deb et l'installer manuellement</h2> +<div style="position:relative;left:20px">Choisir un paquet .deb dans la <a +href="http://www.lamaresh.net/binary.php" target="_blank">liste de paquets binaires</a> +et le sauver dans votre dossier personnel</div> +<div style="position:relative;left:20px">Ouvrir un terminal</div> +<div style="position:relative;left:20px"><i>cd ~</i> <font color="gray"># +se déplacer dans votre dossier personnel</font></div> +<div style="position:relative;left:20px"><i>su</i> <font color="gray"># se +connecter comme root</font></div> +<div style="position:relative;left:20px"><i>dpkg -i wine_xxx.deb</i> <font +color="gray"># installer Wine (où xxx correspond à la version du paquet choisi)</font></div> + +<br><br><p style="font-size:12px;text-align:left;font-style:normal;"> +Page web : <a href="http://www.lamaresh.net" target="_blank">http://www.lamaresh.net/</a><br> +Maintenanceur du dépôt : <a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br> +Constructeur de paquets : <a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a> +</p> + +

1 0

Vincent Cadet : link to previous version from release notes page
by Jeremy Newman Sept. 2, 2010

Sept. 2, 2010

Module: website Branch: master Commit: ee7fbd9a71d389558a5b4b3ffd6bae1b3621a38c URL: http://source.winehq.org/git/website.git/?a=commit;h=ee7fbd9a71d389558a5b4b… Author: Vincent Cadet <v_cadet(a)yahoo.fr> Date: Thu Sep 2 15:49:00 2010 -0500 link to previous version from release notes page --- include/plugins/announce.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 693db8d..8f6df00 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -4,6 +4,7 @@ WineHQ Website Announce plugin (grabs latest announce from git) by Jeremy Newman <jnewman(a)codeweavers.com> + Vince C. <v_cadet(a)yahoo.fr> (back-reference in 'changes' section) */ // import global objects @@ -26,7 +27,12 @@ if ($arr = file($announce)) if (ereg("^--------------------", $arr[$c])) $in_header = 0; else if (ereg("^Bugs fixed", $arr[$c])) $in_bugs = 1; - else if (ereg("^Changes since", $arr[$c])) $in_bugs = 0; + else if (ereg("^Changes since", $arr[$c])) + { + // Link to previous versions in changes + $in_bugs = 0; + $arr[$c] = ereg_replace( '[[:digit:].]+', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); + } if ($in_header) {

1 0

Frédéric Delanoy : Fix French Ubuntu software sources screenshot (again)
by Jeremy Newman Sept. 2, 2010

Sept. 2, 2010

Module: website Branch: master Commit: 6e50dd0f685914e9d4072079cd51486c0a438d0d URL: http://source.winehq.org/git/website.git/?a=commit;h=6e50dd0f685914e9d40720… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 27 22:07:54 2010 +0200 Fix French Ubuntu software sources screenshot (again) Just remarked that title bar showed background terminal due to transparency... ugly --- images/distro/fr_ubuntu-ppa.png | Bin 52043 -> 44730 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/distro/fr_ubuntu-ppa.png b/images/distro/fr_ubuntu-ppa.png index ed47780..8aed5e5 100644 Binary files a/images/distro/fr_ubuntu-ppa.png and b/images/distro/fr_ubuntu-ppa.png differ

1 0

Jörg Höhle : winmm: Always unload the MCI driver when Open fails.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: ec7aef83782546a69fc5d2ca24404fb4221c6b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7aef83782546a69fc5d2ca2… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Aug 30 19:43:26 2010 +0200 winmm: Always unload the MCI driver when Open fails. --- dlls/winmm/mci.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 44a65a0..7a3cd8f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1317,10 +1317,8 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if (dwRet == MCIERR_DEVICE_NOT_INSTALLED) dwRet = MCIERR_INVALID_DEVICE_NAME; HeapFree(GetProcessHeap(), 0, devType); - if (dwRet) { - MCI_UnLoadMciDriver(wmd); + if (dwRet) goto errCleanUp; - } } else if (!strcmpW(verb, wszSysinfo)) { /* System commands are not subject to auto-open. */ /* It's too early to handle Sysinfo here because the @@ -1411,14 +1409,21 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, data[0] = (DWORD_PTR)hwndCallback; } + if (wMsg == MCI_OPEN && strcmpW(verb, wszOpen)) { + ERR("Cannot open with command %s\n", debugstr_w(verb)); + dwRet = MCIERR_INTERNAL; + wMsg = 0; + goto errCleanUp; + } + TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(wMsg), dwFlags, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9]); - if (strcmpW(verb, wszOpen) == 0) { + if (wMsg == MCI_OPEN) { if ((dwRet = MCI_FinishOpen(wmd, (LPMCI_OPEN_PARMSW)data, dwFlags))) - MCI_UnLoadMciDriver(wmd); + goto errCleanUp; /* FIXME: notification is not properly shared across two opens */ } else { dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)data); @@ -1435,6 +1440,8 @@ errCleanUp: else FIXME("leaking auto-open device %u\n", auto_open); } + if (wMsg == MCI_OPEN && LOWORD(dwRet) && wmd) + MCI_UnLoadMciDriver(wmd); HeapFree(GetProcessHeap(), 0, verb); return dwRet; }

1 0

Jörg Höhle : winmm/tests: Add a few Open/ Close MCI tests.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: 0cf326ce55a4e92773d4534555806a9844d190cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf326ce55a4e92773d453455… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jul 6 18:09:27 2010 +0200 winmm/tests: Add a few Open/Close MCI tests. --- dlls/winmm/tests/mci.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 19082e8..236a722 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -259,6 +259,12 @@ static void test_openCloseWAVE(HWND hwnd) ok(err==MCIERR_PARAM_OVERFLOW || broken(!err /* Win9x */),"mciCommand MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); + err = mciSendString("sysinfo mysound quantity open", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity returned %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo nosuchalias quantity open", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open returned %s\n", dbg_mcierr(err)); + err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); @@ -282,6 +288,21 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"close y returned %s\n", dbg_mcierr(err)); } + err = mciSendString("open ! alias no", buf, sizeof(buf), NULL); + ok(err==MCIERR_INVALID_DEVICE_NAME,"open !(void): %s\n", dbg_mcierr(err)); + + err = mciSendString("open !no-such-file-exists.wav alias no", buf, sizeof(buf), NULL); + ok(err==MCIERR_FILE_NOT_FOUND || /* Win9X */err==MCIERR_INVALID_DEVICE_NAME,"open !name: %s\n", dbg_mcierr(err)); + + /* FILE_NOT_FOUND stems from mciwave, + * the complete name including ! is passed through since NT */ + err = mciSendString("open nosuchdevice!tempfile.wav alias no", buf, sizeof(buf), NULL); + ok(err==MCIERR_FILE_NOT_FOUND || /* Win9X */err==MCIERR_INVALID_DEVICE_NAME,"open nosuchdevice!name: %s\n", dbg_mcierr(err)); + /* FIXME? use broken(INVALID_DEVICE_NAME) and have Wine not mimic Win9X? */ + + err = mciSendString("close waveaudio", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_INVALID_DEVICE_NAME,"open nosuchdevice!name: %s\n", dbg_mcierr(err)); + err = mciSendString(command_close_all, NULL, 0, NULL); ok(!err,"mci %s (without buffer) returned %s\n", command_close_all, dbg_mcierr(err)); @@ -317,6 +338,9 @@ static void test_openCloseWAVE(HWND hwnd) ok(0xDEADF00D==intbuf[0] && 0xABADCAFE==intbuf[2],"DWORD buffer corruption\n"); + err = mciGetDeviceID("waveaudio"); + ok(err==1,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0); /* from MSDN */ ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0) returned %s\n", dbg_mcierr(err));

1 0

Jörg Höhle : winmm/tests: MCI_STATUS returns DWORD_PTR, unlike other commands.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: 0030ef8d267ffac70017be91e5d0b96d2234ffc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0030ef8d267ffac70017be91e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 24 06:44:13 2010 +0100 winmm/tests: MCI_STATUS returns DWORD_PTR, unlike other commands. --- dlls/winmm/tests/mci.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 236a722..2918dc7 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -162,6 +162,83 @@ static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, i else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } +static void test_mciParser(HWND hwnd) +{ + MCIERROR err; + MCIDEVICEID wDeviceID; + MCI_PARMS_UNION parm; + char buf[1024]; + memset(buf, 0, sizeof(buf)); + test_notification(hwnd, "-prior to parser test-", 0); + + /* Get a handle on an MCI device, works even without sound. */ + parm.open.lpstrDeviceType = "waveaudio"; + parm.open.lpstrElementName = ""; /* "new" at the command level */ + parm.open.lpstrAlias = "x"; /* to enable mciSendString */ + parm.open.dwCallback = (DWORD_PTR)hwnd; + err = mciSendCommand(0, MCI_OPEN, + MCI_OPEN_ELEMENT | MCI_OPEN_TYPE | MCI_OPEN_ALIAS | MCI_NOTIFY, + (DWORD_PTR)&parm); + ok(!err,"mciCommand open new type waveaudio alias x notify: %s\n", dbg_mcierr(err)); + wDeviceID = parm.open.wDeviceID; + ok(!strcmp(parm.open.lpstrDeviceType,"waveaudio"), "open modified device type\n"); + + test_notification(hwnd, "MCI_OPEN", MCI_NOTIFY_SUCCESSFUL); + test_notification(hwnd, "MCI_OPEN no #2", 0); + + /* MCI_STATUS' dwReturn is a DWORD_PTR, others' a plain DWORD. */ + parm.status.dwItem = MCI_STATUS_TIME_FORMAT; + parm.status.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand status time format: %s\n", dbg_mcierr(err)); + if(!err) ok(MCI_FORMAT_MILLISECONDS==parm.status.dwReturn,"status time format: %ld\n",parm.status.dwReturn); + + parm.status.dwItem = MCI_STATUS_MODE; + parm.status.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand status mode: %s\n", dbg_mcierr(err)); + if(!err) ok(MCI_MODE_STOP==parm.status.dwReturn,"STATUS mode: %ld\n",parm.status.dwReturn); + + err = mciSendString("status x mode", buf, sizeof(buf), hwnd); + ok(!err,"status mode: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "stopped"), "status mode is %s\n", buf); + + parm.caps.dwItem = MCI_GETDEVCAPS_USES_FILES; + parm.caps.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_GETDEVCAPS, MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand getdevcaps files: %s\n", dbg_mcierr(err)); + if(!err) ok(1==parm.caps.dwReturn,"getdevcaps files: %d\n",parm.caps.dwReturn); + + parm.caps.dwItem = MCI_GETDEVCAPS_HAS_VIDEO; + parm.caps.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_GETDEVCAPS, MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand getdevcaps video: %s\n", dbg_mcierr(err)); + if(!err) ok(0==parm.caps.dwReturn,"getdevcaps video: %d\n",parm.caps.dwReturn); + + parm.caps.dwItem = MCI_GETDEVCAPS_DEVICE_TYPE; + parm.caps.dwReturn = 0xFEEDABAD; + err = mciSendCommand(wDeviceID, MCI_GETDEVCAPS, MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand getdevcaps video: %s\n", dbg_mcierr(err)); + if(!err) ok(MCI_DEVTYPE_WAVEFORM_AUDIO==parm.caps.dwReturn,"getdevcaps device type: %d\n",parm.caps.dwReturn); + + err = mciSendString("capability x uses files", buf, sizeof(buf), hwnd); + ok(!err,"capability files: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "true"), "capability files is %s\n", buf); + + err = mciSendString("capability x has video", buf, sizeof(buf), hwnd); + ok(!err,"capability video: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "false"), "capability video is %s\n", buf); + + err = mciSendString("capability x device type", buf, sizeof(buf), hwnd); + ok(!err,"capability device type: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "waveaudio"), "capability device type is %s\n", buf); + + err = mciSendCommand(wDeviceID, MCI_CLOSE, 0, 0); + ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err)); + + test_notification(hwnd, "-end of 1st set-", 0); +} + static void test_openCloseWAVE(HWND hwnd) { MCIERROR err; @@ -1012,6 +1089,7 @@ START_TEST(mci) HWND hwnd; hwnd = CreateWindowExA(0, "static", "winmm test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); + test_mciParser(hwnd); test_openCloseWAVE(hwnd); test_recordWAVE(hwnd); test_playWAVE(hwnd);

1 0