November 2009 - Wine-Commits

Owen Rudge : comctl32: Implement Add, ReplaceIcon, GetImageCount, SetImageCount in IImageList.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: dff6be098eef5accd2a39350baa774afa42d63a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff6be098eef5accd2a39350b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Nov 13 11:14:23 2009 -0600 comctl32: Implement Add, ReplaceIcon, GetImageCount, SetImageCount in IImageList. --- dlls/comctl32/imagelist.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a8101e6..8853e22 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2985,15 +2985,37 @@ static ULONG WINAPI ImageListImpl_Release(IImageList *iface) static HRESULT WINAPI ImageListImpl_Add(IImageList *iface, HBITMAP hbmImage, HBITMAP hbmMask, int *pi) { - FIXME("STUB: %p %p %p %p\n", iface, hbmImage, hbmMask, pi); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + int ret; + + if (!pi) + return E_FAIL; + + ret = ImageList_Add(This, hbmImage, hbmMask); + + if (ret == -1) + return E_FAIL; + + *pi = ret; + return S_OK; } static HRESULT WINAPI ImageListImpl_ReplaceIcon(IImageList *iface, int i, HICON hicon, int *pi) { - FIXME("STUB: %p %d %p %p\n", iface, i, hicon, pi); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + int ret; + + if (!pi) + return E_FAIL; + + ret = ImageList_ReplaceIcon(This, i, hicon); + + if (ret == -1) + return E_FAIL; + + *pi = ret; + return S_OK; } static HRESULT WINAPI ImageListImpl_SetOverlayImage(IImageList *iface, @@ -3026,8 +3048,7 @@ static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) { - FIXME("STUB: %p %d\n", iface, i); - return E_NOTIMPL; + return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_FAIL : S_OK; } static HRESULT WINAPI ImageListImpl_GetIcon(IImageList *iface, int i, UINT flags, @@ -3089,15 +3110,17 @@ static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) { - FIXME("STUB: %p %p\n", iface, pi); - return E_NOTIMPL; + if (!pi) + return E_FAIL; + + *pi = ImageList_GetImageCount((HIMAGELIST) iface); + return S_OK; } static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList *iface, UINT uNewCount) { - FIXME("STUB: %p %d\n", iface, uNewCount); - return E_NOTIMPL; + return ImageList_SetImageCount((HIMAGELIST) iface, uNewCount) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk,

1 0

André Hentschel : gdi32/tests: Test CreateFontIndirect for suffix stripping.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 8f31df1dd812cbe8370bfb36c6eae9995b16451f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f31df1dd812cbe8370bfb36c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 13 23:05:20 2009 +0100 gdi32/tests: Test CreateFontIndirect for suffix stripping. --- dlls/gdi32/tests/font.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b67670f..6d76abe 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2977,6 +2977,72 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } +void test_CreateFontIndirect(void) +{ + LOGFONTA lf, getobj_lf; + int ret; + HFONT hfont; + + memset(&lf, 0, sizeof(lf)); + + lf.lfCharSet = ANSI_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + lstrcpyA(lf.lfFaceName, "Arial"); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA failed\n"); + ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(lf.lfWeight == getobj_lf.lfWeight || + broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ + "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); + ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); + ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || + broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ + "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); + DeleteObject(hfont); + + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + lstrcpyA(lf.lfFaceName, "Arial Bold"); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA failed\n"); + ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); + todo_wine + { + ok(lf.lfWeight == getobj_lf.lfWeight || + broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ + "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); + ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || + broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ + "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); + } + DeleteObject(hfont); + + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + lstrcpyA(lf.lfFaceName, "Arial Italic"); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA failed\n"); + ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(lf.lfWeight == getobj_lf.lfWeight || + broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ + "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); + todo_wine + { + ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); + ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || + broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ + "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); + } + DeleteObject(hfont); +} + START_TEST(font) { init(); @@ -3020,4 +3086,5 @@ START_TEST(font) test_GetTextMetrics2("Arial", -11); test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); + test_CreateFontIndirect(); }

