August 2007 - Wine-commits - list.winehq.org

Roderick Colenbrander : wgl: Fix wglGetCurrentReadDCARB bugs.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: daceb4564ff3daf5e033e90432f315a1992181e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daceb4564ff3daf5e033e9043… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 22 19:47:32 2007 +0200 wgl: Fix wglGetCurrentReadDCARB bugs. --- dlls/opengl32/tests/opengl.c | 42 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 45 ++++++++++++++---------------------------- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ccf5e3d..268bece 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -29,6 +29,10 @@ typedef void* HPBUFFERARB; static const char* (WINAPI *pwglGetExtensionsStringARB)(HDC); static int (WINAPI *pwglReleasePbufferDCARB)(HPBUFFERARB, HDC); +/* WGL_ARB_make_current_read */ +static BOOL (WINAPI *pwglMakeContextCurrentARB)(HDC hdraw, HDC hread, HGLRC hglrc); +static HDC (WINAPI *pwglGetCurrentReadDCARB)(); + /* WGL_ARB_pixel_format */ #define WGL_COLOR_BITS_ARB 0x2014 #define WGL_RED_BITS_ARB 0x2015 @@ -58,6 +62,10 @@ static void init_functions(void) /* WGL_ARB_extensions_string */ GET_PROC(wglGetExtensionsStringARB) + /* WGL_ARB_make_current_read */ + GET_PROC(wglMakeContextCurrentARB); + GET_PROC(wglGetCurrentReadDCARB); + /* WGL_ARB_pixel_format */ GET_PROC(wglChoosePixelFormatARB) GET_PROC(wglGetPixelFormatAttribivARB) @@ -257,6 +265,35 @@ static void test_gdi_dbuf(HDC hdc) } } +static void test_make_current_read(HDC hdc) +{ + int res; + HDC hread; + HGLRC hglrc = wglCreateContext(hdc); + + if(!hglrc) + { + skip("wglCreateContext failed!\n"); + return; + } + + res = wglMakeCurrent(hdc, hglrc); + if(!res) + { + skip("wglMakeCurrent failed!\n"); + return; + } + + /* Test what wglGetCurrentReadDCARB does for wglMakeCurrent as the spec doesn't mention it */ + hread = pwglGetCurrentReadDCARB(); + trace("hread %p, hdc %p\n", hread, hdc); + ok(hread == hdc, "wglGetCurrentReadDCARB failed for standard wglMakeCurrent\n"); + + pwglMakeContextCurrentARB(hdc, hdc, hglrc); + hread = pwglGetCurrentReadDCARB(); + ok(hread == hdc, "wglGetCurrentReadDCARB failed for wglMakeContextCurrent\n"); +} + START_TEST(opengl) { HWND hwnd; @@ -311,6 +348,11 @@ START_TEST(opengl) wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n"); + if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) + test_make_current_read(hdc); + else + trace("WGL_ARB_make_current_read not supported, skipping test\n"); + if(strstr(wgl_extensions, "WGL_ARB_pbuffer")) test_pbuffers(hdc); else diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 98ecedb..09a1d6a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -110,6 +110,7 @@ typedef struct wine_glcontext { GLXContext ctx; BOOL do_escape; X11DRV_PDEVICE *physDev; + X11DRV_PDEVICE *pReadDev; RECT viewport; RECT scissor; BOOL scissor_enabled; @@ -554,22 +555,6 @@ static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx) return ret; } -/** - * get_hdc_from_Drawable (internal) - * - * For use by wglGetCurrentReadDCARB. - */ -static inline HDC get_hdc_from_Drawable(GLXDrawable d) -{ - Wine_GLContext *ret; - for (ret = context_list; ret; ret = ret->next) { - if (d == ret->physDev->drawable) { - return ret->hdc; - } - } - return NULL; -} - static inline BOOL is_valid_context( Wine_GLContext *ctx ) { Wine_GLContext *ptr; @@ -1532,17 +1517,14 @@ BOOL X11DRV_wglDeleteContext(HGLRC hglrc) */ static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) { - GLXDrawable gl_d; - HDC ret; + HDC ret = 0; + Wine_GLContext *ctx = NtCurrentTeb()->glContext; + X11DRV_PDEVICE *physDev = ctx ? ctx->pReadDev : NULL; - TRACE("()\n"); - - wine_tsx11_lock(); - gl_d = pglXGetCurrentReadDrawable(); - ret = get_hdc_from_Drawable(gl_d); - wine_tsx11_unlock(); + if(physDev) + ret = physDev->hdc; - TRACE(" returning %p (GL drawable %lu)\n", ret, gl_d); + TRACE(" returning %p (GL drawable %lu)\n", ret, physDev ? physDev->drawable : 0); return ret; } @@ -1681,6 +1663,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if(ret) { ctx->physDev = physDev; + ctx->pReadDev = physDev; if (type == OBJ_MEMDC) { @@ -1703,10 +1686,10 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { * * For OpenGL32 wglMakeContextCurrentARB */ -BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* hDrawDev, X11DRV_PDEVICE* hReadDev, HGLRC hglrc) +BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* pReadDev, HGLRC hglrc) { BOOL ret; - TRACE("(%p,%p,%p)\n", hDrawDev, hReadDev, hglrc); + TRACE("(%p,%p,%p)\n", pDrawDev, pReadDev, hglrc); if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); @@ -1722,13 +1705,15 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* hDrawDev, X11DRV_PDEVICE* h ret = FALSE; } else { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; - Drawable d_draw = get_glxdrawable(hDrawDev); - Drawable d_read = get_glxdrawable(hReadDev); + Drawable d_draw = get_glxdrawable(pDrawDev); + Drawable d_read = get_glxdrawable(pReadDev); if (ctx->ctx == NULL) { - ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, GetObjectType(hDrawDev->hdc) == OBJ_MEMDC ? False : True); + ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, GetObjectType(pDrawDev->hdc) == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } + ctx->physDev = pDrawDev; + ctx->pReadDev = pReadDev; ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); NtCurrentTeb()->glContext = ctx; }

