August 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add tests for redirections using non stdout/stderr handles.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 523683d78858419df6edee80710b5ffafcecd127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523683d78858419df6edee807… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:29 2011 +0200 cmd/tests: Add tests for redirections using non stdout/stderr handles. --- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1f9bb78..7a264d4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -81,6 +81,10 @@ echo foo>foo type foo echo foo 1> foo type foo +echo foo7 7> foo +type foo +echo foo9 9> foo +type foo echo foo1> foo type foo echo foo11> foo @@ -103,6 +107,10 @@ type foo del foo echo food21>>foo type foo +del foo +echo foo> foo +echo foo7 7>> foo || (echo not supported & del foo) +if exist foo (type foo) else echo not supported cd .. & rd /s/q foobar echo ------------ Testing ^^ escape character -------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 17d828c..2f9471b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -120,6 +120,8 @@ word ...stdout redirection foo foo(a)space@ +foo7(a)space@@or_broken(a)foo@space@ +foo9(a)space@@or_broken(a)foo@space@ @todo_wine(a)foo1 @todo_wine(a)foo11 @todo_wine(a)foo12 @@ -137,6 +139,8 @@ fooc(a)space@ @todo_wine(a)food1 @todo_wine(a)food2 @todo_wine(a)food21 +(a)todo_wine@foo7(a)space@@space@@or_broken(a)not supported(a)space@ +(a)todo_wine@foo(a)or_broken@not supported @todo_wine(a)------------ Testing ^ escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world

1 0

Francois Gouget : net: Fix the parameter checking, /help handling and usage .
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 175953563bd7b230f78c000290e9c155d61e792b URL: http://source.winehq.org/git/wine.git/?a=commit;h=175953563bd7b230f78c00029… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 26 17:40:17 2011 +0200 net: Fix the parameter checking, /help handling and usage. Also simplify and improve the usage messages. --- po/ar.po | 48 +++++++++++++++-------------- po/bg.po | 48 +++++++++++++++-------------- po/ca.po | 48 +++++++++++++++-------------- po/cs.po | 48 +++++++++++++++-------------- po/da.po | 70 +++++++++++++++++++++--------------------- po/de.po | 68 ++++++++++++++++++++-------------------- po/el.po | 48 +++++++++++++++-------------- po/en.po | 66 +++++++++++++++++++-------------------- po/en_US.po | 77 +++++++++++++++++++++++++-------------------- po/eo.po | 48 +++++++++++++++-------------- po/es.po | 52 +++++++++++++++---------------- po/fa.po | 48 +++++++++++++++-------------- po/fi.po | 48 +++++++++++++++-------------- po/fr.po | 68 ++++++++++++++++++++-------------------- po/he.po | 68 ++++++++++++++++++++-------------------- po/hi.po | 48 +++++++++++++++-------------- po/hu.po | 48 +++++++++++++++-------------- po/it.po | 68 ++++++++++++++++++++-------------------- po/ja.po | 68 ++++++++++++++++++++-------------------- po/ko.po | 70 +++++++++++++++++++++--------------------- po/lt.po | 68 ++++++++++++++++++++-------------------- po/ml.po | 48 +++++++++++++++-------------- po/nb_NO.po | 70 +++++++++++++++++++++--------------------- po/nl.po | 68 ++++++++++++++++++++-------------------- po/or.po | 48 +++++++++++++++-------------- po/pa.po | 48 +++++++++++++++-------------- po/pl.po | 70 +++++++++++++++++++++--------------------- po/pt_BR.po | 68 ++++++++++++++++++++-------------------- po/pt_PT.po | 68 ++++++++++++++++++++-------------------- po/rm.po | 48 +++++++++++++++-------------- po/ro.po | 68 ++++++++++++++++++++-------------------- po/ru.po | 68 ++++++++++++++++++++-------------------- po/sk.po | 48 +++++++++++++++-------------- po/sl.po | 70 +++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 48 +++++++++++++++-------------- po/sr_RS(a)latin.po | 48 +++++++++++++++-------------- po/sv.po | 68 ++++++++++++++++++++-------------------- po/te.po | 48 +++++++++++++++-------------- po/th.po | 48 +++++++++++++++-------------- po/tr.po | 48 +++++++++++++++-------------- po/uk.po | 68 ++++++++++++++++++++-------------------- po/wa.po | 48 +++++++++++++++-------------- po/wine.pot | 48 +++++++++++++++-------------- po/zh_CN.po | 48 +++++++++++++++-------------- po/zh_TW.po | 48 +++++++++++++++-------------- programs/net/net.c | 47 ++++++++++++++++----------- programs/net/net.rc | 8 ++--- programs/net/resources.h | 1 - 48 files changed, 1348 insertions(+), 1289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=175953563bd7b230f78c0…

1 0

