July 2018 - Wine-devel - list.winehq.org

[PATCH] mscoree: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc 06 Jul '18

06 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 64f345d850..0c933cac29 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1607,7 +1607,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, } #define CHARS_IN_GUID 39 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { @@ -1618,7 +1617,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR wszDLL[] = {'.','d','l','l',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; ICLRRuntimeInfo *info = NULL; -- 2.14.4

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 06 Jul '18

06 Jul '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index d2d9a47314..c563ff6043 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15627,41 +15627,6 @@ msgid "D" msgstr "H" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15724,6 +15689,7 @@ msgstr "" "[/A] Kopioi vain tiedostot, joilla on arkistointiattribuutti.\n" "[/M] Kopioi vain tiedostot, joilla on arkistointiattribuutti, ja\n" "\tpoista arkistointiattribuutti.\n" +"[/K] Kopioi myös attribuutit. Muuten attribuutit eivät säily.\n" "[/D | /D:k-p-v] Kopioi uudet tiedostot tai ne, joita on muokattu annetun\n" "\t\tpäivän jälkeen. Jos päivää ei anneta, kopioi vain, jos\n" "\t\tkohde on vanhempi kuin lähde.\n" -- 2.18.0

1 0

Re: Dmitry Timoshkov : user32: For an owner-drawn listbox without strings WM_MEASUREITEM still needs correct itemData.
by Nikolay Sivov 06 Jul '18

06 Jul '18

On 6/28/2018 11:55 PM, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 8b864ae9aa6284206dcef57ed716227cb41ca6c9 > URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b864ae9aa6284206dcef57e… > > Author: Dmitry Timoshkov <dmitry(a)baikal.ru> > Date: Thu Jun 28 18:48:50 2018 +0800 > > user32: For an owner-drawn listbox without strings WM_MEASUREITEM still needs correct itemData. > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/user32/listbox.c | 2 +- > dlls/user32/tests/msg.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c > index 9caccf6..af8ee40 100644 > --- a/dlls/user32/listbox.c > +++ b/dlls/user32/listbox.c > @@ -1554,7 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, > mis.CtlType = ODT_LISTBOX; > mis.CtlID = id; > mis.itemID = index; > - mis.itemData = data; > + mis.itemData = str ? (ULONG_PTR)str : data; > mis.itemHeight = descr->item_height; > SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); > item->height = mis.itemHeight ? mis.itemHeight : 1; > diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c > index da01766..052b9b9 100644 > --- a/dlls/user32/tests/msg.c > +++ b/dlls/user32/tests/msg.c > @@ -14387,7 +14387,7 @@ static void test_listbox_messages(void) > ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); > ok(ret == 2, "expected 2, got %ld\n", ret); > > - ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", TRUE); > + ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", FALSE); > check_lb_state(listbox, 3, LB_ERR, 0, 0); > > log_all_parent_messages--; > I wonder how was this tested. Included test diff does not seem to be relevant, i.e. I don't get any new failures with functional part reverted.

1 0

[PATCH 3/4] oleaut32: IPicture::set_hPal() supports only bitmaps.
by Dmitry Timoshkov 06 Jul '18

06 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 401d940262..b58fa9f1a4 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -742,10 +742,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface, OLE_HANDLE hpal) { - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%08x): stub\n", This, hpal); - OLEPicture_SendNotify(This,DISPID_PICT_HPAL); - return E_NOTIMPL; + OLEPictureImpl *This = impl_from_IPicture(iface); + + TRACE("(%p)->(%08x)\n", This, hpal); + + if (This->desc.picType == PICTYPE_BITMAP) + { + This->desc.u.bmp.hpal = (HPALETTE)hpal; + OLEPicture_SendNotify(This,DISPID_PICT_HPAL); + return S_OK; + } + + return E_FAIL; } /************************************************************************ -- 2.17.1

1 0

[PATCH 2/4] oleaut32: IPicture::get_hPal() supports only bitmaps.
by Dmitry Timoshkov 06 Jul '18

