February 2012 - Wine-Commits

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: fb3ed629e5a0dce1d372bca8e5e828775f8c7301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3ed629e5a0dce1d372bca8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 21:12:17 2012 +0100 po: Update French translation. --- po/fr.po | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/po/fr.po b/po/fr.po index cd726e9..5a550b2 100644 --- a/po/fr.po +++ b/po/fr.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-02-06 23:40+0100\n" +"PO-Revision-Date: 2012-02-11 21:10+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -9666,7 +9666,6 @@ msgstr "" "s'il est appelé depuis la ligne de commande.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9692,26 +9691,16 @@ msgstr "" "start [options] fichier_document\n" "\n" "Options :\n" -"/M[inimized] Lancer le programme minimisé.\n" -"/MAX[imized] Lancer le programme maximisé.\n" -"/R[estored] Lancer le programme normalement (ni minimisé ni " -"maximisé).\n" -"/W[ait] Attendre que le programme lancé se termine, puis " -"renvoyer\n" -" son code de sortie.\n" -"/Unix Utiliser un chemin Unix et lancer le fichier comme " -"windows\n" -" explorer.\n" -"/ProgIDOpen progID Ouvrir un document en utilisant le programme identifié\n" -" par progID.\n" -"/L Afficher la licence d'utilisation.\n" -"/? Afficher cette aide et se terminer.\n" -"\n" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start est fourni sans AUCUNE GARANTIE ; pour plus de détails lancez-le avec\n" -"l'option /L.\n" -"Ceci est un logiciel libre, et vous êtes invité à le redistribuer\n" -"sous certaines conditions ; lancez « start /L » pour plus de détails.\n" +"/M[inimized] Lancer le programme minimisé.\n" +"/MAX[imized] Lancer le programme maximisé.\n" +"/R[estored] Lancer le programme normalement (ni minimisé ni maximisé).\n" +"/W[ait] Attendre que le programme lancé se termine, puis renvoyer son\n" +" code de sortie.\n" +"/Unix Utiliser un chemin Unix et lancer le fichier comme windows\n" +" explorer.\n" +"/ProgIDOpen Ouvrir un document via le programme identifié par progID.\n" +"/L Afficher la licence d'utilisation.\n" +"/? Afficher cette aide et se terminer.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9869,7 +9858,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9942,6 +9930,7 @@ msgstr "" "SET\t\tRègle ou affiche les variables d'environnement\n" "SETLOCAL\tEntame les modifications locales à l'environnement dans un\n" "\t\tfichier batch\n" +"START\t\tLance un programme, ou ouvre un document dans le programme associé\n" "TIME\t\tRègle ou affiche l'heure système courante\n" "TITLE\t\tRègle le titre de la fenêtre pour la session CMD\n" "TYPE\t\tAffiche le contenu d'un fichier texte\n"

1 0

Henri Verbeet : wined3d: Use a format flag instead of a floating point comparison to determine if we need to apply heightscale .
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: a4e5bcff4c66aa1041ea32f971b92b40d73e7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e5bcff4c66aa1041ea32f97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 18:40:13 2012 +0100 wined3d: Use a format flag instead of a floating point comparison to determine if we need to apply heightscale. --- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 30dc63e..ac44194 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2281,7 +2281,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi surface->flags |= SFLAG_PIN_SYSMEM; } - if (format->heightscale != 1.0f && format->heightscale != 0.0f) + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) update_h *= format->heightscale; ENTER_GL(); @@ -2516,7 +2516,8 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru internal = format->glInternal; } - if (format->heightscale != 1.0f && format->heightscale != 0.0f) height *= format->heightscale; + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + height *= format->heightscale; TRACE("(%p) : Creating surface (target %#x) level %d, d3d format %s, internal format %#x, width %d, height %d, gl format %#x, gl type=%#x\n", surface, surface->texture_target, surface->texture_level, debug_d3dformat(format->id), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2ade261..e570a13 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1580,6 +1580,7 @@ static void apply_format_fixups(struct wined3d_gl_info *gl_info) } idx = getFmtIdx(WINED3DFMT_YV12); + gl_info->formats[idx].flags |= WINED3DFMT_FLAG_HEIGHT_SCALE; gl_info->formats[idx].heightscale = 1.5f; gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); @@ -1705,7 +1706,7 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali size = height * (((width * format->byte_count) + alignment - 1) & ~(alignment - 1)); } - if (format->heightscale != 0.0f) + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { /* The D3D format requirements make sure that the resulting format is an integer again */ size = (UINT) (size * format->heightscale); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 416d970..3cabe76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2800,6 +2800,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_COMPRESSED 0x00008000 #define WINED3DFMT_FLAG_BROKEN_PITCH 0x00010000 #define WINED3DFMT_FLAG_BLOCKS 0x00020000 +#define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 struct wined3d_format {

1 0

Juan Lang : advapi32/tests: Fix a test failure on older NT4.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: c21033c5e93716ed37bd969b060407576bbccbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21033c5e93716ed37bd969b0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 12 17:49:19 2012 -0800 advapi32/tests: Fix a test failure on older NT4. --- dlls/advapi32/tests/crypt.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 1180275..dae7263 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -448,7 +448,9 @@ static void test_verify_sig(void) "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, bogus, sizeof(bogus), key, NULL, 0); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + broken(GetLastError() == NTE_BAD_HASH_STATE /* older NT4 */)), "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); pCryptDestroyKey(key); pCryptDestroyHash(hash);

