February 2017 - Wine-commits

Józef Kucia : d3d11: Use WINED3D_POOL_MANAGED for staging 3D textures.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 8e4b3c0b0234ed74ffe7470e2d2e350a9d769d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4b3c0b0234ed74ffe7470e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:50 2017 +0100 d3d11: Use WINED3D_POOL_MANAGED for staging 3D textures. This makes 3D staging textures CPU accessible. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 +--- dlls/d3d11/texture.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index abd78c5..1e966d4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7972,8 +7972,7 @@ static void test_resource_map(void) memset(&mapped_subresource, 0, sizeof(mapped_subresource)); hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); - todo_wine ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); - if (FAILED(hr)) goto done; + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); ok(mapped_subresource.RowPitch == 4 * 64, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); ok(mapped_subresource.DepthPitch == 4 * 64 * 64, "Got unexpected depth pitch %u.\n", mapped_subresource.DepthPitch); @@ -7990,7 +7989,6 @@ static void test_resource_map(void) ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture3d, 0); -done: refcount = ID3D11Texture3D_Release(texture3d); ok(!refcount, "3D texture has %u references left.\n", refcount); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 54c5613..de1e865 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -946,7 +946,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); - wined3d_desc.pool = WINED3D_POOL_DEFAULT; + wined3d_desc.pool = desc->Usage == D3D11_USAGE_STAGING ? WINED3D_POOL_MANAGED : WINED3D_POOL_DEFAULT; wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; wined3d_desc.depth = desc->Depth;

1 0

