June 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : wine.inf: Add Baltic font substitutions.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 4aa985981c835e8d03362e5a203c7134bd922f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa985981c835e8d03362e5a2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jun 22 22:41:03 2008 +0900 wine.inf: Add Baltic font substitutions. --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 251f706..38c48d5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -281,10 +281,12 @@ HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x000 HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%" [Fonts] +HKLM,%FontSubStr%,"Arial Baltic,186",,"Arial,186" HKLM,%FontSubStr%,"Arial CE,238",,"Arial,238" HKLM,%FontSubStr%,"Arial CYR,204",,"Arial,204" HKLM,%FontSubStr%,"Arial Greek,161",,"Arial,161" HKLM,%FontSubStr%,"Arial TUR,162",,"Arial,162" +HKLM,%FontSubStr%,"Courier New Baltic,186",,"Courier New,186" HKLM,%FontSubStr%,"Courier New CE,238",,"Courier New,238" HKLM,%FontSubStr%,"Courier New CYR,204",,"Courier New,204" HKLM,%FontSubStr%,"Courier New Greek,161",,"Courier New,161" @@ -293,6 +295,7 @@ HKLM,%FontSubStr%,"Helv",,"MS Sans Serif" HKLM,%FontSubStr%,"Helvetica",,"Arial" HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma" HKLM,%FontSubStr%,"Times",,"Times New Roman" +HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186" HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204" HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"

1 0

Dmitry Timoshkov : gdi32: Extend the font substitution test, make it pass under Wine.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 41aad2dce28ca0dd9d23fa6234ad8523302d6054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41aad2dce28ca0dd9d23fa623… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jun 22 22:41:47 2008 +0900 gdi32: Extend the font substitution test, make it pass under Wine. --- dlls/gdi32/freetype.c | 124 ++++++++++++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/font.c | 82 ++++++++++++++++++++----------- 2 files changed, 165 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41aad2dce28ca0dd9d23f…

1 0

Roderick Colenbrander : wined3d: Update the Nvidia driver version to 173. 41 and also put it in the right format e.g. 7.15.11.7341 instead of 7.15.10 .17341.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: ee3bbccf6eaf982ca6af4ec44a9fcff48ec6313f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3bbccf6eaf982ca6af4ec44… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Jun 21 20:19:04 2008 +0000 wined3d: Update the Nvidia driver version to 173.41 and also put it in the right format e.g. 7.15.11.7341 instead of 7.15.10.17341. --- dlls/wined3d/directx.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ace6199..db23f0f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3597,22 +3597,23 @@ struct driver_version_information { }; static const struct driver_version_information driver_version_table[] = { - /* Nvidia drivers. Geforce FX and newer cards are supported by the current driver */ + /* Nvidia drivers. Geforce6 and newer cards are supported by the current driver (177.x)*/ + /* GeforceFX support is up to 173.x, Geforce2MX/3/4 upto 96.x, TNT/Geforce1/2 upto 71.x */ /* Note that version numbers >100 lets say 123.45 use >= x.y.11.2345 and not x.y.10.12345 */ - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 10, 16921 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 7341 },

1 0

Paul Vriens : setupapi/tests: Remove win9x specifics from testCreateDeviceInfo.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: d2ee399c66b73f42449767608794754721e82a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ee399c66b73f42449767608… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jun 23 09:47:48 2008 +0200 setupapi/tests: Remove win9x specifics from testCreateDeviceInfo. --- dlls/setupapi/tests/devinst.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2612f21..346257e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -401,30 +401,13 @@ static void testCreateDeviceInfo(void) 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; - if (!pSetupDiCreateDeviceInfoList || !pSetupDiEnumDeviceInfo || - !pSetupDiDestroyDeviceInfoList || !pSetupDiCreateDeviceInfoA) - { - skip("No SetupDiCreateDeviceInfoA\n"); - return; - } SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_DEVINST_NAME || - GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */ || - GetLastError() == ERROR_INVALID_HANDLE /* Win9x */, + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, "Unexpected last error, got %08x\n", GetLastError()); - /* If we are running on win9x we should skip these tests. Win95 - * fails most tests anyway and win98 pops up the "Add New Hardware - * Wizard". - */ - if (GetLastError() == ERROR_INVALID_HANDLE) - { - skip("We are on win9x where the tests introduce issues\n"); - return; - } - SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL);