06 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 41 ++++++++++++-------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index da71946a40..401d940262 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -555,37 +555,22 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, OLE_HANDLE *phandle) { - OLEPictureImpl *This = impl_from_IPicture(iface); - HRESULT hres; - TRACE("(%p)->(%p)\n", This, phandle); + OLEPictureImpl *This = impl_from_IPicture(iface); - if (!phandle) - return E_POINTER; + TRACE("(%p)->(%p)\n", This, phandle); - switch (This->desc.picType) { - case (UINT)PICTYPE_UNINITIALIZED: - case PICTYPE_NONE: - *phandle = 0; - hres = S_FALSE; - break; - case PICTYPE_BITMAP: - *phandle = HandleToUlong(This->desc.u.bmp.hpal); - hres = S_OK; - break; - case PICTYPE_METAFILE: - hres = E_FAIL; - break; - case PICTYPE_ICON: - case PICTYPE_ENHMETAFILE: - default: - FIXME("unimplemented for type %d. Returning 0 palette.\n", - This->desc.picType); - *phandle = 0; - hres = S_OK; - } + if (!phandle) return E_POINTER; - TRACE("returning 0x%08x, palette handle %08x\n", hres, *phandle); - return hres; + if (This->desc.picType == PICTYPE_BITMAP) + { + *phandle = HandleToUlong(This->desc.u.bmp.hpal); + return S_OK; + } + +#ifdef _WIN64 + *phandle = 0; +#endif + return E_FAIL; } /************************************************************************ -- 2.17.1

1 0

[PATCH 1/4] oleaut32: Don't accept unsupported picture types in OleCreatePictureIndirect.
by Dmitry Timoshkov 06 Jul '18

06 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index ac8b207207..da71946a40 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -275,9 +275,10 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) * The caller of this method must release the object when it's * done with it. */ -static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) +static HRESULT OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn, OLEPictureImpl **pict) { - OLEPictureImpl* newObject = 0; + OLEPictureImpl *newObject; + HRESULT hr; if (pictDesc) TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType); @@ -286,9 +287,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) * Allocate space for the object. */ newObject = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OLEPictureImpl)); - - if (newObject==0) - return newObject; + if (!newObject) + return E_OUTOFMEMORY; /* * Initialize the virtual function table. @@ -299,12 +299,12 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable; newObject->pCP = NULL; - CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, + hr = CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, &newObject->pCP); - if (!newObject->pCP) + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, newObject); - return NULL; + return hr; } /* @@ -347,18 +347,24 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) case PICTYPE_ICON: OLEPictureImpl_SetIcon(newObject); break; + case PICTYPE_ENHMETAFILE: + FIXME("EMF is not supported\n"); + newObject->himetricWidth = newObject->himetricHeight = 0; + break; + default: - FIXME("Unsupported type %d\n", pictDesc->picType); - newObject->himetricWidth = newObject->himetricHeight = 0; - break; + WARN("Unsupported type %d\n", pictDesc->picType); + IPicture_Release(&newObject->IPicture_iface); + return E_UNEXPECTED; } } else { newObject->desc.picType = PICTYPE_UNINITIALIZED; } TRACE("returning %p\n", newObject); - return newObject; + *pict = newObject; + return S_OK; } /************************************************************************ @@ -2217,10 +2223,8 @@ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, *ppvObj = NULL; - newPict = OLEPictureImpl_Construct(lpPictDesc, Own); - - if (newPict == NULL) - return E_OUTOFMEMORY; + hr = OLEPictureImpl_Construct(lpPictDesc, Own, &newPict); + if (hr != S_OK) return hr; /* * Make sure it supports the interface required by the caller. -- 2.17.1

1 0

[PATCH] winhttp: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc 06 Jul '18

06 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 56ec910294..5e5b229a1f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -851,8 +851,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, } -#define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR basicW[] = {'B','a','s','i','c',0}; static const WCHAR ntlmW[] = {'N','T','L','M',0}; static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; @@ -867,11 +865,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } }; static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]); -- 2.14.4

2 1

[PATCH] po: Update Russian translation.
by Nikolay Sivov 06 Jul '18

06 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index 45dd3a1b28..9caec7dc40 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-04 13:51+0300\n" +"PO-Revision-Date: 2018-07-06 09:17+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -15658,41 +15658,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15756,6 +15721,7 @@ msgstr "" "[/A] Копирует только файлы с атрибутом «архивный».\n" "[/M] Копирует только файлы с атрибутом «архивный»,\n" "при этом очищает атрибут.\n" +"[/K] Копирует атрибуты, без этого ключа атрибуты не копируются.\n" "[/D | /D:m-d-y] Копирует только новые файлы или файлы, изменённые\n" "\t\tпосле указанной даты. Если дата не указана, заменяет все старые файлы\n" "\t\tсуществующими новыми.\n" -- 2.18.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 06 Jul '18

06 Jul '18

1 0

[PATCH] user32: Support SPI_S/GETAUDIODESCRIPTION in SystemParametersInfo
by Alistair Leslie-Hughes 06 Jul '18