1 0

Maarten Lankhorst : include: Add devicetopology.idl.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 11575bd8374dfee7c0dc091f36c23ed24465993c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11575bd8374dfee7c0dc091f3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 13 13:04:47 2009 +0100 include: Add devicetopology.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/devicetopology.idl | 738 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 740 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11575bd8374dfee7c0dc0…

1 0

Maarten Lankhorst : include: Fix propkeydef.h header.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 8c278a0d82c22e8cb85896ef61e5975575f8b452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c278a0d82c22e8cb85896ef6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 13 14:48:53 2009 +0100 include: Fix propkeydef.h header. --- include/propkeydef.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index 8507ddb..2a45984 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -33,18 +33,18 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \ + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ EXTERN_C const PROPERTYKEY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \ + const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ const PROPERTYKEY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY #endif #ifndef IsEqualPropertyKey

1 0

Maarten Lankhorst : include: Add some definitions to ksmedia.h.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: c0846d03ca3b47dd01252991f4a4b898bc4c7c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0846d03ca3b47dd01252991f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 13 13:02:48 2009 +0100 include: Add some definitions to ksmedia.h. --- include/ksmedia.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index 4f36ccc..4dfe058 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -34,4 +34,102 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0 #define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOWFREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) +typedef LONGLONG REFERENCE_TIME; + +typedef enum +{ + eConnTypeUnknown = 0, + eConnType3Point5mm, + eConnTypeQuarter, + eConnTypeAtapiInternal, + eConnTypeRCA, + eConnTypeOptical, + eConnTypeOtherDigital, + eConnTypeOtherAnalog, + eConnTypeMultichannelAnalogDIN, + eConnTypeXlrProfessional, + eConnTypeRj11Modem, + eConnTypeCombination +} EPcxConnectionType; + +typedef enum +{ + eGeoLocRear = 1, + eGeoLocFront, + eGeoLocLeft, + eGeoLocRight, + eGeoLocTop, + eGeoLocBottom, + eGeoLocRearPanel, + eGeoLocRiser, + eGeoLocInsideMobileLid, + eGeoLocDrivebay, + eGeoLocHDMI, + eGeoLocOutsideMobileLid, + eGeoLocATAPI, + eGeoLocReserved5, + eGeoLocReserved6 +} EPcxGeoLocation; + +typedef enum +{ + eGenLocPrimaryBox = 0, + eGenLocInternal, + eGenLocSeparate, + eGenLocOther +} EPcxGenLocation; + +typedef enum +{ + ePortConnJack = 0, + ePortConnIntegratedDevice, + ePortConnBothIntegratedAndJack, + ePortConnUnknown +} EPxcPortConnection; + +typedef struct +{ + DWORD ChannelMapping; + COLORREF Color; + EPcxConnectionType ConnectionType; + EPcxGeoLocation GeoLocation; + EPcxGenLocation GenLocation; + EPxcPortConnection PortConnection; + BOOL IsConnected; +} KSJACK_DESCRIPTION; + +typedef KSJACK_DESCRIPTION *PKSJACK_DESCRIPTION; + +typedef enum +{ + KSJACK_SINK_CONNECTIONTYPE_HDMI = 0, + KSJACK_SINK_CONNECTIONTYPE_DISPLAYPORT +} KSJACK_SINK_CONNECTIONTYPE; + +#define MAX_SINK_DESCRIPTION_NAME_LENGTH 32 + +typedef struct _tagKSJACK_SINK_INFORMATION +{ + KSJACK_SINK_CONNECTIONTYPE ConnType; + WORD ManufacturerId; + WORD ProductId; + WORD AudioLatency; + BOOL HDCPCapable; + BOOL AICapable; + UCHAR SinkDescriptionLength; + WCHAR SinkDescription[MAX_SINK_DESCRIPTION_NAME_LENGTH]; + LUID PortId; +} KSJACK_SINK_INFORMATION; + +#define JACKDESC2_PRESENCE_DETECT_CAPABILITY 0x1 +#define JACKDESC2_DYNAMIC_FORMAT_CHANGE_CAPABILITY 0x2 + +typedef struct _tagKSJACK_DESCRIPTION2 +{ + DWORD DeviceStateInfo; + DWORD JackCapabilities; +} KSJACK_DESCRIPTION2; + +typedef struct _tagKSJACK_DESCRIPTION2 *PKSJACK_DESCRIPTION2; + #endif /* _KSMEDIA_ */

