October 2006 - Wine-Commits

Andrew Talbot : regedit: Cast-qual warnings fix.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 4b2756ba5dd1248d57bcf34448c9b952102fa37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2756ba5dd1248d57bcf3444… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Oct 5 22:01:55 2006 +0100 regedit: Cast-qual warnings fix. --- programs/regedit/edit.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index e71a247..1741672 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -89,13 +89,13 @@ static void error_code_messagebox(HWND h LPTSTR lpMsgBuf; DWORD status; TCHAR title[256]; - static const TCHAR fallback[] = TEXT("Error displaying error message.\n"); + static TCHAR fallback[] = TEXT("Error displaying error message.\n"); if (!LoadString(hInst, IDS_ERROR, title, COUNT_OF(title))) lstrcpy(title, TEXT("Error")); status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); if (!status) - lpMsgBuf = (LPTSTR)fallback; + lpMsgBuf = fallback; MessageBox(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); if (lpMsgBuf != fallback) LocalFree(lpMsgBuf); @@ -481,9 +481,12 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, parentKey = hRootKey; srcSubKey = keyPath; } else { + LPTSTR srcSubKey_copy; + parentPath = strdup(keyPath); - srcSubKey = strrchr(parentPath, '\\') + 1; - *((LPTSTR)srcSubKey - 1) = 0; + srcSubKey_copy = strrchr(parentPath, '\\'); + *srcSubKey_copy = 0; + srcSubKey = srcSubKey_copy + 1; lRet = RegOpenKeyEx(hRootKey, parentPath, 0, KEY_READ | KEY_CREATE_SUB_KEY, &parentKey); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet);

1 0

Mike McCormack : msi: Handle the sign properly when converting integer data .
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 9187951ac72ef7493dd90981da280d963bc26dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9187951ac72ef7493dd90981d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 12 21:28:26 2006 +0900 msi: Handle the sign properly when converting integer data. --- dlls/msi/table.c | 6 ++++++ dlls/msi/tests/db.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 1ef7d0e..61ff217 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1762,7 +1762,13 @@ static UINT* msi_record_to_row( MSITABLE } } else + { data[i] = MSI_RecordGetInteger( rec, i+1 ); + if ((tv->columns[i].type&0xff) == 2) + data[i] += 0x8000; + else + data[i] += 0x80000000; + } } return data; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5fc33eb..f3e15a8 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1913,7 +1913,7 @@ static void test_try_transform(void) hrec = 0; query = "select `NOO`,`OOO` from `MOO` where `NOO` = 1 AND `OOO` = 'c'"; r = do_query(hdb, query, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "select query failed\n"); + ok(r == ERROR_SUCCESS, "select query failed\n"); MsiCloseHandle(hrec); /* check unchanged value */ @@ -1927,7 +1927,7 @@ static void test_try_transform(void) hrec = 0; query = "select * from `MOO` where `NOO` = 3"; r = do_query(hdb, query, &hrec); - todo_wine ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); + ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); if (hrec) MsiCloseHandle(hrec); MsiCloseHandle( hdb );

1 0

