July 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : services.exe: Pass the service name as first argument when auto-starting services.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 7e8ecd2d6437c0ed2ee83fc2b63b77c950a27c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ecd2d6437c0ed2ee83fc2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 2 12:02:11 2008 +0200 services.exe: Pass the service name as first argument when auto-starting services. --- programs/services/services.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 806fbb6..36ed117 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -256,8 +256,11 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) for (i = 0; i < size; i++) { DWORD err; + const WCHAR *argv[2]; service = services_list[i]; - err = service_start(service, 0, NULL); + argv[0] = service->name; + argv[1] = NULL; + err = service_start(service, 1, argv); /* FIXME: do something if the service failed to start */ release_service(service); }

1 0

Detlef Riekenberg : spoolss: Implement InitializeRouter.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 76204941b815a8095f8d99bdca4862faec6a1fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76204941b815a8095f8d99bdc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 2 00:16:46 2008 +0200 spoolss: Implement InitializeRouter. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 5645b2e..da5ee04 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -73,7 +73,7 @@ @ stub GetPrinterDriverW @ stub GetPrinterW @ stdcall ImpersonatePrinterClient(long) -@ stub InitializeRouter +@ stdcall InitializeRouter() @ stdcall IsLocalCall() @ stub IsNamedPipeRpcCall @ stub LoadDriver diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index c701c0d..cc4487c 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -23,16 +23,104 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" + +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(spoolss); /* ################################ */ +static CRITICAL_SECTION backend_cs; +static CRITICAL_SECTION_DEBUG backend_cs_debug = +{ + 0, 0, &backend_cs, + { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") } +}; +static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; + +/* ################################ */ + static HMODULE hwinspool; +static HMODULE hlocalspl; +static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); + +static PRINTPROVIDOR * backend; + +/* ################################ */ + +static const WCHAR localspldllW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; +/****************************************************************************** + * backend_load [internal] + * + * load and init our backend (the local printprovider: "localspl.dll") + * + * PARAMS + * + * RETURNS + * Success: TRUE + * Failure: FALSE and RPC_S_SERVER_UNAVAILABLE + * + * NOTES + * In windows, the spooler router (spoolss.dll) support multiple + * printprovider (localspl.dll for the local system) + * + */ +static BOOL backend_load(void) +{ + static PRINTPROVIDOR mybackend; + DWORD res; + + if (backend) return TRUE; + + EnterCriticalSection(&backend_cs); + hlocalspl = LoadLibraryW(localspldllW); + if (hlocalspl) { + pInitializePrintProvidor = (void *) GetProcAddress(hlocalspl, "InitializePrintProvidor"); + if (pInitializePrintProvidor) { + + /* native localspl does not clear unused entries */ + memset(&mybackend, 0, sizeof(mybackend)); + res = pInitializePrintProvidor(&mybackend, sizeof(mybackend), NULL); + if (res) { + backend = &mybackend; + LeaveCriticalSection(&backend_cs); + TRACE("backend: %p (%p)\n", backend, hlocalspl); + return TRUE; + } + } + FreeLibrary(hlocalspl); + } + + LeaveCriticalSection(&backend_cs); + + WARN("failed to load the backend: %u\n", GetLastError()); + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; +} + /****************************************************************** + * unload_backend [internal] + * + */ +static void backend_unload(void) +{ + EnterCriticalSection(&backend_cs); + if (backend) { + backend = NULL; + FreeLibrary(hlocalspl); + } + LeaveCriticalSection(&backend_cs); +} + +/****************************************************************************** * */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -45,6 +133,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); break; + + case DLL_PROCESS_DETACH: + backend_unload(); + break; } } return TRUE; @@ -170,6 +262,15 @@ BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) } /****************************************************************** + * InitializeRouter [SPOOLSS.@] + */ +BOOL WINAPI InitializeRouter(void) +{ + TRACE("()\n"); + return backend_load(); +} + +/****************************************************************** * IsLocalCall [SPOOLSS.@] */ BOOL WINAPI IsLocalCall(void)

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d0add535440fac5249b355c09781b8239a30ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0add535440fac5249b355c09… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 2 10:13:32 2008 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 0379926..04f4af0 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -153,20 +153,22 @@ FONT 10, "MS Shell Dlg" LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } + SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" { -ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE -LTEXT "Ǯ�׸�,��,�� ͳ� �ڿ�, �׸�� Wine�� ̸�� ּ��.", 12289, 36, 11, 182, 18 -LTEXT "��(&O):", 12305, 7, 39, 24, 10 -CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 -DEFPUSHBUTTON "Ȯ��", IDOK, 62, 63, 50, 14, WS_TABSTOP -PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP -PUSHBUTTON "ã��(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Ǯ�׸�,��,�� ͳ� �ڿ�, �׸�� Wine�� ̸�� ּ��.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "��(&O):", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + DEFPUSHBUTTON "Ȯ��", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "ã��(&B)...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP } + STRINGTABLE { /* columns in the shellview */ @@ -222,6 +224,12 @@ IDS_RESTART_PROMPT " IDS_SHUTDOWN_TITLE "��" IDS_SHUTDOWN_PROMPT "�� Wine �� ڽ��ϱ�?" +/* Run File dialog */ +IDS_RUNDLG_ERROR "�� ȭ ��ڸ� ��ټ� ��ϴ�(�� )" +IDS_RUNDLG_BROWSE_ERROR "ã�� ȭ ��ڸ� �� ϴ�(�� )" +IDS_RUNDLG_BROWSE_CAPTION "ã��" +IDS_RUNDLG_BROWSE_FILTER "�� \0*.exe\0A�� \0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "�� ޴�\\��α׷�" IDS_PERSONAL "�� "

1 0

Peter Oberndorfer : ntdll: Add broken() to two test cases.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 9cd60e20242646b2f070892226dd79ee59ac2764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd60e20242646b2f07089222… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 21:53:09 2008 +0200 ntdll: Add broken() to two test cases. --- dlls/ntdll/tests/exception.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8116503..3a9b65d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -169,6 +169,11 @@ static const struct exception 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffe } }, { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffff; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffff } }, + + /* test exception with cleared %ds and %es */ + { { 0x1e, 0x06, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, 0xfa, 0x07, 0x1f, 0xc3 }, + /* push %ds; push %es; xorl %eax,%eax; mov %ax,%ds; mov %ax,%es; cli; pop %es; pop %ds; ret */ + 8, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, }; static int got_exception; @@ -216,7 +221,7 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } @@ -248,7 +253,7 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); }

