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

Henri Verbeet : wined3d: Store the source modifiers in struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

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 16 Apr '09

16 Apr '09

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

Aric Stewart : msctf: Add locking flags.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 7b4f2703485ce09292e8199c88f8139f55d7f6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b4f2703485ce09292e8199c8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 15 09:14:50 2009 -0500 msctf: Add locking flags. --- include/textstor.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 08ee21d..b603198 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -38,6 +38,9 @@ const DWORD TS_AS_STATUS_CHANGE = 0x10; const DWORD TS_AS_ALL_SINKS = (TS_AS_TEXT_CHANGE | TS_AS_SEL_CHANGE | TS_AS_LAYOUT_CHANGE | TS_AS_ATTR_CHANGE | TS_AS_STATUS_CHANGE); +const DWORD TS_LF_SYNC = 0x1; +const DWORD TS_LF_READ = 0x2; +const DWORD TS_LF_READWRITE = 0x6; typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType;

1 0

Nikolay Sivov : comctl32/listview: Fix some comment typos.
by Alexandre Julliard 16 Apr '09

16 Apr '09

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

Nikolay Sivov : comctl32/listview: Implemented LVM_SORTITEMSEX.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: b2486d41c73dbecc8ca05468ff12f47e67d6731d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2486d41c73dbecc8ca05468f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 15 09:27:07 2009 -0400 comctl32/listview: Implemented LVM_SORTITEMSEX. --- dlls/comctl32/listview.c | 43 +++++++++++++++++++++++++++++++++++-------- include/commctrl.h | 4 ++++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e73cb16..d594e51 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -137,7 +137,6 @@ * -- LVM_SETINFOTIP * -- LVM_SETTILEWIDTH * -- LVM_SORTGROUPS - * -- LVM_SORTITEMSEX * * Macros: * -- ListView_GetCheckSate, ListView_SetCheckState @@ -148,7 +147,6 @@ * -- ListView_GetTextBkColor * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas - * -- ListView_SortItemsEx * * Functions: * -- LVGroupComparE @@ -422,7 +420,6 @@ static void LISTVIEW_SetSelection(LISTVIEW_INFO *, INT); static void LISTVIEW_UpdateSize(LISTVIEW_INFO *); static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *, INT, BOOL); static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *, WPARAM, LPARAM); -static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *, PFNLVCOMPARE, LPARAM); static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); @@ -7835,7 +7832,7 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL fUnicode) /*** * DESCRIPTION: - * Callback internally used by LISTVIEW_SortItems() + * Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMS * * PARAMETER(S): * [I] first : pointer to first ITEM_INFO to compare @@ -7859,18 +7856,44 @@ static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM l /*** * DESCRIPTION: + * Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMSEX + * + * PARAMETER(S): + * [I] first : pointer to first ITEM_INFO to compare + * [I] second : pointer to second ITEM_INFO to compare + * [I] lParam : HWND of control + * + * RETURN: + * if first comes before second : negative + * if first comes after second : positive + * if first and second are equivalent : zero + */ +static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM lParam) +{ + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; + INT first_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, first ); + INT second_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, second ); + + /* Forward the call to the client defined callback */ + return (infoPtr->pfnCompare)( first_idx, second_idx, infoPtr->lParamSort ); +} + +/*** + * DESCRIPTION: * Sorts the listview items. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] pfnCompare : application-defined value * [I] lParamSort : pointer to comparison callback + * [I] IsEx : TRUE when LVM_SORTITEMSEX used * * RETURN: * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, LPARAM lParamSort) +static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, + LPARAM lParamSort, BOOL IsEx) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; HDPA hdpaSubItems; @@ -7900,7 +7923,10 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, infoPtr->pfnCompare = pfnCompare; infoPtr->lParamSort = lParamSort; - DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); + if (IsEx) + DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)infoPtr); + else + DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); /* restore selection ranges */ for (i=0; i < infoPtr->nItemCount; i++) @@ -10022,9 +10048,10 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SORTGROUPS: */ case LVM_SORTITEMS: - return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam); + return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, FALSE); - /* LVM_SORTITEMSEX: */ + case LVM_SORTITEMSEX: + return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, TRUE); case LVM_SUBITEMHITTEST: return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, TRUE, FALSE); diff --git a/include/commctrl.h b/include/commctrl.h index bebdb27..a3ec513 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3147,6 +3147,7 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_SETITEMTEXT WINELIB_NAME_AW(LVM_SETITEMTEXT) #define LVM_SETITEMCOUNT (LVM_FIRST+47) #define LVM_SORTITEMS (LVM_FIRST+48) +#define LVM_SORTITEMSEX (LVM_FIRST+81) #define LVM_SETITEMPOSITION32 (LVM_FIRST+49) #define LVM_GETSELECTEDCOUNT (LVM_FIRST+50) #define LVM_GETITEMSPACING (LVM_FIRST+51) @@ -3772,6 +3773,9 @@ typedef struct NMLVSCROLL #define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) \ (BOOL)SNDMSGA((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)_lPrm,(LPARAM)(PFNLVCOMPARE)_pfnCompare) +#define ListView_SortItemsEx(hwndLV, _pfnCompare, _lPrm) \ + (BOOL)SNDMSGA((hwndLV), LVM_SORTITEMSEX, (WPARAM)(LPARAM)(_lPrm), (LPARAM)(PFNLVCOMPARE)(_pfnCompare)) + #define ListView_SetItemPosition(hwndLV, i, x, y) \ (BOOL)SNDMSGA((hwndLV),LVM_SETITEMPOSITION,(WPARAM)(INT)(i),MAKELPARAM((x),(y))) #define ListView_GetSelectedCount(hwndLV) \

