September 2013 - Wine-commits

Frédéric Delanoy : wineusr: Mention forums.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 891e03ecb915aecb34b7d797d3d013392c96d4fc URL: http://source.winehq.org/git/docs.git/?a=commit;h=891e03ecb915aecb34b7d797d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:58 2013 +0200 wineusr: Mention forums. --- en/wineusr-bugs.sgml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 931ed6e..e251bdd 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -179,8 +179,9 @@ </listitem> <listitem> <para> - Wine <ulink url="http://www.winehq.org/site/forums#ml">mailing - lists</ulink> may also help, especially <literal>wine-users</literal>. The + Wine <ulink url="http://forums.winehq.org/">forums</ulink> and <ulink + url="http://www.winehq.org/site/forums">mailing lists</ulink> may also help, + especially <literal>wine-users</literal>. The <literal>wine-devel</literal> list may be appropriate depending on the type of problem you are experiencing. If you post to <literal>wine-devel</literal> you should be prepared to do a little work to help diagnose the

1 0

Frédéric Delanoy : winedev: Update " Adding New Languages" section.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 616a0bf86fe91e992bda11193de9cec3a4d5cceb URL: http://source.winehq.org/git/docs.git/?a=commit;h=616a0bf86fe91e992bda11193… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 9 17:51:01 2013 +0200 winedev: Update "Adding New Languages" section. --- en/winedev-coding.sgml | 49 +++++++++++++---------------------------------- 1 files changed, 14 insertions(+), 35 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index edc1d87..f450a7f 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -442,50 +442,29 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) <title>Adding New Languages</title> <para> - This file documents the necessary procedure for adding a new + This section documents the procedure for adding a new language to the list of languages that Wine can display system menus and forms in. Adding new translations is not hard as it requires no programming knowledge or special skills. </para> <para> - Language dependent resources reside in files named - <filename><replaceable>somefile</replaceable>_<replaceable>Xx</replaceable>.rc</filename> or - <filename><replaceable>Xx</replaceable>.rc</filename>, where <replaceable>Xx</replaceable> - is your language abbreviation (look for it in - <filename class="headerfile">include/winnls.h</filename>). These are included - in a master file named <filename><replaceable>somefile</replaceable>.rc</filename> or - <filename>rsrc.rc</filename>, located in the same - directory as the language files. + First add the language ID (most often like <replaceable>xx</replaceable>, e.g. + <literal>fr</literal> for French, or + <replaceable>xx</replaceable>_<replaceable>YY</replaceable> for country-specific variations, + e.g. <literal>pt_BR</literal> for Brazilian Portuguese ; look in + <filename>tools/wmc/po.c</filename> for a list) in the <literal>LINGUAS</literal> section of + <filename>configure.ac</filename>, and in <filename>po/LINGUAS</filename>. </para> <para> - To add a new language to one of these resources you - need to make a copy of the English resource (located - in the <filename><replaceable>somefile</replaceable>_En.rc</filename> file) over to your - <filename><replaceable>somefile</replaceable>_<replaceable>Xx</replaceable>.rc</filename> - file, include this file in the master - <filename><replaceable>somefile</replaceable>.rc</filename> file, - and edit the new file to translate the English text. - You may also need to rearrange some of the controls - to better fit the newly translated strings. Test your changes - to make sure they properly layout on the screen. - </para> - - <para> - In menus, the character '&' means that the next - character will be highlighted and that pressing that - letter will select the item. You should place these - '&' characters suitably for your language, not just - copy the positions from English. In particular, - items within one menu should have different highlighted - letters. - </para> - - <para> - To get a list of the files that need translating, - run the following command in the root of your Wine tree: - <userinput>find -name "*En.rc"</userinput>. + Language dependent resources reside in <filename class="extension">.po</filename> files in the + <filename class="directory">po/</filename> directory. Simply create the language-specific + <filename class="extension">.po</filename> file using the <filename>wine.pot</filename> + template: + <screen>cp po/wine.pot po/<replaceable>xx</replaceable>.po</screen> + and <ulink url="http://wiki.winehq.org/Translating">start translating</ulink> (note the file + must use UTF-8 encoding). </para> <para>

1 0

