December 2011 - Wine-commits

Henri Verbeet : wined3d: Get rid of the WINED3DLOCKED_RECT typedef.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: eafebc04911d257350517cf1be6b8fd4ed4943fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafebc04911d257350517cf1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:56 2011 +0100 wined3d: Get rid of the WINED3DLOCKED_RECT typedef. --- dlls/d3d8/surface.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/ddraw/surface.c | 12 +++--- dlls/wined3d/device.c | 12 +++--- dlls/wined3d/surface.c | 100 ++++++++++++++++++++++++------------------------ include/wine/wined3d.h | 10 ++-- 6 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eafebc04911d257350517…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DLOCKED_BOX typedef.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 2fa5a22100731277d06cdc74d383b22ec8d6834d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa5a22100731277d06cdc74d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:57 2011 +0100 wined3d: Get rid of the WINED3DLOCKED_BOX typedef. --- dlls/d3d10core/texture.c | 8 ++++---- dlls/d3d8/volume.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/volume.c | 20 ++++++++++---------- include/wine/wined3d.h | 12 ++++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index bd9b63a..f6e6d3b 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -363,8 +363,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct wined3d_mapped_box wined3d_map_desc; struct wined3d_resource *sub_resource; - WINED3DLOCKED_BOX wined3d_map_desc; HRESULT hr; TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", @@ -380,9 +380,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN else if (SUCCEEDED(hr = wined3d_volume_map(wined3d_volume_from_resource(sub_resource), &wined3d_map_desc, NULL, 0))) { - mapped_texture->pData = wined3d_map_desc.pBits; - mapped_texture->RowPitch = wined3d_map_desc.RowPitch; - mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; + mapped_texture->pData = wined3d_map_desc.data; + mapped_texture->RowPitch = wined3d_map_desc.row_pitch; + mapped_texture->DepthPitch = wined3d_map_desc.slice_pitch; } return hr; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index f3d1132..069b64f 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -227,7 +227,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface, iface, pLockedVolume, pBox, Flags); wined3d_mutex_lock(); - hr = wined3d_volume_map(This->wined3d_volume, (WINED3DLOCKED_BOX *)pLockedVolume, + hr = wined3d_volume_map(This->wined3d_volume, (struct wined3d_mapped_box *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 5e430b9..dfd27fe 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -225,7 +225,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(IDirect3DVolume9 *iface, iface, pLockedVolume, pBox, Flags); wined3d_mutex_lock(); - hr = wined3d_volume_map(This->wined3d_volume, (WINED3DLOCKED_BOX *)pLockedVolume, + hr = wined3d_volume_map(This->wined3d_volume, (struct wined3d_mapped_box *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 987d540..068fb7f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4301,8 +4301,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic static HRESULT device_update_volume(struct wined3d_device *device, struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) { - WINED3DLOCKED_BOX src; - WINED3DLOCKED_BOX dst; + struct wined3d_mapped_box src; + struct wined3d_mapped_box dst; HRESULT hr; TRACE("device %p, src_volume %p, dst_volume %p.\n", @@ -4319,7 +4319,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, return hr; } - memcpy(dst.pBits, src.pBits, dst_volume->resource.size); + memcpy(dst.data, src.data, dst_volume->resource.size); hr = wined3d_volume_unmap(dst_volume); if (FAILED(hr)) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d36d6c3..d00cc4d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -185,23 +185,23 @@ struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volum } HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, - WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) + struct wined3d_mapped_box *mapped_box, const WINED3DBOX *box, DWORD flags) { - TRACE("volume %p, locked_box %p, box %p, flags %#x.\n", - volume, locked_box, box, flags); + TRACE("volume %p, mapped_box %p, box %p, flags %#x.\n", + volume, mapped_box, box, flags); if (!volume->resource.allocatedMemory) volume->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, volume->resource.size); TRACE("allocatedMemory %p.\n", volume->resource.allocatedMemory); - locked_box->RowPitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ - locked_box->SlicePitch = volume->resource.format->byte_count + mapped_box->row_pitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ + mapped_box->slice_pitch = volume->resource.format->byte_count * volume->resource.width * volume->resource.height; /* Bytes / slice */ if (!box) { TRACE("No box supplied - all is ok\n"); - locked_box->pBits = volume->resource.allocatedMemory; + mapped_box->data = volume->resource.allocatedMemory; volume->lockedBox.Left = 0; volume->lockedBox.Top = 0; volume->lockedBox.Front = 0; @@ -213,9 +213,9 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, { TRACE("Lock Box (%p) = l %d, t %d, r %d, b %d, fr %d, ba %d\n", box, box->Left, box->Top, box->Right, box->Bottom, box->Front, box->Back); - locked_box->pBits = volume->resource.allocatedMemory - + (locked_box->SlicePitch * box->Front) /* FIXME: is front < back or vica versa? */ - + (locked_box->RowPitch * box->Top) + mapped_box->data = volume->resource.allocatedMemory + + (mapped_box->slice_pitch * box->Front) /* FIXME: is front < back or vica versa? */ + + (mapped_box->row_pitch * box->Top) + (box->Left * volume->resource.format->byte_count); volume->lockedBox.Left = box->Left; volume->lockedBox.Top = box->Top; @@ -234,7 +234,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, volume->locked = TRUE; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", - locked_box->pBits, locked_box->RowPitch, locked_box->SlicePitch); + mapped_box->data, mapped_box->row_pitch, mapped_box->slice_pitch); return WINED3D_OK; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 91d73b6..a0356a2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1708,12 +1708,12 @@ struct wined3d_mapped_rect void *data; }; -typedef struct _WINED3DLOCKED_BOX +struct wined3d_mapped_box { - INT RowPitch; - INT SlicePitch; - void *pBits; -} WINED3DLOCKED_BOX; + UINT row_pitch; + UINT slice_pitch; + void *data; +}; typedef struct _WINED3DBOX { @@ -2452,7 +2452,7 @@ DWORD __cdecl wined3d_volume_get_priority(const struct wined3d_volume *volume); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, - WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags); + struct wined3d_mapped_box *mapped_box, const WINED3DBOX *box, DWORD flags); void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); DWORD __cdecl wined3d_volume_set_priority(struct wined3d_volume *volume, DWORD new_priority); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 32fe05d3c4e3e782213618850bbf1df615759389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fe05d3c4e3e782213618850… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 6 01:57:15 2011 +0100 po: Update French translation. --- po/fr.po | 43 ++++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 25 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4a9aefa..c295f02 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,11 +1,11 @@ # French translations for Wine -# Frédéric Delanoy <frederic.delanoy(a)gmail.com>, 2011. +# msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-01 00:20+0100\n" +"PO-Revision-Date: 2011-12-06 00:09+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -115,7 +115,6 @@ msgid "Wine Gecko Installer" msgstr "Programme d'installation de Gecko pour Wine" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -129,8 +128,9 @@ msgstr "" "applications incorporant du HTML puissent fonctionner correctement.\n" "Wine peut automatiquement le télécharger et l'installer pour vous.\n" "\n" -"Note : il est recommandé d'utiliser le paquet de votre distribution si " -"disponible. Consultez http://wiki.winehq.org/Gecko pour plus de détails." +"Note : il est recommandé d'utiliser le paquet de votre distribution." +"Consultez <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" +"Gecko</a> pour plus de détails." #: appwiz.rc:106 msgid "&Install" @@ -2270,38 +2270,32 @@ msgid "Default MidiOut Device" msgstr "Périphérique MidiOut par défaut" #: dinput.rc:40 -#, fuzzy msgid "Configure Devices" -msgstr "Con&figurer..." +msgstr "Configurer les périphériques" #: dinput.rc:45 msgid "Reset" -msgstr "" +msgstr "Réinitialiser" #: dinput.rc:48 -#, fuzzy msgid "Player" -msgstr "Lecture" +msgstr "Lecteur" #: dinput.rc:49 -#, fuzzy msgid "Device" -msgstr "De&vice:" +msgstr "Périphérique" #: dinput.rc:50 -#, fuzzy msgid "Actions" -msgstr "Action" +msgstr "Actions" #: dinput.rc:51 -#, fuzzy msgid "Mapping" -msgstr "Assignation de lecteur" +msgstr "Mapping" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "Déjà assigné\n" +msgstr "Afficher en premier les affectations" #: dinput.rc:34 msgid "Action" @@ -6100,9 +6094,8 @@ msgid "&Data Rate" msgstr "&Débit de données" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "Kio/sec" +msgstr "ko/sec" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6585,7 +6578,6 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" msgstr "Propriétés de %s" @@ -12785,7 +12777,6 @@ msgstr "" "somme désolés pour le désagrément subi." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -12795,11 +12786,13 @@ msgid "" "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" "Cela peut être causé par une erreur dans le programme ou un défaut dans " -"Wine. Vous pouvez consulter http://appdb.winehq.org pour obtenir des " -"instructions sur l'exécution de cette application.\n" +"Wine. Vous pouvez consulter la <a href=\"http://appdb.winehq.org\">base de " +"données d'applications</a> pour obtenir des conseils sur la façon d'exécuter " +"cette application.\n" "\n" "Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " -"vous pouvez le rapporter sur http://bugs.winehq.org." +"vous pouvez <a href=\"http://wiki.winehq.org/Bugs\">soumettre un rapport " +"d'anomalie</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Frédéric Delanoy : po: Use non-breaking space before double punctuation in the French translation .
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 099e7f09ecd1e0634bf32b6deb54be67e1c4f563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099e7f09ecd1e0634bf32b6de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 6 01:57:16 2011 +0100 po: Use non-breaking space before double punctuation in the French translation. --- po/fr.po | 76 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/po/fr.po b/po/fr.po index c295f02..fc673ab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -76,11 +76,11 @@ msgstr "OK" msgid "The following information can be used to get technical support for %s:" msgstr "" "Les informations suivantes peuvent être utilisées pour obtenir du support " -"technique pour %s :" +"technique pour %s :" #: appwiz.rc:77 msgid "Publisher:" -msgstr "Éditeur :" +msgstr "Éditeur :" #: appwiz.rc:78 winefile.rc:172 msgid "Version:" @@ -88,27 +88,27 @@ msgstr "Version :" #: appwiz.rc:79 msgid "Contact:" -msgstr "Contact :" +msgstr "Contact :" #: appwiz.rc:80 msgid "Support Information:" -msgstr "Support :" +msgstr "Support :" #: appwiz.rc:81 msgid "Support Telephone:" -msgstr "Téléphone :" +msgstr "Téléphone :" #: appwiz.rc:82 msgid "Readme:" -msgstr "Lisez-moi :" +msgstr "Lisez-moi :" #: appwiz.rc:83 msgid "Product Updates:" -msgstr "Mises à jour :" +msgstr "Mises à jour :" #: appwiz.rc:84 msgid "Comments:" -msgstr "Commentaires :" +msgstr "Commentaires :" #: appwiz.rc:97 msgid "Wine Gecko Installer" @@ -1901,11 +1901,11 @@ msgstr "" #: cryptui.rc:74 msgid "X.509 Certificate (*.cer; *.crt)" -msgstr "Certificat X.509 (*.cer ; *.crt)" +msgstr "Certificat X.509 (*.cer ; *.crt)" #: cryptui.rc:75 msgid "Personal Information Exchange (*.pfx; *.p12)" -msgstr "Échange d'informations personnelles (*.pfx ; *.p12)" +msgstr "Échange d'informations personnelles (*.pfx ; *.p12)" #: cryptui.rc:76 cryptui.rc:155 msgid "Certificate Revocation List (*.crl)" @@ -1921,7 +1921,7 @@ msgstr "Magasin de certificats sérialisés Microsoft (*.sst)" #: cryptui.rc:79 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" -msgstr "Messages CMS/PKCS #7 (*.spc ; *.p7b)" +msgstr "Messages CMS/PKCS #7 (*.spc ; *.p7b)" #: cryptui.rc:81 msgid "Please select a file." @@ -5932,7 +5932,7 @@ msgstr "Informations sur l'hyperlien" #: mshtml.rc:41 winecfg.rc:247 msgid "&Type:" -msgstr "&Type :" +msgstr "&Type :" #: mshtml.rc:43 msgid "&URL:" @@ -6387,7 +6387,7 @@ msgstr "Insérer objet" #: oledlg.rc:54 msgid "Object Type:" -msgstr "Type d'objet :" +msgstr "Type d'objet :" #: oledlg.rc:57 oledlg.rc:95 msgid "Result" @@ -6419,7 +6419,7 @@ msgstr "Parcourir..." #: oledlg.rc:69 msgid "File:" -msgstr "Fichier :" +msgstr "Fichier :" #: oledlg.rc:75 msgid "Paste Special" @@ -7681,7 +7681,7 @@ msgstr "Le certificat pour ce site pose problème." #: wininet.rc:79 msgid "Do you want to continue anyway?" -msgstr "Voulez-vous tout de même continuer ?" +msgstr "Voulez-vous tout de même continuer ?" #: wininet.rc:25 msgid "LAN Connection" @@ -9039,7 +9039,7 @@ msgid "" msgstr "" "SHIFT est utilisé dans un fichier batch pour enlever le premier paramètre de " "la\n" -"liste ; ainsi, le paramètre 2 devient paramètre 1 et ainsi de suite. Il est " +"liste ; ainsi, le paramètre 2 devient paramètre 1 et ainsi de suite. Il est " "sans effet\n" "s'il est appelé depuis la ligne de commande.\n" @@ -9050,7 +9050,7 @@ msgstr "TIME règle ou affiche l'heure système courante.\n" #: cmd.rc:187 msgid "Sets the window title for the cmd window, syntax TITLE [string]\n" msgstr "" -"Définit le titre de la fenêtre pour la session cmd ; syntaxe : TITLE " +"Définit le titre de la fenêtre pour la session cmd ; syntaxe : TITLE " "[chaîne]\n" #: cmd.rc:191 @@ -9329,7 +9329,7 @@ msgstr "Erreur de syntaxe\n" #: cmd.rc:302 msgid "%s: File Not Found\n" -msgstr "%s : fichier non trouvé\n" +msgstr "%s : fichier non trouvé\n" #: cmd.rc:303 msgid "No help available for %s\n" @@ -9436,7 +9436,7 @@ msgstr "Outil de diagnostic DirectX" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "Usage : dxdiag [/whql:off | /whql:on] [/t fichier | /x fichier]" +msgstr "Usage : dxdiag [/whql:off | /whql:on] [/t fichier | /x fichier]" #: explorer.rc:28 msgid "Wine Explorer" @@ -9448,7 +9448,7 @@ msgstr "Emplacement :" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "Usage : hostname\n" +msgstr "Usage : hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" @@ -9459,17 +9459,17 @@ msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" -"Erreur : impossible de spécifier le nom d'hôte système avec l'utilitaire " +"Erreur : impossible de spécifier le nom d'hôte système avec l'utilitaire " "hostname.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "Usage : ipconfig [ /? | /all ]\n" +msgstr "Usage : ipconfig [ /? | /all ]\n" #: ipconfig.rc:28 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Erreur : les paramètres de ligne de commande spécifiés sont inconnus ou " +"Erreur : les paramètres de ligne de commande spécifiés sont inconnus ou " "invalides\n" #: ipconfig.rc:29 @@ -10839,7 +10839,7 @@ msgstr "Occurrence de « %s » non trouvée" #: regedit.rc:183 msgid "Are you sure you want to delete these values?" -msgstr "Voulez-vous réellement supprimer ces valeurs ?" +msgstr "Voulez-vous réellement supprimer ces valeurs ?" #: regedit.rc:184 msgid "New Key #%d" @@ -10969,27 +10969,27 @@ msgstr "" #: taskkill.rc:27 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "Usage : taskkill [/?] [/f] [/im NomProcessus | /pid IdProcessus]\n" +msgstr "Usage : taskkill [/?] [/f] [/im NomProcessus | /pid IdProcessus]\n" #: taskkill.rc:28 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "Erreur : option de ligne de commande inconnue ou invalide.\n" +msgstr "Erreur : option de ligne de commande inconnue ou invalide.\n" #: taskkill.rc:29 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Erreur : paramètre de ligne de commande invalide.\n" +msgstr "Erreur : paramètre de ligne de commande invalide.\n" #: taskkill.rc:30 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "Erreur : une des options /im ou /pid doit être spécifiée.\n" +msgstr "Erreur : une des options /im ou /pid doit être spécifiée.\n" #: taskkill.rc:31 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Erreur : l'option %1 requiert un paramètre de ligne de commande.\n" +msgstr "Erreur : l'option %1 requiert un paramètre de ligne de commande.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "Erreur : les options /im et /pid sont incompatibles.\n" +msgstr "Erreur : les options /im et /pid sont incompatibles.\n" #: taskkill.rc:33 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -11923,7 +11923,7 @@ msgstr "Wine" #: wineboot.rc:43 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"La configuration de Wine est en cours de mise à jour dans %s ; veuillez " +"La configuration de Wine est en cours de mise à jour dans %s ; veuillez " "patienter..." #: winecfg.rc:138 @@ -12093,7 +12093,7 @@ msgid "" "Failed to connect to the mount manager, the drive configuration cannot be " "edited." msgstr "" -"N'a pu se connecter au gestionnaire de montage : la configuration du lecteur " +"N'a pu se connecter au gestionnaire de montage : la configuration du lecteur " "n'a pu être éditée." #: winecfg.rc:238 @@ -12286,11 +12286,11 @@ msgid "" "Are you sure you want to do this?" msgstr "" "Modifier l'ordre de chargement de cette bibliothèque n'est pas recommandé.\n" -"Êtes-vous sûr de vouloir le faire ?" +"Êtes-vous sûr de vouloir le faire ?" #: winecfg.rc:52 msgid "Warning: system library" -msgstr "Attention : bibliothèque système" +msgstr "Attention : bibliothèque système" #: winecfg.rc:53 msgid "native" @@ -12697,15 +12697,15 @@ msgstr "Ceci est un test" #: wineconsole.rc:41 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" +msgstr "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" #: wineconsole.rc:42 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole : moteur de traitement invalide\n" +msgstr "wineconsole : moteur de traitement invalide\n" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole : option de ligne de commande non reconnue\n" +msgstr "wineconsole : option de ligne de commande non reconnue\n" #: wineconsole.rc:44 msgid "Starts a program in a Wine console\n" @@ -12716,7 +12716,7 @@ msgid "" "wineconsole: Starting program %s failed.\n" "The command is invalid.\n" msgstr "" -"wineconsole : impossible de démarrer le programme %s.\n" +"wineconsole : impossible de démarrer le programme %s.\n" "La commande est invalide.\n" #: wineconsole.rc:47

