November 2011 - Wine-commits

Andrew Talbot : ws2_32: Remove unneeded address-of operator from array name .
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: a38b3008c5c14f6850c6b9c6c79b1f8d81848d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38b3008c5c14f6850c6b9c6c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 3 23:03:22 2011 +0000 ws2_32: Remove unneeded address-of operator from array name. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 219e954..00a15b6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2784,7 +2784,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, &src->dev[i].daddr, sizeof(dst->Device[i].irdaDeviceID) ) ; memcpy( dst->Device[i].irdaDeviceName, - &src->dev[i].info, + src->dev[i].info, sizeof(dst->Device[i].irdaDeviceName) ) ; memcpy( &dst->Device[i].irdaDeviceHints1, &src->dev[i].hints[0],

1 0

Alexandre Julliard : wineps: Fix the font escapement when coordinates are being mirrored.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 29295e98e61021028a79212748d1d904cbedc742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29295e98e61021028a7921274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 16:08:29 2011 +0100 wineps: Fix the font escapement when coordinates are being mirrored. --- dlls/wineps.drv/download.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index a09f97a..6996205 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -274,6 +274,7 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) if(GetGraphicsMode(dev->hdc) == GM_COMPATIBLE) { + if (xform.eM22 < 0) physDev->font.escapement = -physDev->font.escapement; xform.eM11 = xform.eM22 = fabs(xform.eM22); xform.eM21 = xform.eM12 = 0; }

1 0

Eric Pouech : icinfo: Compile the IcInfo program as a command-line app.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 15bcb63bca6ac74c2f4d4dbbc5bb449fd52f4cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bcb63bca6ac74c2f4d4dbbc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 3 21:54:05 2011 +0100 icinfo: Compile the IcInfo program as a command-line app. --- programs/icinfo/Makefile.in | 2 +- programs/icinfo/icinfo.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index 16a5bb7..cbd49f9 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = icinfo.exe -APPMODE = -mwindows +APPMODE = -mconsole IMPORTS = msvfw32 C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 3b882ac..345f813 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -23,15 +23,21 @@ #include "vfw.h" -int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int main(int argc, char* argv[]) { - int n=0,doabout=0,doconfigure=0; + int i, n=0,doabout=0,doconfigure=0; char buf[128],type[5],handler[5]; - if (strstr(cmdline,"-about")) - doabout = 1; - if (strstr(cmdline,"-configure")) - doconfigure = 1; + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-about")) + doabout = 1; + else if (!strcmp(argv[i], "-configure")) + doconfigure = 1; + else { + printf("Unknown option: %s\n", argv[i]); + return -1; + } + } printf("Currently installed Video Compressors:\n"); while (1) {

1 0

