June 2011 - Wine-Commits - list.winehq.org

Gerald Pfeifer : d3dx9_36: Fix the return value in error cases in d3dx9_parse_resource.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: c69331c84a8951fcb13494fc01525f355cb022ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69331c84a8951fcb13494fc0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jun 15 13:01:22 2011 -0600 d3dx9_36: Fix the return value in error cases in d3dx9_parse_resource. --- dlls/d3dx9_36/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 271594c..3265037 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4733,12 +4733,14 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + hr=E_FAIL; break; } break; default: FIXME("Unknown usage %x\n", usage); + hr=E_FAIL; break; }

1 0

Jörg Höhle : ntdll: Use list_empty() instead of list_count() == 0.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: bcd2d0ec5b58849ba66c5cf9a28f1be201fa66e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd2d0ec5b58849ba66c5cf9a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jun 15 20:25:56 2011 +0200 ntdll: Use list_empty() instead of list_count() == 0. --- dlls/ntdll/threadpool.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1a10240..547e6eb 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -577,7 +577,7 @@ static void queue_remove_timer(struct queue_timer *t) NtSetEvent(t->event, NULL); RtlFreeHeap(GetProcessHeap(), 0, t); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) NtSetEvent(q->event, NULL); } @@ -725,7 +725,7 @@ static void WINAPI timer_queue_thread_proc(LPVOID p) timer got put at the head of the list so we need to adjust our timeout. */ RtlEnterCriticalSection(&q->cs); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) done = TRUE; RtlLeaveCriticalSection(&q->cs); }

1 0

Jörg Höhle : strmbase: Use !list_empty() instead of list_count() > 0.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 155e4fb6d340fd84b66ada46574c429b3fe47bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=155e4fb6d340fd84b66ada465… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jun 15 22:21:50 2011 +0200 strmbase: Use !list_empty() instead of list_count() > 0. --- dlls/strmbase/outputqueue.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 4f4ecf8..88a49f8 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -171,10 +171,10 @@ HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSamp list_add_tail(pOutputQueue->SampleList, &qev->entry); (*nSamplesProcessed)++; } - LeaveCriticalSection(&pOutputQueue->csQueue); if (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) SetEvent(pOutputQueue->hProcessQueue); + LeaveCriticalSection(&pOutputQueue->csQueue); } return hr; } @@ -190,7 +190,7 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) if (pOutputQueue->hThread) { EnterCriticalSection(&pOutputQueue->csQueue); - if (list_count(pOutputQueue->SampleList) > 0) + if (!list_empty(pOutputQueue->SampleList)) { pOutputQueue->bSendAnyway = TRUE; SetEvent(pOutputQueue->hProcessQueue); @@ -235,14 +235,14 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) do { EnterCriticalSection(&pOutputQueue->csQueue); - if (list_count(pOutputQueue->SampleList) > 0 && + if (!list_empty(pOutputQueue->SampleList) && (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || pOutputQueue->bSendAnyway ) ) { - while (list_count(pOutputQueue->SampleList) > 0) + while (!list_empty(pOutputQueue->SampleList)) { IMediaSample **ppSamples; LONG nSamples; @@ -278,28 +278,25 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) HeapFree(GetProcessHeap(),0,ppSamples); /* Process Non-Samples */ - if (list_count(pOutputQueue->SampleList) > 0) + LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) { - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); + if (qev->type == EOS_PACKET) { - QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); - if (qev->type == EOS_PACKET) + IPin* ppin = NULL; + IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); + if (ppin) { - IPin* ppin = NULL; - IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } + IPin_EndOfStream(ppin); + IPin_Release(ppin); } - else if (qev->type == SAMPLE_PACKET) - break; - else - FIXME("Unhandled Event type %i\n",qev->type); - list_remove(cursor); - HeapFree(GetProcessHeap(),0,qev); } + else if (qev->type == SAMPLE_PACKET) + break; + else + FIXME("Unhandled Event type %i\n",qev->type); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,qev); } } pOutputQueue->bSendAnyway = FALSE;

