August 2007 - Wine-commits - list.winehq.org

Misha Koshelev : urlmon/tests: Add tests for synchronous vs asynchronous binding.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: ed2cf42b514013aa99b5debd33a4db689ef3a96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2cf42b514013aa99b5debd3… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Aug 6 23:08:46 2007 -0500 urlmon/tests: Add tests for synchronous vs asynchronous binding. --- dlls/urlmon/tests/url.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfb7ca7..a28c32c 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -104,7 +104,8 @@ static const WCHAR MK_URL[] = {'m','k',':','@','M','S','I','T','S','t','o','r',' static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; -static BOOL stopped_binding = FALSE, emulate_protocol = FALSE; +static BOOL stopped_binding = FALSE, emulate_protocol = FALSE, + data_available = FALSE, http_is_first = TRUE; static DWORD read = 0, bindf = 0; static const LPCWSTR urls[] = { @@ -612,6 +613,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR BYTE buf[512]; CHECK_EXPECT2(OnDataAvailable); + data_available = TRUE; if (0) { @@ -768,6 +770,8 @@ static void test_BindToStorage(int protocol, BOOL emul) test_protocol = protocol; emulate_protocol = emul; + stopped_binding = FALSE; + data_available = FALSE; SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); @@ -837,20 +841,20 @@ static void test_BindToStorage(int protocol, BOOL emul) trace( "Network unreachable, skipping tests\n" ); return; } - ok(SUCCEEDED(hres), "IMoniker_BindToStorage failed: %08x\n", hres); if (!SUCCEEDED(hres)) return; - if(test_protocol == HTTP_TEST) { - todo_wine { - ok(unk == NULL, "istr should be NULL\n"); - } + if((bindf & BINDF_ASYNCHRONOUS) && !data_available) { + ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToStorage failed: %08x\n", hres); + ok(unk == NULL, "istr should be NULL\n"); }else { + ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); } if(unk) IUnknown_Release(unk); - while(!stopped_binding && GetMessage(&msg,NULL,0,0)) { + while((bindf & BINDF_ASYNCHRONOUS) && + !stopped_binding && GetMessage(&msg,NULL,0,0)) { TranslateMessage(&msg); DispatchMessage(&msg); } @@ -870,8 +874,13 @@ static void test_BindToStorage(int protocol, BOOL emul) * called on WinXP but not on Win98 */ CLEAR_CALLED(QueryInterface_IHttpNegotiate2); CLEAR_CALLED(GetRootSecurityId); - CHECK_CALLED(OnProgress_FINDINGRESOURCE); - CHECK_CALLED(OnProgress_CONNECTING); + if(http_is_first) { + CHECK_CALLED(OnProgress_FINDINGRESOURCE); + CHECK_CALLED(OnProgress_CONNECTING); + }else todo_wine { + CHECK_NOT_CALLED(OnProgress_FINDINGRESOURCE); + CHECK_NOT_CALLED(OnProgress_CONNECTING); + } CHECK_CALLED(OnProgress_SENDINGREQUEST); todo_wine CHECK_CALLED(OnResponse); todo_wine { CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); } @@ -889,6 +898,9 @@ static void test_BindToStorage(int protocol, BOOL emul) ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); + + if(test_protocol == HTTP_TEST) + http_is_first = FALSE; } static void set_file_url(void) @@ -953,6 +965,14 @@ START_TEST(url) test_CreateAsyncBindCtx(); test_CreateAsyncBindCtxEx(); + trace("synchronous http test...\n"); + test_BindToStorage(HTTP_TEST, FALSE); + + trace("synchronous file test...\n"); + create_file(); + test_BindToStorage(FILE_TEST, FALSE); + DeleteFileW(wszIndexHtml); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; trace("http test...\n");

1 0

Misha Koshelev : urlmon: Add support for synchronous binding.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 97e999565daa7c7426a3c60a28455bbc55d3f635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e999565daa7c7426a3c60a2… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Aug 6 23:08:31 2007 -0500 urlmon: Add support for synchronous binding. --- dlls/urlmon/binding.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index acf96b6..5820d4f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1375,6 +1375,7 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) { Binding *binding = NULL; HRESULT hres; + MSG msg; *ppv = NULL; @@ -1403,6 +1404,15 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) return hres; } + while(!(binding->bindf & BINDF_ASYNCHRONOUS) && + binding->download_state != END_DOWNLOAD) { + MsgWaitForMultipleObjects(0, NULL, FALSE, 5000, QS_POSTMESSAGE); + while (PeekMessageW(&msg, binding->notif_hwnd, WM_USER, WM_USER+117, PM_REMOVE|PM_NOYIELD)) { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + if(binding->stream->init_buf) { if(binding->request_locked) IInternetProtocol_UnlockRequest(binding->protocol);

1 0

James Hawkins : msi: Implement the MSIINSTALLCONTEXT_MACHINE context for MsiQueryComponentState .
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: ca55c7a3307188952513c01aa8f6abf8da18b46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca55c7a3307188952513c01aa… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 6 20:48:34 2007 -0700 msi: Implement the MSIINSTALLCONTEXT_MACHINE context for MsiQueryComponentState. --- dlls/msi/msi.c | 45 ++++++++++++++++++++++++++-- dlls/msi/msipriv.h | 2 + dlls/msi/registry.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/msi/tests/msi.c | 80 +++++++++++++++---------------------------------- 4 files changed, 129 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca55c7a3307188952513c…

1 0

Misha Koshelev : urlmon/tests: Declare the bind flags as a global variable in url tests.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: e54a48f96c7130b797757e1d79c5923943499b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54a48f96c7130b797757e1d7… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Aug 6 23:08:21 2007 -0500 urlmon/tests: Declare the bind flags as a global variable in url tests. --- dlls/urlmon/tests/url.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1b2758e..cfb7ca7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -105,7 +105,7 @@ static const WCHAR MK_URL[] = {'m','k',':','@','M','S','I','T','S','t','o','r',' static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static BOOL stopped_binding = FALSE, emulate_protocol = FALSE; -static DWORD read = 0; +static DWORD read = 0, bindf = 0; static const LPCWSTR urls[] = { WINE_ABOUT_URL, @@ -596,7 +596,7 @@ static HRESULT WINAPI statusclb_GetBindInfo(IBindStatusCallback *iface, DWORD *g CHECK_EXPECT(GetBindInfo); - *grfBINDF = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + *grfBINDF = bindf; cbSize = pbindinfo->cbSize; memset(pbindinfo, 0, cbSize); pbindinfo->cbSize = cbSize; @@ -953,6 +953,8 @@ START_TEST(url) test_CreateAsyncBindCtx(); test_CreateAsyncBindCtxEx(); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + trace("http test...\n"); test_BindToStorage(HTTP_TEST, FALSE);

1 0

James Hawkins : msi: Add tests for MsiQueryComponentState.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 072adfa99aa0c5ba9e4bbcdb5b6bf4ba2cf692ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=072adfa99aa0c5ba9e4bbcdb5… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 6 19:27:54 2007 -0700 msi: Add tests for MsiQueryComponentState. --- dlls/msi/tests/msi.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 238 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=072adfa99aa0c5ba9e4bb…

1 0

James Hawkins : msi: Forward MsiQueryComponentStateA to MsiQueryComponentStateW.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 5f442207d579dc3d6cf5243c4c63c6be966edccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f442207d579dc3d6cf5243c4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 6 19:36:28 2007 -0700 msi: Forward MsiQueryComponentStateA to MsiQueryComponentStateW. --- dlls/msi/msi.c | 35 +++++++++++++++++++++++++++++++++-- dlls/msi/msi.spec | 2 +- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 47c08a9..9b311d7 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -732,9 +732,40 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) return ERROR_SUCCESS; } -UINT WINAPI MsiQueryComponentStateA(LPCSTR szProductCode, LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCSTR szComponent, INSTALLSTATE *pdwState) +UINT WINAPI MsiQueryComponentStateA(LPCSTR szProductCode, + LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, + LPCSTR szComponent, INSTALLSTATE *pdwState) { - FIXME("(%s, %s, %d, %s, %p): stub!\n", debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, debugstr_a(szComponent), pdwState); + LPWSTR prodcode = NULL, usersid = NULL, comp = NULL; + UINT r; + + TRACE("(%s, %s, %d, %s, %p)\n", debugstr_a(szProductCode), + debugstr_a(szUserSid), dwContext, debugstr_a(szComponent), pdwState); + + if (szProductCode && !(prodcode = strdupAtoW(szProductCode))) + return ERROR_OUTOFMEMORY; + + if (szUserSid && !(usersid = strdupAtoW(szUserSid))) + return ERROR_OUTOFMEMORY; + + if (szComponent && !(comp = strdupAtoW(szComponent))) + return ERROR_OUTOFMEMORY; + + r = MsiQueryComponentStateW(prodcode, usersid, dwContext, comp, pdwState); + + msi_free(prodcode); + msi_free(usersid); + msi_free(comp); + + return r; +} + +UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, + LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, + LPCWSTR szComponent, INSTALLSTATE *pdwState) +{ + FIXME("(%s, %s, %d, %s, %p): stub!\n", debugstr_w(szProductCode), + debugstr_w(szUserSid), dwContext, debugstr_w(szComponent), pdwState); if (!pdwState) return ERROR_INVALID_PARAMETER; diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 3990849..2874b71 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -243,7 +243,7 @@ 247 stub MsiGetProductInfoExA 248 stub MsiGetProductInfoExW 249 stdcall MsiQueryComponentStateA(str str long str ptr) -250 stub MsiQueryComponentStateW +250 stdcall MsiQueryComponentStateW(wstr wstr long wstr ptr) 251 stub MsiQueryFeatureStateExA 252 stub MsiQueryFeatureStateExW 253 stub MsiDeterminePatchSequenceA

1 0

Hwang YunSong(황윤성) : write: New Korean resource.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 3207e06fe9f51390bc2ff4a27a6761135395c16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3207e06fe9f51390bc2ff4a27… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Aug 6 09:19:25 2007 +0900 write: New Korean resource. --- programs/write/Ko.rc | 27 +++++++++++++++++++++++++++ programs/write/rsrc.rc | 1 + 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/programs/write/Ko.rc b/programs/write/Ko.rc new file mode 100644 index 0000000..f78ea13 --- /dev/null +++ b/programs/write/Ko.rc @@ -0,0 +1,27 @@ +/* + * Korean language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2008 YunSong Hwang(Ȳ��)(hys545(a)dreamwiz.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "��е� �� " +} diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index 06e4040..6e63eee 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -22,3 +22,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Ko.rc"

1 0

Andrew Talbot : qcap: Constify some variables.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 48dcc3fc04cb5e6c735c0160ddea85c4e0088d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48dcc3fc04cb5e6c735c0160d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 6 20:25:31 2007 +0100 qcap: Constify some variables. --- dlls/qcap/capture.h | 2 +- dlls/qcap/pin.c | 4 +++- dlls/qcap/pin.h | 4 +++- dlls/qcap/v4l.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index b5c707a..626bc05 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -29,7 +29,7 @@ typedef struct _Capture Capture; Capture *qcap_driver_init(IPin*,USHORT); HRESULT qcap_driver_destroy(Capture*); HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*); -HRESULT qcap_driver_get_format(Capture*,AM_MEDIA_TYPE**); +HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**); HRESULT qcap_driver_get_prop_range(Capture*,long,long*,long*,long*,long*,long*); HRESULT qcap_driver_get_prop(Capture*,long,long*,long*); HRESULT qcap_driver_set_prop(Capture*,long,long,long); diff --git a/dlls/qcap/pin.c b/dlls/qcap/pin.c index 09c3c5d..28d2f1a 100644 --- a/dlls/qcap/pin.c +++ b/dlls/qcap/pin.c @@ -223,7 +223,9 @@ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const return hr; } -HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES * props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl) +HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES * props, + LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl) { TRACE("\n"); diff --git a/dlls/qcap/pin.h b/dlls/qcap/pin.h index 5dba694..316d3d6 100644 --- a/dlls/qcap/pin.h +++ b/dlls/qcap/pin.h @@ -59,7 +59,9 @@ typedef struct OutputPin } OutputPin; /*** Initializers ***/ -HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl); +HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES *props, + LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl); /* Common */ HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index babf2cf..0742968 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -73,7 +73,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); #ifdef HAVE_LINUX_VIDEODEV_H -typedef void (* Renderer)(Capture *, LPBYTE bufferin, LPBYTE stream); +typedef void (* Renderer)(const Capture *, LPBYTE bufferin, const BYTE *stream); struct _Capture { @@ -111,8 +111,8 @@ struct renderlist Renderer renderer; }; -static void renderer_RGB(Capture *capBox, LPBYTE bufferin, LPBYTE stream); -static void renderer_YUV(Capture *capBox, LPBYTE bufferin, LPBYTE stream); +static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); +static void renderer_YUV(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); static const struct renderlist renderlist_V4l[] = { { 0, "NULL renderer", NULL }, @@ -279,7 +279,7 @@ HRESULT qcap_driver_set_format(Capture *capBox, AM_MEDIA_TYPE * mT) return S_OK; } -HRESULT qcap_driver_get_format(Capture *capBox, AM_MEDIA_TYPE ** mT) +HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) { VIDEOINFOHEADER *vi; @@ -412,7 +412,7 @@ HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long F return S_OK; } -static void renderer_RGB(Capture *capBox, LPBYTE bufferin, LPBYTE stream) +static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *stream) { int depth = renderlist_V4l[capBox->pict.palette].depth; int size = capBox->height * capBox->width * depth / 8; @@ -443,7 +443,7 @@ static void renderer_RGB(Capture *capBox, LPBYTE bufferin, LPBYTE stream) } } -static void renderer_YUV(Capture *capBox, LPBYTE bufferin, LPBYTE stream) +static void renderer_YUV(const Capture *capBox, LPBYTE bufferin, const BYTE *stream) { enum YUV_Format format; @@ -478,7 +478,7 @@ static void renderer_YUV(Capture *capBox, LPBYTE bufferin, LPBYTE stream) YUV_To_RGB24(format, bufferin, stream, capBox->width, capBox->height); } -static void Resize(Capture * capBox, LPBYTE output, LPBYTE input) +static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { /* the whole image needs to be reversed, because the dibs are messed up in windows */ @@ -927,7 +927,7 @@ HRESULT qcap_driver_set_format(Capture *capBox, AM_MEDIA_TYPE * mT) FAIL_WITH_ERR; } -HRESULT qcap_driver_get_format(Capture *capBox, AM_MEDIA_TYPE ** mT) +HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) { FAIL_WITH_ERR; }