1 0

Austin Lund : kernel32/tests: Fixed test for GetVolumeNameForVolumeMountPoint on directory.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: f5271ce1e3630954026d349fcf8a69435a1f6820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5271ce1e3630954026d349fc… Author: Austin Lund <austin.lund(a)gmail.com> Date: Sun Nov 15 11:45:45 2009 +1000 kernel32/tests: Fixed test for GetVolumeNameForVolumeMountPoint on directory. --- dlls/kernel32/tests/volume.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f569247..efd74d5 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -155,8 +155,11 @@ static void test_GetVolumeNameForVolumeMountPointA(void) GetLastError()); /* Try on a arbitrary directory */ + /* On FAT filesystems it seems that GetLastError() is set to + ERROR_INVALID_FUNCTION. */ ret = pGetVolumeNameForVolumeMountPointA(temp_path, volume, len); - ok(ret == FALSE && GetLastError() == ERROR_NOT_A_REPARSE_POINT, + ok(ret == FALSE && (GetLastError() == ERROR_NOT_A_REPARSE_POINT || + GetLastError() == ERROR_INVALID_FUNCTION), "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", temp_path, GetLastError());

1 0

Vladimir Pankratov : mshtml: Update Russian translation.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 469a1ba4cc20bd68bd9dddb09a004b2ce7515040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469a1ba4cc20bd68bd9dddb09… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Nov 16 12:58:55 2009 +0500 mshtml: Update Russian translation. --- dlls/mshtml/Ru.rc | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 02bc433..8d3a4c3 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -31,18 +31,18 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "Установка..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 261, 95 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 261, 110 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Установка Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine не может найти пакет Gecko который нужен для приложений со встроенным HTML " \ + "для корректной работы. Wine может автоматически загрузить и установить его для Вас.\n\n" \ + "Примечание: Рекомендовано использовать пакет из Вашего дистрибутива. Посетите http://wiki.winehq.org/Gecko для деталей.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT - CONTROL "Прогресс", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 46, 240, 12 - DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Отмена", IDCANCEL, 140, 63, 70, 15, WS_GROUP | WS_TABSTOP + CONTROL "Прогресс", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 + DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 180, 85, 70, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Отмена", IDCANCEL, 100, 85, 70, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 @@ -58,3 +58,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отмена", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Отмена", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Maarten Lankhorst : include: Add audioclient.idl.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 2757e1efba452b5a2dba8dcde390865e784e72c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2757e1efba452b5a2dba8dcde… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 09:18:25 2009 +0100 include: Add audioclient.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/audioclient.idl | 326 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 328 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2757e1efba452b5a2dba8…

1 0

Roderick Colenbrander : opengl32/tests: fix wglShareLists error messages.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 9120e9baeb7326aa932e7651904454afa4304489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9120e9baeb7326aa932e76519… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Nov 14 17:53:33 2009 +0100 opengl32/tests: fix wglShareLists error messages. --- dlls/opengl32/tests/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 13e41fd..5c3de1f 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -314,7 +314,7 @@ static void test_sharelists(HDC winhdc) res = wglMakeCurrent(winhdc, hglrc2); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - todo_wine ok(res, "Sharing display lists with a destination context which has been made current passed\n"); + todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); } @@ -325,7 +325,7 @@ static void test_sharelists(HDC winhdc) if(hglrc3) { res = wglShareLists(hglrc3, hglrc1); - ok(res == FALSE, "Sharing of display lists failed for a context which already shared lists before\n"); + ok(res == FALSE, "Sharing of display lists passed for a context which already shared lists before\n"); wglDeleteContext(hglrc3); } @@ -336,7 +336,7 @@ static void test_sharelists(HDC winhdc) res = wglMakeCurrent(winhdc, hglrc1); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing display lists with a source context which has been made current passed\n"); + ok(res, "Sharing display lists with a source context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); }

