wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Aric Stewart : usp10: Gurmukhi has Ras but no Ralf. So do not treat them as a lex_Ra for reordering.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: ab36da264b2fd986df398e76a940f0035f61bd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab36da264b2fd986df398e76a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 7 10:55:22 2011 -0500 usp10: Gurmukhi has Ras but no Ralf. So do not treat them as a lex_Ra for reordering. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 80ac191..36ed75a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2210,10 +2210,10 @@ static int gurmukhi_lex(WCHAR c) { switch (c) { - case 0x0A2f: return lex_Consonant; case 0x0A30: case 0x0A35: - case 0x0A39: return lex_Ra; + case 0x0A39: + case 0x0A2f: return lex_Consonant; case 0x0A3C: return lex_Nukta; case 0x0A3F: return lex_Matra_pre; case 0x0A03:

1 0

Aric Stewart : usp10: Do not over increment glyph index in Chaining Contextual Substitution.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 6657bf2d69828d0fa0d14d588c1f79eae802c145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6657bf2d69828d0fa0d14d588… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 7 09:57:01 2011 -0500 usp10: Do not over increment glyph index in Chaining Contextual Substitution. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5ee0b6d..80ac191 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1040,7 +1040,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU continue; } } - return newIndex + 1; + return newIndex; } } return -1;

1 0

Matteo Bruni : wined3d: Simplify context_apply_draw_buffers() a bit.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: c23a5443c16e03ee5668038fa72bd16792aff9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23a5443c16e03ee5668038fa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 6 23:46:12 2011 +0200 wined3d: Simplify context_apply_draw_buffers() a bit. --- dlls/wined3d/context.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5cd0517..b077c5f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1973,6 +1973,16 @@ static struct wined3d_context *FindContext(struct wined3d_device *device, struct return context; } +static inline BOOL is_rt_mask_onscreen(DWORD rt_mask) +{ + return rt_mask & (1 << 31); +} + +static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) +{ + return rt_mask & ~(1 << 31); +} + /* Context activation and GL locking are done by the caller. */ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) { @@ -1981,9 +1991,9 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt glDrawBuffer(GL_NONE); checkGLcall("glDrawBuffer()"); } - else if (!surface_is_offscreen(rts[0])) + else if (is_rt_mask_onscreen(rt_mask)) { - glDrawBuffer(surface_get_gl_buffer(rts[0])); + glDrawBuffer(draw_buffer_from_rt_mask(rt_mask)); checkGLcall("glDrawBuffer()"); } else @@ -2017,7 +2027,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt } else { - glDrawBuffer(rts[0]->resource.device->offscreenBuffer); + glDrawBuffer(draw_buffer_from_rt_mask(rt_mask)); checkGLcall("glDrawBuffer()"); } }

1 0