1 0

Dan Hipschman : widl: Factor a small part of the grammar.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d87bc0520f1bc6f6201b8b44bd25cf6dff69184c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87bc0520f1bc6f6201b8b44b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 1 13:09:56 2008 -0700 widl: Factor a small part of the grammar. --- tools/widl/parser.y | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fc27b2d..180ca98 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -311,7 +311,7 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s %type <type> dispinterface dispinterfacehdr dispinterfacedef %type <type> module modulehdr moduledef %type <type> base_type int_std -%type <type> enumdef structdef uniondef +%type <type> enumdef structdef uniondef typedecl %type <type> type %type <ifref> coclass_int %type <ifref_list> coclass_ints @@ -401,7 +401,7 @@ semicolon_opt: statement: cppquote { $$ = make_statement_cppquote($1); } - | enumdef ';' { $$ = make_statement_type_decl($1); + | typedecl ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); fprintf(header, ";\n\n"); @@ -411,19 +411,13 @@ statement: if (!parse_only && do_header) write_declaration($1, is_in_interface); } | import { $$ = make_statement_import($1); } - | structdef ';' { $$ = make_statement_type_decl($1); - if (!parse_only && do_header) { - write_type_def_or_decl(header, $1, FALSE, NULL); - fprintf(header, ";\n\n"); - } - } | typedef ';' { $$ = $1; } - | uniondef ';' { $$ = make_statement_type_decl($1); - if (!parse_only && do_header) { - write_type_def_or_decl(header, $1, FALSE, NULL); - fprintf(header, ";\n\n"); - } - } + ; + +typedecl: + enumdef + | structdef + | uniondef ; cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; if (!parse_only && do_header) fprintf(header, "%s\n", $3); }

1 0

