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

Jacek Caban : mshtml: Use DOM designMode to switch to editor mode.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 80f0f35c504feb47e982cac74cb6ec91bb6854c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f0f35c504feb47e982cac74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 20:01:41 2010 +0200 mshtml: Use DOM designMode to switch to editor mode. --- dlls/mshtml/htmlwindow.c | 20 ++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 40 ---------------------------------------- dlls/mshtml/olecmd.c | 3 --- 4 files changed, 20 insertions(+), 44 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2aafaa3..5dbea55 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -57,6 +57,26 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) if(doc_node) htmldoc_addref(&doc_node->basedoc); } + + if(doc_node && window->doc_obj->usermode == EDITMODE) { + nsIDOMNSHTMLDocument *nshtmldoc; + nsAString mode_str; + nsresult nsres; + + static const PRUnichar onW[] = {'o','n',0}; + + nsres = nsIDOMHTMLDocument_QueryInterface(doc_node->nsdoc, &IID_nsIDOMNSHTMLDocument, (void**)&nshtmldoc); + if(NS_SUCCEEDED(nsres)) { + nsAString_Init(&mode_str, onW); + nsres = nsIDOMNSHTMLDocument_SetDesignMode(nshtmldoc, &mode_str); + nsAString_Finish(&mode_str); + nsIDOMNSHTMLDocument_Release(nshtmldoc); + if(NS_FAILED(nsres)) + ERR("SetDesignMode failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSHTMLDocument interface: %08x\n", nsres); + } + } } nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4431d9c..3db8d79 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -843,7 +843,6 @@ void update_title(HTMLDocumentObj*); /* editor */ void init_editor(HTMLDocument*); -void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f3e43c8..8a59007 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -767,46 +767,6 @@ void get_editor_controller(NSContainer *This) } } -void set_ns_editmode(NSContainer *This) -{ - nsIEditingSession *editing_session = NULL; - nsIURIContentListener *listener = NULL; - nsIDOMWindow *dom_window = NULL; - nsresult nsres; - - nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsIEditingSession, - (void**)&editing_session); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIEditingSession: %08x\n", nsres); - return; - } - - nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); - if(NS_FAILED(nsres)) { - ERR("Could not get content DOM window: %08x\n", nsres); - nsIEditingSession_Release(editing_session); - return; - } - - nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, - NULL, FALSE, TRUE, TRUE); - nsIEditingSession_Release(editing_session); - nsIDOMWindow_Release(dom_window); - if(NS_FAILED(nsres)) { - ERR("MakeWindowEditable failed: %08x\n", nsres); - return; - } - - /* MakeWindowEditable changes WebBrowser's parent URI content listener. - * It seams to be a bug in Gecko. To workaround it we set our content - * listener again and Gecko's one as its parent. - */ - nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); - nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); - nsIURIContentListener_Release(listener); - nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); -} - void close_gecko(void) { TRACE("()\n"); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b54f064..4d5967a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -616,9 +616,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, IDocHostUIHandler_HideUI(This->doc_obj->hostui); } - if(This->doc_obj->nscontainer) - set_ns_editmode(This->doc_obj->nscontainer); - if(This->doc_obj->ui_active) { RECT rcBorderWidths;

1 0

Damjan Jovanovic : ntoskrnl.exe: Implement IoCallDriver.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 242370b8364ec75651c807d4ed5577b77efc6635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242370b8364ec75651c807d4e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 13 20:42:13 2010 +0200 ntoskrnl.exe: Implement IoCallDriver. --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e71f692..793a699 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -632,14 +632,9 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc /*********************************************************************** - * IofCallDriver (NTOSKRNL.EXE.@) + * IoCallDriver (NTOSKRNL.EXE.@) */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( IofCallDriver ) -NTSTATUS WINAPI __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) -#else -NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) -#endif +NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) { PDRIVER_DISPATCH dispatch; IO_STACK_LOCATION *irpsp; @@ -657,6 +652,21 @@ NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) /*********************************************************************** + * IofCallDriver (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCallDriver ) +NTSTATUS WINAPI __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +#else +NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +#endif +{ + TRACE( "%p %p\n", device, irp ); + return IoCallDriver( device, irp ); +} + + +/*********************************************************************** * IoGetRelatedDeviceObject (NTOSKRNL.EXE.@) */ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject( PFILE_OBJECT obj ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1722393..bb98dc2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -323,7 +323,7 @@ @ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) @ stub IoBuildPartialMdl @ stub IoBuildSynchronousFsdRequest -@ stub IoCallDriver +@ stdcall IoCallDriver(ptr ptr) @ stub IoCancelFileOpen @ stub IoCancelIrp @ stub IoCheckDesiredAccess

