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

Matteo Bruni : d3dx9: Add sampler dcl instruction support to the shader assembler.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 745b5fe8f1aa1de994a9fe0ce6084daf52e47314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745b5fe8f1aa1de994a9fe0ce… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:59 2010 +0200 d3dx9: Add sampler dcl instruction support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 9 ++++++ dlls/d3dx9_36/asmshader.l | 10 ++++++ dlls/d3dx9_36/asmshader.y | 44 ++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 11 +++++++ dlls/d3dx9_36/bytecodewriter.c | 59 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 13 ++++++++- dlls/d3dx9_36/tests/asm.c | 10 ++---- 7 files changed, 148 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745b5fe8f1aa1de994a9f…

1 0

Aric Stewart : gdi32: Use usp10 to optionally generate glyphs for bidi strings.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 2a8958ec18655275cd946fbe00f4efe3d4e1378d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8958ec18655275cd946fbe0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 13 10:43:26 2010 -0500 gdi32: Use usp10 to optionally generate glyphs for bidi strings. --- dlls/gdi32/bidi.c | 184 +++++++++++++++++++++++++++++++++------------- dlls/gdi32/font.c | 15 ++-- dlls/gdi32/gdi_private.h | 4 +- 3 files changed, 142 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a8958ec18655275cd946…

1 0

Jacek Caban : mshtml: Fixed test on some IEs.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 563d289a62597fb7eb747decc85c97d4ca166e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563d289a62597fb7eb747decc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 17:57:35 2010 +0200 mshtml: Fixed test on some IEs. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7be4fe7..fd4238e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3003,7 +3003,7 @@ static void test_select_elem(IHTMLSelectElement *select) V_I4(&name) = 1; hres = IHTMLSelectElement_item(select, name, index, NULL); - ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER || broken(hres == E_INVALIDARG), "item failed: %08x, expected E_POINTER\n", hres); disp = NULL; hres = IHTMLSelectElement_item(select, name, index, &disp);

1 0

