April 2006 - Wine-Commits - list.winehq.org

Jesse Allen : x11drv: Allow xvidmode to always initialize at least for the gamma functions.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 094b18f4b9485efc47ca8a9ad7f84a24c3966211 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=094b18f4b9485efc47ca8a9… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Apr 3 18:38:10 2006 -0700 x11drv: Allow xvidmode to always initialize at least for the gamma functions. --- dlls/x11drv/xvidmode.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c index c32bd59..628b106 100644 --- a/dlls/x11drv/xvidmode.c +++ b/dlls/x11drv/xvidmode.c @@ -148,8 +148,6 @@ void X11DRV_XF86VM_Init(void) if (xf86vm_major) return; /* already initialized? */ - if (!usexvidmode) return; - /* see if XVidMode is available */ wine_tsx11_lock(); ok = XF86VidModeQueryExtension(gdi_display, &xf86vm_event, &xf86vm_error); @@ -172,7 +170,7 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (root_window == DefaultRootWindow( gdi_display )) + if (usexvidmode && root_window == DefaultRootWindow( gdi_display )) ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); else ok = FALSE; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */

1 0

Huw Davies : gdi32: Use a function to add entries to the substitution list
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 9ae3f1dcfe2dd252ae174d89018a245df5392ce5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ae3f1dcfe2dd252ae174d8… Author: Huw Davies <huw(a)codeweavers> Date: Tue Apr 4 14:57:10 2006 +0100 gdi32: Use a function to add entries to the substitution list (based on a patch by Byeong-Sik Jeon). --- dlls/gdi/freetype.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 125c452..e02553b 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -770,6 +770,41 @@ static FontSubst *get_font_subst(const s return NULL; } +#define ADD_FONT_SUBST_FORCE 1 + +static BOOL add_font_subst(struct list *subst_list, FontSubst *subst, INT flags) +{ + FontSubst *from_exist, *to_exist; + + from_exist = get_font_subst(subst_list, subst->from.name, subst->from.charset); + + if(from_exist && (flags & ADD_FONT_SUBST_FORCE)) + { + list_remove(&from_exist->entry); + HeapFree(GetProcessHeap(), 0, &from_exist->from.name); + HeapFree(GetProcessHeap(), 0, &from_exist->to.name); + HeapFree(GetProcessHeap(), 0, from_exist); + from_exist = NULL; + } + + if(!from_exist) + { + to_exist = get_font_subst(subst_list, subst->to.name, subst->to.charset); + + if(to_exist) + { + HeapFree(GetProcessHeap(), 0, subst->to.name); + subst->to.name = strdupW(to_exist->to.name); + } + + list_add_tail(subst_list, &subst->entry); + + return TRUE; + } + + return FALSE; +} + static void split_subst_info(NameCs *nc, LPSTR str) { CHAR *p = strrchr(str, ','); @@ -834,7 +869,7 @@ static void LoadSubstList(void) HeapFree(GetProcessHeap(), 0, psub->from.name); HeapFree(GetProcessHeap(), 0, psub); } else { - list_add_head(&font_subst_list, &psub->entry); + add_font_subst(&font_subst_list, psub, 0); } /* reset dlen and vlen */ dlen = datalen;

1 0

Mike McCormack : setupapi: Add a stub implementation for RegistryDelnode.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 07e9ec46efd49a2e55913bd771f2283caae05488 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07e9ec46efd49a2e55913bd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 4 21:04:32 2006 +0900 setupapi: Add a stub implementation for RegistryDelnode. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f4b3ab8..6f9536c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -228,7 +228,7 @@ @ stub QueryMultiSzValueToArray @ stdcall QueryRegistryValue(long wstr ptr ptr ptr) @ stub ReadAsciiOrUnicodeTextFile -@ stub RegistryDelnode +@ stdcall RegistryDelnode(long long) @ stdcall RetreiveFileSecurity(wstr ptr) @ stub RetrieveServiceConfig @ stub SearchForInfFile diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 70828ca..7279ecc 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -176,3 +176,12 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE FIXME ("Stub %p\n",FileLogHandle); return TRUE; } + +/*********************************************************************** + * RegistryDelnode(SETUPAPI.@) + */ +BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) +{ + FIXME("%08lx %08lx: stub\n", x, y); + return FALSE; +}

1 0

