wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Henri Verbeet : ddraw: Only set DDSCAPS_PRIMARYSURFACE on the root surface.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 28efaec21f4420f98a7d2c78f6e5b6d0546ba154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28efaec21f4420f98a7d2c78f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:16 2013 +0100 ddraw: Only set DDSCAPS_PRIMARYSURFACE on the root surface. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 37fd096..ebc143b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4722,7 +4722,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) { /* For primary surfaces the tree is just a list, so the simpler scheme fits too */ - DDSCAPS2 caps2 = { DDSCAPS_PRIMARYSURFACE, 0, 0, 0 }; + DDSCAPS2 caps2 = { DDSCAPS_FLIP, 0, 0, 0 }; surf = This; while(1) @@ -5978,8 +5978,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc = &texture->surface_desc; /* Only one surface in the flipping chain is a back buffer, one is - * a front buffer, the others are just primary surfaces. */ - desc->ddsCaps.dwCaps &= ~(DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); + * a front buffer, the others are just flippable surfaces. */ + desc->ddsCaps.dwCaps &= ~(DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); if (!i) desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->dwBackBufferCount = 0;

1 0

Henri Verbeet : ddraw/tests: Add a surface flipping test.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: ebd5c2076c1bb805ac20d508ed03c8489e2813f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd5c2076c1bb805ac20d508e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:15 2013 +0100 ddraw/tests: Add a surface flipping test. --- dlls/ddraw/tests/ddraw1.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 744 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebd5c2076c1bb805ac20d…

1 0

Ken Thomases : dbghelp: Add debug logging to some error paths in the Mach-O support.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 15467577fc5cda2e31253f575c2f618c1d6a5bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15467577fc5cda2e31253f575… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:04:13 2013 -0600 dbghelp: Add debug logging to some error paths in the Mach-O support. --- dlls/dbghelp/macho_module.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 5da31aa..6d71168 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -30,6 +30,7 @@ #include <assert.h> #include <stdarg.h> +#include <errno.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -432,17 +433,32 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) RtlInitializeBitMap(&fmap->sect_is_code, fmap->sect_is_code_buff, MAX_SECT + 1); len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) + { + WARN("failed to allocate filename buffer\n"); + return FALSE; + } WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); /* check that the file exists */ - if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; + if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) + { + TRACE("stat() failed or %s is directory: %s\n", debugstr_a(filename), strerror(errno)); + goto done; + } /* Now open the file, so that we can mmap() it. */ - if ((fmap->fd = open(filename, O_RDONLY)) == -1) goto done; + if ((fmap->fd = open(filename, O_RDONLY)) == -1) + { + TRACE("failed to open file %s: %d\n", debugstr_a(filename), errno); + goto done; + } if (read(fmap->fd, &fat_header, sizeof(fat_header)) != sizeof(fat_header)) + { + TRACE("failed to read fat header: %d\n", errno); goto done; + } TRACE("... got possible fat header\n"); /* Fat header is always in big-endian order. */

1 0

Ken Thomases : dbghelp: Fix some parameter names and types in the Mach-O support.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 3fe34fe34693d35822acee2c6ce154b1cffb3588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe34fe34693d35822acee2c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:04:02 2013 -0600 dbghelp: Fix some parameter names and types in the Mach-O support. --- dlls/dbghelp/macho_module.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1aaa7f1..5da31aa 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1023,7 +1023,7 @@ leave: * macho_load_file_from_path * Tries to load a Mach-O file from a set of paths (separated by ':') */ -static BOOL macho_load_file_from_path(HANDLE hProcess, +static BOOL macho_load_file_from_path(struct process* pcs, const WCHAR* filename, unsigned long load_addr, const char* path, @@ -1034,7 +1034,7 @@ static BOOL macho_load_file_from_path(HANDLE hProcess, WCHAR* pathW = NULL; unsigned len; - TRACE("(%p, %s, 0x%08lx, %s, %p)\n", hProcess, debugstr_w(filename), load_addr, + TRACE("(%p/%p, %s, 0x%08lx, %s, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, debugstr_a(path), macho_info); if (!path) return FALSE; @@ -1053,7 +1053,7 @@ static BOOL macho_load_file_from_path(HANDLE hProcess, strcpyW(fn, s); strcatW(fn, S_SlashW); strcatW(fn, filename); - ret = macho_load_file(hProcess, fn, load_addr, macho_info); + ret = macho_load_file(pcs, fn, load_addr, macho_info); HeapFree(GetProcessHeap(), 0, fn); if (ret) break; s = (t) ? (t+1) : NULL; @@ -1069,7 +1069,7 @@ static BOOL macho_load_file_from_path(HANDLE hProcess, * * Tries to load a Mach-O file from the dll path */ -static BOOL macho_load_file_from_dll_path(HANDLE hProcess, +static BOOL macho_load_file_from_dll_path(struct process* pcs, const WCHAR* filename, unsigned long load_addr, struct macho_info* macho_info) @@ -1078,7 +1078,7 @@ static BOOL macho_load_file_from_dll_path(HANDLE hProcess, unsigned int index = 0; const char *path; - TRACE("(%p, %s, 0x%08lx, %p)\n", hProcess, debugstr_w(filename), load_addr, + TRACE("(%p/%p, %s, 0x%08lx, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, macho_info); while (!ret && (path = wine_dll_enum_load_path( index++ ))) @@ -1095,7 +1095,7 @@ static BOOL macho_load_file_from_dll_path(HANDLE hProcess, MultiByteToWideChar(CP_UNIXCP, 0, path, -1, name, len); strcatW( name, S_SlashW ); strcatW( name, filename ); - ret = macho_load_file(hProcess, name, load_addr, macho_info); + ret = macho_load_file(pcs, name, load_addr, macho_info); HeapFree( GetProcessHeap(), 0, name ); } TRACE(" => %d\n", ret);

1 0

Ken Thomases : winemac: Include the OpenGL headers to fix building on OS X 10.9.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: f0c4354a6bd0eeab094124f76987fa7de299c978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c4354a6bd0eeab094124f76… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:02:28 2013 -0600 winemac: Include the OpenGL headers to fix building on OS X 10.9. --- dlls/winemac.drv/cocoa_opengl.m | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 13b9ea3..f546be5 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <OpenGL/gl.h> #import "cocoa_opengl.h" #include "macdrv_cocoa.h"

1 0

André Hentschel : comctl32/tests: Make trackbar. c compile with -D__WINESRC__.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 66932a8855f481838ba9ee7e260dd66019c01559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66932a8855f481838ba9ee7e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 2 23:07:08 2013 +0100 comctl32/tests: Make trackbar.c compile with -D__WINESRC__. --- dlls/comctl32/tests/trackbar.c | 398 ++++++++++++++++++++-------------------- 1 files changed, 196 insertions(+), 202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66932a8855f481838ba9e…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 0e9899fa8c76c9e5adf3b476c860f36993c98aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9899fa8c76c9e5adf3b476c… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Dec 2 22:42:39 2013 +0100 po: Update German translation. --- po/de.po | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/po/de.po b/po/de.po index d8892d8..55fa346 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-11-07 16:38+0100\n" +"PO-Revision-Date: 2013-12-02 22:42+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -12814,10 +12814,8 @@ msgid "Select Drive Letter" msgstr "Laufwerksbuchstaben wählen" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine-Konfiguration" +msgstr "Laufwerkskonfiguration" #: winecfg.rc:227 msgid "" @@ -13097,10 +13095,8 @@ msgid "Letter" msgstr "Buchst." #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Neuer Ordner" +msgstr "Zielverzeichnis" #: winecfg.rc:79 msgid ""

1 0

Alexandre Julliard : makedep: Allow the source directory itself in include paths.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 4674566ba4d9f523dd48bbe4af131c2a0b136394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4674566ba4d9f523dd48bbe4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 2 23:28:58 2013 +0100 makedep: Allow the source directory itself in include paths. --- tools/makedep.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 164b7e4..1d99762 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -536,7 +536,7 @@ static FILE *open_include_file( struct incl_file *pFile ) { FILE *file = NULL; char *filename, *p; - unsigned int i; + unsigned int i, len; errno = ENOENT; @@ -664,8 +664,9 @@ static FILE *open_include_file( struct incl_file *pFile ) { /* ignore absolute paths that don't point into the source dir */ if (!top_src_dir) continue; - if (strncmp( dir, top_src_dir, strlen(top_src_dir) )) continue; - if (dir[strlen(top_src_dir)] != '/') continue; + len = strlen( top_src_dir ); + if (strncmp( dir, top_src_dir, len )) continue; + if (dir[len] && dir[len] != '/') continue; } filename = strmake( "%s/%s", dir, pFile->name ); if ((file = fopen( filename, "r" ))) goto found;

1 0

Andrey Gusev : Add Ukrainian translation for documentation template
by Jeremy Newman 02 Dec '13

02 Dec '13

Module: website Branch: master Commit: 53a952383e57a1a8622bfc4e698f336268e253bf URL: http://source.winehq.org/git/website.git/?a=commit;h=53a952383e57a1a8622bfc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 29 14:12:00 2013 +0200 Add Ukrainian translation for documentation template --- templates/uk/documentation.template | 77 +++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/templates/uk/documentation.template b/templates/uk/documentation.template new file mode 100644 index 0000000..5777d89 --- /dev/null +++ b/templates/uk/documentation.template @@ -0,0 +1,77 @@ + + + +<h1 class="title">Документація</h1> + + <h2>Путівники</h2> + <ul> + <li> + <a href="{$root}/docs/wineusr-guide/index">Путівник користувача Wine</a> + Як використовувати та налаштовувати Wine для запуску Windows застосунків. +    формати: + <a href="{$root}/docs/wineusr-guide/index">Онлайн</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.ps">PostScript</a> + + </li> + + <li> + <a href="{$root}/docs/winelib-guide/index">Путівник користувача Winelib</a> + Як використовувати Wine для портування Windows застосунків для Linux. +    формати: + <a href="{$root}/docs/winelib-guide/index">Онлайн</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.ps">PostScript</a> + + </li> + + <li> + <a href="{$root}/docs/winedev-guide/index">Путівник розробників Wine</a> + Як стати розробником Wine. +    формати: + <a href="{$root}/docs/winedev-guide/index">Онлайн</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.ps">PostScript</a> + + </li> + + <li> + <a href="{$root}/howto">Як допомогти зробити працюючі застосунки у Wine</a> + Короткий путівник для тих, хто хоче нам допомогти. + </li> + </ul> + + <h2>Посібники</h2> + <ul> + <li><a href="{$root}/docs/wine">посібник wine</a> + Параметри командного рядка для бінарного wine.</li> + + <li><a href="{$root}/docs/wineserver">посібник wineserver</a> + Параметри командного рядка для бінарного wineserver.</li> + + <li><a href="{$root}/docs/winebuild">посібник winebuild</a> + Параметри командного рядка для бінарного winebuild.</li> + + <li><a href="{$root}/docs/winedump">посібник winedump</a> + Параметри командного рядка для бінарного winedump.</li> + + <li><a href="{$root}/docs/winemaker">посібник winemaker</a> + Параметри командного рядка для скрипта winemaker.</li> + + <li><a href="{$root}/docs/widl">посібник widl</a> + Параметри командного рядка для компілятора IDL.</li> + + <li><a href="{$root}/docs/wmc">посібник wmc</a> + Параметри командного рядка для повідомлень компілятора.</li> + + <li><a href="{$root}/docs/wrc">посібник wrc</a> + Параметри командного рядка для компілятора ресурсів.</li> + + <li><a href="{$root}/docs/winegcc">посібник winegcc</a> + Параметри командного рядка для компілятора winegcc.</li> + </ul> + +

1 0

Andrey Gusev : Add Ukrainian translation for help template
by Jeremy Newman 02 Dec '13

02 Dec '13

Module: website Branch: master Commit: a875c403bc560d37f5b3bca38ccb02bd1d37710b URL: http://source.winehq.org/git/website.git/?a=commit;h=a875c403bc560d37f5b3bc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 28 21:43:19 2013 +0200 Add Ukrainian translation for help template --- templates/uk/help.template | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/templates/uk/help.template b/templates/uk/help.template new file mode 100644 index 0000000..e56d88c --- /dev/null +++ b/templates/uk/help.template @@ -0,0 +1,91 @@ + + + +<h1 class="title">Отримати допомогу</h1> + +Є різноманітні способи отримати допомогу у використанні Wine. + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> + + <tr> + <td align="center" bgcolor="black" class="small">Варіант</td> + <td align="center" bgcolor="black" class="small">Опис</td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.codeweavers.com"><img src="{$root}/images/paid.png"> Платний</a> + </td> + <td valign="top"> + <a href="http://www.codeweavers.com">CodeWeavers</a> пропонує платну підтримку для Wine. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"> FAQ</a> + </td> + <td valign="top"> + На більшість питань можна швидко знайти відповідь перейшовши до <a href="http://wiki.winehq.org/FAQ">FAQ</a>. Це перший розділ, який варто подивитися, бо можливо там вже є відповідь на ваше питання. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="{$root}/documentation"><img src="{$root}/images/docs.png"> Документи</a> + </td> + <td valign="top"> + Ми рекомендуємо вам почитати нашу онлайн <a href="{$root}/site/documentation">Документацію</a>, щоб знайти відповідь на своє питання. Також будуть цікаві наші <a href="http://wiki.winehq.org/HowTo">Практичні рекомендації</a>, які містять деяку корисну інформацію для новачків. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"> Wiki</a> + </td> + <td valign="top"> + Подивіться нашу <a href="http://wiki.winehq.org/">Wiki</a>, щоб знайти відповідь на своє питання. + </td> + </tr> + +<tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"> Форум</a> + </td> + <td valign="top"> + У нас є <a href="//forums.winehq.org/">форум</a>/<a href="{$root}/site/forums">списки розсилки</a> на основі співтовариства для користувачів Wine, це місце де користувачі Wine можуть задати питання та спілкуватися один з одним. Ви також можете досліджувати <a href="{$root}/site/forums">списки розсилки</a>, які складають це співтовариство. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="{$root}/irc"><img src="{$root}/images/irc.png"> IRC</a> + </td> + <td valign="top"> + Ви можете зв'язатися зі спільнотою Wine на нашому <a href="{$root}/irc">IRC каналі</a>. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="//appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> + </td> + <td valign="top"> + Якщо ви хочете допомогти з додатками, тоді подивіться нашу <a href="//appdb.winehq.org/">Базу застосунків</a>. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="//bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> + </td> + <td valign="top"> + Наш <a href="//bugs.winehq.org/">Bugzilla Bug Tracker</a> містить всі питання над якими ми працювали або працюємо зараз. + </td> + </tr> + +</table> + +Проблеми з нашим сайтом або помітили помилку? Зв'яжіться з нашою <a href="mailto:web-admin@winehq.org">Веб-групою</a>. + +

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013