1 0

Damjan Jovanovic : wdm.h: Declare IoCallDriver.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 189335441e41be7066805965927c38025d0ec7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189335441e41be70668059659… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 13 20:41:31 2010 +0200 wdm.h: Declare IoCallDriver. --- include/ddk/wdm.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e57be4b..da673a5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1063,6 +1063,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE);

1 0

Roderick Colenbrander : wined3d: Move R32G32F convertion to the formats table.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: e35f54ef1f6775b6cbf2707450b1930d540d1e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35f54ef1f6775b6cbf270745… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 21:00:01 2010 +0200 wined3d: Move R32G32F convertion to the formats table. --- dlls/wined3d/surface.c | 26 -------------------------- dlls/wined3d/utils.c | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d8b7cd..25967b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2244,12 +2244,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->conv_byte_count = 6; break; - case WINED3DFMT_R32G32_FLOAT: - if (gl_info->supported[ARB_TEXTURE_RG]) break; - *convert = CONVERT_R32G32F; - desc->conv_byte_count = 12; - break; - default: break; } @@ -2536,26 +2530,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_R32G32F: - { - unsigned int x, y; - const float *Source; - float *Dest; - for(y = 0; y < height; y++) { - Source = (const float *)(src + y * pitch); - Dest = (float *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - float green = (*Source++); - float red = (*Source++); - Dest[0] = green; - Dest[1] = red; - Dest[2] = 1.0f; - Dest += 3; - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 69216c2..b2a35c6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -417,6 +417,29 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi } } +static void convert_r32g32_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const float *Source; + float *Dest; + UINT outpitch = (pitch * 3)/2; + + for(y = 0; y < height; y++) + { + Source = (const float *)(src + y * pitch); + Dest = (float *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) + { + float green = (*Source++); + float red = (*Source++); + Dest[0] = green; + Dest[1] = red; + Dest[2] = 1.0f; + Dest += 3; + } + } +} + static void convert_s1_uint_d15_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -538,9 +561,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32G32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, - GL_RGB, GL_FLOAT, 0, + GL_RGB, GL_FLOAT, 12, WINED3DFMT_FLAG_RENDERTARGET, - ARB_TEXTURE_FLOAT, NULL}, + ARB_TEXTURE_FLOAT, &convert_r32g32_float}, {WINED3DFMT_R32G32_FLOAT, GL_RG32F, GL_RG32F, 0, GL_RG, GL_FLOAT, 0, WINED3DFMT_FLAG_RENDERTARGET,

1 0

Roderick Colenbrander : wined3d: Move D24X4S4 to the formats table.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 6a081ef95a074560492babe57039c476b609cb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a081ef95a074560492babe57… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 20:59:59 2010 +0200 wined3d: Move D24X4S4 to the formats table. --- dlls/wined3d/surface.c | 26 -------------------------- dlls/wined3d/utils.c | 25 +++++++++++++++++++++---- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d54f525..0d3a0a2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2259,14 +2259,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_S4X4_UINT_D24_UNORM: - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] - || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) - { - *convert = CONVERT_D24X4S4; - } - break; - default: break; } @@ -2595,24 +2587,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_D24X4S4: - { - unsigned int x, y; - - for (y = 0; y < height; ++y) - { - const DWORD *source = (const DWORD *)(src + y * pitch); - DWORD *dest = (DWORD *)(dst + y * outpitch); - - for (x = 0; x < width; ++x) - { - /* Just need to clear out the X4 part. */ - dest[x] = source[x] & ~0xf0; - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b7efc9a..6970ec8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -417,6 +417,23 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi } } +static void convert_s4x4_uint_d24_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + y * pitch); + DWORD *dest = (DWORD *)(dst + y * pitch); + + for (x = 0; x < width; ++x) + { + /* Just need to clear out the X4 part. */ + dest[x] = source[x] & ~0xf0; + } + } +} + static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -701,13 +718,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - EXT_PACKED_DEPTH_STENCIL, NULL}, + EXT_PACKED_DEPTH_STENCIL, &convert_s4x4_uint_d24_unorm}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, - GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, + GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - ARB_FRAMEBUFFER_OBJECT, NULL}, + ARB_FRAMEBUFFER_OBJECT, &convert_s4x4_uint_d24_unorm}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH,

1 0

