December 2013 - Wine-Commits

Huw Davies : wordpad: Pass the correct window to the font size list validator.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 39538f91f5d396cf4b721086ddddb08a38bc18d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39538f91f5d396cf4b721086d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 6 16:28:31 2013 +0000 wordpad: Pass the correct window to the font size list validator. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 9eb0700..ec813a7 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2016,7 +2016,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) on_fontlist_modified(endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndFontList,endEdit->szText); + on_sizelist_modified(hwndSizeList,endEdit->szText); } } return 0;

1 0

Henri Verbeet : wined3d: Create volumes inside wined3d.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 15c1a26b55a30b7d33ad7d45b76c6ad7f691ab2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c1a26b55a30b7d33ad7d45b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:53 2013 +0100 wined3d: Create volumes inside wined3d. --- dlls/d3d10core/device.c | 39 ++++++++-------------- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 68 ++++++++++++++------------------------- dlls/d3d8/volume.c | 18 +++------- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 68 ++++++++++++++------------------------- dlls/d3d9/volume.c | 19 +++-------- dlls/ddraw/ddraw.c | 30 ++++++++--------- dlls/wined3d/texture.c | 6 +-- dlls/wined3d/volume.c | 42 +++++++++++++++--------- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 6 +++- include/wine/wined3d.h | 8 +--- 13 files changed, 127 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15c1a26b55a30b7d33ad7…

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: c607ce5eafea73cb632870020a99b7bb3deb1600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c607ce5eafea73cb632870020… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 5 23:41:48 2013 +0200 po: Update Swedish translation. --- po/sv.po | 52 ++++++++++++---------------------------------------- 1 files changed, 12 insertions(+), 40 deletions(-) diff --git a/po/sv.po b/po/sv.po index 1be7ed2..b306c32 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4681,10 +4681,8 @@ msgid "No Unicode translation.\n" msgstr "Ingen Unicode-översättning.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "DLL-initiering misslyckades.\n" +msgstr "DLL-initialisering misslyckades.\n" #: winerror.mc:1371 msgid "Shutdown in progress.\n" @@ -8496,17 +8494,12 @@ msgstr "" "sedan igen." #: winmm.rc:55 winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Den nuvarande MIDI Mapper-installationen refererar till en MIDI-enhet som " -"inte är installerad på systemet. Använd MIDI Mapper för att ändra " -"installationen." +"inte är installerad på systemet." #: winmm.rc:56 msgid "" @@ -9305,22 +9298,16 @@ msgstr "" "process ärvs av den som anropar processen.\n" #: cmd.rc:43 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> är en synonym för CHDIR. Den används för att\n" +"CD <plats> är en synonym för CHDIR. Den används för att\n" "ändra standardsökväg.\n" #: cmd.rc:44 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <dir> ändrar standardsökväg.\n" +msgstr "CHDIR <plats> ändrar standardsökväg.\n" #: cmd.rc:46 msgid "CLS clears the console screen.\n" @@ -9372,11 +9359,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <filename> tar bort en eller flera filer.\n" #: cmd.rc:71 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9386,7 +9368,9 @@ msgid "" msgstr "" "FOR används för att exekvera ett kommando var för ett flertal filer.\n" "\n" -"Syntax: FOR %variabel IN (set) DO kommando\n" +"Användning: FOR %variabel IN (set) DO kommando\n" +"\n" +"%-tecknet måste dubbleras när FOR används i en batchfil.\n" #: cmd.rc:83 msgid "" @@ -9576,14 +9560,10 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <filnamn> döper om en fil.\n" #: cmd.rc:161 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <plats> är en synonym för RMDIR. RD tar bort vald plats.\n" #: cmd.rc:162 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <plats> tar bort vald plats.\n" @@ -9722,15 +9702,11 @@ msgid "" msgstr "" #: cmd.rc:248 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <mappnamn> sparar nuvarande sökväg i en stack,\n" +"PUSHD <plats> sparar nuvarande sökväg i en stack,\n" "och ändrar sedan sökvägen till den angivna mappen.\n" #: cmd.rc:250 @@ -10054,7 +10030,7 @@ msgstr "" #: dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "" +msgstr "Användning: dxdiag [/whql:off | /whql:on] [/t filnamn | /x filnamn]" #: explorer.rc:31 msgid "Wine Explorer" @@ -12300,7 +12276,7 @@ msgstr "Minne använt: %1!u! kB / %2!u! kB" #: taskmgr.rc:272 msgid "Image Name" -msgstr "" +msgstr "Bildnamn" #: taskmgr.rc:273 msgid "PID" @@ -12639,10 +12615,8 @@ msgid "Select Drive Letter" msgstr "Välj enhetsbokstav" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Konfiguration av Wine" +msgstr "Enhetskonfiguration" #: winecfg.rc:227 msgid "" @@ -12920,10 +12894,8 @@ msgid "Letter" msgstr "Bokstav" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Ny mapp" +msgstr "Målmapp" #: winecfg.rc:79 msgid ""

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 4661019f641d4df285bada167a34de52bda286a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4661019f641d4df285bada167… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 5 23:00:25 2013 +0200 po: Update Finnish translation. --- po/fi.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index ff96124..c344f50 100644 --- a/po/fi.po +++ b/po/fi.po @@ -12702,10 +12702,8 @@ msgid "Select Drive Letter" msgstr "Valitse aseman kirjain" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Winen asetukset" +msgstr "Asemien asetukset" #: winecfg.rc:227 msgid "" @@ -12981,10 +12979,8 @@ msgid "Letter" msgstr "Kirjain" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Uusi kansio" +msgstr "Kohdekansio" #: winecfg.rc:79 msgid ""