1 0

Detlef Riekenberg : winspool: Add always the Win9x and the NT printerdriver .
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 8506125cb96e45f226623663a0ebcfaa81115e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8506125cb96e45f226623663a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Aug 22 20:24:35 2007 +0200 winspool: Add always the Win9x and the NT printerdriver. --- dlls/winspool.drv/info.c | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 56203da..1ed05fd 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -470,31 +470,35 @@ static BOOL add_printer_driver(const char *name) { DRIVER_INFO_3A di3a; - static char driver_path[] = "wineps16", - data_file[] = "<datafile?>", - config_file[] = "wineps16", - help_file[] = "<helpfile?>", - dep_file[] = "<dependent files?>\0", - monitor_name[] = "<monitor name?>", + static char driver_9x[] = "wineps16.drv", + driver_nt[] = "wineps.drv", + env_9x[] = "Windows 4.0", + env_nt[] = "Windows NT x86", + data_file[] = "generic.ppd", default_data_type[] = "RAW"; - di3a.cVersion = (GetVersion() & 0x80000000) ? 0 : 3; /* FIXME: add 1, 2 */ + ZeroMemory(&di3a, sizeof(DRIVER_INFO_3A)); + di3a.cVersion = 3; di3a.pName = (char *)name; - di3a.pEnvironment = NULL; /* NULL means auto */ - di3a.pDriverPath = driver_path; + di3a.pEnvironment = env_nt; + di3a.pDriverPath = driver_nt; di3a.pDataFile = data_file; - di3a.pConfigFile = config_file; - di3a.pHelpFile = help_file; - di3a.pDependentFiles = dep_file; - di3a.pMonitorName = monitor_name; + di3a.pConfigFile = driver_nt; di3a.pDefaultDataType = default_data_type; - if (!AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a)) + if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a)) { - ERR("Failed adding driver (%d)\n", GetLastError()); - return FALSE; + di3a.cVersion = 0; + di3a.pEnvironment = env_9x; + di3a.pDriverPath = driver_9x; + di3a.pConfigFile = driver_9x; + if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a)) + { + return TRUE; + } } - return TRUE; + ERR("Failed adding driver %s: %u\n", debugstr_a(di3a.pDriverPath), GetLastError()); + return FALSE; } #ifdef SONAME_LIBCUPS

1 0