Roderick Colenbrander : wined3d: Move L6V5U5 conversion to the formats table.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 798ba56c1b64fef02918988361ef212b827e7b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798ba56c1b64fef0291898836… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 20:59:57 2010 +0200 wined3d: Move L6V5U5 conversion to the formats table. --- dlls/wined3d/surface.c | 69 ------------------------------------------------ dlls/wined3d/utils.c | 68 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1a9b6b0..96e61c6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2224,18 +2224,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_R5G5_SNORM_L6_UNORM: - *convert = CONVERT_L6V5U5; - if (gl_info->supported[NV_TEXTURE_SHADER]) - { - desc->conv_byte_count = 3; - /* Use format and types from table */ - } else { - /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ - desc->conv_byte_count = 2; - } - break; - case WINED3DFMT_L4A4_UNORM: /* WINED3DFMT_L4A4_UNORM exists as an internal gl format, but for some reason there is not * format+type combination to load it. Thus convert it to A8L8, then load it @@ -2385,8 +2373,6 @@ void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *This) { - IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const BYTE *source; BYTE *dest; TRACE("(%p)->(%p),(%d,%d,%d,%d,%p)\n", src, dst, pitch, height, outpitch, convert,This); @@ -2532,61 +2518,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case CONVERT_L6V5U5: - { - unsigned int x, y; - const WORD *Source; - unsigned char *Dest; - - if (gl_info->supported[NV_TEXTURE_SHADER]) - { - /* This makes the gl surface bigger(24 bit instead of 16), but it works with - * fixed function and shaders without further conversion once the surface is - * loaded - */ - for(y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - char v = ((color >> 5) & 0x3e); - char u = ((color ) & 0x1f); - - /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign - * and doubles the positive range. Thus shift left only once, gl does the 2nd - * shift. GL reads a signed value and converts it into an unsigned value. - */ - /* M */ Dest[2] = l << 1; - - /* Those are read as signed, but kept signed. Just left-shift 3 times to scale - * from 5 bit values to 8 bit values. - */ - /* V */ Dest[1] = v << 3; - /* U */ Dest[0] = u << 3; - Dest += 3; - } - } - } else { - for(y = 0; y < height; y++) { - unsigned short *Dest_s = (unsigned short *) (dst + y * outpitch); - Source = (const WORD *)(src + y * pitch); - for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - short v = ((color >> 5) & 0x3e); - short u = ((color ) & 0x1f); - short v_conv = v + 16; - short u_conv = u + 16; - - *Dest_s = ((v_conv << 11) & 0xf800) | ((l << 5) & 0x7e0) | (u_conv & 0x1f); - Dest_s += 1; - } - } - } - break; - } - case CONVERT_A4L4: { unsigned int x, y; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9a3e762..43f7340 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -241,6 +241,66 @@ struct wined3d_format_texture_info void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); }; +static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const WORD *Source; + + for(y = 0; y < height; y++) + { + unsigned short *Dest_s = (unsigned short *) (dst + y * pitch); + Source = (const WORD *)(src + y * pitch); + for (x = 0; x < width; x++ ) + { + short color = (*Source++); + unsigned char l = ((color >> 10) & 0xfc); + short v = ((color >> 5) & 0x3e); + short u = ((color ) & 0x1f); + short v_conv = v + 16; + short u_conv = u + 16; + + *Dest_s = ((v_conv << 11) & 0xf800) | ((l << 5) & 0x7e0) | (u_conv & 0x1f); + Dest_s += 1; + } + } +} + +static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const WORD *Source; + unsigned char *Dest; + UINT outpitch = (pitch * 3)/2; + + /* This makes the gl surface bigger(24 bit instead of 16), but it works with + * fixed function and shaders without further conversion once the surface is + * loaded + */ + for(y = 0; y < height; y++) { + Source = (const WORD *)(src + y * pitch); + Dest = dst + y * outpitch; + for (x = 0; x < width; x++ ) { + short color = (*Source++); + unsigned char l = ((color >> 10) & 0xfc); + char v = ((color >> 5) & 0x3e); + char u = ((color ) & 0x1f); + + /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign + * and doubles the positive range. Thus shift left only once, gl does the 2nd + * shift. GL reads a signed value and converts it into an unsigned value. + */ + /* M */ Dest[2] = l << 1; + + /* Those are read as signed, but kept signed. Just left-shift 3 times to scale + * from 5 bit values to 8 bit values. + */ + /* V */ Dest[1] = v << 3; + /* U */ Dest[0] = u << 3; + Dest += 3; + } + } +} + static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -549,13 +609,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, - GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, + GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_r5g5_snorm_l6_unorm}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_DSDT8_MAG8_NV, GL_DSDT8_MAG8_NV, 0, - GL_DSDT_MAG_NV, GL_BYTE, 0, + GL_DSDT_MAG_NV, GL_BYTE, 3, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - NV_TEXTURE_SHADER, NULL}, + NV_TEXTURE_SHADER, &convert_r5g5_snorm_l6_unorm_nv}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,