1 0

Ken Thomases : dbghelp: For Mach-O, get the address of the process' s image info from its PEB.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: 1577fb6c3f5941a9b2ba1fec7e38e61cdfa2b757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1577fb6c3f5941a9b2ba1fec7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:08:06 2013 -0600 dbghelp: For Mach-O, get the address of the process's image info from its PEB. --- dlls/dbghelp/macho_module.c | 57 +++++++++++++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 6d71168..08028b1 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -24,6 +24,8 @@ #include "config.h" #include "wine/port.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "dbghelp_private.h" #ifdef HAVE_MACH_O_LOADER_H @@ -964,23 +966,52 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, */ if (macho_info->flags & MACHO_INFO_DEBUG_HEADER) { - static void* dyld_all_image_infos_addr; + PROCESS_BASIC_INFORMATION pbi; + NTSTATUS status; - /* This symbol should be in the same place in all processes. */ - if (!dyld_all_image_infos_addr) + ret = FALSE; + + /* Get address of PEB */ + status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL); + if (status == STATUS_SUCCESS) { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; - if (!nlist("/usr/lib/dyld", nl)) - dyld_all_image_infos_addr = (void*)nl[0].n_value; + ULONG dyld_image_info; + + /* Read dyld image info address from PEB */ + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved, + &dyld_image_info, sizeof(dyld_image_info), NULL)) + { + TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n", + dyld_image_info, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); + macho_info->dbg_hdr_addr = dyld_image_info; + ret = TRUE; + } } - if (dyld_all_image_infos_addr) - macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; - else - ret = FALSE; - TRACE("dbg_hdr_addr = 0x%08lx\n", macho_info->dbg_hdr_addr); + if (!ret) + { + static void* dyld_all_image_infos_addr; + + /* Our next best guess is that dyld was loaded at its base address + and we can find the dyld image infos address by looking up its symbol. */ + if (!dyld_all_image_infos_addr) + { + struct nlist nl[2]; + memset(nl, 0, sizeof(nl)); + nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; + if (!nlist("/usr/lib/dyld", nl)) + dyld_all_image_infos_addr = (void*)nl[0].n_value; + } + + if (dyld_all_image_infos_addr) + { + TRACE("got dyld_image_info %p from /usr/lib/dyld symbol table\n", + dyld_all_image_infos_addr); + macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; + ret = TRUE; + } + } } if (macho_info->flags & MACHO_INFO_MODULE)

1 0

Henri Verbeet : ddraw/tests: Add a test for primary surface capabilities.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: f637c229f9cf58546434c680ba2876021a1bd07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f637c229f9cf58546434c680b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:16 2013 +0100 ddraw/tests: Add a test for primary surface capabilities. --- dlls/ddraw/tests/ddraw1.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 628 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f637c229f9cf58546434c…