Francois Gouget : net: Add support for enumerating the running services with 'net start'.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a64f42b8d7cd66fa59809531f8c973cf116195af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64f42b8d7cd66fa59809531f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 26 17:41:52 2011 +0200 net: Add support for enumerating the running services with 'net start'. --- po/ar.po | 31 ++++++++++++++++--------- po/bg.po | 31 ++++++++++++++++--------- po/ca.po | 31 ++++++++++++++++--------- po/cs.po | 31 ++++++++++++++++--------- po/da.po | 32 +++++++++++++++++--------- po/de.po | 32 +++++++++++++++++--------- po/el.po | 31 ++++++++++++++++--------- po/en.po | 31 ++++++++++++++++--------- po/en_US.po | 37 +++++++++++++++++++----------- po/eo.po | 31 ++++++++++++++++--------- po/es.po | 31 ++++++++++++++++--------- po/fa.po | 31 ++++++++++++++++--------- po/fi.po | 31 ++++++++++++++++--------- po/fr.po | 32 +++++++++++++++++--------- po/he.po | 32 +++++++++++++++++--------- po/hi.po | 31 ++++++++++++++++--------- po/hu.po | 31 ++++++++++++++++--------- po/it.po | 32 +++++++++++++++++--------- po/ja.po | 32 +++++++++++++++++--------- po/ko.po | 32 +++++++++++++++++--------- po/lt.po | 32 +++++++++++++++++--------- po/ml.po | 31 ++++++++++++++++--------- po/nb_NO.po | 32 +++++++++++++++++--------- po/nl.po | 32 +++++++++++++++++--------- po/or.po | 31 ++++++++++++++++--------- po/pa.po | 31 ++++++++++++++++--------- po/pl.po | 32 +++++++++++++++++--------- po/pt_BR.po | 32 +++++++++++++++++--------- po/pt_PT.po | 32 +++++++++++++++++--------- po/rm.po | 31 ++++++++++++++++--------- po/ro.po | 32 +++++++++++++++++--------- po/ru.po | 32 +++++++++++++++++--------- po/sk.po | 31 ++++++++++++++++--------- po/sl.po | 32 +++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 31 ++++++++++++++++--------- po/sr_RS(a)latin.po | 31 ++++++++++++++++--------- po/sv.po | 32 +++++++++++++++++--------- po/te.po | 31 ++++++++++++++++--------- po/th.po | 31 ++++++++++++++++--------- po/tr.po | 31 ++++++++++++++++--------- po/uk.po | 32 +++++++++++++++++--------- po/wa.po | 31 ++++++++++++++++--------- po/wine.pot | 31 ++++++++++++++++--------- po/zh_CN.po | 31 ++++++++++++++++--------- po/zh_TW.po | 31 ++++++++++++++++--------- programs/net/net.c | 55 ++++++++++++++++++++++++++++++++++++++++++++- programs/net/net.rc | 4 ++- programs/net/resources.h | 2 + 48 files changed, 979 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a64f42b8d7cd66fa59809…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a5f1eeb5f09357ba85bac5887ea6ffc51aee95f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f1eeb5f09357ba85bac5887… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Aug 27 11:30:06 2011 +0900 po: Updated Korean translation. --- po/ko.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index 92ae190..c8020d5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -775,7 +775,7 @@ msgstr "단체 단위" #: crypt32.rc:74 msgid "Common Name" -msgstr "보통 이름" +msgstr "완전한 이름" #: crypt32.rc:75 msgid "Locality" @@ -791,16 +791,15 @@ msgstr "제목" #: crypt32.rc:78 msgid "Given Name" -msgstr "주어진 이름" +msgstr "이름" #: crypt32.rc:79 msgid "Initials" msgstr "머릿글자" #: crypt32.rc:80 -#, fuzzy msgid "Surname" -msgstr "사용자 이름" +msgstr "성" #: crypt32.rc:81 msgid "Domain Component" @@ -10231,7 +10230,6 @@ msgid "Drives" msgstr "드라이브" #: winecfg.rc:41 -#, fuzzy msgid "Select the Unix target directory, please." msgstr "유닉스 목적 폴더를 선택하십시오."

1 0

José Manuel Ferrer Ortiz : appwiz.cpl: Spanish translation update.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 4fc6fa37346fa0fecc9440fd6eb1e3fbfbd5acaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc6fa37346fa0fecc9440fd6… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sun Aug 28 10:55:04 2011 +0100 appwiz.cpl: Spanish translation update. --- dlls/appwiz.cpl/Es.rc | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/Es.rc b/dlls/appwiz.cpl/Es.rc index 3c4c77c..6ee3097 100644 --- a/dlls/appwiz.cpl/Es.rc +++ b/dlls/appwiz.cpl/Es.rc @@ -2,6 +2,7 @@ * Add/Remove Programs Spanish resources * * Copyright 2010 Jaime Rave +* Copyright 2011 José Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,11 +31,11 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalar/Desinstalar" FONT 8, "MS Shell Dlg" { - CONTROL "Para instalar un nuevo programa desde un disquete, unidad de CD-ROM, o tu disco duro, haz clic en instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Para instalar un nuevo programa desde un disquete, unidad de CD-ROM, o su disco duro, haga clic en Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "El siguiete software puede ser eliminado automaticamente. Para quitar un programa o modificar sus componentes instalados, seleccionanlo en la lista y haz clic en Modificar/Quitar.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "El siguiente software puede ser eliminado automáticamente. Para quitar un programa o modificar sus componentes instalados, selecciónelo en la lista y haga clic en Modificar/Quitar.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Información de soporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 @@ -54,7 +55,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Contacto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 CONTROL "Información de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 CONTROL "Teléfono de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Leeme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Léeme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 CONTROL "Actualizaciones del Producto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 CONTROL "Comentarios:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 @@ -66,3 +67,19 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine no pudo encontrar el paquete de Gecko, el cual es necesario para que las " \ + "aplicaciones que embeban HTML funcionen correctamente. Wine puede descargarlo e " \ + "instalarlo automáticamente por usted.\n\n" \ + "Nota: se recomienda que utilice en su lugar los paquetes de su distribución. " \ + "Veáse http://wiki.winehq.org/Gecko para más detalles.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +}

