February 2012 - Wine-Commits

Alexandre Julliard : user32: Fix GetKeyNameText returned length.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: f87191815deb5675f20e06c6bfdae402342f9290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87191815deb5675f20e06c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 15 12:07:34 2012 +0100 user32: Fix GetKeyNameText returned length. --- dlls/user32/input.c | 5 ++++- dlls/user32/tests/input.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/keyboard.c | 29 ++++++++++++++++------------- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index abd382f..050fb2b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -823,7 +823,7 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) WCHAR buf[256]; INT ret; - if (!GetKeyNameTextW(lParam, buf, 256)) + if (!nSize || !GetKeyNameTextW(lParam, buf, 256)) { lpBuffer[0] = 0; return 0; @@ -834,6 +834,8 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) ret = nSize - 1; lpBuffer[ret] = 0; } + else ret--; + return ret; } @@ -842,6 +844,7 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) */ INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize) { + if (!lpBuffer || !nSize) return 0; return USER_Driver->pGetKeyNameText( lParam, lpBuffer, nSize ); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 748ed26..cb090dd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1603,6 +1603,46 @@ static void test_keyboard_layout_name(void) ok(!strcmp(klid, "00000409"), "expected 00000409, got %s\n", klid); } +static void test_key_names(void) +{ + char buffer[40]; + WCHAR bufferW[40]; + int ret, prev; + LONG lparam = 0x1d << 16; + + memset( buffer, 0xcc, sizeof(buffer) ); + ret = GetKeyNameTextA( lparam, buffer, sizeof(buffer) ); + ok( ret > 0, "wrong len %u for '%s'\n", ret, buffer ); + ok( ret == strlen(buffer), "wrong len %u for '%s'\n", ret, buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + prev = ret; + ret = GetKeyNameTextA( lparam, buffer, prev ); + ok( ret == prev - 1, "wrong len %u for '%s'\n", ret, buffer ); + ok( ret == strlen(buffer), "wrong len %u for '%s'\n", ret, buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + ret = GetKeyNameTextA( lparam, buffer, 0 ); + ok( ret == 0, "wrong len %u for '%s'\n", ret, buffer ); + ok( buffer[0] == 0, "wrong string '%s'\n", buffer ); + + memset( bufferW, 0xcc, sizeof(bufferW) ); + ret = GetKeyNameTextW( lparam, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + ok( ret > 0, "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + ok( ret == lstrlenW(bufferW), "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + + memset( bufferW, 0xcc, sizeof(bufferW) ); + prev = ret; + ret = GetKeyNameTextW( lparam, bufferW, prev ); + ok( ret == prev - 1, "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + ok( ret == lstrlenW(bufferW), "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + + memset( bufferW, 0xcc, sizeof(bufferW) ); + ret = GetKeyNameTextW( lparam, bufferW, 0 ); + ok( ret == 0, "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + ok( bufferW[0] == 0xcccc, "wrong string %s\n", wine_dbgstr_w(bufferW) ); +} + START_TEST(input) { init_function_pointers(); @@ -1621,6 +1661,7 @@ START_TEST(input) test_ToUnicode(); test_get_async_key_state(); test_keyboard_layout_name(); + test_key_names(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 57deb59..3b91d8f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2291,7 +2291,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) (scanCode != 0x4a ) && /* numpad - */ (scanCode != 0x4e ) ) /* numpad + */ { - if ((nSize >= 2) && lpBuffer) + if (nSize >= 2) { *lpBuffer = toupperW((WCHAR)ansi); *(lpBuffer+1) = 0; @@ -2318,6 +2318,8 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) break; if (keyi <= max_keycode) { + INT rc; + wine_tsx11_lock(); keyc = (KeyCode) keyi; keys = keycode_to_keysym(display, keyc, 0); @@ -2329,29 +2331,30 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) char* idx = strrchr(name, '_'); if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) { - INT rc = 0; TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", scanCode, keyc, keys, debugstr_an(name,idx-name)); - if (lpBuffer && nSize) - { - rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); - if (rc > 0) lpBuffer[rc - 1] = 0; - } + rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); + if (!rc) rc = nSize; + lpBuffer[--rc] = 0; return rc; } } - TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n", - scanCode, keyc, (int)keys, debugstr_a(name)); - if (lpBuffer && nSize && name) - return MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); + if (name) + { + TRACE("found scan=%04x keyc=%u keysym=%04x vkey=%04x string=%s\n", + scanCode, keyc, (int)keys, vkey, debugstr_a(name)); + rc = MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); + if (!rc) rc = nSize; + lpBuffer[--rc] = 0; + return rc; + } } /* Finally issue WARN for unknown keys */ WARN("(%08x,%p,%d): unsupported key, vkey=%04X, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi); - if (lpBuffer && nSize) - *lpBuffer = 0; + *lpBuffer = 0; return 0; }