Frédéric Delanoy : winedev: Do not indent verbatim environments.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 249e66a3c4b6d8e34f0750dac59938db9c58515a URL: http://source.winehq.org/git/docs.git/?a=commit;h=249e66a3c4b6d8e34f0750dac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 10 08:37:51 2013 +0200 winedev: Do not indent verbatim environments. --- en/winedev-architecture.sgml | 12 +- en/winedev-coding.sgml | 20 ++-- en/winedev-ddraw.sgml | 64 +++++++------- en/winedev-debugger.sgml | 204 +++++++++++++++++++---------------------- en/winedev-debugging.sgml | 136 ++++++++++++++-------------- en/winedev-documentation.sgml | 93 ++++++++++++------- en/winedev-kernel.sgml | 10 +- en/winedev-multimedia.sgml | 102 +++++++++++---------- en/winedev-ole.sgml | 24 +++-- en/winedev-opengl.sgml | 12 +- en/winedev-otherdebug.sgml | 130 ++++++++++++++------------ en/winedev-testing.sgml | 28 +++--- en/winedev-windowing.sgml | 156 ++++++++++++++++--------------- 13 files changed, 511 insertions(+), 480 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=249e66a3c4b6d8e34f075…

1 0

Frédéric Delanoy : winelib: Do not indent verbatim environments.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 0d2ada91f19d088819911b2228d6c3047a160db3 URL: http://source.winehq.org/git/docs.git/?a=commit;h=0d2ada91f19d088819911b222… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 10 08:37:52 2013 +0200 winelib: Do not indent verbatim environments. --- en/winelib-bindlls.sgml | 4 +- en/winelib-intro.sgml | 24 +++++++------- en/winelib-mfc.sgml | 4 +- en/winelib-toolkit.sgml | 78 +++++++++++++++++++++++----------------------- 4 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=0d2ada91f19d088819911…

1 0

Frédéric Delanoy : wineusr: Do not indent verbatim environments.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: c1072b2aa2ea84708802b040ef5d56ca9a6dad29 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c1072b2aa2ea84708802b040e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 10 08:37:53 2013 +0200 wineusr: Do not indent verbatim environments. --- en/wineusr-bugs.sgml | 8 ++-- en/wineusr-configuring.sgml | 64 ++++++++++++++++++------------------ en/wineusr-getting.sgml | 18 +++++----- en/wineusr-glossary.sgml | 36 ++++++++++---------- en/wineusr-running.sgml | 75 ++++++++++++++++++++---------------------- 5 files changed, 99 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=c1072b2aa2ea84708802b…

1 0