1 0

André Hentschel : ntdll/tests: Fix some typos.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 0fb4cba77f4703268080694bc0e7e7c50eaaed10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb4cba77f4703268080694bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 12 19:35:04 2012 +0100 ntdll/tests: Fix some typos. --- dlls/ntdll/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index a4d0b8a..9349f5d 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1255,9 +1255,9 @@ static void test_qsort(void) static void test_bsearch(void) { int arr[7] = { 1, 3, 4, 8, 16, 23, 42 }; - int *x, l, i,j ; + int *x, l, i, j; - /* just try all all sizes */ + /* just try all array sizes */ for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { for (i=0;i<j;i++) { l = arr[i];

1 0

Nikolay Sivov : comctl32: Update ticks on TBM_SETRANGEMIN.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 11de98be34490709487a311c3ab2d17d75e20048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11de98be34490709487a311c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 16:22:37 2012 +0300 comctl32: Update ticks on TBM_SETRANGEMIN. --- dlls/comctl32/tests/trackbar.c | 16 +++++++++++++++- dlls/comctl32/trackbar.c | 9 +++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7c16ae8..a444503 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -993,6 +993,12 @@ static void test_initial_state(void) ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); expect(2, ret); + ret = SendMessage(hWnd, TBM_SETRANGEMIN, TRUE, 10); + expect(0, ret); + + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(2, ret); + DestroyWindow(hWnd); } @@ -1014,12 +1020,20 @@ static void test_TBS_AUTOTICKS(void) ret = SendMessage(hWnd, TBM_GETRANGEMAX, 0, 0); expect(100, ret); + /* TBM_SETRANGEMAX rebuilds tics */ ret = SendMessage(hWnd, TBM_SETRANGEMAX, TRUE, 200); expect(0, ret); - ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); expect(201, ret); + /* TBM_SETRANGEMIN rebuilds tics */ + ret = SendMessage(hWnd, TBM_SETRANGEMAX, TRUE, 100); + expect(0, ret); + ret = SendMessage(hWnd, TBM_SETRANGEMIN, TRUE, 10); + expect(0, ret); + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(91, ret); + DestroyWindow(hWnd); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 667bff1..679d979 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1199,8 +1199,10 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) static inline LRESULT -TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) +TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMin) { + BOOL changed = infoPtr->lRangeMin != lMin; + infoPtr->lRangeMin = lMin; if (infoPtr->lPos < infoPtr->lRangeMin) { infoPtr->lPos = infoPtr->lRangeMin; @@ -1210,7 +1212,10 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) + TRACKBAR_RecalculateTics (infoPtr); + + if (redraw) TRACKBAR_InvalidateAll(infoPtr); return 0; }

1 0