1 0

Paul Vriens : setupapi/tests: Remove win9x specifics from testInstallClass.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 46e0219f7a4a9644eb1713e2dee484c21b055925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e0219f7a4a9644eb1713e2d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jun 23 10:26:29 2008 +0200 setupapi/tests: Remove win9x specifics from testInstallClass. --- dlls/setupapi/tests/devinst.c | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 346257e..8b79844 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -336,20 +336,9 @@ static void testInstallClass(void) '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; - static const CHAR classKey_win9x[] = - "System\\CurrentControlSet\\Services\\Class\\" - "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; - static const CHAR bogus_win9x[] = - "System\\CurrentControlSet\\Services\\Class\\Bogus"; char tmpfile[MAX_PATH]; BOOL ret; - HKEY hkey; - if (!pSetupDiInstallClassA) - { - skip("No SetupDiInstallClassA\n"); - return; - } tmpfile[0] = '.'; tmpfile[1] = '\\'; get_temp_filename(tmpfile + 2); @@ -372,21 +361,10 @@ static void testInstallClass(void) */ ret = pSetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "SetupDiInstallClassA failed: %08x\n", GetLastError()); - if (!RegOpenKeyA(HKEY_LOCAL_MACHINE, classKey_win9x, &hkey)) - { - /* We are on win9x */ - RegCloseKey(hkey); - ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, classKey_win9x), - "Couldn't delete win9x classkey\n"); - ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, bogus_win9x), - "Couldn't delete win9x bogus services class\n"); - } - else - { - /* NT4 and above */ - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), - "Couldn't delete NT classkey\n"); - } + + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), + "Couldn't delete classkey\n"); + DeleteFile(tmpfile); }

1 0

Andrew Talbot : dbghelp: Use dbgstr_a() in case pointer is NULL.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 51b3b4a481a1066620f5b8f694f2efee84879df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b3b4a481a1066620f5b8f69… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jun 22 15:12:02 2008 +0100 dbghelp: Use dbgstr_a() in case pointer is NULL. --- dlls/dbghelp/stabs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index d550633..9955b7e 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1003,7 +1003,7 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ *stabs_find_ref(filenr1, subnr1) = *ret_dt = new_dt; - TRACE("Adding (%ld,%ld) %s\n", filenr1, subnr1, typename); + TRACE("Adding (%ld,%ld) %s\n", filenr1, subnr1, debugstr_a(typename)); return 0; }

1 0

Vitaliy Margolen : dxdiagn: PhysicalMemory parameter is a string not long long.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 8ab96ba2dc1ecb5ef0af5732ad4f6fccbd843bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab96ba2dc1ecb5ef0af5732a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jun 21 11:53:44 2008 -0600 dxdiagn: PhysicalMemory parameter is a string not long long. --- dlls/dxdiagn/provider.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 7fc7aa5..630c649 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -300,7 +300,9 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) GlobalMemoryStatusEx( &msex ); V_VT(&v) = VT_UI8; V_UI8(&v) = msex.ullTotalPhys; + VariantChangeType(&v, &v, 0, VT_BSTR); IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v); + VariantClear(&v); info.dwOSVersionInfoSize = sizeof(info); GetVersionExW( &info );

1 0