1 0

Christian Costa : d3dxof: Enable retrieving a particular member in GetData + tests.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: d581f1bf7d2f306ed5803984c300301a758361dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d581f1bf7d2f306ed5803984c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Feb 15 09:53:19 2012 +0100 d3dxof: Enable retrieving a particular member in GetData + tests. --- dlls/d3dxof/d3dxof.c | 21 ++++++++++++++++----- dlls/d3dxof/parsing.c | 3 +++ dlls/d3dxof/tests/d3dxof.c | 28 +++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 966baa2..3294f92 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -616,12 +616,23 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS if (szMember) { - FIXME("Specifying a member is not supported yet!\n"); - return DXFILEERR_BADVALUE; + int i; + for (i = 0; i < This->pobj->nb_members; i++) + if (!strcmp(This->pobj->members[i].name, szMember)) + break; + if (i == This->pobj->nb_members) + { + WARN("Unknown member '%s'\n", szMember); + return DXFILEERR_BADDATAREFERENCE; + } + *pcbSize = This->pobj->members[i].size; + *ppvData = This->pobj->root->pdata + This->pobj->members[i].start; + } + else + { + *pcbSize = This->pobj->size; + *ppvData = This->pobj->root->pdata + This->pobj->pos_data; } - - *pcbSize = This->pobj->size; - *ppvData = This->pobj->root->pdata + This->pobj->pos_data; return DXFILE_OK; } diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 5b8b44b..4b9b12f 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1149,6 +1149,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) int i; xtemplate* pt = buf->pxt[buf->level]; + buf->pxo->nb_members = pt->nb_members; + for (i = 0; i < pt->nb_members; i++) { int k; @@ -1295,6 +1297,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) return FALSE; } + buf->pxo->members[i].size = buf->cur_pos_data - buf->pxo->members[i].start; } return TRUE; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index daded96..8ce22b7 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -204,12 +204,38 @@ static void test_CreateEnumObject(void) hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + /* Get all data (szMember == NULL) */ hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&pdata); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == 8, "Retrieved data size is wrong\n"); + ok(size == 8, "Retrieved data size is wrong (%u instead of 8)\n", size); ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retrieved data is wrong\n"); + /* Get only "major" member (szMember == "major") */ + hr = IDirectXFileData_GetData(lpdxfd, "major", &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 2, "Retrieved data size is wrong (%u instead of 2)\n", size); + ok(*((WORD*)pdata) == 1, "Retrieved data is wrong (%u instead of 1)\n", *((WORD*)pdata)); + + /* Get only "minor" member (szMember == "minor") */ + hr = IDirectXFileData_GetData(lpdxfd, "minor", &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 2, "Retrieved data size is wrong (%u instead of 2)\n", size); + ok(*((WORD*)pdata) == 2, "Retrieved data is wrong (%u instead of 2)\n", *((WORD*)pdata)); + + /* Get only "flags" member (szMember == "flags") */ + hr = IDirectXFileData_GetData(lpdxfd, "flags", &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 4, "Retrieved data size is wrong (%u instead of 4)\n", size); + ok(*((WORD*)pdata) == 3, "Retrieved data is wrong (%u instead of 3)\n", *((WORD*)pdata)); + + /* Try to get not existing member (szMember == "unknown") */ + hr = IDirectXFileData_GetData(lpdxfd, "unknow", &size, (void**)&pdata); + ok(hr == DXFILEERR_BADDATAREFERENCE, "IDirectXFileData_GetData: %x\n", hr); + ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(ref == 0, "Got refcount %d, expected 0\n", ref);

1 0