Alexandre Julliard : hhctrl.ocx: Fix a buffer allocation size.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 8e1dbebdb0e7b834fad53b4ea3d3cd349c34fbec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1dbebdb0e7b834fad53b4ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 13 12:28:32 2012 +0100 hhctrl.ocx: Fix a buffer allocation size. --- dlls/hhctrl.ocx/chm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index e6f955d..9d1f91e 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -223,7 +223,8 @@ static WCHAR *FindHTMLHelpSetting(HHInfo *info, const WCHAR *extW) WCHAR *filename; HRESULT hr; - filename = heap_alloc(strlenW(info->pCHMInfo->compiledFile)+strlenW(periodW)+strlenW(extW)+1); + filename = heap_alloc( (strlenW(info->pCHMInfo->compiledFile) + + strlenW(periodW) + strlenW(extW) + 1) * sizeof(WCHAR) ); strcpyW(filename, info->pCHMInfo->compiledFile); strcatW(filename, periodW); strcatW(filename, extW);

1 0

Nikolay Sivov : comctl32: Update ticks on TBM_SETRANGEMAX.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: abde0c21e369b16f743290ac82a0d8bc594b2ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abde0c21e369b16f743290ac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 16:17:53 2012 +0300 comctl32: Update ticks on TBM_SETRANGEMAX. --- dlls/comctl32/tests/trackbar.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 9 +++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index eb320d5..7c16ae8 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -982,6 +982,43 @@ static void test_initial_state(void) expect(-1, ret); ret = SendMessage(hWnd, TBM_GETTICPOS, 0, 0); expect(-1, ret); + ret = SendMessage(hWnd, TBM_GETRANGEMIN, 0, 0); + expect(0, ret); + ret = SendMessage(hWnd, TBM_GETRANGEMAX, 0, 0); + expect(100, ret); + + ret = SendMessage(hWnd, TBM_SETRANGEMAX, TRUE, 200); + expect(0, ret); + + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(2, ret); + + DestroyWindow(hWnd); +} + +static void test_TBS_AUTOTICKS(void) +{ + HWND hWnd; + int ret; + + hWnd = create_trackbar(TBS_AUTOTICKS, hWndParent); + + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(2, ret); + ret = SendMessage(hWnd, TBM_GETTIC, 0, 0); + expect(-1, ret); + ret = SendMessage(hWnd, TBM_GETTICPOS, 0, 0); + expect(-1, ret); + ret = SendMessage(hWnd, TBM_GETRANGEMIN, 0, 0); + expect(0, ret); + ret = SendMessage(hWnd, TBM_GETRANGEMAX, 0, 0); + expect(100, ret); + + ret = SendMessage(hWnd, TBM_SETRANGEMAX, TRUE, 200); + expect(0, ret); + + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(201, ret); DestroyWindow(hWnd); } @@ -1031,6 +1068,7 @@ START_TEST(trackbar) test_tic_placement(hWndTrackbar); test_tool_tips(hWndTrackbar); test_unicode(hWndTrackbar); + test_TBS_AUTOTICKS(); flush_sequences(sequences, NUM_MSG_SEQUENCE); DestroyWindow(hWndTrackbar); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 788e21f..667bff1 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1176,8 +1176,10 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) static inline LRESULT -TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) +TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) { + BOOL changed = infoPtr->lRangeMax != lMax; + infoPtr->lRangeMax = lMax; if (infoPtr->lPos > infoPtr->lRangeMax) { infoPtr->lPos = infoPtr->lRangeMax; @@ -1187,7 +1189,10 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) + TRACKBAR_RecalculateTics (infoPtr); + + if (redraw) TRACKBAR_InvalidateAll(infoPtr); return 0; }

1 0

Frédéric Delanoy : cmd: Respect constant wide strings naming convention.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 668e44ab262120e004823a85c3879b0775049c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=668e44ab262120e004823a85c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 18:24:56 2012 +0100 cmd: Respect constant wide strings naming convention. --- programs/cmd/batch.c | 14 +++++++------- programs/cmd/builtins.c | 18 +++++++++--------- programs/cmd/directory.c | 4 ++-- programs/cmd/wcmd.h | 4 ++-- programs/cmd/wcmdmain.c | 16 ++++++++-------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index bf8f1b7..2b33b69 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -475,13 +475,13 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, int datelen; doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, space); + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); /* Format the time */ FileTimeToSystemTime(&fileInfo.ftLastWriteTime, &systime); GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systime, NULL, thisoutput, MAX_PATH); - strcatW(thisoutput, space); + strcatW(thisoutput, spaceW); datelen = strlenW(thisoutput); GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &systime, NULL, (thisoutput+datelen), MAX_PATH-datelen); @@ -497,14 +497,14 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, static const WCHAR fmt[] = {'%','u','\0'}; doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, space); + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); wsprintfW(thisoutput, fmt, fullsize); strcatW(finaloutput, thisoutput); } /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchrW(firstModifier, 's', modifierLen) != NULL) { - if (finaloutput[0] != 0x00) strcatW(finaloutput, space); + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); /* Don't flag as doneModifier - %~s on its own is processed later */ GetShortPathNameW(outputparam, outputparam, sizeof(outputparam)/sizeof(outputparam[0])); } @@ -513,7 +513,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* Note this overrides d,p,n,x */ if (memchrW(firstModifier, 'f', modifierLen) != NULL) { doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, space); + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); strcatW(finaloutput, fullfilename); } else { @@ -523,7 +523,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, WCHAR ext[MAX_PATH]; BOOL doneFileModifier = FALSE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, space); + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); /* Split into components */ WCMD_splitpath(fullfilename, drive, dir, fname, ext); @@ -560,7 +560,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, if (!doneFileModifier && memchrW(firstModifier, 's', modifierLen) != NULL) { doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, space); + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); strcatW(finaloutput, outputparam); } } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d966dc6..7e6bd77 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -349,7 +349,7 @@ void WCMD_choice (const WCHAR * command) { ptr = strchrW(opt_c, answer[0]); if (ptr) { WCMD_output_asis(answer); - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); @@ -954,7 +954,7 @@ void WCMD_echo (const WCHAR *command) echo_mode = FALSE; else { WCMD_output_asis (command); - WCMD_output_asis (newline); + WCMD_output_asis (newlineW); } HeapFree(GetProcessHeap(), 0, trimmed); } @@ -2101,7 +2101,7 @@ void WCMD_setshow_default (const WCHAR *command) { GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); if (strlenW(command) == 0) { - strcatW (cwd, newline); + strcatW (cwd, newlineW); WCMD_output_asis (cwd); } else { @@ -2264,7 +2264,7 @@ static int WCMD_setshow_sortenv(const WCHAR *s, const WCHAR *stub) /* Don't display special internal variables */ if (str[i][0] != '=') { WCMD_output_asis(str[i]); - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); displayedcount++; } } @@ -2368,7 +2368,7 @@ void WCMD_setshow_path (const WCHAR *command) { if (status != 0) { WCMD_output_asis ( pathEqW); WCMD_output_asis ( string); - WCMD_output_asis ( newline); + WCMD_output_asis ( newlineW); } else { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOPATH)); @@ -2488,7 +2488,7 @@ void WCMD_start(const WCHAR *command) strcatW( file, exeW ); cmdline = HeapAlloc( GetProcessHeap(), 0, (strlenW(file) + strlenW(command) + 2) * sizeof(WCHAR) ); strcpyW( cmdline, file ); - strcatW( cmdline, space ); + strcatW( cmdline, spaceW ); strcatW( cmdline, command ); memset( &st, 0, sizeof(STARTUPINFOW) ); @@ -2879,7 +2879,7 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) { if (rc == ERROR_SUCCESS) { WCMD_output_asis(keyValue); } - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); RegCloseKey(readKey); } } @@ -2909,7 +2909,7 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) { WCMD_output_asis(equalW); /* If no default value found, leave line empty after '=' */ if (rc == ERROR_SUCCESS) WCMD_output_asis(keyValue); - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); RegCloseKey(readKey); } else { @@ -2982,7 +2982,7 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) { WCMD_output_asis(command); WCMD_output_asis(equalW); WCMD_output_asis(newValue); - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); } } } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 8b556f7..52b998c 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -316,7 +316,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Output the results */ if (!bare) { - if (level != 0 && (entry_count > 0)) WCMD_output_asis (newline); + if (level != 0 && (entry_count > 0)) WCMD_output_asis (newlineW); if (!recurse || ((entry_count > 0) && done_header==FALSE)) { static const WCHAR headerW[] = {'D','i','r','e','c','t','o','r','y',' ','o','f', ' ','%','1','\n','\n','\0'}; @@ -446,7 +446,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } } } - if (addNewLine) WCMD_output_asis (newline); + if (addNewLine) WCMD_output_asis (newlineW); cur_width = 0; } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5f343b5..3623213 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -231,8 +231,8 @@ extern BATCH_CONTEXT *context; #define WCMD_EXIT 45 /* Some standard messages */ -extern const WCHAR newline[]; -extern const WCHAR space[]; +extern const WCHAR newlineW[]; +extern const WCHAR spaceW[]; extern const WCHAR nullW[]; extern const WCHAR dotW[]; extern const WCHAR dotdotW[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1aca30d..c6c3e0e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -44,8 +44,8 @@ int defaultColor = 7; BOOL echo_mode = TRUE; WCHAR anykey[100], version_string[100]; -const WCHAR newline[] = {'\r','\n','\0'}; -const WCHAR space[] = {' ','\0'}; +const WCHAR newlineW[] = {'\r','\n','\0'}; +const WCHAR spaceW[] = {' ','\0'}; static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE; @@ -318,7 +318,7 @@ void WCMD_print_error (void) { WCMD_output_asis_len(lpMsgBuf, lstrlenW(lpMsgBuf), GetStdHandle(STD_ERROR_HANDLE)); LocalFree (lpMsgBuf); - WCMD_output_asis_len (newline, lstrlenW(newline), + WCMD_output_asis_len (newlineW, lstrlenW(newlineW), GetStdHandle(STD_ERROR_HANDLE)); return; } @@ -1550,7 +1550,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_type (p); break; case WCMD_VER: - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); WCMD_version (); break; case WCMD_VERIFY: @@ -1813,7 +1813,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (strlenW(extraSpace) == MAXSTRING -1) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_TRUNCATEDLINE)); WCMD_output_asis_stderr(extraSpace); - WCMD_output_asis_stderr(newline); + WCMD_output_asis_stderr(newlineW); } /* Replace env vars if in a batch context */ @@ -1834,9 +1834,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, extraSpace, min_len, echoCol, len) != CSTR_EQUAL) { - WCMD_output_asis(space); + WCMD_output_asis(spaceW); } - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); } /* Start with an empty string, copying to the command string */ @@ -2172,7 +2172,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Continue to echo commands IF echo is on and in batch program */ if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { WCMD_output_asis(extraSpace); - WCMD_output_asis(newline); + WCMD_output_asis(newlineW); } } }