Huw Davies : gdi32: Use RtlUshortByteSwap to read big endian words.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: d8a2fb971ba54370049245f190dfc992e0bfe5a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8a2fb971ba54370049245f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 4 12:12:41 2006 +0100 gdi32: Use RtlUshortByteSwap to read big endian words. --- dlls/gdi/freetype.c | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 4f29812..125c452 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -35,6 +35,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winerror.h" #include "winreg.h" #include "wingdi.h" @@ -168,7 +169,11 @@ MAKE_FUNCPTR(FcPatternGet); #define FT_ENCODING_APPLE_ROMAN ft_encoding_apple_roman #endif -#define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] ) +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#endif /* This is bascially a copy of FT_Bitmap_Size with an extra element added */ typedef struct { @@ -1898,10 +1903,16 @@ typedef struct { BYTE yEndRatio; } Ratios; +typedef struct { + WORD recs; + BYTE startsz; + BYTE endsz; +} VDMX_group; static LONG load_VDMX(GdiFont font, LONG height) { - BYTE hdr[6], tmp[2], group[4]; + WORD hdr[3], tmp; + VDMX_group group; BYTE devXRatio, devYRatio; USHORT numRecs, numRatios; DWORD result, offset = -1; @@ -1921,8 +1932,8 @@ static LONG load_VDMX(GdiFont font, LONG devXRatio = 1; devYRatio = 1; - numRecs = GET_BE_WORD(&hdr[2]); - numRatios = GET_BE_WORD(&hdr[4]); + numRecs = GET_BE_WORD(hdr[1]); + numRatios = GET_BE_WORD(hdr[2]); TRACE("numRecs = %d numRatios = %d\n", numRecs, numRatios); for(i = 0; i < numRatios; i++) { @@ -1942,7 +1953,7 @@ static LONG load_VDMX(GdiFont font, LONG devYRatio <= ratio.yEndRatio)) { offset = (3 * 2) + (numRatios * 4) + (i * 2); - WineEngGetFontData(font, MS_VDMX_TAG, offset, tmp, 2); + WineEngGetFontData(font, MS_VDMX_TAG, offset, &tmp, 2); offset = GET_BE_WORD(tmp); break; } @@ -1953,14 +1964,14 @@ static LONG load_VDMX(GdiFont font, LONG return ppem; } - if(WineEngGetFontData(font, MS_VDMX_TAG, offset, group, 4) != GDI_ERROR) { + if(WineEngGetFontData(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { USHORT recs; BYTE startsz, endsz; - BYTE *vTable; + WORD *vTable; - recs = GET_BE_WORD(group); - startsz = group[2]; - endsz = group[3]; + recs = GET_BE_WORD(group.recs); + startsz = group.startsz; + endsz = group.endsz; TRACE("recs=%d startsz=%d endsz=%d\n", recs, startsz, endsz); @@ -1973,9 +1984,9 @@ static LONG load_VDMX(GdiFont font, LONG if(height > 0) { for(i = 0; i < recs; i++) { - SHORT yMax = GET_BE_WORD(&vTable[(i * 6) + 2]); - SHORT yMin = GET_BE_WORD(&vTable[(i * 6) + 4]); - ppem = GET_BE_WORD(&vTable[i * 6]); + SHORT yMax = GET_BE_WORD(vTable[(i * 3) + 1]); + SHORT yMin = GET_BE_WORD(vTable[(i * 3) + 2]); + ppem = GET_BE_WORD(vTable[i * 3]); if(yMax + -yMin == height) { font->yMax = yMax; @@ -1988,8 +1999,8 @@ static LONG load_VDMX(GdiFont font, LONG ppem = 0; goto end; /* failed */ } - font->yMax = GET_BE_WORD(&vTable[(i * 6) + 2]); - font->yMin = GET_BE_WORD(&vTable[(i * 6) + 4]); + font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]); + font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]); TRACE("ppem %ld found; height=%ld yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin); break; } @@ -2005,14 +2016,14 @@ static LONG load_VDMX(GdiFont font, LONG for(i = 0; i < recs; i++) { USHORT yPelHeight; - yPelHeight = GET_BE_WORD(&vTable[i * 6]); + yPelHeight = GET_BE_WORD(vTable[i * 3]); if(yPelHeight > ppem) break; /* failed */ if(yPelHeight == ppem) { - font->yMax = GET_BE_WORD(&vTable[(i * 6) + 2]); - font->yMin = GET_BE_WORD(&vTable[(i * 6) + 4]); + font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]); + font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]); TRACE("ppem %ld found; yMax=%d yMin=%d\n", ppem, font->yMax, font->yMin); break; }

1 0

