April 2016 - Wine-Commits - list.winehq.org

Alex Henrie : qedit: Implement IAMTimelineObj_GetTimelineNoRef and add tests.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: d10c5b4ac223365f397cdf02f0d297686bea2854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10c5b4ac223365f397cdf02f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 26 23:12:50 2016 -0600 qedit: Implement IAMTimelineObj_GetTimelineNoRef and add tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 8 ++++++++ dlls/qedit/timeline.c | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index ca00063..2d37010 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -91,6 +91,14 @@ static void test_timeline(void) else ok(hr == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", hr); } + + hr = IAMTimelineObj_GetTimelineNoRef(obj, NULL); + ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); + + timeline2 = (IAMTimeline *)0xdeadbeef; + hr = IAMTimelineObj_GetTimelineNoRef(obj, &timeline2); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); + ok(!timeline2, "Expected NULL got %p\n", timeline2); } START_TEST(timeline) diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index a2552d2..8c6ac5b 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -737,9 +737,12 @@ static HRESULT WINAPI TimelineObj_RemoveAll(IAMTimelineObj *iface) static HRESULT WINAPI TimelineObj_GetTimelineNoRef(IAMTimelineObj *iface, IAMTimeline **timeline) { + /* MSDN says that this function is "not supported" */ TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%p): not implemented!\n", This, timeline); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, timeline); + if (!timeline) return E_POINTER; + *timeline = NULL; + return E_NOINTERFACE; } static HRESULT WINAPI TimelineObj_GetGroupIBelongTo(IAMTimelineObj *iface, IAMTimelineGroup **group)

1 0

