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

Michael Stefaniuc : ntdll: Use IsEqualGUID instead of memcmp to compare GUIDs.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 76c06a6d9448ef2c29a012bf74c231af28e6a951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c06a6d9448ef2c29a012bf7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 27 10:17:50 2010 +0200 ntdll: Use IsEqualGUID instead of memcmp to compare GUIDs. --- dlls/ntdll/tests/rtlstr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 5dd3500..91233a5 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1841,7 +1841,7 @@ static void test_RtlGUIDFromString(void) ret = pRtlGUIDFromString(&str, &guid); ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); - ok(memcmp(&guid, &IID_Endianess, sizeof(guid)) == 0, "Endianess broken\n"); + ok(IsEqualGUID(&guid, &IID_Endianess), "Endianess broken\n"); str.Length = str.MaximumLength = sizeof(szGuid2) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid2;

1 0

Frédéric Delanoy : Fix French about page
by Jeremy Newman 28 Jul '10

28 Jul '10

Module: website Branch: master Commit: 846cec75e34c401c084563a6ab34dc65ade18fed URL: http://source.winehq.org/git/website.git/?a=commit;h=846cec75e34c401c084563… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 28 11:46:09 2010 +0200 Fix French about page >From 42afd515dbbdbfbde4865233d1111879ab1ada99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Wed, 28 Jul 2010 11:45:09 +0200 Subject: Fix French about page --- templates/fr/about.template | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/fr/about.template b/templates/fr/about.template index f989cd7..bc29852 100644 --- a/templates/fr/about.template +++ b/templates/fr/about.template @@ -1,7 +1,7 @@   -<h1 class="title">About Wine</h1> +<h1 class="title">À propos de Wine</h1> <p>Wine vous permet d'exécuter des logiciels Windows sous d'autres systèmes d'exploitation. Avec Wine, vous pouvez installer et exécuter ces applications, @@ -9,9 +9,9 @@ exactement comme vous le feriez sous Windows.</p> <p>Wine est toujours en cours de développement actif. Tous les programmes ne fonctionnent pas encore, mais il y a déjà <a -href="http://wiki.winehq.org/UsageStatistics" title="Statistiques d'utilisation -de Wine">plusieurs millions de personnes</a> qui utilisent Wine pour faire -tourner leurs logiciels.</p> +href="http://wiki.winehq.org/UsageStatistics" +title="Statistiques d'utilisation de Wine">plusieurs millions de personnes</a> +qui utilisent Wine pour faire tourner leurs logiciels.</p> <h3>Open Source et conduit par ses utilisateurs</h3> @@ -23,11 +23,11 @@ title="Codeweavers Crossover Office">Codeweavers</a> qui vend une version de Wine avec du support.</p> <p>Wine dépend fortement de sa communauté d'utilisateurs. Les tests des -utilisateurs composant notre <a href="http://appdb.winehq.org/" title="Base de -données d'applications de Wine">Base de données d'applications</a> permettent de -vérifier la façon dont les programmes fonctionnent, et toutes les réponses des <a -href="http://forums.winehq.org/" title="Forums WineHQ">forums</a> proviennent de -volontaires.</p> +utilisateurs composant notre <a href="http://appdb.winehq.org/" +title="Base de données d'applications de Wine">base de données d'applications</a> +permettent de vérifier la façon dont les programmes fonctionnent, et toutes les +réponses des <a href="http://forums.winehq.org/" title="Forums WineHQ">forums</a> +proviennent de volontaires.</p> <h3>En savoir plus :</h3> <ul>

1 0

Frédéric Delanoy : Update French translation of ' About Wine' page
by Jeremy Newman 27 Jul '10

27 Jul '10