Eric Pouech : icinfo: No longer use stdio functions, but direct kernel32 ones.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: ad54412813dc24c52b98814fb0926dc6f6e65658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad54412813dc24c52b98814fb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 3 21:54:11 2011 +0100 icinfo: No longer use stdio functions, but direct kernel32 ones. --- programs/icinfo/Makefile.in | 2 +- programs/icinfo/icinfo.c | 112 ++++++++++++++++++++++++++++++++---------- 2 files changed, 86 insertions(+), 28 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index cbd49f9..e6f6b95 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = icinfo.exe -APPMODE = -mconsole +APPMODE = -mconsole -municode IMPORTS = msvfw32 C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 345f813..1801d09 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -18,28 +18,88 @@ #include <stdio.h> #include <string.h> +#include <wine/unicode.h> #include "windows.h" #include "mmsystem.h" #include "vfw.h" +static int mywprintf(const WCHAR *format, ...) +{ + static char output_bufA[65536]; + static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; + va_list parms; + DWORD nOut; + int len; + BOOL res = FALSE; + HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); + + va_start(parms, format); + len = vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + va_end(parms); + if (len < 0) + { + /* String too long */ + return 0; + } + + /* Try to write as unicode whenever we think it's a console */ + if (((DWORD_PTR)hout & 3) == 3) + { + res = WriteConsoleW(hout, output_bufW, len, &nOut, NULL); + } + else + { + BOOL usedDefaultChar = FALSE; + DWORD convertedChars; + + /* Convert to OEM, then output */ + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, len, + output_bufA, sizeof(output_bufA), + "?", &usedDefaultChar); + res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE); + } + + return res ? nOut : 0; +} -int main(int argc, char* argv[]) +int wmain(int argc, WCHAR* argv[]) { int i, n=0,doabout=0,doconfigure=0; - char buf[128],type[5],handler[5]; + + static const WCHAR header[] = {'C','u','r','r','e','n','t','l','y',' ','i','n','s','t','a','l','l','e','d',' ', + 'V','i','d','e','o',' ','C','o','m','p','r','e','s','s','o','r','s',':','\n',0}; + static const WCHAR close_flags[] = {')','\n',0}; + static const WCHAR s_fmt[] = {'%','s',0}; + static const WCHAR sspc_fmt[] = {'%','s',' ',0}; + static const WCHAR fcc_fmt[] = {'%','c','%','c','%','c','%','c','.','%','c','%','c','%','c','%','c',':',' ','%','s','\n',0}; + static const WCHAR desc_fmt[] = {'\t','s','z','D','e','s','c','r','i','p','t','i','o','n',':',' ','%','s','\n',0}; + static const WCHAR flags_fmt[] = {'\t','d','w','F','l','a','g','s',':',' ','0','x','%','0','8','x',' ','(',0}; + static const WCHAR version_fmt[] = {'\t','d','w','V','e','r','s','i','o','n',':',' ','0','x','%','0','8','x','\n',0}; + static const WCHAR versicm_fmt[] = {'\t','d','w','V','e','r','s','i','o','n','I','C','M',':',' ','0','x','%','0','8','x','\n',0}; + static const WCHAR VIDCF_QUALITY_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y',0}; + static const WCHAR VIDCF_CRUNCH_W[] = {'V','I','D','C','F','_','C','R','U','N','C','H',0}; + static const WCHAR VIDCF_TEMPORAL_W[] = {'V','I','D','C','F','_','T','E','M','P','O','R','A','L',0}; + static const WCHAR VIDCF_COMPRESSFRAMES_W[] = {'V','I','D','C','F','_','C','O','M','P','R','E','S','S','F','R','A','M','E','S',0}; + static const WCHAR VIDCF_DRAW_W[] = {'V','I','D','C','F','_','D','R','A','W',0}; + static const WCHAR VIDCF_FASTTEMPORALC_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','C',0}; + static const WCHAR VIDCF_FASTTEMPORALD_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','D',0}; + static const WCHAR VIDCF_QUALITYTIME_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y','T','I','M','E',0}; + static const WCHAR about[] = {'-','a','b','o','u','t','\0'}; + static const WCHAR configure[] = {'-','c','o','n','f','i','g','u','r','e','\0'}; + static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-about")) + if (!strcmpW(argv[i], about)) doabout = 1; - else if (!strcmp(argv[i], "-configure")) + else if (!strcmpW(argv[i], configure)) doconfigure = 1; else { - printf("Unknown option: %s\n", argv[i]); + mywprintf(unk_opt_fmt, argv[i]); return -1; } } - printf("Currently installed Video Compressors:\n"); + mywprintf(s_fmt, header); while (1) { ICINFO ii; HIC hic; @@ -53,28 +113,26 @@ int main(int argc, char* argv[]) ICClose(hic); continue; } -#define w2s(w,s) WideCharToMultiByte(0,0,w,-1,s,128,0,NULL) - w2s(ii.szName,buf); - memcpy(type,&(ii.fccType),4);type[4]='\0'; - memcpy(handler,&(ii.fccHandler),4);handler[4]='\0'; - printf("%s.%s: %s\n",type,handler,buf); - printf("\tdwFlags: 0x%08x (",ii.dwFlags); -#define XX(x) if (ii.dwFlags & x) printf(#x" "); - XX(VIDCF_QUALITY); - XX(VIDCF_CRUNCH); - XX(VIDCF_TEMPORAL); - XX(VIDCF_COMPRESSFRAMES); - XX(VIDCF_DRAW); - XX(VIDCF_FASTTEMPORALC); - XX(VIDCF_FASTTEMPORALD); - XX(VIDCF_QUALITYTIME); -#undef XX - printf(")\n"); - printf("\tdwVersion: 0x%08x\n",ii.dwVersion); - printf("\tdwVersionICM: 0x%08x\n",ii.dwVersionICM); - w2s(ii.szDescription,buf); - printf("\tszDescription: %s\n",buf); + mywprintf(fcc_fmt, + LOBYTE(ii.fccType),LOBYTE(ii.fccType>>8),LOBYTE(ii.fccType>>16),LOBYTE(ii.fccType>>24), + LOBYTE(ii.fccHandler),LOBYTE(ii.fccHandler>>8),LOBYTE(ii.fccHandler>>16),LOBYTE(ii.fccHandler>>24), + ii.szName); + mywprintf(flags_fmt,ii.dwFlags); + + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); + if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); + if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(sspc_fmt, VIDCF_TEMPORAL_W); + if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(sspc_fmt, VIDCF_COMPRESSFRAMES_W); + if (ii.dwFlags & VIDCF_DRAW) mywprintf(sspc_fmt, VIDCF_DRAW_W); + if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALC_W); + if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALD_W); + if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(sspc_fmt, VIDCF_QUALITYTIME_W); + + mywprintf(s_fmt, close_flags); + mywprintf(version_fmt,ii.dwVersion); + mywprintf(versicm_fmt,ii.dwVersionICM); + mywprintf(desc_fmt,ii.szDescription); if (doabout) ICAbout(hic,0); if (doconfigure && ICQueryConfigure(hic)) ICConfigure(hic,0);

