May 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : wine.inf: Unify all the control panel settings.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: bd621203ac835844ffca25b7bd53646f9b1b1eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd621203ac835844ffca25b7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 12:42:20 2012 +0200 wine.inf: Unify all the control panel settings. --- tools/wine.inf.in | 49 +++++++++++++++++++++---------------------------- 1 files changed, 21 insertions(+), 28 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a01c8bb..1b8e56d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -35,11 +35,10 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ + ControlPanel,\ CurrentVersion,\ Debugger,\ - Desktop,\ Dotnet,\ - Metrics,\ DirectX,\ Fonts,\ MCI,\ @@ -61,11 +60,10 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ + ControlPanel,\ CurrentVersion,\ Debugger,\ - Desktop,\ Dotnet,\ - Metrics,\ DirectX,\ Fonts,\ MCI,\ @@ -88,12 +86,11 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ + ControlPanel,\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ - Desktop,\ Dotnet,\ - Metrics,\ DirectX,\ Fonts,\ MCI,\ @@ -156,8 +153,6 @@ AddService=FontCache3.0.0.0,0,FontCacheService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" -Desktop="Control Panel\Desktop" -Metrics="Control Panel\Desktop\WindowMetrics" CurrentVersion="Software\Microsoft\Windows\CurrentVersion" CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" @@ -500,13 +495,24 @@ HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32" -[Desktop] -HKCU,%Desktop%,"FontSmoothing",2,"0" -HKCU,%Desktop%,"DragFullWindows",2,"0" -HKCU,%Desktop%,"SmoothScroll",3,00,00,00,00 -HKCU,%Desktop%,"UserPreferenceMask",3,10,00,00,80 -HKCU,%Desktop%,"LowPowerActive",,"0" -HKCU,%Desktop%,"MenuShowDelay",2,"400" +[ControlPanel] +HKCU,Control Panel\Desktop,DragFullWindows,2,"0" +HKCU,Control Panel\Desktop,FontSmoothing,2,"0" +HKCU,Control Panel\Desktop,LowPowerActive,,"0" +HKCU,Control Panel\Desktop,MenuShowDelay,2,"400" +HKCU,Control Panel\Desktop,SmoothScroll,3,00,00,00,00 +HKCU,Control Panel\Desktop,UserPreferenceMask,3,10,00,00,80 +HKCU,Control Panel\Desktop\WindowMetrics,BorderWidth,2,"1" +HKCU,Control Panel\Desktop\WindowMetrics,CaptionHeight,2,"18" +HKCU,Control Panel\Desktop\WindowMetrics,CaptionWidth,2,"18" +HKCU,Control Panel\Desktop\WindowMetrics,MenuHeight,2,"18" +HKCU,Control Panel\Desktop\WindowMetrics,MenuWidth,2,"18" +HKCU,Control Panel\Desktop\WindowMetrics,ScrollHeight,2,"16" +HKCU,Control Panel\Desktop\WindowMetrics,ScrollWidth,2,"16" +HKCU,Control Panel\Desktop\WindowMetrics,Shell Icon Size,2,"32" +HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" +HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" +HKCU,Control Panel\Mouse,Beep,2,"No" [DotNet] HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" @@ -534,18 +540,6 @@ HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 -[Metrics] -HKCU,%Metrics%,"ScrollWidth",2,"16" -HKCU,%Metrics%,"ScrollHeight",2,"16" -HKCU,%Metrics%,"CaptionWidth",2,"18" -HKCU,%Metrics%,"CaptionHeight",2,"18" -HKCU,%Metrics%,"SmCaptionWidth",2,"13" -HKCU,%Metrics%,"SmCaptionHeight",2,"15" -HKCU,%Metrics%,"MenuWidth",2,"18" -HKCU,%Metrics%,"MenuHeight",2,"18" -HKCU,%Metrics%,"BorderWidth",2,"1" -HKCU,%Metrics%,"Shell Icon Size",2,"32" - [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00 @@ -658,7 +652,6 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo" HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] -HKCU,Control Panel\Mouse,"Beep",2,"No" HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client"

1 0

Alexandre Julliard : winex11: Add support for OpenGL rendering in DIBs using an intermediate pixmap.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: ba7db0998ccaafc2c5b0939110a570688a01106d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7db0998ccaafc2c5b093911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 17:06:50 2012 +0200 winex11: Add support for OpenGL rendering in DIBs using an intermediate pixmap. --- dlls/winex11.drv/opengl.c | 205 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 162 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba7db0998ccaafc2c5b09…

1 0

Alexandre Julliard : winex11: Use an intermediate pixmap also for DDBs to handle format mismatches.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: b082b3acba54c69db0338b000fa9ceded9ed94c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b082b3acba54c69db0338b000… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 17:35:09 2012 +0200 winex11: Use an intermediate pixmap also for DDBs to handle format mismatches. --- dlls/winex11.drv/bitmap.c | 2 - dlls/winex11.drv/opengl.c | 56 +------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 883deba..f00e530 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -239,8 +239,6 @@ BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap ) if (physBitmap) { - if (physBitmap->glxpixmap) - destroy_glxpixmap( gdi_display, physBitmap->glxpixmap ); wine_tsx11_lock(); if (physBitmap->pixmap) XFreePixmap( gdi_display, physBitmap->pixmap ); XDeleteContext( gdi_display, (XID)hbitmap, bitmap_context ); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1b5c7a9..95c1169 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1172,24 +1172,6 @@ Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent) } -static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev, WineGLPixelFormat *fmt) -{ - GLXPixmap ret = 0; - XVisualInfo *vis; - - wine_tsx11_lock(); - - vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); - if(vis) { - if(vis->depth == physDev->bitmap->depth) - ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); - XFree(vis); - } - wine_tsx11_unlock(); - TRACE("return %lx\n", ret); - return ret; -} - /** * glxdrv_ChoosePixelFormat * @@ -1610,16 +1592,6 @@ static BOOL internal_SetPixelFormat( struct glx_physdev *physdev, return FALSE; } - if (physdev->x11dev->bitmap->hbitmap == GetCurrentObject( physdev->dev.hdc, OBJ_BITMAP )) - { - physdev->x11dev->bitmap->glxpixmap = create_bitmap_glxpixmap(physdev->x11dev, fmt); - if(!physdev->x11dev->bitmap->glxpixmap) { - WARN("Couldn't create glxpixmap for pixel format %d\n", iPixelFormat); - return FALSE; - } - } - /* otherwise we have a DIB section */ - physdev->pixel_format = iPixelFormat; physdev->type = DC_GL_BITMAP; } @@ -1830,17 +1802,11 @@ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) static GLXPixmap get_context_pixmap( struct glx_physdev *physdev, struct wine_glcontext *ctx ) { - HBITMAP bitmap = GetCurrentObject( physdev->dev.hdc, OBJ_BITMAP ); - - if (physdev->x11dev->bitmap->hbitmap == bitmap) return physdev->x11dev->bitmap->glxpixmap; - - /* otherwise we have a DIB section */ - if (!ctx->pixmap) { BITMAP bmp; - GetObjectW( bitmap, sizeof(bmp), &bmp ); + GetObjectW( GetCurrentObject( physdev->dev.hdc, OBJ_BITMAP ), sizeof(bmp), &bmp ); wine_tsx11_lock(); ctx->pixmap = XCreatePixmap( gdi_display, root_window, @@ -3974,24 +3940,6 @@ static BOOL glxdrv_DeleteDC( PHYSDEV dev ) return TRUE; } -/*********************************************************************** - * glxdrv_SelectBitmap - */ -static HBITMAP glxdrv_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) -{ - HBITMAP ret; - struct glx_physdev *physdev = get_glxdrv_dev( dev ); - - dev = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); - ret = dev->funcs->pSelectBitmap( dev, hbitmap ); - if (ret) - { - if (hbitmap == BITMAP_stock_phys_bitmap.hbitmap) physdev->drawable = 0; - else physdev->drawable = X11DRV_get_phys_bitmap(hbitmap)->glxpixmap; - } - return ret; -} - /********************************************************************** * glxdrv_ExtEscape */ @@ -4122,7 +4070,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = NULL, /* pSaveDC */ NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */ - glxdrv_SelectBitmap, /* pSelectBitmap */ + NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5533c76..82889c2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -108,7 +108,6 @@ typedef struct { HBITMAP hbitmap; Pixmap pixmap; - XID glxpixmap; int depth; /* depth of the X pixmap */ int format; /* color format (used by XRender) */ ColorShifts color_shifts; /* color shifts of the X pixmap */

1 0

Alexandre Julliard : gdi32: Pass OpenGL calls through to the display driver from the DIB engine.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 1392bfce3c3811f885a070f1830836327eef00f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1392bfce3c3811f885a070f18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 17:07:15 2012 +0200 gdi32: Pass OpenGL calls through to the display driver from the DIB engine. --- dlls/gdi32/dibdrv/dc.c | 188 ++++-------------------------------------- dlls/opengl32/tests/opengl.c | 4 +- 2 files changed, 19 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1392bfce3c3811f885a07…

1 0

Alexandre Julliard : opengl32/tests: Add some more tests for bitmap rendering.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 1157ccccd7cceac6c3af7e3bf8ae88d3cfb24d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1157ccccd7cceac6c3af7e3bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 17:07:33 2012 +0200 opengl32/tests: Add some more tests for bitmap rendering. --- dlls/opengl32/tests/opengl.c | 117 +++++++++++++++++++++++++++++++++--------- 1 files changed, 92 insertions(+), 25 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index e6e4881..a91dfb8 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -515,37 +515,49 @@ static void test_acceleration(HDC hdc) } } -static void test_bitmap_rendering(void) +static void test_bitmap_rendering( BOOL use_dib ) { PIXELFORMATDESCRIPTOR pfd; - int i, iPixelFormat=0; + int i, ret, bpp, iPixelFormat=0; unsigned int nFormats; - HGLRC hglrc; + HGLRC hglrc, hglrc2; BITMAPINFO biDst; - HBITMAP bmpDst, oldDst; + HBITMAP bmpDst, oldDst, bmp2; HDC hdcDst, hdcScreen; - UINT32 *dstBuffer; - - memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = -2; - biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; - biDst.bmiHeader.biCompression = BI_RGB; + UINT *dstBuffer = NULL; hdcScreen = CreateCompatibleDC(0); - if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) + hdcDst = CreateCompatibleDC(0); + + if (use_dib) { - DeleteDC(hdcScreen); - trace("Skipping bitmap rendering test\n"); - return; + bpp = 32; + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 4; + biDst.bmiHeader.biHeight = -4; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + bmpDst = CreateDIBSection(0, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + + biDst.bmiHeader.biWidth = 12; + biDst.bmiHeader.biHeight = -12; + biDst.bmiHeader.biBitCount = 16; + bmp2 = CreateDIBSection(0, &biDst, DIB_RGB_COLORS, NULL, NULL, 0); + } + else + { + bpp = GetDeviceCaps( hdcScreen, BITSPIXEL ); + bmpDst = CreateBitmap( 4, 4, 1, bpp, NULL ); + bmp2 = CreateBitmap( 12, 12, 1, bpp, NULL ); } - hdcDst = CreateCompatibleDC(hdcScreen); - bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); + trace( "testing on %s\n", use_dib ? "DIB" : "DDB" ); + /* Pick a pixel format by hand because ChoosePixelFormat is unreliable */ nFormats = DescribePixelFormat(hdcDst, 0, 0, NULL); for(i=1; i<=nFormats; i++) @@ -555,7 +567,7 @@ static void test_bitmap_rendering(void) if((pfd.dwFlags & PFD_DRAW_TO_BITMAP) && (pfd.dwFlags & PFD_SUPPORT_OPENGL) && - (pfd.cColorBits == 32) && + (pfd.cColorBits == bpp) && (pfd.cAlphaBits == 8) ) { iPixelFormat = i; @@ -569,31 +581,85 @@ static void test_bitmap_rendering(void) } else { - SetPixelFormat(hdcDst, iPixelFormat, &pfd); + ret = SetPixelFormat(hdcDst, iPixelFormat, &pfd); + ok( ret, "SetPixelFormat failed\n" ); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); hglrc = wglCreateContext(hdcDst); ok(hglrc != NULL, "Unable to create a context\n"); if(hglrc) { + GLint viewport[4]; wglMakeCurrent(hdcDst, hglrc); + hglrc2 = wglCreateContext(hdcDst); + ok(hglrc2 != NULL, "Unable to create a context\n"); /* Note this is RGBA but we read ARGB back */ glClearColor((float)0x22/0xff, (float)0x33/0xff, (float)0x44/0xff, (float)0x11/0xff); glClear(GL_COLOR_BUFFER_BIT); + glGetIntegerv( GL_VIEWPORT, viewport ); glFinish(); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); /* Note apparently the alpha channel is not supported by the software renderer (bitmap only works using software) */ - ok(dstBuffer[0] == 0x223344 || dstBuffer[0] == 0x11223344, "Received color=%x\n", dstBuffer[0]); + if (dstBuffer) + for (i = 0; i < 16; i++) + ok(dstBuffer[i] == 0x223344 || dstBuffer[i] == 0x11223344, "Received color=%x at %u\n", + dstBuffer[i], i); + + SelectObject(hdcDst, bmp2); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); + + /* context still uses the old pixel format and viewport */ + glClearColor((float)0x44/0xff, (float)0x33/0xff, (float)0x22/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); wglMakeCurrent(NULL, NULL); - wglDeleteContext(hglrc); + wglMakeCurrent(hdcDst, hglrc); + glClearColor((float)0x44/0xff, (float)0x55/0xff, (float)0x66/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglMakeCurrent(hdcDst, hglrc2); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglMakeCurrent(hdcDst, hglrc); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + SelectObject(hdcDst, bmpDst); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); + wglMakeCurrent(hdcDst, hglrc2); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); } } SelectObject(hdcDst, oldDst); + DeleteObject(bmp2); DeleteObject(bmpDst); DeleteDC(hdcDst); - DeleteDC(hdcScreen); } @@ -1305,7 +1371,8 @@ START_TEST(opengl) res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError()); - test_bitmap_rendering(); + test_bitmap_rendering( TRUE ); + test_bitmap_rendering( FALSE ); test_minimized(); test_window_dc(); test_dc(hwnd, hdc);