Andrew Eikum : mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: f7d37b38fe5914cb81f0fbca3902b0862eb842d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d37b38fe5914cb81f0fbca3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 11:50:05 2012 -0600 mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint. This prevents invalid devices from being created if the user adds a device, sets it as default, and then removes it. --- dlls/mmdevapi/devenum.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 06a1adf..ba55368 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -942,7 +942,7 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa if(RegOpenKeyW(HKEY_CURRENT_USER, reg_key, &key) == ERROR_SUCCESS){ const WCHAR *reg_x_name, *reg_vx_name; WCHAR def_id[256]; - DWORD size = sizeof(def_id); + DWORD size = sizeof(def_id), state; if(flow == eRender){ reg_x_name = reg_out_nameW; @@ -957,8 +957,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa (BYTE*)def_id, &size) == ERROR_SUCCESS){ hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device); if(SUCCEEDED(hr)){ - RegCloseKey(key); - return S_OK; + if(SUCCEEDED(IMMDevice_GetState(*device, &state)) && + state == DEVICE_STATE_ACTIVE){ + RegCloseKey(key); + return S_OK; + } } TRACE("Unable to find voice device %s\n", wine_dbgstr_w(def_id)); @@ -968,8 +971,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa (BYTE*)def_id, &size) == ERROR_SUCCESS){ hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device); if(SUCCEEDED(hr)){ - RegCloseKey(key); - return S_OK; + if(SUCCEEDED(IMMDevice_GetState(*device, &state)) && + state == DEVICE_STATE_ACTIVE){ + RegCloseKey(key); + return S_OK; + } } TRACE("Unable to find device %s\n", wine_dbgstr_w(def_id));

1 0

André Hentschel : advapi32/tests: Add a test to cover second RegSetValueW Parameter (gcov).
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: c2c3b51650a8ebda2e4af2150bd1b7041a1ea8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c3b51650a8ebda2e4af2150… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 20:35:09 2012 +0100 advapi32/tests: Add a test to cover second RegSetValueW Parameter (gcov). --- dlls/advapi32/tests/registry.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 60bc451..c0a7ebf 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -353,7 +353,12 @@ static void test_set_value(void) test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); - /* RegSetValueA ignores the size passed in */ + ret = RegSetValueW(hkey_main, name1W, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); + + /* RegSetValueW ignores the size passed in */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, 4 * sizeof(string1W[0])); ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(NULL, string1A, sizeof(string1A));

1 0