1 0

Frans Kool : mshtml: Corrected Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: f46bd1bb01dd08158d46ea80a1463caf762a5662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46bd1bb01dd08158d46ea80a… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 21:57:00 2009 +0200 mshtml: Corrected Dutch translations. --- dlls/mshtml/Nl.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index a8f8f7c..f6f47e1 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -56,3 +56,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Frans Kool : wordpad: Fixed Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

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

Austin English : wineps.drv: Fix a memory leak.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 5f4cc6a89bf8cf401d9cc03a2689e0f9a06c5dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4cc6a89bf8cf401d9cc03a2… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 14 11:25:47 2009 -0500 wineps.drv: Fix a memory leak. --- dlls/wineps.drv/mkagl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index db789f1..d6aab8a 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -516,5 +516,9 @@ int main(int argc, char *argv[]) triple_space(f_c); write_encoding_by_UV(f_c); + /* Clean up */ + fclose(f_c); + fclose(f_h; + return 0; }

1 0

Vincent Povirk : mciavi32: Remove unnecessary string buffers in MCIAVI_mciSet.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 075ff23394196d9d5e91950747b690d015a0d24c URL: http://source.winehq.org/git/wine.git/?a=commit;h=075ff23394196d9d5e9195074… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 14 11:56:54 2009 -0500 mciavi32: Remove unnecessary string buffers in MCIAVI_mciSet. --- dlls/mciavi32/info.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 61b79b7..64d51eb 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -225,72 +225,73 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) } if (dwFlags & MCI_SET_ON) { - char buffer[256]; - - strcpy(buffer, "MCI_SET_ON:"); + const char *szVideo=""; + const char *szAudio=""; + const char *szSeek=""; if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szVideo = " video"; wma->dwSet |= 4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_ON:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio all"; wma->dwSet |= 3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio left"; wma->dwSet |= 1; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio right"; wma->dwSet |= 2; break; default: + szAudio = " audio unknown"; WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)); + szSeek = " seek_exactly"; } - FIXME("%s\n", buffer); + FIXME("MCI_SET_ON:%s%s%s\n", szVideo, szAudio, szSeek); } if (dwFlags & MCI_SET_OFF) { - char buffer[256]; + const char *szVideo=""; + const char *szAudio=""; + const char *szSeek=""; - strcpy(buffer, "MCI_SET_OFF:"); if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szVideo = " video"; wma->dwSet &= ~4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_OFF:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio all"; wma->dwSet &= ~3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio left"; wma->dwSet &= ~2; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio right"; wma->dwSet &= ~2; break; default: + szAudio = " audio unknown"; WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)-strlen(buffer)-1); + szSeek = " seek_exactly"; } - FIXME("%s\n", buffer); + FIXME("MCI_SET_OFF:%s%s%s\n", szVideo, szAudio, szSeek); } if (dwFlags & MCI_DGV_SET_FILEFORMAT) { LPCSTR str = "save";

1 0

André Hentschel : start: Correct German translation.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: ec21ea1baa1a35f8c58de07b38c1b548d62723ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec21ea1baa1a35f8c58de07b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 14 19:43:56 2009 +0200 start: Correct German translation. --- programs/start/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/De.rc b/programs/start/De.rc index a6bc118..3ab7aa0 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -37,7 +37,7 @@ Optionen:\n\ /L Zeige die Endbenutzerlizenz an.\n\ \n\ start.exe Version 0.2 Copyright (C) 2003, Dan Kegel\n\ -Start kommte ABSOLUT OHNE GARANTIE; f�r detalierte Informationen, starte es mit der /L Option.\n\ +Start kommt ABSOLUT OHNE GARANTIE; f�r detaillierte Informationen, starte es mit der /L Option.\n\ Dies ist freie Software, und du bist willkommen, es unter bestimmten\n\ Bedingungen weiter zu verbreiten; f�hre 'start /L' f�r mehr Details aus.\n\ "

1 0