1 0

Henri Verbeet : wined3d: Fix source rectangle validation in wined3d_device_update_surface().
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 6f710d18fc1c3e6b077f8db6c64ed2bc84807ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f710d18fc1c3e6b077f8db6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:28 2011 +0200 wined3d: Fix source rectangle validation in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba5db37..ed52831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4786,8 +4786,8 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, r.bottom = src_surface->resource.height; src_rect = &r; } - else if (src_rect->left < 0 || src_rect->left >= r.right - || src_rect->top < 0 || src_rect->top >= r.bottom) + else if (src_rect->left < 0 || src_rect->left >= src_rect->right + || src_rect->top < 0 || src_rect->top >= src_rect->bottom) { WARN("Invalid source rectangle.\n"); return WINED3DERR_INVALIDCALL;

1 0

André Hentschel : kernel32: Set dwProcessorType on ARM .
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 4f1aae76af0254cf5965722431cee4ff2a61afdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1aae76af0254cf596572243… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 15 20:53:35 2011 +0200 kernel32: Set dwProcessorType on ARM. --- dlls/kernel32/cpu.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 560c060..996d776 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -157,6 +157,13 @@ VOID WINAPI GetSystemInfo( case PROCESSOR_ARCHITECTURE_AMD64: si->dwProcessorType = PROCESSOR_AMD_X8664; break; + case PROCESSOR_ARCHITECTURE_ARM: + switch (sci.Level) + { + case 4: si->dwProcessorType = PROCESSOR_ARM_7TDMI; break; + default: si->dwProcessorType = PROCESSOR_ARM920; + } + break; default: FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0;

1 0

André Hentschel : ntdll: Parse ARM CPU level.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 3eb91fbc3c3c501f2a3ff094d4da7fa75c1294fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb91fbc3c3c501f2a3ff094d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 15 20:52:33 2011 +0200 ntdll: Parse ARM CPU level. --- dlls/ntdll/nt.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 316e9f6..f9302c1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -990,11 +990,12 @@ void fill_cpu_info(void) continue; } - /* 2.1 method */ - if (!strcasecmp(line, "cpu family")) + /* 2.1 and ARM method */ + if (!strcasecmp(line, "cpu family") || !strcasecmp(line, "CPU architecture")) { if (isdigit(value[0])) { + value[1] = '\0'; /* Make sure we only get one character */ cached_sci.Level = atoi(value); } continue;

1 0

André Hentschel : kernel32: Initialise dwProcessorType .
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 8a8a700513719c8f4f5fbbf7d038756424a39698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8a700513719c8f4f5fbbf7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 15 20:51:45 2011 +0200 kernel32: Initialise dwProcessorType. --- dlls/kernel32/cpu.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 5d45941..560c060 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -157,7 +157,9 @@ VOID WINAPI GetSystemInfo( case PROCESSOR_ARCHITECTURE_AMD64: si->dwProcessorType = PROCESSOR_AMD_X8664; break; - default: FIXME("Unknown processor architecture %x\n", sci.Architecture); + default: + FIXME("Unknown processor architecture %x\n", sci.Architecture); + si->dwProcessorType = 0; } si->dwAllocationGranularity = sbi.AllocationGranularity; si->wProcessorLevel = sci.Level;

1 0

Frédéric Delanoy : cmdlgtst: Update French translation.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 6b45fd8aa37bd4ac467b837fd24e82af06df84e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b45fd8aa37bd4ac467b837fd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 15 21:17:27 2011 +0200 cmdlgtst: Update French translation. --- programs/cmdlgtst/Fr.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index b6da8eb..6d3e8a8 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -37,30 +37,30 @@ CmdlgtstMenu MENU POPUP "&Commdlg" { - MENUITEM "&Ouvrir", CM_U_OPEN - MENUITEM "&Enregistrer", CM_U_SAVE + MENUITEM "&Ouvrir...", CM_U_OPEN + MENUITEM "&Enregistrer sous...", CM_U_SAVE MENUITEM SEPARATOR - MENUITEM "&Couleur", CM_U_COLOR - MENUITEM "&Police", CM_U_FONT + MENUITEM "&Couleur...", CM_U_COLOR + MENUITEM "&Police...", CM_U_FONT MENUITEM SEPARATOR - MENUITEM "&Rechercher", CM_U_FIND - MENUITEM "Remp&lacer", CM_U_REPLACE + MENUITEM "&Rechercher...", CM_U_FIND + MENUITEM "Remp&lacer...", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "&Imprimer", CM_U_PRINT - MENUITEM "Mise en pa&ge", CM_U_PAGESETUP + MENUITEM "&Imprimer...", CM_U_PRINT + MENUITEM "Mise en pa&ge...", CM_U_PAGESETUP } POPUP "&Indicateurs" { - MENUITEM "&Fichier", CM_F_FILE + MENUITEM "&Fichier...", CM_F_FILE MENUITEM SEPARATOR - MENUITEM "&Couleur", CM_F_COLOR - MENUITEM "&Police", CM_F_FONT + MENUITEM "&Couleur...", CM_F_COLOR + MENUITEM "&Police...", CM_F_FONT MENUITEM SEPARATOR - MENUITEM "Rechercher/&Remplacer", CM_F_FINDREPLACE + MENUITEM "Rechercher/&Remplacer...", CM_F_FINDREPLACE MENUITEM SEPARATOR - MENUITEM "&Imprimer", CM_F_PRINT - MENUITEM "Mise en pa&ge", CM_F_PAGESETUP + MENUITEM "&Imprimer...", CM_F_PRINT + MENUITEM "Mise en pa&ge...", CM_F_PAGESETUP } POPUP "&Aide"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: e3991b9706251b507232127822c9ee2c82082830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3991b9706251b50723212782… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 15 21:17:29 2011 +0200 po: Update French translation. --- po/fr.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index df9850d..caa316b 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: 2011-06-14 19:58+0100\n" +"PO-Revision-Date: 2011-06-15 21:15+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -189,7 +189,7 @@ msgstr "Disques locaux" #: comdlg32.rc:43 msgid "File not found" -msgstr "Fichier non trouvé" +msgstr "Fichier introuvable" #: comdlg32.rc:44 msgid "Please verify that the correct file name was given" @@ -6404,9 +6404,8 @@ msgid "E&xit" msgstr "&Quitter" #: shell32.rc:115 -#, fuzzy msgid "&About Control Panel" -msgstr "À &propos du panneau de configuration..." +msgstr "À &propos du panneau de configuration" #: shell32.rc:123 shell32.rc:127 winefile.rc:113 msgid "Size"

1 0

Frédéric Delanoy : shell32: Update French translation.
by Alexandre Julliard June 16, 2011

June 16, 2011

Module: wine Branch: master Commit: 2118b66193543c9c0c86ff0410ad0ef06451f624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2118b66193543c9c0c86ff041… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 15 21:17:28 2011 +0200 shell32: Update French translation. --- dlls/shell32/shell32_Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index bb23c6e..3eeb6bb 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -4,7 +4,7 @@ * * Copyright 1998 Juergen Schmied * Copyright 2006-2009 Jonathan Ernst - * Copyright 2010 Frédéric Delanoy + * Copyright 2010-2011 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -79,7 +79,7 @@ CAPTION "À propos de %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 70, 12, WS_TABSTOP - PUSHBUTTON "&Licence de Wine...", IDC_ABOUT_LICENSE, 153, 113, 70, 12, WS_TABSTOP + PUSHBUTTON "&Licence de Wine", IDC_ABOUT_LICENSE, 153, 113, 70, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 137, 10

1 0