July 2010 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Stub GdipRecordMetafile.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 48ceb3d67fc82ea7166aad91b8417dd7e1581ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ceb3d67fc82ea7166aad91b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:27:22 2010 -0500 gdiplus: Stub GdipRecordMetafile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bf0de64..fa89ae2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -466,7 +466,7 @@ @ stub GdipPlayTSClientRecord @ stdcall GdipPrivateAddFontFile(ptr wstr) @ stdcall GdipPrivateAddMemoryFont(ptr ptr long) -@ stub GdipRecordMetafile +@ stdcall GdipRecordMetafile(long long ptr long wstr ptr) @ stdcall GdipRecordMetafileFileName(wstr long long ptr long wstr ptr) @ stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) @ stdcall GdipRecordMetafileI(long long ptr long wstr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5fed017..bfd3a2a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4731,6 +4731,13 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 return NotImplemented; } +GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + FIXME("(%p %d %p %d %p %p): stub\n", hdc, type, frameRect, frameUnit, desc, metafile); + return NotImplemented; +} + /***************************************************************************** * GdipRecordMetafileI [GDIPLUS.@] */

1 0

Vincent Povirk : gdiplus: Stub GdipRecordMetafileStream.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 0c8ac024400b17521ebe168141fd88b11ebc5a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8ac024400b17521ebe16814… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:29:41 2010 -0500 gdiplus: Stub GdipRecordMetafileStream. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index fa89ae2..8b9eaf5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -470,7 +470,7 @@ @ stdcall GdipRecordMetafileFileName(wstr long long ptr long wstr ptr) @ stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) @ stdcall GdipRecordMetafileI(long long ptr long wstr ptr) -@ stub GdipRecordMetafileStream +@ stdcall GdipRecordMetafileStream(ptr long long ptr long wstr ptr) @ stub GdipRecordMetafileStreamI @ stdcall GdipReleaseDC(ptr ptr) @ stdcall GdipRemovePropertyItem(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bfd3a2a..2d512ab 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4748,6 +4748,13 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect return NotImplemented; } +GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + FIXME("(%p %p %d %p %d %p %p): stub\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + return NotImplemented; +} + /***************************************************************************** * GdipIsVisibleClipEmpty [GDIPLUS.@] */

1 0

Vincent Povirk : gdiplus: Stub GdipGetMetafileHeaderFromEmf.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 2223900cf65cda753e66dd6b3916412a570f14f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2223900cf65cda753e66dd6b3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:32:59 2010 -0500 gdiplus: Stub GdipGetMetafileHeaderFromEmf. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8b9eaf5..ad60942 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -315,7 +315,7 @@ @ stdcall GdipGetLogFontW(ptr ptr ptr) @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit -@ stub GdipGetMetafileHeaderFromEmf +@ stdcall GdipGetMetafileHeaderFromEmf(ptr ptr) @ stub GdipGetMetafileHeaderFromFile @ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) @ stub GdipGetMetafileHeaderFromStream diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 252e19a..ca3f0b6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2212,6 +2212,22 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hEmf, + MetafileHeader *header) +{ + static int calls; + + if(!hEmf || !header) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + memset(header, 0, sizeof(MetafileHeader)); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, UINT num, PropertyItem* items) {

1 0

Stefan Dösinger : d3d9: Nvidia drivers don' t like unused output formats.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 218b9cec6fc0f7c3e417d82f62608ffcf3bbf37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=218b9cec6fc0f7c3e417d82f6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 11:54:42 2010 +0200 d3d9: Nvidia drivers don't like unused output formats. Newer nvidia drivers return garbage when using a COUNTx where x is bigger than the amount of coordinates the texture can consume. So stick to COUNT3 for volume textures. The tests don't need COUNT4 anyway. --- dlls/d3d9/tests/visual.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1da7cca..b3d1103 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3937,10 +3937,10 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, 6 * sizeof(float)); ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - /* default values? Set up the identity matrix, pass in 2 vertex coords, and enable 4 */ + /* default values? Set up the identity matrix, pass in 2 vertex coords, and enable 3 */ hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) identity); ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %08x\n", hr); - IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4); + IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT3); ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); @@ -4013,10 +4013,14 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %08x\n", hr); /* Default values? 4 coords used, 3 passed. What happens to the 4th? + * Use COUNT3 because newer Nvidia drivers return black when there are more (output) coords + * than being used by the texture(volume tex -> 3). Again, as shown in earlier test the COUNTx + * affects the post-transformation output, so COUNT3 plus the matrix above is OK for testing the + * 4th *input* coordinate. */ hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) mat); ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %08x\n", hr); - IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4); + IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT3); ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, 6 * sizeof(float)); ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr);

1 0

Stefan Dösinger : d3d9: Pass count= 0 when clearing the whole surface.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: dd6cabcc1e7761ebea98cd83a9efb184eb5cad7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6cabcc1e7761ebea98cd83a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 15:26:53 2010 +0200 d3d9: Pass count=0 when clearing the whole surface. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b3d1103..a17588b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9766,13 +9766,13 @@ static void np2_stretch_rect_test(IDirect3DDevice9 *device) { hr = IDirect3DTexture9_GetSurfaceLevel(dsttex, 0, &dst); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 1, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); /* Clear the StretchRect destination for debugging */ hr = IDirect3DDevice9_SetRenderTarget(device, 0, dst); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 1, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, src);

