February 2011 - Wine-Commits

Austin English : localspl/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 7cebcce8572cecd238ff2752a96cc12a38688906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cebcce8572cecd238ff2752a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:48 2011 -0800 localspl/tests: Make sure return values are used (LLVM/Clang). --- dlls/localspl/tests/localmon.c | 55 +++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 413a95a..4e913c0 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -208,8 +208,8 @@ static void test_AddPort(void) if (0) { - /* NT4 crash on this test */ - res = pAddPort(NULL, 0, NULL); + /* NT4 crash on this test */ + pAddPort(NULL, 0, NULL); } /* Testing-Results (localmon.dll from NT4.0): @@ -445,8 +445,8 @@ static void test_ConfigurePort(void) if (0) { - /* NT4 crash on this test */ - res = pConfigurePort(NULL, 0, NULL); + /* NT4 crash on this test */ + pConfigurePort(NULL, 0, NULL); } /* Testing-Results (localmon.dll from NT4.0): @@ -486,8 +486,8 @@ static void test_DeletePort(void) if (0) { - /* NT4 crash on this test */ - res = pDeletePort(NULL, 0, NULL); + /* NT4 crash on this test */ + pDeletePort(NULL, 0, NULL); } /* Testing-Results (localmon.dll from NT4.0): @@ -573,10 +573,10 @@ static void test_EnumPorts(void) if (0) { - /* The following tests crash this app with native localmon/localspl */ - res = pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); - res = pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); - res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + /* The following tests crash this app with native localmon/localspl */ + pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); } /* The Servername is ignored */ @@ -747,9 +747,9 @@ static void test_XcvClosePort(void) if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(NULL); - res = pXcvClosePort(INVALID_HANDLE_VALUE); + /* crash with native localspl.dll (w2k+xp) */ + pXcvClosePort(NULL); + pXcvClosePort(INVALID_HANDLE_VALUE); } @@ -761,12 +761,12 @@ static void test_XcvClosePort(void) if (res) { SetLastError(0xdeadbeef); res = pXcvClosePort(hXcv2); - ok( res, "returned %d with %u (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %u (expected '!= 0')\n", res, GetLastError()); if (0) { - /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(hXcv2); + /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ + pXcvClosePort(hXcv2); } } } @@ -1001,6 +1001,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) /* the default timeout is returned, when the value is empty */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)emptyA, 1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1011,6 +1012,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) /* the dialog is limited (1 - 999999), but that is done somewhere else */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_0A, lstrlenA(num_0A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1021,6 +1023,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1A, lstrlenA(num_1A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1030,6 +1033,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) "for '1')\n", res, GetLastError(), needed, buffer[0]); res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_999999A, lstrlenA(num_999999A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1040,6 +1044,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1000000A, lstrlenA(num_1000000A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1094,10 +1099,10 @@ static void test_XcvDataPort_MonitorUI(void) "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed); if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); + /* crash with native localspl.dll (w2k+xp) */ + pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); + pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); + pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); } @@ -1173,8 +1178,8 @@ static void test_XcvDataPort_PortIsValid(void) if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); + /* crash with native localspl.dll (w2k+xp) */ + pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); } @@ -1304,9 +1309,9 @@ static void test_XcvOpenPort(void) if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); + /* crash with native localspl.dll (w2k+xp) */ + pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); + pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); }

1 0

Austin English : cryptui/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: ed778bc8e154f1debeec395cf2d37b599f45ca4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed778bc8e154f1debeec395cf… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 18:27:16 2011 -0800 cryptui/tests: Remove a dead assignment (LLVM/Clang). --- dlls/cryptui/tests/cryptui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 996df0e..09b246c 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -344,7 +344,7 @@ static void test_crypt_ui_wiz_import(void) /* Brings up UI. Cancelling yields ret = 1. */ if (0) { - ret = pCryptUIWizImport(0, 0, NULL, NULL, NULL); + pCryptUIWizImport(0, 0, NULL, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, NULL, NULL);

1 0

Austin English : mstask/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 340a4c21ce9d722d899d4d4cd1466ede4b2c17f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340a4c21ce9d722d899d4d4cd… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:06 2011 -0800 mstask/tests: Make sure return values are used (LLVM/Clang). --- dlls/mstask/tests/task_trigger.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 7f1c577..c64e1c5 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -224,6 +224,7 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); + ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); ok(trigger_state.Reserved1 == 0 && trigger_state.Reserved2 == 0, "Reserved fields should be set to zero\n"); normal_trigger_state.Reserved1 = 0; @@ -261,6 +262,7 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); + ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); ok(trigger_state.wEndYear == 0, "End year should be 0: %d\n", trigger_state.wEndYear); ok(trigger_state.wEndMonth == 200, "End month should be 200: %d\n", @@ -328,6 +330,7 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); + ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf, "Expected WeeksInterval set remain untouched: %d\n", trigger_state.Type.Weekly.WeeksInterval); @@ -337,6 +340,7 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.TriggerType = TASK_TIME_TRIGGER_DAILY; normal_trigger_state.Type.Daily.DaysInterval = 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); + ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); /* Test setting trigger with set wRandomMinutesInterval */ normal_trigger_state.wRandomMinutesInterval = 5; @@ -345,6 +349,7 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); + ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); ok(trigger_state.wRandomMinutesInterval == 0, "wRandomMinutesInterval should be set to zero\n"); normal_trigger_state.wRandomMinutesInterval = 0;

