October 2010 - Wine-commits

Nikolay Sivov : comctl32/treeview: Fix TVN_DELETEITEM to use item that is about to be deleted.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 4633fc5c03a2aff20d3b50a5b80dcaff8274dcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4633fc5c03a2aff20d3b50a5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 22:15:04 2010 +0400 comctl32/treeview: Fix TVN_DELETEITEM to use item that is about to be deleted. --- dlls/comctl32/tests/treeview.c | 6 ++---- dlls/comctl32/treeview.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 7238bd0..5088d91 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1359,10 +1359,8 @@ static void test_delete_items(void) if (item_sequence[0]->count == 2) { -todo_wine { - ok(msg[0].lParam == (LPARAM)hChild, "expected %p, got %lx\n", hChild, msg[0].lParam); - ok(msg[1].lParam == (LPARAM)hRoot, "expected %p, got %lx\n", hRoot, msg[1].lParam); -} + ok(msg[0].lParam == (LPARAM)hChild, "expected %p, got 0x%lx\n", hChild, msg[0].lParam); + ok(msg[1].lParam == (LPARAM)hRoot, "expected %p, got 0x%lx\n", hRoot, msg[1].lParam); } ret = SendMessageA(hTree, TVM_GETCOUNT, 0, 0); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1ca5639..f8c28de 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1479,12 +1479,12 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem) { TRACE("%p, (%s)\n", wineItem, TREEVIEW_ItemName(wineItem)); - TREEVIEW_SendTreeviewNotify(infoPtr, TVN_DELETEITEMW, TVC_UNKNOWN, - TVIF_HANDLE | TVIF_PARAM, wineItem, 0); - if (wineItem->firstChild) TREEVIEW_RemoveAllChildren(infoPtr, wineItem); + TREEVIEW_SendTreeviewNotify(infoPtr, TVN_DELETEITEMW, TVC_UNKNOWN, + TVIF_HANDLE | TVIF_PARAM, wineItem, 0); + TREEVIEW_UnlinkItem(wineItem); infoPtr->uNumItems--;

1 0

Nikolay Sivov : shlwapi: Allow IUnknown_SetSite() to be requested by name.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 88136e689738e64be397352fe563f4cf8f5ed360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88136e689738e64be397352fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 22:17:21 2010 +0400 shlwapi: Allow IUnknown_SetSite() to be requested by name. --- dlls/shlwapi/shlwapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 4a4f594..60eef7a 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -171,7 +171,7 @@ 171 stdcall -noname SHIsSameObject(ptr ptr) 172 stdcall -noname IUnknown_GetWindow(ptr ptr) 173 stdcall -noname IUnknown_SetOwner(ptr ptr) -174 stdcall -noname IUnknown_SetSite(ptr ptr) +174 stdcall -ordinal IUnknown_SetSite(ptr ptr) 175 stdcall -noname IUnknown_GetClassID(ptr ptr) 176 stdcall -noname IUnknown_QueryService(ptr ptr ptr ptr) 177 stdcall -noname SHLoadMenuPopup(ptr wstr)

1 0

Nikolay Sivov : oleaut32: Remove some useless null checks.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 71a3fe3c9452fb5c54291ca2e4204a5e19919d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a3fe3c9452fb5c54291ca2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 23:23:07 2010 +0400 oleaut32: Remove some useless null checks. --- dlls/oleaut32/olefont.c | 11 +---------- dlls/oleaut32/tests/olefont.c | 3 +++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 3c8c91f..24d18b7 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -480,15 +480,6 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface( OLEFontImpl *this = (OLEFontImpl *)iface; TRACE("(%p)->(%s, %p)\n", this, debugstr_guid(riid), ppvObject); - /* - * Perform a sanity check on the parameters. - */ - if ( (this==0) || (ppvObject==0) ) - return E_INVALIDARG; - - /* - * Initialize the return parameter. - */ *ppvObject = 0; /* @@ -1143,7 +1134,7 @@ static HRESULT WINAPI OLEFontImpl_IsEqual( INT ret; INT left_len,right_len; - if((iface == NULL) || (pFontOther == NULL)) + if(pFontOther == NULL) return E_POINTER; else if (left->description.cySize.s.Lo != right->description.cySize.s.Lo) return S_FALSE; diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 7c0a112..0b08432 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -127,6 +127,9 @@ static void test_QueryInterface(void) IFont* font = NULL; LONG ret; + hres = pOleCreateFontIndirect(NULL, &IID_IFont, NULL); + ok(hres == E_POINTER, "got 0x%08x\n", hres); + hres = pOleCreateFontIndirect(NULL, &IID_IFont, &pvObj); font = pvObj;

1 0

Nikolay Sivov : oleaut32: Fix properties type conversion on property bag load.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 2c91ccede63b8352f349e2ed7103ef3ab6b54aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c91ccede63b8352f349e2ed7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 24 00:06:19 2010 +0400 oleaut32: Fix properties type conversion on property bag load. --- dlls/oleaut32/olefont.c | 87 ++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 46 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 24d18b7..31575ee 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2131,111 +2131,106 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( static const WCHAR sAttrUnderline[] = {'U','n','d','e','r','l','i','n','e',0}; static const WCHAR sAttrItalic[] = {'I','t','a','l','i','c',0}; static const WCHAR sAttrStrikethrough[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; - VARIANT rawAttr; - VARIANT valueAttr; - HRESULT iRes = S_OK; OLEFontImpl *this = impl_from_IPersistPropertyBag(iface); + VARIANT value; + HRESULT iRes; - VariantInit(&rawAttr); - VariantInit(&valueAttr); + VariantInit(&value); - if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrName, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrName, &value, pErrorLog); + if (iRes == S_OK) + { + iRes = VariantChangeType(&value, &value, 0, VT_BSTR); if (iRes == S_OK) - { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_BSTR); - if (iRes == S_OK) - iRes = IFont_put_Name((IFont *)this, V_BSTR(&valueAttr)); - } - else if (iRes == E_INVALIDARG) - iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + iRes = IFont_put_Name((IFont *)this, V_BSTR(&value)); } + else if (iRes == E_INVALIDARG) + iRes = S_OK; + + VariantClear(&value); if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrSize, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrSize, &value, pErrorLog); if (iRes == S_OK) { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_CY); + iRes = VariantChangeType(&value, &value, 0, VT_CY); if (iRes == S_OK) - iRes = IFont_put_Size((IFont *)this, V_CY(&valueAttr)); + iRes = IFont_put_Size((IFont *)this, V_CY(&value)); } else if (iRes == E_INVALIDARG) iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + + VariantClear(&value); } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrCharset, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrCharset, &value, pErrorLog); if (iRes == S_OK) { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_I2); + iRes = VariantChangeType(&value, &value, 0, VT_I2); if (iRes == S_OK) - iRes = IFont_put_Charset((IFont *)this, V_I2(&valueAttr)); + iRes = IFont_put_Charset((IFont *)this, V_I2(&value)); } else if (iRes == E_INVALIDARG) iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + + VariantClear(&value); } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrWeight, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrWeight, &value, pErrorLog); if (iRes == S_OK) { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_I2); + iRes = VariantChangeType(&value, &value, 0, VT_I2); if (iRes == S_OK) - iRes = IFont_put_Weight((IFont *)this, V_I2(&valueAttr)); + iRes = IFont_put_Weight((IFont *)this, V_I2(&value)); } else if (iRes == E_INVALIDARG) iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + VariantClear(&value); } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrUnderline, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrUnderline, &value, pErrorLog); if (iRes == S_OK) { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_BOOL); + iRes = VariantChangeType(&value, &value, 0, VT_BOOL); if (iRes == S_OK) - iRes = IFont_put_Underline((IFont *)this, V_BOOL(&valueAttr)); + iRes = IFont_put_Underline((IFont *)this, V_BOOL(&value)); } else if (iRes == E_INVALIDARG) iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + + VariantClear(&value); } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrItalic, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrItalic, &value, pErrorLog); if (iRes == S_OK) { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_BOOL); + iRes = VariantChangeType(&value, &value, 0, VT_BOOL); if (iRes == S_OK) - iRes = IFont_put_Italic((IFont *)this, V_BOOL(&valueAttr)); + iRes = IFont_put_Italic((IFont *)this, V_BOOL(&value)); } else if (iRes == E_INVALIDARG) iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + + VariantClear(&value); } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrStrikethrough, &rawAttr, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, sAttrStrikethrough, &value, pErrorLog); if (iRes == S_OK) { - iRes = VariantChangeType(&rawAttr, &valueAttr, 0, VT_BOOL); + iRes = VariantChangeType(&value, &value, 0, VT_BOOL); if (iRes == S_OK) - IFont_put_Strikethrough((IFont *)this, V_BOOL(&valueAttr)); + IFont_put_Strikethrough((IFont *)this, V_BOOL(&value)); } else if (iRes == E_INVALIDARG) iRes = S_OK; - VariantClear(&rawAttr); - VariantClear(&valueAttr); + + VariantClear(&value); } if (FAILED(iRes))

1 0

Marcus Meissner : comdlg32: Fixed bad size to GetModuleFilenameW.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 5b09820d7cb360233197e25216553549fbb37711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b09820d7cb360233197e2521… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 11:08:30 2010 +0200 comdlg32: Fixed bad size to GetModuleFilenameW. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 01b068e..2687029 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2070,7 +2070,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) HKEY hkey; /* get the current executable's name */ - if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path))){ + if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } @@ -2157,7 +2157,7 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) WCHAR module_path[MAX_PATH], *module_name; /* get the current executable's name */ - if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path))){ + if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { WARN("GotModuleFileName failed: %d\n", GetLastError()); return; }

1 0

Marcus Meissner : shell32: Pass correct size to MultiByteToWideChar.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: f5518eb3d861a7e06a97bf638886425e42941a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5518eb3d861a7e06a97bf638… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 12:04:12 2010 +0200 shell32: Pass correct size to MultiByteToWideChar. --- dlls/shell32/tests/brsfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index e9a6e2c..16d4597 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -198,7 +198,7 @@ static void test_click_make_new_folder_button(void) bi.lpfn = create_new_folder_callback; /* Use test folder as the root folder for dialog box */ MultiByteToWideChar(CP_UTF8, 0, test_folder_path, MAX_PATH, - test_folder_pathW, MAX_PATH*sizeof(WCHAR)); + test_folder_pathW, MAX_PATH); SHGetDesktopFolder(&test_folder_object); test_folder_object->lpVtbl->ParseDisplayName(test_folder_object, NULL, NULL, test_folder_pathW, 0UL, &test_folder_pidl, 0UL);