1 0

Alexandre Julliard : dpnet/tests: Fix another test failure on Windows.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 2d18d5feeb3affdab6575aafa20245beb2526748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d18d5feeb3affdab6575aafa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 17:19:51 2011 +0100 dpnet/tests: Fix another test failure on Windows. --- dlls/dpnet/tests/peer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 0deb988..fc22f66 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -130,8 +130,10 @@ static void test_get_sp_caps(void) hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); - ok(caps.dwFlags == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | - DPNSPCAPS_SUPPORTSTHREADPOOL), "unexpected flags %x\n", caps.dwFlags); + ok((caps.dwFlags & + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), + "unexpected flags %x\n", caps.dwFlags); ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval);

1 0

Henri Verbeet : wined3d: Avoid a drawable -> texture transfer through sysmem in arbfp_blit_surface() with backbuffer ORM.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 3bfecd58d282ac50463f659e427a2d3d86d12334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfecd58d282ac50463f659e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:24 2011 +0100 wined3d: Avoid a drawable -> texture transfer through sysmem in arbfp_blit_surface() with backbuffer ORM. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++++++++--- dlls/wined3d/surface.c | 26 +++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8fd0714..1573c17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7270,14 +7270,29 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win } HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { struct wined3d_context *context; + RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; /* Now load the surface */ - surface_internal_preload(src_surface, SRGB_RGB); + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + { + /* Without FBO blits transfering from the drawable to the texture is + * expensive, because we have to flip the data in sysmem. Since we can + * flip in the blitter, we don't actually need that flip anyway. So we + * use the surface's texture as scratch texture, and flip the source + * rectangle instead. */ + surface_load_fb_texture(src_surface, FALSE); + + src_rect.top = src_surface->resource.height - src_rect.top; + src_rect.bottom = src_surface->resource.height - src_rect.bottom; + } + else + surface_internal_preload(src_surface, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface); @@ -7291,7 +7306,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, ENTER_GL(); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, src_rect, &dst_rect, filter); + draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); LEAVE_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f75593d..6713f98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4310,25 +4310,14 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r } } -/* Read the framebuffer contents into a texture */ -static void read_from_framebuffer_texture(struct wined3d_surface *surface, BOOL srgb) +/* Read the framebuffer contents into a texture. Note that this function + * doesn't do any kind of flipping. Using this on an onscreen surface will + * result in a flipped D3D texture. */ +void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) { struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; - if (!surface_is_offscreen(surface)) - { - /* We would need to flip onscreen surfaces, but there's no efficient - * way to do that here. It makes more sense for the caller to - * explicitly go through sysmem. */ - ERR("Not supported for onscreen targets.\n"); - return; - } - - /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer - * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any - * states in the stateblock, and no driver was found yet that had bugs in that regard. - */ context = context_acquire(device, surface); device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -4339,7 +4328,10 @@ static void read_from_framebuffer_texture(struct wined3d_surface *surface, BOOL ENTER_GL(); - glReadBuffer(device->offscreenBuffer); + if (surface_is_offscreen(surface)) + glReadBuffer(device->offscreenBuffer); + else + glReadBuffer(surface_get_gl_buffer(surface)); checkGLcall("glReadBuffer"); glCopyTexSubImage2D(surface->texture_target, surface->texture_level, @@ -6037,7 +6029,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, && surface_is_offscreen(surface) && (surface->flags & SFLAG_INDRAWABLE)) { - read_from_framebuffer_texture(surface, srgb); + surface_load_fb_texture(surface, srgb); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90a70b4..4adfa83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2088,6 +2088,7 @@ BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, const RECT *rect) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Add fallbacks for d3d9 and d3d10 cards in select_card_amd_mesa().
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 739dbab46e1ce2b00b395a8430fc046b31b6c743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739dbab46e1ce2b00b395a843… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:25 2011 +0100 wined3d: Add fallbacks for d3d9 and d3d10 cards in select_card_amd_mesa(). --- dlls/wined3d/directx.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0fce621..2e63a1a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1932,6 +1932,9 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 10) + return CARD_AMD_RADEON_HD2600; + if (d3d_level >= 9) { static const struct @@ -1966,6 +1969,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info if (strstr(gl_renderer, cards[i].renderer)) return cards[i].id; } + + return CARD_AMD_RADEON_9500; } if (d3d_level >= 8)