Matteo Bruni : wined3d: Fix glDrawBuffers() optimization.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 002674e49d3343d2ad4670081276e38af867eefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=002674e49d3343d2ad4670081… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 6 17:44:43 2011 +0200 wined3d: Fix glDrawBuffers() optimization. --- dlls/wined3d/context.c | 60 ++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 3 +- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8ada3d1..5cd0517 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1321,6 +1321,17 @@ static int WineD3D_ChoosePixelFormat(struct wined3d_device *device, HDC hdc, return iPixelFormat; } +static inline DWORD generate_rt_mask(GLenum buffer) +{ + /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ + return buffer ? (1 << 31) | buffer : 0; +} + +static inline DWORD generate_rt_mask_from_surface(struct wined3d_surface *target) +{ + return (1 << 31) | surface_get_gl_buffer(target); +} + /* Do not call while under the GL lock. */ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) @@ -1457,7 +1468,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->tid = GetCurrentThreadId(); ret->render_offscreen = surface_is_offscreen(target); - ret->draw_buffer_dirty = TRUE; + ret->draw_buffers_mask = generate_rt_mask(GL_BACK); ret->valid = 1; ret->glCtx = ctx; @@ -2017,7 +2028,7 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) { glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - context->draw_buffer_dirty = TRUE; + context->draw_buffers_mask = generate_rt_mask(buffer); } static inline void context_set_render_offscreen(struct wined3d_context *context, const struct StateEntry *StateTable, @@ -2075,6 +2086,8 @@ static void context_validate_onscreen_formats(struct wined3d_device *device, /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { + DWORD rt_mask; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { context_validate_onscreen_formats(device, context, NULL); @@ -2086,23 +2099,26 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL, SFLAG_INTEXTURE); LEAVE_GL(); + rt_mask = 1; } else { ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); LEAVE_GL(); + rt_mask = generate_rt_mask_from_surface(context->current_rt); } - - context->draw_buffer_dirty = TRUE; + } + else + { + rt_mask = generate_rt_mask_from_surface(context->current_rt); } ENTER_GL(); - if (context->draw_buffer_dirty) + if (rt_mask != context->draw_buffers_mask) { context_apply_draw_buffers(context, 1, &context->current_rt); - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - context->draw_buffer_dirty = FALSE; + context->draw_buffers_mask = rt_mask; } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2168,19 +2184,22 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d else { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); - rt_mask = 1; + rt_mask = generate_rt_mask_from_surface(rts[0]); } LEAVE_GL(); } else { - rt_mask = 1; + rt_mask = generate_rt_mask_from_surface(rts[0]); } ENTER_GL(); - context_apply_draw_buffers(context, rt_mask, rts); - context->draw_buffer_dirty = TRUE; + if (rt_mask != context->draw_buffers_mask) + { + context_apply_draw_buffers(context, rt_mask, rts); + context->draw_buffers_mask = rt_mask; + } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2214,6 +2233,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de const struct StateEntry *state_table = device->StateTable; const struct wined3d_fb_state *fb = &device->fb; unsigned int i; + DWORD rt_mask; if (!context_validate_rt_config(context->gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) @@ -2236,26 +2256,31 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); LEAVE_GL(); + rt_mask = generate_rt_mask_from_surface(fb->render_targets[0]); } else { + const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, fb->render_targets, fb->depth_stencil, SFLAG_INTEXTURE); glReadBuffer(GL_NONE); checkGLcall("glReadBuffer"); LEAVE_GL(); + rt_mask = ps ? ps->reg_maps.rt_mask : 1; + rt_mask &= device->valid_rt_mask; } } + else + { + rt_mask = generate_rt_mask_from_surface(fb->render_targets[0]); + } ENTER_GL(); - if (context->draw_buffer_dirty) + if (context->draw_buffers_mask != rt_mask) { - const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; - DWORD rt_mask = ps ? ps->reg_maps.rt_mask : 1; - - rt_mask &= device->valid_rt_mask; context_apply_draw_buffers(context, rt_mask, fb->render_targets); - context->draw_buffer_dirty = FALSE; + context->draw_buffers_mask = rt_mask; } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2334,7 +2359,6 @@ static void context_setup_target(struct wined3d_device *device, } } - context->draw_buffer_dirty = TRUE; context->current_rt = target; context_set_render_offscreen(context, StateTable, render_offscreen); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8530a86..d898654 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1053,7 +1053,6 @@ struct wined3d_context /* Stores some information about the context state for optimization */ WORD render_offscreen : 1; - WORD draw_buffer_dirty : 1; WORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ WORD last_was_pshader : 1; WORD last_was_vshader : 1; @@ -1067,6 +1066,7 @@ struct wined3d_context WORD current : 1; WORD destroyed : 1; WORD valid : 1; + WORD padding : 1; BYTE texShaderBumpMap; /* MAX_TEXTURES, 8 */ BYTE lastWasPow2Texture; /* MAX_TEXTURES, 8 */ DWORD numbered_array_mask; @@ -1098,6 +1098,7 @@ struct wined3d_context BOOL rebind_fbo; struct wined3d_surface **blit_targets; GLenum *draw_buffers; + DWORD draw_buffers_mask; /* Enabled draw buffers, 31 max. */ /* Queries */ GLuint *free_occlusion_queries;

1 0