André Hentschel : winefile: Fix collapsing when there' s no parent directory.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 7476bb0556de553e690367e4d2faff994cd57457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7476bb0556de553e690367e4d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 19:33:54 2012 +0100 winefile: Fix collapsing when there's no parent directory. --- programs/winefile/winefile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 63ce463..52e1bc4 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3563,7 +3563,10 @@ static BOOL expand_entry(ChildWnd* child, Entry* dir) static void collapse_entry(Pane* pane, Entry* dir) { - int idx = SendMessageW(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); + int idx; + + if (!dir) return; + idx = SendMessageW(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); ShowWindow(pane->hwnd, SW_HIDE);

1 0

Jeremy White : oleaut32: When marshalling VT_CARRAY, only marshall by reference for appropriate types.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 4f5271a17f07b169012168fd81951938bb68e5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5271a17f07b169012168fd8… Author: Jeremy White <jwhite(a)winehq.org> Date: Tue Feb 14 14:59:48 2012 -0600 oleaut32: When marshalling VT_CARRAY, only marshall by reference for appropriate types. --- dlls/oleaut32/tests/tmarshal.c | 34 ++++++++++++++++++++++++---------- dlls/oleaut32/tests/tmarshal.idl | 1 + dlls/oleaut32/tmarshal.c | 23 ++++++++++++++++++++--- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index e261464..b491e53 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -37,14 +37,14 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) -const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432)}; -const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211)}; +const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}}; +const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {0,1,2,3,4,5,6,7}}; const MYSTRUCT MYSTRUCT_ARRAY[5] = { - {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415)}, - {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425)}, - {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435)}, - {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445)}, - {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455)}, + {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415), {0,1,2,3,4,5,6,7}}, + {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425), {0,1,2,3,4,5,6,7}}, + {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435), {0,1,2,3,4,5,6,7}}, + {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445), {0,1,2,3,4,5,6,7}}, + {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455), {0,1,2,3,4,5,6,7}}, }; @@ -563,6 +563,17 @@ static HRESULT WINAPI Widget_VarArg( return S_OK; } + +static BOOL mystruct_uint_ordered(UINT uarr[8]) +{ + int i; + for (i = 0; i < sizeof(uarr) / sizeof(uarr[0]); i++) + if (uarr[i] != i) + return 0; + + return 1; +} + static HRESULT WINAPI Widget_StructArgs( IWidget * iface, MYSTRUCT byval, @@ -571,14 +582,17 @@ static HRESULT WINAPI Widget_StructArgs( { int i, diff = 0; ok(byval.field1 == MYSTRUCT_BYVAL.field1 && - byval.field2 == MYSTRUCT_BYVAL.field2, + byval.field2 == MYSTRUCT_BYVAL.field2 && + mystruct_uint_ordered(byval.uarr), "Struct parameter passed by value corrupted\n"); ok(byptr->field1 == MYSTRUCT_BYPTR.field1 && - byptr->field2 == MYSTRUCT_BYPTR.field2, + byptr->field2 == MYSTRUCT_BYPTR.field2 && + mystruct_uint_ordered(byptr->uarr), "Struct parameter passed by pointer corrupted\n"); for (i = 0; i < 5; i++) if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 || - arr[i].field2 != MYSTRUCT_ARRAY[i].field2) + arr[i].field2 != MYSTRUCT_ARRAY[i].field2 || + ! mystruct_uint_ordered(arr[i].uarr)) diff++; ok(diff == 0, "Array of structs corrupted\n"); return S_OK; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 88c13bf..a26589d 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -39,6 +39,7 @@ library TestTypelib { INT field1; ULONGLONG field2; + UINT uarr[8]; } MYSTRUCT; coclass ApplicationObject2; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 1549d97..44a6d44 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -638,6 +638,17 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { } } +/* Whether we pass this type by reference or by value */ +static int +_passbyref(const TYPEDESC *td, ITypeInfo *tinfo) { + if (td->vt == VT_USERDEFINED || + td->vt == VT_VARIANT || + td->vt == VT_PTR) + return 1; + + return 0; +} + static HRESULT serialize_param( ITypeInfo *tinfo, @@ -892,7 +903,8 @@ serialize_param( if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { - hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf); + LPBYTE base = _passbyref(&adesc->tdescElem, tinfo) ? (LPBYTE) *arg : (LPBYTE) arg; + hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)base+i*_xsize(&adesc->tdescElem, tinfo)), buf); if (hres) return hres; if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); @@ -1172,13 +1184,18 @@ deserialize_param( } case VT_CARRAY: { /* arg is pointing to the start of the array. */ + LPBYTE base = (LPBYTE) arg; ARRAYDESC *adesc = tdesc->u.lpadesc; int arrsize,i; arrsize = 1; if (adesc->cDims > 1) FIXME("cDims > 1 in VT_CARRAY. Does it work?\n"); for (i=0;i<adesc->cDims;i++) arrsize *= adesc->rgbounds[i].cElements; - *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); + if (_passbyref(&adesc->tdescElem, tinfo)) + { + base = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); + *arg = (DWORD) base; + } for (i=0;i<arrsize;i++) deserialize_param( tinfo, @@ -1186,7 +1203,7 @@ deserialize_param( debugout, alloc, &adesc->tdescElem, - (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), + (DWORD*)(base + i*_xsize(&adesc->tdescElem, tinfo)), buf ); return S_OK;

1 0

Andrew Eikum : winealsa.drv: Optionally load extra ALSA device names from the registry.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 73cdf6530c2e463554194e11233c57251dc61a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cdf6530c2e463554194e112… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 15:28:29 2012 -0600 winealsa.drv: Optionally load extra ALSA device names from the registry. --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/mmdevdrv.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 336da8b..7086ce6 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winealsa.drv -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = @ALSALIBS@ diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7621423..0f710a5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -340,6 +340,57 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char return S_OK; } +static void get_reg_devices(snd_pcm_stream_t stream, WCHAR **ids, char **keys, + UINT *num) +{ + static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','a','l','s','a','.','d','r','v',0}; + static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; + static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + HKEY key; + WCHAR reg_devices[256]; + DWORD size = sizeof(reg_devices), type, len; + const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ + if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ + if(RegQueryValueExW(key, value_name, 0, &type, + (BYTE*)reg_devices, &size) == ERROR_SUCCESS){ + WCHAR *p = reg_devices; + + if(type != REG_MULTI_SZ){ + ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); + RegCloseKey(key); + return; + } + + while(*p){ + char devname[64]; + + WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); + + if(alsa_try_open(devname, stream)){ + if(ids && keys){ + len = lstrlenW(p) + 1; + ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(ids[*num], p, len * sizeof(WCHAR)); + + len = strlen(devname) + 1; + keys[*num] = HeapAlloc(GetProcessHeap(), 0, len); + memcpy(keys[*num], devname, len); + } + ++*num; + } + + p += lstrlenW(p) + 1; + } + } + + RegCloseKey(key); + } +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, UINT *num) { @@ -360,6 +411,8 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, ++*num; } + get_reg_devices(stream, ids, keys, num); + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64];

1 0

Andrew Eikum : dsound: Add some more DSCAPS flags.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 9d06d41e37e124a95f095ecb4a61a44cb545fc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d06d41e37e124a95f095ecb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 09:40:38 2012 -0600 dsound: Add some more DSCAPS flags. --- dlls/dsound/dsound.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 305bfeb0..444b933 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1480,6 +1480,11 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG DSOUND_check_supported(device->client, 96000, 16, 2)) device->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT | DSCAPS_PRIMARYSTEREO; + /* the dsound mixer supports all of the following */ + device->drvcaps.dwFlags |= DSCAPS_SECONDARY8BIT | DSCAPS_SECONDARY16BIT; + device->drvcaps.dwFlags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO; + device->drvcaps.dwFlags |= DSCAPS_CONTINUOUSRATE; + device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;