1 0

Marcus Meissner : ipconfig: Fixed buffer size to MultiByteToWideChar.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 243d458909185a75fd86d0c8efa5cebaf92b5170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=243d458909185a75fd86d0c8e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 12:26:47 2010 +0200 ipconfig: Fixed buffer size to MultiByteToWideChar. --- programs/ipconfig/ipconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index b6eb5f0..50f7e6c 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -289,7 +289,7 @@ static void print_full_information(void) { WCHAR hostnameW[MAX_HOSTNAME_LEN + 4]; - MultiByteToWideChar(CP_ACP, 0, info->HostName, -1, hostnameW, sizeof(hostnameW)); + MultiByteToWideChar(CP_ACP, 0, info->HostName, -1, hostnameW, sizeof(hostnameW)/sizeof(hostnameW[0])); print_field(STRING_HOSTNAME, hostnameW); /* FIXME: Output primary DNS suffix. */

1 0

Marcus Meissner : wineboot: Fixed 2 buffer sizes.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: a2dfa7d8a6cae4ab651d2e7ba06cc01f5781d7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2dfa7d8a6cae4ab651d2e7ba… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 12:32:26 2010 +0200 wineboot: Fixed 2 buffer sizes. --- programs/wineboot/wineboot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 92331ee..4407e17 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -351,7 +351,7 @@ static void create_volatile_environment_registry_key(void) set_reg_value( hkey, HomeDriveW, path ); } - size = sizeof(path); + size = sizeof(path)/sizeof(path[0]); if (GetUserNameW( path, &size )) set_reg_value( hkey, UserNameW, path ); set_reg_value( hkey, HomeShareW, EmptyW ); @@ -360,7 +360,7 @@ static void create_volatile_environment_registry_key(void) if (SUCCEEDED(hr)) set_reg_value( hkey, LocalAppDataW, path ); - size = sizeof(computername) - 2; + size = (sizeof(computername)/sizeof(WCHAR)) - 2; if (GetComputerNameW(&computername[2], &size)) { computername[0] = computername[1] = '\\';

1 0

Marcus Meissner : regedit: Fixed a wrong buffer size.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: e2eb5e2348dd974c5e87ae53f8053039319dd1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2eb5e2348dd974c5e87ae53f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 14:26:15 2010 +0200 regedit: Fixed a wrong buffer size. --- programs/regedit/tests/regedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index da8b1e0..2002e64 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -142,7 +142,7 @@ static void r_verify_reg_wsz(unsigned line, HKEY key, const char *subkey, return; MultiByteToWideChar(CP_ACP, 0, value_name, -1, value_nameW, - sizeof(value_nameW)); + sizeof(value_nameW)/sizeof(value_nameW[0])); fnd_len = sizeof(fnd_value); lr = RegQueryValueExW(fnd_key, value_nameW, NULL, &fnd_type,

1 0

Marcus Meissner : winspool.drv: Check return value of EnumPrintersA.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: c7f158824f41f37168222cb09a12c385d98315c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f158824f41f37168222cb09… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 11:09:42 2010 +0100 winspool.drv: Check return value of EnumPrintersA. --- dlls/winspool.drv/info.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4a084d1..4ffe092 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -964,8 +964,7 @@ void WINSPOOL_LoadSystemPrinters(void) printers AddPrinter takes a while. So we'll tag all printers that were automatically added last time around, if they still exist we'll leave them be otherwise we'll delete them. */ - EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num); - if(needed) { + if (EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num) && needed) { PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { for(i = 0; i < num; i++) {

1 0