February 2012 - Wine-Commits

Detlef Riekenberg : comdlg32: Exclude the driver path from the result.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: bea70326875077c488cb42f2d487d777e5721b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea70326875077c488cb42f2d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 13 00:26:53 2012 +0100 comdlg32: Exclude the driver path from the result. --- dlls/comdlg32/printdlg.c | 4 ++++ dlls/comdlg32/tests/printdlg.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index aea5224..d074563 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -322,6 +322,8 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName, char buf[260]; DWORD dwBufLen = sizeof(buf); + DeviceDriverName = strrchr(DeviceDriverName, '\\') + 1; + size = strlen(DeviceDriverName) + 1 + strlen(DeviceName) + 1 + strlen(OutputPort) + 1 @@ -365,6 +367,8 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, WCHAR bufW[260]; DWORD dwBufLen = sizeof(bufW) / sizeof(WCHAR); + DeviceDriverName = strrchrW(DeviceDriverName, '\\') + 1; + size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 + sizeof(WCHAR)*lstrlenW(DeviceName) + 2 + sizeof(WCHAR)*lstrlenW(OutputPort) + 2 diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index cad080d..c295df0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -200,9 +200,7 @@ static void test_PrintDlgA(void) /* The Driver Entry does not include a Path */ ptr = strrchr(driver, '\\'); - todo_wine { ok( ptr == NULL, "got %p for '%s' (expected NULL for a simple name)\n", ptr, driver); - } /* The Driver Entry does not have an extension (fixed to ".drv") */ ptr = strrchr(driver, '.'); @@ -220,11 +218,8 @@ static void test_PrintDlgA(void) res, GetLastError(), ptr, buffer); if (ptr) ptr[0] = '\0'; - todo_wine { ok( lstrcmpiA(driver, buffer) == 0, "got driver '%s' (expected '%s')\n", driver, buffer); - } - } GlobalUnlock(pDlg->hDevNames);

1 0

Juan Lang : cryptnet/tests: Fix test failures on older NT4.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 0439500f2cfbe0eaad9bd6c9c0b848526b36cbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0439500f2cfbe0eaad9bd6c9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 12 17:58:45 2012 -0800 cryptnet/tests: Fix test failures on older NT4. --- dlls/cryptnet/tests/cryptnet.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 683c6b6..4ab88ec 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -365,9 +365,12 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG + * or OSS_DATA_ERROR. + */ ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - broken(GetLastError() == CRYPT_E_ASN1_BADTAG)), + broken(GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR)), "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ @@ -698,6 +701,11 @@ static void test_verifyRevocation(void) * bad authority key ID extension and can't be matched with the issuer * cert, hence the revocation status should be unknown. */ + 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 || broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError());

1 0

Nikolay Sivov : comctl32: Trace Header order array contents.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

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 Feb. 13, 2012

Feb. 13, 2012

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

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

Feb. 13, 2012

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

