February 2012 - Wine-commits

Łukasz Wojniłowicz : Polish translation for release 1.4-rc4
by Jeremy Newman 21 Feb '12

21 Feb '12

Module: website Branch: master Commit: 15d490e4672b8a1e8887f793892f2290fe576443 URL: http://source.winehq.org/git/website.git/?a=commit;h=15d490e4672b8a1e8887f7… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 18 08:00:59 2012 +0100 Polish translation for release 1.4-rc4 --- news/pl/2012021701.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012021701.xml b/news/pl/2012021701.xml new file mode 100644 index 0000000..6b178f3 --- /dev/null +++ b/news/pl/2012021701.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 17, 2012</date> +<title>Wydano Wine 1.4-rc4</title> +<body> + Wydanie rozwojowe Wine 1.4-rc4 jest już dostępne. + <a href="{$root}/announce/1.4-rc4">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-rc4.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

Christian Costa : d3dxof: Accept bigger names for objects.
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 67c6234a26e37d20ab80c353be3dbbe80c2bb13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c6234a26e37d20ab80c353b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 20 21:11:12 2012 +0100 d3dxof: Accept bigger names for objects. --- dlls/d3dxof/d3dxof_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index a68df56..8872c14 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -30,7 +30,7 @@ #include "winuser.h" #include "dxfile.h" -#define MAX_NAME_LEN 32 +#define MAX_NAME_LEN 40 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 #define MAX_CHILDREN 200

1 0

Christian Costa : d3dxof: Fix leaking of IDirectXFileObject object in tests .
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 36d4e1ea59c90beaf65bc5d0d03d5846b5907976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d4e1ea59c90beaf65bc5d0d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 20 23:42:32 2012 +0100 d3dxof: Fix leaking of IDirectXFileObject object in tests. --- dlls/d3dxof/tests/d3dxof.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 95dcd66..c166054 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -611,6 +611,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) printf("Found Binary (%d)\n", j); IDirectXFileBinary_Release(p3); } + IDirectXFileObject_Release(pChildObj); } (*plevel)--; ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr);

1 0

Christian Costa : d3dxof: Make sure the returned object pointer is null when there is no more object .
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 40b15a380d4bd4e7c771aad83e91a0a07f8d59dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b15a380d4bd4e7c771aad83… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 20 23:42:49 2012 +0100 d3dxof: Make sure the returned object pointer is null when there is no more object. --- dlls/d3dxof/d3dxof.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 3294f92..2b0770f 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -988,17 +988,22 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (This->nb_xobjects >= MAX_OBJECTS) { ERR("Too many objects\n"); + *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; } /* Check if there are templates defined before the object */ - if (!parse_templates(&This->buf)) { + if (!parse_templates(&This->buf)) + { hr = DXFILEERR_BADVALUE; goto error; } if (!This->buf.rem_bytes) + { + *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; + } hr = IDirectXFileDataImpl_Create(&object); if (FAILED(hr))

1 0

Henri Verbeet : wined3d: Don' t take the wined3d mutex during WM_DISPLAYCHANGE either.
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: ed47f259bdb664b508301480c5018b5f60f84f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed47f259bdb664b508301480c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 10:02:13 2012 +0100 wined3d: Don't take the wined3d mutex during WM_DISPLAYCHANGE either. --- dlls/ddraw/ddraw.c | 2 ++ dlls/wined3d/device.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 99c0a69..25519d2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5359,6 +5359,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p.\n", device_parent, device); } +/* This is run from device_process_message() in wined3d, we can't take the + * wined3d mutex. */ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0768aa..17560c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5912,9 +5912,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_DISPLAYCHANGE) { - wined3d_mutex_lock(); device->device_parent->ops->mode_changed(device->device_parent); - wined3d_mutex_unlock(); } if (unicode)

1 0