Nikolay Sivov : shell32: Fix getting a command string when root key default value doesn' t point to a key.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 8ae6b43bc89b80ef6e5019dccefd451bc5ff903c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae6b43bc89b80ef6e5019dcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 10 08:58:53 2013 +0400 shell32: Fix getting a command string when root key default value doesn't point to a key. --- dlls/shell32/assoc.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index d28fa20..b0d815a 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -263,17 +263,19 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, KEY_READ, &hkeyFile); HeapFree(GetProcessHeap(), 0, filetype); - if (ret) return HRESULT_FROM_WIN32(ret); - ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); - RegCloseKey(hkeyFile); - if (ret) return HRESULT_FROM_WIN32(ret); + if (ret == ERROR_SUCCESS) + { + ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + RegCloseKey(hkeyFile); + } + else + ret = RegOpenKeyExW(This->hkeySource, shellW, 0, KEY_READ, &hkeyShell); } else - { ret = RegOpenKeyExW(This->hkeySource, shellW, 0, KEY_READ, &hkeyShell); - if (ret) return HRESULT_FROM_WIN32(ret); - } + + if (ret) return HRESULT_FROM_WIN32(ret); if (!extra) {

1 0

Alistair Leslie-Hughes : msdasc.idl: Correctly register DataLinks.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 10251e5ab0808c8b338cb2870e0685491a28e7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10251e5ab0808c8b338cb2870… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 10 19:26:13 2013 +1000 msdasc.idl: Correctly register DataLinks. --- include/msdasc.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/msdasc.idl b/include/msdasc.idl index f3b6a37..25610e5 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -124,6 +124,7 @@ library MSDASC [ uuid(2206CDB2-19C1-11D1-89E0-00C04FD7A829), + threading(both), progid("DataLinks") ] coclass DataLinks

1 0

André Hentschel : kernel32: Add partial CreateFile2 implementation.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: fa6b0580702b1cdcf97f64ac34b53095604c1230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6b0580702b1cdcf97f64ac3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 10 00:24:55 2013 +0200 kernel32: Add partial CreateFile2 implementation. --- dlls/kernel32/file.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 1 + include/Makefile.in | 1 + include/fileapi.h | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 89e0fad..506b651 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -42,6 +42,7 @@ #include "wincon.h" #include "ddk/ntddk.h" #include "kernel_private.h" +#include "fileapi.h" #include "wine/exception.h" #include "wine/unicode.h" @@ -1527,6 +1528,20 @@ HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing, return CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); } +/************************************************************************* + * CreateFile2 (KERNEL32.@) + */ +HANDLE WINAPI CreateFile2( LPCWSTR filename, DWORD access, DWORD sharing, DWORD creation, + CREATEFILE2_EXTENDED_PARAMETERS *exparams ) +{ + LPSECURITY_ATTRIBUTES sa = exparams ? exparams->lpSecurityAttributes : NULL; + DWORD attributes = exparams ? exparams->dwFileAttributes : 0; + HANDLE template = exparams ? exparams->hTemplateFile : NULL; + + FIXME("(%s %x %x %x %p), partial stub\n", debugstr_w(filename), access, sharing, creation, exparams); + + return CreateFileW( filename, access, sharing, sa, creation, attributes, template ); +} /*********************************************************************** * DeleteFileW (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 57cc38b..08b225f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -229,6 +229,7 @@ @ stdcall CreateEventW(ptr long long wstr) @ stdcall CreateFiber(long ptr ptr) @ stdcall CreateFiberEx(long long long ptr ptr) +@ stdcall CreateFile2(wstr long long long ptr) @ stdcall CreateFileA(str long long ptr long long long) @ stdcall CreateFileMappingA(long ptr long long long str) @ stdcall CreateFileMappingW(long ptr long long long wstr) diff --git a/include/Makefile.in b/include/Makefile.in index 3da2977..d40284e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -302,6 +302,7 @@ SRCDIR_INCLUDES = \ exdispid.h \ fci.h \ fdi.h \ + fileapi.h \ fltdefs.h \ gdiplus.h \ gdipluscolor.h \ diff --git a/include/fileapi.h b/include/fileapi.h new file mode 100644 index 0000000..02bbbd4 --- /dev/null +++ b/include/fileapi.h @@ -0,0 +1,41 @@ +/* + * Copyright 2013 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FILEAPI_H +#define __WINE_FILEAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _CREATEFILE2_EXTENDED_PARAMETERS { + DWORD dwSize; + DWORD dwFileAttributes; + DWORD dwFileFlags; + DWORD dwSecurityQosFlags; + LPSECURITY_ATTRIBUTES lpSecurityAttributes; + HANDLE hTemplateFile; +} CREATEFILE2_EXTENDED_PARAMETERS, *PCREATEFILE2_EXTENDED_PARAMETERS, *LPCREATEFILE2_EXTENDED_PARAMETERS; + +WINBASEAPI HANDLE WINAPI CreateFile2(LPCWSTR,DWORD,DWORD,DWORD,LPCREATEFILE2_EXTENDED_PARAMETERS); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_FILEAPI_H */

1 0

Ken Thomases : winemac: Don' t allow dead-key state to repeat after characters are generated.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: ae2ce18fd669efb797e11ef0e614be309e83fd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2ce18fd669efb797e11ef0e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 9 22:37:36 2013 -0500 winemac: Don't allow dead-key state to repeat after characters are generated. It's fairly common in Mac keyboard layouts that, if you type a dead key twice, the second key press will both produce a non-dead character and also perpetuate the dead-key state. For example, with the U.S. layout, Option-E, E will produce "�" and Option-E, Option-E, E will produce "��". Windows keyboard layouts don't tend to do this. The second key press produces the non-dead character and clears the dead-key state. --- dlls/winemac.drv/keyboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 98d17ba..cc25789 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1394,7 +1394,10 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState } if (!is_menu) { - thread_data->dead_key_state = deadKeyState; + if (keyAction != kUCKeyActionUp && len > 0 && deadKeyState == thread_data->dead_key_state) + thread_data->dead_key_state = 0; + else + thread_data->dead_key_state = deadKeyState; if (keyAction == kUCKeyActionUp) goto done;

1 0

Henri Verbeet : wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in surface_modify_location().
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: c6ce5486c00b637422ec78c2dfdd584205faf5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ce5486c00b637422ec78c2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:32 2013 +0200 wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in surface_modify_location(). It turns out this is already safe for all callers. --- dlls/wined3d/surface.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 385a994..ee404c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5361,8 +5361,6 @@ static void surface_invalidate_location(struct wined3d_surface *surface, DWORD l void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(location), persistent); @@ -5371,10 +5369,6 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO && (location & SFLAG_INDRAWABLE)) ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); - if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - location |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); - if (persistent) { surface_validate_location(surface, location);

1 0