September 2006 - Wine-Commits

Andrew Talbot : rpcrt4: Cast-qual warnings fix.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 7147f791537f6340061ccc6de9f8079fa9ef4601 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7147f791537f6340061ccc6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Sep 25 22:20:20 2006 +0100 rpcrt4: Cast-qual warnings fix. --- dlls/rpcrt4/ndr_marshall.c | 56 ++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7147f791537f6340061…

1 0

Andrew Talbot : riched20: Cast-qual warning fix.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: b038fa18ee0ee85502b7e12d1f7dd766905ab972 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b038fa18ee0ee85502b7e12… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Sep 25 20:02:10 2006 +0100 riched20: Cast-qual warning fix. --- dlls/riched20/reader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index e6e4186..f3a917c 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -66,7 +66,7 @@ static void ReadPictGroup (RTF_Info *); static void ReadObjGroup (RTF_Info *); static void LookupInit (void); static void Lookup (RTF_Info *, char *); -static int Hash (char*); +static int Hash (const char *); static void CharAttr(RTF_Info *info); static void CharSet(RTF_Info *info); @@ -2349,8 +2349,8 @@ static void LookupInit(void) memset(rtfHashTable, 0, RTF_KEY_COUNT * 2 * sizeof(*rtfHashTable)); for (rp = rtfKey; rp->rtfKStr != NULL; rp++) { int index; - - rp->rtfKHash = Hash ((char*)rp->rtfKStr); + + rp->rtfKHash = Hash (rp->rtfKStr); index = rp->rtfKHash % (RTF_KEY_COUNT * 2); if (!rtfHashTable[index].count) rtfHashTable[index].value = RTFAlloc(sizeof(RTFKey *)); @@ -2398,7 +2398,7 @@ static void Lookup(RTF_Info *info, char * Compute hash value of symbol */ -static int Hash(char *s) +static int Hash(const char *s) { char c; int val = 0;

1 0

Fatih Aşıcı : notepad: Update Turkish resources.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 4e9087a670b266dcc8a263b9551201257978c3a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e9087a670b266dcc8a263b… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Mon Sep 25 18:41:14 2006 +0300 notepad: Update Turkish resources. --- programs/notepad/Tr.rc | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Tr.rc b/programs/notepad/Tr.rc index 27944c2..9bd49c5 100644 --- a/programs/notepad/Tr.rc +++ b/programs/notepad/Tr.rc @@ -1,7 +1,7 @@ /* * Notepad (Turkish resources) * - * Copyright 2006 Fatih A��c� <fasici(a)linux-sevenler.org> + * Copyright 2006 Fatih A��c� <fatih.asici(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -106,7 +106,7 @@ STRING_ERROR, STRING_WARNING, "UYARI" STRING_INFO, "Bilgi" -STRING_UNTITLED, "(Ads�z)" +STRING_UNTITLED, "Ads�z" STRING_ALL_FILES, "T�m dosyalar (*.*)" STRING_TEXT_FILES_TXT, "Metin Dosyalar� (*.txt)" @@ -125,3 +125,27 @@ alan� yok. \nBir veya daha fazla uygulam deneyin." } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "L�SANS" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "GARANT�S�ZD�R" +IDS_WARRANTY, +"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." +}

1 0

Fatih Aşıcı : clock: Update Turkish resources.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: b360582c95788bc751dc8db4e69048326ef3b846 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b360582c95788bc751dc8db… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Mon Sep 25 18:36:10 2006 +0300 clock: Update Turkish resources. --- programs/clock/Tr.rc | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/programs/clock/Tr.rc b/programs/clock/Tr.rc index 26132fd..b764a1c 100644 --- a/programs/clock/Tr.rc +++ b/programs/clock/Tr.rc @@ -1,7 +1,7 @@ /* * Clock (Turkish resources) * - * Copyright 2006 Fatih A��c� <fasici(a)linux-sevenler.org> + * Copyright 2006 Fatih A��c� <fatih.asici(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,3 +46,27 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Saat" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "L�SANS" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "GARANT�S�ZD�R" +IDS_WARRANTY, +"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." +}

1 0

Ivan Leo : dinput: Add some error checks to mouse.c.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: db782fe04a34319b249c91d6af751689f9e2ddf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db782fe04a34319b249c91d… Author: Ivan Leo <ivanleo(a)gmail.com> Date: Fri Sep 22 19:36:07 2006 +0100 dinput: Add some error checks to mouse.c. --- dlls/dinput/mouse.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index dff65df..aae5e9a 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -551,12 +551,13 @@ static LRESULT CALLBACK dinput_mouse_hoo return CallNextHookEx( 0, code, wparam, lparam ); } -static void dinput_window_check(SysMouseImpl* This) { +static BOOL dinput_window_check(SysMouseImpl* This) { RECT rect; DWORD centerX, centerY; - + /* make sure the window hasn't moved */ - GetWindowRect(This->win, &rect); + if(!GetWindowRect(This->win, &rect)) + return FALSE; centerX = (rect.right - rect.left) / 2; centerY = (rect.bottom - rect.top ) / 2; if (This->win_centerX != centerX || This->win_centerY != centerY) { @@ -566,6 +567,7 @@ static void dinput_window_check(SysMouse This->mapped_center.x = This->win_centerX; This->mapped_center.y = This->win_centerY; MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1); + return TRUE; } @@ -700,7 +702,8 @@ static HRESULT WINAPI SysMouseAImpl_GetD /* Check if we need to do a mouse warping */ if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { - dinput_window_check(This); + if(!dinput_window_check(This)) + return DIERR_GENERIC; TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime(); @@ -794,7 +797,8 @@ static HRESULT WINAPI SysMouseAImpl_GetD /* Check if we need to do a mouse warping */ if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { - dinput_window_check(This); + if(!dinput_window_check(This)) + return DIERR_GENERIC; TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime();

1 0

Fatih Aşıcı : shell32: Update Turkish resources.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 8d3a4759d764f29ee04ebcb737eb19646827ed97 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d3a4759d764f29ee04ebcb… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Mon Sep 25 18:23:39 2006 +0300 shell32: Update Turkish resources. --- dlls/shell32/shell32_Tr.rc | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Tr.rc b/dlls/shell32/shell32_Tr.rc index 846add6..b41be53 100644 --- a/dlls/shell32/shell32_Tr.rc +++ b/dlls/shell32/shell32_Tr.rc @@ -145,10 +145,13 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN9 "A��klamalar" IDS_SHV_COLUMN10 "Sahip" IDS_SHV_COLUMN11 "Grup" + IDS_SHV_COLUMN_DELFROM "�zg�n konum" + IDS_SHV_COLUMN_DELDATE "Silinme tarihi" /* special folders */ IDS_DESKTOP "Masa�st�" IDS_MYCOMPUTER "Bilgisayar�m" + IDS_RECYCLEBIN_FOLDER_NAME "��p" /* context menus */ IDS_VIEW_LARGE "B�&y�k Simgeler" @@ -164,6 +167,11 @@ STRINGTABLE DISCARDABLE IDS_DELETEFOLDER_CAPTION "Dizin silmeyi onayla" IDS_DELETEITEM_TEXT "'%1' ��esini silmek istedi�inizden emin misiniz?" IDS_DELETEMULTIPLE_TEXT "Bu %1 ��eyi silmek istedi�inizden emin misiniz?" + IDS_DELETESELECTED_TEXT "Se�ili ��eleri silmek istedi�inizden emin misiniz?" + IDS_TRASHITEM_TEXT "'%1' adl� ��eyi ��pe g�ndermek istedi�inizden emin misiniz?" + IDS_TRASHFOLDER_TEXT "'%1' adl� ��eyi ve t�m i�eri�ini ��pe g�ndermek istedi�inizden emin misiniz?" + IDS_TRASHMULTIPLE_TEXT "Bu %1 ��eyi ��pe g�ndermek istedi�inizden emin misiniz?" + IDS_CANTTRASH_TEXT "'%1' adl� ��e ��pe g�nderilemiyor. Tamamen silmek ister misiniz?" IDS_OVERWRITEFILE_TEXT "%1 dosyas�n�n �zerine yazmak istiyor musunuz?" IDS_OVERWRITEFILE_CAPTION "Dosya �zerine Yazmay� Onayla" @@ -199,6 +207,6 @@ STRINGTABLE DISCARDABLE IDS_ADMINTOOLS "Start Menu\\Programlar\\Y�netimsel Ara�lar" IDS_COMMON_MUSIC "Belgeler\\M�zi�im" IDS_COMMON_PICTURES "Belgeler\\Resimlerim" - IDS_COMMON_VIDEO "Belgeler\\Vidyolar�m" + IDS_COMMON_VIDEO "Belgeler\\Videolar�m" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" }

1 0

Paul Vriens : wintrust: Implement SoftpubDllRegisterServer.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: bbf796c7a11ef3df9762bdfa0e2dbe7329c9f288 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbf796c7a11ef3df9762bdf… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sat Sep 23 14:09:49 2006 +0200 wintrust: Implement SoftpubDllRegisterServer. --- dlls/wintrust/register.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 6fb1f58..cc9b9b7 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -991,11 +991,52 @@ HRESULT WINAPI DllUnregisterServer(void) /*********************************************************************** * SoftpubDllRegisterServer (WINTRUST.@) + * + * Registers softpub.dll + * + * PARAMS + * + * RETURNS + * Success: S_OK. + * Failure: S_FALSE. (See also GetLastError()). + * + * NOTES + * DllRegisterServer in softpub.dll will call this function. + * See comments in DllRegisterServer. */ HRESULT WINAPI SoftpubDllRegisterServer(void) { - FIXME("stub\n"); - return S_OK; + HRESULT TrustProviderRes = S_OK; + + TRACE("\n"); + + /* Create the necessary action registry structures */ + WINTRUST_InitRegStructs(); + + /* Register several Trust Provider actions */ + if (!WINTRUST_RegisterGenVerifyV2()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterPublishedSoftware()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterPublishedSoftwareNoBadUi()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterGenCertVerify()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterTrustProviderTest()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterHttpsProv()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterOfficeSignVerify()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterDriverVerify()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterGenChainVerify()) + TrustProviderRes = S_FALSE; + + /* Free the registry structures */ + WINTRUST_FreeRegStructs(); + + return TrustProviderRes; } /***********************************************************************

1 0

Jan Zerebecki : regedit: Remove dead code.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 08de1f4293402cf3573e586285e66ff012d2aad7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08de1f4293402cf3573e586… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Sep 25 09:31:33 2006 +0200 regedit: Remove dead code. --- programs/regedit/listview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index bddc2b6..bd7b0b6 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -528,7 +528,6 @@ BOOL RefreshListView(HWND hwndLV, HKEY h if (RegQueryValueEx(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); } - /*dwValSize = max_val_size; */ for(index = 0; index < val_count; index++) { BOOL bSelected = (valName == highlightValue); /* NOT a bug, we check for double NULL here */ valNameLen = max_val_name_len;

1 0

Roderick Colenbrander : wined3d: Add the missing gamma cap.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 4b55964a26d975be445ee4bfded9cbc47f35bf09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b55964a26d975be445ee4b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 24 22:33:15 2006 +0200 wined3d: Add the missing gamma cap. --- dlls/wined3d/directx.c | 5 +++-- include/wine/wined3d_types.h | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 793e3c8..3a2bc7e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1822,8 +1822,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDe *pCaps->AdapterOrdinal = Adapter; *pCaps->Caps = 0; - *pCaps->Caps2 = D3DCAPS2_CANRENDERWINDOWED; - *pCaps->Caps3 = WINED3DDEVCAPS_HWTRANSFORMANDLIGHT; + *pCaps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | + WINED3DCAPS2_FULLSCREENGAMMA; + *pCaps->Caps3 = 0; *pCaps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE; *pCaps->CursorCaps = 0; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index a82f094..ef3f588 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1046,6 +1046,15 @@ typedef enum _WINED3DSURFTYPE { SURFACE_XRENDER /* Future dreams: Use XRENDER / EXA / whatever stuff */ } WINED3DSURFTYPE; +#define WINED3DCAPS2_NO2DDURING3DSCENE 0x00000002L +#define WINED3DCAPS2_FULLSCREENGAMMA 0x00020000L +#define WINED3DCAPS2_CANRENDERWINDOWED 0x00080000L +#define WINED3DCAPS2_CANCALIBRATEGAMMA 0x00100000L +#define WINED3DCAPS2_RESERVED 0x02000000L +#define WINED3DCAPS2_CANMANAGERESOURCE 0x10000000L +#define WINED3DCAPS2_DYNAMICTEXTURES 0x20000000L +#define WINED3DCAPS2_CANAUTOGENMIPMAP 0x40000000L + #define WINED3DPRASTERCAPS_DITHER 0x00000001L #define WINED3DPRASTERCAPS_ROP2 0x00000002L #define WINED3DPRASTERCAPS_XOR 0x00000004L

1 0

Frank Richter : setupapi: Duplicate behaviour of native SetupGetInfInformation with NULL ReturnBuffer and certain ReturnBufferSizes .
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: e1fa51f59cf050b9b3bc8da3aa8cc2228a1d507d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1fa51f59cf050b9b3bc8da… Author: Frank Richter <frank.richter(a)gmail.com> Date: Fri Sep 22 13:17:46 2006 +0200 setupapi: Duplicate behaviour of native SetupGetInfInformation with NULL ReturnBuffer and certain ReturnBufferSizes. --- dlls/setupapi/query.c | 15 ++++++++------- dlls/setupapi/tests/query.c | 14 +++++++++++++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index fd56f96..3e680eb 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -130,6 +130,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCV { HINF inf; BOOL ret; + DWORD infSize; TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize); @@ -144,12 +145,6 @@ BOOL WINAPI SetupGetInfInformationW(LPCV return FALSE; } - if (!ReturnBuffer && ReturnBufferSize) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - switch (SearchControl) { case INFINFO_INF_SPEC_IS_HINF: @@ -181,7 +176,13 @@ BOOL WINAPI SetupGetInfInformationW(LPCV return FALSE; } - ret = fill_inf_info(inf, ReturnBuffer, ReturnBufferSize, RequiredSize); + ret = fill_inf_info(inf, ReturnBuffer, ReturnBufferSize, &infSize); + if (!ReturnBuffer && (ReturnBufferSize >= infSize)) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + if (RequiredSize) *RequiredSize = infSize; if (SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE) SetupCloseInfFile(inf); diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index e823e7d..0ac23da 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -177,13 +177,25 @@ static void test_SetupGetInfInformation( ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(size != 0xdeadbeef, "Expected a valid size on return\n"); - /* set ReturnBuffer to NULL and ReturnBufferSize to non-zero */ + /* set ReturnBuffer to NULL and ReturnBufferSize to non-zero value 'size' */ SetLastError(0xbeefcafe); ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size, &size); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + /* set ReturnBuffer to NULL and ReturnBufferSize to non-zero value 'size-1' */ + ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size-1, &size); + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + + /* some tests for behaviour with a NULL RequiredSize pointer */ + ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, 0, NULL); + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size - 1, NULL); + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size, NULL); + ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); + info = HeapAlloc(GetProcessHeap(), 0, size); /* try valid ReturnBuffer but too small size */

1 0