1 0

Maarten Lankhorst : include: Add audiopolicy.idl.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 86ce6e29549b494e1e619e44096e553d051d9011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ce6e29549b494e1e619e440… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 09:27:43 2009 +0100 include: Add audiopolicy.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/audiopolicy.idl | 245 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 247 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index ead942c..8a86f38 100644 --- a/.gitignore +++ b/.gitignore @@ -126,6 +126,7 @@ include/activscp.h include/amstream.h include/amvideo.h include/audioclient.h +include/audiopolicy.h include/austream.h include/bits.h include/bits1_5.h diff --git a/include/Makefile.in b/include/Makefile.in index a4828e1..cdfc9b7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -15,6 +15,7 @@ PUBLIC_IDL_H_SRCS = \ amstream.idl \ amvideo.idl \ audioclient.idl \ + audiopolicy.idl \ austream.idl \ bits.idl \ bits1_5.idl \ diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl new file mode 100644 index 0000000..2344f91 --- /dev/null +++ b/include/audiopolicy.idl @@ -0,0 +1,245 @@ +/* + * Core Audio audio policy definitions + * + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +cpp_quote("#ifndef __audiopolicy_h__") +cpp_quote("#define __audiopolicy_h__") + +import "oaidl.idl"; +import "ocidl.idl"; +import "propidl.idl"; +import "audiosessiontypes.h"; +import "audioclient.idl"; + +interface IAudioSessionEvents; +interface IAudioSessionControl; +interface IAudioSessionControl2; +interface IAudioSessionManager; +interface IAudioVolumeDuckNotification; +interface IAudioSessionNotification; +interface IAudioSessionEnumerator; +interface IAudioSessionManager2; + +typedef enum AudioSessionDisconnectReason /*[local]*/ +{ + DisconnectReasonDeviceRemoval = 0, + DisconnectReasonServerShutdown, + DisconnectReasonFormatChanged, + DisconnectReasonSessionLogoff, + DisconnectReasonSessionDisconnected, + DisconnectReasonExclusiveModeOverride, +} AudioSessionDisconnectReason; + +[ + local, + uuid(24918acc-64b3-37c1-8ca9-74a66e9957a8), + pointer_default(unique), + object +] +interface IAudioSessionEvents : IUnknown +{ + HRESULT OnDisplayNameChanged( + [string,in] LPCWSTR NewDisplayName, + [in] LPCGUID EventContext + ); + HRESULT OnIconPathChanged( + [string,in] LPCWSTR NewIconPath, + [in] LPCGUID EventContext + ); + HRESULT OnSimpleVolumeChanged( + [in] float NewVolume, + [in] BOOL NewMute, + [in] LPCGUID EventContext + ); + HRESULT OnChannelVolumeChanged( + [in] DWORD ChannelCount, + [size_is(ChannelCount),in] float *NewChannelVolumeArray, + [in] DWORD ChangedChannel, + [in] LPCGUID EventContext + ); + HRESULT OnGroupingParamChanged( + [in] LPCGUID NewGroupingParam, + [in] LPCGUID EventContext + ); + HRESULT OnStateChanged( + [in] AudioSessionState NewState + ); + HRESULT OnSessionDisconnected( + [in] AudioSessionDisconnectReason DisconnectReason + ); +} + +[ + local, + uuid(f4b1a599-7266-4319-a8ca-e70acb11e8cd), + pointer_default(unique), + object +] +interface IAudioSessionControl : IUnknown +{ + HRESULT GetState( + [out] AudioSessionState *pRetVal + ); + HRESULT GetDisplayName( + [string,out] LPWSTR *pRetVal + ); + HRESULT SetDisplayName( + [string,in] LPCWSTR DisplayName, + [unique,in] LPCGUID EventContext + ); + HRESULT GetIconPath( + [string,out] LPWSTR *pRetVal + ); + HRESULT SetIconPath( + [string,in] LPCWSTR Value, + [unique,in] LPCGUID EventContext + ); + HRESULT GetGroupingParam( + [out] GUID *pRetVal + ); + HRESULT SetGroupingParam( + [in] GUID *Override, + [unique,in] LPCGUID EventContext + ); + HRESULT RegisterAudioSessionNotification( + [in] IAudioSessionEvents *NewNotifications + ); + HRESULT UnregisterAudioSessionNotification( + [in] IAudioSessionEvents *NewNotifications + ); +} + +[ + local, + uuid(bfb7ff88-7239-4fc9-8fa2-07c950be9c6d), + pointer_default(unique), + object +] +interface IAudioSessionControl2 : IAudioSessionControl +{ + HRESULT GetSessionIdentifier( + [string,out] LPWSTR *pRetVal + ); + HRESULT GetSessionInstanceIdentifier( + [string,out] LPWSTR *pRetVal + ); + HRESULT GetProcessId( + [out] DWORD *pRetVal + ); + HRESULT IsSystemSoundsSession(void); + HRESULT SetDuckingPreferences( + [in] BOOL optOut + ); +}; + +[ + local, + uuid(bfa971f1-4d5e-40bb-935e-967039bfbee4), + pointer_default(unique), + object +] +interface IAudioSessionManager : IUnknown +{ + HRESULT GetAudioSessionControl( + [in] LPCGUID AudioSessionGuid, + [in] DWORD StreamFlags, + [out] IAudioSessionControl **SessionControl + ); + HRESULT GetSimpleAudioVolume( + [in] LPCGUID AudioSessionGuid, + [in] DWORD StreamFlags, + [out] ISimpleAudioVolume **AudioVolume + ); +}; + +[ + local, + uuid(c3b284d4-6d39-4359-b3cf-b56ddb3bb39c), + pointer_default(unique), + object +] +interface IAudioVolumeDuckNotification : IUnknown +{ + HRESULT OnVolumeDuckNotification( + [in] LPCWSTR sessionID, + [in] UINT32 countCommunicationSessions + ); + HRESULT OnVolumeUndockNotification( + [in] LPCWSTR sessionID + ); +}; + +[ + local, + uuid(641dd20b-4d41-49cc-aba3-174b9477bb08), + pointer_default(unique), + object +] +interface IAudioSessionNotification : IUnknown +{ + HRESULT OnSessionCreated( + [in] IAudioSessionControl *NewSession + ); +}; + +[ + local, + uuid(e2f5bb11-0570-40ca-acdd-3aa01277dee8), + pointer_default(unique), + object +] +interface IAudioSessionEnumerator : IUnknown +{ + HRESULT GetCount( + [out] INT *SessionCount + ); + HRESULT GetSession( + [in] INT SessionCount, + [out] IAudioSessionControl **Session + ); +}; + +[ + local, + uuid(77aa99a0-1bd6-484f-8bc7-2c654c9a9b6f), + pointer_default(unique), + object +] +interface IAudiosessionManager2 : IAudioSessionManager +{ + HRESULT GetSessionEnumerator( + [retval,out] IAudioSessionEnumerator **SessionEnum + ); + HRESULT RegisterSessionNotification( + [in] IAudioSessionNotification *SessionNotification + ); + HRESULT UnregisterSessionNotification( + [in] IAudioSessionNotification *SessionNotification + ); + HRESULT RegisterDuckNotification( + [string,in] LPCWSTR sessionID, + [in] IAudioVolumeDuckNotification *duckNotification + ); + HRESULT UnregisterDuckNotification( + [in] IAudioVolumeDuckNotification *duckNotification + ); +}; + +cpp_quote("#endif /*__audiopolicy_h__*/")

1 0