wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Alexandre Julliard : winex11: Implement the entry points for creating and destroying cursors.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 9485f0b75680fc53a7218077cef417fad8a3aea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9485f0b75680fc53a7218077c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 19:25:14 2010 +0200 winex11: Implement the entry points for creating and destroying cursors. --- dlls/winex11.drv/mouse.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 2 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6b22877..e8f96c4 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -88,6 +88,7 @@ static const UINT button_up_flags[NB_BUTTONS] = POINT cursor_pos; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ +static XContext cursor_context; BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ); @@ -166,6 +167,17 @@ static inline void update_button_state( unsigned int state ) /* X-buttons are not reported from XQueryPointer */ } +/*********************************************************************** + * get_x11_cursor + */ +static Cursor get_x11_cursor( HCURSOR handle ) +{ + Cursor cursor; + + if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) + return cursor; + return 0; +} /*********************************************************************** * update_mouse_state @@ -945,6 +957,45 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) return cursor; } +/*********************************************************************** + * CreateCursorIcon (X11DRV.@) + */ +void CDECL X11DRV_CreateCursorIcon( HCURSOR handle, CURSORICONINFO *info ) +{ + static const WORD ICON_HOTSPOT = 0x4242; + Cursor cursor; + + /* ignore icons (FIXME: shouldn't use magic hotspot value) */ + if (info->ptHotSpot.x == ICON_HOTSPOT && info->ptHotSpot.y == ICON_HOTSPOT) return; + + wine_tsx11_lock(); + cursor = create_cursor( gdi_display, info ); + if (cursor) + { + if (!cursor_context) cursor_context = XUniqueContext(); + XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + TRACE( "cursor %p %ux%u, planes %u, bpp %u -> xid %lx\n", + handle, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, cursor ); + } + wine_tsx11_unlock(); +} + +/*********************************************************************** + * DestroyCursorIcon (X11DRV.@) + */ +void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) +{ + Cursor cursor; + + wine_tsx11_lock(); + if ((cursor = get_x11_cursor( handle ))) + { + TRACE( "%p xid %lx\n", handle, cursor ); + XFreeCursor( gdi_display, cursor ); + XDeleteContext( gdi_display, (XID)handle, cursor_context ); + } + wine_tsx11_unlock(); +} /*********************************************************************** * SetCursor (X11DRV.@) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 4f3dfe6..0a69581 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -73,6 +73,8 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx +@ cdecl CreateCursorIcon(long ptr) X11DRV_CreateCursorIcon +@ cdecl DestroyCursorIcon(long) X11DRV_DestroyCursorIcon @ cdecl SetCursor(long ptr) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos

1 0

Alexandre Julliard : user32: Add driver entry points for cursor creation and destruction, and pass the cursor handle to SetCursor.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: d676bf246da0c15d46d685598191b1146b764460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d676bf246da0c15d46d685598… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 14:10:46 2010 +0200 user32: Add driver entry points for cursor creation and destruction, and pass the cursor handle to SetCursor. --- dlls/user32/cursoricon.c | 12 +++++++++--- dlls/user32/driver.c | 34 +++++++++++++++++++++++++++++----- dlls/user32/user_private.h | 6 ++++-- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 7 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fcdb278..60e59c1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -955,6 +955,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, GetBitmapBits( hAndBits, sizeAnd, info + 1 ); GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd ); release_icon_ptr( hObj, info ); + USER_Driver->pCreateCursorIcon( hObj, info ); } DeleteObject( hAndBits ); @@ -1566,6 +1567,7 @@ HICON WINAPI CopyIcon( HICON hIcon ) memcpy( ptrNew, ptrOld, size ); release_icon_ptr( hIcon, ptrOld ); release_icon_ptr( hNew, ptrNew ); + USER_Driver->pCreateCursorIcon( hNew, ptrNew ); return hNew; } @@ -1578,7 +1580,10 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) TRACE_(icon)("%p\n", hIcon ); if (CURSORICON_DelSharedIcon( hIcon ) == -1) + { + USER_Driver->pDestroyCursorIcon( hIcon ); free_icon_handle( hIcon ); + } return TRUE; } @@ -1789,7 +1794,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu CURSORICONINFO *info = get_icon_ptr( hCursor ); /* release before calling driver (FIXME) */ if (info) release_icon_ptr( hCursor, info ); - USER_Driver->pSetCursor( info ); + USER_Driver->pSetCursor( hCursor, info ); } return hOldCursor; } @@ -1822,9 +1827,9 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) CURSORICONINFO *info = get_icon_ptr( cursor ); /* release before calling driver (FIXME) */ if (info) release_icon_ptr( cursor, info ); - USER_Driver->pSetCursor( info ); + USER_Driver->pSetCursor( cursor, info ); } - else USER_Driver->pSetCursor( NULL ); + else USER_Driver->pSetCursor( 0, NULL ); } return prev_count + increment; } @@ -2195,6 +2200,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } } release_icon_ptr( hObj, info ); + USER_Driver->pCreateCursorIcon( hObj, info ); } return hObj; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 608c598..ffbfbf8 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -84,6 +84,8 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ToUnicodeEx); GET_USER_FUNC(UnloadKeyboardLayout); GET_USER_FUNC(VkKeyScanEx); + GET_USER_FUNC(CreateCursorIcon); + GET_USER_FUNC(DestroyCursorIcon); GET_USER_FUNC(SetCursor); GET_USER_FUNC(GetCursorPos); GET_USER_FUNC(SetCursorPos); @@ -215,7 +217,15 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -1; } -static void CDECL nulldrv_SetCursor( struct tagCURSORICONINFO *info ) +static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info ) +{ +} + +static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) +{ +} + +static void CDECL nulldrv_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *info ) { } @@ -442,7 +452,9 @@ static USER_DRIVER null_driver = nulldrv_ToUnicodeEx, nulldrv_UnloadKeyboardLayout, nulldrv_VkKeyScanEx, - /* mouse functions */ + /* cursor/icon functions */ + nulldrv_CreateCursorIcon, + nulldrv_DestroyCursorIcon, nulldrv_SetCursor, nulldrv_GetCursorPos, nulldrv_SetCursorPos, @@ -558,9 +570,19 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_SetCursor( struct tagCURSORICONINFO *info ) +static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info ) +{ + load_driver()->pCreateCursorIcon( cursor, info ); +} + +static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) +{ + load_driver()->pDestroyCursorIcon( cursor ); +} + +static void CDECL loaderdrv_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *info ) { - load_driver()->pSetCursor( info ); + load_driver()->pSetCursor( cursor, info ); } static BOOL CDECL loaderdrv_GetCursorPos( LPPOINT pt ) @@ -783,7 +805,9 @@ static USER_DRIVER lazy_load_driver = loaderdrv_ToUnicodeEx, loaderdrv_UnloadKeyboardLayout, loaderdrv_VkKeyScanEx, - /* mouse functions */ + /* cursor/icon functions */ + loaderdrv_CreateCursorIcon, + loaderdrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, loaderdrv_SetCursorPos, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index eb6bdc9..953812b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -67,8 +67,10 @@ typedef struct tagUSER_DRIVER { INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL); BOOL (CDECL *pUnloadKeyboardLayout)(HKL); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); - /* mouse functions */ - void (CDECL *pSetCursor)(struct tagCURSORICONINFO *); + /* cursor/icon functions */ + void (CDECL *pCreateCursorIcon)(HCURSOR,struct tagCURSORICONINFO *); + void (CDECL *pDestroyCursorIcon)(HCURSOR); + void (CDECL *pSetCursor)(HCURSOR,struct tagCURSORICONINFO *); BOOL (CDECL *pGetCursorPos)(LPPOINT); BOOL (CDECL *pSetCursorPos)(INT,INT); BOOL (CDECL *pClipCursor)(LPCRECT); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 211edfb..6b22877 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -949,7 +949,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) /*********************************************************************** * SetCursor (X11DRV.@) */ -void CDECL X11DRV_SetCursor( CURSORICONINFO *lpCursor ) +void CDECL X11DRV_SetCursor( HCURSOR handle, CURSORICONINFO *lpCursor ) { struct x11drv_thread_data *data = x11drv_init_thread_data(); Cursor cursor; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index edb9a33..4f3dfe6 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -73,7 +73,7 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx -@ cdecl SetCursor(ptr) X11DRV_SetCursor +@ cdecl SetCursor(long ptr) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a062e92..12ec286 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -784,7 +784,7 @@ extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr ); -extern void CDECL X11DRV_SetCursor( struct tagCURSORICONINFO *lpCursor ); +extern void CDECL X11DRV_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *lpCursor ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7b4fb58..240e4d9 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -664,7 +664,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) TlsSetValue( thread_data_tls_index, data ); if (use_xim) X11DRV_SetupXIM(); - X11DRV_SetCursor( NULL ); + X11DRV_SetCursor( 0, NULL ); return data; }

