March 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Add an open_file() function to the object operations.
by Alexandre Julliard March 22, 2007

March 22, 2007

1 0

Louis Lenders : shell32: Define avi resource #163.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 1f4c704678a2b688ea04e0f580dc7cc184e1d04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4c704678a2b688ea04e0f58… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Mar 22 09:16:54 2007 +0000 shell32: Define avi resource #163. --- dlls/shell32/shres.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index d02b6b4..5d8722e 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -12398,6 +12398,9 @@ IDR_AVI_FILECOPY AVI searching.avi /* BINRES findcomputer.avi */ IDR_AVI_FINDCOMPUTER AVI searching.avi +/* BINRES filenuke.avi */ +IDR_AVI_FILENUKE AVI searching.avi + /*--------------------- END FIXME ------------------------*/ /* diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index dfcd339..3619353 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -150,5 +150,6 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDR_AVI_FINDCOMPUTER 152 #define IDR_AVI_FILEMOVE 160 #define IDR_AVI_FILECOPY 161 +#define IDR_AVI_FILENUKE 163 #endif

1 0

Ken Thomases : Revert "gdi32: Disable the freetype mmap sharing on Mac OS." .
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: df605c0ac3a1294b71416cec5da213b956295e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df605c0ac3a1294b71416cec5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 21 18:36:39 2007 -0500 Revert "gdi32: Disable the freetype mmap sharing on Mac OS.". This reverts ae9f68dec91cd6ac66a99dc62d69dc53eaf910d0 commit. Because of commit 4e6860433e72714ed1e500eb523710656e71ba02 which extracts the constituent fonts from Mac suitcase fonts, we can use mmap on font files on the Mac. --- dlls/gdi32/freetype.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31b3429..f7b1220 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2205,7 +2205,6 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) static struct font_mapping *map_font( const char *name ) { -#ifndef __APPLE__ /* Mac OS fonts use resource forks, we can't simply mmap them */ struct font_mapping *mapping; struct stat st; int fd; @@ -2242,7 +2241,6 @@ static struct font_mapping *map_font( const char *name ) error: close( fd ); -#endif return NULL; } @@ -2265,11 +2263,13 @@ static FT_Face OpenFontFile(GdiFont *font, char *file, FT_Long face_index, LONG TRACE("%s, %ld, %d x %d\n", debugstr_a(file), face_index, width, height); - if ((font->mapping = map_font( file ))) - err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); - else - err = pFT_New_Face(library, file, face_index, &ft_face); + if (!(font->mapping = map_font( file ))) + { + WARN("failed to map %s\n", debugstr_a(file)); + return 0; + } + err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); if(err) { ERR("FT_New_Face rets %d\n", err); return 0;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: f76d076f8e43773be300929f7345f4ad9704292b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76d076f8e43773be300929f7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 21:51:22 2007 +0000 comctl32: Constify some variables. --- dlls/comctl32/comboex.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 1598c99..64e7b12 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -151,7 +151,7 @@ static inline LPCSTR debugstr_txt(LPCWSTR str) return debugstr_w(str); } -static void COMBOEX_DumpItem (CBE_ITEMDATA *item) +static void COMBOEX_DumpItem (CBE_ITEMDATA const *item) { TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n", item, item->mask, item->pszText, item->cchTextMax, item->iImage); @@ -162,7 +162,7 @@ static void COMBOEX_DumpItem (CBE_ITEMDATA *item) } -static void COMBOEX_DumpInput (COMBOBOXEXITEMW *input) +static void COMBOEX_DumpInput (COMBOBOXEXITEMW const *input) { TRACE("input - mask=%08x, iItem=%d, pszText=%p, cchTM=%d, iImage=%d\n", input->mask, input->iItem, input->pszText, input->cchTextMax, @@ -180,7 +180,7 @@ static inline CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index) (WPARAM)index, 0); } -static inline cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr) +static inline cmp_func_t get_cmp_func(COMBOEX_INFO const *infoPtr) { return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW; } @@ -283,11 +283,11 @@ static void COMBOEX_FreeText (CBE_ITEMDATA *item) } -static INT COMBOEX_GetIndex(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) +static INT COMBOEX_GetIndex(COMBOEX_INFO const *infoPtr, CBE_ITEMDATA const *item) { - CBE_ITEMDATA *moving; + CBE_ITEMDATA const *moving; INT index; - + moving = infoPtr->items; index = infoPtr->nb_items - 1; @@ -493,7 +493,7 @@ static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index) } -static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO *infoPtr) +static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO const *infoPtr) { return infoPtr->hwndEdit ? TRUE : FALSE; } @@ -530,7 +530,7 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf) static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index) { - CBE_ITEMDATA *item; + CBE_ITEMDATA const *item; TRACE("(index=%d)\n", index); @@ -601,14 +601,14 @@ static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) } -static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr) +static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO const *infoPtr) { return COMBOEX_HasEdit(infoPtr) && (infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED; } -static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW const *cit) { INT index; CBE_ITEMDATA *item; @@ -693,7 +693,7 @@ static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) } -static INT COMBOEX_InsertItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static INT COMBOEX_InsertItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -817,7 +817,7 @@ static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) return TRUE; } -static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -875,7 +875,8 @@ COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index) { - CBE_ITEMDATA *item1, *item2; + CBE_ITEMDATA const *item1; + CBE_ITEMDATA const *item2; DWORD_PTR ret = 0; item1 = get_item_data(infoPtr, index); @@ -914,7 +915,8 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT index) static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD_PTR data) { - CBE_ITEMDATA *item1, *item2; + CBE_ITEMDATA *item1; + CBE_ITEMDATA const *item2; item1 = get_item_data(infoPtr, index); if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) { @@ -933,7 +935,7 @@ static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD_PT } -static INT COMBOEX_SetItemHeight (COMBOEX_INFO *infoPtr, INT index, UINT height) +static INT COMBOEX_SetItemHeight (COMBOEX_INFO const *infoPtr, INT index, UINT height) { RECT cb_wrect, cbx_wrect, cbx_crect; @@ -967,7 +969,7 @@ static INT COMBOEX_SetItemHeight (COMBOEX_INFO *infoPtr, INT index, UINT height) /* *** WM_xxx message support *** */ -static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) +static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) { static const WCHAR COMBOBOX[] = { 'C', 'o', 'm', 'b', 'o', 'B', 'o', 'x', 0 }; static const WCHAR EDIT[] = { 'E', 'D', 'I', 'T', 0 }; @@ -1287,7 +1289,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lPa } -static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis) +static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const *dis) { CBE_ITEMDATA *item, *olditem; NMCOMBOBOXEXW nmcit; @@ -1333,7 +1335,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis) } -static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) +static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) { static const WCHAR nil[] = { 0 }; CBE_ITEMDATA *item = 0; @@ -1606,7 +1608,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) } -static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO *infoPtr, MEASUREITEMSTRUCT *mis) +static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO const *infoPtr, MEASUREITEMSTRUCT *mis) { static const WCHAR strW[] = { 'W', 0 }; SIZE mysize;

1 0

Andrew Talbot : msg711.acm: Replace inline static with static inline.
by Alexandre Julliard March 21, 2007

March 21, 2007

Module: wine Branch: master Commit: a97d79e2119bfa6ce61d87ac4888d42e232e9249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97d79e2119bfa6ce61d87ac4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 18:01:47 2007 +0000 msg711.acm: Replace inline static with static inline. --- dlls/msg711.acm/msg711.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 1b94134..b53524f 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -389,7 +389,7 @@ static const unsigned short _a2l[] = { 0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350, }; -inline static int +static inline int alaw2linear(unsigned char a_val) { return (short)_a2l[a_val];

1 0

Andrew Talbot : kernel32/tests: Replace inline static with static inline.
by Alexandre Julliard March 21, 2007

March 21, 2007

Module: wine Branch: master Commit: c261a75a6fa27c8462719d169e489e5b60859bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c261a75a6fa27c8462719d169… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 18:02:05 2007 +0000 kernel32/tests: Replace inline static with static inline. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2efa6f8..ee1dc5c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -55,7 +55,7 @@ static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) return NULL; } -inline static int isdigitW( WCHAR wc ) +static inline int isdigitW( WCHAR wc ) { WORD type; GetStringTypeW( CT_CTYPE1, &wc, 1, &type );

1 0

Andrew Talbot : mlang/tests: Replace inline static with static inline.
by Alexandre Julliard March 21, 2007

March 21, 2007

Module: wine Branch: master Commit: a96340becb79328ca6fade09e86535c09f76cb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96340becb79328ca6fade09e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 18:01:00 2007 +0000 mlang/tests: Replace inline static with static inline. --- dlls/mlang/tests/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 471f54a..53060fd 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -216,7 +216,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) ok(lenA == expected_len, "expected lenA %u, got %u\n", expected_len, lenA); } -inline static void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) +static inline void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) { ok(cpinfo1->dwFlags == cpinfo2->dwFlags, "dwFlags mismatch: %08x != %08x\n", cpinfo1->dwFlags, cpinfo2->dwFlags); ok(cpinfo1->uiCodePage == cpinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", cpinfo1->uiCodePage, cpinfo2->uiCodePage); @@ -499,7 +499,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) IEnumCodePage_Release(iEnumCP); } -inline static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) +static inline void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) { ok(sinfo1->ScriptId == sinfo2->ScriptId, "ScriptId mismatch: %d != %d\n", sinfo1->ScriptId, sinfo2->ScriptId); ok(sinfo1->uiCodePage == sinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", sinfo1->uiCodePage, sinfo2->uiCodePage);

1 0

Paul Vriens : wininet/ftp: Remove unneeded check.
by Alexandre Julliard March 21, 2007

March 21, 2007

Module: wine Branch: master Commit: 5f9d7745dc589eab47e0550aa7a2025fc7b31e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9d7745dc589eab47e0550aa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 21 17:55:56 2007 +0100 wininet/ftp: Remove unneeded check. --- dlls/wininet/ftp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 526c65e..73d51e8 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2801,9 +2801,6 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW TRACE("\n"); - if (INVALID_HANDLE_VALUE == hFile) - return FALSE; - lpszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHAR)*DATA_PACKET_SIZE); if (NULL == lpszBuffer) {

1 0

Paul Vriens : wininet/ftp: Fix potential memory leak.
by Alexandre Julliard March 21, 2007

March 21, 2007

Module: wine Branch: master Commit: 611acf5201c4823899a8c0d37c806af30033dcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=611acf5201c4823899a8c0d37… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 21 17:56:09 2007 +0100 wininet/ftp: Fix potential memory leak. --- dlls/wininet/ftp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 73d51e8..40026fd 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2825,9 +2825,10 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW } TRACE("Data transfer complete\n"); - HeapFree(GetProcessHeap(), 0, lpszBuffer); recv_end: + HeapFree(GetProcessHeap(), 0, lpszBuffer); + return (nRC != -1); }

