October 2006 - Wine-commits

Stefan Dösinger : wined3d: Add WINED3DUSAGE_OVERLAY.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 3529560cd7a4f752596e80d4084e9527b348eb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3529560cd7a4f752596e80d40… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 5 17:56:54 2006 +0200 wined3d: Add WINED3DUSAGE_OVERLAY. --- dlls/d3d8/device.c | 12 ++++++------ dlls/d3d9/device.c | 2 +- dlls/d3d9/indexbuffer.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexbuffer.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/ddraw/ddraw.c | 4 ++++ dlls/wined3d/surface.c | 24 ++++++++++++++++++++++++ dlls/wined3d/surface_gdi.c | 5 +++++ include/wine/wined3d_types.h | 1 + 11 files changed, 46 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3529560cd7a4f752596e8…

1 0

Stefan Dösinger : wined3d: Add IWineD3DSurface:: UpdateOverlay.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 2bcacf22d369cf0ff2f7f0497537f460cbe321da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcacf22d369cf0ff2f7f0497… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 5 16:43:26 2006 +0200 wined3d: Add IWineD3DSurface::UpdateOverlay. --- dlls/ddraw/surface.c | 10 ++++++++-- dlls/wined3d/surface.c | 9 +++++++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 459ce2c..6c3050c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1563,8 +1563,14 @@ IDirectDrawSurfaceImpl_UpdateOverlay(IDi { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); IDirectDrawSurfaceImpl *Dst = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, DstSurface); - FIXME("(%p)->(%p,%p,%p,%lx,%p): Stub!\n", This, SrcRect, Dst, DstRect, Flags, FX); - return DDERR_UNSUPPORTED; + TRACE("(%p)->(%p,%p,%p,%lx,%p): Relay\n", This, SrcRect, Dst, DstRect, Flags, FX); + + return IWineD3DSurface_UpdateOverlay(This->WineD3DSurface, + SrcRect, + Dst ? Dst->WineD3DSurface : NULL, + DstRect, + Flags, + (WINEDDOVERLAYFX *) FX); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 41059c5..61bad8a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3096,6 +3096,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Updat return WINED3D_OK; } +HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSurfaceImpl *Dst = (IWineD3DSurfaceImpl *) DstSurface; + FIXME("(%p)->(%p, %p, %p, %08x, %p)\n", This, SrcRect, Dst, DstRect, Flags, FX); + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3136,6 +3144,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, IWineD3DSurfaceImpl_UpdateOverlayZOrder, + IWineD3DSurfaceImpl_UpdateOverlay, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 43acdf9..0e605c8 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1586,6 +1586,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, IWineD3DSurfaceImpl_UpdateOverlayZOrder, + IWineD3DSurfaceImpl_UpdateOverlay, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 190066b..c9fb365 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -951,6 +951,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMe HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y); HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y); HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref); +HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX); /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3c65c98..516e637 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1136,6 +1136,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LONG *X, LONG *Y) PURE; STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD Flags, IWineD3DSurface *Ref) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX); /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1191,6 +1192,7 @@ #define IWineD3DSurface_SetMem(p, a) #define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b) #define IWineD3DSurface_GetOverlayPosition(p, a, b) (p)->lpVtbl->GetOverlayPosition(p, a, b) #define IWineD3DSurface_UpdateOverlayZOrder(p, a, b) (p)->lpVtbl->UpdateOverlayZOrder(p, a, b) +#define IWineD3DSurface_UpdateOverlay(p, a, b, c, d, e) (p)->lpVtbl->UpdateOverlay(p, a, b, c, d, e) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Stefan Dösinger : wined3d: Add DDOVERLAYFX struct.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 05ff0d0f64f6d70d21b9f7514d04b2da65c1369f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ff0d0f64f6d70d21b9f7514… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 5 16:42:50 2006 +0200 wined3d: Add DDOVERLAYFX struct. --- include/wine/wined3d_types.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index ef3f588..e70a814 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -963,6 +963,30 @@ typedef struct WineDirect3DVertexStrided } u; } WineDirect3DVertexStridedData; +typedef struct _WINEDDOVERLAYFX +{ + DWORD dwSize; /* size of structure */ + DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */ + DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */ + DWORD dwReserved; + DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */ + union + { + DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */ + LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */ + } DUMMYUNIONNAME1; + DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */ + union + { + DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */ + LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as alpha channel for src */ + } DUMMYUNIONNAME2; + DDCOLORKEY dckDestColorkey; /* DestColorkey override */ + DDCOLORKEY dckSrcColorkey; /* DestColorkey override */ + DWORD dwDDFX; /* Overlay FX */ + DWORD dwFlags; /* flags */ +} WINEDDOVERLAYFX; + /**************************** * * Vertex Shaders Declaration * */

