October 2007 - Wine-Commits

Francois Gouget : shell32: Pass the shutdown reason to ExitWindowsEx().
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 9e82e46a8470762d393fd824ccc80bcedcfe6160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e82e46a8470762d393fd824c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:35:51 2007 +0200 shell32: Pass the shutdown reason to ExitWindowsEx(). --- dlls/shell32/dialogs.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index eb5c1a1..76c3d6e 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -384,8 +384,7 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D { TRACE("(%p)\n", hWndOwner); - /*FIXME: use uReason */ - + /* FIXME: use lpwstrReason */ if (ConfirmDialog(hWndOwner, IDS_RESTART_PROMPT, IDS_RESTART_TITLE)) { HANDLE hToken; @@ -400,7 +399,7 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); CloseHandle(hToken); } - ExitWindowsEx(EWX_REBOOT, 0); + ExitWindowsEx(EWX_REBOOT, uReason); } return 0;

1 0

Francois Gouget : wineboot: Make sure 'Cancel' has the focus and is the default button in the ' Do you want to kill all your applications' dialog.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 7afe1d23e274d0e7dc93ffe79d887d71422937ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afe1d23e274d0e7dc93ffe79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 28 02:38:21 2007 +0200 wineboot: Make sure 'Cancel' has the focus and is the default button in the 'Do you want to kill all your applications' dialog. --- programs/wineboot/wineboot_En.rc | 4 ++-- programs/wineboot/wineboot_Ko.rc | 4 ++-- programs/wineboot/wineboot_Sv.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/wineboot/wineboot_En.rc b/programs/wineboot/wineboot_En.rc index 45abe9c..7a3fa2a 100644 --- a/programs/wineboot/wineboot_En.rc +++ b/programs/wineboot/wineboot_En.rc @@ -26,8 +26,8 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Waiting for Program" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Terminate Process",IDOK,51,49,71,15 - PUSHBUTTON "Cancel",IDCANCEL,129,49,50,15 + DEFPUSHBUTTON "Cancel",IDCANCEL,129,49,50,15 + PUSHBUTTON "Terminate Process",IDOK,51,49,71,15 LTEXT "A simulated log-off or shutdown is in progress, but this program isn't responding.", IDC_STATIC,7,7,172,19 LTEXT "If you terminate the process you may lose all unsaved data.", diff --git a/programs/wineboot/wineboot_Ko.rc b/programs/wineboot/wineboot_Ko.rc index 869a6af..d39f873 100644 --- a/programs/wineboot/wineboot_Ko.rc +++ b/programs/wineboot/wineboot_Ko.rc @@ -28,8 +28,8 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "��α׷� ��" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "��μ�� ",IDOK,51,49,71,15 - PUSHBUTTON "��",IDCANCEL,129,49,50,15 + DEFPUSHBUTTON "��",IDCANCEL,129,49,50,15 + PUSHBUTTON "��μ�� ",IDOK,51,49,71,15 LTEXT " �� μ�� α� �� Ḧ �õ��, �� α׷�� ƹ�� ϴ�.", IDC_STATIC,7,7,172,19 LTEXT "�� μ�� ٸ� �� ͸� �Ҿ�� Դϴ�.", diff --git a/programs/wineboot/wineboot_Sv.rc b/programs/wineboot/wineboot_Sv.rc index eb60450..6727c01 100644 --- a/programs/wineboot/wineboot_Sv.rc +++ b/programs/wineboot/wineboot_Sv.rc @@ -26,8 +26,8 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "V�ntar p� program" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Avsluta process",IDOK,51,49,71,15 - PUSHBUTTON "Avbryt",IDCANCEL,129,49,50,15 + DEFPUSHBUTTON "Avbryt",IDCANCEL,129,49,50,15 + PUSHBUTTON "Avsluta process",IDOK,51,49,71,15 LTEXT "En simulerad avloggning eller avst�ngning p�g�r, men det h�r programmet svarar inte.", IDC_STATIC,7,7,172,19 LTEXT "Om du avslutar processen kan du f�rlora allt osparat data.",

1 0