Module: website Branch: master Commit: 7425ff45ff74cb0773e4f510af7fb4d028863377 URL: http://source.winehq.org/git/website.git/?a=commit;h=7425ff45ff74cb0773e4f5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 27 11:25:06 2010 +0200 Update French translation of 'About Wine' page >From d9eb3a4cf56f7fbaf972ed3418c82e91524117a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Tue, 27 Jul 2010 11:22:49 +0200 Subject: Update French translation of 'About Wine' page --- templates/fr/about.template | 77 ++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 40 deletions(-) diff --git a/templates/fr/about.template b/templates/fr/about.template index 68629e2..f989cd7 100644 --- a/templates/fr/about.template +++ b/templates/fr/about.template @@ -1,49 +1,46 @@   -<h1 class="title">À propos de Wine</h1> - -<p>Wine est une couche de traduction (un chargeur de programme) capable d'exécuter -des applications Windows sous Linux et d'autres systèmes d'exploitation compatibles -POSIX. Les programmes Windows exécutés par Wine agissent comme le feraient des programmes natifs, -c'est à dire sans pénalités de performances ou d'utilisation de mémoire (ce qui serait le cas avec un émulateur) et -avec un aspect et une utilisation similaire aux autres applications de votre environnement de travail.</p> - -<p>Le projet Wine a débuté en 1993 comme un moyen d'exécuter des -programmes Windows 3.1 sous Linux. Bob Amstadt était le coordinateur -à l'origine, mais Alexandre Julliard a rapidement pris le relai et -continue de gérer le projet jusqu'à aujourd'hui. Au cours des années -le projet a été porté pour d'autres Unixes et le support pour les applications -Win32 a été ajouté au fur et à mesure que celles-ci sont devenues populaires.</p> - -<p>Wine est toujours en cours de développement et n'est pas prévu pour une utilisation -générale. Néanmoins, de nombreuses personnes le trouve utile pour exécuter un nombre -grandissant de programmes Windows. Veuillez vous rapporter à la -<a href="http://appdb.winehq.org/">base de données des applications</a> -pour des rapports concernant le succès ou l'échec de l'exécution de centaines de programmes -Windows, ainsi qu'à la <a href="http://bugs.winehq.org/">base de données de suivi des -anomalies</a> pour une liste des problèmes connus et, finalement, à la page -<a href="{$root}/status">État</a> pour une vue globale de l'état d'implémentation de Wine.</p> - -<p>Une grande partie des développeurs de Wine peuvent être contactés dans les -<a href="{$root}/forums">forums de Wine</a>. Les commentaires à propos du site winehq.org -peuvent être envoyés par courriel à <a -href="mailto:web-admin_at_winehq.org">web-admin_at_winehq.org</a>. Alexandre -Julliard mène le projet Wine et peut être contacté par courriel à -<a href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a>.</p> - -<p>Nous avons également mis en place une courte liste de resources qui vous aideront a comprendre le projet :</p> +<h1 class="title">About Wine</h1> + +<p>Wine vous permet d'exécuter des logiciels Windows sous d'autres systèmes +d'exploitation. Avec Wine, vous pouvez installer et exécuter ces applications, +exactement comme vous le feriez sous Windows.</p> + +<p>Wine est toujours en cours de développement actif. Tous les programmes ne +fonctionnent pas encore, mais il y a déjà <a +href="http://wiki.winehq.org/UsageStatistics" title="Statistiques d'utilisation +de Wine">plusieurs millions de personnes</a> qui utilisent Wine pour faire +tourner leurs logiciels.</p> + +<h3>Open Source et conduit par ses utilisateurs</h3> + +<p>Wine sera toujours du <a href="http://wiki.winehq.org/Licensing" +title="Licence de Wine">logiciel libre</a>. À peu près la moitié du code source +de Wine est écrite par des volontaires. Le reste est sponsorisé par des intérêts +commerciaux, en particulier <a href="http://www.codeweavers.com/products/" +title="Codeweavers Crossover Office">Codeweavers</a> qui vend une version de +Wine avec du support.</p> + +<p>Wine dépend fortement de sa communauté d'utilisateurs. Les tests des +utilisateurs composant notre <a href="http://appdb.winehq.org/" title="Base de +données d'applications de Wine">Base de données d'applications</a> permettent de +vérifier la façon dont les programmes fonctionnent, et toutes les réponses des <a +href="http://forums.winehq.org/" title="Forums WineHQ">forums</a> proviennent de +volontaires.</p> + +<h3>En savoir plus :</h3> <ul> - <li><a href="{$root}/history">L'historique de Wine</a></li> - <li><a href="{$root}/why">Pourquoi Wine est-il si important ?</a></li> - <li><a href="{$root}/myths">Démonter les mythes sur Wine</a></li> - <li><a href="{$root}/wine_features">Fonctionnalités de Wine</a></li> - <li><a href="{$root}/acknowledgement">Remerciements</a></li> - <li><a href="{$root}/wwn">World Wine News : les nouvelles de Wine</a></li> - <li><a href="{$root}/interview">Interviews</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Pourquoi Wine est-il +si important</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Mythes courants +sur Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Historique du projet Wine</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation du +projet</a></li> </ul> <hr> <div class="link-container"> - <p class="right-link">Wine's History: <a href="{$root}/history">Next</a></p> + <p class="right-link">Historique de Wine : <a href="{$root}/history">Suivant</a></p> </div>

