January 2012 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the WINED3DMATERIALCOLORSOURCE typedef.
by Alexandre Julliard Jan. 5, 2012

Jan. 5, 2012

Module: wine Branch: master Commit: c3cc92e472b59a9b7727d18151af42f2b368f9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cc92e472b59a9b7727d1815… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 23:34:55 2012 +0100 wined3d: Get rid of the WINED3DMATERIALCOLORSOURCE typedef. --- dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d.h | 11 +++++------ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a68fae9..3c5220e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1264,47 +1264,47 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE], state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); - if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { - if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) Parm = GL_AMBIENT_AND_DIFFUSE; else Parm = GL_DIFFUSE; - if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_AMBIENT; - if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_EMISSION; - if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_SPECULAR; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0f9d07c..1dd6b9c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1176,10 +1176,10 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_COLORVERTEX] = TRUE; state->render_states[WINED3D_RS_LOCALVIEWER] = TRUE; state->render_states[WINED3D_RS_NORMALIZENORMALS] = FALSE; - state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] = WINED3DMCS_COLOR1; - state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] = WINED3DMCS_COLOR2; - state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] = WINED3DMCS_MATERIAL; - state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] = WINED3DMCS_MATERIAL; + state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] = WINED3D_MCS_COLOR1; + state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] = WINED3D_MCS_COLOR2; + state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] = WINED3D_MCS_MATERIAL; + state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] = WINED3D_MCS_MATERIAL; state->render_states[WINED3D_RS_VERTEXBLEND] = WINED3D_VBF_DISABLE; state->render_states[WINED3D_RS_CLIPPLANEENABLE] = 0; state->render_states[WINED3D_RS_SOFTWAREVERTEXPROCESSING] = FALSE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb09168..254a839 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -481,13 +481,12 @@ enum wined3d_stencil_op WINED3D_STENCIL_OP_DECR = 8, }; -typedef enum _WINED3DMATERIALCOLORSOURCE +enum wined3d_material_color_source { - WINED3DMCS_MATERIAL = 0, - WINED3DMCS_COLOR1 = 1, - WINED3DMCS_COLOR2 = 2, - WINED3DMCS_FORCE_DWORD = 0x7fffffff -} WINED3DMATERIALCOLORSOURCE; + WINED3D_MCS_MATERIAL = 0, + WINED3D_MCS_COLOR1 = 1, + WINED3D_MCS_COLOR2 = 2, +}; typedef enum _WINED3DPATCHEDGESTYLE {

1 0

Dmitry Timoshkov : user32: Add an invalid window check to SetActiveWindow.
by Alexandre Julliard Jan. 5, 2012

Jan. 5, 2012

Module: wine Branch: master Commit: 98e2bf4e1ccd5ffa4fbadf08a951754ff1cc7945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e2bf4e1ccd5ffa4fbadf08a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 5 17:58:30 2012 +0800 user32: Add an invalid window check to SetActiveWindow. --- dlls/user32/focus.c | 12 +++++++++--- dlls/user32/tests/msg.c | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 9fdae25..6b5312f 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -232,12 +232,18 @@ HWND WINAPI SetActiveWindow( HWND hwnd ) if (hwnd) { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style; + hwnd = WIN_GetFullHandle( hwnd ); + if (!IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + + style = GetWindowLongW( hwnd, GWL_STYLE ); if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return GetActiveWindow(); /* Windows doesn't seem to return an error here */ - - hwnd = WIN_GetFullHandle( hwnd ); } if (!set_active_window( hwnd, &prev, FALSE, TRUE )) return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6fa4d10..6f40a0b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13602,10 +13602,9 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_active = SetActiveWindow((HWND)0xdeadbeef); -todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); - ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", TRUE); + ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", FALSE); ok(old_active == 0, "expected old focus 0, got %p\n", old_active); ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus());

1 0