Jacek Caban : iphlpapi: Added PfCreateInterface stub implementation.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 76eba12e1c84490ee895496481e9e8ff4928d940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76eba12e1c84490ee89549648… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 13:10:57 2011 +0200 iphlpapi: Added PfCreateInterface stub implementation. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index d6f33d7..e53a641 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -92,7 +92,7 @@ @ stub _PfAddGlobalFilterToInterface@8 @ stub _PfBindInterfaceToIPAddress@12 @ stub _PfBindInterfaceToIndex@16 -@ stub _PfCreateInterface@24 +@ stdcall _PfCreateInterface@24(long long long long long ptr) PfCreateInterface @ stub _PfDeleteInterface@4 @ stub _PfDeleteLog@0 @ stub _PfGetInterfaceStatistics@16 diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 70b4876..d5e8f33 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -55,6 +55,7 @@ #include "ifenum.h" #include "ipstats.h" #include "ipifcons.h" +#include "fltdefs.h" #include "wine/debug.h" @@ -2256,3 +2257,13 @@ DWORD WINAPI UnenableRouter(OVERLAPPED * pOverlapped, LPDWORD lpdwEnableCount) */ return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * PfCreateInterface (IPHLPAPI.@) + */ +DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWARD_ACTION outAction, + BOOL bUseLog, BOOL bMustBeUnique, INTERFACE_HANDLE *ppInterface) +{ + FIXME("(%d %d %d %x %x %p) stub\n", dwName, inAction, outAction, bUseLog, bMustBeUnique, ppInterface); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Jacek Caban : include: Added fltdefs.h from mingw-w64 project.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 39503fdf9ceffb66c58d1c7ea25cc88bd2fa5718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39503fdf9ceffb66c58d1c7ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 13:10:46 2011 +0200 include: Added fltdefs.h from mingw-w64 project. --- include/Makefile.in | 1 + include/fltdefs.h | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 673c32f..36dcaad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -266,6 +266,7 @@ SRCDIR_INCLUDES = \ exdispid.h \ fci.h \ fdi.h \ + fltdefs.h \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ diff --git a/include/fltdefs.h b/include/fltdefs.h new file mode 100644 index 0000000..393dd58 --- /dev/null +++ b/include/fltdefs.h @@ -0,0 +1,142 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _FLTDEFS_H +#define _FLTDEFS_H + +typedef PVOID FILTER_HANDLE,*PFILTER_HANDLE; +typedef PVOID INTERFACE_HANDLE,*PINTERFACE_HANDLE; + +#ifdef __cplusplus +#define EXTERNCDECL EXTERN_C +#else +#define EXTERNCDECL +#endif + +#define PFAPIENTRY EXTERNCDECL DWORD WINAPI + +typedef enum _GlobalFilter { + GF_FRAGMENTS = 2,GF_STRONGHOST = 8,GF_FRAGCACHE = 9 +} GLOBAL_FILTER,*PGLOBAL_FILTER; + +typedef enum _PfForwardAction { + PF_ACTION_FORWARD = 0,PF_ACTION_DROP +} PFFORWARD_ACTION,*PPFFORWARD_ACTION; + +typedef enum _PfAddresType { + PF_IPV4,PF_IPV6 +} PFADDRESSTYPE,*PPFADDRESSTYPE; + +#define FILTER_PROTO(ProtoId) MAKELONG(MAKEWORD((ProtoId),0x00),0x00000) + +#define FILTER_PROTO_ANY FILTER_PROTO(0x00) +#define FILTER_PROTO_ICMP FILTER_PROTO(0x01) +#define FILTER_PROTO_TCP FILTER_PROTO(0x06) +#define FILTER_PROTO_UDP FILTER_PROTO(0x11) + +#define FILTER_TCPUDP_PORT_ANY (WORD)0x0000 + +#define FILTER_ICMP_TYPE_ANY (BYTE)0xff +#define FILTER_ICMP_CODE_ANY (BYTE)0xff + +typedef struct _PF_FILTER_DESCRIPTOR { + DWORD dwFilterFlags; + DWORD dwRule; + PFADDRESSTYPE pfatType; + PBYTE SrcAddr; + PBYTE SrcMask; + PBYTE DstAddr; + PBYTE DstMask; + DWORD dwProtocol; + DWORD fLateBound; + WORD wSrcPort; + WORD wDstPort; + WORD wSrcPortHighRange; + WORD wDstPortHighRange; +} PF_FILTER_DESCRIPTOR,*PPF_FILTER_DESCRIPTOR; + +typedef struct _PF_FILTER_STATS { + DWORD dwNumPacketsFiltered; + PF_FILTER_DESCRIPTOR info; +} PF_FILTER_STATS,*PPF_FILTER_STATS; + +typedef struct _PF_INTERFACE_STATS { + PVOID pvDriverContext; + DWORD dwFlags; + DWORD dwInDrops; + DWORD dwOutDrops; + PFFORWARD_ACTION eaInAction; + PFFORWARD_ACTION eaOutAction; + DWORD dwNumInFilters; + DWORD dwNumOutFilters; + DWORD dwFrag; + DWORD dwSpoof; + DWORD dwReserved1; + DWORD dwReserved2; + LARGE_INTEGER liSYN; + LARGE_INTEGER liTotalLogged; + DWORD dwLostLogEntries; + PF_FILTER_STATS FilterInfo[1]; +} PF_INTERFACE_STATS,*PPF_INTERFACE_STATS; + +#define FILTERSIZE (sizeof(PF_FILTER_DESCRIPTOR) - (DWORD)(&((PPF_FILTER_DESCRIPTOR)0)->SrcAddr)) + +#define FD_FLAGS_NOSYN 0x1 + +#define FD_FLAGS_ALLFLAGS FD_FLAGS_NOSYN + +#define LB_SRC_ADDR_USE_SRCADDR_FLAG 0x00000001 +#define LB_SRC_ADDR_USE_DSTADDR_FLAG 0x00000002 +#define LB_DST_ADDR_USE_SRCADDR_FLAG 0x00000004 +#define LB_DST_ADDR_USE_DSTADDR_FLAG 0x00000008 +#define LB_SRC_MASK_LATE_FLAG 0x00000010 +#define LB_DST_MASK_LATE_FLAG 0x00000020 + +typedef struct _PF_LATEBIND_INFO { + PBYTE SrcAddr; + PBYTE DstAddr; + PBYTE Mask; +} PF_LATEBIND_INFO,*PPF_LATEBIND_INFO; + +typedef enum _PfFrameType { + PFFT_FILTER = 1,PFFT_FRAG = 2,PFFT_SPOOF = 3 +} PFFRAMETYPE,*PPFFRAMETYPE; + +typedef struct _pfLogFrame { + LARGE_INTEGER Timestamp; + PFFRAMETYPE pfeTypeOfFrame; + DWORD dwTotalSizeUsed; + DWORD dwFilterRule; + WORD wSizeOfAdditionalData; + WORD wSizeOfIpHeader; + DWORD dwInterfaceName; + DWORD dwIPIndex; + BYTE bPacketData[1]; +} PFLOGFRAME,*PPFLOGFRAME; + +#define ERROR_BASE 23000 + +#define PFERROR_NO_PF_INTERFACE (ERROR_BASE + 0) +#define PFERROR_NO_FILTERS_GIVEN (ERROR_BASE + 1) +#define PFERROR_BUFFER_TOO_SMALL (ERROR_BASE + 2) +#define ERROR_IPV6_NOT_IMPLEMENTED (ERROR_BASE + 3) + +PFAPIENTRY PfCreateInterface(DWORD dwName,PFFORWARD_ACTION inAction,PFFORWARD_ACTION outAction,BOOL bUseLog,BOOL bMustBeUnique,INTERFACE_HANDLE *ppInterface); +PFAPIENTRY PfDeleteInterface(INTERFACE_HANDLE pInterface); +PFAPIENTRY PfAddFiltersToInterface(INTERFACE_HANDLE ih,DWORD cInFilters,PPF_FILTER_DESCRIPTOR pfiltIn,DWORD cOutFilters,PPF_FILTER_DESCRIPTOR pfiltOut,PFILTER_HANDLE pfHandle); +PFAPIENTRY PfRemoveFiltersFromInterface(INTERFACE_HANDLE ih,DWORD cInFilters,PPF_FILTER_DESCRIPTOR pfiltIn,DWORD cOutFilters,PPF_FILTER_DESCRIPTOR pfiltOut); +PFAPIENTRY PfRemoveFilterHandles(INTERFACE_HANDLE pInterface,DWORD cFilters,PFILTER_HANDLE pvHandles); +PFAPIENTRY PfUnBindInterface(INTERFACE_HANDLE pInterface); +PFAPIENTRY PfBindInterfaceToIndex(INTERFACE_HANDLE pInterface,DWORD dwIndex,PFADDRESSTYPE pfatLinkType,PBYTE LinkIPAddress); +PFAPIENTRY PfBindInterfaceToIPAddress(INTERFACE_HANDLE pInterface,PFADDRESSTYPE pfatType,PBYTE IPAddress); +PFAPIENTRY PfRebindFilters(INTERFACE_HANDLE pInterface,PPF_LATEBIND_INFO pLateBindInfo); +PFAPIENTRY PfAddGlobalFilterToInterface(INTERFACE_HANDLE pInterface,GLOBAL_FILTER gfFilter); +PFAPIENTRY PfRemoveGlobalFilterFromInterface(INTERFACE_HANDLE pInterface,GLOBAL_FILTER gfFilter); +PFAPIENTRY PfMakeLog(HANDLE hEvent); +PFAPIENTRY PfSetLogBuffer(PBYTE pbBuffer,DWORD dwSize,DWORD dwThreshold,DWORD dwEntries,PDWORD pdwLoggedEntries,PDWORD pdwLostEntries,PDWORD pdwSizeUsed); +PFAPIENTRY PfDeleteLog(VOID); +PFAPIENTRY PfGetInterfaceStatistics(INTERFACE_HANDLE pInterface,PPF_INTERFACE_STATS ppfStats,PDWORD pdwBufferSize,BOOL fResetCounters); +PFAPIENTRY PfTestPacket(INTERFACE_HANDLE pInInterface,INTERFACE_HANDLE pOutInterface,DWORD cBytes,PBYTE pbPacket,PPFFORWARD_ACTION ppAction); +#endif

