January 2009 - Wine-commits

Huw Davies : comdlg32: Display the fractional part of the margins.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: fd9d79ab5d9073d41f3a13b275238bc75090a387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9d79ab5d9073d41f3a13b27… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 12:04:45 2009 +0000 comdlg32: Display the fractional part of the margins. --- dlls/comdlg32/printdlg.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index be0eaf8..fdedbcf 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2416,13 +2416,28 @@ _c_inch2size(PAGESETUPDLGA *dlga,DWORD size) { static void size2str(const PageSetupDataA *pda, DWORD size, LPWSTR strout) { - static const WCHAR metric_format[] = {'%','d',0}; - static const WCHAR imperial_format[] = {'%','d','i','n',0}; + WCHAR decimal[2] = {'.', 0}; + WCHAR integer_fmt[] = {'%','d',0}; + WCHAR hundredths_fmt[] = {'%','d','%','s','%','0','2','d',0}; + WCHAR thousandths_fmt[] = {'%','d','%','s','%','0','3','d',0}; + + /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */ if (is_metric(pda)) - wsprintfW(strout, metric_format, size / 100); + { + if(size % 100) + wsprintfW(strout, hundredths_fmt, size / 100, decimal, size % 100); + else + wsprintfW(strout, integer_fmt, size / 100); + } else - wsprintfW(strout, imperial_format, size / 1000); + { + if(size % 1000) + wsprintfW(strout, thousandths_fmt, size / 1000, decimal, size % 1000); + else + wsprintfW(strout, integer_fmt, size / 1000); + + } } static void

1 0

Alexandre Julliard : Wine release 1.1.13
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: website Branch: master Commit: bdb30ff03c1ee14f55714febe78bf567c7b1486a URL: http://source.winehq.org/git/website.git/?a=commit;h=bdb30ff03c1ee14f55714f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 16 17:42:45 2009 +0100 Wine release 1.1.13 --- news/en/2009011601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009011601.xml b/news/en/2009011601.xml new file mode 100644 index 0000000..124f0e5 --- /dev/null +++ b/news/en/2009011601.xml @@ -0,0 +1,17 @@ +<news> +<date>January 16, 2009</date> +<title>Wine 1.1.13 Released</title> +<body> + The Wine development release 1.1.13 is now available. + <a href="{$root}/announce/1.1.13">What's new</a> in this release: +<ul> + <li>Freedesktop.org-compliant startup notifications.</li> + <li>Many fixes for 64-bit application support.</li> + <li>Improved graphics support in Internet Explorer.</li> + <li>Various Richedit improvements.</li> + <li>Better certificate manager dialog.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.13.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

Tag wine-1.1.13 : Alexandre Julliard : Release 1.1.13
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: refs/tags/wine-1.1.13 Tag: 1f34b08ac8c45778dcab3ad372c522e585ff2a96 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1f34b08ac8c45778dcab3ad372c5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 16 17:28:08 2009 +0100 Release 1.1.13

1 0

Alexandre Julliard : Release 1.1.13.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 76bb12558beaece005419feb98f024a1eb1f74e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bb12558beaece005419feb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 16 17:28:07 2009 +0100 Release 1.1.13. --- ANNOUNCE | 1372 +++++++++++++++++++++++++++++++++++++------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 847 insertions(+), 545 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76bb12558beaece005419…

1 0

Alexandre Julliard : gdiplus: Fix a typo that breaks the Mingw build.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 0208fe2f1f0cc2bb3c5196ce5a3b73b2242b3faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0208fe2f1f0cc2bb3c5196ce5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 16 16:36:29 2009 +0100 gdiplus: Fix a typo that breaks the Mingw build. --- dlls/gdiplus/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 7e1fa69..f0c9b20 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -149,7 +149,7 @@ static LONG HatchStyleToHatch(HatchStyle hatchstyle) /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] */ -GpStatus WINGDIAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { COLORREF fgcol = ARGB2COLORREF(forecol);

1 0

Michael Stefaniuc : riched20: Fix a typo (stray address of operator).
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 273dbe461976486faddf2ecf3036639551677ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=273dbe461976486faddf2ecf3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 16:29:33 2009 +0100 riched20: Fix a typo (stray address of operator). --- dlls/riched20/para.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ecc89d3..00d81a2 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -587,7 +587,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) while (para != para_end) { para = para->member.para.next_para; - curFmt = &para->member.para.pFmt; + curFmt = para->member.para.pFmt; #define CHECK_FIELD(m, f) \ if (pFmt->f != curFmt->f) pFmt->dwMask &= ~(m);

1 0

Huw Davies : comdlg32: Add an is_metric() helper function.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 3288c72057f545aef7d30158ad09c9ae5576571d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3288c72057f545aef7d30158a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 12:08:18 2009 +0000 comdlg32: Add an is_metric() helper function. --- dlls/comdlg32/printdlg.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c9988a6..47c3b34 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2393,6 +2393,11 @@ static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd) return hDlgTmpl; } +static inline BOOL is_metric(const PageSetupDataA *pda) +{ + return pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS; +} + static DWORD _c_10mm2size(PAGESETUPDLGA *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) @@ -2414,7 +2419,7 @@ static void size2str(const PageSetupDataA *pda, DWORD size, LPWSTR strout) static const WCHAR metric_format[] = {'%','d',0}; static const WCHAR imperial_format[] = {'%','d','i','n',0}; - if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) + if (is_metric(pda)) wsprintfW(strout, metric_format, size / 100); else wsprintfW(strout, imperial_format, size / 1000);