1 0

Jeremy Newman : adding fr news for 20100402
by Jeremy Newman 20 Apr '10

20 Apr '10

Module: website Branch: master Commit: 1235749aae5337d48c5195f14913a01e821e118b URL: http://source.winehq.org/git/website.git/?a=commit;h=1235749aae5337d48c5195… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Apr 20 14:39:57 2010 -0500 adding fr news for 20100402 --- news/fr/2010040201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/fr/2010040201.xml b/news/fr/2010040201.xml new file mode 100644 index 0000000..76d6c42 --- /dev/null +++ b/news/fr/2010040201.xml @@ -0,0 +1,18 @@ +<news> +<date>2 avril 2010</date> +<title>Sortie de Wine 1.1.42</title> +<body> + Wine 1.1.42 est maintenant disponible. + <a href="{$root}/announce/1.1.42">Ce qu'il y a de nouveau dans cette</a> dans cette sortie: +<ul> + <li>Support pour les configurations partagées 32/64.</li> + <li>Informations de suppport de débogage Dwarf pour de meilleurs backtraces.</li> + <li>Plus d'actions standard supportées dans MSI.</li> + <li>Support pour le format d'image TIFF dans WinCodecs.</li> + <li>Un certain nombre d'améliorations à Direct3D.</li> + <li>Corrections du shell pour un meilleur support d'Internet Explorer.</li> + <li>Corrections de divers bogues.</li> +</ul> +La source est <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.42.tar.bz2">disponible ici</a>. +Les paquets binaires sont en train d'être construits et apparaîtront bientôt à leurs <a href="{$root}/download">lieux de téléchargement respectifs</a>. +</body></news>

