wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

André Hentschel : po: Update German translation.
by Alexandre Julliard 13 Feb '12

13 Feb '12

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

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

13 Feb '12

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

13 Feb '12

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

13 Feb '12

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

13 Feb '12

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

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

13 Feb '12

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

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

13 Feb '12

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

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

13 Feb '12

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

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

13 Feb '12

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

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

13 Feb '12

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

← Newer
1
...
23
24
25
26
27
28
29
...
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