1 0

Alexandre Goujon : ws2_32: Add host unreachable case.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 73b2f5708f1f918bdf0f495ee8cc96df7035926a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b2f5708f1f918bdf0f495ee… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Fri Jul 2 14:57:56 2010 +0200 ws2_32: Add host unreachable case. --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6254bba..4191f80 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -615,6 +615,7 @@ static inline DWORD NtStatusToWSAError( const DWORD status ) case STATUS_CANT_WAIT: wserr = WSAEWOULDBLOCK; break; case STATUS_BUFFER_OVERFLOW: wserr = WSAEMSGSIZE; break; case STATUS_NOT_SUPPORTED: wserr = WSAEOPNOTSUPP; break; + case STATUS_HOST_UNREACHABLE: wserr = WSAEHOSTUNREACH; break; default: wserr = RtlNtStatusToDosError( status );

1 0

Ken Sharp : msvidc32: Add Welsh resource.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: f1c78ff04f1af181d860a5a4a02963e4b62c4d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c78ff04f1af181d860a5a4a… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Tue Jun 15 07:41:01 2010 +0100 msvidc32: Add Welsh resource. --- dlls/msvidc32/Makefile.in | 1 + dlls/msvidc32/msvidc32_Cy.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index dcf323b..f0c2b88 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ msvideo1.c RC_SRCS = \ + msvidc32_Cy.rc \ msvidc32_Da.rc \ msvidc32_De.rc \ msvidc32_En.rc \ diff --git a/dlls/msvidc32/msvidc32_Cy.rc b/dlls/msvidc32/msvidc32_Cy.rc new file mode 100644 index 0000000..69681b4 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Cy.rc @@ -0,0 +1,30 @@ +/* + * Cefnogaeth iaith Cymraeg + * Welsh language support + * + * Copyright 2010 Ken Sharp + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msvidc32_private.h" + +LANGUAGE LANG_WELSH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 'n fideo codec" +}

1 0

Frédéric Delanoy : comdlg32: Ensure French print dialogs sizes match English ones.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: b4e20b2ebf8de976170b758ea0283bd0cb8b939c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e20b2ebf8de976170b758ea… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 2 22:06:46 2010 +0200 comdlg32: Ensure French print dialogs sizes match English ones. --- dlls/comdlg32/cdlg_Fr.rc | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/comdlg32/cdlg_Fr.rc b/dlls/comdlg32/cdlg_Fr.rc index 105da9f..881cbab 100644 --- a/dlls/comdlg32/cdlg_Fr.rc +++ b/dlls/comdlg32/cdlg_Fr.rc @@ -77,7 +77,7 @@ FONT 8, "MS Shell Dlg" } -PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 237, 134 +PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Imprimer" FONT 8, "MS Shell Dlg" @@ -88,9 +88,9 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "&Tout", rad1, 16, 45, 60, 12 RADIOBUTTON "&Sélection", rad2, 16, 60, 60, 12 RADIOBUTTON "&Pages", rad3, 16, 75, 41, 12 - DEFPUSHBUTTON "Imprimer", 1, 173, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Annuler", 2, 173, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Configurer...", psh1, 173, 46, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Imprimer", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Configurer...", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&De :", 1090, 64, 77, 30, 9 LTEXT "&à :", 1091, 120, 77, 30, 9 LTEXT "&Qualité d'impression :", 1092, 7, 102, 69, 9 @@ -100,7 +100,7 @@ FONT 8, "MS Shell Dlg" } -PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 151 +PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configuration de l'impression" FONT 8, "MS Shell Dlg" @@ -113,16 +113,16 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Options...", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientation", grp2, 6, 90, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Portrait", rad3, 50, 105, 40, 12 - RADIOBUTTON "Pa&ysage", rad4, 50, 120, 40, 12 - ICON "LANDSCAP", stc10, 10, 100, 21, 20 - ICON "PORTRAIT", stc11, 10, 100, 21, 20 - GROUPBOX "Papier", grp3, 120, 90, 135, 50, BS_GROUPBOX - LTEXT "&Taille :", 1089, 125, 103, 30, 9 - LTEXT "&Source :", 1090, 125, 121, 30, 9 - COMBOBOX cmb2, 155, 100, 92, 17, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 118, 92, 17, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Orientation", grp2, 6, 82, 100, 50, BS_GROUPBOX + RADIOBUTTON "&Portrait", rad3, 50, 97, 40, 12 + RADIOBUTTON "Pa&ysage", rad4, 50, 112, 40, 12 + ICON "LANDSCAP", stc10, 10, 92, 21, 20 + ICON "PORTRAIT", stc11, 10, 92, 21, 20 + GROUPBOX "Papier", grp3, 120, 82, 135, 50, BS_GROUPBOX + LTEXT "&Taille :", 1089, 125, 95, 30, 9 + LTEXT "&Source :", 1090, 125, 113, 30, 9 + COMBOBOX cmb2, 155, 92, 92, 17, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 17, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } @@ -231,15 +231,15 @@ FONT 8, "MS Shell Dlg" } -PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 196 +PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Impression" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 178,176, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 231,176, 48,14, WS_GROUP - PUSHBUTTON "Aid&e", pshHelp, 55, 176, 48,14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 178,169, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 231,169, 48,14, WS_GROUP + PUSHBUTTON "Aid&e", pshHelp, 55, 169, 48,14, WS_GROUP GROUPBOX "Imprimante", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Imprimer dans un fichier", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,44,93,14 @@ -306,7 +306,7 @@ BEGIN CONTROL "Pa&ysage", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END -PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 242, 240 +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Mise en page" FONT 8, "MS Shell Dlg"

1 0

Vincent Povirk : gdiplus: Check for null pt in GdipCreateMatrix3.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 1c41470cd09d7857f2d14b470a04ebe0147f6f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c41470cd09d7857f2d14b470… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 16:44:38 2010 -0500 gdiplus: Check for null pt in GdipCreateMatrix3. --- dlls/gdiplus/matrix.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 2176da6..a6724d3 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -87,7 +87,7 @@ GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *rect, { TRACE("(%p, %p, %p)\n", rect, pt, matrix); - if(!matrix) + if(!matrix || !pt) return InvalidParameter; *matrix = GdipAlloc(sizeof(GpMatrix));

1 0

Alexandre Julliard : Wine release 1.2-rc6
by Alexandre Julliard 02 Jul '10

02 Jul '10

Module: website Branch: master Commit: 686c5453ec30a37f809341aa7a840df20bfda3ba URL: http://source.winehq.org/git/website.git/?a=commit;h=686c5453ec30a37f809341… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 19:34:11 2010 +0200 Wine release 1.2-rc6 --- news/en/2010070201.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2010070201.xml b/news/en/2010070201.xml new file mode 100644 index 0000000..7b21489 --- /dev/null +++ b/news/en/2010070201.xml @@ -0,0 +1,13 @@ +<news> +<date>July 2, 2010</date> +<title>Wine 1.2-rc6 Released</title> +<body> + The Wine development release 1.2-rc6 is now available. + <a href="{$root}/announce/1.2-rc6">What's new</a> in this release: +<ul> + <li>Many translation updates.</li> + <li>A lot of bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc6.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