Frédéric Delanoy : setupx.dll16: Simplify some dead code (Coverity).
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: a8fe74b4d1c13151326393f8889c2f591c61420a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fe74b4d1c13151326393f88… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 22:20:09 2012 +0100 setupx.dll16: Simplify some dead code (Coverity). --- dlls/setupx.dll16/virtcopy.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index f2ce4e8..a718ac9 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -562,14 +562,6 @@ VCP_UI_FileCopyWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg != WM_CREATE) return DefWindowProcA (hwnd, uMsg, wParam, lParam); - switch (uMsg) - { - case WM_CREATE: - return 0; - default: - FIXME("%04x: unhandled.\n", uMsg); - } - return 0; }

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: bc058788de460e774ef8dde4f9b64f5f86e9e36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc058788de460e774ef8dde4f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 12 19:37:01 2012 +0100 po: Update German translation. --- po/de.po | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index a20ccc8..78dfd5c 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-02-05 13:54+0100\n" +"PO-Revision-Date: 2012-02-12 18:12+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -9632,7 +9632,6 @@ msgstr "" "wird.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9667,11 +9666,6 @@ msgstr "" "/ProgIDOpen Öffne ein Dokument mit der folgenden progID.\n" "/L Zeigt die Endbenutzerlizenz an.\n" "/? Zeigt die Hilfe an und beendet sich.\n" -"\n" -"start.exe Version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start kommt ABSOLUT OHNE GARANTIE; für Details starte es mit der /L Option.\n" -"Dies ist freie Software, und du bist Eingeladen, es unter bestimmten\n" -"Bedingungen weiter zu verbreiten; führe 'start /L' für mehr Details aus.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9822,7 +9816,6 @@ msgstr "" "Betriebssystem oder der Shell zurück, von der CMD gestartet wurde.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9892,6 +9885,7 @@ msgstr "" "RD (RMDIR)\tLöscht ein Unterverzeichnis\n" "SET\t\tSetzt oder zeigt die Umgebungsvariablen an\n" "SETLOCAL\tStartet die Begrenzung der Gültigkeit von Änderungen\n" +"START\t\tStartet ein Programm oder öffnet ein Dokument\n" "TIME\t\tSetzt oder zeigt die aktuelle Systemzeit an\n" "TITLE\t\tSetzt den Fenstertitel für die CMD - Sitzung\n" "TYPE\t\tGibt den Inhalt einer Textdatei aus\n"

1 0

Alexandre Julliard : wineps16.drv: Call winspool functions instead of removed wineps.drv entry points.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: ca69cc6078de3e3f79462b774baf05273925c26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca69cc6078de3e3f79462b774… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 13 16:01:27 2012 +0100 wineps16.drv: Call winspool functions instead of removed wineps.drv entry points. --- dlls/wineps16.drv16/Makefile.in | 1 + dlls/wineps16.drv16/driver.c | 43 +++++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/wineps16.drv16/Makefile.in b/dlls/wineps16.drv16/Makefile.in index 759410b..879e7da 100644 --- a/dlls/wineps16.drv16/Makefile.in +++ b/dlls/wineps16.drv16/Makefile.in @@ -1,4 +1,5 @@ MODULE = wineps16.drv16 +IMPORTS = winspool EXTRADLLFLAGS = -m16 C_SRCS = driver.c diff --git a/dlls/wineps16.drv16/driver.c b/dlls/wineps16.drv16/driver.c index 64dcbfb..b4d54dd 100644 --- a/dlls/wineps16.drv16/driver.c +++ b/dlls/wineps16.drv16/driver.c @@ -25,24 +25,11 @@ #include "windef.h" #include "wine/winuser16.h" #include "wownt32.h" +#include "winspool.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -static HMODULE wineps; -static INT (CDECL *pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); -static DWORD (CDECL *pDeviceCapabilities)(LPSTR,LPCSTR,LPCSTR,WORD,LPSTR,LPDEVMODEA); - -static HMODULE load_wineps(void) -{ - if (!wineps) - { - wineps = LoadLibraryA( "wineps.drv" ); - pExtDeviceMode = (void *)GetProcAddress( wineps, "ExtDeviceMode" ); - pDeviceCapabilities = (void *)GetProcAddress( wineps, "DeviceCapabilities" ); - } - return wineps; -} /************************************************************** * AdvancedSetupDialog [WINEPS16.93] @@ -63,9 +50,7 @@ INT16 WINAPI PSDRV_ExtDeviceMode16(HWND16 hwnd, HANDLE16 hDriver, LPSTR lpszProfile, WORD fwMode) { - if (!load_wineps() || !pExtDeviceMode) return -1; - return pExtDeviceMode( NULL, HWND_32(hwnd), lpdmOutput, lpszDevice, - lpszPort, lpdmInput, lpszProfile, fwMode ); + return DocumentPropertiesA( HWND_32(hwnd), 0, lpszDevice, lpdmOutput, lpdmInput, fwMode ); } /************************************************************** @@ -75,8 +60,28 @@ DWORD WINAPI PSDRV_DeviceCapabilities16(LPCSTR lpszDevice, LPCSTR lpszPort, WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpdm) { - if (!load_wineps() || !pDeviceCapabilities) return 0; - return pDeviceCapabilities( NULL, lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); + int i, ret; + POINT *pt; + POINT16 *pt16; + + if (fwCapability != DC_PAPERSIZE || !lpszOutput) + return DeviceCapabilitiesA( lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); + + /* for DC_PAPERSIZE, map POINT to POINT16 */ + + ret = DeviceCapabilitiesA( lpszDevice, lpszPort, DC_PAPERSIZE, NULL, lpdm ); + if (ret <= 0) return ret; + + pt16 = (POINT16 *)lpszOutput; + pt = HeapAlloc( GetProcessHeap(), 0, ret * sizeof(POINT) ); + ret = DeviceCapabilitiesA( lpszDevice, lpszPort, DC_PAPERSIZE, (LPSTR)pt, lpdm ); + for (i = 0; i < ret; i++) + { + pt16[i].x = pt[i].x; + pt16[i].y = pt[i].y; + } + HeapFree( GetProcessHeap(), 0, pt ); + return ret; } /***************************************************************