1 0

Ken Thomases : ntdll: On Mac, store the dyld image info address in the PEB.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: 22cf68e1bc079c05ad4bf9397c48f6065019d5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cf68e1bc079c05ad4bf9397… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:07:55 2013 -0600 ntdll: On Mac, store the dyld image info address in the PEB. --- dlls/ntdll/thread.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9c34c0c..8a63725 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -186,6 +186,23 @@ done: return status; } +#ifdef __APPLE__ +#include <mach/mach.h> +#include <mach/mach_error.h> + +static ULONG get_dyld_image_info_addr(void) +{ + ULONG ret = 0; +#ifdef TASK_DYLD_INFO + struct task_dyld_info dyld_info; + mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; + if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) + ret = dyld_info.all_image_info_addr; +#endif + return ret; +} +#endif /* __APPLE__ */ + /*********************************************************************** * thread_init * @@ -245,6 +262,9 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); InitializeListHead( &tls_links ); +#ifdef __APPLE__ + peb->Reserved[0] = get_dyld_image_info_addr(); +#endif /* allocate and initialize the initial TEB */

1 0

Henri Verbeet : ddraw: Require a non-zero back buffer count for swap chains .
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: 8797a9eda3f4ccc256cb0716389d8225da6c4615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8797a9eda3f4ccc256cb07163… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:15 2013 +0100 ddraw: Require a non-zero back buffer count for swap chains. --- dlls/ddraw/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7cb18a1..4c96da8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5647,6 +5647,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->dwBackBufferCount) + { + WARN("Tried to create a flippable primary surface without any back buffers.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n");

1 0

Francois Gouget : libport: Fix the detection of isfinite().
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: 6f22057c21a19dc7f797307b90b084550ea0a263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f22057c21a19dc7f797307b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 5 11:31:20 2013 +0100 libport: Fix the detection of isfinite(). --- configure | 1 + configure.ac | 3 ++- include/wine/port.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 23eeb92..7ad174c 100755 --- a/configure +++ b/configure @@ -15771,6 +15771,7 @@ if ${ac_cv_have_isfinite+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#define _GNU_SOURCE #include <math.h> int main () diff --git a/configure.ac b/configure.ac index d091370..0124652 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,7 +2534,8 @@ dnl Check for isfinite ac_save_LIBS="$LIBS" LIBS="$LIBS -lm" AC_CACHE_CHECK([for isfinite], ac_cv_have_isfinite, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isfinite(f)]])],[ac_cv_have_isfinite="yes"],[ac_cv_have_isfinite="no"])) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE +#include <math.h>]], [[float f = 0.0; return isfinite(f)]])],[ac_cv_have_isfinite="yes"],[ac_cv_have_isfinite="no"])) if test "$ac_cv_have_isfinite" = "yes" then AC_DEFINE(HAVE_ISFINITE, 1, [Define to 1 if you have the `isfinite' function.]) diff --git a/include/wine/port.h b/include/wine/port.h index 406f190..3548a44 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -30,7 +30,7 @@ #endif #ifndef _GNU_SOURCE -# define _GNU_SOURCE /* for pread/pwrite */ +# define _GNU_SOURCE /* for pread/pwrite, isfinite */ #endif #include <fcntl.h> #include <math.h>

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.5.2.
by Alexandre Julliard Dec. 5, 2013

Dec. 5, 2013

Module: wine Branch: master Commit: 608b1e141457dc9653d4783419aa6492ea705d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608b1e141457dc9653d478341… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 4 11:04:21 2013 -0600 mscoree: Update Wine Mono to 4.5.2. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4e59654..1f219d5 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "0.0.8" -#define MONO_SHA "dd349e72249ce5ff981be0e9dae33ac4a46a9f60" +#define MONO_VERSION "4.5.2" +#define MONO_SHA "73d6b8aa7a8921f43b22c6d930e8d7e421058187" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 5b4a2c7..9ac1e3e 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -660,7 +660,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "0.0.8"; + static const char* mono_version = "4.5.2"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0