1 0

Louis Lenders : d3d9/tests: Test GetAdapterDisplayModeEx with D3DDISPLAYROTATION null-pointer.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 5a05950271987d4dbfc4a9d84924276dc4056760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a05950271987d4dbfc4a9d84… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jul 25 21:05:55 2010 +0200 d3d9/tests: Test GetAdapterDisplayModeEx with D3DDISPLAYROTATION null-pointer. --- dlls/d3d9/tests/d3d9ex.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index f84ad7d..6e11116 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -312,10 +312,26 @@ static void test_get_adapter_displaymode_ex(void) /* check that orientation is returned correctly by GetAdapterDisplayModeEx and EnumDisplaySettingsEx*/ todo_wine ok(startmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, startmode.dmDisplayOrientation); - /* return to the default mode */ - pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); + + /* test GetAdapterDisplayModeEx with null pointer for D3DDISPLAYROTATION */ + memset(&mode_ex, 0, sizeof(mode_ex)); + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, D3DADAPTER_DEFAULT, &mode_ex, NULL); + todo_wine ok(SUCCEEDED(hr), "GetAdapterDisplayModeEx failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d\n", mode_ex.Size); + todo_wine ok(mode_ex.Width == mode.Width, "width is %d instead of %d\n", mode_ex.Width, mode.Width); + todo_wine ok(mode_ex.Height == mode.Height, "height is %d instead of %d\n", mode_ex.Height, mode.Height); + todo_wine ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d\n", mode_ex.RefreshRate, mode.RefreshRate); + todo_wine ok(mode_ex.Format == mode.Format, "format is %x instead of %x\n", mode_ex.Format, mode.Format); + /* don't know yet how to test for ScanLineOrdering, just testing that it is set to a value by GetAdapterDisplayModeEx*/ + todo_wine ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); + + /* return to the default mode */ + pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); out: IDirect3D9_Release(d3d9); IDirect3D9Ex_Release(d3d9ex);

1 0

Matteo Bruni : wined3d: Setup target if offscreen rendering setting changed .
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 20f51c29a99299384e840e148f02aae66bfb45be URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f51c29a99299384e840e148… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Jun 28 21:13:56 2010 +0200 wined3d: Setup target if offscreen rendering setting changed. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/swapchain.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 949e137..2ddb02b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2242,8 +2242,8 @@ static void context_setup_target(IWineD3DDeviceImpl *device, const struct StateEntry *StateTable = device->StateTable; if (!target) return; - else if (context->current_rt == target) return; render_offscreen = surface_is_offscreen(target); + if (context->current_rt == target && render_offscreen == old_render_offscreen) return; context_set_render_offscreen(context, StateTable, render_offscreen); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6f99dc1..2245f0c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -334,9 +334,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO surface_load_location(This->back_buffers[0], SFLAG_INTEXTURE, NULL); surface_modify_location(This->back_buffers[0], SFLAG_INDRAWABLE, FALSE); This->render_to_fbo = TRUE; - - /* Force the context manager to update the render target configuration next draw. */ - context->current_rt = NULL; } if(This->render_to_fbo)

