mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 06:31:03 +00:00
dxdiagn: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
96aa7bcd7b
commit
1cc1ecf574
|
@ -1,4 +1,3 @@
|
||||||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
|
||||||
MODULE = dxdiagn.dll
|
MODULE = dxdiagn.dll
|
||||||
IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32
|
IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ static ULONG WINAPI IDxDiagContainerImpl_AddRef(IDxDiagContainer *iface)
|
||||||
IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface);
|
IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface);
|
||||||
ULONG refCount = InterlockedIncrement(&This->ref);
|
ULONG refCount = InterlockedIncrement(&This->ref);
|
||||||
|
|
||||||
TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
|
TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
|
||||||
|
|
||||||
DXDIAGN_LockModule();
|
DXDIAGN_LockModule();
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ static ULONG WINAPI IDxDiagContainerImpl_Release(IDxDiagContainer *iface)
|
||||||
IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface);
|
IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface);
|
||||||
ULONG refCount = InterlockedDecrement(&This->ref);
|
ULONG refCount = InterlockedDecrement(&This->ref);
|
||||||
|
|
||||||
TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
|
TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
|
||||||
|
|
||||||
if (!refCount) {
|
if (!refCount) {
|
||||||
IDxDiagProvider_Release(This->pProv);
|
IDxDiagProvider_Release(This->pProv);
|
||||||
|
@ -101,7 +101,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(IDxDiagContai
|
||||||
IDxDiagContainerImpl_Container *p;
|
IDxDiagContainerImpl_Container *p;
|
||||||
DWORD i = 0;
|
DWORD i = 0;
|
||||||
|
|
||||||
TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer);
|
TRACE("(%p, %lu, %p, %lu)\n", iface, dwIndex, pwszContainer, cchContainer);
|
||||||
|
|
||||||
if (NULL == pwszContainer || 0 == cchContainer) {
|
if (NULL == pwszContainer || 0 == cchContainer) {
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
@ -214,7 +214,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(IDxDiagContainer *iface
|
||||||
IDxDiagContainerImpl_Property *p;
|
IDxDiagContainerImpl_Property *p;
|
||||||
DWORD i = 0;
|
DWORD i = 0;
|
||||||
|
|
||||||
TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszPropName, cchPropName);
|
TRACE("(%p, %lu, %p, %lu)\n", iface, dwIndex, pwszPropName, cchPropName);
|
||||||
|
|
||||||
if (NULL == pwszPropName || 0 == cchPropName) {
|
if (NULL == pwszPropName || 0 == cchPropName) {
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
|
@ -42,7 +42,7 @@ LONG DXDIAGN_refCount = 0;
|
||||||
/* At process attach */
|
/* At process attach */
|
||||||
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
{
|
{
|
||||||
TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved);
|
TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved);
|
||||||
if (fdwReason == DLL_PROCESS_ATTACH) {
|
if (fdwReason == DLL_PROCESS_ATTACH) {
|
||||||
dxdiagn_instance = hInstDLL;
|
dxdiagn_instance = hInstDLL;
|
||||||
DisableThreadLibraryCalls(hInstDLL);
|
DisableThreadLibraryCalls(hInstDLL);
|
||||||
|
|
|
@ -84,7 +84,7 @@ static ULONG WINAPI IDxDiagProviderImpl_AddRef(IDxDiagProvider *iface)
|
||||||
IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface);
|
IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface);
|
||||||
ULONG refCount = InterlockedIncrement(&This->ref);
|
ULONG refCount = InterlockedIncrement(&This->ref);
|
||||||
|
|
||||||
TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
|
TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
|
||||||
|
|
||||||
DXDIAGN_LockModule();
|
DXDIAGN_LockModule();
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ static ULONG WINAPI IDxDiagProviderImpl_Release(IDxDiagProvider *iface)
|
||||||
IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface);
|
IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface);
|
||||||
ULONG refCount = InterlockedDecrement(&This->ref);
|
ULONG refCount = InterlockedDecrement(&This->ref);
|
||||||
|
|
||||||
TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
|
TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
|
||||||
|
|
||||||
if (!refCount) {
|
if (!refCount) {
|
||||||
free_information_tree(This->info_root);
|
free_information_tree(This->info_root);
|
||||||
|
@ -825,7 +825,7 @@ static const WCHAR *vendor_id_to_manufacturer_string(DWORD vendor_id)
|
||||||
return vendors[i].name;
|
return vendors[i].name;
|
||||||
}
|
}
|
||||||
|
|
||||||
FIXME("Unknown PCI vendor ID 0x%04x.\n", vendor_id);
|
FIXME("Unknown PCI vendor ID 0x%04lx.\n", vendor_id);
|
||||||
|
|
||||||
return L"Unknown";
|
return L"Unknown";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue