wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Juan Lang : crypt32/tests: Fix test failures on older NT4.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: ad46dbd4cc866592aab8ab84f34ccf98762ac995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad46dbd4cc866592aab8ab84f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 12 17:51:23 2012 -0800 crypt32/tests: Fix test failures on older NT4. --- dlls/crypt32/tests/cert.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 759b0da..9678053 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3321,6 +3321,11 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)certs, 0, NULL, &status); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n"); + return; + } ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK,

1 0

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

13 Feb '12

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

Nikolay Sivov : comctl32: Trace Header order array contents.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: a4e2f47c2d628cf3ee30f420cdaeaf070957d54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e2f47c2d628cf3ee30f420c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 22:24:28 2012 +0300 comctl32: Trace Header order array contents. --- dlls/comctl32/header.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ce95d58..0a40423 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1241,6 +1241,14 @@ HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, const INT *order) if ((UINT)size != infoPtr->uNumItem) return FALSE; + if (TRACE_ON(header)) + { + TRACE("count=%d, order array={", size); + for (i = 0; i < size; i++) + TRACE("%d%c", order[i], i != size-1 ? ',' : '}'); + TRACE("\n"); + } + for (i=0; i<size; i++) { if (order[i] >= size || order[i] < 0)

1 0

Nikolay Sivov : comctl32: Update ticks on TBM_SETRANGE.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: e508eae7d7e587add9ccee598acc65ed92fcc093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e508eae7d7e587add9ccee598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 16:29:54 2012 +0300 comctl32: Update ticks on TBM_SETRANGE. --- dlls/comctl32/tests/trackbar.c | 9 +++++++++ dlls/comctl32/trackbar.c | 14 ++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index a444503..687ed07 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -1034,6 +1034,15 @@ static void test_TBS_AUTOTICKS(void) ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); expect(91, ret); + ret = SendMessage(hWnd, TBM_SETRANGEMIN, TRUE, 0); + expect(0, ret); + + /* TBM_SETRANGE rebuilds tics */ + ret = SendMessage(hWnd, TBM_SETRANGE, TRUE, MAKELONG(10, 200)); + expect(0, ret); + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(191, ret); + DestroyWindow(hWnd); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 679d979..299c44c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1151,10 +1151,13 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) static inline LRESULT -TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) +TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) { - infoPtr->lRangeMin = (SHORT)LOWORD(lRange); - infoPtr->lRangeMax = (SHORT)HIWORD(lRange); + BOOL changed = infoPtr->lRangeMin != (SHORT)LOWORD(range) || + infoPtr->lRangeMax != (SHORT)HIWORD(range); + + infoPtr->lRangeMin = (SHORT)LOWORD(range); + infoPtr->lRangeMax = (SHORT)HIWORD(range); if (infoPtr->lPos < infoPtr->lRangeMin) { infoPtr->lPos = infoPtr->lRangeMin; @@ -1169,7 +1172,10 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) 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

Nikolay Sivov : comctl32: Update ticks on TBM_SETRANGEMIN.
by Alexandre Julliard 13 Feb '12

13 Feb '12

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

Nikolay Sivov : comctl32: Update ticks on TBM_SETRANGEMAX.
by Alexandre Julliard 13 Feb '12

13 Feb '12

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 13 Feb '12

13 Feb '12

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 13 Feb '12

13 Feb '12

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

Alexandre Julliard : hhctrl.ocx: Fix a buffer allocation size.
by Alexandre Julliard 13 Feb '12

13 Feb '12

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

Joerg Schiermeier : Missing comma
by Jeremy Newman 13 Feb '12

13 Feb '12

Module: website Branch: master Commit: 7c029efd9796258587e6d39544a3664288e2253b URL: http://source.winehq.org/git/website.git/?a=commit;h=7c029efd9796258587e6d3… Author: Joerg Schiermeier <project(a)Schiermeier-Software.de> Date: Fri Feb 10 14:17:34 2012 +0100 Missing comma German translation: Only a small comma, but it give this sentence a sense. --- news/de/2012020201.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2012020201.xml b/news/de/2012020201.xml index 497d550..4993376 100644 --- a/news/de/2012020201.xml +++ b/news/de/2012020201.xml @@ -5,7 +5,7 @@ Die Entwicklungsversion 1.4-rc2 von Wine ist jetzt verfügbar. <a href="{$root}/announce/1.4-rc2">Neuerungen (en)</a> in dieser Version: <ul> - <li>Nur Fehlerbehebungen da wir uns im Code-Freeze befinden.</li> + <li>Nur Fehlerbehebungen, da wir uns im Code-Freeze befinden.</li> </ul> Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.tar.bz2">verfügbar</a>. Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung.

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2012