Peter Oberndorfer : opengl32: Fix a typo (wglShaderLists -> wglShareLists).
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c5a702f513623d81aac5f5d9ad4046dc074c31ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a702f513623d81aac5f5d9a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 22:08:30 2008 +0200 opengl32: Fix a typo (wglShaderLists -> wglShareLists). --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 23f53d6..a68591d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1850,7 +1850,7 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* p /** * X11DRV_wglShareLists * - * For OpenGL32 wglShaderLists. + * For OpenGL32 wglShareLists. */ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { Wine_GLContext *org = (Wine_GLContext *) hglrc1; @@ -3652,7 +3652,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { /** * X11DRV_wglShareLists * - * For OpenGL32 wglShaderLists. + * For OpenGL32 wglShareLists. */ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { opengl_error();

1 0

Austin English : crypt32: Fix a couple of test failures on Vista.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: ae24e21da12dfde382602cb9e6890b1ae358e6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae24e21da12dfde382602cb9e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 1 15:09:17 2008 -0500 crypt32: Fix a couple of test failures on Vista. --- dlls/crypt32/tests/crl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 3a65c7d..561953b 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -164,11 +164,13 @@ static void testAddCRL(void) /* Weird--bad add disposition leads to an access violation in Windows. */ ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", GetLastError()); ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); /* Weird--can add a CRL to the NULL store (does this have special meaning?)

1 0

H. Verbeet : wined3d: Extract an attach_depth_stencil_fbo() function.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d5a8875b930abbc43b8adcf369483339a1b5c786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a8875b930abbc43b8adcf36… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 1 21:30:11 2008 +0200 wined3d: Extract an attach_depth_stencil_fbo() function. The idea is to make setting depth attachments a bit more consistent with set_render_target_fbo()/attach_surface_fbo(). I've also got an upcoming patch in my tree that needs this. --- dlls/wined3d/device.c | 94 ++++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e3fa816..45dc25c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6059,6 +6059,54 @@ static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { checkGLcall("glBindFramebuffer()"); } +/* TODO: Handle stencil attachments */ +static void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) { + IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; + + if (use_render_buffer && depth_stencil_impl->current_renderbuffer) { + GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); + checkGLcall("glFramebufferRenderbufferEXT()"); + } else { + IWineD3DBaseTextureImpl *texture_impl; + GLenum texttarget, target; + GLint old_binding = 0; + + texttarget = depth_stencil_impl->glDescription.target; + if(texttarget == GL_TEXTURE_2D) { + target = GL_TEXTURE_2D; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); + } else if(texttarget == GL_TEXTURE_RECTANGLE_ARB) { + target = GL_TEXTURE_RECTANGLE_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); + } else { + target = GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + } + + IWineD3DSurface_PreLoad(depth_stencil); + + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); + glBindTexture(target, old_binding); + + /* Update base texture states array */ + if (SUCCEEDED(IWineD3DSurface_GetContainer(depth_stencil, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { + texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture_impl->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + if (texture_impl->baseTexture.bindCount) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(texture_impl->baseTexture.sampler)); + } + + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); + } + + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, texttarget, + depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); + checkGLcall("glFramebufferTexture2DEXT()"); + } +} + static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; IWineD3DBaseTextureImpl *texture_impl; @@ -6409,53 +6457,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice /* TODO: Handle stencil attachments */ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; TRACE("Set depth stencil to %p\n", depth_stencil); - if (depth_stencil_impl) { - if (depth_stencil_impl->current_renderbuffer) { - GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); - checkGLcall("glFramebufferRenderbufferEXT()"); - } else { - IWineD3DBaseTextureImpl *texture_impl; - GLenum texttarget, target; - GLint old_binding = 0; - - texttarget = depth_stencil_impl->glDescription.target; - if(texttarget == GL_TEXTURE_2D) { - target = GL_TEXTURE_2D; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - } else if(texttarget == GL_TEXTURE_RECTANGLE_ARB) { - target = GL_TEXTURE_RECTANGLE_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); - } else { - target = GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); - } - - IWineD3DSurface_PreLoad(depth_stencil); - - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); - glBindTexture(target, old_binding); - - /* Update base texture states array */ - if (SUCCEEDED(IWineD3DSurface_GetContainer(depth_stencil, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { - texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; - texture_impl->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; - if (texture_impl->baseTexture.bindCount) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(texture_impl->baseTexture.sampler)); - } - - IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); - } - - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, texttarget, - depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); - checkGLcall("glFramebufferTexture2DEXT()"); - } + if (depth_stencil) { + attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, depth_stencil, TRUE); } else { GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2DEXT()");

1 0

Rob Shearman : rpcrt4: Reset the BufferLength to the used part of the buffer in NdrProxySendReceive .
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 182a2ae3150cdf0defd8c85c021175d1238901ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=182a2ae3150cdf0defd8c85c0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Jul 1 23:34:12 2008 +0100 rpcrt4: Reset the BufferLength to the used part of the buffer in NdrProxySendReceive. This avoids sending uninitialised data on the wire. --- dlls/rpcrt4/cproxy.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6ddaccd..8272679 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -385,6 +385,8 @@ void WINAPI NdrProxySendReceive(void *This, } pStubMsg->dwStubPhase = PROXY_SENDRECEIVE; + /* avoid sending uninitialised parts of the buffer on the wire */ + pStubMsg->RpcMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; hr = IRpcChannelBuffer_SendReceive(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg, &Status);

1 0

Rob Shearman : widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures .
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: fb224429f7f5bcd66798ceb1709c048789238e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb224429f7f5bcd66798ceb17… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 2 00:00:43 2008 +0100 widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures. The 8 bytes are for the variance and offset and are added just before the array, as seen in the marshalling code in rpcrt4. No offset needs to be added for non-varying structures since the buffer mark is set after the conformance in marshalled or unmarshalled. --- tools/widl/typegen.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f7a189a..79ae0f4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1437,6 +1437,14 @@ static int write_varying_array_pointer_descriptions( if (offset_in_memory && offset_in_buffer) { size_t padding; + + if (is_array(v->type) && v->type->length_is) + { + *offset_in_buffer = ROUND_SIZE(*offset_in_buffer, 4); + /* skip over variance and offset in buffer */ + *offset_in_buffer += 8; + } + align = 0; type_memsize(v->type, &align); padding = ROUNDING(*offset_in_memory, align); @@ -1470,19 +1478,13 @@ static void write_pointer_description(FILE *file, type_t *type, { size_t offset_in_buffer; size_t offset_in_memory; - size_t conformance = 0; - - if (type->type == RPC_FC_CVSTRUCT) - conformance = 8; - else if (type->type == RPC_FC_CSTRUCT || type->type == RPC_FC_CPSTRUCT) - conformance = 4; /* pass 1: search for single instance of a pointer (i.e. don't descend * into arrays) */ if (!is_array(type)) { offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_no_repeat_pointer_descriptions( file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1490,7 +1492,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 2: search for pointers in fixed arrays */ offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_fixed_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1512,7 +1514,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 4: search for pointers in varying arrays */ offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_varying_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset);

1 0