1 0

Henri Verbeet : wined3d: Merge surface_getdc() and gdi_surface_getdc().
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 3f11631e75442320da1b64b26b6dd15fd8147579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f11631e75442320da1b64b26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:26 2011 +0100 wined3d: Merge surface_getdc() and gdi_surface_getdc(). --- dlls/wined3d/surface.c | 90 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 28 insertions(+), 63 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6713f98..5568695 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1029,43 +1029,6 @@ done: surface->surface_ops->surface_draw_overlay(surface); } -static HRESULT surface_getdc(struct wined3d_surface *surface) -{ - WINED3DLOCKED_RECT lock; - HRESULT hr; - - TRACE("surface %p.\n", surface); - - /* Create a DIB section if there isn't a dc yet. */ - if (!surface->hDC) - { - if (surface->flags & SFLAG_CLIENT) - { - surface_load_location(surface, SFLAG_INSYSMEM, NULL); - surface_release_client_storage(surface); - } - hr = surface_create_dib_section(surface); - if (FAILED(hr)) - return WINED3DERR_INVALIDCALL; - - /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & SFLAG_PBO)) - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - - /* Map the surface. */ - hr = wined3d_surface_map(surface, &lock, NULL, 0); - if (FAILED(hr)) - ERR("Map failed, hr %#x.\n", hr); - - /* Sync the DIB with the PBO. This can't be done earlier because Map() - * activates the allocatedMemory. */ - if (surface->flags & SFLAG_PBO) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); - - return hr; -} - static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) @@ -1956,7 +1919,6 @@ static const struct wined3d_surface_ops surface_ops = surface_preload, surface_map, surface_unmap, - surface_getdc, }; /***************************************************************************** @@ -2085,28 +2047,6 @@ static void gdi_surface_unmap(struct wined3d_surface *surface) memset(&surface->lockedRect, 0, sizeof(RECT)); } -static HRESULT gdi_surface_getdc(struct wined3d_surface *surface) -{ - WINED3DLOCKED_RECT lock; - HRESULT hr; - - TRACE("surface %p.\n", surface); - - /* Should have a DIB section already. */ - if (!(surface->flags & SFLAG_DIBSECTION)) - { - WARN("DC not supported on this surface\n"); - return WINED3DERR_INVALIDCALL; - } - - /* Map the surface. */ - hr = wined3d_surface_map(surface, &lock, NULL, 0); - if (FAILED(hr)) - ERR("Map failed, hr %#x.\n", hr); - - return hr; -} - static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, @@ -2115,7 +2055,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_preload, gdi_surface_map, gdi_surface_unmap, - gdi_surface_getdc, }; void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, BOOL srgb) @@ -3862,6 +3801,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { + WINED3DLOCKED_RECT lock; HRESULT hr; TRACE("surface %p, dc %p.\n", surface, dc); @@ -3880,9 +3820,35 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (surface->flags & SFLAG_LOCKED) return WINED3DERR_INVALIDCALL; - hr = surface->surface_ops->surface_getdc(surface); + /* Create a DIB section if there isn't a dc yet. */ + if (!surface->hDC) + { + if (surface->flags & SFLAG_CLIENT) + { + surface_load_location(surface, SFLAG_INSYSMEM, NULL); + surface_release_client_storage(surface); + } + hr = surface_create_dib_section(surface); + if (FAILED(hr)) + return WINED3DERR_INVALIDCALL; + + /* Use the DIB section from now on if we are not using a PBO. */ + if (!(surface->flags & SFLAG_PBO)) + surface->resource.allocatedMemory = surface->dib.bitmap_data; + } + + /* Map the surface. */ + hr = wined3d_surface_map(surface, &lock, NULL, 0); if (FAILED(hr)) + { + ERR("Map failed, hr %#x.\n", hr); return hr; + } + + /* Sync the DIB with the PBO. This can't be done earlier because Map() + * activates the allocatedMemory. */ + if (surface->flags & SFLAG_PBO) + memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4adfa83..098d03a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2004,7 +2004,6 @@ struct wined3d_surface_ops void (*surface_preload)(struct wined3d_surface *surface); void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); - HRESULT (*surface_getdc)(struct wined3d_surface *surface); }; struct wined3d_surface