1 0

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: 65aca8b648cd2e7a2bafe765ef8e33737993c42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65aca8b648cd2e7a2bafe765e… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Sun Feb 12 14:40:19 2012 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ac88d92..5acf55f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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-09 23:08-0200\n" +"PO-Revision-Date: 2012-02-11 22:12-0200\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -9618,7 +9618,6 @@ msgstr "" "Isto não tem efeito se chamado a partir da linha de comandos.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9640,26 +9639,20 @@ msgstr "" "Inicia um programa ou abre um documento no programa normalmente usado para " "arquivos com determinado sufixo.\n" "Uso:\n" -"start [opções] arquivo_de_programa [argumentos...]\n" +"start [opções] arquivo_de_programa [...]\n" "start [opções] arquivo_de_documento\n" "\n" "Opções:\n" "/M[inimized] Inicia o programa minimizado.\n" "/MAX[imized] Inicia o programa maximizado.\n" "/R[estored] Inicia o programa normalmente (sem minimizar nem maximizar).\n" -"/W[ait] Aguarda que o programa iniciado termine e então retorna\n" -"\t\tseu valor de saída.\n" +"/W[ait] Aguarda que o programa iniciado termine e então retorna seu " +"valor de saída.\n" "/Unix Usa um nome de arquivo Unix e inicia o arquivo como windows\n" "explorer.\n" "/ProgIDOpen Abre um documento usando o seguinte progID.\n" "/L Exibe a licença do usuário.\n" "/? Mostra essa ajuda e sai.\n" -"\n" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start não vem com ABSOLUTAMENTE NENHUMA GARANTIA; para detalhes, execute\n" -"com a opção /L.\n" -"Este é um software livre e você é bem-vindo a redistribuí-lo sob certas\n" -"condições; execute 'start /L' para detalhes.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9811,7 +9804,6 @@ msgstr "" "shell que tenha invocado o cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9881,6 +9873,7 @@ msgstr "" "RD (RMDIR)\tApaga um subdiretório\n" "SET\t\tConfigura ou mostra variáveis de ambiente\n" "SETLOCAL\tInicia as mudanças de ambiente num arquivo de lote\n" +"START\t\tInicia um programa ou abre um documento no programa associado\n" "TIME\t\tConfigura ou mostra a hora atual do sistema\n" "TITLE\t\tConfigura o título da janela de comando CMD\n" "TYPE\t\tMostra o conteúdo de um arquivo texto\n"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 13, 2012

Feb. 13, 2012