André Hentschel : progman: Remove dead code.
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: b3369984270c1b13e774fadf9b416fdeac85c8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3369984270c1b13e774fadf9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 20 20:49:27 2012 +0100 progman: Remove dead code. --- programs/progman/group.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/progman/group.c b/programs/progman/group.c index d628ffc..39f155c 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -33,9 +33,6 @@ static LRESULT CALLBACK GROUP_GroupWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { -#if 0 - printf("G %4.4x %4.4x\n", msg, wParam); -#endif switch (msg) { case WM_SYSCOMMAND:

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 7249cd4a90e7c248758e7a3e2e33924adeb642e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7249cd4a90e7c248758e7a3e2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Feb 20 21:43:29 2012 +0200 po: Update Finnish translation. --- po/fi.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4463123..f8f01d6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6254,7 +6254,7 @@ msgstr "" #: winerror.mc:3526 msgid "Not an RPC error.\n" -msgstr "Ei RCP-virhe.\n" +msgstr "Ei RPC-virhe.\n" #: winerror.mc:3531 msgid "UUID is local only.\n" @@ -8065,7 +8065,7 @@ msgstr "" "lisätietoja.\n" "\n" "Winen mukana pitäisi tulla kopio GNU Lesser General Public Licensesta; jos " -"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin Street, " +"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, " "Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:253 @@ -9619,7 +9619,7 @@ msgstr "" "Syntaksi: ASSOC [.pääte[=[tyyppi]]]\n" "\n" "ASSOC ilman parametreja näyttää nykyiset tiedostokytkennät.\n" -"Pelkän tiedostopäätteen kanssa ASSOC näyttää kyseisen päätteen kytekennän.\n" +"Pelkän tiedostopäätteen kanssa ASSOC näyttää kyseisen päätteen kytkennän.\n" "Jos annetaan yhtäsuuruusmerkki mutta ei tyyppiä, ASSOC poistaa " "tiedostopäätteen nykyisen kytkennän.\n" @@ -9670,7 +9670,6 @@ msgstr "" "komentoriville, jolta kutsuit cmd:tä.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9739,6 +9738,7 @@ msgstr "" "RD (RMDIR)\tPoista alihakemisto\n" "SET\t\tAseta tai näytä ympäristömuuttujia\n" "SETLOCAL\tAloita ympäristömuutosten paikallisuus komentojonotiedostossa\n" +"START\t\tKäynnistä ohjelma tai avaa dokumentti siihen kytketyllä ohjelmalla\n" "TIME\t\tAseta tai näytä järjestelmän nykyinen aika\n" "TITLE\t\tAseta ikkunan otsikko CMD-istunnolle\n" "TYPE\t\tKirjoita tekstitiedoston sisältö\n" @@ -9765,11 +9765,11 @@ msgstr "E" #: cmd.rc:310 msgid "File association missing for extension %1\n" -msgstr "Päätteellä %1 ei ole tiedostokytkentää.\n" +msgstr "Päätteellä %1 ei ole tiedostokytkentää\n" #: cmd.rc:311 msgid "No open command associated with file type '%1'\n" -msgstr "Tiedostotyyppiin '%1' ei ole liitetty avauskomentoa.\n" +msgstr "Tiedostotyyppiin '%1' ei ole liitetty avauskomentoa\n" #: cmd.rc:312 msgid "Overwrite %1?" @@ -11392,8 +11392,7 @@ msgstr "" "\n" "Ohjelman mukana pitäisi tulla kopio GNU Lesser General Public Licensesta; " "jos\n" -"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin " -"Street,\n" +"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St,\n" "Fifth Floor, Boston, MA 02110-1301, USA.\n" "\n" "Tiedostossa COPYING.LIB on lisenssitietoa.\n"

1 0

Kusanagi Kouichi : gdi32: Initialize font signature of "System" font link.
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 4dc04ae867155ba734c2a8edbe816c31e09703a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc04ae867155ba734c2a8edb… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Feb 21 20:14:18 2012 +0900 gdi32: Initialize font signature of "System" font link. --- dlls/gdi32/freetype.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ea0da85..8a0c096 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2212,6 +2212,7 @@ skip_internal: system_font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*system_font_link)); system_font_link->font_name = strdupW(System); list_init(&system_font_link->links); + memset(&fs, 0, sizeof(fs)); face = find_face_from_filename(tahoma_ttf, Tahoma); if(face) @@ -2219,6 +2220,8 @@ skip_internal: child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); child_font->face = face; child_font->font = NULL; + fs.fsCsb[0] |= face->fs.fsCsb[0]; + fs.fsCsb[1] |= face->fs.fsCsb[1]; TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index); list_add_tail(&system_font_link->links, &child_font->entry); } @@ -2233,11 +2236,21 @@ skip_internal: new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); new_child->face = font_link_entry->face; new_child->font = NULL; + fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; + fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; list_add_tail(&system_font_link->links, &new_child->entry); } break; } } + family = find_family_from_name(system_font_link->font_name); + if(family) + { + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + face->fs_links = fs; + } + } list_add_tail(&system_links, &system_font_link->entry); return ret; }

1 0

Huw Davies : ole32: Trace the drop effect in hex.
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 903803b5525a62d2579c0340d2ac275d7178e215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903803b5525a62d2579c0340d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 21 14:19:44 2012 +0000 ole32: Trace the drop effect in hex. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index cb667c9..9e9ca65 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -773,7 +773,7 @@ HRESULT WINAPI DoDragDrop ( HWND hwndTrackWindow; MSG msg; - TRACE("(%p, %p, %d, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); + TRACE("(%p, %p, %08x, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); if (!pDataObject || !pDropSource || !pdwEffect) return E_INVALIDARG;

1 0

Alexandre Julliard : gdi32: Don' t paint the text rectangle in transparent mode unless a rectangle is explicitly specified .
by Alexandre Julliard 21 Feb '12

21 Feb '12

Module: wine Branch: master Commit: 32057bf1328908aea8709d3a832cb1e0792e58ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=32057bf1328908aea8709d3a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 17:20:48 2012 +0100 gdi32: Don't paint the text rectangle in transparent mode unless a rectangle is explicitly specified. --- dlls/gdi32/font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1dc87b1..6035b57 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2198,7 +2198,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(rc.top > rc.bottom) {INT tmp = rc.top; rc.top = rc.bottom; rc.bottom = tmp;} } - if (flags & ETO_OPAQUE) + if (lprect && (flags & ETO_OPAQUE)) physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); if(count == 0) @@ -2354,7 +2354,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { if(!((flags & ETO_CLIPPED) && (flags & ETO_OPAQUE))) { - if(!(flags & ETO_OPAQUE) || x < rc.left || x + width.x >= rc.right || + if(!(flags & ETO_OPAQUE) || !lprect || + x < rc.left || x + width.x >= rc.right || y - tm.tmAscent < rc.top || y + tm.tmDescent >= rc.bottom) { RECT text_box;

1 0