October 2007 - Wine-commits

Detlef Riekenberg : spoolss/tests: Add tests for SplInitializeWinSpoolDrv.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: cf122bab8c771e6bff95ba003c424f99fdf62f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf122bab8c771e6bff95ba003… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 3 01:01:12 2007 +0200 spoolss/tests: Add tests for SplInitializeWinSpoolDrv. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/spoolss/tests/Makefile.in | 13 ++++ dlls/spoolss/tests/spoolss.c | 129 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 157 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf122bab8c771e6bff95b…

1 0

Detlef Riekenberg : localspl: Implement InitializePrintProvidor.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 29873b7e06bbee71f0ae4bc0eeaa57e6be95135a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29873b7e06bbee71f0ae4bc0e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 3 01:07:43 2007 +0200 localspl: Implement InitializePrintProvidor. --- dlls/localspl/localspl.spec | 2 +- dlls/localspl/localspl_main.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localspl.spec b/dlls/localspl/localspl.spec index b9fc06d..651d20d 100644 --- a/dlls/localspl/localspl.spec +++ b/dlls/localspl/localspl.spec @@ -4,7 +4,7 @@ @ stub GetPrintProcessorCapabilities @ stdcall InitializePrintMonitor(wstr) # "Providor" is no typo here -@ stub InitializePrintProvidor +@ stdcall InitializePrintProvidor(ptr long wstr) @ stub OpenPrintProcessor @ stub PrintDocumentOnPrintProcessor @ stub PrintProcLogEvent diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 800d1c5..3585c34 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -26,7 +26,9 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" +#include "winreg.h" +#include "winspool.h" +#include "ddk/winsplp.h" #include "wine/debug.h" #include "localspl_private.h" @@ -54,3 +56,35 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + + +/***************************************************** + * InitializePrintProvidor (localspl.@) + * + * Initialize the Printprovider + * + * PARAMS + * pPrintProvidor [I] Buffer to fill with a struct PRINTPROVIDOR + * cbPrintProvidor [I] Size of Buffer in Bytes + * pFullRegistryPath [I] Registry-Path for the Printprovidor + * + * RETURNS + * Success: TRUE and pPrintProvidor filled + * Failure: FALSE + * + * NOTES + * The RegistryPath should be: + * "System\CurrentControlSet\Control\Print\Providers\<providername>", + * but this Parameter is ignored in "localspl.dll". + * + */ + +BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, + DWORD cbPrintProvidor, LPWSTR pFullRegistryPath) +{ + + TRACE("(%p, %u, %s)\n", pPrintProvidor, cbPrintProvidor, debugstr_w(pFullRegistryPath)); + ZeroMemory(pPrintProvidor, (cbPrintProvidor < sizeof(PRINTPROVIDOR)) ? cbPrintProvidor : sizeof(PRINTPROVIDOR)); + + return TRUE; +}

1 0

Detlef Riekenberg : msi: Dump the database name in a FIXME.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 7f655802a368d15ce0b896117070a95313a396fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f655802a368d15ce0b896117… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 3 00:33:13 2007 +0200 msi: Dump the database name in a FIXME. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 7adb362..d0f0097 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -138,7 +138,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( FAILED( r ) || !stg ) { - FIXME("open failed r = %08x!\n",r); + FIXME("open failed r = %08x for %s\n", r, debugstr_w(szDBPath)); return ERROR_FUNCTION_FAILED; }

1 0

Detlef Riekenberg : winspool: Add a missing export.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 3e6307f20aeafcdaf57bcd0061bbe1733780b8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6307f20aeafcdaf57bcd006… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 3 00:34:45 2007 +0200 winspool: Add a missing export. --- dlls/winspool.drv/winspool.drv.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index ba48563..0ad97df 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -166,6 +166,7 @@ @ stdcall SetPrinterW(long long ptr long) @ stub SpoolerDevQueryPrintW @ stub SpoolerInit +@ stub SpoolerPrinterEvent @ stdcall StartDocDlgA(ptr ptr) @ stdcall StartDocDlgW(ptr ptr) @ stdcall StartDocPrinterA(long long ptr)

1 0

