wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Francois Gouget : ole32: Don't define NONAMELESSUNION in olestd.h. It' s not needed anyway.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: fb908b3a956b8e064c54d73db690b2d5deae4d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb908b3a956b8e064c54d73db… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:01:54 2015 +0100 ole32: Don't define NONAMELESSUNION in olestd.h. It's not needed anyway. --- dlls/ole32/olestd.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ole32/olestd.h b/dlls/ole32/olestd.h index 02a4d3b..fbc4442 100644 --- a/dlls/ole32/olestd.h +++ b/dlls/ole32/olestd.h @@ -19,10 +19,6 @@ #if !defined( __WINE_OLESTD_H_ ) #define __WINE_OLESTD_H_ -#if !defined(__cplusplus) && !defined( __TURBOC__) -#define NONAMELESSUNION /* use strict ANSI standard (for DVOBJ.H) */ -#endif - /* Clipboard format strings */ #define CF_EMBEDSOURCE "Embed Source" #define CF_EMBEDDEDOBJECT "Embedded Object"

1 0

Jacek Caban : vbscript: Added a helper for getting default IDispatch value.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 0de7b95c371c911c0dd86d6fad89160bdab474ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de7b95c371c911c0dd86d6fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 5 15:49:02 2015 +0100 vbscript: Added a helper for getting default IDispatch value. --- dlls/vbscript/interp.c | 10 +++------- dlls/vbscript/vbdisp.c | 11 +++++++---- dlls/vbscript/vbscript.h | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 64f998d..bc34860 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -323,10 +323,9 @@ static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *r) stack_pop_deref(ctx, r); if(V_VT(r->v) == VT_DISPATCH) { - DISPPARAMS dp = {0}; HRESULT hres; - hres = disp_call(ctx->script, V_DISPATCH(r->v), DISPID_VALUE, &dp, &r->store); + hres = get_disp_value(ctx->script, V_DISPATCH(r->v), &r->store); if(r->owned) IDispatch_Release(V_DISPATCH(r->v)); if(FAILED(hres)) @@ -354,12 +353,10 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) } if(V_VT(v) == VT_DISPATCH) { - DISPPARAMS dp = {0}; IDispatch *disp; disp = V_DISPATCH(v); - V_VT(v) = VT_EMPTY; - hres = disp_call(ctx->script, disp, DISPID_VALUE, &dp, v); + hres = get_disp_value(ctx->script, disp, v); IDispatch_Release(disp); if(FAILED(hres)) return hres; @@ -706,10 +703,9 @@ static HRESULT assign_value(exec_ctx_t *ctx, VARIANT *dst, VARIANT *src, WORD fl return hres; if(V_VT(dst) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { - DISPPARAMS dp = {NULL}; VARIANT value; - hres = disp_call(ctx->script, V_DISPATCH(dst), DISPID_VALUE, &dp, &value); + hres = get_disp_value(ctx->script, V_DISPATCH(dst), &value); IDispatch_Release(V_DISPATCH(dst)); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index eec0bf6..9c0c4c1 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -105,15 +105,12 @@ static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD fla if(V_VT(v) == VT_DISPATCH) { if(!(flags & DISPATCH_PROPERTYPUTREF)) { - DISPPARAMS val_dp = {NULL}; - VARIANT value; HRESULT hres; - hres = disp_call(ctx, V_DISPATCH(v), DISPID_VALUE, &val_dp, &value); + hres = get_disp_value(ctx, V_DISPATCH(v), v); if(FAILED(hres)) return hres; - *v = value; *is_owned = TRUE; } }else if(!(flags & DISPATCH_PROPERTYPUT)) { @@ -1102,6 +1099,12 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, return hres; } +HRESULT get_disp_value(script_ctx_t *ctx, IDispatch *disp, VARIANT *v) +{ + DISPPARAMS dp = {NULL}; + return disp_call(ctx, disp, DISPID_VALUE, &dp, v); +} + HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp) { IDispatchEx *dispex; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cbb90ce..cd122d3 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -149,6 +149,7 @@ HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_ HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; +HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : mciqtz: Implement MCI_DGV_SETAUDIO_VOLUME.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 7561375eded9d6c1675f47bb1ae569d95253e0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7561375eded9d6c1675f47bb1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 5 23:34:42 2015 +0900 mciqtz: Implement MCI_DGV_SETAUDIO_VOLUME. --- dlls/mciqtz32/mciqtz.c | 46 +++++++++++++++++++++++++++++++++++++++--- dlls/mciqtz32/mciqtz_private.h | 1 + dlls/winmm/tests/mci.c | 6 +++--- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index c13746d..a72f1af 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -198,6 +198,12 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicAudio, (void**)&wma->audio); + if (FAILED(hr)) { + TRACE("Cannot get IBasicAudio interface (hr = %x)\n", hr); + goto err; + } + if (!(dwFlags & MCI_OPEN_ELEMENT) || (dwFlags & MCI_OPEN_ELEMENT_ID)) { TRACE("Wrong dwFlags %x\n", dwFlags); goto err; @@ -240,6 +246,9 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, return 0; err: + if (wma->audio) + IBasicAudio_Release(wma->audio); + wma->audio = NULL; if (wma->vidbasic) IBasicVideo_Release(wma->vidbasic); wma->vidbasic = NULL; @@ -284,6 +293,7 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP if (wma->opened) { IVideoWindow_Release(wma->vidwin); IBasicVideo_Release(wma->vidbasic); + IBasicAudio_Release(wma->audio); IMediaSeeking_Release(wma->seek); IMediaEvent_Release(wma->mevent); IGraphBuilder_Release(wma->pgraph); @@ -892,8 +902,9 @@ out: static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_PARMSW lpParms) { WINE_MCIQTZ *wma; + DWORD ret = 0; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); if (!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -902,9 +913,38 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P if (!wma) return MCIERR_INVALID_DEVICE_ID; - MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + if (!(dwFlags & MCI_DGV_SETAUDIO_ITEM)) { + FIXME("Unknown flags (%08x)\n", dwFlags); + return 0; + } - return 0; + if (dwFlags & MCI_DGV_SETAUDIO_ITEM) { + switch (lpParms->dwItem) { + case MCI_DGV_SETAUDIO_VOLUME: + if (dwFlags & MCI_DGV_SETAUDIO_VALUE) { + long vol = -10000; + HRESULT hr; + if (lpParms->dwValue > 1000) { + ret = MCIERR_OUTOFRANGE; + break; + } + if (dwFlags & MCI_TEST) + break; + vol += (long)lpParms->dwValue * 10; + hr = IBasicAudio_put_Volume(wma->audio, vol); + if (FAILED(hr)) { + WARN("Cannot set volume (hr = %x)\n", hr); + ret = MCIERR_INTERNAL; + } + } + break; + default: + FIXME("Unknown item %08x\n", lpParms->dwItem); + break; + } + } + + return ret; } /*======================================================================* diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 35adc42..7263a26 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -35,6 +35,7 @@ typedef struct { IMediaEvent* mevent; IVideoWindow* vidwin; IBasicVideo* vidbasic; + IBasicAudio* audio; DWORD time_format; UINT command_table; HWND parent; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 5438d12..ab0c611 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1334,14 +1334,14 @@ static void test_playWaveTypeMpegvideo(void) err = mciSendStringA("status mysound mode", buf, sizeof(buf), NULL); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); - todo_wine ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); + ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); err = mciSendStringA("setaudio mysound volume to 1001", NULL, 0, NULL); - todo_wine ok(err==MCIERR_OUTOFRANGE,"mci setaudio volume to 1001 returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_OUTOFRANGE,"mci setaudio volume to 1001 returned %s\n", dbg_mcierr(err)); err = mciSendStringA("status mysound mode", buf, sizeof(buf), NULL); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); - todo_wine ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); + ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); err = mciSendStringA("close mysound", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : winmm/tests: Add MCI_SETAUDIO command tests.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 6a41aeefe830441811785d4bd59a2b7b3e23b66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a41aeefe830441811785d4bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 5 23:34:40 2015 +0900 winmm/tests: Add MCI_SETAUDIO command tests. --- dlls/winmm/tests/mci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index a729b5f..5438d12 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1329,6 +1329,20 @@ static void test_playWaveTypeMpegvideo(void) ok(status_parm.dwReturn == MCI_MODE_PLAY, "mciCommand status mode: %u\n", (DWORD)status_parm.dwReturn); + err = mciSendStringA("setaudio mysound volume to 1000", NULL, 0, NULL); + ok(!err,"mci setaudio volume to 1000 returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("status mysound mode", buf, sizeof(buf), NULL); + ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); + todo_wine ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); + + err = mciSendStringA("setaudio mysound volume to 1001", NULL, 0, NULL); + todo_wine ok(err==MCIERR_OUTOFRANGE,"mci setaudio volume to 1001 returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("status mysound mode", buf, sizeof(buf), NULL); + ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); + todo_wine ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); + err = mciSendStringA("close mysound", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 11db4481297484086ebb205b24dc0370e34559c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11db4481297484086ebb205b2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 5 23:34:37 2015 +0900 po: Update Japanese translation. --- po/ja.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9f41977..73bda26 100644 --- a/po/ja.po +++ b/po/ja.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: 2015-02-25 00:13+0900\n" +"PO-Revision-Date: 2015-03-05 23:24+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -3133,10 +3133,8 @@ msgid "&View Source" msgstr "ソースの表示(&V)" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "プロパティ" +msgstr "プロパティ(&T)" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104

1 0

Bruno Jesus : ws2_32: Make closesocket() more robust.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: bf36fb02165db67a35ccd3f3c55f5b605a780221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf36fb02165db67a35ccd3f3c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Mar 5 03:35:06 2015 -0300 ws2_32: Make closesocket() more robust. --- dlls/ws2_32/socket.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5bfdecf..7e875e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2780,9 +2780,23 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) */ int WINAPI WS_closesocket(SOCKET s) { - TRACE("socket %04lx\n", s); - if (CloseHandle(SOCKET2HANDLE(s))) return 0; - return SOCKET_ERROR; + int res = SOCKET_ERROR, fd; + if (num_startup) + { + fd = get_sock_fd(s, FILE_READ_DATA, NULL); + if (fd >= 0) + { + release_sock_fd(s, fd); + if (CloseHandle(SOCKET2HANDLE(s))) + res = 0; + } + else + SetLastError(WSAENOTSOCK); + } + else + SetLastError(WSANOTINITIALISED); + TRACE("(socket %04lx) -> %d\n", s, res); + return res; } static int do_connect(int fd, const struct WS_sockaddr* name, int namelen)

1 0

Bruno Jesus : kernel32: In GetTempPathW only copy the path if it fits and zero the buffer when it doesn 't.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 81598be9cf1299a2a101e43ceca8d463c2c675e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81598be9cf1299a2a101e43ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Mar 5 02:33:33 2015 -0300 kernel32: In GetTempPathW only copy the path if it fits and zero the buffer when it doesn't. --- dlls/kernel32/path.c | 20 ++++++++++---------- dlls/kernel32/tests/path.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1048214..4cc8c1d 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -621,17 +621,17 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) ret++; /* add space for terminating 0 */ - if (count) + if (count >= ret) { - lstrcpynW(path, tmp_path, ret); - if (count >= ret) - { - /* the remaining buffer must be zeroed */ - memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); - ret--; /* return length without 0 */ - } - else if (count < 4) - path[0] = 0; /* avoid returning ambiguous "X:" */ + lstrcpynW(path, tmp_path, count); + /* the remaining buffer must be zeroed */ + memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); + ret--; /* return length without 0 */ + } + else if (count) + { + /* the buffer must be cleared if contents will not fit */ + memset(path, 0, count * sizeof(WCHAR)); } TRACE("returning %u, %s\n", ret, debugstr_w(path)); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index a5c0f41..e97c50c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -922,7 +922,7 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) static void test_GetTempPathA(char* tmp_dir) { - DWORD len, len_with_null; + DWORD len, slen, len_with_null; char buf[MAX_PATH]; len_with_null = strlen(tmp_dir) + 1; @@ -959,13 +959,22 @@ static void test_GetTempPathA(char* tmp_dir) ok(lstrcmpiA(buf, tmp_dir) == 0, "expected [%s], got [%s]\n",tmp_dir,buf); ok(len == strlen(buf), "returned length should be equal to the length of string\n"); /* The rest of the buffer remains untouched */ + slen = len + 1; for(len++; len < sizeof(buf); len++) ok(buf[len] == 'a', "expected 'a' at [%d], got 0x%x\n", len, buf[len]); + + /* When the buffer is not long enough it remains untouched */ + memset(buf, 'a', sizeof(buf)); + len = GetTempPathA(slen / 2, buf); + ok(len == slen || broken(len == slen + 1) /* read the big comment above */ , + "expected %d, got %d\n", slen, len); + for(len = 0; len < sizeof(buf) / sizeof(buf[0]); len++) + ok(buf[len] == 'a', "expected 'a' at [%d], got 0x%x\n", len, buf[len]); } static void test_GetTempPathW(char* tmp_dir) { - DWORD len, len_with_null; + DWORD len, slen, len_with_null; WCHAR buf[MAX_PATH]; WCHAR tmp_dirW[MAX_PATH]; static const WCHAR fooW[] = {'f','o','o',0}; @@ -1011,8 +1020,34 @@ static void test_GetTempPathW(char* tmp_dir) ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); /* The rest of the buffer must be zeroed */ + slen = len + 1; for(len++; len < sizeof(buf) / sizeof(buf[0]); len++) ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); + + /* When the buffer is not long enough the length passed is zeroed */ + for(len = 0; len < sizeof(buf) / sizeof(buf[0]); len++) + buf[len] = 'a'; + len = GetTempPathW(slen / 2, buf); + ok(len == slen || broken(len == slen + 1) /* read the big comment above */ , + "expected %d, got %d\n", slen, len); + + { + /* In Windows 8 when TMP var points to a drive only (like C:) instead of a + * full directory the behavior changes. It will start filling the path but + * will later truncate the buffer before returning. So the generic test + * below will fail for this Windows 8 corner case. + */ + char tmp_var[64]; + DWORD version = GetVersion(); + GetEnvironmentVariableA("TMP", tmp_var, sizeof(tmp_var)); + if (strlen(tmp_var) == 2 && version >= 0x00060002) + return; + } + + for(len = 0; len < slen / 2; len++) + ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); + for(; len < sizeof(buf) / sizeof(buf[0]); len++) + ok(buf[len] == 'a', "expected 'a' at [%d], got 0x%x\n", len, buf[len]); } static void test_GetTempPath(void)