Frédéric Delanoy : wordpad: Update French translation.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 1fcf509336e8b4d07ef6f88b4513663e0f82bff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcf509336e8b4d07ef6f88b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 13 18:27:53 2010 +0200 wordpad: Update French translation. --- programs/wordpad/Fr.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 54ae0b9..499c05b 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -1,5 +1,6 @@ /* * Copyright 2006-2009 by Jonathan Ernst + * Copyright 2010 by Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,11 +59,11 @@ BEGIN MENUITEM SEPARATOR POPUP "&Avancé" BEGIN - MENUITEM "&Information sélection", ID_EDIT_SELECTIONINFO - MENUITEM "&Format caractères", ID_EDIT_CHARFORMAT - MENUITEM "&Déf. format car.", ID_EDIT_DEFCHARFORMAT - MENUITEM "Format paragrap&he", ID_EDIT_PARAFORMAT - MENUITEM "Texte &complet", ID_EDIT_GETTEXT + MENUITEM "&Informations sur la sélection", ID_EDIT_SELECTIONINFO + MENUITEM "&Format de caractères", ID_EDIT_CHARFORMAT + MENUITEM "Format de caractères par &défaut", ID_EDIT_DEFCHARFORMAT + MENUITEM "Format de &paragraphe", ID_EDIT_PARAFORMAT + MENUITEM "Texte &complet", ID_EDIT_GETTEXT END END POPUP "&Affichage" @@ -129,7 +130,7 @@ BEGIN MENUITEM "Fuchsia" ID_COLOR_FUCHSIA MENUITEM "Eau" ID_COLOR_AQUA MENUITEM "Blanc" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatique" ID_COLOR_AUTOMATIC END END @@ -250,11 +251,10 @@ BEGIN STRING_PREVIEW_CLOSE, "Fermer" STRING_PREVIEW_PAGE, "Page" STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "po" + STRING_UNITS_INCH, "pouces" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0

Frédéric Delanoy : msi: Update French translation .
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 2ba53f476cfdcbf2ca55adfb581c66d734a90e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba53f476cfdcbf2ca55adfb5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 13 18:36:24 2010 +0200 msi: Update French translation. --- dlls/msi/msi_Fr.rc | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi_Fr.rc b/dlls/msi/msi_Fr.rc index 7712864..6cd1fc5 100644 --- a/dlls/msi/msi_Fr.rc +++ b/dlls/msi/msi_Fr.rc @@ -2,6 +2,7 @@ * French resources for MSI * * Copyright 2005 Jonathan Ernst + * Copyright 2009-2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,31 +31,31 @@ STRINGTABLE DISCARDABLE 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." 5 "Le chemin %s est introuvable" 9 "insérez le disque %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ + 10 "Programme d'installation Windows %s\n\n" \ + "Usage :\n" \ + "msiexec commande {paramètre obligatoire} [paramètre optionnel]\n\n" \ + "Installer un produit :\n" \ + "\t/i {paquet|code_produit} [propriété]\n" \ + "\t/package {paquet|code_produit} [propriété]\n" \ + "\t/a paquet [propriété]\n" \ + "Réparer une installation :\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\n" \ + "Désinstaller un produit :\n" \ + "\t/uninstall {paquet|code_produit} [propriété]\n" \ + "\t/x {paquet|code_produit} [propriété]\n" \ + "Publier un produit :\n" \ + "\t/j[u|m] paquet [/t transformation] [/g id_langue]\n" \ + "Appliquer un patch :\n" \ + "\t/p paquet_patch [propriété]\n" \ + "\t/p paquet_patch /a paquet [propriété]\n" \ + "Modificateurs de journalisation et d'interface utilisateur pour les commandes ci-dessus :\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] fichier_journal\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "Enregistrer le service MSI :\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "Annuler l'enregistrement du service MSI :\n" \ "\t/z\n" \ - "Display this help:\n" \ + "Afficher cette aide :\n" \ "\t/help\n" \ "\t/?\n" 11 "saisissez le nom du dossier contenant %s"

1 0

Vincent Povirk : ole32: Use a temporary variable in TransactedSnapshotImpl_EnsureReadEntry.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 57ddceea340da5512a64245792434f760989cb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ddceea340da5512a6424579… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 12 14:08:55 2010 -0500 ole32: Use a temporary variable in TransactedSnapshotImpl_EnsureReadEntry. CreateStubEntry can change the value of This->entries, in which case the assignment can go to the wrong place. So instead, assign to a temporary variable, and copy the data back after all CreateStubEntry calls are finished. --- dlls/ole32/storage32.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d136837..ce4e885 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4160,42 +4160,43 @@ static HRESULT TransactedSnapshotImpl_EnsureReadEntry( TransactedSnapshotImpl *This, DirRef entry) { HRESULT hr=S_OK; + DirEntry data; if (!This->entries[entry].read) { hr = StorageBaseImpl_ReadDirEntry(This->transactedParent, This->entries[entry].transactedParentEntry, - &This->entries[entry].data); + &data); - if (SUCCEEDED(hr) && This->entries[entry].data.leftChild != DIRENTRY_NULL) + if (SUCCEEDED(hr) && data.leftChild != DIRENTRY_NULL) { - This->entries[entry].data.leftChild = - TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].data.leftChild); + data.leftChild = TransactedSnapshotImpl_CreateStubEntry(This, data.leftChild); - if (This->entries[entry].data.leftChild == DIRENTRY_NULL) + if (data.leftChild == DIRENTRY_NULL) hr = E_OUTOFMEMORY; } - if (SUCCEEDED(hr) && This->entries[entry].data.rightChild != DIRENTRY_NULL) + if (SUCCEEDED(hr) && data.rightChild != DIRENTRY_NULL) { - This->entries[entry].data.rightChild = - TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].data.rightChild); + data.rightChild = TransactedSnapshotImpl_CreateStubEntry(This, data.rightChild); - if (This->entries[entry].data.rightChild == DIRENTRY_NULL) + if (data.rightChild == DIRENTRY_NULL) hr = E_OUTOFMEMORY; } - if (SUCCEEDED(hr) && This->entries[entry].data.dirRootEntry != DIRENTRY_NULL) + if (SUCCEEDED(hr) && data.dirRootEntry != DIRENTRY_NULL) { - This->entries[entry].data.dirRootEntry = - TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].data.dirRootEntry); + data.dirRootEntry = TransactedSnapshotImpl_CreateStubEntry(This, data.dirRootEntry); - if (This->entries[entry].data.dirRootEntry == DIRENTRY_NULL) + if (data.dirRootEntry == DIRENTRY_NULL) hr = E_OUTOFMEMORY; } if (SUCCEEDED(hr)) + { + memcpy(&This->entries[entry].data, &data, sizeof(DirEntry)); This->entries[entry].read = 1; + } } return hr;

1 0

Paul Vriens : kernel32: Return the correct processor arch and type in wow64 mode.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: f3b4bd2bbce5da732ac7e9fd829fe2ef193d5fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b4bd2bbce5da732ac7e9fd8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 12 22:58:34 2010 +0200 kernel32: Return the correct processor arch and type in wow64 mode. --- dlls/kernel32/cpu.c | 23 ++++++++++++++++----- dlls/kernel32/tests/process.c | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 5862eac..6594450 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -170,13 +170,24 @@ VOID WINAPI GetSystemInfo( VOID WINAPI GetNativeSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */) { - static BOOL reported = FALSE; - if (!reported) { - FIXME("(%p) using GetSystemInfo()\n", si); - reported = TRUE; - } else - TRACE("(%p) using GetSystemInfo()\n", si); + BOOL is_wow64; + GetSystemInfo(si); + + IsWow64Process(GetCurrentProcess(), &is_wow64); + if (is_wow64) + { + if (si->u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + { + si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + si->dwProcessorType = PROCESSOR_AMD_X8664; + } + else + { + FIXME("Add the proper information for %d in wow64 mode\n", + si->u.s.wProcessorArchitecture); + } + } } /*********************************************************************** diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 806c468..846c338 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -55,6 +55,8 @@ } while (0) static HINSTANCE hkernel32; +static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); +static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); @@ -194,6 +196,8 @@ static int init(void) if ((p = strrchr(exename, '/')) != NULL) exename = p + 1; hkernel32 = GetModuleHandleA("kernel32"); + pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); + pIsWow64Process = (void *) GetProcAddress(hkernel32, "IsWow64Process"); pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); @@ -1767,6 +1771,44 @@ static void test_Handles(void) #endif } +static void test_SystemInfo(void) +{ + SYSTEM_INFO si, nsi; + BOOL is_wow64; + + if (!pGetNativeSystemInfo) + { + win_skip("GetNativeSystemInfo is not available\n"); + return; + } + + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + + GetSystemInfo(&si); + pGetNativeSystemInfo(&nsi); + if (is_wow64) + { + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + { + ok(nsi.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, + "Expected PROCESSOR_ARCHITECTURE_AMD64, got %d\n", + nsi.wProcessorArchitecture); + ok(nsi.dwProcessorType == PROCESSOR_AMD_X8664, + "Expected PROCESSOR_AMD_X8664, got %d\n", + nsi.dwProcessorType); + } + } + else + { + ok(si.wProcessorArchitecture == nsi.wProcessorArchitecture, + "Expected no difference for wProcessorArchitecture, got %d and %d\n", + si.wProcessorArchitecture, nsi.wProcessorArchitecture); + ok(si.dwProcessorType == nsi.dwProcessorType, + "Expected no difference for dwProcessorType, got %d and %d\n", + si.dwProcessorType, nsi.dwProcessorType); + } +} + START_TEST(process) { int b = init(); @@ -1791,6 +1833,7 @@ START_TEST(process) test_ProcessNameA(); test_ProcessName(); test_Handles(); + test_SystemInfo(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Gerald Pfeifer : comctl32: Remove document of (already removed) infoPtr from LISTVIEW_StyleChanged.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 00d5f87d3043eeb38b2aeb4053eb73015a7e486a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d5f87d3043eeb38b2aeb405… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 12 23:23:45 2010 +0200 comctl32: Remove document of (already removed) infoPtr from LISTVIEW_StyleChanged. --- dlls/comctl32/listview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index be5979c..dcb9207 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10928,7 +10928,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, * Processes WM_STYLECHANGING messages. * * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure * [I] wStyleType : window style type (normal or extended) * [I0] lpss : window style information *

1 0

Mike Kaplinskiy : ws2_32/tests: Add some socket event tests.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 688b94b43d3e1b1b18b57955c4112cc73ac784ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=688b94b43d3e1b1b18b57955c… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 13:27:32 2010 -0400 ws2_32/tests: Add some socket event tests. --- dlls/ws2_32/tests/Makefile.in | 2 +- dlls/ws2_32/tests/sock.c | 756 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 691 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=688b94b43d3e1b1b18b57…

1 0

Mike Kaplinskiy : server: Set FD_READ in only 1 place (cleanup).
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: f928580ac3fb8daa630904880d386978946fb4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f928580ac3fb8daa630904880… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 01:59:01 2010 -0400 server: Set FD_READ in only 1 place (cleanup). --- server/sock.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index b460fa7..753518d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -381,18 +381,9 @@ static void sock_poll_event( struct fd *fd, int event ) /* Linux 2.4 doesn't report POLLHUP if only one side of the socket * has been closed, so we need to check for it explicitly here */ nr = recv( get_unix_fd( fd ), &dummy, 1, MSG_PEEK ); - if ( nr > 0 ) - { - /* incoming data */ - sock->pmask |= FD_READ; - sock->hmask |= (FD_READ|FD_CLOSE); - sock->errors[FD_READ_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p is readable\n", sock ); - } - else if ( nr == 0 ) + if ( nr == 0 ) hangup_seen = 1; - else + else if ( nr < 0 ) { /* EAGAIN can happen if an async recv() falls between the server's poll() call and the invocation of this routine */ @@ -411,14 +402,14 @@ static void sock_poll_event( struct fd *fd, int event ) { hangup_seen = 1; } - else if ( event & POLLIN ) /* POLLIN for non-stream socket */ + + if ( event & POLLIN && !hangup_seen ) { sock->pmask |= FD_READ; sock->hmask |= (FD_READ|FD_CLOSE); sock->errors[FD_READ_BIT] = 0; if (debug_level) fprintf(stderr, "socket %p is readable\n", sock ); - } if (event & POLLOUT)

1 0