1 0

Stefan Dösinger : wined3d: Add UpdatOverlayZOrder.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 080e4f56cf7d50d0683266e94d2cda2d367d2048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080e4f56cf7d50d0683266e94… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Oct 5 16:41:19 2006 +0200 wined3d: Add UpdatOverlayZOrder. --- dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/surface.c | 10 ++++++++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6e43976..459ce2c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1607,8 +1607,11 @@ IDirectDrawSurfaceImpl_UpdateOverlayZOrd { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); IDirectDrawSurfaceImpl *Ref = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, DDSRef); - FIXME("(%p)->(%lx,%p)\n", This, Flags, Ref); - return DDERR_NOTAOVERLAYSURFACE; + + TRACE("(%p)->(%lx,%p): Relay\n", This, Flags, Ref); + return IWineD3DSurface_UpdateOverlayZOrder(This->WineD3DSurface, + Flags, + Ref ? Ref->WineD3DSurface : NULL); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36a525c..41059c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3087,6 +3087,15 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetOv return WINED3D_OK; } +HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSurfaceImpl *RefImpl = (IWineD3DSurfaceImpl *) Ref; + + FIXME("(%p)->(%08x,%p) Stub!\n", This, Flags, RefImpl); + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3126,6 +3135,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, + IWineD3DSurfaceImpl_UpdateOverlayZOrder, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 22727c4..43acdf9 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1585,6 +1585,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetOverlayPosition, IWineD3DSurfaceImpl_GetOverlayPosition, + IWineD3DSurfaceImpl_UpdateOverlayZOrder, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e7326a..190066b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -950,6 +950,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Reali HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem); HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y); HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y); +HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref); /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 4860c3b..3c65c98 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1135,6 +1135,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(SetMem)(THIS_ void *mem) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LONG *X, LONG *Y) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD Flags, IWineD3DSurface *Ref) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1189,6 +1190,7 @@ #define IWineD3DSurface_GetPitch(p) #define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a) #define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b) #define IWineD3DSurface_GetOverlayPosition(p, a, b) (p)->lpVtbl->GetOverlayPosition(p, a, b) +#define IWineD3DSurface_UpdateOverlayZOrder(p, a, b) (p)->lpVtbl->UpdateOverlayZOrder(p, a, b) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Stefan Dösinger : wined3d: Add IWineD3DSurface:: GetOverlayPosition.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: f6647486cfb8bc0751cd2f588dc57b425b9c1e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6647486cfb8bc0751cd2f588… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 5 16:40:56 2006 +0200 wined3d: Add IWineD3DSurface::GetOverlayPosition. --- dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/surface.c | 9 +++++++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 16af260..6e43976 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1351,9 +1351,12 @@ static HRESULT WINAPI IDirectDrawSurfaceImpl_GetOverlayPosition(IDirectDrawSurface7 *iface, LONG *X, LONG *Y) { - FIXME("(%p)->(%p,%p): Stub!\n", iface, X, Y); + ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); + TRACE("(%p)->(%p,%p): Relay\n", This, X, Y); - return DDERR_NOTAOVERLAYSURFACE; + return IWineD3DSurface_GetOverlayPosition(This->WineD3DSurface, + X, + Y); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3b8d323..36a525c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3079,6 +3079,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetOv return WINED3D_OK; } +HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + + FIXME("(%p)->(%p,%p) Stub!\n", This, X, Y); + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3117,6 +3125,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetOverlayPosition, + IWineD3DSurfaceImpl_GetOverlayPosition, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 6376f9b..22727c4 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1584,6 +1584,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_SetMem, IWineD3DSurfaceImpl_SetOverlayPosition, + IWineD3DSurfaceImpl_GetOverlayPosition, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0f98482..1e7326a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -949,6 +949,7 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitc HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem); HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y); +HRESULT WINAPI IWineD3DSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y); /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 48a0545..4860c3b 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1134,6 +1134,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD_(DWORD,GetPitch)(THIS) PURE; STDMETHOD(SetMem)(THIS_ void *mem) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; + STDMETHOD(GetOverlayPosition)(THIS_ LONG *X, LONG *Y) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1187,6 +1188,7 @@ #define IWineD3DSurface_SetColorKey(p, a #define IWineD3DSurface_GetPitch(p) (p)->lpVtbl->GetPitch(p) #define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a) #define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b) +#define IWineD3DSurface_GetOverlayPosition(p, a, b) (p)->lpVtbl->GetOverlayPosition(p, a, b) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Stefan Dösinger : wined3d: Add IWineD3DSurface:: SetOverlayPosition.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 0f3995d21aa71da01d0fcefb37e8764a27222c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3995d21aa71da01d0fcefb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 5 16:37:42 2006 +0200 wined3d: Add IWineD3DSurface::SetOverlayPosition. --- dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/surface.c | 9 +++++++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 111fa9e..16af260 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1528,8 +1528,11 @@ IDirectDrawSurfaceImpl_SetOverlayPositio LONG Y) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); - FIXME("(%p)->(%ld,%ld): Stub!\n", This, X, Y); - return DDERR_NOTAOVERLAYSURFACE; + TRACE("(%p)->(%ld,%ld): Relay\n", This, X, Y); + + return IWineD3DSurface_SetOverlayPosition(This->WineD3DSurface, + X, + Y); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 19bbd98..3b8d323 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3071,6 +3071,14 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitc return ret; } +HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + + FIXME("(%p)->(%d,%d) Stub!\n", This, X, Y); + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3108,6 +3116,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetColorKey, IWineD3DSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_SetMem, + IWineD3DSurfaceImpl_SetOverlayPosition, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 95fc785..6376f9b 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1583,6 +1583,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_SetColorKey, IWineD3DSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_SetMem, + IWineD3DSurfaceImpl_SetOverlayPosition, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b859ade..0f98482 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -948,6 +948,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Relea DWORD WINAPI IWineD3DSurfaceImpl_GetPitch(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem); +HRESULT WINAPI IWineD3DSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y); /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index e76bc55..48a0545 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1133,6 +1133,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(SetColorKey)(THIS_ DWORD Flags, DDCOLORKEY *CKey) PURE; STDMETHOD_(DWORD,GetPitch)(THIS) PURE; STDMETHOD(SetMem)(THIS_ void *mem) PURE; + STDMETHOD(SetOverlayPosition)(THIS_ LONG X, LONG Y) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1185,6 +1186,7 @@ #define IWineD3DSurface_RealizePalette(p #define IWineD3DSurface_SetColorKey(p, a, b) (p)->lpVtbl->SetColorKey(p, a, b) #define IWineD3DSurface_GetPitch(p) (p)->lpVtbl->GetPitch(p) #define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a) +#define IWineD3DSurface_SetOverlayPosition(p, a, b) (p)->lpVtbl->SetOverlayPosition(p, a, b) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Jacek Caban : shdocvw: Win64 printf format warning fixes.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: e5f2f651b23257b15466328af053f147f80d7611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f2f651b23257b15466328af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 23:49:39 2006 +0200 shdocvw: Win64 printf format warning fixes. --- dlls/shdocvw/Makefile.in | 2 +- dlls/shdocvw/classinfo.c | 4 ++-- dlls/shdocvw/client.c | 10 +++++----- dlls/shdocvw/dochost.c | 18 +++++++++--------- dlls/shdocvw/events.c | 2 +- dlls/shdocvw/factory.c | 4 ++-- dlls/shdocvw/ie.c | 10 +++++----- dlls/shdocvw/navigate.c | 42 +++++++++++++++++++++--------------------- dlls/shdocvw/oleobject.c | 32 ++++++++++++++++---------------- dlls/shdocvw/regsvr.c | 2 +- dlls/shdocvw/shdocvw_main.c | 6 +++--- dlls/shdocvw/shlinstobj.c | 4 ++-- dlls/shdocvw/view.c | 12 ++++++------ dlls/shdocvw/webbrowser.c | 10 +++++----- 14 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5f2f651b23257b154663…

