April 2009 - Wine-Commits - list.winehq.org

Frans Kool : setupapi: Fixed Dutch translations.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: f207c280420d174efd2eb329ebd15de14f38a079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f207c280420d174efd2eb329e… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 22:12:37 2009 +0200 setupapi: Fixed Dutch translations. --- dlls/setupapi/Nl.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Nl.rc b/dlls/setupapi/Nl.rc index be28ef0..1aa43dd 100644 --- a/dlls/setupapi/Nl.rc +++ b/dlls/setupapi/Nl.rc @@ -2,6 +2,7 @@ * setupapi (Dutch resources) * * Copyright 2003 Hans Leidekker + * Copyright 2009 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +21,14 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Het bestand '%s' op %s is benodigd" + IDS_UNKNOWN "Onbekend" + IDS_COPYFROM "Kopieer bestanden van:" + IDS_INFO "Voer het pad in waar het bestand zich bevind, en klik dan op OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Bestanden worden gekopi�erd..." @@ -32,3 +41,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Bestanden benodigd" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Voer de installatie disk van de fabrikant in, en zorg\ndan dat de correcte schijf is geselecteerd hieronder", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopieer de fabrikant's bestanden van:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bladeren...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Dan Kegel : ntdll: Add missing valgrind hook in RtlAllocateHeap.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 999bb6a0e9bdc741c65974a3c53af6f72a752a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=999bb6a0e9bdc741c65974a3c… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Apr 15 14:36:34 2009 -0700 ntdll: Add missing valgrind hook in RtlAllocateHeap. --- dlls/ntdll/heap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 674aee7..255a688 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1372,6 +1372,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) void *ret = allocate_large_block( heap, flags, size ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); if (!ret && (flags & HEAP_GENERATE_EXCEPTIONS)) RtlRaiseStatus( STATUS_NO_MEMORY ); + notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); TRACE("(%p,%08x,%08lx): returning %p\n", heap, flags, size, ret ); return ret; }

1 0

Frans Kool : kernel32: Added Dutch translations.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 6a13a1f5894421a8708dca69d909940671db1626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a13a1f5894421a8708dca69d… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Apr 16 00:33:04 2009 +0200 kernel32: Added Dutch translations. --- dlls/kernel32/kernel.rc | 1 + dlls/kernel32/nls/winerr_nld.mc | 3730 ++++++++++++++++++++++++++++++++++++ dlls/kernel32/nls/winerr_nld.mc.rc | 2286 ++++++++++++++++++++++ 3 files changed, 6017 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a13a1f5894421a8708dc…

1 0

Frans Kool : shell32: Fixed Dutch translations.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: c95a69d29c5be990c337750e668790b96ce08bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95a69d29c5be990c337750e6… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Apr 16 00:13:54 2009 +0200 shell32: Fixed Dutch translations. --- dlls/shell32/shell32_Nl.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index ac3f18b..7bea2e8 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -281,9 +281,11 @@ STRINGTABLE IDS_NEWFOLDER "Nieuwe Map" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine Controle Paneel" + IDS_CPANEL_NAME "Naam" + IDS_CPANEL_DESCRIPTION "Beschrijving" + + IDS_SHLEXEC_NOASSOC "Er is geen Windows programma geconfigureerd om dit soort bestanden te openen." } STRINGTABLE

1 0

Frans Kool : reg: Fixed Dutch translations.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 846ce4f0c4537d488c5cf8558a87f91562452dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846ce4f0c4537d488c5cf8558… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 22:23:44 2009 +0200 reg: Fixed Dutch translations. --- programs/reg/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc index a3eaa28..c6a89f1 100644 --- a/programs/reg/Nl.rc +++ b/programs/reg/Nl.rc @@ -27,4 +27,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s scheidingsteken] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" + STRING_SUCCESS, "De bewerking is succesvol voltooid\n" + STRING_INVALID_KEY, "Fout: Foutieve sleutel naam\n" + STRING_INVALID_CMDLINE, "Fout: Foutieve commando regel parameters\n" + STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" + STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registry sleutel of waarde niet vinden\n" }

1 0

Frans Kool : wordpad: Fixed Dutch translations.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 38d9989fba1490fa3834e0797246144af933a9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d9989fba1490fa3834e0797… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 22:41:11 2009 +0200 wordpad: Fixed Dutch translations. --- programs/wordpad/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 3c82c7e..c91e028 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -241,4 +241,5 @@ BEGIN STRING_OPEN_FAILED, "Bestand kon niet geopend worden." STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te openen." STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd" + STRING_MAX_TAB_STOPS, "Onmogelijk om meer dan 32 tab stops toe te voegen." END