Detlef Riekenberg : spoolss: Implement SplInitializeWinSpoolDrv.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: a2b70095f6a7fdb968761900181afb9b67638adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b70095f6a7fdb9687619001… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 3 00:55:55 2007 +0200 spoolss: Implement SplInitializeWinSpoolDrv. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 4afa9bf..b7fc0bd 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -121,7 +121,7 @@ @ stub SplCommitSpoolData @ stub SplDriverUnloadComplete @ stub SplGetSpoolFileInfo -@ stub SplInitializeWinSpoolDrv +@ stdcall SplInitializeWinSpoolDrv(ptr) @ stub SplIsUpgrade @ stub SplProcessPnPEvent @ stub SplReadPrinter diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index c368fe5..52365c7 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -27,6 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); +/* ################################ */ + +static HMODULE hwinspool; +static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; /****************************************************************** * @@ -161,3 +165,47 @@ HANDLE WINAPI RevertToPrinterSelf(void) FIXME("() stub\n"); return NULL; } + +/****************************************************************** + * SplInitializeWinSpoolDrv [SPOOLSS.@] + * + * Dynamic load "winspool.drv" and fill an array with some function-pointer + * + * PARAMS + * table [I] array of function-pointer to fill + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Native "spoolss.dll" from w2k fill the table with 11 Function-Pointer. + * We implement the XP-Version (The table has only 9 Pointer) + * + */ +BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) +{ + DWORD res; + + TRACE("(%p)\n", table); + + hwinspool = LoadLibraryW(winspooldrvW); + if (!hwinspool) return FALSE; + + table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW"); + table[1] = (void *) GetProcAddress(hwinspool, "ClosePrinter"); + table[2] = (void *) GetProcAddress(hwinspool, "SpoolerDevQueryPrintW"); + table[3] = (void *) GetProcAddress(hwinspool, "SpoolerPrinterEvent"); + table[4] = (void *) GetProcAddress(hwinspool, "DocumentPropertiesW"); + table[5] = (void *) GetProcAddress(hwinspool, (LPSTR) 212); /* LoadPrinterDriver */ + table[6] = (void *) GetProcAddress(hwinspool, (LPSTR) 213); /* RefCntLoadDriver */ + table[7] = (void *) GetProcAddress(hwinspool, (LPSTR) 214); /* RefCntUnloadDriver */ + table[8] = (void *) GetProcAddress(hwinspool, (LPSTR) 215); /* ForceUnloadDriver */ + + for (res = 0; res < 9; res++) { + if (table[res] == NULL) return FALSE; + } + + return TRUE; + +}

1 0

Lionel Debroux : advapi32/tests: Fix a typo.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 57a67ebcceb08639736f218f0f545aa41737ad96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a67ebcceb08639736f218f0… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Tue Oct 2 09:19:49 2007 +0200 advapi32/tests: Fix a typo. --- dlls/advapi32/tests/security.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a17931e..3583a4d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1989,70 +1989,70 @@ static void test_ConvertSecurityDescriptorToString() LocalFree(string); InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE(""); size = 4096; CreateWellKnownSid(WinLocalSid, NULL, sid_buf, &size); SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, FALSE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:S-1-2-0"); SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, TRUE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:S-1-2-0"); size = sizeof(sid_buf); CreateWellKnownSid(WinLocalSystemSid, NULL, sid_buf, &size); SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, TRUE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SY"); ConvertStringSidToSid("S-1-5-21-93476-23408-4576", &psid); SetSecurityDescriptorGroup(&desc, psid, TRUE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576"); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, GROUP_SECURITY_INFORMATION, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, GROUP_SECURITY_INFORMATION, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576"); pacl = (PACL)acl_buf; InitializeAcl(pacl, sizeof(acl_buf), ACL_REVISION); SetSecurityDescriptorDacl(&desc, TRUE, pacl, TRUE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:"); SetSecurityDescriptorDacl(&desc, TRUE, pacl, FALSE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:"); ConvertStringSidToSid("S-1-5-6", &psid2); AddAccessAllowedAceEx(pacl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, 0xf0000000, psid2); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)"); AddAccessAllowedAceEx(pacl, ACL_REVISION, INHERIT_ONLY_ACE|INHERITED_ACE, 0x00000003, psid2); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)"); AddAccessDeniedAceEx(pacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, 0xffffffff, psid); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"); pacl = (PACL)acl_buf; InitializeAcl(pacl, sizeof(acl_buf), ACL_REVISION); SetSecurityDescriptorSacl(&desc, TRUE, pacl, FALSE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:"); SetSecurityDescriptorDacl(&desc, TRUE, NULL, FALSE); AddAuditAccessAceEx(pacl, ACL_REVISION, VALID_INHERIT_FLAGS, KEY_READ|KEY_WRITE, psid2, TRUE, TRUE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)"); AddAuditAccessAceEx(pacl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, FILE_GENERIC_READ|FILE_GENERIC_WRITE, psid2, TRUE, FALSE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)"); } @@ -2081,7 +2081,7 @@ static void test_PrivateObjectSecurity(void) ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION, buf, dwDescSize, &retSize), "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576"); GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); expect_eq(ctrl, 0x8000, int, "%x"); @@ -2089,7 +2089,7 @@ static void test_PrivateObjectSecurity(void) ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, buf, dwDescSize, &retSize), "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed err=%u\n", GetLastError()); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed err=%u\n", GetLastError()); CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"); GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); expect_eq(ctrl, 0x8004, int, "%x"); @@ -2097,7 +2097,7 @@ static void test_PrivateObjectSecurity(void) ok(GetPrivateObjectSecurity(sec, sec_info, buf, dwDescSize, &retSize), "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize == dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SY" "G:S-1-5-21-93476-23408-4576" "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"