1 0

Henri Verbeet : wined3d: Make some parameters to shader_generate_arb_declarations() const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: e71830625533fef913a8a50cb06f447abc25b4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71830625533fef913a8a50cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:27 2011 +0100 wined3d: Make some parameters to shader_generate_arb_declarations() const. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1573c17..a53f04a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -725,10 +725,10 @@ static DWORD *local_const_mapping(const struct wined3d_shader *shader) } /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(struct wined3d_shader *shader, +static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, - const struct wined3d_gl_info *gl_info, DWORD *lconst_map, - DWORD *num_clipplanes, struct shader_arb_ctx_priv *ctx) + const struct wined3d_gl_info *gl_info, const DWORD *lconst_map, + DWORD *num_clipplanes, const struct shader_arb_ctx_priv *ctx) { DWORD i, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type);

1 0

Henri Verbeet : wined3d: Make the shader parameter to init_output_registers () const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 3a9001fbb63491c3386504315706a9341530855e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9001fbb63491c3386504315… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:28 2011 +0100 wined3d: Make the shader parameter to init_output_registers() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a53f04a..ea404cb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3927,7 +3927,7 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win return found_sig->idx; } -static void init_output_registers(struct wined3d_shader *shader, DWORD sig_num, +static void init_output_registers(const struct wined3d_shader *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx, struct arb_vs_compiled_shader *compiled) { unsigned int i, j;

1 0