September 2013 - Wine-Commits

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: docs Branch: master Commit: 2b7c66dc429bf25d51462764d1a8f86a128f1402 URL: http://source.winehq.org/git/docs.git/?a=commit;h=2b7c66dc429bf25d51462764d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:57 2013 +0200 wineusr: Assorted formatting & tagging fixes. --- en/wineusr-bugs.sgml | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 5a66456..931ed6e 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -154,8 +154,15 @@ <para> <ulink url="http://www.freenode.net">Freenode.net</ulink> hosts an IRC channel for Wine. You can access it by using - any IRC client such as Xchat. The settings you'll need are: - server = irc.freenode.net, port = 6667, and channel = #winehq + any IRC client such as <application>Xchat</application>. The settings you'll need are: + <simplelist type="horiz" columns="2"> + <member>server</member> + <member>irc.freenode.net</member> + <member>port</member> + <member>6667</member> + <member>channel</member> + <member>#winehq</member> + </simplelist> </para> </listitem> <listitem> @@ -173,9 +180,9 @@ <listitem> <para> Wine <ulink url="http://www.winehq.org/site/forums#ml">mailing - lists</ulink> may also help, especially wine-users. The - wine-devel list may be appropriate depending on the type of - problem you are experiencing. If you post to wine-devel you + 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 problem. Read the section below to find out how to debug the source of your problem.

1 0

Frédéric Delanoy : wineusr: Do not indent verbatim environments.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

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

Frédéric Delanoy : winelib: Do not indent verbatim environments.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

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 : winedev: Update " Adding New Languages" section.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

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 Sept. 11, 2013

Sept. 11, 2013

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

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

Sept. 10, 2013

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 Sept. 10, 2013

Sept. 10, 2013

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

Andrew Eikum : oleaut32: Don't crash on NULL string arguments.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: 6b4f43e8e6c904319033ff2c1748d7394d9d45a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4f43e8e6c904319033ff2c1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 10 08:45:41 2013 -0500 oleaut32: Don't crash on NULL string arguments. --- dlls/oleaut32/tests/typelib.c | 11 +++++++++++ dlls/oleaut32/typelib.c | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1c398f9..17a3b99 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4243,6 +4243,8 @@ static void test_SetFuncAndParamNames(void) static OLECHAR nameW[] = {'n','a','m','e',0}; static OLECHAR prop[] = {'p','r','o','p',0}; static OLECHAR *propW[] = {prop}; + static OLECHAR func[] = {'f','u','n','c',0}; + static OLECHAR *funcW[] = {func, NULL}; CHAR filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; @@ -4309,6 +4311,15 @@ static void test_SetFuncAndParamNames(void) hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 3, propW, 1); ok(hr == TYPE_E_AMBIGUOUSNAME, "got 0x%08x\n", hr); + /* regular function */ + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 1; + hr = ICreateTypeInfo_AddFuncDesc(cti, 4, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 4, funcW, 2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICreateTypeInfo_Release(cti); ICreateTypeLib2_Release(ctl); DeleteFileA(filenameA); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 328e28a..afcdc5c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1889,6 +1889,9 @@ static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) { TLBString *str; + if(!new_str) + return NULL; + LIST_FOR_EACH_ENTRY(str, string_list, TLBString, entry) { if (strcmpW(str->str, new_str) == 0) return str;

1 0

Stefan Dösinger : d3d9/tests: Actually accept r500 results.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: c0a14564d33aad52c4500b90da8eea3f0810283d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a14564d33aad52c4500b90d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:04 2013 +0200 d3d9/tests: Actually accept r500 results. --- dlls/d3d9/tests/visual.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b856c93..cb04c01 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12728,11 +12728,12 @@ static void fp_special_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, vs_body[i].r600, 1) + ok(color_match(color, vs_body[i].r500, 1) + || color_match(color, vs_body[i].r600, 1) || color_match(color, vs_body[i].nv40, 1) || color_match(color, vs_body[i].nv50, 1), - "Expected color 0x%08x, 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", - vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color); + "Expected color 0x%08x, 0x%08x, 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", + vs_body[i].r500, vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d9/tests: Use a plain depth stencil instead of a texture.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: ff14c24dd2e1fd7e697e7c3bd2a3a37088e419f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff14c24dd2e1fd7e697e7c3bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:03 2013 +0200 d3d9/tests: Use a plain depth stencil instead of a texture. r500 does not support anything but AMD's extension depth texture formats on Windows 7. Plain surfaces work OK with the builtin formats. --- dlls/d3d9/tests/d3d9ex.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2deef76..470e8a4 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -861,12 +861,9 @@ static void test_reset_resources(void) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, - D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); - IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface);

1 0