1 0

Chris Robinson : winex11: Track async GL drawable changes.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 3629ea4cfd3e3768436e095d4fa1dcb0f3c02b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3629ea4cfd3e3768436e095d4… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 26 07:15:52 2007 -0700 winex11: Track async GL drawable changes. --- dlls/winex11.drv/opengl.c | 56 +++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 780e7d6..b296c3a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -111,6 +111,8 @@ typedef struct wine_glcontext { BOOL do_escape; X11DRV_PDEVICE *physDev; X11DRV_PDEVICE *pReadDev; + Drawable drawables[2]; + BOOL refresh_drawables; struct wine_glcontext *next; struct wine_glcontext *prev; } Wine_GLContext; @@ -940,6 +942,36 @@ int pixelformat_from_fbconfig_id(XID fbconfig_id) } +/* Mark any allocated context using the glx drawable 'old' to use 'new' */ +void mark_drawable_dirty(Drawable old, Drawable new) +{ + Wine_GLContext *ctx; + for (ctx = context_list; ctx; ctx = ctx->next) { + if (old == ctx->drawables[0]) { + ctx->drawables[0] = new; + ctx->refresh_drawables = TRUE; + } + if (old == ctx->drawables[1]) { + ctx->drawables[1] = new; + ctx->refresh_drawables = TRUE; + } + } +} + +/* Given the current context, make sure its drawable is sync'd */ +static inline void sync_context(Wine_GLContext *context) +{ + if(context && context->refresh_drawables) { + if (glxRequireVersion(3)) + pglXMakeContextCurrent(gdi_display, context->drawables[0], + context->drawables[1], context->ctx); + else + pglXMakeCurrent(gdi_display, context->drawables[0], context->ctx); + context->refresh_drawables = FALSE; + } +} + + /** * X11DRV_ChoosePixelFormat * @@ -1607,6 +1639,9 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { ctx->hdc = hdc; ctx->physDev = physDev; ctx->pReadDev = physDev; + ctx->drawables[0] = drawable; + ctx->drawables[1] = drawable; + ctx->refresh_drawables = FALSE; if (type == OBJ_MEMDC) { @@ -1656,6 +1691,9 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* p ctx->hdc = pDrawDev->hdc; ctx->physDev = pDrawDev; ctx->pReadDev = pReadDev; + ctx->drawables[0] = d_draw; + ctx->drawables[1] = d_read; + ctx->refresh_drawables = FALSE; ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); NtCurrentTeb()->glContext = ctx; } @@ -1939,17 +1977,23 @@ static inline void update_drawable(X11DRV_PDEVICE *physDev) static void WINAPI X11DRV_wglFinish(void) { + Wine_GLContext *ctx = NtCurrentTeb()->glContext; + wine_tsx11_lock(); + sync_context(ctx); pglFinish(); - update_drawable(((Wine_GLContext*)NtCurrentTeb()->glContext)->physDev); + update_drawable(ctx->physDev); wine_tsx11_unlock(); } static void WINAPI X11DRV_wglFlush(void) { + Wine_GLContext *ctx = NtCurrentTeb()->glContext; + wine_tsx11_lock(); + sync_context(ctx); pglFlush(); - update_drawable(((Wine_GLContext*)NtCurrentTeb()->glContext)->physDev); + update_drawable(ctx->physDev); wine_tsx11_unlock(); } @@ -3203,6 +3247,8 @@ BOOL destroy_glxpixmap(Display *display, XID glxpixmap) BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) { GLXDrawable drawable; + Wine_GLContext *ctx = NtCurrentTeb()->glContext; + if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); return 0; @@ -3211,7 +3257,9 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) TRACE_(opengl)("(%p)\n", physDev); drawable = get_glxdrawable(physDev); + wine_tsx11_lock(); + sync_context(ctx); pglXSwapBuffers(gdi_display, drawable); update_drawable(physDev); wine_tsx11_unlock(); @@ -3292,6 +3340,10 @@ int pixelformat_from_fbconfig_id(XID fbconfig_id) return 0; } +void mark_drawable_dirty(Drawable old, Drawable new) +{ +} + /*********************************************************************** * ChoosePixelFormat (X11DRV.@) */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 55abffb..adb8796 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -670,6 +670,7 @@ extern BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig ); extern int pixelformat_from_fbconfig_id( XID fbconfig_id ); extern XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ); +extern void mark_drawable_dirty( Drawable old, Drawable new ); extern void alloc_window_dce( struct x11drv_win_data *data ); extern void free_window_dce( struct x11drv_win_data *data );