1 0

Hwang YunSong(황윤성) : winecfg: Updated Korean resource.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 093cbbe9329dc9ec01ee7d0de41c473f5b52ee89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=093cbbe9329dc9ec01ee7d0de… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Aug 6 09:21:42 2007 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index edc6613..aab554c 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -86,7 +86,7 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,100,197,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "�ȼ� ��̴� �� (�ϵ���� Ѵٸ�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 - GROUPBOX " Screen Resolution ",IDC_STATIC,8,242,244,25 + GROUPBOX " ȭ�� ػ� ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,252,10,8 @@ -308,5 +308,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Ȱ�� " IDC_SYSPARAMS_INACTIVE_TITLE "��Ȱ�� " IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "��Ȱ�� " - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_MSGBOX_TEXT "�޼�� ؽ�Ʈ" END

1 0

Ralf Beck : winealsa.drv: Correct midi input program change + channel aftertouch.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 92ef2814eb48bed3c859f306a41d8b8e41d4cbec URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ef2814eb48bed3c859f306a… Author: Ralf Beck <musical_snake(a)gmx.de> Date: Mon Aug 6 18:34:11 2007 +0200 winealsa.drv: Correct midi input program change + channel aftertouch. --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index a95f36c..f5e98ed 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -346,10 +346,10 @@ static DWORD WINAPI midRecThread(LPVOID arg) toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; break; case SND_SEQ_EVENT_PGMCHANGE: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; break; case SND_SEQ_EVENT_CHANPRESS: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; break; case SND_SEQ_EVENT_CLOCK: toSend = 0xF8;

1 0