1 0

Frédéric Delanoy : cmd: Reuse common string constants.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 7cf307a7bd208a5c194808f71a86b173c6dd2d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf307a7bd208a5c194808f71… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 18:24:55 2012 +0100 cmd: Reuse common string constants. --- programs/cmd/builtins.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a02aa78..d966dc6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2477,7 +2477,6 @@ void WCMD_shift (const WCHAR *command) { */ void WCMD_start(const WCHAR *command) { - static const WCHAR spaceW[] = {' ',0}; static const WCHAR exeW[] = {'\\','c','o','m','m','a','n','d', '\\','s','t','a','r','t','.','e','x','e',0}; WCHAR file[MAX_PATH]; @@ -2489,7 +2488,7 @@ void WCMD_start(const WCHAR *command) strcatW( file, exeW ); cmdline = HeapAlloc( GetProcessHeap(), 0, (strlenW(file) + strlenW(command) + 2) * sizeof(WCHAR) ); strcpyW( cmdline, file ); - strcatW( cmdline, spaceW ); + strcatW( cmdline, space ); strcatW( cmdline, command ); memset( &st, 0, sizeof(STARTUPINFOW) );

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc3
by Jeremy Newman Feb. 13, 2012

Feb. 13, 2012

Module: website Branch: master Commit: 6e7cb2830260ae1590a93efeb898ddd576fe970d URL: http://source.winehq.org/git/website.git/?a=commit;h=6e7cb2830260ae1590a93e… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 12 08:04:42 2012 +0100 Polish translation for release 1.4-rc3 --- news/pl/2012021101.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012021101.xml b/news/pl/2012021101.xml new file mode 100644 index 0000000..4be15fb --- /dev/null +++ b/news/pl/2012021101.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 11, 2012</date> +<title>Wydano Wine 1.4-rc3</title> +<body> + Wydanie rozwojowe Wine 1.4-rc3 jest już dostępne. + <a href="{$root}/announce/1.4-rc3">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0