Jacek Caban : wininet: Simplify handling ICU_DECODE in InternetCrackUrlW.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 40992ee873d27dbd8e731f5f2f3432a8dfbbc3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40992ee873d27dbd8e731f5f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:17:31 2016 +0200 wininet: Simplify handling ICU_DECODE in InternetCrackUrlW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9045b03..6cfc488 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1737,8 +1737,7 @@ static BOOL SetUrlComponentValueW(LPWSTR* lppszComponent, LPDWORD dwComponentLen * TRUE on success * FALSE on failure */ -BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWORD dwFlags, - LPURL_COMPONENTSW lpUC) +BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwFlags, URL_COMPONENTSW *lpUC) { /* * RFC 1808 @@ -1747,18 +1746,16 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR */ LPCWSTR lpszParam = NULL; BOOL found_colon = FALSE; - LPCWSTR lpszap, lpszUrl = lpszUrl_orig; + LPCWSTR lpszap; LPCWSTR lpszcp = NULL, lpszNetLoc; - LPWSTR lpszUrl_decode = NULL; - DWORD dwUrlLength = dwUrlLength_orig; TRACE("(%s %u %x %p)\n", lpszUrl ? debugstr_wn(lpszUrl, dwUrlLength ? dwUrlLength : strlenW(lpszUrl)) : "(null)", dwUrlLength, dwFlags, lpUC); - if (!lpszUrl_orig || !*lpszUrl_orig || !lpUC) + if (!lpszUrl || !*lpszUrl || !lpUC) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } if (!dwUrlLength) dwUrlLength = strlenW(lpszUrl); @@ -1767,26 +1764,18 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR { WCHAR *url_tmp; DWORD len = dwUrlLength + 1; + BOOL ret; - if (!(url_tmp = heap_alloc(len * sizeof(WCHAR)))) + if (!(url_tmp = heap_strndupW(lpszUrl, dwUrlLength))) { - INTERNET_SetLastError(ERROR_OUTOFMEMORY); + SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - memcpy(url_tmp, lpszUrl_orig, dwUrlLength * sizeof(WCHAR)); - url_tmp[dwUrlLength] = 0; - if (!(lpszUrl_decode = heap_alloc(len * sizeof(WCHAR)))) - { - heap_free(url_tmp); - INTERNET_SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - if (InternetCanonicalizeUrlW(url_tmp, lpszUrl_decode, &len, ICU_DECODE | ICU_NO_ENCODE)) - { - dwUrlLength = len; - lpszUrl = lpszUrl_decode; - } + ret = InternetCanonicalizeUrlW(url_tmp, url_tmp, &len, ICU_DECODE | ICU_NO_ENCODE); + if (ret) + ret = InternetCrackUrlW(url_tmp, len, dwFlags & ~ICU_DECODE, lpUC); heap_free(url_tmp); + return ret; } lpszap = lpszUrl; @@ -1989,7 +1978,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR if (*lpszcp == '/') { len = MAX_PATH; - PathCreateFromUrlW(lpszUrl_orig, tmppath, &len, 0); + PathCreateFromUrlW(lpszUrl, tmppath, &len, 0); } else { @@ -2036,7 +2025,6 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR debugstr_wn(lpUC->lpszUrlPath,lpUC->dwUrlPathLength), debugstr_wn(lpUC->lpszExtraInfo,lpUC->dwExtraInfoLength)); - heap_free( lpszUrl_decode ); return TRUE; }

1 0

Austin English : winsta: Add a stub for WinStationEnumerateW.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 0a31f489a65230cb72ae9953c184571101b059d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a31f489a65230cb72ae9953c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 26 23:36:47 2016 -0500 winsta: Add a stub for WinStationEnumerateW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index a95782f..59efef2 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -91,3 +91,10 @@ BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOLEAN WINAPI WinStationEnumerateW( HANDLE server, PSESSIONIDW *sessionids, ULONG *count ) +{ + FIXME( "%p %p %p\n", server, sessionids, count ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 30aa6b5..20db0ca 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -29,7 +29,7 @@ @ stub WinStationEnumerateA @ stub WinStationEnumerateLicenses @ stub WinStationEnumerateProcesses -@ stub WinStationEnumerateW +@ stdcall WinStationEnumerateW(ptr ptr ptr) @ stub WinStationEnumerate_IndexedA @ stub WinStationEnumerate_IndexedW @ stub WinStationFreeGAPMemory

1 0

Jacek Caban : wininet: Fixed handling too small buffers in InternetCrackUrlW.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 41f69916c0cb6b62fbdb6d6014fdbb018331db68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f69916c0cb6b62fbdb6d601… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:17:59 2016 +0200 wininet: Fixed handling too small buffers in InternetCrackUrlW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 116 ++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 68 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6cfc488..537bf7d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1482,6 +1482,30 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet) return TRUE; } +static BOOL set_url_component(WCHAR **component, DWORD *component_length, const WCHAR *value, DWORD len) +{ + TRACE("%s (%d)\n", debugstr_wn(value, len), len); + + if (!*component_length) + return TRUE; + + if (!*component) { + *(const WCHAR**)component = value; + *component_length = len; + return TRUE; + } + + if (*component_length < len+1) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + *component_length = len; + if(len) + memcpy(*component, value, len*sizeof(WCHAR)); + (*component)[len] = 0; + return TRUE; +} /*********************************************************************** * ConvertUrlComponentValue (Internal) @@ -1686,49 +1710,6 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) } /*********************************************************************** - * SetUrlComponentValueW (Internal) - * - * Helper function for InternetCrackUrlW - * - * PARAMS - * lppszComponent [O] Holds the returned string - * dwComponentLen [I] Holds the size of lppszComponent - * [O] Holds the length of the string in lppszComponent without '\0' - * lpszStart [I] Holds the string to copy from - * len [I] Holds the length of lpszStart without '\0' - * - * RETURNS - * TRUE on success - * FALSE on failure - * - */ -static BOOL SetUrlComponentValueW(LPWSTR* lppszComponent, LPDWORD dwComponentLen, LPCWSTR lpszStart, DWORD len) -{ - TRACE("%s (%d)\n", debugstr_wn(lpszStart,len), len); - - if ( (*dwComponentLen == 0) && (*lppszComponent == NULL) ) - return FALSE; - - if (*dwComponentLen != 0 || *lppszComponent == NULL) - { - if (*lppszComponent == NULL) - { - *lppszComponent = (LPWSTR)lpszStart; - *dwComponentLen = len; - } - else - { - DWORD ncpylen = min((*dwComponentLen)-1, len); - memcpy(*lppszComponent, lpszStart, ncpylen*sizeof(WCHAR)); - (*lppszComponent)[ncpylen] = '\0'; - *dwComponentLen = ncpylen; - } - } - - return TRUE; -} - -/*********************************************************************** * InternetCrackUrlW (WININET.@) * * Break up URL into its components @@ -1813,14 +1794,15 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if(!lpszParam) lpszParam = memchrW(lpszap, '#', dwUrlLength - (lpszap - lpszUrl)); - SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, - lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0); + if(!set_url_component(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, + lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0)) + return FALSE; /* Get scheme first. */ lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl); - SetUrlComponentValueW(&lpUC->lpszScheme, &lpUC->dwSchemeLength, - lpszUrl, lpszcp - lpszUrl); + if(!set_url_component(&lpUC->lpszScheme, &lpUC->dwSchemeLength, lpszUrl, lpszcp - lpszUrl)) + return FALSE; /* Eat ':' in protocol. */ lpszcp++; @@ -1854,8 +1836,8 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if (lpszHost == NULL || lpszHost > lpszNetLoc) { /* username and password not specified. */ - SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); - SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); + set_url_component(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); + set_url_component(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); } else /* Parse out username and password */ { @@ -1870,14 +1852,14 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF lpszcp++; } - SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, - lpszUser, lpszPasswd - lpszUser); + if(!set_url_component(&lpUC->lpszUserName, &lpUC->dwUserNameLength, lpszUser, lpszPasswd - lpszUser)) + return FALSE; if (lpszPasswd != lpszHost) lpszPasswd++; - SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, - lpszPasswd == lpszHost ? NULL : lpszPasswd, - lpszHost - lpszPasswd); + if(!set_url_component(&lpUC->lpszPassword, &lpUC->dwPasswordLength, + lpszPasswd == lpszHost ? NULL : lpszPasswd, lpszHost - lpszPasswd)) + return FALSE; lpszcp++; /* Advance to beginning of host */ } @@ -1891,8 +1873,8 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF entire string up to the first '/' */ if(lpUC->nScheme==INTERNET_SCHEME_RES) { - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, - lpszHost, lpszPort - lpszHost); + if(!set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, lpszHost, lpszPort - lpszHost)) + return FALSE; lpszcp=lpszNetLoc; } else @@ -1909,13 +1891,12 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if(lpUC->nScheme==INTERNET_SCHEME_FILE && lpszPort <= lpszHost+1) { lpszcp=lpszHost; - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, - NULL, 0); + set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); } else { - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, - lpszHost, lpszPort - lpszHost); + if(!set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, lpszHost, lpszPort - lpszHost)) + return FALSE; if (lpszPort != lpszNetLoc) lpUC->nPort = atoiW(++lpszPort); else switch (lpUC->nScheme) @@ -1941,9 +1922,9 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF } else { - SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); - SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); + set_url_component(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); + set_url_component(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); + set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); } /* Here lpszcp points to: @@ -2005,12 +1986,11 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF ++len; } } - SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, - tmppath, len); + if(!set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, tmppath, len)) + return FALSE; } - else - SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, - lpszcp, len); + else if(!set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, len)) + return FALSE; } else {

1 0

Nikolay Sivov : kernel32/nls: Convert most of the locale data files to UTF-8.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: d488f6b8561d01f80362ae4cd29f893b70ecd5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d488f6b8561d01f80362ae4cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 18:33:03 2016 +0300 kernel32/nls: Convert most of the locale data files to UTF-8. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/afk.nls | 4 +- dlls/kernel32/nls/ara.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/are.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arg.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arh.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ari.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arj.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ark.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arl.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arm.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aro.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arq.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ars.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/art.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aru.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ary.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aze.nls | 74 +++++++++++++------------- dlls/kernel32/nls/azl.nls | 22 ++++---- dlls/kernel32/nls/bel.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/bgr.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/brf.nls | 10 ++-- dlls/kernel32/nls/cat.nls | 14 ++--- dlls/kernel32/nls/chs.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/cht.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/cor.nls | 8 +-- dlls/kernel32/nls/csy.nls | 80 ++++++++++++++-------------- dlls/kernel32/nls/cym.nls | 6 +-- dlls/kernel32/nls/dan.nls | 12 ++--- dlls/kernel32/nls/dea.nls | 20 +++---- dlls/kernel32/nls/dec.nls | 8 +-- dlls/kernel32/nls/del.nls | 10 ++-- dlls/kernel32/nls/des.nls | 8 +-- dlls/kernel32/nls/deu.nls | 12 ++--- dlls/kernel32/nls/ell.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ena.nls | 4 +- dlls/kernel32/nls/enb.nls | 4 +- dlls/kernel32/nls/enc.nls | 4 +- dlls/kernel32/nls/eng.nls | 6 +-- dlls/kernel32/nls/eni.nls | 6 +-- dlls/kernel32/nls/enj.nls | 4 +- dlls/kernel32/nls/enl.nls | 4 +- dlls/kernel32/nls/enp.nls | 4 +- dlls/kernel32/nls/ens.nls | 4 +- dlls/kernel32/nls/ent.nls | 6 +-- dlls/kernel32/nls/enu.nls | 4 +- dlls/kernel32/nls/enw.nls | 4 +- dlls/kernel32/nls/enz.nls | 4 +- dlls/kernel32/nls/esa.nls | 18 +++---- dlls/kernel32/nls/esb.nls | 16 +++--- dlls/kernel32/nls/esc.nls | 18 +++---- dlls/kernel32/nls/esd.nls | 18 +++---- dlls/kernel32/nls/ese.nls | 16 +++--- dlls/kernel32/nls/esf.nls | 16 +++--- dlls/kernel32/nls/esg.nls | 16 +++--- dlls/kernel32/nls/esh.nls | 14 ++--- dlls/kernel32/nls/esi.nls | 16 +++--- dlls/kernel32/nls/esl.nls | 16 +++--- dlls/kernel32/nls/esm.nls | 20 +++---- dlls/kernel32/nls/esn.nls | 20 +++---- dlls/kernel32/nls/eso.nls | 16 +++--- dlls/kernel32/nls/esp.nls | 18 +++---- dlls/kernel32/nls/esr.nls | 18 +++---- dlls/kernel32/nls/ess.nls | 16 +++--- dlls/kernel32/nls/esu.nls | 16 +++--- dlls/kernel32/nls/esv.nls | 20 +++---- dlls/kernel32/nls/esy.nls | 16 +++--- dlls/kernel32/nls/esz.nls | 18 +++---- dlls/kernel32/nls/eti.nls | 24 ++++----- dlls/kernel32/nls/euq.nls | 6 +-- dlls/kernel32/nls/far.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/fin.nls | 18 +++---- dlls/kernel32/nls/fos.nls | 26 +++++----- dlls/kernel32/nls/fra.nls | 40 +++++++------- dlls/kernel32/nls/frb.nls | 36 ++++++------- dlls/kernel32/nls/frc.nls | 38 +++++++------- dlls/kernel32/nls/frl.nls | 40 +++++++------- dlls/kernel32/nls/frm.nls | 42 +++++++-------- dlls/kernel32/nls/frs.nls | 34 ++++++------ dlls/kernel32/nls/gae.nls | 78 ++++++++++++++-------------- dlls/kernel32/nls/gdh.nls | 40 +++++++------- dlls/kernel32/nls/gdv.nls | 6 +-- dlls/kernel32/nls/glc.nls | 20 +++---- dlls/kernel32/nls/heb.nls | 124 +++++++++++++++++++++---------------------- dlls/kernel32/nls/hrv.nls | 16 +++--- dlls/kernel32/nls/hun.nls | 46 ++++++++-------- dlls/kernel32/nls/ind.nls | 4 +- dlls/kernel32/nls/isl.nls | 56 ++++++++++---------- dlls/kernel32/nls/ita.nls | 14 ++--- dlls/kernel32/nls/its.nls | 14 ++--- dlls/kernel32/nls/ivl.nls | 2 +- dlls/kernel32/nls/jpn.nls | 72 ++++++++++++------------- dlls/kernel32/nls/kkz.nls | 58 ++++++++++----------- dlls/kernel32/nls/kor.nls | 70 ++++++++++++------------- dlls/kernel32/nls/kyr.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/lvi.nls | 30 +++++------ dlls/kernel32/nls/mki.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/mon.nls | 60 ++++++++++----------- dlls/kernel32/nls/msb.nls | 4 +- dlls/kernel32/nls/msl.nls | 4 +- dlls/kernel32/nls/nlb.nls | 8 +-- dlls/kernel32/nls/nld.nls | 6 +-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/non.nls | 12 ++--- dlls/kernel32/nls/nor.nls | 26 +++++----- dlls/kernel32/nls/plk.nls | 46 ++++++++-------- dlls/kernel32/nls/ptb.nls | 30 +++++------ dlls/kernel32/nls/ptg.nls | 32 ++++++------ dlls/kernel32/nls/rmc.nls | 2 +- dlls/kernel32/nls/rus.nls | 2 +- dlls/kernel32/nls/sky.nls | 66 +++++++++++------------ dlls/kernel32/nls/slv.nls | 8 +-- dlls/kernel32/nls/sqi.nls | 26 +++++----- dlls/kernel32/nls/srb.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/srl.nls | 8 +-- dlls/kernel32/nls/sve.nls | 18 +++---- dlls/kernel32/nls/svf.nls | 22 ++++---- dlls/kernel32/nls/swk.nls | 4 +- dlls/kernel32/nls/trk.nls | 38 +++++++------- dlls/kernel32/nls/ttt.nls | 72 ++++++++++++------------- dlls/kernel32/nls/ukr.nls | 130 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/urd.nls | 84 +++++++++++++++--------------- dlls/kernel32/nls/uzb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/uzl.nls | 8 +-- dlls/kernel32/nls/wal.nls | 28 +++++----- dlls/kernel32/nls/zhh.nls | 10 ++-- dlls/kernel32/nls/zhi.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/zhm.nls | 80 ++++++++++++++-------------- 128 files changed, 2506 insertions(+), 2506 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d488f6b8561d01f80362a…

1 0

Hugh McMaster : reg: Support recursion when querying a registry value.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: dd5da0ae640966be2ccc2ea84a6fb1b638da0f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5da0ae640966be2ccc2ea84… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 26 12:28:24 2016 +0000 reg: Support recursion when querying a registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 57 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 26a1288..c9903ac 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -655,16 +655,19 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, return subkey_path; } -static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) +static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; + DWORD num_subkeys, max_subkey_len, subkey_len; DWORD max_data_bytes, data_size; - DWORD type; + DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; WCHAR newlineW[] = {'\n',0}; + WCHAR *subkey_name, *subkey_path; + HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, NULL, NULL, &max_data_bytes, NULL, NULL); if (rc) { @@ -690,11 +693,43 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) HeapFree(GetProcessHeap(), 0, data); - if (rc == ERROR_FILE_NOT_FOUND) + if (!recurse) { - output_message(STRING_CANNOT_FIND); + if (rc == ERROR_FILE_NOT_FOUND) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + return 0; + } + + max_subkey_len++; + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + if (!subkey_name) + { + ERR("Failed to allocate memory for subkey_name\n"); return 1; } + + path_len = strlenW(path); + + for (i = 0; i < num_subkeys; i++) + { + subkey_len = max_subkey_len; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_value(subkey, value_name, subkey_path, recurse); + RegCloseKey(subkey); + } + HeapFree(GetProcessHeap(), 0, subkey_path); + } + } + + HeapFree(GetProcessHeap(), 0, subkey_name); return 0; } @@ -795,8 +830,6 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL { WCHAR *p; HKEY root, key; - static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', - '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; int ret; if (!sane_path(key_name)) @@ -825,15 +858,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL } if (value_name || value_empty) - { - if (recurse) - { - RegCloseKey(key); - output_string(stubW, key_name, value_name, value_empty, recurse); - return 1; - } - ret = query_value(key, value_name, key_name); - } + ret = query_value(key, value_name, key_name, recurse); else ret = query_all(key, key_name, recurse);

1 0

Piotr Caban : msvcr120: Add __ExceptionPtrToBool implementation.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 4f8aafbe2891d16aeb1aa7916405b5efb862d7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8aafbe2891d16aeb1aa7916… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 20:39:41 2016 +0200 msvcr120: Add __ExceptionPtrToBool implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 76cafd9..ddab904 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -704,8 +704,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ad9749a..7efcb20 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -686,8 +686,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index fb3e4a3..6bfc0b7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -682,8 +682,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z @ cdecl __uncaught_exception() msvcr120.__uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) msvcr120.?_invalid_parameter@@YAXPBG00II(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 17292d5..b470478 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1500,6 +1500,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Piotr Caban : msvcp71: Add basic_istream<char>::operator>> export.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 62d4e5e6fa0a220a037e0a1764a7a1deb4e939da URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d4e5e6fa0a220a037e0a176… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 19:57:15 2016 +0200 msvcp71: Add basic_istream<char>::operator>> export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp71/msvcp71.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 7bf7b59..d9e42bd 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index d708825..35119fa 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f().
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 1fe83c0d7e4af20a50132aabedc570c5f4f2babe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe83c0d7e4af20a50132aabe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:56:01 2016 +0200 wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 21de2d6..ed953fe 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2746,7 +2746,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface iface, start_register, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ce67292..b0ef724 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3124,7 +3124,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_f(device->wined3d_device, + reg_idx, count, (struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9af2b70..e0a7370 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2722,18 +2722,18 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - int count = min(vector4f_count, d3d_info->limits.ps_uniform_count - start_register); - TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || count < 0) + if (!constants || start_idx >= d3d_info->limits.ps_uniform_count + || count > d3d_info->limits.ps_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_f[start_register], count * sizeof(float) * 4); + memcpy(constants, &device->state.ps_consts_f[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 42039f6..4eb2470 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -71,7 +71,7 @@ @ cdecl wined3d_device_get_primitive_type(ptr ptr) @ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) -@ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5eea884..4cfe1e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2117,7 +2117,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_de HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count); + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_get_vs_consts_f().
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 67ec18ba2c748f180ef5f06f67ccdfd38c9460db URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ec18ba2c748f180ef5f06f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 17:55:59 2016 +0200 wined3d: Pass wined3d_vec4 structures to wined3d_device_get_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 847adad..1424342 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2457,7 +2457,7 @@ static HRESULT WINAPI d3d8_device_GetVertexShaderConstant(IDirect3DDevice8 *ifac } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 53486bc..be5e9f7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2836,7 +2836,8 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_f(device->wined3d_device, + reg_idx, count, (struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7afdff8..76b7eaf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2494,18 +2494,18 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - int count = min(vector4f_count, d3d_info->limits.vs_uniform_count - start_register); - TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || count < 0) + if (!constants || start_idx >= d3d_info->limits.vs_uniform_count + || count > d3d_info->limits.vs_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_f[start_register], count * sizeof(float) * 4); + memcpy(constants, &device->state.vs_consts_f[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 26a0c07..e23bb03 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,7 +94,7 @@ @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) -@ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d789470..d0151c3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2153,7 +2153,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_de HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count); + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device,

1 0