1 0

Huw Davies : comdlg32: Correctly rotate the margins when the paper orientation is changed.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 8149f2a645ca226164857224c7f1b5a8f3ebd505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8149f2a645ca226164857224c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 12:08:12 2009 +0000 comdlg32: Correctly rotate the margins when the paper orientation is changed. --- dlls/comdlg32/printdlg.c | 67 +++++++++++++++++++++++++++++++--------------- 1 files changed, 45 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ffc4fb3..c9988a6 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2409,7 +2409,7 @@ _c_inch2size(PAGESETUPDLGA *dlga,DWORD size) { return (size*254)/100; } -static void size2str(PageSetupDataA *pda, DWORD size, LPWSTR strout) +static void size2str(const PageSetupDataA *pda, DWORD size, LPWSTR strout) { static const WCHAR metric_format[] = {'%','d',0}; static const WCHAR imperial_format[] = {'%','d','i','n',0}; @@ -2495,6 +2495,33 @@ static inline BOOL is_default_metric(void) return system == 0; } +/********************************************** + * rotate_rect + * Cyclically permute the four members of rc + * If sense is TRUE l -> t -> r -> b + * otherwise l <- t <- r <- b + */ +static inline void rotate_rect(RECT *rc, BOOL sense) +{ + INT tmp; + if(sense) + { + tmp = rc->bottom; + rc->bottom = rc->right; + rc->right = rc->top; + rc->top = rc->left; + rc->left = tmp; + } + else + { + tmp = rc->left; + rc->left = rc->top; + rc->top = rc->right; + rc->right = rc->bottom; + rc->bottom = tmp; + } +} + static BOOL pagesetup_papersizeA(PAGESETUPDLGA *dlg, const WORD paperword, LPPOINT size) { DEVNAMES *dn; @@ -2815,6 +2842,20 @@ if(msg == EN_CHANGE){ \ FIXME("could not get dlgitemtexta for %x\n",id); \ } +static void update_margin_edits(HWND hDlg, const PageSetupDataA *pda) +{ + WCHAR str[100]; + + size2str(pda, pda->dlga->rtMargin.left, str); + SetDlgItemTextW(hDlg, edt4, str); + size2str(pda, pda->dlga->rtMargin.top, str); + SetDlgItemTextW(hDlg, edt5, str); + size2str(pda, pda->dlga->rtMargin.right, str); + SetDlgItemTextW(hDlg, edt6, str); + size2str(pda, pda->dlga->rtMargin.bottom, str); + SetDlgItemTextW(hDlg, edt7, str); +} + /******************************************************************************** * PRINTDLG_PS_WMCommandA * process WM_COMMAND message for PageSetupDlgA @@ -2867,8 +2908,6 @@ PRINTDLG_PS_WMCommandA( if((id == rad1 && pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) || (id == rad2 && pda->dlga->ptPaperSize.y > pda->dlga->ptPaperSize.x)) { - char TmpText[25]; - char TmpText2[25]; DWORD tmp = pda->dlga->ptPaperSize.x; DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); @@ -2878,15 +2917,8 @@ PRINTDLG_PS_WMCommandA( dm->u1.s1.dmOrientation = (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; GlobalUnlock(pda->dlga->hDevMode); - GetDlgItemTextA(hDlg, edt4, TmpText, sizeof(TmpText)); - GetDlgItemTextA(hDlg, edt5, TmpText2, sizeof(TmpText2)); - SetDlgItemTextA(hDlg, edt5, TmpText); - SetDlgItemTextA(hDlg, edt4, TmpText2); - - GetDlgItemTextA(hDlg, edt6, TmpText, sizeof(TmpText)); - GetDlgItemTextA(hDlg, edt7, TmpText2, sizeof(TmpText2)); - SetDlgItemTextA(hDlg, edt7, TmpText); - SetDlgItemTextA(hDlg, edt6, TmpText2); + rotate_rect(&pda->dlga->rtMargin, (id == rad2)); + update_margin_edits(hDlg, pda); PRINTDLG_PS_ChangePaperPrev(pda); } @@ -3254,8 +3286,6 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) HWND hDrawWnd; if (uMsg == WM_INITDIALOG) { /*Init dialog*/ - WCHAR str[100]; - pda = (PageSetupDataA*)lParam; pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */ @@ -3315,14 +3345,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pda->dlga->rtMargin.right = size; pda->dlga->rtMargin.bottom = size; } - size2str(pda, pda->dlga->rtMargin.left, str); - SetDlgItemTextW(hDlg, edt4, str); - size2str(pda, pda->dlga->rtMargin.top, str); - SetDlgItemTextW(hDlg, edt5, str); - size2str(pda, pda->dlga->rtMargin.right, str); - SetDlgItemTextW(hDlg, edt6, str); - size2str(pda, pda->dlga->rtMargin.bottom, str); - SetDlgItemTextW(hDlg, edt7, str); + update_margin_edits(hDlg, pda); /* if paper disabled */ if (pda->dlga->Flags & PSD_DISABLEPAPER) {

1 0

Henri Verbeet : ddraw: Add extern to some global variable declarations.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 2afa23867b5cd1df25e11c7c05dab3e7aa5e43f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afa23867b5cd1df25e11c7c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 16 10:14:25 2009 +0100 ddraw: Add extern to some global variable declarations. --- dlls/ddraw/ddraw_private.h | 62 ++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a4652fe..399a5b8 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -169,11 +169,11 @@ struct IDirectDrawImpl }; /* Declare the VTables. They can be found ddraw.c */ -const IDirectDraw7Vtbl IDirectDraw7_Vtbl; -const IDirectDraw4Vtbl IDirectDraw4_Vtbl; -const IDirectDraw3Vtbl IDirectDraw3_Vtbl; -const IDirectDraw2Vtbl IDirectDraw2_Vtbl; -const IDirectDrawVtbl IDirectDraw1_Vtbl; +extern const IDirectDraw7Vtbl IDirectDraw7_Vtbl; +extern const IDirectDraw4Vtbl IDirectDraw4_Vtbl; +extern const IDirectDraw3Vtbl IDirectDraw3_Vtbl; +extern const IDirectDraw2Vtbl IDirectDraw2_Vtbl; +extern const IDirectDrawVtbl IDirectDraw1_Vtbl; extern const IWineD3DDeviceParentVtbl ddraw_wined3d_device_parent_vtbl; /* Helper structures */ @@ -273,11 +273,11 @@ struct IDirectDrawSurfaceImpl }; /* VTable declaration. It's located in surface.c / surface_thunks.c */ -const IDirectDrawSurface7Vtbl IDirectDrawSurface7_Vtbl; -const IDirectDrawSurface3Vtbl IDirectDrawSurface3_Vtbl; -const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl; -const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl; -const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl; +extern const IDirectDrawSurface7Vtbl IDirectDrawSurface7_Vtbl; +extern const IDirectDrawSurface3Vtbl IDirectDrawSurface3_Vtbl; +extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl; +extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl; +extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl; HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf); void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This); @@ -300,7 +300,7 @@ struct IParentImpl }; -const IParentVtbl IParent_Vtbl; +extern const IParentVtbl IParent_Vtbl; /***************************************************************************** * IDirect3DDevice implementation @@ -363,14 +363,14 @@ struct IDirect3DDeviceImpl }; /* Vtables in various versions */ -const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUSetup_Vtbl; -const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUPreserve_Vtbl; -const IDirect3DDevice3Vtbl IDirect3DDevice3_Vtbl; -const IDirect3DDevice2Vtbl IDirect3DDevice2_Vtbl; -const IDirect3DDeviceVtbl IDirect3DDevice1_Vtbl; +extern const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUSetup_Vtbl; +extern const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUPreserve_Vtbl; +extern const IDirect3DDevice3Vtbl IDirect3DDevice3_Vtbl; +extern const IDirect3DDevice2Vtbl IDirect3DDevice2_Vtbl; +extern const IDirect3DDeviceVtbl IDirect3DDevice1_Vtbl; /* The IID */ -const GUID IID_D3DDEVICE_WineD3D; +extern const GUID IID_D3DDEVICE_WineD3D; /* Helper functions */ HRESULT IDirect3DImpl_GetCaps(IWineD3D *WineD3D, D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7); @@ -392,10 +392,10 @@ struct EnumTextureFormatsCBS /* No implementation structure as this is only another interface to DirectDraw */ /* the Vtables */ -const IDirect3DVtbl IDirect3D1_Vtbl; -const IDirect3D2Vtbl IDirect3D2_Vtbl; -const IDirect3D3Vtbl IDirect3D3_Vtbl; -const IDirect3D7Vtbl IDirect3D7_Vtbl; +extern const IDirect3DVtbl IDirect3D1_Vtbl; +extern const IDirect3D2Vtbl IDirect3D2_Vtbl; +extern const IDirect3D3Vtbl IDirect3D3_Vtbl; +extern const IDirect3D7Vtbl IDirect3D7_Vtbl; /* Structure for EnumZBufferFormats */ struct EnumZBufferFormatsData @@ -417,7 +417,7 @@ struct IDirectDrawClipperImpl IDirectDrawImpl *ddraw_owner; }; -const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl; +extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl; typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper; @@ -437,7 +437,7 @@ struct IDirectDrawPaletteImpl IDirectDrawImpl *ddraw_owner; IUnknown *ifaceToRelease; }; -const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl; +extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl; /****************************************************************************** * DirectDraw ClassFactory implementation - incomplete @@ -487,7 +487,7 @@ struct IDirect3DLightImpl }; /* Vtable */ -const IDirect3DLightVtbl IDirect3DLight_Vtbl; +extern const IDirect3DLightVtbl IDirect3DLight_Vtbl; /* Helper functions */ void light_update(IDirect3DLightImpl* This); @@ -515,9 +515,9 @@ struct IDirect3DMaterialImpl }; /* VTables in various versions */ -const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl; -const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl; -const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl; +extern const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl; +extern const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl; +extern const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl; /* Helper functions */ void material_activate(IDirect3DMaterialImpl* This); @@ -561,7 +561,7 @@ struct IDirect3DViewportImpl }; /* Vtable */ -const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl; +extern const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl; /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights); @@ -594,7 +594,7 @@ struct IDirect3DExecuteBufferImpl }; /* The VTable */ -const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl; +extern const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl; /* The execute function */ void @@ -622,8 +622,8 @@ struct IDirect3DVertexBufferImpl }; /* The Vtables */ -const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl; -const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl; +extern const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl; +extern const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl; /***************************************************************************** * Helper functions from utils.c

1 0

Henri Verbeet : d3d9: Properly test for dynamic usage in device_parent_CreateSurface().
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: e6babd8367742edfd96ed09a1656842b09ce185f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6babd8367742edfd96ed09a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 16 10:14:25 2009 +0100 d3d9: Properly test for dynamic usage in device_parent_CreateSurface(). --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec796d2..768bf9d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1807,7 +1807,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen "\tpool %#x, level %u, face %u, surface %p\n", iface, superior, width, height, format, usage, pool, level, face, surface); - if (pool == D3DPOOL_DEFAULT && usage != D3DUSAGE_DYNAMIC) lockable = FALSE; + if (pool == D3DPOOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) lockable = FALSE; hr = IDirect3DDevice9Impl_CreateSurface((IDirect3DDevice9Ex *)This, width, height, format, lockable, FALSE /* Discard */, level, (IDirect3DSurface9 **)&d3d_surface,

1 0