1 0

Marko Nikolic : advapi32: Removed sign comparison warning.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: da2750384dd21868395d8d43807bef7c300c3cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2750384dd21868395d8d438… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jul 24 17:21:22 2010 +0200 advapi32: Removed sign comparison warning. --- dlls/advapi32/cred.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 03d7622..0afbb63 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -925,7 +925,7 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) * */ -static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len) +static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD len) { char *buffer; INT string_len; @@ -1582,7 +1582,8 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) { PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; - INT len, i; + INT len; + DWORD i; WCHAR *buffer, *end; BOOL ret; PCREDENTIALW* CredentialsW;

1 0

Aurimas Fišeras : shdocvw: Add Lithuanian translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 5ffa1dae363d0c339a033e97e0c9b5ed88227341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffa1dae363d0c339a033e97e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 25 19:20:50 2010 +0300 shdocvw: Add Lithuanian translation. --- dlls/shdocvw/Lt.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc new file mode 100644 index 0000000..e35a2d8 --- /dev/null +++ b/dlls/shdocvw/Lt.rc @@ -0,0 +1,60 @@ +/* + * Copyright 2010 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Atverti URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nurodykite URL, kurį norite atverti su Internet Explorer",-1,30, 5, 150,15 + LTEXT "Atverti:", -1, 2, 32, 25, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 30, 30, 160, 13 + DEFPUSHBUTTON "&Gerai", IDOK, 30, 50, 50, 15 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 90, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Failas" + { + POPUP "&Naujas" + { + MENUITEM "&Langas" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Atverti...", ID_BROWSE_OPEN + MENUITEM "&Išsaugoti", ID_BROWSE_SAVE + MENUITEM "Išsaugoti &kaip...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Spaudinio &formatas...", ID_BROWSE_PRINT_FORMAT + MENUITEM "S&pausdinti...", ID_BROWSE_PRINT + MENUITEM "Spaudinio pe&ržiūra...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES + } + POPUP "&Žinynas" + { + MENUITEM "&Apie Internet Explorer...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 18f9a88..182aa01 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -31,6 +31,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Lt.rc \ Nl.rc \ Uk.rc \ shdocvw.rc

1 0

Hwang YunSong : shdocvw: New Korean resource.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: e1a6ba3a29fe6698450a2995226f4729c334d757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a6ba3a29fe6698450a29952… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 26 10:45:47 2010 +0900 shdocvw: New Korean resource. --- dlls/shdocvw/Ko.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Ko.rc b/dlls/shdocvw/Ko.rc new file mode 100644 index 0000000..a612609 --- /dev/null +++ b/dlls/shdocvw/Ko.rc @@ -0,0 +1,60 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 YunSOng Hwang + * + * 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 + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "URL 열기" +FONT 8, "MS Shell Dlg" +{ + LTEXT "인터넷 익스플로어로 열 URL 지정",-1,25, 5, 150,15 + LTEXT "열기:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "확인(&O)", IDOK, 25, 50, 50, 15 + PUSHBUTTON "취소(&C)", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "파일(&F)" + { + POPUP "새 작업(&N)" + { + MENUITEM "창(&W)" ID_BROWSE_NEW_WINDOW + } + MENUITEM "열기(&O)...", ID_BROWSE_OPEN + MENUITEM "저장(&S)", ID_BROWSE_SAVE + MENUITEM "다른 이름으로 저장(&A)...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "인쇄 형식(&F)...", ID_BROWSE_PRINT_FORMAT + MENUITEM "인쇄(&I)...", ID_BROWSE_PRINT + MENUITEM "인쇄 미리보기(&W)...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "속성(&P)...", ID_BROWSE_PROPERTIES + } + POPUP "도움말(&H)" + { + MENUITEM "인터넷 익스플로어 정보(&A)...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 182aa01..bff1a3d 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -31,6 +31,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Ko.rc \ Lt.rc \ Nl.rc \ Uk.rc \

1 0

Hwang YunSong : start: Update Korean resource.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 0379acc27d23d485bcd6715b00398124479fe0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0379acc27d23d485bcd6715b0… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 26 10:46:16 2010 +0900 start: Update Korean resource. --- programs/start/Ko.rc | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index b1ca3e9..a7f0980 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -3,7 +3,7 @@ * Korean Language Support * * Copyright 2003 Dan Kegel - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,23 +22,25 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { -STRING_USAGE, "Ǯ�׸�� Ű�ų� �� Ͽ� ÷��ؼ� ��Ǵ� Ǯ�׸�� \n\ +STRING_USAGE,"풀그림을 실행시키거나 보통 파일에 첨가해서 사용되는 풀그림으로 문서 열기\n\ Usage:\n\ -start [�ɼ�] Ǯ�׸��̳� �� ̸� [...]\n\ -start [�ɼ�] �� ̸�\n\ +start [옵션] 풀그림이나 파일 이름 [...]\n\ +start [옵션] 문서 파일 이름\n\ \n\ Options:\n\ -/M[inimized] Ǯ�׸� �ּ�ȭ ��·� ��.\n\ -/MAX[imized] Ǯ�׸� �ִ�ȭ ��·� ��.\n\ -/R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�).\n\ -/W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��.\n\ -/Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��.\n\ -/ProgIDOpen �� progID�� ؼ� �� .\n\ -/L �� ̼�� \n\ +/M[inimized] 풀그림 최소화 상태로 실행.\n\ +/MAX[imized] 풀그림 최대화 상태로 실행.\n\ +/R[estored] 풀그림을 보통상태로 시작시키기 (최소화도 아니고 최대화도 아님).\n\ +/W[ait] 시작된 풀그림이 끝날 때까지 기다림, 끝날 때 종료코드를 남김.\n\ +/Unix 윈도우 익스플로어같이 유닉스 파일이름을 사용해서 시작.\n\ +/ProgIDOpen 지정한 progID를 사용해서 문서 열기.\n\ +/L 사용자 라이센스 보여줌\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n\ @@ -64,7 +66,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ See the COPYING.LIB file for license information.\n\ " -STRING_EXECFAIL "��α׷�� ų�, �� Ͽ� �� α׷�� ϴ�.\nShellExecuteEx ��" +STRING_EXECFAIL "프로그램을 실행할 수 없거나, 지정된 파일에 연결된 프로그램이 없습니다.\nShellExecuteEx 실패" -STRING_UNIXFAIL "�� Unix ��ϸ�� DOS ��ϸ�� ٲ� �� ϴ�." +STRING_UNIXFAIL "지정된 Unix 파일명을 DOS 파일명으로 바꿀 수 없습니다." }

1 0

Maarten Lankhorst : mmdevapi: Blacklist portaudio.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 47d28ace151390d102a34c51ce5d0ed3abad5e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d28ace151390d102a34c51c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun May 30 19:18:35 2010 +0200 mmdevapi: Blacklist portaudio. --- dlls/mmdevapi/devenum.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 85eeb5e..6fa637f 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -756,6 +756,8 @@ static int blacklist(const char *dev) { return 1; if (!strncmp(dev, "ALSA ", 5) && strstr(dev, "hw:")) return 1; + if (!strncmp(dev, "PortAudio ", 10)) + return 1; return 0; }

1 0