Stefan Dösinger : wined3d: Add WINED3DCUBEMAP_FACES to wined3d_types.h.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: be720179b66470693cdc4c66c007cf75bb390d18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be720179b66470693cdc4c6… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 4 15:51:28 2006 +0200 wined3d: Add WINED3DCUBEMAP_FACES to wined3d_types.h. --- dlls/d3d8/cubetexture.c | 8 ++++---- dlls/d3d9/cubetexture.c | 8 ++++---- dlls/wined3d/cubetexture.c | 8 ++++---- dlls/wined3d/device.c | 2 +- include/wine/wined3d_interface.h | 8 ++++---- include/wine/wined3d_types.h | 11 +++++++++++ 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index c43bfc3..3be24fe 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -159,7 +159,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl TRACE("(%p) Relay\n", This); - hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, FaceType, Level, &mySurface); + hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, &mySurface); if (hrc == D3D_OK && NULL != ppCubeMapSurface) { IWineD3DCubeTexture_GetParent(mySurface, (IUnknown **)ppCubeMapSurface); IWineD3DCubeTexture_Release(mySurface); @@ -170,19 +170,19 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, FaceType, Level, pLockedRect, pRect, Flags); + return IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, pLockedRect, pRect, Flags); } HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, FaceType, Level); + return IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level); } HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, CONST RECT *pDirtyRect) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, FaceType, pDirtyRect); + return IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, pDirtyRect); } diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 0c3d3c5..4b4ab53 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -180,7 +180,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl TRACE("(%p) Relay\n", This); - hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, FaceType, Level, &mySurface); + hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, &mySurface); if (hrc == D3D_OK && NULL != ppCubeMapSurface) { IWineD3DCubeTexture_GetParent(mySurface, (IUnknown **)ppCubeMapSurface); IWineD3DCubeTexture_Release(mySurface); @@ -191,19 +191,19 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, FaceType, Level, pLockedRect, pRect, Flags); + return IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, pLockedRect, pRect, Flags); } HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, FaceType, Level); + return IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level); } HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, FaceType, pDirtyRect); + return IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, pDirtyRect); } diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 392d116..f07c58b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -273,7 +273,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_G return D3DERR_INVALIDCALL; } -HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeTexture *iface, D3DCUBEMAP_FACES FaceType, UINT Level, IWineD3DSurface** ppCubeMapSurface) { +HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeTexture *iface, WINED3DCUBEMAP_FACES FaceType, UINT Level, IWineD3DSurface** ppCubeMapSurface) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; HRESULT hr = D3DERR_INVALIDCALL; @@ -292,7 +292,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_G return hr; } -HRESULT WINAPI IWineD3DCubeTextureImpl_LockRect(IWineD3DCubeTexture *iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { +HRESULT WINAPI IWineD3DCubeTextureImpl_LockRect(IWineD3DCubeTexture *iface, WINED3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; @@ -309,7 +309,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_L return hr; } -HRESULT WINAPI IWineD3DCubeTextureImpl_UnlockRect(IWineD3DCubeTexture *iface, D3DCUBEMAP_FACES FaceType, UINT Level) { +HRESULT WINAPI IWineD3DCubeTextureImpl_UnlockRect(IWineD3DCubeTexture *iface, WINED3DCUBEMAP_FACES FaceType, UINT Level) { HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; @@ -325,7 +325,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_U return hr; } -HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { +HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *iface, WINED3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; This->baseTexture.dirty = TRUE; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 60e044b..03a7ec3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5207,7 +5207,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Update { IWineD3DSurface *srcSurface; IWineD3DSurface *destSurface; - D3DCUBEMAP_FACES faceType; + WINED3DCUBEMAP_FACES faceType; for (i = 0 ; i < levels ; ++i) { /* Update each cube face */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 34bbd8f..101f530 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -907,10 +907,10 @@ DECLARE_INTERFACE_(IWineD3DCubeTexture,I STDMETHOD_(void, ApplyStateChanges)(THIS_ DWORD const textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE; /*** IWineD3DCubeTexture methods ***/ STDMETHOD(GetLevelDesc)(THIS_ UINT Level,WINED3DSURFACE_DESC* pDesc) PURE; - STDMETHOD(GetCubeMapSurface)(THIS_ D3DCUBEMAP_FACES FaceType, UINT Level, struct IWineD3DSurface** ppCubeMapSurface) PURE; - STDMETHOD(LockRect)(THIS_ D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) PURE; - STDMETHOD(UnlockRect)(THIS_ D3DCUBEMAP_FACES FaceType, UINT Level) PURE; - STDMETHOD(AddDirtyRect)(THIS_ D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) PURE; + STDMETHOD(GetCubeMapSurface)(THIS_ WINED3DCUBEMAP_FACES FaceType, UINT Level, struct IWineD3DSurface** ppCubeMapSurface) PURE; + STDMETHOD(LockRect)(THIS_ WINED3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) PURE; + STDMETHOD(UnlockRect)(THIS_ WINED3DCUBEMAP_FACES FaceType, UINT Level) PURE; + STDMETHOD(AddDirtyRect)(THIS_ WINED3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) PURE; }; #undef INTERFACE diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 60fa601..ed7dd94 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -461,6 +461,17 @@ typedef enum _WINED3DBASISTYPE { WINED3DBASIS_FORCE_DWORD = 0x7fffffff } WINED3DBASISTYPE; +typedef enum _WINED3DCUBEMAP_FACES { + WINED3DCUBEMAP_FACE_POSITIVE_X = 0, + WINED3DCUBEMAP_FACE_NEGATIVE_X = 1, + WINED3DCUBEMAP_FACE_POSITIVE_Y = 2, + WINED3DCUBEMAP_FACE_NEGATIVE_Y = 3, + WINED3DCUBEMAP_FACE_POSITIVE_Z = 4, + WINED3DCUBEMAP_FACE_NEGATIVE_Z = 5, + + WINED3DCUBEMAP_FACE_FORCE_DWORD = 0xffffffff +} WINED3DCUBEMAP_FACES; + typedef struct _WINEDD3DRECTPATCH_INFO { UINT StartVertexOffsetWidth; UINT StartVertexOffsetHeight;

1 0

Stefan Dösinger : wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: c289b3cc51a75f688d1eb334a34425658eca9c33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c289b3cc51a75f688d1eb33… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 4 13:44:17 2006 +0200 wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 4 ++-- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d_interface.h | 26 ++++++++++++++++---------- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 54ffb04..0176459 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -273,14 +273,14 @@ void WINAPI IDirect3DDevice8Impl_SetGamm IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, pRamp); + return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (WINED3DGAMMARAMP *) pRamp); } void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, pRamp); + return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, (WINED3DGAMMARAMP *) pRamp); } HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3f557f2..ab0ffcb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -223,14 +223,14 @@ void WINAPI IDirect3DDevice9Impl_SetGamm IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, pRamp); + return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (WINED3DGAMMARAMP *) pRamp); } void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, pRamp); + return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5df1ab2..60e044b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6557,20 +6557,20 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetC return D3D_OK; } -void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) { +void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) { IWineD3DSwapChain *swapchain; HRESULT hrc = D3D_OK; TRACE("Relaying to swapchain\n"); if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == D3D_OK) { - IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (D3DGAMMARAMP *)pRamp); + IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp); IWineD3DSwapChain_Release(swapchain); } return; } -void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { +void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) { IWineD3DSwapChain *swapchain; HRESULT hrc = D3D_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 55bb6e1..ef4e4bd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -453,7 +453,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get return D3D_OK; } -HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST D3DGAMMARAMP *pRamp){ +HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST WINED3DGAMMARAMP *pRamp){ IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; HDC hDC; @@ -465,7 +465,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Set } -HRESULT WINAPI IWineD3DSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, D3DGAMMARAMP *pRamp){ +HRESULT WINAPI IWineD3DSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp){ IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; HDC hDC; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 73fa410..34bbd8f 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -146,17 +146,23 @@ DEFINE_GUID(IID_IWineD3DQuery, /* Also, D3DCAPS8 is a subset of D3DCAPS9 so can be typecase as long as none of the 9 fields are accessed when the device is d3d8 */ /* TODO: remove the d3d8/d3d9 dependencies by making a all inclusive WINED3D version */ -#if defined( __WINE_D3D8_H ) +#if defined( __WINE_D3D9_H ) + /* Identical: */ +# define WINED3DLIGHT D3DLIGHT9 +# define WINED3DMATERIAL D3DMATERIAL9 +# define WINED3DVIEWPORT D3DVIEWPORT9 +# define WINED3DGAMMARAMP D3DGAMMARAMP + +#elif defined( __WINE_D3D8_H ) /* Identical: */ # define WINED3DLIGHT D3DLIGHT8 # define WINED3DMATERIAL D3DMATERIAL8 # define WINED3DVIEWPORT D3DVIEWPORT8 +# define WINED3DGAMMARAMP D3DGAMMARAMP -#else - /* Identical: */ -# define WINED3DLIGHT D3DLIGHT9 -# define WINED3DMATERIAL D3DMATERIAL9 -# define WINED3DVIEWPORT D3DVIEWPORT9 +#else /* defined (__WINE_D3D_H ) */ + /* Identical: */ +# define WINED3DGAMMARAMP DDGAMMARAMP #endif @@ -345,8 +351,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetDepthStencilSurface)(THIS_ struct IWineD3DSurface** ppZStencilSurface) PURE; STDMETHOD(SetFVF)(THIS_ DWORD fvf) PURE; STDMETHOD(GetFVF)(THIS_ DWORD * pfvf) PURE; - STDMETHOD_(void, SetGammaRamp)(THIS_ UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) PURE; - STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, D3DGAMMARAMP* pRamp) PURE; + STDMETHOD_(void, SetGammaRamp)(THIS_ UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) PURE; + STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, WINED3DGAMMARAMP* pRamp) PURE; STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData,UINT BaseVertexIndex) PURE; STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData,UINT * pBaseVertexIndex) PURE; STDMETHOD(SetLight)(THIS_ DWORD Index,CONST WINED3DLIGHT * pLight) PURE; @@ -1294,8 +1300,8 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi STDMETHOD(GetRasterStatus)(THIS_ WINED3DRASTER_STATUS *pRasterStatus) PURE; STDMETHOD(GetDisplayMode)(THIS_ WINED3DDISPLAYMODE *pMode) PURE; STDMETHOD(GetPresentParameters)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters) PURE; - STDMETHOD(SetGammaRamp)(THIS_ DWORD Flags, const D3DGAMMARAMP *pRamp) PURE; - STDMETHOD(GetGammaRamp)(THIS_ D3DGAMMARAMP *pRamp) PURE; + STDMETHOD(SetGammaRamp)(THIS_ DWORD Flags, const WINED3DGAMMARAMP *pRamp) PURE; + STDMETHOD(GetGammaRamp)(THIS_ WINED3DGAMMARAMP *pRamp) PURE; }; #undef INTERFACE

1 0

Alexandre Julliard : user: Fixed PrivateExtractIcons to pass the tests when using native dlls.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 53ad4cbb57747ad72036ef1a72120a86f4138304 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53ad4cbb57747ad72036ef1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 18:58:48 2006 +0200 user: Fixed PrivateExtractIcons to pass the tests when using native dlls. --- dlls/user/exticon.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index ad37611..170f750 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -401,9 +401,9 @@ static UINT ICO_ExtractIconExW( CloseHandle(fmapping); cx1 = LOWORD(cxDesired); - cx2 = HIWORD(cxDesired) ? HIWORD(cxDesired) : cx1; + cx2 = HIWORD(cxDesired); cy1 = LOWORD(cyDesired); - cy2 = HIWORD(cyDesired) ? HIWORD(cyDesired) : cy1; + cy2 = HIWORD(cyDesired); if (pIconId) /* Invalidate first icon identifier */ *pIconId = 0xFFFFFFFF; @@ -469,7 +469,8 @@ static UINT ICO_ExtractIconExW( /* .ICO files have only one icon directory */ if (lpiID == NULL) /* not *.ico */ pCIDir = USER32_LoadResource(peimage, pIconDir + i + nIconIndex, *(WORD*)pData, &uSize); - pIconId[i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); + pIconId[i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, cx1, cy1, flags); + if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, cx2, cy2, flags); } if (lpiID && pCIDir) /* *.ico file, deallocate heap pointer*/ HeapFree(GetProcessHeap(), 0, pCIDir); @@ -485,8 +486,13 @@ static UINT ICO_ExtractIconExW( pCIDir = USER32_LoadResource(peimage, pIconStorage + i, *(WORD*)pData, &uSize); if (pCIDir) + { RetPtr[icon] = (HICON)CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, - (icon & 1) ? cx2 : cx1, (icon & 1) ? cy2 : cy1, flags); + cx1, cy1, flags); + if (cx2 && cy2) + RetPtr[++icon] = (HICON)CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, + cx2, cy2, flags); + } else RetPtr[icon] = 0; } @@ -550,7 +556,7 @@ static UINT ICO_ExtractIconExW( iconDirCount = icongroupresdir->NumberOfNamedEntries + icongroupresdir->NumberOfIdEntries; /* only number of icons requested */ - if( nIcons == 0 ) + if( !pIconId ) { ret = iconDirCount; goto end; /* success */ @@ -630,7 +636,8 @@ static UINT ICO_ExtractIconExW( FIXME("no matching real address for icongroup!\n"); goto end; /* failure */ } - pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); + pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx1, cy1, flags); + if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx2, cy2, flags); } if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir))) @@ -669,7 +676,10 @@ static UINT ICO_ExtractIconExW( continue; } RetPtr[i] = (HICON) CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000, - (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); + cx1, cy1, flags); + if (cx2 && cy2) + RetPtr[++i] = (HICON) CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000, + cx2, cy2, flags); } ret = i; /* return number of retrieved icons */ } /* if(sig == IMAGE_NT_SIGNATURE) */