Stefan Leichter : quartz: Remove 'recursive registry key delete' function.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: c13c9e382496a451f4504ecf61ec0c1865c6f8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13c9e382496a451f4504ecf6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Aug 22 21:44:06 2007 +0200 quartz: Remove 'recursive registry key delete' function. --- dlls/quartz/regsvr.c | 84 ++++++-------------------------------------------- 1 files changed, 10 insertions(+), 74 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 20bc5c4..8b93601 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -172,9 +172,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -263,7 +260,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -370,16 +368,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -521,7 +522,7 @@ static HRESULT unregister_mediatypes_parsing(struct regsvr_mediatype_parsing con if (res != ERROR_SUCCESS) break; StringFromGUID2(list->subtype, buf, 39); - res = recursive_delete_keyW(majortype_key, buf); + res = RegDeleteTreeW(majortype_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; /* Removed majortype key if there is no more subtype key */ @@ -556,7 +557,7 @@ static HRESULT unregister_mediatypes_extension(struct regsvr_mediatype_extension res = ERROR_SUCCESS; else if (res == ERROR_SUCCESS) for (; res == ERROR_SUCCESS && list->majortype; ++list) { - res = recursive_delete_keyA(extensions_root_key, list->extension); + res = RegDeleteTreeA(extensions_root_key, list->extension); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -775,71 +776,6 @@ error_close_progid_key: return res; } -/*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - - static GUID const CLSID_PSFactoryBuffer = { 0x92a3a302, 0xda7c, 0x4a1f, {0xba,0x7e,0x18,0x02,0xbb,0x5d,0x2d,0x02} };

1 0

Paul Vriens : atl: Replace SHDeleteKeyW with RegDeleteTreeW and get rid of the import of shlwapi .
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 4f49655a6591f9ef1626e619ddcf1ea4be1316de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f49655a6591f9ef1626e619d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 22 11:05:35 2007 +0200 atl: Replace SHDeleteKeyW with RegDeleteTreeW and get rid of the import of shlwapi. --- dlls/atl/Makefile.in | 2 +- dlls/atl/registrar.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index d419a5d..413c50d 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = atl.dll IMPORTLIB = libatl.$(IMPLIBEXT) -IMPORTS = ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32 +IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 2bc078d..9c0c73b 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -27,7 +27,6 @@ #include "winreg.h" #include "objbase.h" #include "oaidl.h" -#include "shlwapi.h" #define ATL_INITGUID #include "atliface.h" @@ -243,10 +242,10 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO strbuf_write(buf->str, &name, -1); }else if(key_type == DO_DELETE) { TRACE("Deleting %s\n", debugstr_w(buf->str)); - lres = SHDeleteKeyW(parent_key, buf->str); + lres = RegDeleteTreeW(parent_key, buf->str); }else { if(key_type == FORCE_REMOVE) - SHDeleteKeyW(parent_key, buf->str); + RegDeleteTreeW(parent_key, buf->str); lres = RegCreateKeyW(parent_key, buf->str, &hkey); if(lres != ERROR_SUCCESS) { WARN("Could not create(open) key: %08x\n", lres);

1 0

Alexandre Julliard : gdi32: Fix a few more places that use the wrong get/ release function for DCs.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: e9a4c2351d4317f214a51aa8de0740851ae45e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a4c2351d4317f214a51aa8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 18:20:39 2007 +0200 gdi32: Fix a few more places that use the wrong get/release function for DCs. --- dlls/gdi32/dc.c | 24 +++++++++++------------- dlls/gdi32/gdiobj.c | 14 ++++---------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4bf19b4..a3689eb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -200,7 +200,7 @@ BOOL DC_FreeDCPtr( DC *dc ) */ static BOOL DC_DeleteObject( HGDIOBJ handle, void *obj ) { - DC_ReleaseDCPtr( obj ); + GDI_ReleaseObj( handle ); return DeleteDC( handle ); } @@ -740,25 +740,23 @@ HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, HDC WINAPI CreateCompatibleDC( HDC hdc ) { DC *dc, *origDC; - const DC_FUNCTIONS *funcs; - PHYSDEV physDev; + const DC_FUNCTIONS *funcs = NULL; + PHYSDEV physDev = NULL; GDI_CheckNotLock(); - if ((origDC = GDI_GetObjPtr( hdc, DC_MAGIC ))) + if ((origDC = DC_GetDCPtr( hdc ))) { - funcs = origDC->funcs; - physDev = origDC->physDev; + if (GetObjectType( hdc ) == OBJ_DC) + { + funcs = origDC->funcs; + physDev = origDC->physDev; + } DC_ReleaseDCPtr( origDC ); /* can't hold the lock while loading the driver */ - funcs = DRIVER_get_driver( funcs ); - } - else - { - funcs = DRIVER_load_driver( displayW ); - physDev = NULL; + if (funcs) funcs = DRIVER_get_driver( funcs ); } - if (!funcs) return 0; + if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; if (!(dc = DC_AllocDC( funcs, MEMORY_DC_MAGIC ))) goto error; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index f2dd4e1..0388c71 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -528,15 +528,9 @@ static DWORD get_dpi( void ) * * Increment the reference count of a GDI object. */ -static inline void inc_ref_count( HGDIOBJ handle ) +static inline void inc_ref_count( GDIOBJHDR *header ) { - GDIOBJHDR *header; - - if ((header = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) - { - header->dwCount++; - GDI_ReleaseObj( handle ); - } + header->dwCount++; } @@ -829,7 +823,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { if(dc->funcs->pDeleteObject) dc->funcs->pDeleteObject( dc->physDev, obj ); - GDI_ReleaseObj( header->hdcs->hdc ); + DC_ReleaseDCPtr( dc ); } tmp = header->hdcs; header->hdcs = header->hdcs->next; @@ -1159,7 +1153,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) ret = header->funcs->pSelectObject( hObj, header, hdc ); if (ret && ret != hObj && HandleToULong(ret) > COMPLEXREGION) { - inc_ref_count( hObj ); + inc_ref_count( header ); dec_ref_count( ret ); } }

1 0

Huw Davies : gdi32: Quote the printer name prior to passing it to the shell .
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: a247ca53081e1b871320cb47232aaa766a962971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247ca53081e1b871320cb472… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 22 14:39:46 2007 +0100 gdi32: Quote the printer name prior to passing it to the shell. --- dlls/gdi32/printdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 0cca2ad..9444536 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -468,7 +468,7 @@ static int CreateSpoolFile(LPCSTR pszOutput) RegCloseKey(hkey); } if (!psCmd[0] && !strncmp("LPR:",pszOutput,4)) - sprintf(psCmd,"|lpr -P%s",pszOutput+4); + sprintf(psCmd,"|lpr -P'%s'",pszOutput+4); TRACE("Got printerSpoolCommand '%s' for output device '%s'\n", psCmd, pszOutput);

1 0

Maarten Lankhorst : dsound: Transparantly fall back to software mode if hardware mode is unavailable.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 2ececbeda999dc67ac93f88233cfaa7e535042cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ececbeda999dc67ac93f8823… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 21 21:04:32 2007 +0200 dsound: Transparantly fall back to software mode if hardware mode is unavailable. --- dlls/dsound/primary.c | 257 +++++++++++++++++++------------------------------ 1 files changed, 98 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ececbeda999dc67ac93f…

1 0

Juan Lang : advapi32: Add more tests for CryptVerifySignatureW, and correct its parameter checking.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: a5bbed2b95abb5b8983df487c62039c683fe98cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5bbed2b95abb5b8983df487c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 22 09:38:44 2007 -0700 advapi32: Add more tests for CryptVerifySignatureW, and correct its parameter checking. --- dlls/advapi32/crypt.c | 7 +--- dlls/advapi32/tests/crypt.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 60131bb..63f89f6 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2134,12 +2134,7 @@ BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DW TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags); - if (!hash || !key) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!pbSignature || !dwSigLen || + if (!hash || !key || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index a8db384..9fa532c 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -349,6 +349,81 @@ static void test_incorrect_api_usage(void) ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); } +static const BYTE privKey[] = { + 0x07, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53, 0x41, 0x32, 0x00, + 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x79, 0x10, 0x1c, 0xd0, 0x6b, 0x10, + 0x18, 0x30, 0x94, 0x61, 0xdc, 0x0e, 0xcb, 0x96, 0x4e, 0x21, 0x3f, 0x79, 0xcd, + 0xa9, 0x17, 0x62, 0xbc, 0xbb, 0x61, 0x4c, 0xe0, 0x75, 0x38, 0x6c, 0xf3, 0xde, + 0x60, 0x86, 0x03, 0x97, 0x65, 0xeb, 0x1e, 0x6b, 0xdb, 0x53, 0x85, 0xad, 0x68, + 0x21, 0xf1, 0x5d, 0xe7, 0x1f, 0xe6, 0x53, 0xb4, 0xbb, 0x59, 0x3e, 0x14, 0x27, + 0xb1, 0x83, 0xa7, 0x3a, 0x54, 0xe2, 0x8f, 0x65, 0x8e, 0x6a, 0x4a, 0xcf, 0x3b, + 0x1f, 0x65, 0xff, 0xfe, 0xf1, 0x31, 0x3a, 0x37, 0x7a, 0x8b, 0xcb, 0xc6, 0xd4, + 0x98, 0x50, 0x36, 0x67, 0xe4, 0xa1, 0xe8, 0x7e, 0x8a, 0xc5, 0x23, 0xf2, 0x77, + 0xf5, 0x37, 0x61, 0x49, 0x72, 0x59, 0xe8, 0x3d, 0xf7, 0x60, 0xb2, 0x77, 0xca, + 0x78, 0x54, 0x6d, 0x65, 0x9e, 0x03, 0x97, 0x1b, 0x61, 0xbd, 0x0c, 0xd8, 0x06, + 0x63, 0xe2, 0xc5, 0x48, 0xef, 0xb3, 0xe2, 0x6e, 0x98, 0x7d, 0xbd, 0x4e, 0x72, + 0x91, 0xdb, 0x31, 0x57, 0xe3, 0x65, 0x3a, 0x49, 0xca, 0xec, 0xd2, 0x02, 0x4e, + 0x22, 0x7e, 0x72, 0x8e, 0xf9, 0x79, 0x84, 0x82, 0xdf, 0x7b, 0x92, 0x2d, 0xaf, + 0xc9, 0xe4, 0x33, 0xef, 0x89, 0x5c, 0x66, 0x99, 0xd8, 0x80, 0x81, 0x47, 0x2b, + 0xb1, 0x66, 0x02, 0x84, 0x59, 0x7b, 0xc3, 0xbe, 0x98, 0x45, 0x4a, 0x3d, 0xdd, + 0xea, 0x2b, 0xdf, 0x4e, 0xb4, 0x24, 0x6b, 0xec, 0xe7, 0xd9, 0x0c, 0x45, 0xb8, + 0xbe, 0xca, 0x69, 0x37, 0x92, 0x4c, 0x38, 0x6b, 0x96, 0x6d, 0xcd, 0x86, 0x67, + 0x5c, 0xea, 0x54, 0x94, 0xa4, 0xca, 0xa4, 0x02, 0xa5, 0x21, 0x4d, 0xae, 0x40, + 0x8f, 0x9d, 0x51, 0x83, 0xf2, 0x3f, 0x33, 0xc1, 0x72, 0xb4, 0x1d, 0x94, 0x6e, + 0x7d, 0xe4, 0x27, 0x3f, 0xea, 0xff, 0xe5, 0x9b, 0xa7, 0x5e, 0x55, 0x8e, 0x0d, + 0x69, 0x1c, 0x7a, 0xff, 0x81, 0x9d, 0x53, 0x52, 0x97, 0x9a, 0x76, 0x79, 0xda, + 0x93, 0x32, 0x16, 0xec, 0x69, 0x51, 0x1a, 0x4e, 0xc3, 0xf1, 0x72, 0x80, 0x78, + 0x5e, 0x66, 0x4a, 0x8d, 0x85, 0x2f, 0x3f, 0xb2, 0xa7 }; + +static void test_verify_sig(void) +{ + BOOL ret; + HCRYPTPROV prov; + HCRYPTKEY key; + HCRYPTHASH hash; + BYTE bogus[] = { 0 }; + + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(0, NULL, 0, 0, NULL, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, 0); + ret = pCryptImportKey(prov, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key); + ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); + ret = pCryptCreateHash(prov, CALG_MD5, 0, 0, &hash); + ok(ret, "CryptCreateHash failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(hash, NULL, 0, 0, NULL, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(0, NULL, 0, key, NULL, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(hash, NULL, 0, key, NULL, 0); + ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(hash, NULL, sizeof(bogus), key, NULL, 0); + ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(hash, bogus, 0, key, NULL, 0); + ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pCryptVerifySignatureW(hash, bogus, sizeof(bogus), key, NULL, 0); + ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + pCryptDestroyKey(key); + pCryptDestroyHash(hash); + pCryptReleaseContext(prov, 0); +} + static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, DWORD *pcbProvName, DWORD *pdwProvCount) { @@ -779,6 +854,7 @@ START_TEST(crypt) init_environment(); test_acquire_context(); test_incorrect_api_usage(); + test_verify_sig(); clean_up_environment(); }

1 0

appdb/. screenshots.php
by WineHQ 23 Aug '07

23 Aug '07

ChangeSet ID: 31336 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/22 21:33:57 Modified files: . : screenshots.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove logic that was preventing the opening of the version frame. The code to open the version frame also determins if the user maintains the version or not, which decides whether we include the "Delete Image" link. Change fixes missing "Delete Image" link for maintainers. Patch: http://cvs.winehq.org/patch.py?id=31336 Old revision New revision Changes Path 1.49 1.50 +6 -4 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.49 appdb/screenshots.php:1.50 --- appdb/screenshots.php:1.49 23 Aug 2007 2:33:57 -0000 +++ appdb/screenshots.php 23 Aug 2007 2:33:57 -0000 @@ -62,7 +62,7 @@ $oVersion = new Version($aClean['iVersio if($hResult && query_num_rows($hResult)) { - echo html_frame_start("Screenshot Gallery for ".$oApp->sName." ".$oVersion->sName,500); + echo html_frame_start("Screenshot Gallery for ".$oApp->sName, 500); // display thumbnails $c = 1; @@ -77,7 +77,7 @@ if($hResult && query_num_rows($hResult)) // if the current version changed then update the current version // and close the previous html frame if this isn't the // first frame - if(!$aClean['iVersionId'] && $oRow->versionId != $iCurrentVersionId) + if($oRow->versionId != $iCurrentVersionId) { if($iCurrentVersionId) { @@ -86,13 +86,14 @@ if($hResult && query_num_rows($hResult)) $c=1; } $iCurrentVersionId = $oRow->versionId; - $bUserIsMaintainerOfVersion = $_SESSION['current']->isMaintainer($iCurrentVersionId); + $bUserIsMaintainerOfVersion = $_SESSION['current']->isMaintainer($iCurrentVersionId); echo html_frame_start("Version ".Version::lookup_name($iCurrentVersionId)); echo "<div align=center><table><tr>\n"; } $oScreenshot = new Screenshot($oRow->id); $img = $oScreenshot->get_thumbnail_img(); + // display image echo "<td>\n"; echo $img; @@ -120,7 +121,8 @@ if($hResult && query_num_rows($hResult)) echo html_frame_end(); // close the current version we are displaying echo html_frame_end(); // close the "Screenshot Gallary..." html frame -} else { +} else +{ echo "<p align=\"center\">There are currently no screenshots for the selected version of this application."; echo "<br />Please consider submitting a screenshot for the selected version yourself.</p>"; }

1 0

appdb/. screenshots.php
by WineHQ 23 Aug '07

23 Aug '07

ChangeSet ID: 31335 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/22 20:48:45 Modified files: . : screenshots.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Require that users be logged in to submit screenshots. Display a login link on the screenshots page for users that aren't logged in so they know that if they login they'll be able to submit screenshots. Patch: http://cvs.winehq.org/patch.py?id=31335 Old revision New revision Changes Path 1.48 1.49 +7 -2 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.48 appdb/screenshots.php:1.49 --- appdb/screenshots.php:1.48 23 Aug 2007 1:48:45 -0000 +++ appdb/screenshots.php 23 Aug 2007 1:48:45 -0000 @@ -125,8 +125,9 @@ if($hResult && query_num_rows($hResult)) echo "<br />Please consider submitting a screenshot for the selected version yourself.</p>"; } -// let's show the screenshot uploading box -if($aClean['iVersionId']) +// let's show the screenshot uploading box, but only +// if the user is logged in +if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) { echo "<p align=\"center\">When submitting screenshots please ensure that the focus is on the application running inside Wine."; echo "<br />This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop.</p>"; @@ -144,6 +145,10 @@ if($aClean['iVersionId']) echo '<input type="hidden" name="MAX_FILE_SIZE" value="4000000" />',"\n"; echo '<input type="hidden" name="sCmd" value="screenshot_upload" />',"\n"; echo '<input type="hidden" name="iVersionId" value="'.$aClean['iVersionId'].'"></form />',"\n"; +} else // else let the person know that if they log in they can submit screenshots +{ + echo '<div align="center"><a href="'.login_url().'">'; + echo "Log in</a> to submit screenshots</div>\n"; } echo html_back_link(1);

1 0