1 0

Stefan Dösinger : wined3d: General signed format correction without native signed formats.
by Alexandre Julliard March 21, 2007

March 21, 2007

Module: wine Branch: master Commit: e25a16fda5be9ec7e1c0e56d430d3e4c6e31f05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25a16fda5be9ec7e1c0e56d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 21 00:06:04 2007 +0100 wined3d: General signed format correction without native signed formats. Implement signed d3d formats for D3DFMT_V8U8 and D3DFMT_Q8W8V8U8 if no suitable opengl signed format is supported. --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++++------------ dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 56ef5fb..f2c58ff 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -382,6 +382,8 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *) deviceImpl->stateBlock->textures[sampler_idx]; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(((IWineD3DDeviceImpl *)(This->baseShader.device))->wineD3D))->gl_info; SHADER_BUFFER* buffer = arg->buffer; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; @@ -414,6 +416,19 @@ static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const ch } else { shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); } + + /* Signedness correction */ + if(!GL_SUPPORT(NV_TEXTURE_SHADER3) /* Provides signed formats */ && texture) { + WINED3DFORMAT format = texture->baseTexture.format; + + if((format == WINED3DFMT_V8U8 && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) || + format == WINED3DFMT_Q8W8V8U8 || + format == WINED3DFMT_V16U16) { + shader_addline(buffer, "MAD %s, %s, coefmul.x, -one;\n", dst_str, dst_str); + } else if(format == WINED3DFMT_X8L8V8U8) { + shader_addline(buffer, "MAD %s.rg, %s, coefmul.x, -one;\n", dst_str, dst_str); + } + } } @@ -694,7 +709,6 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(((IWineD3DDeviceImpl *)(This->baseShader.device))->wineD3D))->gl_info; DWORD dst = arg->dst; DWORD src = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -709,19 +723,7 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { pshader_get_register_name(dst, reg_coord); if(This->bumpenvmatconst) { - /*shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", 1, 1); Not needed - done already */ - - /* Plain GL does not have any signed formats suitable for that instruction. - * So the surface loading code converts the -128 ... 127 signed integers to - * 0 ... 255 unsigned ones. The following line undoes that. - * - * TODO: GL_ATI_envmap_bumpmap supports D3DFMT_DU8DV8 only. If conversion for other formats - * is implemented check the texture format. - * - * TODO: Move that to the common sampling function - */ - if(!GL_SUPPORT(NV_TEXTURE_SHADER3) && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) - shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); + /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e1c754e..8ac924b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -45,7 +45,10 @@ typedef enum { CONVERT_CK_8888, CONVERT_CK_8888_ARGB, CONVERT_RGB32_888, - CONVERT_V8U8 + CONVERT_V8U8, + CONVERT_X8L8V8U8, + CONVERT_Q8W8V8U8, + CONVERT_V16U16 } CONVERT_TYPES; HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); @@ -1475,37 +1478,37 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *convert = CONVERT_V8U8; *format = GL_BGR; *internal = GL_RGB8; - *type = GL_BYTE; + *type = GL_UNSIGNED_BYTE; *target_bpp = 3; break; case WINED3DFMT_X8L8V8U8: if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; - FIXME("Conversion for D3D_X8L8V8U8 not implemented\n"); + *convert = CONVERT_X8L8V8U8; *format = GL_BGRA; *internal = GL_RGBA8; - *type = GL_BYTE; + *type = GL_UNSIGNED_BYTE; *target_bpp = 4; /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_Q8W8V8U8: if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; - FIXME("Conversion for D3D_Q8W8V8U8 not implemented\n"); + *convert = CONVERT_Q8W8V8U8; *format = GL_BGRA; *internal = GL_RGBA8; - *type = GL_BYTE; + *type = GL_UNSIGNED_BYTE; *target_bpp = 4; /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_V16U16: if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; - FIXME("Conversion for D3D_V16U16 not implemented\n"); - *format = GL_COLOR_INDEX; - *internal = GL_COLOR_INDEX; + *convert = CONVERT_V16U16; + *format = GL_BGR; + *internal = GL_RGB16; *type = GL_SHORT; - *target_bpp = 4; + *target_bpp = 6; /* What should I do here about GL_ATI_envmap_bumpmap? * Convert it or allow data loss by loading it into a 8 bit / channel texture? */ @@ -1649,6 +1652,26 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN break; } + case CONVERT_Q8W8V8U8: + { + unsigned int x, y; + DWORD *Source; + unsigned char *Dest; + for(y = 0; y < height; y++) { + Source = (DWORD *) (src + y * pitch); + Dest = (unsigned char *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + long color = (*Source++); + /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + /* A */ Dest[3] = ((color >> 24) & 0xff) + 128; /* Q */ + Dest += 4; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); }

1 0