1 0

Alexandre Julliard : tools: Add LDFLAGS to all the linker invocations.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: d237bda6e7a044f419b8b6455fadc247f3e0e487 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d237bda6e7a044f419b8b64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 13:45:34 2006 +0200 tools: Add LDFLAGS to all the linker invocations. --- tools/Makefile.in | 14 +++++++------- tools/winegcc/Makefile.in | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 1fcc092..361278f 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -49,25 +49,25 @@ all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS) @MAKE_RULES@ makedep$(EXEEXT): makedep.o - $(CC) $(CFLAGS) -o $@ makedep.o + $(CC) $(CFLAGS) -o $@ makedep.o $(LDFLAGS) make_ctests$(EXEEXT): make_ctests.o - $(CC) $(CFLAGS) -o $@ make_ctests.o + $(CC) $(CFLAGS) -o $@ make_ctests.o $(LDFLAGS) fnt2bdf$(EXEEXT): fnt2bdf.o - $(CC) $(CFLAGS) -o $@ fnt2bdf.o $(LIBPORT) + $(CC) $(CFLAGS) -o $@ fnt2bdf.o $(LIBPORT) $(LDFLAGS) fnt2fon$(EXEEXT): fnt2fon.o - $(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) + $(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) $(LDFLAGS) relpath$(EXEEXT): relpath.o - $(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) + $(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) $(LDFLAGS) sfnt2fnt$(EXEEXT): sfnt2fnt.o - $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(FREETYPELIBS) + $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) bin2res$(EXEEXT): bin2res.o - $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) + $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) $(LDFLAGS) wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 1b80531..09fd6b8 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -34,7 +34,7 @@ all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ winegcc$(EXEEXT): winegcc.o utils.o - $(CC) $(CFLAGS) -o $@ winegcc.o utils.o $(LIBPORT) + $(CC) $(CFLAGS) -o $@ winegcc.o utils.o $(LIBPORT) $(LDFLAGS) winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@