Module: wine Branch: master Commit: aa97bf05d05013a0496b592e442fca5e1d60dde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa97bf05d05013a0496b592e4… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Feb 11 18:53:50 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 270369c..2e58b24 100644 --- a/po/lt.po +++ b/po/lt.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-02 20:33+0300\n" +"PO-Revision-Date: 2012-02-11 22:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9586,7 +9586,6 @@ msgstr "" "jokio poveikio, kai kviečiama iš komandos eilutės.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9619,14 +9618,9 @@ msgstr "" "išėjimo kodu.\n" "/Unix Naudoti Unix failo vardą ir paleisti failą kaip windows " "naršyklėje.\n" +"/ProgIDOpen Atverti dokumentą naudojant šį progID.\n" "/L Parodyti galutinio naudotojo licenciją.\n" "/? Parodyti šį pranešimą ir išeiti.\n" -"\n" -"start.exe versija 0.2 (C) 2003, Dan Kegel\n" -"Start pateikiama BE JOKIŲ GARANTIJŲ; detales rasite paleidę su /L " -"parametru.\n" -"Ši programa yra laisva programinė įranga; galite ją platinti\n" -"tam tikromis sąlygomis; paleiskite „start /L“ išsamiai informacijai gauti.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9773,7 +9767,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9841,6 +9834,7 @@ msgstr "" "RD (RMDIR)\tŠalinti pakatalogį\n" "SET\t\tNustatyti ar parodyti aplinkos kintamuosius\n" "SETLOCAL\tPradėti aplinkos pakeitimų lokalizavimą komandų faile\n" +"START\t\tPaleisti programą arba atverti dokumentą susietoje programoje\n" "TIME\t\tNustatyti ar parodyti dabartinį sistemos laiką\n" "TITLE\t\tNustatyti CMD seanso lango antraštę\n" "TYPE\t\tIšvesti tekstinio failo turinį\n"

1 0

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

Frédéric Delanoy : French translation for release 1.4-rc3
by Jeremy Newman Feb. 13, 2012

Feb. 13, 2012

Module: website Branch: master Commit: aca1a1ec6b5119f5582d48f8d2558968f6297fd9 URL: http://source.winehq.org/git/website.git/?a=commit;h=aca1a1ec6b5119f5582d48… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 21:19:08 2012 +0100 French translation for release 1.4-rc3 --- news/fr/2012021101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012021101.xml b/news/fr/2012021101.xml new file mode 100644 index 0000000..b14c900 --- /dev/null +++ b/news/fr/2012021101.xml @@ -0,0 +1,15 @@ +<news> +<date>11 février 2012</date> +<title>Sortie de Wine 1.4-rc3</title> +<body> + La version de développement 1.4-rc3 de Wine est disponible. + <a href="{$root}/announce/1.4-rc3">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc3.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Joerg Schiermeier : Missing comma
by Jeremy Newman Feb. 13, 2012

Feb. 13, 2012

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

Alexandre Julliard : Wine release 1.4-rc3
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: website Branch: master Commit: 024540a3dae6ded7ac953e6f97b5a6f0bedaa0a9 URL: http://source.winehq.org/git/website.git/?a=commit;h=024540a3dae6ded7ac953e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 20:51:05 2012 +0100 Wine release 1.4-rc3 --- news/en/2012021101.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012021101.xml b/news/en/2012021101.xml new file mode 100644 index 0000000..f47fafc --- /dev/null +++ b/news/en/2012021101.xml @@ -0,0 +1,12 @@ +<news> +<date>February 11, 2012</date> +<title>Wine 1.4-rc3 Released</title> +<body> + The Wine development release 1.4-rc3 is now available. + <a href="{$root}/announce/1.4-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.4-rc3.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: cd3af0531b0b86edf570e36bc3ce0011fc8806c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3af0531b0b86edf570e36bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 20:25:37 2012 +0100 Release 1.4-rc3. --- ANNOUNCE | 396 ++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 242 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd3af0531b0b86edf570e…

1 0

Tag wine-1.4-rc3 : Alexandre Julliard : Release 1.4-rc3
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: refs/tags/wine-1.4-rc3 Tag: b315c5f8cb5efb736e9da85d4dccfb1aae85ddc0 URL: http://source.winehq.org/git/wine.git/?a=tag;h=b315c5f8cb5efb736e9da85d4dcc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 20:25:38 2012 +0100 Release 1.4-rc3

1 0