Vitaliy Margolen : dxdiagn: Use helper functions for adding properties to container.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: e938ff9aee7aeb02b8eecec333d0217289c90024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e938ff9aee7aeb02b8eecec33… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jun 21 11:54:00 2008 -0600 dxdiagn: Use helper functions for adding properties to container. --- dlls/dxdiagn/provider.c | 120 ++++++++++++++--------------------------------- 1 files changed, 36 insertions(+), 84 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 630c649..44b30d8 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -156,15 +156,20 @@ static inline HRESULT add_prop_str( IDxDiagContainer* cont, LPCWSTR prop, LPCWST static inline HRESULT add_prop_ui4( IDxDiagContainer* cont, LPCWSTR prop, DWORD data ) { - HRESULT hr; VARIANT var; V_VT( &var ) = VT_UI4; V_UI4( &var ) = data; - hr = IDxDiagContainerImpl_AddProp( cont, prop, &var ); - VariantClear( &var ); + return IDxDiagContainerImpl_AddProp( cont, prop, &var ); +} - return hr; +static inline HRESULT add_prop_bool( IDxDiagContainer* cont, LPCWSTR prop, BOOL data ) +{ + VARIANT var; + + V_VT( &var ) = VT_BOOL; + V_BOOL( &var ) = data; + return IDxDiagContainerImpl_AddProp( cont, prop, &var ); } /** @@ -189,7 +194,6 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH static const WCHAR szFinal_Retail_v[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; static const WCHAR szEnglish_v[] = {'E','n','g','l','i','s','h',0}; static const WCHAR szVersionFormat[] = {'%','u','.','%','0','2','u','.','%','0','4','u','.','%','0','4','u',0}; - VARIANT v; WCHAR szFile[512]; WCHAR szVersion_v[1024]; @@ -210,15 +214,9 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH boolret = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); boolret = VerQueryValueW(pVersionInfo, szSlashSep, (LPVOID) &pFileInfo, &uiLength); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFile); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szPath, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFileName); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = boolret; - hr = IDxDiagContainerImpl_AddProp(pSubCont, bExists, &v); - VariantClear(&v); + add_prop_str(pSubCont, szPath, szFile); + add_prop_str(pSubCont, szName, szFileName); + add_prop_bool(pSubCont, bExists, boolret); if (boolret) { snprintfW(szVersion_v, sizeof(szVersion_v)/sizeof(szVersion_v[0]), @@ -230,27 +228,13 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szVersion_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szVersion, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFinal_Retail_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szAttributes, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szLanguageEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateMS; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeHigh, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateLS; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeLow, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE)); - hr = IDxDiagContainerImpl_AddProp(pSubCont, bBeta, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG)); - hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); - VariantClear(&v); + add_prop_str(pSubCont, szVersion, szVersion_v); + add_prop_str(pSubCont, szAttributes, szFinal_Retail_v); + add_prop_str(pSubCont, szLanguageEnglish, szEnglish_v); + add_prop_ui4(pSubCont, dwFileTimeHigh, pFileInfo->dwFileDateMS); + add_prop_ui4(pSubCont, dwFileTimeLow, pFileInfo->dwFileDateLS); + add_prop_bool(pSubCont, bBeta, 0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE)); + add_prop_bool(pSubCont, bDebug, 0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG)); } HeapFree(GetProcessHeap(), 0, pVersionInfo); @@ -280,21 +264,12 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) OSVERSIONINFOW info; VARIANT v; - V_VT(&v) = VT_UI4; V_UI4(&v) = 9; - IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMajor, &v); - V_VT(&v) = VT_UI4; V_UI4(&v) = 0; - IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMinor, &v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLetter_v); - IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLetter, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionEnglish_v); - IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLongEnglish_v); - IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLongEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = FALSE; - IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); + add_prop_ui4(pSubCont, dwDirectXVersionMajor, 9); + add_prop_ui4(pSubCont, dwDirectXVersionMinor, 0); + add_prop_str(pSubCont, szDirectXVersionLetter, szDirectXVersionLetter_v); + add_prop_str(pSubCont, szDirectXVersionEnglish, szDirectXVersionEnglish_v); + add_prop_str(pSubCont, szDirectXVersionLongEnglish, szDirectXVersionLongEnglish_v); + add_prop_bool(pSubCont, bDebug, FALSE); msex.dwLength = sizeof(msex); GlobalMemoryStatusEx( &msex ); @@ -306,18 +281,10 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) info.dwOSVersionInfoSize = sizeof(info); GetVersionExW( &info ); - V_VT(&v) = VT_UI4; - V_UI4(&v) = info.dwMajorVersion; - IDxDiagContainerImpl_AddProp(pSubCont, dwOSMajorVersion, &v); - V_VT(&v) = VT_UI4; - V_UI4(&v) = info.dwMinorVersion; - IDxDiagContainerImpl_AddProp(pSubCont, dwOSMinorVersion, &v); - V_VT(&v) = VT_UI4; - V_UI4(&v) = info.dwBuildNumber; - IDxDiagContainerImpl_AddProp(pSubCont, dwOSBuildNumber, &v); - V_VT(&v) = VT_UI4; - V_UI4(&v) = info.dwPlatformId; - IDxDiagContainerImpl_AddProp(pSubCont, dwOSPlatformID, &v); + add_prop_ui4(pSubCont, dwOSMajorVersion, info.dwMajorVersion); + add_prop_ui4(pSubCont, dwOSMinorVersion, info.dwMinorVersion); + add_prop_ui4(pSubCont, dwOSBuildNumber, info.dwBuildNumber); + add_prop_ui4(pSubCont, dwOSPlatformID, info.dwPlatformId); return S_OK; } @@ -643,18 +610,12 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu LPBYTE pData = NULL; LPBYTE pCurrent = NULL; struct REG_RF* prrf = NULL; - VARIANT v_data; DWORD it; DWORD dwNOutputs = 0; DWORD dwNInputs = 0; - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(wszCatName); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szCatName, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(wszCatClsid); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidCat, &v); - VariantClear(&v); + add_prop_str(pSubCont, szCatName, wszCatName); + add_prop_str(pSubCont, szClsidCat, wszCatClsid); hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); @@ -670,14 +631,9 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); prrf = (struct REG_RF*) pData; pCurrent = pData; - - VariantInit(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = prrf->dwVersion; - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v_data); - VariantClear(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = prrf->dwMerit; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwMerit, &v_data); - VariantClear(&v_data); + + add_prop_ui4(pSubCont, szName, prrf->dwVersion); + add_prop_ui4(pSubCont, dwMerit, prrf->dwMerit); pCurrent += sizeof(struct REG_RF); for (it = 0; it < prrf->dwPins; ++it) { @@ -701,12 +657,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu } } - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = dwNInputs; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwInputs, &v_data); - VariantClear(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = dwNOutputs; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwOutputs, &v_data); - VariantClear(&v_data); + add_prop_ui4(pSubCont, dwInputs, dwNInputs); + add_prop_ui4(pSubCont, dwOutputs, dwNOutputs); SafeArrayUnaccessData(V_UNION(&v, parray)); VariantClear(&v);

1 0

Rob Shearman : rpcrt4: Initialise UniquePtrCount in NdrServerInitializeNew.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: cc199b777e734f44c99b8af0f63c7a8ca36c4ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc199b777e734f44c99b8af0f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 09:42:08 2008 +0100 rpcrt4: Initialise UniquePtrCount in NdrServerInitializeNew. --- dlls/rpcrt4/ndr_clientserver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 3aefab9..9af736a 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -121,6 +121,7 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M pStubMsg->IgnoreEmbeddedPointers = 0; pStubMsg->PointerBufferMark = NULL; pStubMsg->uFlags = 0; + pStubMsg->UniquePtrCount = 0; pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; pStubMsg->pfnFree = pStubDesc->pfnFree; pStubMsg->StackTop = NULL;

1 0

Rob Shearman : include: Add new bitfields to MIDL_STUB_MESSAGE added in Vista SDKs.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 7f1b7c51be692cde07bb9fd5f7977ecd035f6f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1b7c51be692cde07bb9fd5f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 16:17:32 2008 +0100 include: Add new bitfields to MIDL_STUB_MESSAGE added in Vista SDKs. Move fBufferValid to a bitfield and update the corresponding tests in rpcrt4. Add tests for the new fields. --- dlls/rpcrt4/ndr_clientserver.c | 15 ++++++++++++++- dlls/rpcrt4/tests/generated.c | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 38 ++++++++++++++++++++++++++++++-------- include/rpcndr.h | 11 +++++++++-- 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 34d6898..3aefab9 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -67,7 +67,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg->pPointerQueueState = NULL; pStubMsg->IgnoreEmbeddedPointers = 0; pStubMsg->PointerBufferMark = NULL; - pStubMsg->fBufferValid = 0; + pStubMsg->CorrDespIncrement = 0; pStubMsg->uFlags = 0; pStubMsg->UniquePtrCount = 0; pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; @@ -82,6 +82,13 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg->fHasReturn = 0; pStubMsg->fHasExtensions = 0; pStubMsg->fHasNewCorrDesc = 0; + pStubMsg->fIsIn = 0; + pStubMsg->fIsOut = 0; + pStubMsg->fIsOicf = 0; + pStubMsg->fBufferValid = 0; + pStubMsg->fHasMemoryValidateCallback = 0; + pStubMsg->fInFree = 0; + pStubMsg->fNeedMCCP = 0; pStubMsg->fUnused = 0; pStubMsg->dwDestContext = MSHCTX_DIFFERENTMACHINE; pStubMsg->pvDestContext = NULL; @@ -127,6 +134,12 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M pStubMsg->fHasReturn = 0; pStubMsg->fHasExtensions = 0; pStubMsg->fHasNewCorrDesc = 0; + pStubMsg->fIsIn = 0; + pStubMsg->fIsOut = 0; + pStubMsg->fIsOicf = 0; + pStubMsg->fHasMemoryValidateCallback = 0; + pStubMsg->fInFree = 0; + pStubMsg->fNeedMCCP = 0; pStubMsg->fUnused = 0; pStubMsg->dwDestContext = MSHCTX_DIFFERENTMACHINE; pStubMsg->pvDestContext = NULL; diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 9c4a5a7..609e49c 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -412,7 +412,7 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD(MIDL_STUB_MESSAGE, struct NDR_POINTER_QUEUE_STATE *, pPointerQueueState, 44, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, int, IgnoreEmbeddedPointers, 48, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, PointerBufferMark, 52, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char, fBufferValid, 56, 1, 1); + TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char, CorrDespIncrement, 56, 1, 1); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char, uFlags, 57, 1, 1); TEST_FIELD(MIDL_STUB_MESSAGE, ULONG_PTR, MaxCount, 60, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, Offset, 64, 4, 4); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ecb9f57..a860253 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1164,7 +1164,7 @@ static void test_client_init(void) TEST_ZERO(pPointerQueueState, "%p"); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); - TEST_ZERO(fBufferValid, "%d"); + TEST_ZERO(CorrDespIncrement, "%d"); TEST_ZERO(uFlags, "%d"); /* FIXME: UniquePtrCount */ TEST_ULONG_PTR_UNSET(MaxCount); @@ -1186,8 +1186,15 @@ static void test_client_init(void) TEST_ZERO(fHasReturn, "%d"); TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); - TEST_ZERO(fUnused, "%d"); - ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xcccc instead of 0x%x\n", stubMsg.fUnused2); + TEST_ZERO(fIsIn, "%d"); + TEST_ZERO(fIsOut, "%d"); + TEST_ZERO(fIsOicf, "%d"); + TEST_ZERO(fBufferValid, "%d"); + TEST_ZERO(fHasMemoryValidateCallback, "%d"); + TEST_ZERO(fInFree, "%d"); + TEST_ZERO(fNeedMCCP, "%d"); + TEST_ZERO(fUnused, "0x%x"); + ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xffffcccc instead of 0x%x\n", stubMsg.fUnused2); ok(stubMsg.dwDestContext == MSHCTX_DIFFERENTMACHINE, "stubMsg.dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %d\n", stubMsg.dwDestContext); TEST_ZERO(pvDestContext, "%p"); TEST_POINTER_UNSET(SavedContextHandles); @@ -1258,7 +1265,7 @@ todo_wine TEST_ZERO(pPointerQueueState, "%p"); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); - ok(stubMsg.fBufferValid == 0xcc, "fBufferValid should have been unset instead of 0x%x\n", stubMsg.fBufferValid); + ok(stubMsg.CorrDespIncrement == 0xcc, "CorrDespIncrement should have been unset instead of 0x%x\n", stubMsg.CorrDespIncrement); TEST_ZERO(uFlags, "%d"); /* FIXME: UniquePtrCount */ TEST_ULONG_PTR_UNSET(MaxCount); @@ -1280,8 +1287,15 @@ todo_wine TEST_ZERO(fHasReturn, "%d"); TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); - TEST_ZERO(fUnused, "%d"); - ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xcccc instead of 0x%x\n", stubMsg.fUnused2); + TEST_ZERO(fIsIn, "%d"); + TEST_ZERO(fIsOut, "%d"); + TEST_ZERO(fIsOicf, "%d"); + trace("fBufferValid = %d\n", stubMsg.fBufferValid); + TEST_ZERO(fHasMemoryValidateCallback, "%d"); + TEST_ZERO(fInFree, "%d"); + TEST_ZERO(fNeedMCCP, "%d"); + TEST_ZERO(fUnused, "0x%x"); + ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xffffcccc instead of 0x%x\n", stubMsg.fUnused2); ok(stubMsg.dwDestContext == MSHCTX_DIFFERENTMACHINE, "stubMsg.dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %d\n", stubMsg.dwDestContext); TEST_ZERO(pvDestContext, "%p"); TEST_POINTER_UNSET(SavedContextHandles); @@ -1799,6 +1813,7 @@ static void test_ndr_buffer(void) RPC_BINDING_HANDLE Handle; RPC_STATUS status; ULONG prev_buffer_length; + BOOL old_buffer_valid_location; StubDesc.RpcInterfaceInformation = (void *)&IFoo___RpcServerInterface; @@ -1834,7 +1849,11 @@ static void test_ndr_buffer(void) ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd); todo_wine ok(StubMsg.BufferLength == 0, "BufferLength should have left as 0 instead of being set to %d\n", StubMsg.BufferLength); - ok(StubMsg.fBufferValid == TRUE, "fBufferValid should have been TRUE instead of 0x%x\n", StubMsg.fBufferValid); + old_buffer_valid_location = !StubMsg.fBufferValid; + if (old_buffer_valid_location) + ok(broken(StubMsg.CorrDespIncrement == TRUE), "fBufferValid should have been TRUE instead of 0x%x\n", StubMsg.CorrDespIncrement); + else + ok(StubMsg.fBufferValid, "fBufferValid should have been non-zero instead of 0x%x\n", StubMsg.fBufferValid); prev_buffer_length = RpcMessage.BufferLength; StubMsg.BufferLength = 1; @@ -1844,7 +1863,10 @@ todo_wine ok(RpcMessage.BufferLength == prev_buffer_length, "RpcMessage.BufferLength should have been left as %d instead of %d\n", prev_buffer_length, RpcMessage.BufferLength); ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); ok(StubMsg.BufferLength == 1, "BufferLength should have left as 1 instead of being set to %d\n", StubMsg.BufferLength); - ok(StubMsg.fBufferValid == FALSE, "fBufferValid should have been FALSE instead of 0x%x\n", StubMsg.fBufferValid); + if (old_buffer_valid_location) + ok(broken(StubMsg.CorrDespIncrement == FALSE), "fBufferValid should have been FALSE instead of 0x%x\n", StubMsg.CorrDespIncrement); + else + ok(!StubMsg.fBufferValid, "fBufferValid should have been FALSE instead of %d\n", StubMsg.fBufferValid); /* attempt double-free */ NdrFreeBuffer(&StubMsg); diff --git a/include/rpcndr.h b/include/rpcndr.h index a0968d5..9bf2840 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -183,7 +183,7 @@ typedef struct _MIDL_STUB_MESSAGE struct NDR_POINTER_QUEUE_STATE *pPointerQueueState; int IgnoreEmbeddedPointers; unsigned char *PointerBufferMark; - unsigned char fBufferValid; + unsigned char CorrDespIncrement; unsigned char uFlags; unsigned short UniquePtrCount; ULONG_PTR MaxCount; @@ -205,7 +205,14 @@ typedef struct _MIDL_STUB_MESSAGE int fHasReturn:1; int fHasExtensions:1; int fHasNewCorrDesc:1; - int fUnused:10; + int fIsIn:1; + int fIsOut:1; + int fIsOicf:1; + int fBufferValid:1; + int fHasMemoryValidateCallback:1; + int fInFree:1; + int fNeedMCCP:1; + int fUnused:3; int fUnused2:16; DWORD dwDestContext; void *pvDestContext;

1 0