1 0

Hans Leidekker : rpcrt4: Add a stub implementation of RpcServerInqDefaultPrincNameA/W.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 4d6ff8543394981a34014f0359d4953c145fa1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6ff8543394981a34014f035… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 9 12:06:29 2012 +0200 rpcrt4: Add a stub implementation of RpcServerInqDefaultPrincNameA/W. --- dlls/rpcrt4/rpc_server.c | 40 +++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 +- dlls/rpcrt4/tests/rpc.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ include/rpcdce.h | 6 +++++ 4 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 6fd1a7b..91b7707 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -44,6 +44,7 @@ #include "rpc_message.h" #include "rpc_defs.h" #include "ncastatus.h" +#include "secext.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); @@ -1457,6 +1458,45 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au return RPC_S_OK; } +/****************************************************************************** + * RpcServerInqDefaultPrincNameA (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameA(ULONG AuthnSvc, RPC_CSTR *PrincName) +{ + RPC_STATUS ret; + RPC_WSTR principalW; + + TRACE("%u, %p\n", AuthnSvc, PrincName); + + if ((ret = RpcServerInqDefaultPrincNameW( AuthnSvc, &principalW )) == RPC_S_OK) + { + if (!(*PrincName = (RPC_CSTR)RPCRT4_strdupWtoA( principalW ))) return RPC_S_OUT_OF_MEMORY; + RpcStringFreeW( &principalW ); + } + return ret; +} + +/****************************************************************************** + * RpcServerInqDefaultPrincNameW (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameW(ULONG AuthnSvc, RPC_WSTR *PrincName) +{ + ULONG len = 0; + + FIXME("%u, %p\n", AuthnSvc, PrincName); + + if (AuthnSvc != RPC_C_AUTHN_WINNT) return RPC_S_UNKNOWN_AUTHN_SERVICE; + + GetUserNameExW( NameSamCompatible, NULL, &len ); + if (GetLastError() != ERROR_MORE_DATA) return RPC_S_INTERNAL_ERROR; + + if (!(*PrincName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return RPC_S_OUT_OF_MEMORY; + + GetUserNameExW( NameSamCompatible, *PrincName, &len ); + return RPC_S_OK; +} + /*********************************************************************** * RpcServerListen (RPCRT4.@) */ diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index ac590bf..4b5b553 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -427,8 +427,8 @@ @ stdcall RpcServerInqBindings(ptr) @ stub RpcServerInqCallAttributesA # wxp @ stub RpcServerInqCallAttributesW # wxp -@ stub RpcServerInqDefaultPrincNameA -@ stub RpcServerInqDefaultPrincNameW +@ stdcall RpcServerInqDefaultPrincNameA(long ptr) +@ stdcall RpcServerInqDefaultPrincNameW(long ptr) @ stub RpcServerInqIf @ stdcall RpcServerListen(long long long) @ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d914c97..739a00e 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -31,6 +31,7 @@ #include "rpc.h" #include "rpcdce.h" +#include "secext.h" typedef unsigned int unsigned32; typedef struct twr_t @@ -854,6 +855,59 @@ static void test_RpcBindingFree(void) status); } +static void test_RpcServerInqDefaultPrincName(void) +{ + RPC_STATUS ret; + RPC_CSTR principal, saved_principal; + BOOLEAN (WINAPI *pGetUserNameExA)(EXTENDED_NAME_FORMAT,LPSTR,PULONG); + char *username; + ULONG len = 0; + + pGetUserNameExA = (void *)GetProcAddress( LoadLibraryA("secur32.dll"), "GetUserNameExA" ); + if (!pGetUserNameExA) + { + win_skip( "GetUserNameExA not exported\n" ); + return; + } + pGetUserNameExA( NameSamCompatible, NULL, &len ); + username = HeapAlloc( GetProcessHeap(), 0, len ); + pGetUserNameExA( NameSamCompatible, username, &len ); + + ret = RpcServerInqDefaultPrincNameA( 0, NULL ); + ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); + + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_DEFAULT, NULL ); + ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); + + principal = (RPC_CSTR)0xdeadbeef; + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_DEFAULT, &principal ); + ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); + ok( principal == (RPC_CSTR)0xdeadbeef, "got unexpected principal\n" ); + + saved_principal = (RPC_CSTR)0xdeadbeef; + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_WINNT, &saved_principal ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + ok( saved_principal != (RPC_CSTR)0xdeadbeef, "expected valid principal\n" ); + ok( !strcmp( (const char *)saved_principal, username ), "got \'%s\'\n", saved_principal ); + trace("%s\n", saved_principal); + + ret = RpcServerRegisterAuthInfoA( (RPC_CSTR)"wine\\test", RPC_C_AUTHN_WINNT, NULL, NULL ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + + principal = (RPC_CSTR)0xdeadbeef; + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_WINNT, &principal ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + ok( principal != (RPC_CSTR)0xdeadbeef, "expected valid principal\n" ); + ok( !strcmp( (const char *)principal, username ), "got \'%s\'\n", principal ); + RpcStringFree( &principal ); + + ret = RpcServerRegisterAuthInfoA( saved_principal, RPC_C_AUTHN_WINNT, NULL, NULL ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + + RpcStringFree( &saved_principal ); + HeapFree( GetProcessHeap(), 0, username ); +} + START_TEST( rpc ) { UuidConversionAndComparison(); @@ -867,4 +921,5 @@ START_TEST( rpc ) test_UuidCreate(); test_UuidCreateSequential(); test_RpcBindingFree(); + test_RpcServerInqDefaultPrincName(); } diff --git a/include/rpcdce.h b/include/rpcdce.h index bbdc42f..84f6330 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -611,6 +611,12 @@ RPCRTAPI unsigned short RPC_ENTRY RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcServerInqDefaultPrincNameA( ULONG AuthnSvc, RPC_CSTR *PrincName ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcServerInqDefaultPrincNameW( ULONG AuthnSvc, RPC_WSTR *PrincName ); +#define RpcServerInqDefaultPrincName WINELIB_NAME_AW(RpcServerInqDefaultPrincName) + #ifdef __cplusplus } #endif

1 0

Andrew Eikum : dsound: Don' t destroy primary buffer until device is released.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: f0be44c82dca8760c787576e1bdf76383bac3ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0be44c82dca8760c787576e1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 9 08:48:56 2012 -0500 dsound: Don't destroy primary buffer until device is released. --- dlls/dsound/buffer.c | 44 ++++++++++++++++++++++++++--------------- dlls/dsound/dsound.c | 5 ---- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 33 +++++++++++++++++++++++------- dlls/dsound/sound3d.c | 9 ++++--- dlls/dsound/tests/dsound.c | 9 ++++++++ 6 files changed, 68 insertions(+), 33 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5f9e455..08f4ba7 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -327,16 +327,22 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref was %d\n", This, ref + 1); + ULONG ref; + + if (is_primary_buffer(This)){ + ref = capped_refcount_dec(&This->ref); + if(!ref) + capped_refcount_dec(&This->numIfaces); + TRACE("(%p) ref is now: %d\n", This, ref); + return ref; + } - if (!ref && !InterlockedDecrement(&This->numIfaces)) { - if (is_primary_buffer(This)) - primarybuffer_destroy(This); - else + ref = InterlockedDecrement(&This->ref); + if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - } + + TRACE("(%p) ref is now %d\n", This, ref); + return ref; } @@ -1077,16 +1083,22 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); - ULONG ref = InterlockedDecrement(&This->refiks); + ULONG ref; + + if (is_primary_buffer(This)){ + ref = capped_refcount_dec(&This->refiks); + if(!ref) + capped_refcount_dec(&This->numIfaces); + TRACE("(%p) ref is now: %d\n", This, ref); + return ref; + } - TRACE("(%p) ref was %d\n", This, ref + 1); + ref = InterlockedDecrement(&This->refiks); + if (!ref && !InterlockedDecrement(&This->numIfaces)) + secondarybuffer_destroy(This); + + TRACE("(%p) ref is now %d\n", This, ref); - if (!ref && !InterlockedDecrement(&This->numIfaces)) { - if (is_primary_buffer(This)) - primarybuffer_destroy(This); - else - secondarybuffer_destroy(This); - } return ref; } diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 91184c9..2429042 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1255,11 +1255,6 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) secondarybuffer_destroy(device->buffers[i]); } - if (device->primary) { - WARN("primary buffer not released\n"); - IDirectSoundBuffer8_Release((LPDIRECTSOUNDBUFFER8)device->primary); - } - hr = DSOUND_PrimaryDestroy(device); if (hr != DS_OK) WARN("DSOUND_PrimaryDestroy failed\n"); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 8c6f60b..bed6959 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -288,6 +288,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; +LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; /* duplex.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c39da8a..b5a09f8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -258,6 +258,13 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) EnterCriticalSection(&(device->mixlock)); DSOUND_PrimaryClose(device); + + if(device->primary && (device->primary->ref || device->primary->numIfaces)) + WARN("Destroying primary buffer while references held (%u %u)\n", device->primary->ref, device->primary->numIfaces); + + HeapFree(GetProcessHeap(), 0, device->primary); + device->primary = NULL; + HeapFree(GetProcessHeap(),0,device->pwfx); device->pwfx=NULL; @@ -756,21 +763,31 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer *iface) return ref; } -void primarybuffer_destroy(IDirectSoundBufferImpl *This) +/* Decreases *out by 1 to no less than 0. + * Returns the new value of *out. */ +LONG capped_refcount_dec(LONG *out) { - This->device->primary = NULL; - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); + LONG ref, oldref; + do { + ref = *out; + if(!ref) + return 0; + oldref = InterlockedCompareExchange(out, ref - 1, ref); + } while(oldref != ref); + return ref - 1; } static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); - DWORD ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); + ULONG ref; + + ref = capped_refcount_dec(&This->ref); + if(!ref) + capped_refcount_dec(&This->numIfaces); + + TRACE("(%p) primary ref is now %d\n", This, ref); - if (!ref && !InterlockedDecrement(&This->numIfaces)) - primarybuffer_destroy(This); return ref; } diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index c57aa2e..604d19b 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -699,12 +699,13 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - ULONG ref = InterlockedDecrement(&This->ref3D); + ULONG ref; - TRACE("(%p) ref was %d\n", This, ref + 1); + ref = capped_refcount_dec(&This->ref3D); + if(!ref) + capped_refcount_dec(&This->numIfaces); - if (!ref && !InterlockedDecrement(&This->numIfaces)) - primarybuffer_destroy(This); + TRACE("(%p) ref is now %d\n", This, ref); return ref; } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index c68a5de..4c46f67 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -493,6 +493,15 @@ static HRESULT test_primary(LPGUID lpGuid) !(dscaps.dwFlags & DSCAPS_EMULDRIVER),5.0,0,0,0,0,FALSE,0); ref=IDirectSoundBuffer_Release(primary); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); + + ref=IDirectSoundBuffer_AddRef(primary); + ok(ref==1,"IDirectSoundBuffer_AddRef() primary has %d references\n",ref); + + ref=IDirectSoundBuffer_Release(primary); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); + + ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " "should have 0\n",ref); }

1 0

Vincent Povirk : mscoree: Implement vtable fixups.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: a629ba4949e0cc5e908dd5a9c1cf0e4b0685487f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a629ba4949e0cc5e908dd5a9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 7 10:48:33 2012 -0500 mscoree: Implement vtable fixups. --- dlls/mscoree/corruntimehost.c | 232 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_main.c | 3 + dlls/mscoree/mscoree_private.h | 4 + 4 files changed, 237 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a629ba4949e0cc5e908dd…

1 0

Nikolay Sivov : msxml3/tests: Correct variant type.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: b2a5d37a468b38e89f6790c6763a3b2df8b76097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a5d37a468b38e89f6790c67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 20:13:32 2012 +0400 msxml3/tests: Correct variant type. --- dlls/msxml3/tests/saxreader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 73c16b9..0a0651b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1992,7 +1992,7 @@ static void test_saxreader(void) IStream_Write(stream, testXML, strlen(testXML), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; set_expected_seq(test_seq); @@ -2008,7 +2008,7 @@ static void test_saxreader(void) IStream_Write(stream, test_attributes, strlen(test_attributes), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) @@ -2151,7 +2151,7 @@ static void test_saxreader(void) IStream_Write(stream, test_attributes, strlen(test_attributes), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || @@ -2179,7 +2179,7 @@ static void test_saxreader(void) IStream_Write(stream, test_attributes, strlen(test_attributes), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || @@ -2205,7 +2205,7 @@ static void test_saxreader(void) IStream_Write(stream, attribute_normalize, strlen(attribute_normalize), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) ||

1 0

Eric Pouech : winedbg: Fix printing of fp registers for x86_64 CPU.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 721a3c910a74ba310e51a0325d738aa276624057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721a3c910a74ba310e51a0325… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 8 19:52:34 2012 +0200 winedbg: Fix printing of fp registers for x86_64 CPU. --- programs/winedbg/be_x86_64.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 0dd11c2..dde30f3 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -70,6 +70,14 @@ static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) else ctx->EFlags &= ~STEP_FLAG; } +static inline long double m128a_to_longdouble(const M128A m) +{ + /* gcc uses the same IEEE-754 representation as M128A for long double + * but 16 byte aligned (hence only the first 10 bytes out of the 16 are used) + */ + return *(long double*)&m; +} + static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { @@ -144,16 +152,12 @@ static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, for (i = 0; i < 4; i++) { - long double st; - memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); - dbg_printf(" st%u:%-16Lg ", i, st); + dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); } dbg_printf("\n"); for (i = 4; i < 8; i++) { - long double st; - memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); - dbg_printf(" st%u:%-16Lg ", i, st); + dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); } dbg_printf("\n");

1 0