1 0

Tony Wasserka : d3dx9: Add tests for D3DXDeclaratorFromFVF.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 7746136f9a2e0957e21aed104b62410a4eabd714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7746136f9a2e0957e21aed104… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Apr 19 05:52:17 2010 +0200 d3dx9: Add tests for D3DXDeclaratorFromFVF. --- dlls/d3dx9_36/tests/mesh.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 0f451a2..8e4e26d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -225,6 +225,100 @@ static void D3DXComputeBoundingSphereTest(void) ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } +static void D3DXDeclaratorFromFVFTest(void) +{ + D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE]; + HRESULT hr; + int i; + + static const D3DVERTEXELEMENT9 exp1[6] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 0xC, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, + {0, 0x18, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + {0, 0x1C, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, + {0, 0x20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT,D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END(), }; + + static const D3DVERTEXELEMENT9 exp2[3] = { + {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, + {0, 0x10, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_PSIZE, 0}, + D3DDECL_END(), }; + + static const D3DVERTEXELEMENT9 exp3[4] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 0xC, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, + {0, 0x1C, D3DDECLTYPE_UBYTE4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, + D3DDECL_END(), }; + + /* Note: passing NULL as declaration segfaults */ + todo_wine + { + hr = D3DXDeclaratorFromFVF(0, decl); + ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); + ok(decl[0].Stream == 0xFF, "D3DXDeclaratorFromFVF returned an incorrect vertex declaration\n"); /* end element */ + + hr = D3DXDeclaratorFromFVF(D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, decl); + ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + for (i=0; i<4; i++) + { + ok(decl[i].Stream == exp1[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp1[i].Stream); + ok(decl[i].Type == exp1[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp1[i].Type); + ok(decl[i].Method == exp1[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp1[i].Method); + ok(decl[i].Usage == exp1[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp1[i].Usage); + ok(decl[i].UsageIndex == exp1[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp1[i].UsageIndex); + ok(decl[i].Offset == exp1[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, exp1[i].Offset); + } + ok(decl[5].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + } + + todo_wine + { + hr = D3DXDeclaratorFromFVF(D3DFVF_XYZRHW | D3DFVF_PSIZE, decl); + ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + for (i=0; i<1; i++) + { + ok(decl[i].Stream == exp2[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp2[i].Stream); + ok(decl[i].Type == exp2[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp1[i].Type); + ok(decl[i].Method == exp2[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp2[i].Method); + ok(decl[i].Usage == exp2[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp2[i].Usage); + ok(decl[i].UsageIndex == exp2[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp2[i].UsageIndex); + ok(decl[i].Offset == exp2[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, exp2[i].Offset); + } + ok(decl[2].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + } + + todo_wine + { + hr = D3DXDeclaratorFromFVF(D3DFVF_XYZB5, decl); + ok(hr == D3DERR_INVALIDCALL, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXDeclaratorFromFVF(D3DFVF_XYZB5 | D3DFVF_LASTBETA_UBYTE4, decl); + ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + for (i=0; i<2; i++) + { + ok(decl[i].Stream == exp3[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp3[i].Stream); + ok(decl[i].Type == exp3[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp3[i].Type); + ok(decl[i].Method == exp3[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp3[i].Method); + ok(decl[i].Usage == exp3[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp3[i].Usage); + ok(decl[i].UsageIndex == exp3[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp3[i].UsageIndex); + ok(decl[i].Offset == exp3[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, exp3[i].Offset); + } + ok(decl[3].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + } +} + static void D3DXGetFVFVertexSizeTest(void) { UINT got; @@ -459,6 +553,7 @@ START_TEST(mesh) D3DXBoundProbeTest(); D3DXComputeBoundingBoxTest(); D3DXComputeBoundingSphereTest(); + D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); test_get_decl_vertex_size();

1 0

Tony Wasserka : d3dx9: Add a stubbed D3DXDeclaratorFromFVF.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: a1945388f53d45b6cea6298383f53f7aa4b132a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1945388f53d45b6cea629838… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Apr 19 05:51:06 2010 +0200 d3dx9: Add a stubbed D3DXDeclaratorFromFVF. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 11 +++++++++++ include/d3dx9mesh.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0151f00..8b2796a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -118,7 +118,7 @@ @ stub D3DXCreateVolumeTextureFromResourceExW @ stub D3DXCreateVolumeTextureFromResourceW @ stdcall D3DXDebugMute(long) -@ stub D3DXDeclaratorFromFVF +@ stdcall D3DXDeclaratorFromFVF(long ptr) @ stub D3DXDisassembleEffect @ stub D3DXDisassembleShader @ stub D3DXFileCreate diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d5a1b2b..9691eed 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2,6 +2,7 @@ * Mesh operations specific to D3DX9. * * Copyright (C) 2009 David Adam + * Copyright (C) 2010 Tony Wasserka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -167,6 +168,16 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR } /************************************************************************* + * D3DXDeclaratorFromFVF + */ +HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) +{ + FIXME("(%d, %p): stub\n", fvf, Declaration); + + return E_NOTIMPL; +} + +/************************************************************************* * D3DXGetFVFVertexSize */ static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 84db95f..5773d24 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 David Adam + * Copyright (C) 2010 Tony Wasserka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -130,6 +131,7 @@ BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); +HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

Paul Vriens : wordpad: Update/fix Dutch translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 26e93215a4204b59df48735c6ed9ac0fc92852c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e93215a4204b59df48735c6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Apr 20 14:36:02 2010 +0200 wordpad: Update/fix Dutch translation. --- programs/wordpad/Nl.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 5741dbe..e68f4b0 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -21,6 +21,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Bestand" @@ -99,7 +101,7 @@ BEGIN POPUP "" BEGIN MENUITEM "K&nippen", ID_EDIT_CUT - MENUITEM "&Kopieren", ID_EDIT_COPY + MENUITEM "&Kopiëren", ID_EDIT_COPY MENUITEM "&Plakken", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullet points" ID_BULLET @@ -127,7 +129,7 @@ BEGIN MENUITEM "Fuchsiapaars" ID_COLOR_FUCHSIA MENUITEM "Zeeblauw" ID_COLOR_AQUA MENUITEM "Wit" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatisch" ID_COLOR_AUTOMATIC END END @@ -238,8 +240,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Sluiten" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" + STRING_PREVIEW_PAGE, "Pagina" + STRING_PREVIEW_PAGES, "Pagina's" END STRINGTABLE DISCARDABLE @@ -251,17 +253,17 @@ STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "Wijzigingen opslaan van '%s'?" - STRING_SEARCH_FINISHED, "Doorzoeken van document beeindigd." + STRING_SEARCH_FINISHED, "Doorzoeken van document beëindigd." STRING_LOAD_RICHED_FAILED, "Laden van de RichEdit library is mislukt." STRING_SAVE_LOSEFORMATTING, "U koos voor opslaan in gewoon tekst formaat, " \ "waardoor alle formatering verloren zal gaan. " \ "Weet u zeker dat u dit wilt?" STRING_INVALID_NUMBER, "Foutief nummer formaat" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten zijn niet ondersteund" - STRING_WRITE_FAILED, "Bestand kon niet opgeslagen worden." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten worden niet ondersteund" + STRING_WRITE_FAILED, "Bestand kon niet worden opgeslagen." STRING_WRITE_ACCESS_DENIED, "Onvoldoende rechten om het bestand op te slaan." - STRING_OPEN_FAILED, "Bestand kon niet geopend worden." + STRING_OPEN_FAILED, "Bestand kon niet worden geopend." STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te openen." - STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd" + STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geïmplementeerd" STRING_MAX_TAB_STOPS, "Onmogelijk om meer dan 32 tab stops toe te voegen." END

1 0

Michael Stefaniuc : wineconsole: Always show an ASCII string in the font test.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: b0c4c93538f2ae5c99dc58ea19a9fba1500dc935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c4c93538f2ae5c99dc58ea1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 11:19:18 2010 +0200 wineconsole: Always show an ASCII string in the font test. --- programs/wineconsole/dialog.c | 33 +++++++++++++------------------ programs/wineconsole/wineconsole_Cs.rc | 3 +- programs/wineconsole/wineconsole_De.rc | 3 +- programs/wineconsole/wineconsole_En.rc | 3 +- programs/wineconsole/wineconsole_Eo.rc | 3 +- programs/wineconsole/wineconsole_Es.rc | 3 +- programs/wineconsole/wineconsole_Fr.rc | 3 +- programs/wineconsole/wineconsole_Hu.rc | 3 +- programs/wineconsole/wineconsole_It.rc | 3 +- programs/wineconsole/wineconsole_Ko.rc | 3 +- programs/wineconsole/wineconsole_Lt.rc | 3 +- programs/wineconsole/wineconsole_Nl.rc | 3 +- programs/wineconsole/wineconsole_No.rc | 3 +- programs/wineconsole/wineconsole_Pl.rc | 3 +- programs/wineconsole/wineconsole_Pt.rc | 6 +--- programs/wineconsole/wineconsole_Ru.rc | 3 +- programs/wineconsole/wineconsole_Si.rc | 3 +- programs/wineconsole/wineconsole_Sv.rc | 3 +- programs/wineconsole/wineconsole_Tr.rc | 3 +- programs/wineconsole/wineconsole_Zh.rc | 6 +--- programs/wineconsole/wineconsole_res.h | 3 +- 21 files changed, 36 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0c4c93538f2ae5c99dc5…

1 0

Maarten Lankhorst : mmdevapi: Add AudioSimpleVolume stub.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 724351ede47459ca5538ed5dc4f882048d9cbd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=724351ede47459ca5538ed5dc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:55 2010 +0200 mmdevapi: Add AudioSimpleVolume stub. --- dlls/mmdevapi/audio.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 3b384d8..4a7a4c6 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -78,6 +78,7 @@ typedef struct ACImpl { ACRender *render; ACCapture *capture; ACSession *session; + ASVolume *svolume; AClock *clock; } ACImpl; @@ -99,6 +100,12 @@ struct ACSession { ACImpl *parent; }; +struct ASVolume { + const ISimpleAudioVolumeVtbl *lpVtbl; + LONG ref; + ACImpl *parent; +}; + struct AClock { const IAudioClockVtbl *lpVtbl; const IAudioClock2Vtbl *lp2Vtbl; @@ -110,6 +117,7 @@ static const IAudioClientVtbl ACImpl_Vtbl; static const IAudioRenderClientVtbl ACRender_Vtbl; static const IAudioCaptureClientVtbl ACCapture_Vtbl; static const IAudioSessionControl2Vtbl ACSession_Vtbl; +static const ISimpleAudioVolumeVtbl ASVolume_Vtbl; static const IAudioClockVtbl AClock_Vtbl; static const IAudioClock2Vtbl AClock2_Vtbl; @@ -119,6 +127,8 @@ static HRESULT AudioCaptureClient_Create(ACImpl *parent, ACCapture **ppv); static void AudioCaptureClient_Destroy(ACCapture *This); static HRESULT AudioSessionControl_Create(ACImpl *parent, ACSession **ppv); static void AudioSessionControl_Destroy(ACSession *This); +static HRESULT AudioSimpleVolume_Create(ACImpl *parent, ASVolume **ppv); +static void AudioSimpleVolume_Destroy(ASVolume *This); static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv); static void AudioClock_Destroy(AClock *This); @@ -301,6 +311,8 @@ static void AudioClient_Destroy(ACImpl *This) AudioCaptureClient_Destroy(This->capture); if (This->session) AudioSessionControl_Destroy(This->session); + if (This->svolume) + AudioSimpleVolume_Destroy(This->svolume); if (This->clock) AudioClock_Destroy(This->clock); if (This->parent->flow == eRender && This->init) { @@ -876,6 +888,10 @@ static HRESULT WINAPI AC_GetService(IAudioClient *iface, REFIID riid, void **ppv if (!This->session) hr = AudioSessionControl_Create(This, &This->session); *ppv = This->session; + } else if (IsEqualIID(riid, &IID_ISimpleAudioVolume)) { + if (!This->svolume) + hr = AudioSimpleVolume_Create(This, &This->svolume); + *ppv = This->svolume; } else if (IsEqualIID(riid, &IID_IAudioClock)) { if (!This->clock) hr = AudioClock_Create(This, &This->clock); @@ -1452,6 +1468,111 @@ static const IAudioSessionControl2Vtbl ACSession_Vtbl = ACS_SetDuckingPreference }; +static HRESULT AudioSimpleVolume_Create(ACImpl *parent, ASVolume **ppv) +{ + ASVolume *This; + This = *ppv = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &ASVolume_Vtbl; + This->ref = 0; + This->parent = parent; + return S_OK; +} + +static void AudioSimpleVolume_Destroy(ASVolume *This) +{ + This->parent->svolume = NULL; + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI ASV_QueryInterface(ISimpleAudioVolume *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_ISimpleAudioVolume)) + *ppv = iface; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ASV_AddRef(ISimpleAudioVolume *iface) +{ + ASVolume *This = (ASVolume*)iface; + ULONG ref; + ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI ASV_Release(ISimpleAudioVolume *iface) +{ + ASVolume *This = (ASVolume*)iface; + ULONG ref; + ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + AudioSimpleVolume_Destroy(This); + return ref; +} + +static HRESULT WINAPI ASV_SetMasterVolume(ISimpleAudioVolume *iface, float level, const GUID *context) +{ + ASVolume *This = (ASVolume*)iface; + TRACE("(%p)->(%f,%p)\n", This, level, context); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI ASV_GetMasterVolume(ISimpleAudioVolume *iface, float *level) +{ + ASVolume *This = (ASVolume*)iface; + TRACE("(%p)->(%p)\n", This, level); + + *level = 1.f; + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI ASV_SetMute(ISimpleAudioVolume *iface, BOOL mute, const GUID *context) +{ + ASVolume *This = (ASVolume*)iface; + TRACE("(%p)->(%u,%p)\n", This, mute, context); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI ASV_GetMute(ISimpleAudioVolume *iface, BOOL *mute) +{ + ASVolume *This = (ASVolume*)iface; + TRACE("(%p)->(%p)\n", This, mute); + + *mute = 0; + FIXME("stub\n"); + return S_OK; +} + +static const ISimpleAudioVolumeVtbl ASVolume_Vtbl = +{ + ASV_QueryInterface, + ASV_AddRef, + ASV_Release, + ASV_SetMasterVolume, + ASV_GetMasterVolume, + ASV_SetMute, + ASV_GetMute +}; + static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv) { AClock *This;

1 0

Maarten Lankhorst : mmdevapi: Add support for IAudioSessionControl2.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: f259ae550e5f2e7f3ea07feb6dc4c92db66a07c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f259ae550e5f2e7f3ea07feb6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:54 2010 +0200 mmdevapi: Add support for IAudioSessionControl2. --- dlls/mmdevapi/audio.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 33099c5..3b384d8 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -77,6 +77,7 @@ typedef struct ACImpl { ACRender *render; ACCapture *capture; + ACSession *session; AClock *clock; } ACImpl; @@ -92,6 +93,12 @@ struct ACCapture { ACImpl *parent; }; +struct ACSession { + const IAudioSessionControl2Vtbl *lpVtbl; + LONG ref; + ACImpl *parent; +}; + struct AClock { const IAudioClockVtbl *lpVtbl; const IAudioClock2Vtbl *lp2Vtbl; @@ -102,6 +109,7 @@ struct AClock { static const IAudioClientVtbl ACImpl_Vtbl; static const IAudioRenderClientVtbl ACRender_Vtbl; static const IAudioCaptureClientVtbl ACCapture_Vtbl; +static const IAudioSessionControl2Vtbl ACSession_Vtbl; static const IAudioClockVtbl AClock_Vtbl; static const IAudioClock2Vtbl AClock2_Vtbl; @@ -109,6 +117,8 @@ static HRESULT AudioRenderClient_Create(ACImpl *parent, ACRender **ppv); static void AudioRenderClient_Destroy(ACRender *This); static HRESULT AudioCaptureClient_Create(ACImpl *parent, ACCapture **ppv); static void AudioCaptureClient_Destroy(ACCapture *This); +static HRESULT AudioSessionControl_Create(ACImpl *parent, ACSession **ppv); +static void AudioSessionControl_Destroy(ACSession *This); static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv); static void AudioClock_Destroy(AClock *This); @@ -289,6 +299,8 @@ static void AudioClient_Destroy(ACImpl *This) AudioRenderClient_Destroy(This->render); if (This->capture) AudioCaptureClient_Destroy(This->capture); + if (This->session) + AudioSessionControl_Destroy(This->session); if (This->clock) AudioClock_Destroy(This->clock); if (This->parent->flow == eRender && This->init) { @@ -860,6 +872,10 @@ static HRESULT WINAPI AC_GetService(IAudioClient *iface, REFIID riid, void **ppv if (!This->capture) hr = AudioCaptureClient_Create(This, &This->capture); *ppv = This->capture; + } else if (IsEqualIID(riid, &IID_IAudioSessionControl)) { + if (!This->session) + hr = AudioSessionControl_Create(This, &This->session); + *ppv = This->session; } else if (IsEqualIID(riid, &IID_IAudioClock)) { if (!This->clock) hr = AudioClock_Create(This, &This->clock); @@ -1230,6 +1246,212 @@ static const IAudioCaptureClientVtbl ACCapture_Vtbl = ACC_GetNextPacketSize }; +static HRESULT AudioSessionControl_Create(ACImpl *parent, ACSession **ppv) +{ + ACSession *This; + This = *ppv = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &ACSession_Vtbl; + This->ref = 0; + This->parent = parent; + return S_OK; +} + +static void AudioSessionControl_Destroy(ACSession *This) +{ + This->parent->session = NULL; + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI ACS_QueryInterface(IAudioSessionControl2 *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IAudioSessionControl) + || IsEqualIID(riid, &IID_IAudioSessionControl2)) + *ppv = iface; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ACS_AddRef(IAudioSessionControl2 *iface) +{ + ACSession *This = (ACSession*)iface; + ULONG ref; + ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI ACS_Release(IAudioSessionControl2 *iface) +{ + ACSession *This = (ACSession*)iface; + ULONG ref; + ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + AudioSessionControl_Destroy(This); + return ref; +} + +static HRESULT WINAPI ACS_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, state); + + if (!state) + return E_POINTER; + *state = This->parent->parent->state; + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_GetDisplayName(IAudioSessionControl2 *iface, WCHAR **name) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, name); + FIXME("stub\n"); + if (name) + *name = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_SetDisplayName(IAudioSessionControl2 *iface, const WCHAR *name, const GUID *session) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p,%s)\n", This, name, debugstr_guid(session)); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_GetIconPath(IAudioSessionControl2 *iface, WCHAR **path) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, path); + FIXME("stub\n"); + if (path) + *path = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_SetIconPath(IAudioSessionControl2 *iface, const WCHAR *path, const GUID *session) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p,%s)\n", This, path, debugstr_guid(session)); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_GetGroupingParam(IAudioSessionControl2 *iface, GUID *group) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, group); + FIXME("stub\n"); + if (group) + *group = GUID_NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_SetGroupingParam(IAudioSessionControl2 *iface, GUID *group, const GUID *session) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%s,%s)\n", This, debugstr_guid(group), debugstr_guid(session)); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_RegisterAudioSessionNotification(IAudioSessionControl2 *iface, IAudioSessionEvents *events) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, events); + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI ACS_UnregisterAudioSessionNotification(IAudioSessionControl2 *iface, IAudioSessionEvents *events) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, events); + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI ACS_GetSessionIdentifier(IAudioSessionControl2 *iface, WCHAR **id) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, id); + FIXME("stub\n"); + if (id) + *id = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_GetSessionInstanceIdentifier(IAudioSessionControl2 *iface, WCHAR **id) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, id); + FIXME("stub\n"); + if (id) + *id = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ACS_GetProcessId(IAudioSessionControl2 *iface, DWORD *pid) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)->(%p)\n", This, pid); + + if (!pid) + return E_POINTER; + *pid = GetCurrentProcessId(); + return S_OK; +} + +static HRESULT WINAPI ACS_IsSystemSoundsSession(IAudioSessionControl2 *iface) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)\n", This); + + return S_FALSE; +} + +static HRESULT WINAPI ACS_SetDuckingPreference(IAudioSessionControl2 *iface, BOOL optout) +{ + ACSession *This = (ACSession*)iface; + TRACE("(%p)\n", This); + + return S_OK; +} + +static const IAudioSessionControl2Vtbl ACSession_Vtbl = +{ + ACS_QueryInterface, + ACS_AddRef, + ACS_Release, + ACS_GetState, + ACS_GetDisplayName, + ACS_SetDisplayName, + ACS_GetIconPath, + ACS_SetIconPath, + ACS_GetGroupingParam, + ACS_SetGroupingParam, + ACS_RegisterAudioSessionNotification, + ACS_UnregisterAudioSessionNotification, + ACS_GetSessionIdentifier, + ACS_GetSessionInstanceIdentifier, + ACS_GetProcessId, + ACS_IsSystemSoundsSession, + ACS_SetDuckingPreference +}; + static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv) { AClock *This;

1 0

Maarten Lankhorst : mmdevapi: Add support for the clock interface.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 2e130087358e114d3791d0f849a742f4410e32e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e130087358e114d3791d0f84… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:53 2010 +0200 mmdevapi: Add support for the clock interface. --- dlls/mmdevapi/audio.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 997e037..33099c5 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -77,6 +77,7 @@ typedef struct ACImpl { ACRender *render; ACCapture *capture; + AClock *clock; } ACImpl; struct ACRender { @@ -91,14 +92,25 @@ struct ACCapture { ACImpl *parent; }; +struct AClock { + const IAudioClockVtbl *lpVtbl; + const IAudioClock2Vtbl *lp2Vtbl; + LONG ref; + ACImpl *parent; +}; + static const IAudioClientVtbl ACImpl_Vtbl; static const IAudioRenderClientVtbl ACRender_Vtbl; static const IAudioCaptureClientVtbl ACCapture_Vtbl; +static const IAudioClockVtbl AClock_Vtbl; +static const IAudioClock2Vtbl AClock2_Vtbl; static HRESULT AudioRenderClient_Create(ACImpl *parent, ACRender **ppv); static void AudioRenderClient_Destroy(ACRender *This); static HRESULT AudioCaptureClient_Create(ACImpl *parent, ACCapture **ppv); static void AudioCaptureClient_Destroy(ACCapture *This); +static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv); +static void AudioClock_Destroy(AClock *This); static int get_format_PCM(WAVEFORMATEX *format) { @@ -277,6 +289,8 @@ static void AudioClient_Destroy(ACImpl *This) AudioRenderClient_Destroy(This->render); if (This->capture) AudioCaptureClient_Destroy(This->capture); + if (This->clock) + AudioClock_Destroy(This->clock); if (This->parent->flow == eRender && This->init) { setALContext(This->parent->ctx); IAudioClient_Stop((IAudioClient*)This); @@ -846,6 +860,10 @@ static HRESULT WINAPI AC_GetService(IAudioClient *iface, REFIID riid, void **ppv if (!This->capture) hr = AudioCaptureClient_Create(This, &This->capture); *ppv = This->capture; + } else if (IsEqualIID(riid, &IID_IAudioClock)) { + if (!This->clock) + hr = AudioClock_Create(This, &This->clock); + *ppv = This->clock; } if (FAILED(hr)) @@ -1212,4 +1230,151 @@ static const IAudioCaptureClientVtbl ACCapture_Vtbl = ACC_GetNextPacketSize }; +static HRESULT AudioClock_Create(ACImpl *parent, AClock **ppv) +{ + AClock *This; + This = *ppv = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &AClock_Vtbl; + This->lp2Vtbl = &AClock2_Vtbl; + This->ref = 0; + This->parent = parent; + return S_OK; +} + +static void AudioClock_Destroy(AClock *This) +{ + This->parent->clock = NULL; + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI AClock_QueryInterface(IAudioClock *iface, REFIID riid, void **ppv) +{ + AClock *This = (AClock*)iface; + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IAudioClock)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IAudioClock2)) + *ppv = &This->lp2Vtbl; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AClock_AddRef(IAudioClock *iface) +{ + AClock *This = (AClock*)iface; + ULONG ref; + ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI AClock_Release(IAudioClock *iface) +{ + AClock *This = (AClock*)iface; + ULONG ref; + ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + AudioClock_Destroy(This); + return ref; +} + +static HRESULT WINAPI AClock_GetFrequency(IAudioClock *iface, UINT64 *freq) +{ + AClock *This = (AClock*)iface; + TRACE("(%p)->(%p)\n", This, freq); + + *freq = (UINT64)This->parent->pwfx->nSamplesPerSec; + return S_OK; +} + +static HRESULT WINAPI AClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) +{ + AClock *This = (AClock*)iface; + DWORD pad; + + TRACE("(%p)->(%p,%p)\n", This, pos, qpctime); + + if (!pos) + return E_POINTER; + + EnterCriticalSection(This->parent->crst); + AC_GetCurrentPadding((IAudioClient*)This->parent, &pad); + *pos = This->parent->frameswritten - pad; + if (qpctime) + *qpctime = gettime(); + LeaveCriticalSection(This->parent->crst); + + return S_OK; +} + +static HRESULT WINAPI AClock_GetCharacteristics(IAudioClock *iface, DWORD *chars) +{ + AClock *This = (AClock*)iface; + TRACE("(%p)->(%p)\n", This, chars); + + if (!chars) + return E_POINTER; + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; + return S_OK; +} + +static const IAudioClockVtbl AClock_Vtbl = +{ + AClock_QueryInterface, + AClock_AddRef, + AClock_Release, + AClock_GetFrequency, + AClock_GetPosition, + AClock_GetCharacteristics +}; + +static AClock *get_clock_from_clock2(IAudioClock2 *iface) +{ + return (AClock*)((char*)iface - offsetof(AClock,lp2Vtbl)); +} + +static HRESULT WINAPI AClock2_QueryInterface(IAudioClock2 *iface, REFIID riid, void **ppv) +{ + AClock *This = get_clock_from_clock2(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AClock2_AddRef(IAudioClock2 *iface) +{ + AClock *This = get_clock_from_clock2(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AClock2_Release(IAudioClock2 *iface) +{ + AClock *This = get_clock_from_clock2(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI AClock2_GetPosition(IAudioClock2 *iface, UINT64 *pos, UINT64 *qpctime) +{ + AClock *This = get_clock_from_clock2(iface); + return AClock_GetPosition((IAudioClock*)This, pos, qpctime); +} + +static const IAudioClock2Vtbl AClock2_Vtbl = +{ + AClock2_QueryInterface, + AClock2_AddRef, + AClock2_Release, + AClock2_GetPosition +}; + #endif

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010