Nikolay Sivov : gdiplus: Added GdipGetCustomLineCapType().
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 4e685ebb9bf3cb2f2a1c33975acdee96ac984d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e685ebb9bf3cb2f2a1c33975… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 3 16:42:06 2017 +0300 gdiplus: Added GdipGetCustomLineCapType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/customlinecap.c | 12 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/customlinecap.c | 45 ++++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 7 ++++++ include/gdiplusflat.h | 1 + 6 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 9f4eb40..ca81bee 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -77,6 +77,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath *customCap = heap_alloc_zero(sizeof(GpCustomLineCap)); if(!*customCap) return OutOfMemory; + (*customCap)->type = CustomLineCapTypeDefault; if(strokePath){ (*customCap)->fill = FALSE; pathdata = &strokePath->pathdata; @@ -245,6 +246,17 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLi return Ok; } +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap *customCap, CustomLineCapType *type) +{ + TRACE("(%p, %p)\n", customCap, type); + + if(!customCap || !type) + return InvalidParameter; + + *type = customCap->type; + return Ok; +} + GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL fill, GpAdjustableArrowCap **cap) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 98167af..8cf5ab3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -240,7 +240,7 @@ 240 stdcall GdipGetCustomLineCapBaseInset(ptr ptr) 241 stub GdipGetCustomLineCapStrokeCaps 242 stdcall GdipGetCustomLineCapStrokeJoin(ptr ptr) -243 stub GdipGetCustomLineCapType +243 stdcall GdipGetCustomLineCapType(ptr ptr) 244 stdcall GdipGetCustomLineCapWidthScale(ptr ptr) 245 stdcall GdipGetDC(ptr ptr) 246 stdcall GdipGetDpiX(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 340e9bd..b44340f 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -327,6 +327,7 @@ struct GpPathIterator{ }; struct GpCustomLineCap{ + CustomLineCapType type; GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap cap; /* as far as I can tell, this value is ignored */ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index c2a1dab..704f70e 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -267,6 +267,50 @@ todo_wine GdipDeleteCustomLineCap((GpCustomLineCap*)cap); } +static void test_captype(void) +{ + GpAdjustableArrowCap *arrowcap; + GpCustomLineCap *custom; + CustomLineCapType type; + GpStatus stat; + GpPath *path; + + stat = GdipGetCustomLineCapType(NULL, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + type = 10; + stat = GdipGetCustomLineCapType(NULL, &type); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + ok(type == 10, "Unexpected cap type, %d\n", type); + + /* default cap */ + stat = GdipCreatePath(FillModeAlternate, &path); + ok(stat == Ok, "Failed to create path, %d\n", stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + ok(stat == Ok, "AddPathRectangle failed, %d\n", stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + ok(stat == Ok, "Failed to create cap, %d\n", stat); + stat = GdipGetCustomLineCapType(custom, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeDefault, "Unexpected cap type %d\n", stat); + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); + + /* arrow cap */ + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &arrowcap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetCustomLineCapType((GpCustomLineCap*)arrowcap, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeAdjustableArrow, "Unexpected cap type %d\n", stat); + + GdipDeleteCustomLineCap((GpCustomLineCap*)arrowcap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -284,6 +328,7 @@ START_TEST(customlinecap) test_inset(); test_scale(); test_create_adjustable_cap(); + test_captype(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 1b1db6f..905a87a 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -73,6 +73,12 @@ enum LineCap LineCapAnchorMask = 0xf0 }; +enum CustomLineCapType +{ + CustomLineCapTypeDefault = 0, + CustomLineCapTypeAdjustableArrow = 1 +}; + enum PathPointType{ PathPointTypeStart = 0, /* start of a figure */ PathPointTypeLine = 1, @@ -712,6 +718,7 @@ typedef enum BrushType BrushType; typedef enum DriverStringOptions DriverStringOptions; typedef enum FillMode FillMode; typedef enum LineCap LineCap; +typedef enum CustomLineCapType CustomLineCapType; typedef enum PathPointType PathPointType; typedef enum LineJoin LineJoin; typedef enum QualityMode QualityMode; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 101d73d..6e5b23f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,6 +94,7 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin); GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*); GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL); GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL); +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap*,CustomLineCapType*); /* Font */ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: f8adb5cad859bc2b113be49d51423044e324c81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8adb5cad859bc2b113be49d5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 3 17:34:27 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 54 +++++++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5cc1ee3..1d96ab3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-01-11 13:40+0200\n" +"PO-Revision-Date: 2017-02-03 17:32+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -8352,10 +8352,8 @@ msgid "Wine Control Panel" msgstr "Winen Ohjauspaneeli" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Suorita tiedosto -valintaikkunaa ei voida näyttää (sisäinen virhe)" +msgstr "Suorita-valintaikkunaa ei voida näyttää (sisäinen virhe)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -11881,52 +11879,44 @@ msgid "(unknown %d)" msgstr "(tuntematon %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriarvon muokkaaminen ei onnistu." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Uuden rekisteriavaimen luominen ei onnistu." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Uuden rekisteriarvon luominen ei onnistu." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Avaimen '%1' nimeäminen ei onnistu.\n" +"Annettu avaimen nimi on jo varattu." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Arvon '%1' nimeäminen ei onnistu.\n" +"Annettu arvon nimi on jo varattu." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriavaimen poistaminen ei onnistu." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriavaimen uudelleennimeäminen ei onnistu." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriarvon uudelleennimeäminen ei onnistu." #: regedit.rc:371 msgid "" @@ -12154,32 +12144,24 @@ msgid "Displays program information, version number and copyright" msgstr "Näyttää ohjelman tiedot, versionumeron ja tekijänoikeustiedot" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Rekisteriarvon '%1' hakeminen ei onnistu." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Ei voida muokata avaimia tälle tyypille (%u)" +msgstr "Tämän tyypin (%1!u!) rekisteriavainten muokkaaminen ei onnistu." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Arvo on liian suuri (%u)" +msgstr "Arvo on liian suuri (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Vahvista arvon tuhoaminen" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Haettua merkkijonoa '%s' ei löydy" +msgstr "Haku on valmis. Merkkijonoa '%1' ei löydy." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12194,10 +12176,8 @@ msgid "New Value #%d" msgstr "Uusi arvo #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Rekisteriavaimen '%1' hakeminen ei onnistu." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Owen Rudge : advapi32/tests: Add test of LsaLookupSids buffer behaviour.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: bbe6233734d24c96d87aaf1f783f1eca794f0d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe6233734d24c96d87aaf1f7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Feb 2 10:30:55 2017 +0000 advapi32/tests: Add test of LsaLookupSids buffer behaviour. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 1a0d211..4daf75f 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -42,8 +42,10 @@ static NTSTATUS (WINAPI *pLsaFreeMemory)(PVOID); static NTSTATUS (WINAPI *pLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); static NTSTATUS (WINAPI *pLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID,LPSTR*); +static BOOL (WINAPI *pConvertStringSidToSidA)(LPCSTR,PSID*); static NTSTATUS (WINAPI *pLsaLookupNames2)(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); static NTSTATUS (WINAPI *pLsaLookupSids)(LSA_HANDLE,ULONG,PSID*,LSA_REFERENCED_DOMAIN_LIST**,LSA_TRANSLATED_NAME**); +static PVOID (WINAPI *pFreeSid)(PSID); static BOOL init(void) { @@ -55,10 +57,12 @@ static BOOL init(void) pLsaOpenPolicy = (void*)GetProcAddress(hadvapi32, "LsaOpenPolicy"); pLsaQueryInformationPolicy = (void*)GetProcAddress(hadvapi32, "LsaQueryInformationPolicy"); pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void*)GetProcAddress(hadvapi32, "ConvertStringSidToSidA"); pLsaLookupNames2 = (void*)GetProcAddress(hadvapi32, "LsaLookupNames2"); pLsaLookupSids = (void*)GetProcAddress(hadvapi32, "LsaLookupSids"); + pFreeSid = (void*)GetProcAddress(hadvapi32, "FreeSid"); - if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) + if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA && pConvertStringSidToSidA && pFreeSid) return TRUE; return FALSE; @@ -405,6 +409,48 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupSids_NullBuffers(void) +{ + LSA_REFERENCED_DOMAIN_LIST *list; + LSA_OBJECT_ATTRIBUTES attrs; + LSA_TRANSLATED_NAME *names; + LSA_HANDLE policy; + NTSTATUS status; + BOOL ret; + PSID sid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = pLsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ret = pConvertStringSidToSidA("S-1-1-0", &sid); + ok(ret == TRUE, "pConvertStringSidToSidA returned false\n"); + + status = pLsaLookupSids(policy, 1, &sid, &list, &names); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ok(list->Entries > 0, "got %d\n", list->Entries); + + if (list->Entries) + { + ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); + ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); + ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, + list->Domains[0].Name.Length); + ok(list->Domains[0].Name.Buffer != NULL, "domain[0] name buffer is null\n"); + } + + pLsaFreeMemory(names); + pLsaFreeMemory(list); + + pFreeSid(sid); + + status = pLsaClose(policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); +} + START_TEST(lsa) { if (!init()) { @@ -415,4 +461,5 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupSids_NullBuffers(); }

1 0

Francois Gouget : include: Add a couple more UI language APIs.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 34784f0aa8ec451695ecc28fc9bab16c10c130a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34784f0aa8ec451695ecc28fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:21:50 2017 +0100 include: Add a couple more UI language APIs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index d6fcf6e..470acf84 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -909,6 +909,7 @@ WINBASEAPI INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMT WINBASEAPI INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,INT); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat) WINBASEAPI UINT WINAPI GetOEMCP(void); +WINBASEAPI BOOL WINAPI GetProcessPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); WINBASEAPI BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); @@ -956,6 +957,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR); WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); #define SetLocaleInfo WINELIB_NAME_AW(SetLocaleInfo) WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); +WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);