1 0

Austin English : mlang/tests: Remove unused assignment (LLVM/Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: e9316ed8ec7db8c46c218dfd4543bdd8bb7e5da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9316ed8ec7db8c46c218dfd4… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:56 2011 -0800 mlang/tests: Remove unused assignment (LLVM/Clang). --- dlls/mlang/tests/mlang.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 2c4e0c1..c8d098f 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -773,7 +773,6 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) if (!flags) { ok(n == total, "IEnumScript_Next: expected %u, got %u\n", total, n); - flags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM; } total = n;

1 0

Peter Urbanec : setupapi: Fix comparison issue on 64-bit systems.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: de83ea61bbc72976326130c70f85e25f0633752a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de83ea61bbc72976326130c70… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue Feb 8 15:58:43 2011 +1100 setupapi: Fix comparison issue on 64-bit systems. --- dlls/setupapi/setupcab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 77f2b59..f4c6600 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -412,7 +412,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_W_MAGIC)) + if (pfdin && pfdin->pv && (((PSC_HSC_W) pfdin->pv)->magic == SC_HSC_W_MAGIC)) phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_W.\n", (pfdin) ? pfdin->pv : NULL);

1 0

Austin English : oleaut32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: d2c4219c4d4abea2b73bb2e4b696caf0be1822c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c4219c4d4abea2b73bb2e4b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:43 2011 -0800 oleaut32/tests: Make sure return values are used (LLVM/Clang). --- dlls/oleaut32/tests/olefont.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 0b08432..57f1367 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -112,6 +112,7 @@ static void test_ifont_sizes(LONG lo_size, LONG hi_size, ok(hres == S_OK, "%s: IFont_get_hFont returns 0x%08x instead of S_OK.\n", test_name, hres); hres = GetObject (hfont, sizeof(LOGFONT), &lf); + ok(hres == OBJ_FONT, "got obj type %d\n", hres); ok(lf.lfHeight == hfont_height, "%s: hFont has lf.lfHeight=%d, expected %d.\n", test_name, lf.lfHeight, hfont_height); @@ -315,6 +316,7 @@ static void test_font_events_disp(void) dispparams.cArgs = 1; dispparams.rgvarg = &vararg; hr = IFontDisp_Invoke(pFontDisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "IFontDisp_Invoke return 0x%08x instead of S_OK.\n", hr); IFontDisp_Release(pFontDisp);

1 0

André Hentschel : oleaut32/tests: Add more safearray tests.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 1a37f6e9405c0fe97d59847f8fcd7cda619276b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a37f6e9405c0fe97d59847f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 7 20:44:43 2011 +0100 oleaut32/tests: Add more safearray tests. --- dlls/oleaut32/tests/safearray.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 97ba9dd..849bd01 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1590,13 +1590,30 @@ static void test_SafeArrayCopy(void) hres = SafeArrayAllocDescriptor(1, &sa); ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + sa->cbElements = 16; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(sa != sa2, "SafeArrayCopy performed shallow copy\n"); + + hres = SafeArrayDestroy(sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + sa2 = (void*)0xdeadbeef; + hres = SafeArrayCopy(NULL, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(!sa2, "SafeArrayCopy didn't return NULL for output array\n"); + + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + + sa2 = (void*)0xdeadbeef; hres = SafeArrayCopy(sa, &sa2); ok(hres == E_INVALIDARG, "SafeArrayCopy with empty array should have failed with error E_INVALIDARG instead of 0x%08x\n", hres); - sa->cbElements = 16; - hres = SafeArrayCopy(sa, &sa2); - ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(!sa2, "SafeArrayCopy didn't return NULL for output array\n"); hres = SafeArrayDestroy(sa2); ok(hres == S_OK, "got 0x%08x\n", hres);

1 0

Austin English : fusion/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 262dab84183549f8f8ae45ac2239433feedd6d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262dab84183549f8f8ae45ac2… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:35 2011 -0800 fusion/tests: Make sure to use return values (LLVM/Clang). --- dlls/fusion/tests/asmname.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 170af23..a99b288 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -745,6 +745,7 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine, processorArchitecture=AMD64"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_PROCESSORARCHITECTURE); @@ -758,6 +759,7 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine, processorArchitecture=IA64"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_PROCESSORARCHITECTURE); @@ -771,6 +773,7 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine, processorArchitecture=MSIL"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_PROCESSORARCHITECTURE);

1 0

Rico Schüller : d3dcompiler: Parse OSG5 in the reflection interface.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 19fea20963ba0020bea8ba32431edb50897555f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fea20963ba0020bea8ba324… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 6 21:56:35 2011 +0100 d3dcompiler: Parse OSG5 in the reflection interface. --- dlls/d3dcompiler_43/reflection.c | 55 ++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4b0467a..96adb04 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE +{ + D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6 = 6, + D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, +}; + static BOOL copy_name(const char *ptr, char **name) { size_t name_len; @@ -538,15 +544,34 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c return S_OK; } -HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, const char *data, DWORD data_size) +HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section) { D3D11_SIGNATURE_PARAMETER_DESC *d; unsigned int string_data_offset; unsigned int string_data_size; - const char *ptr = data; + const char *ptr = section->data; char *string_data; unsigned int i; DWORD count; + enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE element_size; + + switch (section->tag) + { + case TAG_OSG5: + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7; + break; + + case TAG_ISGN: + case TAG_OSGN: + case TAG_PCSG: + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; + break; + + default: + FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; + break; + } read_dword(&ptr, &count); TRACE("%u elements\n", count); @@ -560,9 +585,10 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons return E_OUTOFMEMORY; } - /* 2 DWORDs for the header, 6 for each element. */ - string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); - string_data_size = data_size - string_data_offset; + /* 2 DWORDs for the header, element_size for each element. */ + string_data_offset = 2 * sizeof(DWORD) + count * element_size * sizeof(DWORD); + string_data_size = section->data_size - string_data_offset; + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); if (!string_data) { @@ -570,15 +596,21 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons HeapFree(GetProcessHeap(), 0, d); return E_OUTOFMEMORY; } - memcpy(string_data, data + string_data_offset, string_data_size); + memcpy(string_data, section->data + string_data_offset, string_data_size); for (i = 0; i < count; ++i) { UINT name_offset; DWORD mask; - /* todo: Parse stream in shaderblobs v5 (dx11) */ - d[i].Stream = 0; + if (element_size == D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7) + { + read_dword(&ptr, &d[i].Stream); + } + else + { + d[i].Stream = 0; + } read_dword(&ptr, &name_offset); d[i].SemanticName = string_data + (name_offset - string_data_offset); @@ -675,7 +707,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->isgn, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->isgn, section); if (FAILED(hr)) { WARN("Failed to parse section ISGN.\n"); @@ -683,6 +715,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_OSG5: case TAG_OSGN: reflection->osgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->osgn)); if (!reflection->osgn) @@ -692,7 +725,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->osgn, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->osgn, section); if (FAILED(hr)) { WARN("Failed to parse section OSGN.\n"); @@ -709,7 +742,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->pcsg, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->pcsg, section); if (FAILED(hr)) { WARN("Failed to parse section PCSG.\n");

1 0

Austin English : dsound/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 8c771e3f7e39caaac0a192d32e19d6f0492d138c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c771e3f7e39caaac0a192d32… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:29 2011 -0800 dsound/tests: Make sure to use return values (LLVM/Clang). --- dlls/dsound/tests/ds3d8.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index aa72648..41de792 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -648,7 +648,10 @@ static HRESULT test_secondary8(LPGUID lpGuid, int play, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc); if (secondary) + { ref=IDirectSoundBuffer_Release(secondary); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, should have 0\n",ref); + } init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); }

1 0