Mike McCormack : msi: Improve error checking when applying transform data.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 1b256f2c6e333a37f5a5a16f7fddcd3160e1125d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b256f2c6e333a37f5a5a16f7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 12 18:55:53 2006 +0900 msi: Improve error checking when applying transform data. --- dlls/msi/table.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 26c0cc1..1ef7d0e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1900,13 +1900,9 @@ static UINT msi_table_load_transform( MS rec = msi_get_transform_record( tv, st, &rawdata[n] ); if (rec) { - UINT row = 0; - - r = msi_table_find_row( tv, rec, &row ); - - if( rawdata[n] & 1) + if ( mask & 1 ) { - TRACE("insert [%d]: \n", row); + TRACE("inserting record\n"); /* * Native msi seems writes nul into the @@ -1921,24 +1917,33 @@ static UINT msi_table_load_transform( MS ERR("_Columns has non-null data...\n"); } - TABLE_insert_row( &tv->view, rec ); - } - else if( mask & 0xff ) - { - TRACE("modify [%d]: \n", row); - msi_table_modify_row( tv, rec, row, mask ); + r = TABLE_insert_row( &tv->view, rec ); + if (r != ERROR_SUCCESS) + ERR("insert row failed\n"); } else { - TRACE("delete [%d]: \n", row); - msi_delete_row( tv, row ); + UINT row = 0; + + r = msi_table_find_row( tv, rec, &row ); + if (r != ERROR_SUCCESS) + ERR("no matching row to transform\n"); + else if ( mask ) + { + TRACE("modifying row [%d]: \n", row); + msi_table_modify_row( tv, rec, row, mask ); + } + else + { + TRACE("deleting row [%d]: \n", row); + msi_delete_row( tv, row ); + } } if( TRACE_ON(msidb) ) dump_record( rec ); msiobj_release( &rec->hdr ); } n += sz/2; - } err:

1 0

Alexandre Julliard : Fixed some printf warnings caused by using sizeof.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 6a9222fc39050e1f594a924215426c610e154902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9222fc39050e1f594a92421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 14:58:25 2006 +0200 Fixed some printf warnings caused by using sizeof. --- dlls/advapi32/service.c | 4 ++-- dlls/crypt32/tests/encode.c | 6 ++---- dlls/dmime/tempotrack.c | 2 +- dlls/shlwapi/tests/clist.c | 6 ++---- dlls/user/tests/class.c | 4 ++-- tools/winedump/pe.c | 1 - 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index b1d80dc..24b209e 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -422,8 +422,8 @@ static BOOL service_handle_start(HANDLE r = ReadFile(pipe, args, count*sizeof(WCHAR), &read, NULL); if (!r || count!=read/sizeof(WCHAR) || args[count-1]) { - ERR("pipe read failed r = %d count = %d/%d args[n-1]=%s\n", - r, count, read/sizeof(WCHAR), debugstr_wn(args, count)); + ERR("pipe read failed r = %d count = %d read = %d args[n-1]=%s\n", + r, count, read, debugstr_wn(args, count)); goto end; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 54d1222..6a1801d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1830,8 +1830,7 @@ static void test_decodeBits(DWORD dwEnco CRYPT_BIT_BLOB *blob; ok(bufSize >= sizeof(CRYPT_BIT_BLOB) + bits[i].cbDecoded, - "Got unexpected size %d, expected >= %d\n", bufSize, - sizeof(CRYPT_BIT_BLOB) + bits[i].cbDecoded); + "Got unexpected size %d\n", bufSize); blob = (CRYPT_BIT_BLOB *)buf; ok(blob->cbData == bits[i].cbDecoded, "Got unexpected length %d, expected %d\n", blob->cbData, @@ -4081,8 +4080,7 @@ static void test_decodeCRLToBeSigned(DWO { CRL_INFO *info = (CRL_INFO *)buf; - ok(size >= sizeof(CRL_INFO), "Expected size at least %d, got %d\n", - sizeof(CRL_INFO), size); + ok(size >= sizeof(CRL_INFO), "Got size %d\n", size); ok(info->cCRLEntry == 209, "Expected 209 CRL entries, got %d\n", info->cCRLEntry); ok(info->cExtension == 0, "Expected 0 extensions, got %d\n", diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 698cc88..7a3589b 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -340,7 +340,7 @@ #if 1 IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL); StreamSize -= sizeof(DWORD); StreamCount = 0; - TRACE_(dmfile)(" - sizeof(DMUS_IO_TEMPO_ITEM): %u (chunkSize = %u)\n", StreamSize, Chunk.dwSize - sizeof(DWORD)); + TRACE_(dmfile)(" - sizeof(DMUS_IO_TEMPO_ITEM): %u (chunkSize = %u)\n", StreamSize, Chunk.dwSize); do { IStream_Read (pStm, &item, sizeof(item), NULL); ++nItem; diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index c1a5f7c..a4a55a1 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -312,8 +312,7 @@ static void test_CList(void) else if (inserted) { ok(inserted->ulSize==item->ulSize+sizeof(SHLWAPI_CLIST), - "id %d size wrong (%d!=%d)\n", inserted->ulId, inserted->ulSize, - item->ulSize+sizeof(SHLWAPI_CLIST)); + "id %d wrong size %d\n", inserted->ulId, inserted->ulSize); } if (inserted) { @@ -437,8 +436,7 @@ #endif else if (inserted) { ok(inserted->ulSize==item->ulSize+sizeof(SHLWAPI_CLIST), - "id %d size wrong (%d!=%d)\n", inserted->ulId, inserted->ulSize, - item->ulSize+sizeof(SHLWAPI_CLIST)); + "id %d wrong size %d\n", inserted->ulId, inserted->ulSize); } ok(!inserted || inserted->ulId==item->ulId, "find got wrong item\n"); if (inserted) diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c index 109d45d..385bb7b 100644 --- a/dlls/user/tests/class.c +++ b/dlls/user/tests/class.c @@ -106,9 +106,9 @@ #endif { SetLastError(0); ok(!SetClassLongW(hTestWnd,i*sizeof(DWORD),i+1), - "GetClassLongW(%d) initial value nonzero!\n",i*sizeof(DWORD)); + "GetClassLongW(%d) initial value nonzero!\n",i); ok(!GetLastError(), - "SetClassLongW(%d) failed!\n",i*sizeof(DWORD)); + "SetClassLongW(%d) failed!\n",i); } /* test values of valid classwords that we set */ diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index cf1c864..dd7588c 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -208,7 +208,6 @@ static inline void print_datadirectory(D { unsigned i; printf("Data Directory\n"); - printf("%d\n", n * sizeof(IMAGE_DATA_DIRECTORY)); for (i = 0; i < n && i < 16; i++) {

1 0

Alexandre Julliard : loader: Make sure the reserved area is protected on MacOSX too.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 181cf8b635404d8ff59631ab4a1eb4a274b28673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181cf8b635404d8ff59631ab4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 14:55:52 2006 +0200 loader: Make sure the reserved area is protected on MacOSX too. --- loader/main.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/loader/main.c b/loader/main.c index d74d4a4..5000add 100644 --- a/loader/main.c +++ b/loader/main.c @@ -18,12 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif + #include "wine/library.h" #include "main.h" #ifdef __APPLE__ + asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000"); asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x02000000"); extern char __wine_dos[0x60000000], __wine_shared_heap[0x02000000]; @@ -34,10 +42,24 @@ static const struct wine_preload_info wi { __wine_shared_heap, sizeof(__wine_shared_heap) }, /* shared user data + shared heap */ { 0, 0 } /* end of list */ }; -#else + +static inline void reserve_area( void *addr, size_t size ) +{ + wine_anon_mmap( addr, size, PROT_NONE, MAP_FIXED | MAP_NORESERVE ); + wine_mmap_add_reserved_area( addr, size ); +} + +#else /* __APPLE__ */ + /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL; -#endif + +static inline void reserve_area( void *addr, size_t size ) +{ + wine_mmap_add_reserved_area( addr, size ); +} + +#endif /* __APPLE__ */ /********************************************************************** * main @@ -50,8 +72,7 @@ int main( int argc, char *argv[] ) if (wine_main_preload_info) { for (i = 0; wine_main_preload_info[i].size; i++) - wine_mmap_add_reserved_area( wine_main_preload_info[i].addr, - wine_main_preload_info[i].size ); + reserve_area( wine_main_preload_info[i].addr, wine_main_preload_info[i].size ); } wine_pthread_set_functions( &pthread_functions, sizeof(pthread_functions) );

1 0

Alexandre Julliard : ws2_32: Win64 printf format fixes.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: e958dc2e9ddd798d6623aa93cccc743aa5e145ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e958dc2e9ddd798d6623aa93c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 14:53:44 2006 +0200 ws2_32: Win64 printf format fixes. --- dlls/ws2_32/Makefile.in | 2 + dlls/ws2_32/async.c | 2 + dlls/ws2_32/socket.c | 66 ++++++++++++++++++++++++----------------------- include/winsock.h | 14 ++++++++-- 4 files changed, 46 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e958dc2e9ddd798d6623a…

1 0

Alexandre Julliard : winsock: Add a WS_ prefix to the BSD types.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 9e5fadab6dfdd2c80cf1eb8919c36a89bd551589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5fadab6dfdd2c80cf1eb891… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 13:45:39 2006 +0200 winsock: Add a WS_ prefix to the BSD types. --- dlls/ws2_32/socket.c | 28 ++++++++------- include/winsock.h | 91 ++++++++++++++++++++++++++------------------------ include/winsock2.h | 42 ++++++++++++----------- 3 files changed, 83 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e5fadab6dfdd2c80cf1e…

1 0

Mikołaj Zalewski : comctl32: toolbar: Store dwBaseCustDraw and dwItemCDFlag in local variables.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: e998f9a4984887cf7cb4eb68dfca208b761f871c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e998f9a4984887cf7cb4eb68d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:53:39 2006 +0200 comctl32: toolbar: Store dwBaseCustDraw and dwItemCDFlag in local variables. --- dlls/comctl32/toolbar.c | 67 ++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e998f9a4984887cf7cb4e…

1 0

Mikołaj Zalewski : comctl32: toolbar: Merge TOOLBAR_InsertButtonA and TOOLBAR_InsertButtonW.
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: 79433e1bdaef26fb42a5ad341ea70661ffa0c7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79433e1bdaef26fb42a5ad341… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:50:11 2006 +0200 comctl32: toolbar: Merge TOOLBAR_InsertButtonA and TOOLBAR_InsertButtonW. --- dlls/comctl32/toolbar.c | 111 ++++++----------------------------------------- 1 files changed, 13 insertions(+), 98 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c2fd14b..9803075 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3808,12 +3808,11 @@ TOOLBAR_Indeterminate (HWND hwnd, WPARAM static LRESULT -TOOLBAR_InsertButtonA (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_InsertButtonT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBBUTTON lpTbb = (LPTBBUTTON)lParam; INT nIndex = (INT)wParam; - TBUTTON_INFO *oldButtons; if (lpTbb == NULL) return FALSE; @@ -3823,7 +3822,6 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM if (nIndex == -1) { /* EPP: this seems to be an undocumented call (from my IE4) * I assume in that case that: - * - lpTbb->iString is a string pointer (not a string index in strings[] table * - index of insertion is at the end of existing buttons * I only see this happen with nIndex == -1, but it could have a special * meaning (like -nIndex (or ~nIndex) to get the real position of insertion). @@ -3839,87 +3837,10 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM TRACE("adjust index=%d\n", nIndex); } - oldButtons = infoPtr->buttons; infoPtr->nNumButtons++; - infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons); - /* pre insert copy */ - if (nIndex > 0) { - memcpy (&infoPtr->buttons[0], &oldButtons[0], - nIndex * sizeof(TBUTTON_INFO)); - } - - /* insert new button */ - infoPtr->buttons[nIndex].iBitmap = lpTbb->iBitmap; - infoPtr->buttons[nIndex].idCommand = lpTbb->idCommand; - infoPtr->buttons[nIndex].fsState = lpTbb->fsState; - infoPtr->buttons[nIndex].fsStyle = lpTbb->fsStyle; - infoPtr->buttons[nIndex].dwData = lpTbb->dwData; - /* if passed string and not index, then add string */ - if(HIWORD(lpTbb->iString) && lpTbb->iString!=-1) { - Str_SetPtrAtoW ((LPWSTR *)&infoPtr->buttons[nIndex].iString, (LPCSTR )lpTbb->iString); - } - else - infoPtr->buttons[nIndex].iString = lpTbb->iString; - - TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[nIndex]); - - /* post insert copy */ - if (nIndex < infoPtr->nNumButtons - 1) { - memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex], - (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO)); - } - - Free (oldButtons); - - TOOLBAR_CalcToolbar (hwnd); - TOOLBAR_AutoSize (hwnd); - - InvalidateRect (hwnd, NULL, TRUE); - - return TRUE; -} - - -static LRESULT -TOOLBAR_InsertButtonW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - LPTBBUTTON lpTbb = (LPTBBUTTON)lParam; - INT nIndex = (INT)wParam; - TBUTTON_INFO *oldButtons; - - if (lpTbb == NULL) - return FALSE; - - TOOLBAR_DumpButton(infoPtr, (TBUTTON_INFO *)lpTbb, nIndex, FALSE); - - if (nIndex == -1) { - /* EPP: this seems to be an undocumented call (from my IE4) - * I assume in that case that: - * - lpTbb->iString is a string pointer (not a string index in strings[] table - * - index of insertion is at the end of existing buttons - * I only see this happen with nIndex == -1, but it could have a special - * meaning (like -nIndex (or ~nIndex) to get the real position of insertion). - */ - nIndex = infoPtr->nNumButtons; - - } else if (nIndex < 0) - return FALSE; - - TRACE("inserting button index=%d\n", nIndex); - if (nIndex > infoPtr->nNumButtons) { - nIndex = infoPtr->nNumButtons; - TRACE("adjust index=%d\n", nIndex); - } - - oldButtons = infoPtr->buttons; - infoPtr->nNumButtons++; - infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons); - /* pre insert copy */ - if (nIndex > 0) { - memcpy (&infoPtr->buttons[0], &oldButtons[0], - nIndex * sizeof(TBUTTON_INFO)); - } + infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO) * infoPtr->nNumButtons); + memmove(&infoPtr->buttons[nIndex+1], &infoPtr->buttons[nIndex], + (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO)); /* insert new button */ infoPtr->buttons[nIndex].iBitmap = lpTbb->iBitmap; @@ -3929,21 +3850,16 @@ TOOLBAR_InsertButtonW (HWND hwnd, WPARAM infoPtr->buttons[nIndex].dwData = lpTbb->dwData; /* if passed string and not index, then add string */ if(HIWORD(lpTbb->iString) && lpTbb->iString!=-1) { - Str_SetPtrW ((LPWSTR *)&infoPtr->buttons[nIndex].iString, (LPWSTR)lpTbb->iString); + if (fUnicode) + Str_SetPtrW((LPWSTR *)&infoPtr->buttons[nIndex].iString, (LPWSTR)lpTbb->iString); + else + Str_SetPtrAtoW((LPWSTR *)&infoPtr->buttons[nIndex].iString, (LPCSTR )lpTbb->iString); } else infoPtr->buttons[nIndex].iString = lpTbb->iString; TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[nIndex]); - /* post insert copy */ - if (nIndex < infoPtr->nNumButtons - 1) { - memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex], - (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO)); - } - - Free (oldButtons); - TOOLBAR_CalcToolbar (hwnd); TOOLBAR_AutoSize (hwnd); @@ -3952,7 +3868,6 @@ TOOLBAR_InsertButtonW (HWND hwnd, WPARAM return TRUE; } - /* << TOOLBAR_InsertMarkHitTest >> */ @@ -4441,8 +4356,8 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, L if (HIWORD(nmtbr.tbButton.iString)) nmtbr.tbButton.iString = 0; - TOOLBAR_InsertButtonW(infoPtr->hwndSelf, -1, - (LPARAM)&nmtbr.tbButton); + TOOLBAR_InsertButtonT(infoPtr->hwndSelf, -1, + (LPARAM)&nmtbr.tbButton, TRUE); } /* do legacy notifications */ @@ -5885,7 +5800,7 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wPa memset(&tbb, 0, sizeof(tbb)); tbb.fsStyle = BTNS_SEP; tbb.iString = -1; - TOOLBAR_InsertButtonW(hwnd, nButton, (LPARAM)&tbb); + TOOLBAR_InsertButtonT(hwnd, nButton, (LPARAM)&tbb, TRUE); } } else @@ -6824,10 +6739,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, return TOOLBAR_Indeterminate (hwnd, wParam, lParam); case TB_INSERTBUTTONA: - return TOOLBAR_InsertButtonA (hwnd, wParam, lParam); + return TOOLBAR_InsertButtonT(hwnd, wParam, lParam, FALSE); case TB_INSERTBUTTONW: - return TOOLBAR_InsertButtonW (hwnd, wParam, lParam); + return TOOLBAR_InsertButtonT(hwnd, wParam, lParam, TRUE); /* case TB_INSERTMARKHITTEST: */ /* 4.71 */

1 0

Mikołaj Zalewski : comctl32: toolbar: Passing a string pointer in TB_INSERTBUTTON shouldn' t change the strings table (with test case).
by Alexandre Julliard Oct. 12, 2006

Oct. 12, 2006

Module: wine Branch: master Commit: c95aa8228acc57f99716ceb3845611c75f084fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95aa8228acc57f99716ceb38… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:48:38 2006 +0200 comctl32: toolbar: Passing a string pointer in TB_INSERTBUTTON shouldn't change the strings table (with test case). --- dlls/comctl32/tests/toolbar.c | 8 ++++++++ dlls/comctl32/toolbar.c | 32 -------------------------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 220d703..a007fa8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -337,6 +337,7 @@ void test_add_string() LPCSTR ret6[] = {"a", "b", "|a|b||", "p", "q", "p", "p", "q", "p", "", "q"}; LPCSTR ret7[] = {"a", "b", "|a|b||", "p", "q", "p", "p", "q", "p", "", "q", "br", "c", "d"}; HWND hToolbar = NULL; + TBBUTTON button; int ret; rebuild_toolbar(&hToolbar); @@ -365,6 +366,13 @@ void test_add_string() ret = SendMessageA(hToolbar, TB_ADDSTRINGA, (WPARAM)GetModuleHandle(NULL), IDS_TBADD7); ok(ret == 11, "TB_ADDSTRINGA - unexpected return %d\n", ret); CHECK_STRING_TABLE(14, ret7); + + ZeroMemory(&button, sizeof(button)); + button.iString = (UINT_PTR)"Test"; + SendMessageA(hToolbar, TB_INSERTBUTTONA, 0, (LPARAM)&button); + CHECK_STRING_TABLE(14, ret7); + SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&button); + CHECK_STRING_TABLE(14, ret7); } START_TEST(toolbar) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8531ac9..c2fd14b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3833,22 +3833,6 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM } else if (nIndex < 0) return FALSE; - /* If the string passed is not an index, assume address of string - and do our own AddString */ - if ((HIWORD(lpTbb->iString) != 0) && (lpTbb->iString != -1)) { - LPSTR ptr; - INT len; - - TRACE("string %s passed instead of index, adding string\n", - debugstr_a((LPSTR)lpTbb->iString)); - len = strlen((LPSTR)lpTbb->iString) + 2; - ptr = Alloc(len); - strcpy(ptr, (LPSTR)lpTbb->iString); - ptr[len - 1] = 0; /* ended by two '\0' */ - lpTbb->iString = TOOLBAR_AddStringA(hwnd, 0, (LPARAM)ptr); - Free(ptr); - } - TRACE("inserting button index=%d\n", nIndex); if (nIndex > infoPtr->nNumButtons) { nIndex = infoPtr->nNumButtons; @@ -3922,22 +3906,6 @@ TOOLBAR_InsertButtonW (HWND hwnd, WPARAM } else if (nIndex < 0) return FALSE; - /* If the string passed is not an index, assume address of string - and do our own AddString */ - if ((HIWORD(lpTbb->iString) != 0) && (lpTbb->iString != -1)) { - LPWSTR ptr; - INT len; - - TRACE("string %s passed instead of index, adding string\n", - debugstr_w((LPWSTR)lpTbb->iString)); - len = strlenW((LPWSTR)lpTbb->iString) + 2; - ptr = Alloc(len*sizeof(WCHAR)); - strcpyW(ptr, (LPWSTR)lpTbb->iString); - ptr[len - 1] = 0; /* ended by two '\0' */ - lpTbb->iString = TOOLBAR_AddStringW(hwnd, 0, (LPARAM)ptr); - Free(ptr); - } - TRACE("inserting button index=%d\n", nIndex); if (nIndex > infoPtr->nNumButtons) { nIndex = infoPtr->nNumButtons;

1 0