1 0

Jacek Caban : appwiz.cpl: Include package version in request URL.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: c769d6fe23561ce50d7149a61c1b475861df7786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c769d6fe23561ce50d7149a61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 12:45:13 2015 +0100 appwiz.cpl: Include package version in request URL. --- dlls/appwiz.cpl/addons.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index f4edd02..ce128fe 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -629,6 +629,7 @@ static void append_url_params( WCHAR *url ) { static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; static const WCHAR v_formatW[] = {'&','v','='}; + static const WCHAR winevW[] = {'&','w','i','n','e','v','='}; DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR); DWORD len = strlenW(url); @@ -638,7 +639,10 @@ static void append_url_params( WCHAR *url ) url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, v_formatW, sizeof(v_formatW)); len += sizeof(v_formatW)/sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); + len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; + memcpy(url+len, winevW, sizeof(winevW)); + len += sizeof(winevW)/sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, PACKAGE_VERSION, -1, url+len, size/sizeof(WCHAR)-len); } static LPWSTR get_url(void)

1 0

Christian Costa : d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 27c72ae986fbc6f168e2001b43cf80a131de03cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c72ae986fbc6f168e2001b4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Dec 31 10:42:01 2014 +0100 d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub. --- dlls/d3dx9_36/skin.c | 6 +++--- include/d3dx9mesh.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index aa5acf2..9b93af6 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -395,13 +395,13 @@ static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, } static HRESULT WINAPI d3dx9_skin_info_ConvertToIndexedBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, - DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, + DWORD options, DWORD palette_size, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) { - FIXME("iface %p, mesh_in %p, options %#x, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, " + FIXME("iface %p, mesh_in %p, options %#x, palette_size %u, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, " "max_face_infl %p, num_bone_combinations %p, bone_combination_table %p, mesh_out %p stub!\n", - iface, mesh_in, options, adjacency_in, adjacency_out, face_remap, vertex_remap, + iface, mesh_in, options, palette_size, adjacency_in, adjacency_out, face_remap, vertex_remap, max_face_infl, num_bone_combinations, bone_combination_table, mesh_out); return E_NOTIMPL; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 1dcc244..8777749 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -544,9 +544,10 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(ConvertToBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; - STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, - DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, - DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; + STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, DWORD palette_size, + const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, + DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, + ID3DXMesh **mesh_out) PURE; }; #undef INTERFACE

1 0

Mark Harmstone : comctl32: Draw hot parts of themed scrollbars.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: a20c920bbdd31394220370c8aac695cb189b4cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20c920bbdd31394220370c8a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 21:56:37 2015 +0000 comctl32: Draw hot parts of themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 195 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 5a44994..bb42267 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -48,6 +48,9 @@ enum SCROLL_HITTEST SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ }; +static HWND tracking_win = 0; +static enum SCROLL_HITTEST tracking_hot_part = SCROLL_NOWHERE; + WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) @@ -149,6 +152,164 @@ static enum SCROLL_HITTEST hit_test(HWND hwnd, HTHEME theme, POINT pt) return SCROLL_BOTTOM_RECT; } +static void redraw_part(HWND hwnd, HTHEME theme, enum SCROLL_HITTEST part) +{ + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL vertical = style & SBS_VERT; + SIZE sz; + RECT r, partrect; + unsigned int size, upsize, downsize; + + if (part == SCROLL_NOWHERE) { /* redraw everything */ + InvalidateRect(hwnd, NULL, TRUE); + return; + } + + GetWindowRect(hwnd, &r); + OffsetRect(&r, -r.left, -r.top); + + if (vertical) { + size = r.bottom; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_UPNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get up arrow size.\n"); + upsize = 0; + } else + upsize = sz.cy; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_DOWNNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get down arrow size.\n"); + downsize = 0; + } else + downsize = sz.cy; + } else { + size = r.right; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_LEFTNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get left arrow size.\n"); + upsize = 0; + } else + upsize = sz.cx; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_RIGHTNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get right arrow size.\n"); + downsize = 0; + } else + downsize = sz.cx; + } + + if (size < SCROLL_MIN_RECT + upsize + downsize) + upsize = downsize = (size - SCROLL_MIN_RECT)/2; + + partrect = r; + + if (part == SCROLL_TOP_ARROW) { + if (vertical) + partrect.bottom = partrect.top + upsize; + else + partrect.right = partrect.left + upsize; + } else if (part == SCROLL_BOTTOM_ARROW) { + if (vertical) + partrect.top = partrect.bottom - downsize; + else + partrect.left = partrect.right - downsize; + } else { + unsigned int thumbpos, thumbsize; + SCROLLINFO si; + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + if (!GetScrollInfo(hwnd, SB_CTL, &si)) { + WARN("GetScrollInfo failed.\n"); + return; + } + + calc_thumb_dimensions(size - upsize - downsize, &si, &thumbpos, &thumbsize); + + if (part == SCROLL_TOP_RECT) { + if (vertical) { + partrect.top = r.top + upsize; + partrect.bottom = partrect.top + thumbpos; + } else { + partrect.left = r.left + upsize; + partrect.right = partrect.left + thumbpos; + } + } else if (part == SCROLL_THUMB) { + if (vertical) { + partrect.top = r.top + upsize + thumbpos; + partrect.bottom = partrect.top + thumbsize; + } else { + partrect.left = r.left + upsize + thumbpos; + partrect.right = partrect.left + thumbsize; + } + } else if (part == SCROLL_BOTTOM_RECT) { + if (vertical) { + partrect.top = r.top + upsize + thumbpos + thumbsize; + partrect.bottom = r.bottom - downsize; + } else { + partrect.left = r.left + upsize + thumbpos + thumbsize; + partrect.right = r.right - downsize; + } + } + } + + InvalidateRect(hwnd, &partrect, TRUE); +} + +static void scroll_event(HWND hwnd, HTHEME theme, UINT msg, POINT pt) +{ + enum SCROLL_HITTEST hittest; + TRACKMOUSEEVENT tme; + + if (GetWindowLongW(hwnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX)) + return; + + hittest = hit_test(hwnd, theme, pt); + + switch (msg) + { + case WM_MOUSEMOVE: + hittest = hit_test(hwnd, theme, pt); + tracking_win = hwnd; + break; + + case WM_MOUSELEAVE: + if (tracking_win == hwnd) { + hittest = SCROLL_NOWHERE; + } + break; + } + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent(&tme); + + if (!(tme.dwFlags & TME_LEAVE) || tme.hwndTrack != hwnd) { + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent(&tme); + } + + if (tracking_win != hwnd && msg == WM_MOUSELEAVE) { + redraw_part(hwnd, theme, SCROLL_NOWHERE); + return; + } + + if (tracking_win == hwnd && hittest != tracking_hot_part) { + enum SCROLL_HITTEST oldhotpart = tracking_hot_part; + + tracking_hot_part = hittest; + + if (hittest != SCROLL_NOWHERE) + redraw_part(hwnd, theme, hittest); + else + tracking_win = 0; + + if (oldhotpart != SCROLL_NOWHERE) + redraw_part(hwnd, theme, oldhotpart); + } +} + static void paint_scrollbar(HWND hwnd, HTHEME theme) { HDC dc; @@ -197,6 +358,15 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) uppertrackstate = SCRBS_NORMAL; lowertrackstate = SCRBS_NORMAL; thumbstate = SCRBS_NORMAL; + + if (tracking_win == hwnd) { + if (tracking_hot_part == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_HOT; + else if (tracking_hot_part == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_HOT; + else if (tracking_hot_part == SCROLL_THUMB) + thumbstate = SCRBS_HOT; + } } if (vertical) { @@ -209,6 +379,13 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } else { uparrowstate = ABS_UPNORMAL; downarrowstate = ABS_DOWNNORMAL; + + if (tracking_win == hwnd) { + if (tracking_hot_part == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPHOT; + else if (tracking_hot_part == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNHOT; + } } if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, uparrowstate, NULL, TS_DRAW, &upsize))) { @@ -277,6 +454,13 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } else { leftarrowstate = ABS_LEFTNORMAL; rightarrowstate = ABS_RIGHTNORMAL; + + if (tracking_win == hwnd) { + if (tracking_hot_part == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTHOT; + else if (tracking_hot_part == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTHOT; + } } if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, leftarrowstate, NULL, TS_DRAW, &leftsize))) { @@ -348,6 +532,7 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, const WCHAR* themeClass = WC_SCROLLBARW; HTHEME theme; LRESULT result; + POINT pt; TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); @@ -382,6 +567,16 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, paint_scrollbar(hwnd, theme); break; + case WM_MOUSEMOVE: + case WM_MOUSELEAVE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + scroll_event(hwnd, theme, msg, pt); + break; + default: return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); }

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015