1 0

Alexandre Julliard : wineps: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 6fd40e3cae9ac9dcad85bd6b1636ae8d49f03880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd40e3cae9ac9dcad85bd6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:17 2011 +0200 wineps: Simplify the DIB byte width computation. --- dlls/wineps.drv/bitmap.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 7f2d507..33c72d8 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -31,22 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */ static inline int get_dib_width_bytes( int width, int depth ) { - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: words = width; break; - } - return 4 * words; + return ((width * depth + 31) / 8) & ~3; }

1 0

Alexandre Julliard : winex11: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 8cf6424057fb7c055fee915c00ab213486f4fe1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf6424057fb7c055fee915c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:21 2011 +0200 winex11: Simplify the DIB byte width computation. --- dlls/winex11.drv/dib.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 812117a..3630c3e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -154,23 +154,7 @@ static inline int X11DRV_DIB_GetXImageWidthBytes( int width, int depth ) */ static int X11DRV_DIB_GetDIBWidthBytes( int width, int depth ) { - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3) / 4; break; - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - } - return 4 * words; + return ((width * depth + 31) / 8) & ~3; }

1 0

Alexandre Julliard : comctl32: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: bd3b0e4f70a7ffb90aeafac0711ae81cddc1fa46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3b0e4f70a7ffb90aeafac07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:27 2011 +0200 comctl32: Simplify the DIB byte width computation. --- dlls/comctl32/imagelist.c | 30 +----------------------------- dlls/comctl32/tests/imagelist.c | 19 +------------------ 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 66cd03d..ec62370 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2061,41 +2061,13 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, /*********************************************************************** - * DIB_GetDIBWidthBytes - * - * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. - */ -static int DIB_GetDIBWidthBytes( int width, int depth ) -{ - int words; - - switch(depth) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - break; - } - return 4 * words; -} - -/*********************************************************************** * DIB_GetDIBImageBytes * * Return the number of bytes used to hold the image in a DIB bitmap. */ static int DIB_GetDIBImageBytes( int width, int height, int depth ) { - return DIB_GetDIBWidthBytes( width, depth ) * abs( height ); + return (((width * depth + 31) / 8) & ~3) * abs( height ); } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 46b3595..0441fd0 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -738,24 +738,7 @@ static struct my_IStream Test_Stream = { { &Test_Stream_Vtbl }, 0, 0 }; static INT DIB_GetWidthBytes( int width, int bpp ) { - int words; - - switch (bpp) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - case 32: words = width; break; - - default: - trace("Unknown depth %d, please report.\n", bpp ); - assert(0); - return -1; - } - return 4 * words; + return ((width * bpp + 31) / 8) & ~3; } static void check_bitmap_data(const char *bm_data, ULONG bm_data_size,

1 0

Alexandre Julliard : gdi32: Remove an unused variable.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 987a18a55ce78b5d12881dc7b36b5536e2e286c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987a18a55ce78b5d12881dc7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:52:09 2011 +0200 gdi32: Remove an unused variable. --- dlls/gdi32/dibdrv/bitblt.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 5d8b54e..646aaf0 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -711,7 +711,6 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info { dib_info *dib, stand_alone; DWORD ret; - POINT origin; dib_info src_dib; HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; @@ -757,9 +756,6 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); src_dib.bits.is_copy = bits->is_copy; - origin.x = src->visrect.left; - origin.y = src->visrect.top; - if (!hbitmap) { if (clip) saved_clip = add_extra_clipping_region( pdev, clip );

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_wined3d() const.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: e1f83fd205c669204073f0f5b5dad6dd6de2d836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f83fd205c669204073f0f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:49 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_wined3d() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ef73487..8593a6a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1684,7 +1684,7 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_wined3d(struct wined3d_device *device, struct wined3d **wined3d) +HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d) { TRACE("device %p, wined3d %p.\n", device, wined3d); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b2d4663..3a1cb87 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2271,7 +2271,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_wined3d(struct wined3d_device *device, struct wined3d **d3d); +HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters); HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters);

1 0