Stefan Dösinger : wined3d: Honor pbos when downloading a compressed texture.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 58ed14eb52392ee8902863e020d030b9e1bb460b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ed14eb52392ee8902863e02… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 28 14:39:24 2007 +0200 wined3d: Honor pbos when downloading a compressed texture. --- dlls/wined3d/surface.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06d5aa6..43cf3a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,8 +47,17 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", This, This->glDescription.level, This->glDescription.glFormat, This->glDescription.glType, This->resource.allocatedMemory); - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); - checkGLcall("glGetCompressedTexImageARB()"); + if(This->Flags & SFLAG_PBO) { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); + checkGLcall("glGetCompressedTexImageARB()"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); + } else { + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); + checkGLcall("glGetCompressedTexImageARB()"); + } } } else { void *mem;

1 0

Francois Gouget : wineboot: Add a reminder that EWX_FORCEIFHUNG is not implemented.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: bbf17b0a86b70fd7eed22eaaa374b052e46d4d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf17b0a86b70fd7eed22eaaa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:40:06 2007 +0200 wineboot: Add a reminder that EWX_FORCEIFHUNG is not implemented. --- programs/wineboot/shutdown.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index b3825e8..b9705d8 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -249,6 +249,7 @@ static DWORD_PTR send_end_session_messages( struct window_info *win, UINT count, HANDLE process_handle; DWORD ret; + /* FIXME: Use flags to implement EWX_FORCEIFHUNG! */ /* don't kill the desktop process */ if (win[0].pid == desktop_pid) return 1;

1 0

Stefan Dösinger : wined3d: Move texture loading to LoadLocation.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: f6637cae983323eb60d989e5d144b15f1fee2846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6637cae983323eb60d989e5d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 12:54:10 2007 +0200 wined3d: Move texture loading to LoadLocation. --- dlls/wined3d/surface.c | 254 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 129 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6637cae983323eb60d98…

1 0

Dan Hipschman : widl: Fix ExprEvalRoutines output.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 70e12b31b8d4976fe4cdfc2dd74329e86d1a8170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e12b31b8d4976fe4cdfc2dd… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Oct 26 15:33:13 2007 -0700 widl: Fix ExprEvalRoutines output. --- tools/widl/client.c | 12 +++++------- tools/widl/proxy.c | 10 +++++++--- tools/widl/server.c | 13 +++++-------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 2d48d7a..696dd83 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -386,6 +386,7 @@ static void init_client(void) void write_client(ifref_list_t *ifaces) { unsigned int proc_offset = 0; + int expr_eval_routines; ifref_t *iface; if (!do_client) @@ -398,6 +399,10 @@ void write_client(ifref_list_t *ifaces) return; write_formatstringsdecl(client, indent, ifaces, need_stub); + expr_eval_routines = write_expr_eval_routines(client, client_token); + if (expr_eval_routines) + write_expr_eval_routine_list(client, client_token); + write_user_quad_list(client); if (ifaces) LIST_FOR_EACH_ENTRY( iface, ifaces, ifref_t, entry ) { @@ -411,8 +416,6 @@ void write_client(ifref_list_t *ifaces) if (iface->iface->funcs) { - int expr_eval_routines; - write_implicithandledecl(iface->iface); write_clientinterfacedecl(iface->iface); @@ -424,11 +427,6 @@ void write_client(ifref_list_t *ifaces) print_client("#endif\n"); fprintf(client, "\n"); - - expr_eval_routines = write_expr_eval_routines(client, iface->iface->name); - if (expr_eval_routines) - write_expr_eval_routine_list(client, iface->iface->name); - write_user_quad_list(client); write_stubdescriptor(iface->iface, expr_eval_routines); } } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3c8d6ef..aa9fe11 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -65,14 +65,14 @@ static void write_stubdescproto(void) print_proxy( "\n"); } -static void write_stubdesc(void) +static void write_stubdesc(int expr_eval_routines) { print_proxy( "static const MIDL_STUB_DESC Object_StubDesc =\n{\n"); indent++; print_proxy( "0,\n"); print_proxy( "NdrOleAllocate,\n"); print_proxy( "NdrOleFree,\n"); - print_proxy( "{0}, 0, 0, 0, 0,\n"); + print_proxy( "{0}, 0, 0, %s, 0,\n", expr_eval_routines ? "ExprEvalRoutines" : "0"); print_proxy( "__MIDL_TypeFormatString.Format,\n"); print_proxy( "1, /* -error bounds_check flag */\n"); print_proxy( "0x10001, /* Ndr library version */\n"); @@ -598,6 +598,7 @@ int need_stub_files(const ifref_list_t *ifaces) void write_proxies(ifref_list_t *ifaces) { ifref_t *cur; + int expr_eval_routines; char *file_id = proxy_token; int c; unsigned int proc_offset = 0; @@ -613,8 +614,11 @@ void write_proxies(ifref_list_t *ifaces) if (need_proxy(cur->iface)) write_proxy(cur->iface, &proc_offset); + expr_eval_routines = write_expr_eval_routines(proxy, proxy_token); + if (expr_eval_routines) + write_expr_eval_routine_list(proxy, proxy_token); write_user_quad_list(proxy); - write_stubdesc(); + write_stubdesc(expr_eval_routines); print_proxy( "#if !defined(__RPC_WIN32__)\n"); print_proxy( "#error Currently only Wine and WIN32 are supported.\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 49ceb69..a52c729 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -399,6 +399,7 @@ static void init_server(void) void write_server(ifref_list_t *ifaces) { unsigned int proc_offset = 0; + int expr_eval_routines; ifref_t *iface; if (!do_server) @@ -411,6 +412,10 @@ void write_server(ifref_list_t *ifaces) return; write_formatstringsdecl(server, indent, ifaces, need_stub); + expr_eval_routines = write_expr_eval_routines(server, server_token); + if (expr_eval_routines) + write_expr_eval_routine_list(server, server_token); + write_user_quad_list(server); if (ifaces) LIST_FOR_EACH_ENTRY( iface, ifaces, ifref_t, entry ) { @@ -424,8 +429,6 @@ void write_server(ifref_list_t *ifaces) if (iface->iface->funcs) { - int expr_eval_routines; - write_serverinterfacedecl(iface->iface); write_stubdescdecl(iface->iface); @@ -436,12 +439,6 @@ void write_server(ifref_list_t *ifaces) print_server("#endif\n"); fprintf(server, "\n"); - - expr_eval_routines = write_expr_eval_routines(server, iface->iface->name); - if (expr_eval_routines) - write_expr_eval_routine_list(server, iface->iface->name); - - write_user_quad_list(server); write_stubdescriptor(iface->iface, expr_eval_routines); write_dispatchtable(iface->iface); }

1 0

Stefan Dösinger : wined3d: Add a comment explaining what LoadLocation does.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: dc1848bd223066e07ac374ac0883d06718c5f3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1848bd223066e07ac374ac0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 25 00:22:53 2007 +0200 wined3d: Add a comment explaining what LoadLocation does. --- dlls/wined3d/surface.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d7b2a16..20e95aa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3502,6 +3502,27 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW } } +/***************************************************************************** + * IWineD3DSurface::LoadLocation + * + * Copies the current surface data from wherever it is to the requested + * location. The location is one of the surface flags, SFLAG_INSYSMEM, + * SFLAG_INTEXTURE and SFLAG_INDRAWABLE. When the surface is current in + * multiple locations, the gl texture is prefered over the drawable, which is + * prefered over system memory. The PBO counts as system memory. If rect is + * not NULL, only the specified rectangle is copied(only supported for + * sysmem<->drawable copies at the moment). If rect is NULL, the destination + * location is marked up to date after the copy. + * + * Parameters: + * flag: Surface location flag to be updated + * rect: rectangle to be copied + * + * Returns: + * WINED3D_OK on success + * WINED3DERR_DEVICELOST on an internal error + * + *****************************************************************************/ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *myDevice;

1 0

Stefan Dösinger : wined3d: Move sysmem-> drawable copying to LoadLocation.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 2a859706317078264fd926a0e884563dddb1bbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a859706317078264fd926a0e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 21 19:55:06 2007 +0200 wined3d: Move sysmem->drawable copying to LoadLocation. --- dlls/wined3d/surface.c | 138 ++++++++++++++++++++---------------------------- 1 files changed, 58 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20e95aa..ff821e0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1072,57 +1072,11 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { return; } -static void flush_to_framebuffer_texture(IWineD3DSurfaceImpl *This) { - float glTexCoord[4]; - - glTexCoord[0] = (float) This->lockedRect.left / (float) This->pow2Width; /* left */ - glTexCoord[1] = (float) This->lockedRect.right / (float) This->pow2Width; /* right */ - glTexCoord[2] = (float) This->lockedRect.top / (float) This->pow2Height; /* top */ - glTexCoord[3] = (float) This->lockedRect.bottom / (float) This->pow2Height; /* bottom */ - - IWineD3DSurface_PreLoad((IWineD3DSurface *) This); - - ENTER_GL(); - - glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); - checkGLcall("glEnable glBindTexture"); - - /* No filtering for blts */ - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - - /* Start drawing a quad */ - glBegin(GL_QUADS); - - glColor3d(1.0f, 1.0f, 1.0f); - glTexCoord2f(glTexCoord[0], glTexCoord[2]); - glVertex3f(This->lockedRect.left, This->lockedRect.top, 0.0); - - glTexCoord2f(glTexCoord[0], glTexCoord[3]); - glVertex3f(This->lockedRect.left, This->lockedRect.bottom, 0.0); - - glTexCoord2f(glTexCoord[1], glTexCoord[3]); - glVertex3d(This->lockedRect.right, This->lockedRect.bottom, 0.0); - - glTexCoord2f(glTexCoord[1], glTexCoord[2]); - glVertex3f(This->lockedRect.right, This->lockedRect.top, 0.0); - - glEnd(); - checkGLcall("glEnd"); - - /* Unbind the texture */ - glBindTexture(GL_TEXTURE_2D, 0); - checkGLcall("glEnable glBindTexture"); - - LEAVE_GL(); -} - static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; IWineD3DSwapChainImpl *swapchain = NULL; + BOOL fullsurface; if (!(This->Flags & SFLAG_LOCKED)) { WARN("trying to Unlock an unlocked surf@%p\n", This); @@ -1160,53 +1114,47 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { goto unlock_end; } - /* Activate the correct context for the render target */ - ActivateContext(myDevice, iface, CTXUSAGE_BLIT); - ENTER_GL(); - - if(!swapchain) { - /* Primary offscreen render target */ - TRACE("Offscreen render target\n"); - glDrawBuffer(myDevice->offscreenBuffer); - checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); + if(This->dirtyRect.left == 0 && + This->dirtyRect.top == 0 && + This->dirtyRect.right == This->currentDesc.Width && + This->dirtyRect.bottom == This->currentDesc.Height) { + fullsurface = TRUE; } else { - GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); - TRACE("Unlocking %#x buffer\n", buffer); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer"); - - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + /* TODO: Proper partial rectangle tracking */ + fullsurface = FALSE; + This->Flags |= SFLAG_INSYSMEM; } switch(wined3d_settings.rendertargetlock_mode) { + case RTL_READTEX: + case RTL_TEXTEX: + /* drop through */ + FIXME("Render target unlocking using textures temporarily disabled\n"); +#if 0 + IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); +#endif case RTL_AUTO: case RTL_READDRAW: case RTL_TEXDRAW: - flush_to_framebuffer_drawpixels(This); - break; - - case RTL_READTEX: - case RTL_TEXTEX: - flush_to_framebuffer_texture(This); + IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); break; } - if(!swapchain) { - glDrawBuffer(myDevice->offscreenBuffer); - checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); - } else if(swapchain->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } else { - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer(GL_FRONT)"); + + if(!fullsurface) { + /* Partial rectangle tracking is not commonly implemented, it is only done for render targets. Overwrite + * the flags to bring them back into a sane state. INSYSMEM was set before to tell LoadLocation where + * to read the rectangle from. Indrawable is set because all modifications from the partial sysmem copy + * are written back to the drawable, thus the surface is merged again in the drawable. The sysmem copy is + * not fully up to date because only a subrectangle was read in LockRect. + */ + This->Flags &= ~SFLAG_INSYSMEM; + This->Flags |= SFLAG_INDRAWABLE; } - LEAVE_GL(); This->dirtyRect.left = This->currentDesc.Width; This->dirtyRect.top = This->currentDesc.Height; This->dirtyRect.right = 0; This->dirtyRect.bottom = 0; - This->Flags |= SFLAG_INDRAWABLE; } else if(iface == myDevice->stencilBufferTarget) { FIXME("Depth Stencil buffer locking is not implemented\n"); } else { @@ -3632,7 +3580,37 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D if(This->Flags & SFLAG_INTEXTURE) { /* Blit texture to drawable */ } else { - /* Load drawable from sysmem */ + /* Activate the correct context for the render target */ + ActivateContext(myDevice, iface, CTXUSAGE_BLIT); + ENTER_GL(); + + IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); + if(!swapchain) { + /* Primary offscreen render target */ + TRACE("Offscreen render target\n"); + glDrawBuffer(myDevice->offscreenBuffer); + checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); + } else { + GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); + TRACE("Unlocking %#x buffer\n", buffer); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer"); + + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + } + + flush_to_framebuffer_drawpixels(This); + if(!swapchain) { + glDrawBuffer(myDevice->offscreenBuffer); + checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); + } else if(swapchain->backBuffer) { + glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer(GL_BACK)"); + } else { + glDrawBuffer(GL_FRONT); + checkGLcall("glDrawBuffer(GL_FRONT)"); + } + LEAVE_GL(); } } else /* if(flag == SFLAG_INTEXTURE) */ { if(This->Flags & SFLAG_INDRAWABLE) {

1 0

Stefan Dösinger : wined3d: Move drawable-> sysmem reading to UpdateLocation.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 34d6b38397285788895d7f74be8c8f04b96810a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d6b38397285788895d7f74b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 25 00:21:34 2007 +0200 wined3d: Move drawable->sysmem reading to UpdateLocation. --- dlls/wined3d/surface.c | 140 +++++++++++++++++++++++++++++------------------ 1 files changed, 86 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4f891c8..d7b2a16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -624,7 +624,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - IWineD3DSwapChainImpl *swapchain = NULL; + IWineD3DSwapChain *swapchain = NULL; TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); @@ -734,70 +734,41 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED */ IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); if(swapchain || iface == myDevice->render_targets[0]) { - BOOL srcIsUpsideDown; + RECT *read_rect; - if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { - static BOOL warned = FALSE; - if(!warned) { - ERR("The application tries to lock the render target, but render target locking is disabled\n"); - warned = TRUE; - } - if(swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - return WINED3D_OK; - } - - /* Activate the surface. Set it up for blitting now, although not necessarily needed for LockRect. - * Certain graphics drivers seem to dislike some enabled states when reading from opengl, the blitting usage - * should help here. Furthermore unlockrect will need the context set up for blitting. The context manager will find - * context->last_was_blit set on the unlock. - */ - ActivateContext(myDevice, iface, CTXUSAGE_BLIT); - ENTER_GL(); - - /* Select the correct read buffer, and give some debug output. - * There is no need to keep track of the current read buffer or reset it, every part of the code - * that reads sets the read buffer as desired. - */ - if(!swapchain) { - /* Locking the primary render target which is not on a swapchain(=offscreen render target). - * Read from the back buffer - */ - TRACE("Locking offscreen render target\n"); - glReadBuffer(myDevice->offscreenBuffer); - srcIsUpsideDown = TRUE; + if(This->lockedRect.left == 0 && + This->lockedRect.top == 0 && + This->lockedRect.right == This->currentDesc.Width && + This->lockedRect.bottom == This->currentDesc.Height) { + read_rect = NULL; } else { - GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); - TRACE("Locking %#x buffer\n", buffer); - glReadBuffer(buffer); - checkGLcall("glReadBuffer"); - - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - srcIsUpsideDown = FALSE; + read_rect = &This->lockedRect; } switch(wined3d_settings.rendertargetlock_mode) { + case RTL_TEXDRAW: + case RTL_TEXTEX: + FIXME("Reading from render target with a texture isn't implemented yet, falling back to framebuffer reading\n"); +#if 0 + /* Disabled for now. LoadLocation prefers the texture over the drawable as the source. So if we copy to the + * texture first, then to sysmem, we'll avoid glReadPixels and use glCopyTexImage and glGetTexImage2D instead. + * This may be faster on some cards + */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* No partial texture copy yet */); +#endif + /* drop through */ + case RTL_AUTO: case RTL_READDRAW: case RTL_READTEX: - read_from_framebuffer(This, &This->lockedRect, This->resource.allocatedMemory, pLockedRect->Pitch, srcIsUpsideDown); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, read_rect); break; - case RTL_TEXDRAW: - case RTL_TEXTEX: - read_from_framebuffer(This, &This->lockedRect, This->resource.allocatedMemory, pLockedRect->Pitch, srcIsUpsideDown); - FIXME("Reading from render target with a texture isn't implemented yet, falling back to framebuffer reading\n"); + case RTL_DISABLE: break; } + if(swapchain) IWineD3DSwapChain_Release(swapchain); - LEAVE_GL(); - - /* Mark the local copy up to date if a full download was done */ - if(This->lockedRect.left == 0 && - This->lockedRect.top == 0 && - This->lockedRect.right == This->currentDesc.Width && - This->lockedRect.bottom == This->currentDesc.Height) { - This->Flags |= SFLAG_INSYSMEM; - } } else if(iface == myDevice->stencilBufferTarget) { /** the depth stencil in openGL has a format of GL_FLOAT * which should be good for WINED3DFMT_D16_LOCKABLE @@ -3534,6 +3505,9 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *myDevice; + IWineD3DSwapChainImpl *swapchain; + BOOL srcIsUpsideDown; + RECT local_rect; TRACE("(%p)->(%s, %p)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", @@ -3567,7 +3541,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } ENTER_GL(); - /* Make sure that a proper texture unit is selected, bind the texture and dirtify the sampler to restore the texture on the next draw */ + /* Make sure that a proper texture unit is selected, bind the texture + * and dirtify the sampler to restore the texture on the next draw + */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); @@ -3578,7 +3554,58 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D surface_download_data(This); LEAVE_GL(); } else { - /* Download drawable to sysmem */ + if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { + static BOOL warned = FALSE; + if(!warned) { + ERR("The application tries to lock the render target, but render target locking is disabled\n"); + warned = TRUE; + } + goto load_end; + } + + IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); + /* Activate the surface. Set it up for blitting now, although not necessarily needed for LockRect. + * Certain graphics drivers seem to dislike some enabled states when reading from opengl, the blitting usage + * should help here. Furthermore unlockrect will need the context set up for blitting. The context manager will find + * context->last_was_blit set on the unlock. + */ + ActivateContext(myDevice, iface, CTXUSAGE_BLIT); + ENTER_GL(); + + /* Select the correct read buffer, and give some debug output. + * There is no need to keep track of the current read buffer or reset it, every part of the code + * that reads sets the read buffer as desired. + */ + if(!swapchain) { + /* Locking the primary render target which is not on a swapchain(=offscreen render target). + * Read from the back buffer + */ + TRACE("Locking offscreen render target\n"); + glReadBuffer(myDevice->offscreenBuffer); + srcIsUpsideDown = TRUE; + } else { + GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); + TRACE("Locking %#x buffer\n", buffer); + glReadBuffer(buffer); + checkGLcall("glReadBuffer"); + + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + srcIsUpsideDown = FALSE; + } + + /* TODO: Get rid of the extra rectangle comparison and construction of a full surface rectangle */ + if(!rect) { + local_rect.left = 0; + local_rect.top = 0; + local_rect.right = This->currentDesc.Width; + local_rect.bottom = This->currentDesc.Height; + } + /* TODO: Get rid of the extra GetPitch call, LockRect does that too. Cache the pitch */ + read_from_framebuffer(This, rect ? rect : &local_rect, + This->resource.allocatedMemory, + IWineD3DSurface_GetPitch(iface), + srcIsUpsideDown); + LEAVE_GL(); } } else if(flag == SFLAG_INDRAWABLE) { if(This->Flags & SFLAG_INTEXTURE) { @@ -3594,6 +3621,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } } + load_end: + if(rect == NULL) { + This->Flags |= flag; + } + return WINED3D_OK; }

1 0

Mikolaj Zalewski : msvcrt/tests: Loosen the mbctype test to pass under Windows 9x and NT 4.0.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 1f632a29ce221a476655ee605d3340f046efd375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f632a29ce221a476655ee605… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Oct 26 13:50:37 2007 -0700 msvcrt/tests: Loosen the mbctype test to pass under Windows 9x and NT 4.0. --- dlls/msvcrt/tests/string.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 66b018a..876415c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -127,14 +127,6 @@ static void test_codepage(int cp) #else /* RLE-encoded mbctype tables for given codepages */ -static int result_cp_1252_mbctype[] = { 0x0,66, 0x10,26, 0x0,6, 0x20,26, 0x0,8, 0x20,1, - 0x0,6, 0x10,1, 0x0,1, 0x10,1, 0x0,1, 0x10,1, 0x0,11, 0x20,1, 0x0,1, 0x20,1, 0x0,1, - 0x20,1, 0x10,1, 0x0,10, 0x20,1, 0x0,10, 0x20,1, 0x0,4, 0x20,1, 0x0,5, 0x10,23, 0x0,1, - 0x10,7, 0x20,24, 0x0,1, 32,8 }; -static int result_cp_1250_mbctype[] = { 0x0,66, 0x10,26, 0x0,6, 0x20,26, 0x0,15, 0x10,1, - 0x0,1, 0x10,4, 0x0,10, 0x20,1, 0x0,1, 0x20,4, 0x0,3, 0x10,1, 0x0,1, 0x10,1, 0x0,4, - 0x10,1, 0x0,4, 0x10,1, 0x0,3, 0x20,1, 0x0,1, 0x20,1, 0x0,3, 0x20,2, 0x0,1, 0x10,1, - 0x0,1, 0x20,2, 0x10,23, 0x0,1, 0x10,7, 0x20,24, 0x0,1, 0x20,7, 0,1 }; static int result_cp_932_mbctype[] = { 0x0,65, 0x8,1, 0x18,26, 0x8,6, 0x28,26, 0x8,4, 0x0,1, 0x8,1, 0xc,31, 0x8,1, 0xa,5, 0x9,58, 0xc,29, 0,3 }; static int result_cp_936_mbctype[] = { 0x0,65, 0x8,1, 0x18,26, 0x8,6, 0x28,26, 0x8,6, @@ -187,9 +179,24 @@ static void test_mbcp(void) unsigned char buf[16]; int step; - /* some two single-byte code pages*/ - test_codepage(1252); - test_codepage(1250); + /* _mbtype tests */ + + /* An SBCS codepage test. The ctype of characters on e.g. CP1252 or CP1250 differs slightly + * between versions of Windows. Also Windows 9x seems to ignore the codepage and always uses + * CP1252 (or the ACP?) so we test only a few ASCII characters */ + _setmbcp(1252); + expect_eq(_mbctype[10], 0, char, "%x"); + expect_eq(_mbctype[50], 0, char, "%x"); + expect_eq(_mbctype[66], _SBUP, char, "%x"); + expect_eq(_mbctype[100], _SBLOW, char, "%x"); + expect_eq(_mbctype[128], 0, char, "%x"); + _setmbcp(1250); + expect_eq(_mbctype[10], 0, char, "%x"); + expect_eq(_mbctype[50], 0, char, "%x"); + expect_eq(_mbctype[66], _SBUP, char, "%x"); + expect_eq(_mbctype[100], _SBLOW, char, "%x"); + expect_eq(_mbctype[128], 0, char, "%x"); + /* double byte code pages */ test_codepage_todo(932, todo_cp_932); test_codepage(936);

1 0