André Hentschel : Assorted header comment cleanup.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: b5ba054ce8856c48a9a7c7afeefe6f9ed886e865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ba054ce8856c48a9a7c7afe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 4 19:31:24 2012 +0100 Assorted header comment cleanup. --- dlls/amstream/amstream.c | 3 --- dlls/amstream/amstream_private.h | 3 --- dlls/amstream/main.c | 3 --- dlls/amstream/mediastream.c | 3 --- dlls/amstream/mediastreamfilter.c | 3 --- dlls/d3drm/d3drm_private.h | 3 --- dlls/d3drm/meshbuilder.c | 3 --- dlls/d3dxof/d3dxof_private.h | 3 --- dlls/d3dxof/main.c | 3 --- dlls/d3dxof/parsing.c | 3 --- dlls/ddraw/surface.c | 3 --- dlls/ddrawex/main.c | 3 --- dlls/qcap/capture.h | 3 --- dlls/qedit/qedit_private.h | 3 --- dlls/quartz/enummoniker.c | 3 --- dlls/quartz/filtergraph.c | 3 --- dlls/quartz/main.c | 3 --- dlls/quartz/quartz_private.h | 3 --- dlls/winegstreamer/gst_guids.h | 3 --- dlls/winegstreamer/gst_private.h | 3 --- 20 files changed, 0 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5ba054ce8856c48a9a7c…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 83507c8dd80a1945d13f17dcd370072346f9f2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=83507c8dd80a1945d13f17dcd… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Jan 3 21:35:04 2012 +0100 po: Update Italian translation. --- po/it.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/it.po b/po/it.po index 08b9c3c..27d2a48 100644 --- a/po/it.po +++ b/po/it.po @@ -1,11 +1,11 @@ # Italian translations for Wine -# Luca Bennati <lucak3(a)gmail.com>, 2011. +# Luca Bennati <lucak3(a)gmail.com>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-30 18:15+0100\n" +"PO-Revision-Date: 2012-01-03 21:32+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -8433,9 +8433,8 @@ msgid "The specified device handle is invalid." msgstr "L'handle del dispositivo specificato non è valido." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "Non è stato installato nessun driver nel sistema !\n" +msgstr "Non è presente nessun driver installato nel sistema!" #: winmm.rc:35 winmm.rc:61 msgid ""

1 0

Piotr Caban : msvcp60: Added partial exceptions support.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: f14fd4add680995cf0524d4979f1c8fb619193d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14fd4add680995cf0524d497… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 4 15:44:48 2012 +0100 msvcp60: Added partial exceptions support. --- dlls/msvcp60/exception.c | 261 ++++++++++++++++++++++++++++++++------------ dlls/msvcp60/msvcp60.spec | 122 +++++++++++----------- 2 files changed, 251 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f14fd4add680995cf0524…

1 0

André Hentschel : d3drm: Add IDirect3DRMFrame3 interface.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 9aaa01ecc506cb5307f6880a8b0eb86683bad2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aaa01ecc506cb5307f6880a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 4 19:12:32 2012 +0100 d3drm: Add IDirect3DRMFrame3 interface. --- dlls/d3drm/d3drm.c | 11 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/frame.c | 1033 +++++++++++++++++++++++++++++++++++++++++++- include/d3drmobj.h | 1 + 4 files changed, 1036 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9aaa01ecc506cb5307f68…

1 0

Piotr Caban : msvcp60: Don't forward _Lockit calls to msvcp90.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: ee3e873e370b87d460bcc8fc1d71f9e27078292f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3e873e370b87d460bcc8fc1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 4 15:44:31 2012 +0100 msvcp60: Don't forward _Lockit calls to msvcp90. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index f0a87ab..bbaee6f 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -827,8 +827,8 @@ @ stub -arch=win64 ??0_Locinfo(a)std@@QEAA(a)HPEBD@Z # don't forward to msvcp90 @ stub -arch=win32 ??0_Locinfo(a)std@@QAE(a)PBD@Z # don't forward to msvcp90 @ stub -arch=win64 ??0_Locinfo(a)std@@QEAA(a)PEBD@Z # don't forward to msvcp90 -@ thiscall -arch=win32 ??0_Lockit(a)std@@QAE(a)XZ(ptr) msvcp90.??0_Lockit(a)std@@QAE(a)XZ -@ cdecl -arch=win64 ??0_Lockit(a)std@@QEAA(a)XZ(ptr) msvcp90.??0_Lockit(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??0_Lockit(a)std@@QAE(a)XZ(ptr) _Lockit_ctor +@ cdecl -arch=win64 ??0_Lockit(a)std@@QEAA(a)XZ(ptr) _Lockit_ctor @ stub -arch=win32 ??0_Timevec(a)std@@QAE(a)ABV01@@Z # don't forward to msvcp90 @ stub -arch=win64 ??0_Timevec(a)std@@QEAA(a)AEBV01@@Z # don't forward to msvcp90 @ stub -arch=win32 ??0_Timevec(a)std@@QAE(a)PAX@Z # don't forward to msvcp90 @@ -1039,8 +1039,8 @@ @ stub -arch=win64 ??1Init(a)ios_base@std@@QEAA(a)XZ @ stub -arch=win32 ??1_Locinfo(a)std@@QAE(a)XZ # don't forward to msvcp90 @ stub -arch=win64 ??1_Locinfo(a)std@@QEAA(a)XZ # don't forward to msvcp90 -@ thiscall -arch=win32 ??1_Lockit(a)std@@QAE(a)XZ(ptr) msvcp90.??1_Lockit(a)std@@QAE(a)XZ -@ cdecl -arch=win64 ??1_Lockit(a)std@@QEAA(a)XZ(ptr) msvcp90.??1_Lockit(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??1_Lockit(a)std@@QAE(a)XZ(ptr) _Lockit_dtor +@ cdecl -arch=win64 ??1_Lockit(a)std@@QEAA(a)XZ(ptr) _Lockit_dtor @ stub -arch=win32 ??1_Timevec(a)std@@QAE(a)XZ # don't forward to msvcp90 @ stub -arch=win64 ??1_Timevec(a)std@@QEAA(a)XZ # don't forward to msvcp90 @ stub -arch=win32 ??1_Winit(a)std@@QAE(a)XZ