06 Jul '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++++++++++- include/winuser.h | 9 +++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fc55b06..7f4fb66 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -70,6 +70,7 @@ enum parameter_key SHOWSOUNDS_KEY, KEYBOARDPREF_KEY, SCREENREADER_KEY, + AUDIODESC_KEY, NB_PARAM_KEYS }; @@ -94,6 +95,9 @@ static const WCHAR KEYBOARDPREF_REGKEY[] = {'C','o','n','t','r','o','l',' ','P', static const WCHAR SCREENREADER_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', 'B','l','i','n','d',' ','A','c','c','e','s','s',0}; +static const WCHAR AUDIODESC_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', + 'A','u','d','i','o','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = { @@ -107,6 +111,7 @@ static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = SHOWSOUNDS_REGKEY, KEYBOARDPREF_REGKEY, SCREENREADER_REGKEY, + AUDIODESC_REGKEY, }; /* parameter key values; the first char is actually an enum parameter_key to specify the key */ @@ -217,6 +222,8 @@ static const WCHAR COLOR_GRADIENTACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r',' static const WCHAR COLOR_GRADIENTINACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r','a','d','i','e','n','t','I','n','a','c','t','i','v','e','T','i','t','l','e',0}; static const WCHAR COLOR_MENUHILIGHT_VALNAME[] = {COLORS_KEY,'M','e','n','u','H','i','l','i','g','h','t',0}; static const WCHAR COLOR_MENUBAR_VALNAME[] = {COLORS_KEY,'M','e','n','u','B','a','r',0}; +static const WCHAR AUDIODESC_LOCALE_VALNAME[] = {AUDIODESC_KEY,'L','o','c','a','l','e',0}; +static const WCHAR AUDIODESC_ON_VALNAME[] = {AUDIODESC_KEY,'O','n',0}; /* FIXME - real value */ static const WCHAR SCREENSAVERRUNNING_VALNAME[]= {DESKTOP_KEY,'W','I','N','E','_','S','c','r','e','e','n','S','a','v','e','r','R','u','n','n','i','n','g',0}; @@ -1240,6 +1247,7 @@ static BOOL_ENTRY( SCREENSAVERRUNNING, FALSE ); static BOOL_ENTRY( SHOWSOUNDS, FALSE ); static BOOL_ENTRY( SNAPTODEFBUTTON, FALSE ); static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); +static BOOL_ENTRY( AUDIODESC_ON, FALSE); static YESNO_ENTRY( BEEP, TRUE ); @@ -1269,6 +1277,7 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( LOGPIXELS, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); +static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); @@ -1399,6 +1408,8 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_USERPREFERENCESMASK, (union sysparam_all_entry *)&entry_WHEELSCROLLCHARS, (union sysparam_all_entry *)&entry_WHEELSCROLLLINES, + (union sysparam_all_entry *)&entry_AUDIODESC_LOCALE, + (union sysparam_all_entry *)&entry_AUDIODESC_ON, }; /*********************************************************************** @@ -2334,7 +2345,26 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETFONTSMOOTHINGORIENTATION: ret = set_entry( &entry_FONTSMOOTHINGORIENTATION, uiParam, pvParam, fWinIni ); break; - + case SPI_GETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = get_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled ) && + get_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale ); + } + break; + } + case SPI_SETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = set_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled, fWinIni) && + set_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale, fWinIni ); + } + break; + } default: FIXME( "Unknown action: %u\n", uiAction ); SetLastError( ERROR_INVALID_SPI_VALUE ); diff --git a/include/winuser.h b/include/winuser.h index 24ca055..a653ef4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2362,6 +2362,8 @@ typedef struct tagDROPSTRUCT #define SPI_SETMOUSESPEED 113 #define SPI_GETSCREENSAVERRUNNING 114 #define SPI_GETDESKWALLPAPER 115 +#define SPI_GETAUDIODESCRIPTION 116 +#define SPI_SETAUDIODESCRIPTION 117 #define SPI_GETACTIVEWINDOWTRACKING 0x1000 #define SPI_SETACTIVEWINDOWTRACKING 0x1001 @@ -3387,6 +3389,13 @@ enum tagPOINTER_INPUT_TYPE }; typedef DWORD POINTER_INPUT_TYPE; +typedef struct tagAUDIODESCRIPTION +{ + UINT cbSize; + BOOL Enabled; + LCID Locale; +} AUDIODESCRIPTION, *LPAUDIODESCRIPTION; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); -- 1.9.1

1 0