1 0

André Hentschel : c2man: Better detect that the file is in use.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 38fcf687c2c70f19bbaf2edf6aa3527823bf3896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fcf687c2c70f19bbaf2edf6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 6 22:23:16 2011 +0200 c2man: Better detect that the file is in use. --- tools/c2man.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index bc25683..8030bc4 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -419,6 +419,9 @@ sub process_source_file($) if ($parse_state == 4) # Reading in the function definition { + # This file is used by the DLL - Make sure we get our contributors right + push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); + push (@{$comment->{PROTOTYPE}},$_); # Strip comments from the line before checking for ')' my $stripped_line = $_; @@ -681,9 +684,6 @@ sub process_comment($) $spec_details->{NUM_DOCS}++; @$export[$EXPORT_FLAGS] |= $FLAG_DOCUMENTED; - # This file is used by the DLL - Make sure we get our contributors right - push (@{$spec_details->{SOURCES}},$comment->{FILE}); - # If we have parameter comments in the prototype, extract them my @parameter_comments; for (@{$comment->{PROTOTYPE}})

1 0

Dylan Smith : d3dx9: Implement D3DXLoadMeshHierarchyFromX.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 66693a6e80aa98cb82ca187f0a1347b5a77b38b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66693a6e80aa98cb82ca187f0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:52 2011 -0400 d3dx9: Implement D3DXLoadMeshHierarchyFromX. --- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/mesh.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9f42937..5a6e6e6 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -173,9 +173,9 @@ @ stub D3DXLoadMeshFromXResource(long ptr ptr long ptr ptr ptr ptr ptr ptr) @ stub D3DXLoadMeshFromXW(ptr long ptr ptr ptr ptr ptr ptr) @ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) -@ stub D3DXLoadMeshHierarchyFromXA(ptr long ptr ptr ptr ptr ptr) +@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) -@ stub D3DXLoadMeshHierarchyFromXW(ptr long ptr ptr ptr ptr ptr) +@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) @ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index da40402..c05b268 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2724,6 +2724,66 @@ cleanup: return hr; } +HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(LPCSTR filename, + DWORD options, + LPDIRECT3DDEVICE9 device, + LPD3DXALLOCATEHIERARCHY alloc_hier, + LPD3DXLOADUSERDATA load_user_data, + LPD3DXFRAME *frame_hierarchy, + LPD3DXANIMATIONCONTROLLER *anim_controller) +{ + HRESULT hr; + int len; + LPWSTR filenameW; + + TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options, + device, alloc_hier, load_user_data, frame_hierarchy, anim_controller); + + if (!filename) + return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filenameW) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = D3DXLoadMeshHierarchyFromXW(filenameW, options, device, + alloc_hier, load_user_data, frame_hierarchy, anim_controller); + HeapFree(GetProcessHeap(), 0, filenameW); + + return hr; +} + +HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(LPCWSTR filename, + DWORD options, + LPDIRECT3DDEVICE9 device, + LPD3DXALLOCATEHIERARCHY alloc_hier, + LPD3DXLOADUSERDATA load_user_data, + LPD3DXFRAME *frame_hierarchy, + LPD3DXANIMATIONCONTROLLER *anim_controller) +{ + HRESULT hr; + DWORD size; + LPVOID buffer; + + TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_w(filename), options, + device, alloc_hier, load_user_data, frame_hierarchy, anim_controller); + + if (!filename) + return D3DERR_INVALIDCALL; + + hr = map_view_of_file(filename, &buffer, &size); + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + hr = D3DXLoadMeshHierarchyFromXInMemory(buffer, size, options, device, + alloc_hier, load_user_data, frame_hierarchy, anim_controller); + + UnmapViewOfFile(buffer); + + return hr; +} + static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name) { HRESULT hr;

1 0

Dylan Smith : d3dx9/tests: Add texture coordinates and vertex colors in X file.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: bbc009f452ad049d03e989f39ceceea0da77343f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc009f452ad049d03e989f39… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:45 2011 -0400 d3dx9/tests: Add texture coordinates and vertex colors in X file. --- dlls/d3dx9_36/tests/mesh.c | 76 +++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d404073..ee15fdb 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1994,6 +1994,30 @@ static void D3DXLoadMeshTest(void) "TextureFilename { \"texture.jpg\"; }" "}" "}" + "MeshVertexColors {" + "8;" /* DWORD nVertexColors; */ + /* array IndexedColor vertexColors[nVertexColors]; */ + "0; 0.0; 0.0; 0.0; 0.0;;" + "1; 0.0; 0.0; 1.0; 0.1;;" + "2; 0.0; 1.0; 0.0; 0.2;;" + "3; 0.0; 1.0; 1.0; 0.3;;" + "4; 1.0; 0.0; 0.0; 0.4;;" + "5; 1.0; 0.0; 1.0; 0.5;;" + "6; 1.0; 1.0; 0.0; 0.6;;" + "7; 1.0; 1.0; 1.0; 0.7;;" + "}" + "MeshTextureCoords {" + "8;" /* DWORD nTextureCoords; */ + /* array Coords2d textureCoords[nTextureCoords]; */ + "0.0; 1.0;," + "1.0; 1.0;," + "0.0; 0.0;," + "1.0; 0.0;," + "1.0; 1.0;," + "0.0; 1.0;," + "1.0; 0.0;," + "0.0; 0.0;;" + "}" "}"; static const WORD box_index_buffer[] = { 0, 1, 3, @@ -2012,31 +2036,33 @@ static void D3DXLoadMeshTest(void) static const struct { D3DXVECTOR3 position; D3DXVECTOR3 normal; + D3DCOLOR diffuse; + D3DXVECTOR2 tex_coords; } box_vertex_buffer[] = { - {{0.0, 0.0, 0.0}, {-1.0, 0.0, 0.0}}, - {{0.0, 0.0, 1.0}, {-1.0, 0.0, 0.0}}, - {{0.0, 1.0, 0.0}, {-1.0, 0.0, 0.0}}, - {{0.0, 1.0, 1.0}, {-1.0, 0.0, 0.0}}, - {{1.0, 0.0, 0.0}, {1.0, 0.0, 0.0}}, - {{1.0, 0.0, 1.0}, {1.0, 0.0, 0.0}}, - {{1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, - {{1.0, 1.0, 1.0}, {0.0, 1.0, 0.0}}, - {{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, - {{0.0, 1.0, 1.0}, {0.0, 1.0, 0.0}}, - {{1.0, 1.0, 0.0}, {1.0, 0.0, 0.0}}, - {{1.0, 1.0, 1.0}, {1.0, 0.0, 0.0}}, - {{0.0, 0.0, 1.0}, {0.0, -1.0, 0.0}}, - {{0.0, 0.0, 0.0}, {0.0, -1.0, 0.0}}, - {{1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}}, - {{1.0, 0.0, 1.0}, {0.0, -1.0, 0.0}}, - {{0.0, 0.0, 1.0}, {0.0, 0.0, 1.0}}, - {{1.0, 0.0, 1.0}, {0.0, 0.0, 1.0}}, - {{1.0, 1.0, 1.0}, {0.0, 0.0, 1.0}}, - {{0.0, 1.0, 1.0}, {0.0, 0.0, 1.0}}, - {{0.0, 0.0, 0.0}, {0.0, 0.0, -1.0}}, - {{0.0, 1.0, 0.0}, {0.0, 0.0, -1.0}}, - {{1.0, 1.0, 0.0}, {0.0, 0.0, -1.0}}, - {{1.0, 0.0, 0.0}, {0.0, 0.0, -1.0}}, + {{0.0, 0.0, 0.0}, {-1.0, 0.0, 0.0}, 0x00000000, {0.0, 1.0}}, + {{0.0, 0.0, 1.0}, {-1.0, 0.0, 0.0}, 0x1a0000ff, {1.0, 1.0}}, + {{0.0, 1.0, 0.0}, {-1.0, 0.0, 0.0}, 0x3300ff00, {0.0, 0.0}}, + {{0.0, 1.0, 1.0}, {-1.0, 0.0, 0.0}, 0x4d00ffff, {1.0, 0.0}}, + {{1.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, 0x66ff0000, {1.0, 1.0}}, + {{1.0, 0.0, 1.0}, {1.0, 0.0, 0.0}, 0x80ff00ff, {0.0, 1.0}}, + {{1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}, 0x99ffff00, {1.0, 0.0}}, + {{1.0, 1.0, 1.0}, {0.0, 1.0, 0.0}, 0xb3ffffff, {0.0, 0.0}}, + {{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0}, 0x3300ff00, {0.0, 0.0}}, + {{0.0, 1.0, 1.0}, {0.0, 1.0, 0.0}, 0x4d00ffff, {1.0, 0.0}}, + {{1.0, 1.0, 0.0}, {1.0, 0.0, 0.0}, 0x99ffff00, {1.0, 0.0}}, + {{1.0, 1.0, 1.0}, {1.0, 0.0, 0.0}, 0xb3ffffff, {0.0, 0.0}}, + {{0.0, 0.0, 1.0}, {0.0, -1.0, 0.0}, 0x1a0000ff, {1.0, 1.0}}, + {{0.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, 0x00000000, {0.0, 1.0}}, + {{1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, 0x66ff0000, {1.0, 1.0}}, + {{1.0, 0.0, 1.0}, {0.0, -1.0, 0.0}, 0x80ff00ff, {0.0, 1.0}}, + {{0.0, 0.0, 1.0}, {0.0, 0.0, 1.0}, 0x1a0000ff, {1.0, 1.0}}, + {{1.0, 0.0, 1.0}, {0.0, 0.0, 1.0}, 0x80ff00ff, {0.0, 1.0}}, + {{1.0, 1.0, 1.0}, {0.0, 0.0, 1.0}, 0xb3ffffff, {0.0, 0.0}}, + {{0.0, 1.0, 1.0}, {0.0, 0.0, 1.0}, 0x4d00ffff, {1.0, 0.0}}, + {{0.0, 0.0, 0.0}, {0.0, 0.0, -1.0}, 0x00000000, {0.0, 1.0}}, + {{0.0, 1.0, 0.0}, {0.0, 0.0, -1.0}, 0x3300ff00, {0.0, 0.0}}, + {{1.0, 1.0, 0.0}, {0.0, 0.0, -1.0}, 0x99ffff00, {1.0, 0.0}}, + {{1.0, 0.0, 0.0}, {0.0, 0.0, -1.0}, 0x66ff0000, {1.0, 1.0}}, }; static const D3DXMATERIAL box_materials[] = { { @@ -2060,7 +2086,7 @@ static void D3DXLoadMeshTest(void) (char *)"texture.jpg", /* pTextureFilename */ }, }; - const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1; /*________________________*/ HRESULT hr; HWND wnd = NULL;

1 0

Dylan Smith : d3dx9: Add support for loading vertex colors from X files.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 19abc0d0fd1ffdda355eb114d8ae1a19f11c4b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19abc0d0fd1ffdda355eb114d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:38 2011 -0400 d3dx9: Add support for loading vertex colors from X files. --- dlls/d3dx9_36/mesh.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d0ee9b7..da40402 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1833,6 +1833,8 @@ struct mesh_data { D3DXVECTOR2 *tex_coords; + DWORD *vertex_colors; + DWORD num_materials; D3DXMATERIAL *materials; DWORD *material_indices; @@ -2100,6 +2102,73 @@ truncated_data_error: return E_FAIL; } +static HRESULT parse_vertex_colors(IDirectXFileData *filedata, struct mesh_data *mesh) +{ + HRESULT hr; + DWORD data_size; + BYTE *data; + DWORD num_colors; + int i; + + HeapFree(GetProcessHeap(), 0, mesh->vertex_colors); + mesh->vertex_colors = NULL; + + hr = IDirectXFileData_GetData(filedata, NULL, &data_size, (void**)&data); + if (FAILED(hr)) return hr; + + /* template IndexedColor { + * DWORD index; + * ColorRGBA indexColor; + * } + * template MeshVertexColors { + * DWORD nVertexColors; + * array IndexedColor vertexColors[nVertexColors]; + * } + */ + + if (data_size < sizeof(DWORD)) + goto truncated_data_error; + num_colors = *(DWORD*)data; + data += sizeof(DWORD); + if (data_size < sizeof(DWORD) + num_colors * (sizeof(DWORD) + sizeof(D3DCOLORVALUE))) + goto truncated_data_error; + + mesh->vertex_colors = HeapAlloc(GetProcessHeap(), 0, mesh->num_vertices * sizeof(DWORD)); + if (!mesh->vertex_colors) + return E_OUTOFMEMORY; + + for (i = 0; i < mesh->num_vertices; i++) + mesh->vertex_colors[i] = D3DCOLOR_ARGB(0, 0xff, 0xff, 0xff); + for (i = 0; i < num_colors; i++) + { + D3DCOLORVALUE color; + DWORD index = *(DWORD*)data; + data += sizeof(DWORD); + if (index >= mesh->num_vertices) { + WARN("vertex color %u references undefined vertex %u (only %u vertices)\n", + i, index, mesh->num_vertices); + return E_FAIL; + } + memcpy(&color, data, sizeof(color)); + data += sizeof(color); + color.r = fminf(1.0f, fmaxf(0.0f, color.r)); + color.g = fminf(1.0f, fmaxf(0.0f, color.g)); + color.b = fminf(1.0f, fmaxf(0.0f, color.b)); + color.a = fminf(1.0f, fmaxf(0.0f, color.a)); + mesh->vertex_colors[index] = D3DCOLOR_ARGB((BYTE)(color.a * 255.0f + 0.5f), + (BYTE)(color.r * 255.0f + 0.5f), + (BYTE)(color.g * 255.0f + 0.5f), + (BYTE)(color.b * 255.0f + 0.5f)); + } + + mesh->fvf |= D3DFVF_DIFFUSE; + + return D3D_OK; +truncated_data_error: + WARN("truncated data (%u bytes)\n", data_size); + return E_FAIL; +} + static HRESULT parse_normals(IDirectXFileData *filedata, struct mesh_data *mesh) { HRESULT hr; @@ -2289,8 +2358,7 @@ static HRESULT parse_mesh(IDirectXFileData *filedata, struct mesh_data *mesh_dat if (IsEqualGUID(type, &TID_D3DRMMeshNormals)) { hr = parse_normals(child, mesh_data); } else if (IsEqualGUID(type, &TID_D3DRMMeshVertexColors)) { - FIXME("Mesh vertex color loading not implemented.\n"); - hr = E_NOTIMPL; + hr = parse_vertex_colors(child, mesh_data); } else if (IsEqualGUID(type, &TID_D3DRMMeshTextureCoords)) { hr = parse_texture_coords(child, mesh_data); } else if (IsEqualGUID(type, &TID_D3DRMMeshMaterialList) && @@ -2514,6 +2582,10 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, *(D3DXVECTOR3*)out_ptr = mesh_data.normals[duplications[i].normal_index]; out_ptr += sizeof(D3DXVECTOR3); } + if (mesh_data.fvf & D3DFVF_DIFFUSE) { + *(DWORD*)out_ptr = mesh_data.vertex_colors[i]; + out_ptr += sizeof(DWORD); + } if (mesh_data.fvf & D3DFVF_TEX1) { *(D3DXVECTOR2*)out_ptr = mesh_data.tex_coords[i]; out_ptr += sizeof(D3DXVECTOR2); @@ -2647,6 +2719,7 @@ cleanup: HeapFree(GetProcessHeap(), 0, mesh_data.normal_indices); destroy_materials(&mesh_data); HeapFree(GetProcessHeap(), 0, mesh_data.tex_coords); + HeapFree(GetProcessHeap(), 0, mesh_data.vertex_colors); HeapFree(GetProcessHeap(), 0, duplications); return hr; }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011