1 0

Piotr Caban : msvcp60: Added basic_string<char> support.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 500f279efd31d19c09bc23c474212209d71e3d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500f279efd31d19c09bc23c47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 4 15:44:07 2012 +0100 msvcp60: Added basic_string<char> support. string.c file is based on msvcp90/string.c, there are many differences between these files. Other files were copied from msvcp90. --- dlls/msvcp60/Makefile.in | 10 +- dlls/msvcp60/exception.c | 646 +++++++++++++++++ dlls/msvcp60/main.c | 122 ++++ dlls/msvcp60/memory.c | 338 +++++++++ dlls/msvcp60/misc.c | 221 ++++++ dlls/msvcp60/msvcp.h | 281 ++++++++ dlls/msvcp60/msvcp60.c | 37 - dlls/msvcp60/msvcp60.spec | 656 +++++++++--------- dlls/msvcp60/string.c | 1759 +++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 3704 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=500f279efd31d19c09bc2…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 50b4b20909ecc02d74f535668fad2fb1ec98c967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b4b20909ecc02d74f535668… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 4 18:36:08 2012 +0100 po: Update German translation. --- po/de.po | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 619bbe6..6f3b780 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: 2012-01-01 16:28+0100\n" +"PO-Revision-Date: 2012-01-04 18:34+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -1354,7 +1354,7 @@ msgstr "Ausgeber des Zertifikationsautorität" #: crypt32.rc:57 msgid "Certification Template Name" -msgstr "Zertifkationsvorlagenname" +msgstr "Zertifikationsvorlagenname" #: crypt32.rc:58 msgid "Certificate Type" @@ -1382,7 +1382,7 @@ msgstr "Netscape CA Sperrungs-URL" #: crypt32.rc:64 msgid "Netscape Cert Renewal URL" -msgstr "Netscape Zertifikationsernerung-URL" +msgstr "Netscape Zertifikationserneuerungs-URL" #: crypt32.rc:65 msgid "Netscape CA Policy URL" @@ -1534,7 +1534,7 @@ msgstr "Anwendungsrichtlinienzuordnungen" #: crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "Anwendungsungsrichtlinieneinschränkungen" +msgstr "Anwendungsrichtlinieneinschränkungen" #: crypt32.rc:103 msgid "CMC Data" @@ -3292,7 +3292,7 @@ msgstr "URL öffnen" #: ieframe.rc:90 msgid "Specify the URL you wish to open in Internet Explorer" -msgstr "Geben Sie die Url ein, die Sie mit Internet Explorer öffnen möchten" +msgstr "Geben Sie die URL ein, die Sie mit Internet Explorer öffnen möchten" #: ieframe.rc:91 msgid "Open:" @@ -3372,7 +3372,7 @@ msgid "" "Temporary internet files\n" "Cached copies of webpages, images and certificates." msgstr "" -"&Temporäre Inernetdateien\n" +"&Temporäre Internetdateien\n" "Zwischengespeicherte Kopien von Webseiten, Bildern und Zertifikaten." #: inetcpl.rc:70 @@ -4504,7 +4504,7 @@ msgstr "Dienst ist deaktiviert\n" #: winerror.mc:1171 msgid "Circular dependency\n" -msgstr "Zirkuläre Abhängigkeit\n" +msgstr "Zirkulare Abhängigkeit\n" #: winerror.mc:1176 msgid "Service does not exist\n" @@ -8391,7 +8391,7 @@ msgstr "" #: wininet.rc:27 msgid "The date on the certificate is invalid." -msgstr "Das Datum des Zertifkats ist ungültig." +msgstr "Das Datum des Zertifikats ist ungültig." #: wininet.rc:28 msgid "The name on the certificate does not match the site." @@ -8434,9 +8434,8 @@ msgid "The specified device handle is invalid." msgstr "Das angegebene Gerätehandle ist ungültig." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "Es ist kein Treiber auf Ihrem System installiert !\n" +msgstr "Es ist kein Treiber auf Ihrem System installiert!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -8671,7 +8670,7 @@ msgstr "" #: winmm.rc:78 msgid "Cannot determine the device type from the given filename extension." msgstr "" -"Kann keinen Gerätetyp aus der angegebenen Dateinamenerweiterung ermitteln." +"Kann keinen Gerätetyp aus der angegebenen Dateinamenserweiterung ermitteln." #: winmm.rc:79 msgid "The specified parameter is out of range for the specified command." @@ -8809,7 +8808,7 @@ msgid "" "characters, followed by a period and an extension." msgstr "" "Der Dateiname ist ungültig. Der Dateiname muss aus maximal 8 Zeichen, " -"gefolgt von einem Punkt und einer Dateinamenerweiterung bestehen." +"gefolgt von einem Punkt und einer Dateinamenserweiterung bestehen." #: winmm.rc:100 msgid "" @@ -9800,7 +9799,7 @@ msgid "" "stack, and then changes the current directory to the supplied one.\n" msgstr "" "PUSHD <Verzeichnisname> speichert das aktuelle\n" -"Verzeichnis auf einem Stack und wecheselt das Arbeitsverzeichnis\n" +"Verzeichnis auf einem Stack und wechselt das Arbeitsverzeichnis\n" "zu dem angegebenen.\n" #: cmd.rc:223 @@ -9822,13 +9821,13 @@ msgid "" "Specifying no file type after the equal sign removes the current " "association, if any.\n" msgstr "" -"ASSOC zeigt oder ändert Dateierweiterungs Zuordungen\n" +"ASSOC zeigt oder ändert Dateierweiterungs Zuordnungen\n" "\n" "Syntax: ASSOC [.erw[=[Dateityp]]]\n" "\n" -"ASSOC zeigt ohne Parameter die aktuellen Dateierweiterungs Zuordungen an.\n" -"Mit nur einer Dateierweiterung, wird die aktuelle Zurordung angezeigt.\n" -"Ohne Zuordung nach dem Gleichheitszeichen wird die aktuelle Zuordnung " +"ASSOC zeigt ohne Parameter die aktuellen Dateierweiterungs Zuordnungen an.\n" +"Mit nur einer Dateierweiterung, wird die aktuelle Zuordnung angezeigt.\n" +"Ohne Zuordnung nach dem Gleichheitszeichen wird die aktuelle Zuordnung " "gelöscht, falls es eine gab.\n" #: cmd.rc:242 @@ -9932,7 +9931,7 @@ msgstr "" "ENDLOCAL\tBeendet die Begrenzung der Gültigkeit von Änderungen\n" "FTYPE\t\tZeigt oder ändert die Öffnen-Befehle zu Dateierweiterungs " "Zuordungen\n" -"HELP\t\tZeigt detalierte Informationen zu einen Thema\n" +"HELP\t\tZeigt detaillierte Informationen zu einen Thema\n" "MD (MKDIR)\tErzeugt ein Unterverzeichnis\n" "MORE\t\tZeigt die Ausgabe seitenweise an\n" "MOVE\t\tBewegt eine oder mehrere Dateien oder einen Verzeichnisbaum\n" @@ -12133,7 +12132,7 @@ msgstr "Versteckt den Task-Manager, wenn er minimiert ist" #: taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting" msgstr "" -"Zwingt den Task Manager zu einer Aktualisierung, unabhänig von der " +"Zwingt den Task Manager zu einer Aktualisierung, unabhängig von der " "Aktualisierungsgeschwindigkeit" #: taskmgr.rc:193 @@ -12186,7 +12185,7 @@ msgstr "Stellt die Fenster hintereinander auf dem Desktop dar" #: taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" -msgstr "Holt das Fenster in den Vordergrund, aber wechslt nicht zu diesem" +msgstr "Holt das Fenster in den Vordergrund, aber wechselt nicht zu diesem" #: taskmgr.rc:211 msgid "Displays Task Manager help topics" @@ -14148,7 +14147,7 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "Ist '%1' eine Datei oder ein Verzeichnis\n" -"am Zielsort?\n" +"am Zielort?\n" "(D - Datei, V - Verzeichnis)\n" #: xcopy.rc:35

1 0

Aric Stewart : usp10: Move GSUB functions to opentype.c.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 40199873919fc9478e1766acbbb6b6d795f41c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40199873919fc9478e1766acb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 4 08:13:44 2012 -0600 usp10: Move GSUB functions to opentype.c. --- dlls/usp10/opentype.c | 809 +++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 841 +------------------------------------------ dlls/usp10/usp10_internal.h | 7 + 3 files changed, 827 insertions(+), 830 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40199873919fc9478e176…

1 0