1 0

Henri Verbeet : wined3d: Don't die if a vertex shader has samplers.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: a7e2c2d70ce8cb1d537248c73f75ea21d41566f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e2c2d70ce8cb1d537248c73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Don't die if a vertex shader has samplers. This fixes a regression introduced by 38239be58ca709ca107752ca7d3fee0763832725. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 61c5701..0a9240d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -825,7 +825,8 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - if(ps_args->np2_fixup & (1 << i)) { + if (pshader && ps_args->np2_fixup & (1 << i)) + { /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] * while D3D has them in the (normalized) [0,1]x[0,1] range. * samplerNP2Fixup stores texture dimensions and is updated through

1 0

Henri Verbeet : wined3d: Store the source modifiers in struct wined3d_shader_src_param.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 8ac4c98be20afd6ee4d82f4f01c7c7592f23f791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac4c98be20afd6ee4d82f4f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the source modifiers in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cd156ba..a7a79c1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1173,7 +1173,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3DPS_VERSION(2,0)) { - DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; + DWORD src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { projected = TRUE; } else if(src_mod == WINED3DSPSM_DW) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 8ae6a19..e0cedbc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -229,6 +229,7 @@ static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->register_idx = param & WINED3DSP_REGNUM_MASK; + src->modifiers = param & WINED3DSP_SRCMOD_MASK; src->token = param; src->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0868b6c..3c8eac1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2459,7 +2459,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3DPS_VERSION(2,0)) { - DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; + DWORD src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; @@ -2559,7 +2559,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) ins->dst[0].register_idx, dst_mask); } else { DWORD reg = ins->src[0].register_idx; - DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; + DWORD src_mod = ins->src[0].modifiers; char dst_swizzle[6]; shader_glsl_get_swizzle(ins->src[0].token, FALSE, write_mask, dst_swizzle); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9a476bc..11d69f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -466,6 +466,7 @@ struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; UINT register_idx; + DWORD modifiers; DWORD token; DWORD addr_token; };

1 0

Paul Vriens : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: b7bd85265015e85b4fde05c703e6d17e6d65e8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bd85265015e85b4fde05c70… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 15 17:06:01 2009 +0200 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlfolder.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1d63778..72c4034 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1494,7 +1494,8 @@ static void test_ITEMIDLIST_format(void) { pFileStructA->uFileTime == pFileStructW->uTime2, "Last write time should match last access time!\n"); - ok (!lstrcmpW(wszFile[i], pFileStructW->wszName), + ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || + !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)), /* Vista */ "The filename should be stored in unicode at this position!\n"); } }

1 0

Nikolay Sivov : comctl32/listview: Fix some comment typos.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 961f175cc222ab089e4d59fc6a152eec44b4e6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=961f175cc222ab089e4d59fc6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 15 08:24:06 2009 -0400 comctl32/listview: Fix some comment typos. --- dlls/comctl32/listview.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 94ab7c9..e73cb16 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -714,7 +714,7 @@ static inline LPCSTR debugscrollcode(int nScrollCode) } -/******** Notification functions i************************************/ +/******** Notification functions ************************************/ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) { @@ -2943,7 +2943,7 @@ fail: * * RETURNS: * SUCCESS : TRUE -* FAILURE : TRUE +* FAILURE : FALSE */ static BOOL LISTVIEW_DeselectAllSkipItems(LISTVIEW_INFO *infoPtr, RANGES toSkip) { @@ -4491,7 +4491,7 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] iItem : index of item - * [O] lppt : Upperr-left corner of the image + * [O] lppt : Upper-left corner of the image * * RETURN: * Returns a handle to the image list if successful, NULL otherwise. @@ -6258,7 +6258,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON)) { - /* Special case for autoarrange - move 'ti the beginning of a row */ + /* Special case for autoarrange - move 'til the beginning of a row */ if (is_autoarrange(infoPtr)) { nCountPerRow = LISTVIEW_GetCountPerRow(infoPtr); @@ -8623,7 +8623,7 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) /* send NM_KILLFOCUS notification */ if (!notify(infoPtr, NM_KILLFOCUS)) return 0; - /* if we have a focus rectagle, get rid of it */ + /* if we have a focus rectangle, get rid of it */ LISTVIEW_ShowFocusRect(infoPtr, FALSE); /* set window focus flag */ @@ -9279,7 +9279,7 @@ static LRESULT LISTVIEW_RButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT /* set button flag */ infoPtr->bRButtonDown = FALSE; - /* Send NM_RClICK notification */ + /* Send NM_RCLICK notification */ lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE);

1 0