1 0

Roderick Colenbrander : wined3d: Move D24FS8 to formats table.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 485040bb5c359614e0576b7a18adeaf76b794e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=485040bb5c359614e0576b7a1… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 20:59:58 2010 +0200 wined3d: Move D24FS8 to formats table. --- dlls/wined3d/surface.c | 27 --------------------------- dlls/wined3d/utils.c | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 96e61c6..d54f525 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2267,14 +2267,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_S8_UINT_D24_FLOAT: - if (gl_info->supported[ARB_DEPTH_BUFFER_FLOAT]) - { - *convert = CONVERT_D24FS8; - desc->conv_byte_count = 8; - } - break; - default: break; } @@ -2621,25 +2613,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_D24FS8: - { - unsigned int x, y; - - for (y = 0; y < height; ++y) - { - const DWORD *source = (const DWORD *)(src + y * pitch); - float *dest_f = (float *)(dst + y * outpitch); - DWORD *dest_s = (DWORD *)(dst + y * outpitch); - - for (x = 0; x < width; ++x) - { - dest_f[x * 2] = float_24_to_32((source[x] & 0xffffff00) >> 8); - dest_s[x * 2 + 1] = source[x] & 0xff; - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 43f7340..b7efc9a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -417,6 +417,25 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi } } +static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + UINT outpitch = pitch * 2; + + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + y * pitch); + float *dest_f = (float *)(dst + y * outpitch); + DWORD *dest_s = (DWORD *)(dst + y * outpitch); + + for (x = 0; x < width; ++x) + { + dest_f[x * 2] = float_24_to_32((source[x] & 0xffffff00) >> 8); + dest_s[x * 2 + 1] = source[x] & 0xff; + } + } +} + static const struct wined3d_format_texture_info format_texture_info[] = { /* WINED3DFORMAT internal srgbInternal rtInternal @@ -702,9 +721,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_BUFFER_FLOAT, NULL}, {WINED3DFMT_S8_UINT_D24_FLOAT, GL_DEPTH32F_STENCIL8, GL_DEPTH32F_STENCIL8, 0, - GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 0, + GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 8, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - ARB_DEPTH_BUFFER_FLOAT, NULL}, + ARB_DEPTH_BUFFER_FLOAT, &convert_s8_uint_d24_float}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0,

1 0

Roderick Colenbrander : wined3d: Move D15S1 over to the formats table.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 5c635f4146542db85e4635014386614e57f8c72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c635f4146542db85e4635014… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 21:00:00 2010 +0200 wined3d: Move D15S1 over to the formats table. --- dlls/wined3d/surface.c | 31 ------------------------------- dlls/wined3d/utils.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d3a0a2..7d8b7cd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2250,15 +2250,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->conv_byte_count = 12; break; - case WINED3DFMT_S1_UINT_D15_UNORM: - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] - || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) - { - *convert = CONVERT_D15S1; - desc->conv_byte_count = 4; - } - break; - default: break; } @@ -2565,28 +2556,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_D15S1: - { - unsigned int x, y; - - for (y = 0; y < height; ++y) - { - const WORD *source = (const WORD *)(src + y * pitch); - DWORD *dest = (DWORD *)(dst + y * outpitch); - - for (x = 0; x < width; ++x) - { - /* The depth data is normalized, so needs to be scaled, - * the stencil data isn't. Scale depth data by - * (2^24-1)/(2^15-1) ~~ (2^9 + 2^-6). */ - WORD d15 = source[x] >> 1; - DWORD d24 = (d15 << 9) + (d15 >> 6); - dest[x] = (d24 << 8) | (source[x] & 0x1); - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6970ec8..69216c2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -417,6 +417,28 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi } } +static void convert_s1_uint_d15_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + UINT outpitch = pitch * 2; + + for (y = 0; y < height; ++y) + { + const WORD *source = (const WORD *)(src + y * pitch); + DWORD *dest = (DWORD *)(dst + y * outpitch); + + for (x = 0; x < width; ++x) + { + /* The depth data is normalized, so needs to be scaled, + * the stencil data isn't. Scale depth data by + * (2^24-1)/(2^15-1) ~~ (2^9 + 2^-6). */ + WORD d15 = source[x] >> 1; + DWORD d24 = (d15 << 9) + (d15 >> 6); + dest[x] = (d24 << 8) | (source[x] & 0x1); + } + } +} + static void convert_s4x4_uint_d24_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -690,13 +712,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - EXT_PACKED_DEPTH_STENCIL, NULL}, + EXT_PACKED_DEPTH_STENCIL, &convert_s1_uint_d15_unorm}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, - GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, + GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - ARB_FRAMEBUFFER_OBJECT, NULL}, + ARB_FRAMEBUFFER_OBJECT, &convert_s1_uint_d15_unorm}, {WINED3DFMT_D24_UNORM_S8_UINT, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH,

1 0

Alexandre Julliard : msvcrt: Export a few more C++ functions that actually call standard C functions.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 6000b08ca7d6d59b2edafcbdf09ad319717ee2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6000b08ca7d6d59b2edafcbdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 17:52:31 2010 +0200 msvcrt: Export a few more C++ functions that actually call standard C functions. --- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c9542bc..c16de92 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -43,11 +43,11 @@ @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z @ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf -@ stub ?swprintf@@YAHPA_WIPB_WZZ +@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ @ cdecl ?vswprintf@@YAHPAGIPBGPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z +@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -i386 ?what(a)exception@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3540296..2154478 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -53,10 +53,10 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ stub ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH(a)Z @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ stub ?_sopen@@YAHPBDHHH(a)Z +@ cdecl ?_sopen@@YAHPBDHHH(a)Z(str long long long) msvcrt._sopen @ stub ?_type_info_dtor_internal_method(a)type_info@@QAEXXZ -@ stub ?_wopen@@YAHPB_WHH(a)Z -@ stub ?_wsopen@@YAHPB_WHHH(a)Z +@ cdecl ?_wopen@@YAHPB_WHH(a)Z(wstr long long) msvcrt._wopen +@ cdecl ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -i386 -norelay ?before(a)type_info@@QBEHABV1@@Z(ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ stub ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -i386 -norelay ?raw_name(a)type_info@@QBEPBDXZ() msvcrt.?raw_name(a)type_info@@QBEPBDXZ @@ -65,11 +65,11 @@ @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ stub ?set_unexpected@@YAP6AXXZH(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z -@ stub ?swprintf@@YAHPAGIPBGZZ -@ stub ?swprintf@@YAHPA_WIPB_WZZ +@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf +@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ -@ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z +@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -i386 -norelay ?what(a)exception@std@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ stub @_calloc_crt(a)8 @ cdecl @_malloc_crt(a)4(long) msvcrt.malloc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 218ae78..1b85a6e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -53,10 +53,10 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ stub ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH(a)Z @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ stub ?_sopen@@YAHPBDHHH(a)Z +@ cdecl ?_sopen@@YAHPBDHHH(a)Z(str long long long) msvcrt._sopen @ stub ?_type_info_dtor_internal_method(a)type_info@@QAEXXZ -@ stub ?_wopen@@YAHPB_WHH(a)Z -@ stub ?_wsopen@@YAHPB_WHHH(a)Z +@ cdecl ?_wopen@@YAHPB_WHH(a)Z(wstr long long) msvcrt._wopen +@ cdecl ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -i386 -norelay ?before(a)type_info@@QBEHABV1@@Z(ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ stub ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -i386 -norelay ?raw_name(a)type_info@@QBEPBDXZ() msvcrt.?raw_name(a)type_info@@QBEPBDXZ @@ -65,11 +65,11 @@ @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ stub ?set_unexpected@@YAP6AXXZH(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z -@ stub ?swprintf@@YAHPAGIPBGZZ -@ stub ?swprintf@@YAHPA_WIPB_WZZ +@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf +@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ -@ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z +@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -i386 -norelay ?what(a)exception@std@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos

1 0

Alexandre Julliard : msvcrt: Implement the missing exception constructor functions.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 300978283aa3c5829fe5b263a9a6cb265b252b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300978283aa3c5829fe5b263a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 17:19:27 2010 +0200 msvcrt: Implement the missing exception constructor functions. --- dlls/msvcr70/msvcr70.spec | 8 +++--- dlls/msvcr71/msvcr71.spec | 8 +++--- dlls/msvcr80/msvcr80.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcr90/msvcr90.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcrt/cpp.c | 44 +++++++++++++++++++++++++++++++++++ dlls/msvcrt/heap.c | 10 ++++++++ dlls/msvcrt/msvcrt.spec | 18 +++++++------- 7 files changed, 127 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=300978283aa3c5829fe5b…

1 0