1 0

Francois Gouget : wlanapi: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 71f08b364fc829d99c3b02b5a4b2fc9a6059792d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f08b364fc829d99c3b02b5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:22:05 2017 +0100 wlanapi: Add a trailing '\n' to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 303d173..3fae765 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -119,7 +119,7 @@ void *WINAPI WlanAllocateMemory(DWORD size) { void *ret; - TRACE("(%d)", size); + TRACE("(%d)\n", size); if (!size) {

1 0

Francois Gouget : hid/tests: Remove a space before a '\n'.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: e829de27fd56cf1bb4654e2ed0db293834a5aa95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e829de27fd56cf1bb4654e2ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:22:19 2017 +0100 hid/tests: Remove a space before a '\n'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 91fade4..e72a500 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -204,7 +204,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D status = HidP_GetValueCaps(HidP_Input, values, &length, ppd); ok(status == HIDP_STATUS_SUCCESS, "Failed to get value caps (%x)\n",status); - trace("\tValues: \n"); + trace("\tValues:\n"); for (i = 0; i < length; i++) { status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0,

1 0

Andrew Wesie : ntdll: Prevent NULL dereference in NtSuspendThread.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: a39d67d8c914d9c34725e1265fdf933614c6726b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39d67d8c914d9c34725e1265… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Feb 3 04:20:39 2017 -0600 ntdll: Prevent NULL dereference in NtSuspendThread. Overwatch calls NtSuspendThread directly, and expects to be able to pass in a NULL pointer for the count argument. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6127c8f..e3cc11a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -632,7 +632,10 @@ NTSTATUS WINAPI NtSuspendThread( HANDLE handle, PULONG count ) SERVER_START_REQ( suspend_thread ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) *count = reply->count; + if (!(ret = wine_server_call( req ))) + { + if (count) *count = reply->count; + } } SERVER_END_REQ; return ret; @@ -650,7 +653,10 @@ NTSTATUS WINAPI NtResumeThread( HANDLE handle, PULONG count ) SERVER_START_REQ( resume_thread ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) *count = reply->count; + if (!(ret = wine_server_call( req ))) + { + if (count) *count = reply->count; + } } SERVER_END_REQ; return ret;

1 0

Sebastian Lackner : server: Fix handling of MAXIMUM_ALLOWED in token_access_check.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 0e42bce0b6bd606565de64158348725efa65bb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e42bce0b6bd606565de64158… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 3 09:57:10 2017 +0100 server: Fix handling of MAXIMUM_ALLOWED in token_access_check. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 6 ++++++ server/token.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f339607..3250544 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1376,6 +1376,12 @@ static void test_AccessCheck(void) ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); + ret = AccessCheck(SecurityDescriptor, Token, MAXIMUM_ALLOWED, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + ok(AccessStatus && (Access == KEY_ALL_ACCESS), + "AccessCheck failed to grant access with error %d\n", + GetLastError()); /* sd with blank dacl */ ret = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); diff --git a/server/token.c b/server/token.c index 8c5e836..9489529 100644 --- a/server/token.c +++ b/server/token.c @@ -844,7 +844,10 @@ static unsigned int token_access_check( struct token *token, if (!dacl_present || !dacl) { if (priv_count) *priv_count = 0; - *granted_access = desired_access; + if (desired_access & MAXIMUM_ALLOWED) + *granted_access = mapping->GenericAll; + else + *granted_access = desired_access; return *status = STATUS_SUCCESS; }

1 0

Jactry Zeng : kernel32/tests: Add Chinese special tests for LocaleNameToLCID().
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: a894a630b49fa2f9d2bc31788f5e03ac86260e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a894a630b49fa2f9d2bc31788… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Feb 3 12:21:04 2017 +0800 kernel32/tests: Add Chinese special tests for LocaleNameToLCID(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 05564c4..86fcc33 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2705,6 +2705,12 @@ static void test_LocaleNameToLCID(void) WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; static const WCHAR enW[] = {'e','n',0}; static const WCHAR esesW[] = {'e','s','-','e','s',0}; + static const WCHAR zhHansW[] = {'z','h','-','H','a','n','s',0}; + static const WCHAR zhhansW[] = {'z','h','-','h','a','n','s',0}; + static const WCHAR zhHantW[] = {'z','h','-','H','a','n','t',0}; + static const WCHAR zhhantW[] = {'z','h','-','h','a','n','t',0}; + static const WCHAR zhcnW[] = {'z','h','-','C','N',0}; + static const WCHAR zhhkW[] = {'z','h','-','H','K',0}; if (!pLocaleNameToLCID) { @@ -2772,6 +2778,44 @@ static void test_LocaleNameToLCID(void) ptr++; } + + /* zh-Hant */ + lcid = pLocaleNameToLCID(zhHantW, 0); + todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHantW), lcid); + ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); + todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); + + /* zh-hant */ + lcid = pLocaleNameToLCID(zhhantW, 0); + todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhantW), + MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT)); + ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhhantW), ret); + todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhhantW), wine_dbgstr_w(buffer)); + + /* zh-Hans */ + lcid = pLocaleNameToLCID(zhHansW, 0); + todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHansW), lcid); + ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); + todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); + + /* zh-hans */ + lcid = pLocaleNameToLCID(zhhansW, 0); + todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhansW), + MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT)); + ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhhansW), ret); + todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhhansW), wine_dbgstr_w(buffer)); } }

1 0