1 0

Akihiro Sagawa : comdlg32: Apply 3D effects to sample text area.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 0352a7089cfbea4ef68da89e2616a62e0920f2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0352a7089cfbea4ef68da89e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Feb 14 23:38:14 2012 +0900 comdlg32: Apply 3D effects to sample text area. --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/fontdlg.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index d1f95b5..13c544a 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -264,7 +264,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 8068e82..c081e91 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1115,7 +1115,6 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE { PAINTSTRUCT ps; HDC hdc; - HPEN hOrigPen; HFONT hOrigFont; LOGFONTW lf = *(lpcf->lpLogFont); @@ -1127,22 +1126,9 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE ps.rcPaint.right, ps.rcPaint.bottom); /* Paint frame */ - MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL ); - hOrigPen=SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DSHADOW ) )); - LineTo( hdc, info.rcWindow.left, info.rcWindow.top ); - LineTo( hdc, info.rcWindow.right, info.rcWindow.top ); - DeleteObject(SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DLIGHT ) ))); - LineTo( hdc, info.rcWindow.right, info.rcWindow.bottom ); - LineTo( hdc, info.rcWindow.left, info.rcWindow.bottom ); - DeleteObject(SelectObject( hdc, hOrigPen )); + DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST ); /* Draw the sample text itself */ - info.rcWindow.right--; - info.rcWindow.bottom--; - info.rcWindow.top++; - info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); SetTextColor( hdc, lpcf->rgbColors );

1 0

Christian Costa : d3dxof: Enable dumping of input x files and templates.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 8bbf1344c9f5c3f8a40e87e1e2c050ba314a5d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbf1344c9f5c3f8a40e87e1e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 13 22:12:29 2012 +0100 d3dxof: Enable dumping of input x files and templates. --- dlls/d3dxof/d3dxof.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 38882a8..966baa2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -32,6 +32,7 @@ #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); +WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; @@ -215,6 +216,21 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV TRACE("File size is %d bytes\n", file_size); + if (TRACE_ON(d3dxof_dump)) + { + static USHORT num; + char tmp[12]; + HANDLE file; + sprintf(tmp, "file%05u.x", num++); + + file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WriteFile(file, file_buffer, file_size, NULL, NULL); + CloseHandle(file); + } + } + object->pDirectXFile = This; object->buf.pdxf = This; @@ -284,6 +300,21 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (!pvData) return DXFILEERR_BADVALUE; + if (TRACE_ON(d3dxof_dump)) + { + static USHORT num; + char tmp[16]; + HANDLE file; + sprintf(tmp, "template%05u.x", num++); + + file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WriteFile(file, pvData, cbSize, NULL, NULL); + CloseHandle(file); + } + } + hr = parse_header(&buf, &decomp_buffer); if (FAILED(hr)) goto cleanup;

1 0