1 0

Alexandre Julliard : winegcc: Don't use the library full name for .so libs.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 1cb75101e6bcd120a7ca338f411af6b52960522f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1cb75101e6bcd120a7ca338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 13:45:16 2006 +0200 winegcc: Don't use the library full name for .so libs. --- tools/winegcc/winegcc.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 43a6b07..f897c9a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -401,8 +401,6 @@ static void add_library( strarray *lib_d } break; case file_so: - strarray_add(files, strmake("-s%s", fullname)); - break; default: /* keep it anyway, the linker may know what to do with it */ strarray_add(files, strmake("-l%s", library)); @@ -628,9 +626,9 @@ static void build(struct options* opts) switch(files->base[j][1]) { case 'l': + case 's': strarray_add(link_args, strmake("-l%s", name)); break; - case 's': case 'a': case 'o': strarray_add(link_args, name);

1 0

Dmitry Timoshkov : fonts: Add cyrillic glyphs to the "Small Fonts" built-in bitmap font.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 1e3b6b18883c7e29432c9aba0932d93e9534a90c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e3b6b18883c7e29432c9ab… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 4 18:56:20 2006 +0900 fonts: Add cyrillic glyphs to the "Small Fonts" built-in bitmap font. --- fonts/small_fonts.sfd | 520 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 516 insertions(+), 4 deletions(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 237f680..39f4686 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -3,7 +3,7 @@ FontName: small_fonts FullName: Small Fonts FamilyName: Small Fonts Weight: Medium -Copyright: Copyright (C) 2006 Huw D M Davies +Copyright: Copyright (C) 2006 Huw D M Davies, Dmitry Timoshkov Comments: 2006-4-1: Created. Version: 001.000 ItalicAngle: 0 @@ -52,10 +52,10 @@ NameList: Adobe Glyph List DisplaySize: 11 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 24 22 +WinInfo: 696 24 22 OnlyBitmaps: 1 TeXData: 1 0 0 189792 94896 63264 0 1048576 63264 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 340 +BeginChars: 65536 404 StartChar: A Encoding: 65 65 0 Width: 7 @@ -2090,8 +2090,392 @@ Encoding: 155 155 339 Width: 11 TeX: 117 0 0 0 EndChar +StartChar: afii10017 +Encoding: 1040 1040 340 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10018 +Encoding: 1041 1041 341 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10019 +Encoding: 1042 1042 342 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10020 +Encoding: 1043 1043 343 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10021 +Encoding: 1044 1044 344 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10022 +Encoding: 1045 1045 345 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10024 +Encoding: 1046 1046 346 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10025 +Encoding: 1047 1047 347 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10026 +Encoding: 1048 1048 348 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10027 +Encoding: 1049 1049 349 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10028 +Encoding: 1050 1050 350 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10029 +Encoding: 1051 1051 351 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10030 +Encoding: 1052 1052 352 +Width: 9 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10031 +Encoding: 1053 1053 353 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10032 +Encoding: 1054 1054 354 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10033 +Encoding: 1055 1055 355 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10034 +Encoding: 1056 1056 356 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10035 +Encoding: 1057 1057 357 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10036 +Encoding: 1058 1058 358 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10037 +Encoding: 1059 1059 359 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10038 +Encoding: 1060 1060 360 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10039 +Encoding: 1061 1061 361 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10040 +Encoding: 1062 1062 362 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10041 +Encoding: 1063 1063 363 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10042 +Encoding: 1064 1064 364 +Width: 8 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10043 +Encoding: 1065 1065 365 +Width: 9 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10044 +Encoding: 1066 1066 366 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10045 +Encoding: 1067 1067 367 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10046 +Encoding: 1068 1068 368 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10047 +Encoding: 1069 1069 369 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10048 +Encoding: 1070 1070 370 +Width: 8 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10049 +Encoding: 1071 1071 371 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10065 +Encoding: 1072 1072 372 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10066 +Encoding: 1073 1073 373 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10067 +Encoding: 1074 1074 374 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10068 +Encoding: 1075 1075 375 +Width: 4 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10069 +Encoding: 1076 1076 376 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10070 +Encoding: 1077 1077 377 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10072 +Encoding: 1078 1078 378 +Width: 8 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10073 +Encoding: 1079 1079 379 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10074 +Encoding: 1080 1080 380 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10075 +Encoding: 1081 1081 381 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10076 +Encoding: 1082 1082 382 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10077 +Encoding: 1083 1083 383 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10078 +Encoding: 1084 1084 384 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10079 +Encoding: 1085 1085 385 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10080 +Encoding: 1086 1086 386 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10081 +Encoding: 1087 1087 387 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10082 +Encoding: 1088 1088 388 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10083 +Encoding: 1089 1089 389 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10084 +Encoding: 1090 1090 390 +Width: 4 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10085 +Encoding: 1091 1091 391 +Width: 4 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10086 +Encoding: 1092 1092 392 +Width: 7 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10087 +Encoding: 1093 1093 393 +Width: 4 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10088 +Encoding: 1094 1094 394 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10089 +Encoding: 1095 1095 395 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10090 +Encoding: 1096 1096 396 +Width: 8 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10091 +Encoding: 1097 1097 397 +Width: 9 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10092 +Encoding: 1098 1098 398 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10093 +Encoding: 1099 1099 399 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10094 +Encoding: 1100 1100 400 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10095 +Encoding: 1101 1101 401 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10096 +Encoding: 1102 1102 402 +Width: 6 +Flags: HW +TeX: 97 0 0 0 +EndChar +StartChar: afii10097 +Encoding: 1103 1103 403 +Width: 5 +Flags: HW +TeX: 97 0 0 0 +EndChar EndChars -BitmapFont: 11 340 9 2 1 +BitmapFont: 11 404 9 2 1 BDFChar: 0 65 7 1 6 0 6 0JH$gG_C_M BDFChar: 1 33 2 1 1 0 6 @@ -2772,5 +3156,133 @@ BDFChar: 338 153 11 0 0 0 0 z BDFChar: 339 155 11 0 0 0 0 z +BDFChar: 340 1040 6 0 5 0 6 +0JH$gG_C_M +BDFChar: 341 1041 7 1 6 0 6 +pjdniKS9+# +BDFChar: 342 1042 7 1 6 0 6 +pk4=qKS9+# +BDFChar: 343 1043 6 1 5 0 6 +pjdmFJ:N.M +BDFChar: 344 1044 7 0 6 -1 6 +*#'YD6q%$+ +BDFChar: 345 1045 6 1 5 0 6 +pjdnaJ:RCp +BDFChar: 346 1046 7 0 6 0 6 +P#PC?<)f"\ +BDFChar: 347 1047 6 1 5 0 6 +E/4cR#`*F" +BDFChar: 348 1048 7 1 6 0 6 +N/X!cUnkp/ +BDFChar: 349 1049 7 1 6 0 8 +82-!]Pa%u>_uKc; +BDFChar: 350 1050 6 1 5 0 6 +Lld_VOH>7u +BDFChar: 351 1051 6 1 5 0 6 +3(QS284\O: +BDFChar: 352 1052 9 1 8 0 6 +_o&=IR@/U+ +BDFChar: 353 1053 7 1 6 0 6 +KS5$VKS5!Y +BDFChar: 354 1054 7 1 6 0 6 +G_Ca'KS4RM +BDFChar: 355 1055 7 1 6 0 6 +r.K`VKS5!Y +BDFChar: 356 1056 7 1 6 0 6 +pk4=qJ:N.M +BDFChar: 357 1057 7 1 6 0 6 +G_CTtJ:r.I +BDFChar: 358 1058 6 1 5 0 6 +p`L\%+<Vd, +BDFChar: 359 1059 6 1 5 0 6 +Lkpk3#`*F" +BDFChar: 360 1060 7 0 6 0 6 +&:BY(Hk6hh +BDFChar: 361 1061 6 1 5 0 6 +Lepnj:f)rJ +BDFChar: 362 1062 7 1 6 -1 6 +LkpkCLkts3 +BDFChar: 363 1063 6 1 5 0 6 +Lkpk3#RC\9 +BDFChar: 364 1064 8 1 7 0 6 +P*1ukP*5eE +BDFChar: 365 1065 9 1 8 -1 7 +P*1ukP*2".!<<*" +BDFChar: 366 1066 7 0 6 0 6 +i#j.)+sK,L +BDFChar: 367 1067 7 0 6 0 6 +JqAUFMMgs) +BDFChar: 368 1068 7 1 6 0 6 +J:N1FKS9+# +BDFChar: 369 1069 7 1 6 0 6 +G_?2^"GD"" +BDFChar: 370 1070 8 1 7 0 6 +S>)b;U8".X +BDFChar: 371 1071 7 1 6 0 6 +I"[0#7"g3n +BDFChar: 372 1072 5 1 4 0 4 +?k@:=Du]k< +BDFChar: 373 1073 5 1 4 0 6 +&7C%HOH<iM +BDFChar: 374 1074 5 1 4 0 4 +i/llYhuE`W +BDFChar: 375 1075 4 1 3 0 4 +i.-?.J,fQL +BDFChar: 376 1076 6 0 5 -1 4 +(aqpGr.G%M +BDFChar: 377 1077 5 1 4 0 4 +@$'l.?iU0, +BDFChar: 378 1078 8 1 7 0 4 +P#OD?OoPI^ +BDFChar: 379 1079 5 1 4 0 4 +@#uLm?iU0, +BDFChar: 380 1080 5 1 4 0 4 +OH?]nO8o7\ +BDFChar: 381 1081 5 1 4 0 7 ++@#pgOKd)n +BDFChar: 382 1082 5 1 4 0 4 +OJ'C^O8o7\ +BDFChar: 383 1083 5 1 4 0 4 +0MkSBO8o7\ +BDFChar: 384 1084 6 1 5 0 4 +LtJZ)L]@DT +BDFChar: 385 1085 5 1 4 0 4 +OHAsnO8o7\ +BDFChar: 386 1086 6 1 5 0 4 +E/9=+Du]k< +BDFChar: 387 1087 5 1 4 0 4 +n;r`nO8o7\ +BDFChar: 388 1088 5 1 4 -2 4 +i/j%^i.-=X +BDFChar: 389 1089 5 1 4 0 4 +@$#o#?iU0, +BDFChar: 390 1090 4 1 3 0 4 +i'9Om5QCca +BDFChar: 391 1091 4 1 3 -2 4 +TV.sN?m*5b +BDFChar: 392 1092 7 0 6 -2 4 +&:BY(Hk6hh +BDFChar: 393 1093 4 1 3 0 4 +TV+QCTE"rl +BDFChar: 394 1094 6 1 5 -1 4 +OH>Qcp]pj" +BDFChar: 395 1095 5 1 4 0 4 +OH=Dm&-)\1 +BDFChar: 396 1096 8 1 7 0 4 +P*1ukrVuou +BDFChar: 397 1097 9 1 8 -1 4 +P*1ukrrE*" +BDFChar: 398 1098 5 0 4 0 4 +^d)j0Du]k< +BDFChar: 399 1099 6 0 5 0 4 +KS8ENj8]/[ +BDFChar: 400 1100 5 1 4 0 4 +J:QR>huE`W +BDFChar: 401 1101 5 1 4 0 4 +i"0i=huE`W +BDFChar: 402 1102 6 0 5 0 4 +R&&f=QiI*d +BDFChar: 403 1103 5 1 4 0 4 +E0,$8O8o7\ EndBitmapFont EndSplineFont

1 0