1 0

Jacek Caban : urlmon: Win64 printf format warning fixes.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 7e340f8f6256a1bbf684b7e31f7e576f11397642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e340f8f6256a1bbf684b7e31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 23:49:11 2006 +0200 urlmon: Win64 printf format warning fixes. --- dlls/urlmon/Makefile.in | 1 - dlls/urlmon/binding.c | 62 +++++++++++++++++++++++---------------------- dlls/urlmon/file.c | 18 +++++++------ dlls/urlmon/format.c | 10 ++++--- dlls/urlmon/ftp.c | 16 ++++++------ dlls/urlmon/http.c | 18 +++++++------ dlls/urlmon/internet.c | 16 ++++++------ dlls/urlmon/sec_mgr.c | 50 ++++++++++++++++++------------------ dlls/urlmon/session.c | 24 +++++++++-------- dlls/urlmon/umon.c | 46 +++++++++++++++++---------------- dlls/urlmon/umstream.c | 6 ++-- dlls/urlmon/urlmon_main.c | 22 ++++++++-------- 12 files changed, 144 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e340f8f6256a1bbf684b…

1 0

Jonathan Ernst : taskmgr: Updated French translation.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 90fc08d1bacd3fe7cb9e88b1521c1e3c714328f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fc08d1bacd3fe7cb9e88b15… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Oct 5 22:14:05 2006 +0200 taskmgr: Updated French translation. --- programs/taskmgr/Fr.rc | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index c9b3465..f897ded 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -64,9 +64,9 @@ BEGIN MENUITEM "&S�lectionner les colonnes...", ID_VIEW_SELECTCOLUMNS POPUP "&Historique du processeur" BEGIN - MENUITEM "Un seul graphique, &toutes les UCs", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "Un seul graphique pour &tous les processeurs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un graphique &par UC", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + MENUITEM "Un graphique &par processeur", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END MENUITEM "Aff&icher les temps du noyau", ID_VIEW_SHOWKERNELTIMES @@ -216,7 +216,7 @@ BEGIN LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,171,189,69,14 - CONTROL "Aff&icher les processus de tous les utilisateurs",IDC_SHOWALLPROCESSES, + CONTROL "&Afficher les processus de tous les utilisateurs",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -225,12 +225,12 @@ IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABL STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Util. de l'UC",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT - GROUPBOX "Util. du fichier",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Utilisation du processeur",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Utilisation de la m�moire",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totaux",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Charge d�di�e (Ko)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "M�moire physique (Ko)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "M�moire pour le noyau (Ko)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Charge d�di�e (Kio)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "M�moire physique (Kio)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "M�moire pour le noyau (Kio)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Processus",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 @@ -267,21 +267,21 @@ BEGIN ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER - GROUPBOX "Historique de l'utilisation de l'UC",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "Historique d'utilisation du fichier d'�change",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "Affichage utilisation UC",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + GROUPBOX "Historique de l'utilisation du processeur",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Historique de l'utilisation de la m�moire",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Affichage de l'utilisation du processeur",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, WS_EX_CLIENTEDGE - PUSHBUTTON "Affichage utilisation fichier",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + PUSHBUTTON "Affichage de l'utilisation de la m�moire",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, WS_EX_CLIENTEDGE - PUSHBUTTON "Historique de l'utilisation de l'UC",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + PUSHBUTTON "Historique de l'utilisation du processeur",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,0,WS_EX_CLIENTEDGE - PUSHBUTTON "Historique d'utilisation du fichier d'�change",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "Historique de l'utilisation de la m�moire",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,0,WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" +CAPTION "Canaux de d�bogage" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | @@ -297,7 +297,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Annuler",IDCANCEL,174,133,50,14 - LTEXT "Le param�tre Affinit� du processeur contr�le sur quelles UC le processus sera autoris� � s'ex�cuter.", + LTEXT "Le param�tre ��affinit� du processeur�� contr�le sur quels processeurs le processus sera autoris� � s'ex�cuter.", IDC_STATIC,5,5,220,16 CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 @@ -459,7 +459,7 @@ BEGIN "Arrange les fen�tres horizontalement sur le bureau" ID_WINDOWS_TILEVERTICALLY "Arrange les fen�tres verticalement sur le bureau" ID_WINDOWS_MINIMIZE "R�duit les fen�tres" - ID_WINDOWS_MAXIMIZE "Aggrandit les fen�tres" + ID_WINDOWS_MAXIMIZE "Agrandit les fen�tres" ID_WINDOWS_CASCADE "Place les fen�tres en cascade sur le bureau" ID_WINDOWS_BRINGTOFRONT "Affiche la fen�tre au premier plan, mais ne bascule pas vers celle-ci" ID_HELP_TOPICS "Affiche les rubriques d'aide du gestionnaire des t�ches" @@ -470,10 +470,10 @@ BEGIN ID_VIEW_SELECTCOLUMNS "S�lectionne quelles colonnes seront affich�es dans la page des processus" ID_VIEW_SHOWKERNELTIMES "Affiche le temps noyau dans les graphiques de performances" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "L'utilisation des UCs est affich�e sur un seul graphique" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Chaque UC � son proper graphique" + "L'utilisation des processeurs est affich�e sur un seul graphique" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Chaque processeur � son propre graphique" ID_APPLICATION_PAGE_SWITCHTO - "Am�ne la t�che aupremier plan et bascule vers celle-ci" + "Am�ne la t�che au premier plan et bascule vers celle-ci" END STRINGTABLE DISCARDABLE @@ -488,14 +488,14 @@ BEGIN ID_PROCESS_PAGE_SETAFFINITY "Contr�le sur quel processeur le processus sera autoris� � s'ex�cuter" ID_PROCESS_PAGE_SETPRIORITY_REALTIME - "Place le processus dans la classe de priorit� TEMPS REEL" + "Place le processus dans la classe de priorit� TEMPS R�EL" ID_PROCESS_PAGE_SETPRIORITY_HIGH "Place le processus dans la classe de priorit� HAUTE" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - "Place le processus dans la classe de priorit� SUPERIEURE A LA NORMALE" + "Place le processus dans la classe de priorit� SUP�RIEURE � LA NORMALE" ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Place le processus dans la classe de priorit� NORMALE" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - "Place le processus dans la classe de priorit� INFERIEURE A LA NORMALE" + "Place le processus dans la classe de priorit� INF�RIEURE � LA NORMALE" ID_PROCESS_PAGE_SETPRIORITY_LOW "Place le processus dans la classe de priorit� BASSE" IDS_LICENSE "Ce programme est libre, vous pouvez la redistribuer et/ou le modifier selon les termes de la Licence Publique G�n�rale GNU Limit�e publi�e par la Free Software Foundation (version 2.1 ou bien toute autre version ult�rieure choisie par vous).\r\n\r\nCe programme est distribu�e car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de commercialisation ou d'adaptation dans un but sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU Limit�e pour plus de d�tails.\r\n\r\nVous devez avoir re�u une copie de la Licence Publique G�n�rale GNU Limit�e en m�me temps que ce programme�; si ce n'est pas le cas, �crivez � la Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, �tats-Unis." END

1 0

Jonathan Ernst : cmdlgtst: Updated French translation.
by Alexandre Julliard 06 Oct '06

06 Oct '06

Module: wine Branch: master Commit: 0e8b65b335dde1c80db989667544130a89e08ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8b65b335dde1c80db989667… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Oct 5 22:14:38 2006 +0200 cmdlgtst: Updated French translation. --- programs/cmdlgtst/Fr.rc | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index a41e766..b8cb1b4 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -42,6 +42,7 @@ CmdlgtstMenu MENU MENUITEM "Remp&lacer", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Imprimer", CM_U_PRINT + MENUITEM "Mise en pa&ge", CM_U_PAGESETUP } POPUP "&Drapeaux" @@ -54,6 +55,7 @@ CmdlgtstMenu MENU MENUITEM "Rechercher/&Remplacer", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Imprimer", CM_F_PRINT + MENUITEM "Mise en pa&ge", CM_F_PAGESETUP } POPUP "Aid&e" @@ -180,6 +182,34 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } +PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION " " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 180, 24, 50, 14 + CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +} + File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Drapeaux de la bo�te de dialogue d'ouverture et d'enregistrement de fichier"

1 0