1 0

Chris Robinson : winex11: Use a GLXPixmap for offscreen OpenGL rendering when XComposite isn' t available.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 37d835bf9a49ef48a689a8c5356c034e35c8bb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d835bf9a49ef48a689a8c53… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 26 08:17:13 2007 -0700 winex11: Use a GLXPixmap for offscreen OpenGL rendering when XComposite isn't available. --- dlls/winex11.drv/dce.c | 3 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/opengl.c | 23 ++++++++-- dlls/winex11.drv/window.c | 104 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 5 ++ 5 files changed, 130 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37d835bf9a49ef48a689a…

1 0

Chris Robinson : winex11: Load and use GLX_MESA_copy_sub_buffer for swapping buffers on a GLXPixmap.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: d053049fd52bba3a89527c81e0a4a52f19552e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d053049fd52bba3a89527c81e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 26 11:01:07 2007 -0700 winex11: Load and use GLX_MESA_copy_sub_buffer for swapping buffers on a GLXPixmap. --- dlls/winex11.drv/opengl.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 74ab940..8224f68 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -256,6 +256,9 @@ static BOOL (*pglXDrawableAttribATI)(Display *dpy, GLXDrawable draw, const int static void* (*pglXAllocateMemoryNV)(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); static void (*pglXFreeMemoryNV)(GLvoid *pointer); +/* MESA GLX Extensions */ +static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); + /* Standard OpenGL */ MAKE_FUNCPTR(glBindTexture) MAKE_FUNCPTR(glBitmap) @@ -508,6 +511,10 @@ LOAD_FUNCPTR(glXFreeMemoryNV) pglXDrawableAttribATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXDrawableAttribATI"); } + if(glxRequireExtension("GLX_MESA_copy_sub_buffer")) { + pglXCopySubBufferMESA = (void*)pglXGetProcAddressARB((const GLubyte *) "glXCopySubBufferMESA"); + } + X11DRV_WineGL_LoadExtensions(); wine_tsx11_unlock(); @@ -3268,7 +3275,23 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) wine_tsx11_lock(); sync_context(ctx); - pglXSwapBuffers(gdi_display, drawable); + if(physDev->pixmap) { + if(pglXCopySubBufferMESA) { + int w = physDev->dc_rect.right - physDev->dc_rect.left; + int h = physDev->dc_rect.bottom - physDev->dc_rect.top; + + /* (glX)SwapBuffers has an implicit glFlush effect, however + * GLX_MESA_copy_sub_buffer doesn't. Make sure GL is flushed before + * copying */ + pglFlush(); + if(w > 0 && h > 0) + pglXCopySubBufferMESA(gdi_display, drawable, 0, 0, w, h); + } + else + pglXSwapBuffers(gdi_display, drawable); + } + else + pglXSwapBuffers(gdi_display, drawable); update_drawable(physDev); wine_tsx11_unlock();

1 0

Lionel Debroux : advapi32/tests: Fix memory leaks (found by Smatch).
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 40c66b8977367103446e699741c8805eff7fc19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c66b8977367103446e69974… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Tue Oct 2 08:59:02 2007 +0200 advapi32/tests: Fix memory leaks (found by Smatch). --- dlls/advapi32/tests/security.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6426f84..a17931e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -719,6 +719,7 @@ static void test_AccessCheck(void) if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { skip("ACLs not implemented - skipping tests\n"); + HeapFree(GetProcessHeap(), 0, Acl); return; } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); @@ -1540,6 +1541,7 @@ static void test_process_security(void) if (!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { skip("ACLs not implemented - skipping tests\n"); + HeapFree(GetProcessHeap(), 0, Acl); return; } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); @@ -1547,7 +1549,11 @@ static void test_process_security(void) /* get owner from the token we might be running as a user not admin */ res = OpenProcessToken( GetCurrentProcess(), MAXIMUM_ALLOWED, &token ); ok(res, "OpenProcessToken failed with error %d\n", GetLastError()); - if (!res) return; + if (!res) + { + HeapFree(GetProcessHeap(), 0, Acl); + return; + } res = GetTokenInformation( token, TokenOwner, owner, sizeof(owner), &tmp ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); @@ -1557,7 +1563,11 @@ static void test_process_security(void) UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup; CloseHandle( token ); - if (!res) return; + if (!res) + { + HeapFree(GetProcessHeap(), 0, Acl); + return; + } res = AddAccessDeniedAce(Acl, ACL_REVISION, PROCESS_VM_READ, AdminSid); ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); @@ -2100,6 +2110,7 @@ static void test_PrivateObjectSecurity(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); LocalFree(sec); + HeapFree(GetProcessHeap(), 0, buf); } #undef CHECK_RESULT_AND_FREE

1 0