1 0

Nikolay Sivov : msxml3: Attribute name could be qualified.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: ca8e3c1cca444b9961b957762b5eec3874609bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8e3c1cca444b9961b957762… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 5 23:27:20 2011 +0300 msxml3: Attribute name could be qualified. --- dlls/msxml3/xslpattern.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 5187761..2fe3627 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -179,7 +179,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons $$=xmlStrcat($$,U("::")); } ; - Attribute : '@' TOK_NCName + Attribute : '@' QName { TRACE("Got Attribute: \"@%s\"\n", $2); $$=xmlStrdup(U("@"));

1 0

Alexandre Julliard : netapi32: Simplify the smbpasswd invocation to avoid compiler warnings.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: b7ceca13993ec473c2ac7659b88a456bba1f0211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ceca13993ec473c2ac7659b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 12:09:04 2011 +0100 netapi32: Simplify the smbpasswd invocation to avoid compiler warnings. --- dlls/netapi32/access.c | 124 ++++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 68 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index c48c693..6750a11 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -876,39 +876,6 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } -static int fork_smbpasswd( char * const argv[], pid_t *pid ) -{ -#ifdef HAVE_FORK - int pipe_out[2]; - - if (pipe( pipe_out ) == -1) return -1; - fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); - fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); - - switch ((*pid = fork())) - { - case -1: - close( pipe_out[0] ); - close( pipe_out[1] ); - return -1; - case 0: - dup2( pipe_out[0], 0 ); - close( pipe_out[0] ); - close( pipe_out[1] ); - execvp( "smbpasswd", argv ); - ERR( "can't execute smbpasswd, is it installed?\n" ); - _exit(1); - default: - close( pipe_out[0] ); - break; - } - return pipe_out[1]; -#else - ERR( "no fork support on this platform\n" ); - return -1; -#endif -} - static char *strdup_unixcp( const WCHAR *str ) { char *ret; @@ -921,20 +888,32 @@ static char *strdup_unixcp( const WCHAR *str ) static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, LPCWSTR oldpassword, LPCWSTR newpassword ) { +#ifdef HAVE_FORK NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; static char option_remote[] = "-r"; static char smbpasswd[] = "smbpasswd"; - int pipe_out; - pid_t pid; - char *server = NULL, *user, *argv[7], *old, *new = NULL; + int pipe_out[2]; + pid_t pid, wret; + int status; + char *server = NULL, *user, *argv[7], *old = NULL, *new = NULL; if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; if (!(user = strdup_unixcp( username ))) { - HeapFree( GetProcessHeap(), 0, server ); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto end; + } + if (!(old = strdup_unixcp( oldpassword ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; + } + if (!(new = strdup_unixcp( newpassword ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; } argv[0] = smbpasswd; argv[1] = option_silent; @@ -948,48 +927,57 @@ static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, } else argv[4] = NULL; - pipe_out = fork_smbpasswd( argv, &pid ); - HeapFree( GetProcessHeap(), 0, server ); - HeapFree( GetProcessHeap(), 0, user ); - if (pipe_out == -1) return NERR_InternalError; - - if (!(old = strdup_unixcp( oldpassword ))) + if (pipe( pipe_out ) == -1) { - ret = ERROR_OUTOFMEMORY; + ret = NERR_InternalError; goto end; } - if (!(new = strdup_unixcp( newpassword ))) + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); + + switch ((pid = fork())) { - ret = ERROR_OUTOFMEMORY; + case -1: + close( pipe_out[0] ); + close( pipe_out[1] ); + ret = NERR_InternalError; goto end; + case 0: + dup2( pipe_out[0], 0 ); + close( pipe_out[0] ); + close( pipe_out[1] ); + execvp( "smbpasswd", argv ); + ERR( "can't execute smbpasswd, is it installed?\n" ); + _exit(1); + default: + close( pipe_out[0] ); + break; } - write( pipe_out, old, strlen( old ) ); - write( pipe_out, "\n", 1 ); - write( pipe_out, new, strlen( new ) ); - write( pipe_out, "\n", 1 ); - write( pipe_out, new, strlen( new ) ); - write( pipe_out, "\n", 1 ); + write( pipe_out[1], old, strlen( old ) ); + write( pipe_out[1], "\n", 1 ); + write( pipe_out[1], new, strlen( new ) ); + write( pipe_out[1], "\n", 1 ); + write( pipe_out[1], new, strlen( new ) ); + write( pipe_out[1], "\n", 1 ); + close( pipe_out[1] ); -end: - close( pipe_out ); + do { + wret = waitpid(pid, &status, 0); + } while (wret < 0 && errno == EINTR); -#ifdef HAVE_FORK - { - pid_t wret; - int status; - - do { - wret = waitpid(pid, &status, 0); - } while (wret < 0 && errno == EINTR); - if (ret == NERR_Success && - (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) - ret = NERR_InternalError; - } -#endif + if (ret == NERR_Success && (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) + ret = NERR_InternalError; +end: + HeapFree( GetProcessHeap(), 0, server ); + HeapFree( GetProcessHeap(), 0, user ); HeapFree( GetProcessHeap(), 0, old ); HeapFree( GetProcessHeap(), 0, new ); return ret; +#else + ERR( "no fork support on this platform\n" ); + return NERR_InternalError; +#endif } /******************************************************************************

1 0

Jacek Caban : jscript: Use bytecode for '*=' expression implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 0ff59f444b48a81cbb4b075fcc81abbe8055f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff59f444b48a81cbb4b075fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:41:34 2011 +0100 jscript: Use bytecode for '*=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 28 ---------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2c6327e..8688d5d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -481,6 +481,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_ASSIGNSUB: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); + case EXPR_ASSIGNMUL: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7627a5b..c9ad519 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2421,24 +2421,6 @@ static HRESULT interp_sub(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.5.1 */ -static HRESULT mul_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - VARIANT lnum, rnum; - HRESULT hres; - - hres = to_number(ctx, lval, ei, &lnum); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, rval, ei, &rnum); - if(FAILED(hres)) - return hres; - - num_set_val(retv, num_val(&lnum) * num_val(&rnum)); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.5.1 */ static HRESULT interp_mul(exec_ctx_t *ctx) { VARIANT l, r; @@ -3384,16 +3366,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_mul_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, mul_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_div_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0f76eba..580b9f5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -575,7 +575,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 17c3b60..66ef886 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1346,7 +1346,7 @@ static const expression_eval_t expression_eval_table[] = { assign_rrshift_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_mul_expression_eval, + compiled_expression_eval, assign_div_expression_eval, assign_mod_expression_eval, assign_and_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '/=' expression implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: e9bd2e47f88c8ec96ee66a1fab62e05812ca3746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bd2e47f88c8ec96ee66a1fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:41:45 2011 +0100 jscript: Use bytecode for '/=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 28 ---------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8688d5d..bcbbaf3 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -483,6 +483,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_ASSIGNMUL: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mul); + case EXPR_ASSIGNDIV: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c9ad519..ef43451 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2440,24 +2440,6 @@ static HRESULT interp_mul(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.5.2 */ -static HRESULT div_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - VARIANT lnum, rnum; - HRESULT hres; - - hres = to_number(ctx, lval, ei, &lnum); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, rval, ei, &rnum); - if(FAILED(hres)) - return hres; - - num_set_val(retv, num_val(&lnum) / num_val(&rnum)); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.5.2 */ static HRESULT interp_div(exec_ctx_t *ctx) { VARIANT l, r; @@ -3366,16 +3348,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_div_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, div_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_mod_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 580b9f5..18f4401 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -575,7 +575,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 66ef886..36c5ecf 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1347,7 +1347,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_div_expression_eval, + compiled_expression_eval, assign_mod_expression_eval, assign_and_expression_eval, assign_or_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '%=' expression implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 822fdde42dc5bbcadf0b114a87ad4dcd3b98f9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=822fdde42dc5bbcadf0b114a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:41:57 2011 +0100 jscript: Use bytecode for '%=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 28 ---------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index bcbbaf3..af227c0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -485,6 +485,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_ASSIGNDIV: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_div); + case EXPR_ASSIGNMOD: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ef43451..0696e77 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2459,24 +2459,6 @@ static HRESULT interp_div(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.5.3 */ -static HRESULT mod_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - VARIANT lnum, rnum; - HRESULT hres; - - hres = to_number(ctx, lval, ei, &lnum); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, rval, ei, &rnum); - if(FAILED(hres)) - return hres; - - num_set_val(retv, fmod(num_val(&lnum), num_val(&rnum))); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.5.3 */ static HRESULT interp_mod(exec_ctx_t *ctx) { VARIANT l, r; @@ -3348,16 +3330,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_mod_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, mod_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 18f4401..54e28a9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -575,7 +575,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 36c5ecf..8051c8a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1348,7 +1348,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_mod_expression_eval, + compiled_expression_eval, assign_and_expression_eval, assign_or_expression_eval, assign_xor_expression_eval,

1 0

Jacek Caban : jscript: Added bytecode version of member expression.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: a289b8e0a40a29a0e2aa0fdc959766a189b0135d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a289b8e0a40a29a0e2aa0fdc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:42:09 2011 +0100 jscript: Added bytecode version of member expression. --- dlls/jscript/compile.c | 14 ++++++++++++++ dlls/jscript/engine.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + 3 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index af227c0..9a0a471 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -210,6 +210,18 @@ static HRESULT compile_unary_expression(compiler_ctx_t *ctx, unary_expression_t return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +/* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT compile_member_expression(compiler_ctx_t *ctx, member_expression_t *expr) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->expression); + if(FAILED(hres)) + return hres; + + return push_instr_bstr(ctx, OP_member, expr->identifier); +} + /* ECMA-262 3rd Edition 11.14 */ static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr) { @@ -519,6 +531,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); + case EXPR_MEMBER: + return compile_member_expression(ctx, (member_expression_t*)expr); case EXPR_MINUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); case EXPR_MOD: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0696e77..9e9c04d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -153,6 +153,22 @@ static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) return hres; } +static HRESULT stack_pop_object(exec_ctx_t *ctx, IDispatch **r) +{ + VARIANT *v; + HRESULT hres; + + v = stack_pop(ctx); + if(V_VT(v) == VT_DISPATCH) { + *r = V_DISPATCH(v); + return S_OK; + } + + hres = to_object(ctx->parser->script, v, r); + VariantClear(v); + return hres; +} + static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) { return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); @@ -1591,6 +1607,35 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT interp_member(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + IDispatch *obj; + VARIANT v; + DISPID id; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_object(ctx, &obj); + if(FAILED(hres)) + return hres; + + hres = disp_get_id(ctx->parser->script, obj, arg, 0, &id); + if(SUCCEEDED(hres)) { + hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); + }else if(hres == DISP_E_UNKNOWNNAME) { + V_VT(&v) = VT_EMPTY; + hres = S_OK; + } + IDispatch_Release(obj); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + +/* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_memberid(exec_ctx_t *ctx) { VARIANT *objv, *namev; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 54e28a9..330dc34 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -62,6 +62,7 @@ typedef struct _func_stack { X(jmp_z, 0, ARG_ADDR, 0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \ + X(member, 1, ARG_BSTR, 0) \ X(memberid, 1, 0,0) \ X(minus, 1, 0,0) \ X(mod, 1, 0,0) \

1 0