October 2006 - Wine-Commits

Michael Stefaniuc : dmcompos: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 521d3070891671c1cd928a089a494127294b3f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521d3070891671c1cd928a089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 9 21:25:45 2006 +0200 dmcompos: Win64 printf format warning fixes. --- dlls/dmcompos/Makefile.in | 1 - dlls/dmcompos/chordmap.c | 24 ++++++++++++------------ dlls/dmcompos/chordmaptrack.c | 18 +++++++++--------- dlls/dmcompos/composer.c | 8 ++++---- dlls/dmcompos/dmcompos_main.c | 4 ++-- dlls/dmcompos/signposttrack.c | 18 +++++++++--------- 6 files changed, 36 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=521d3070891671c1cd928…

1 0

Michael Stefaniuc : msacm32.drv: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 9315847ee4114118df14c2ebac855905b9696649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9315847ee4114118df14c2eba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 9 21:23:23 2006 +0200 msacm32.drv: Win64 printf format warning fixes. --- dlls/msacm32.drv/Makefile.in | 1 - dlls/msacm32.drv/wavemap.c | 72 +++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9315847ee4114118df14c…

1 0

Michael Stefaniuc : odbc32: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: 617db22df43fca6f63f8fc8e91b43a47af922164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=617db22df43fca6f63f8fc8e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 9 21:21:22 2006 +0200 odbc32: Win64 printf format warning fixes. --- dlls/odbc32/Makefile.in | 1 - dlls/odbc32/proxyodbc.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 40a4a25..45bb3a2 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = odbc32.dll IMPORTLIB = libodbc32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ proxyodbc.c diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 1354d85..a3aa287 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -220,14 +220,14 @@ static void ODBC_ReplicateODBCInstToRegi if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) { - TRACE ("Error %ld replicating driver %s\n", + TRACE ("Error %d replicating driver %s\n", reg_ret, desc); success = 0; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %ld checking for %s in drivers\n", + TRACE ("Error %d checking for %s in drivers\n", reg_ret, desc); success = 0; } @@ -244,12 +244,12 @@ static void ODBC_ReplicateODBCInstToRegi */ if ((reg_ret = RegCloseKey (hThis)) != ERROR_SUCCESS) - TRACE ("Error %ld closing %s key\n", reg_ret, + TRACE ("Error %d closing %s key\n", reg_ret, desc); } else { - TRACE ("Error %ld ensuring driver key %s\n", + TRACE ("Error %d ensuring driver key %s\n", reg_ret, desc); success = 0; } @@ -268,21 +268,21 @@ static void ODBC_ReplicateODBCInstToRegi } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { - TRACE ("Error %ld closing hDrivers\n", reg_ret); + TRACE ("Error %d closing hDrivers\n", reg_ret); } } else { - TRACE ("Error %ld opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); + TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); } if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS) { - TRACE ("Error %ld closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } } else { - TRACE ("Error %ld opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } if (!success) { @@ -355,26 +355,26 @@ static void ODBC_ReplicateODBCToRegistry if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0, REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS) { - TRACE ("Error %ld replicating description of " + TRACE ("Error %d replicating description of " "%s(%s)\n", reg_ret, dsn, desc); success = 0; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %ld checking for description of %s\n", + TRACE ("Error %d checking for description of %s\n", reg_ret, dsn); success = 0; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { - TRACE ("Error %ld closing %s DSN key %s\n", + TRACE ("Error %d closing %s DSN key %s\n", reg_ret, which, dsn); } } else { - TRACE ("Error %ld opening %s DSN key %s\n", + TRACE ("Error %d opening %s DSN key %s\n", reg_ret, which, dsn); success = 0; } @@ -394,13 +394,13 @@ static void ODBC_ReplicateODBCToRegistry } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { - TRACE ("Error %ld closing %s ODBC.INI registry key\n", reg_ret, + TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret, which); } } else { - TRACE ("Error %ld creating/opening %s ODBC.INI registry key\n", + TRACE ("Error %d creating/opening %s ODBC.INI registry key\n", reg_ret, which); } if (!success) @@ -467,7 +467,7 @@ static void ODBC_ReplicateToRegistry (vo BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { int i; - TRACE("Initializing or Finalizing proxy ODBC: %p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) {

1 0

Mikołaj Zalewski : comctl32: toolbar: Fix the TB_ADDSTRING from resources for a NUL delimiter.
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 241956101e52877691b78f8bdc9870fb5a594d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241956101e52877691b78f8bd… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Oct 9 00:06:59 2006 +0200 comctl32: toolbar: Fix the TB_ADDSTRING from resources for a NUL delimiter. --- dlls/comctl32/tests/resources.h | 3 --- dlls/comctl32/tests/rsrc.rc | 1 - dlls/comctl32/tests/toolbar.c | 3 --- dlls/comctl32/toolbar.c | 11 +++++++---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 826f9c5..c99633d 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -29,9 +29,6 @@ #define IDS_TBADD2 17 #define IDS_TBADD3 18 #define IDS_TBADD4 19 #define IDS_TBADD5 20 -#define IDS_TBADD6 21 #define IDS_TBADD7 22 -#define IDS_TBADD8 23 -#define IDS_TBADD9 24 #endif /* __WINE_COMCTL32_TEST_RESOURCES_H */ diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index b68ab1b..165dc15 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -37,7 +37,6 @@ STRINGTABLE IDS_TBADD3 "*p*q*" IDS_TBADD4 "#p#q##" IDS_TBADD5 "|p||q|r|" - IDS_TBADD6 "\000a\000\000" IDS_TBADD7 "abracadabra" } diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index b71962b..220d703 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -362,9 +362,6 @@ void test_add_string() ret = SendMessageA(hToolbar, TB_ADDSTRINGA, (WPARAM)GetModuleHandle(NULL), IDS_TBADD5); ok(ret == 8, "TB_ADDSTRINGA - unexpected return %d\n", ret); CHECK_STRING_TABLE(11, ret6); - ret = SendMessageA(hToolbar, TB_ADDSTRINGA, (WPARAM)GetModuleHandle(NULL), IDS_TBADD6); - ok(ret == 11, "TB_ADDSTRINGA - unexpected return %d\n", ret); - CHECK_STRING_TABLE(11, ret6); 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); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2c79051..e0d06ae 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2921,9 +2921,8 @@ #define MAX_RESOURCE_STRING_LENGTH 512 INT len; TRACE("adding string from resource!\n"); - LoadStringW ((HINSTANCE)wParam, (UINT)lParam, + len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam, szString, MAX_RESOURCE_STRING_LENGTH); - len = lstrlenW(szString); TRACE("len=%d %s\n", len, debugstr_w(szString)); if (len == 0 || len == 1) @@ -2932,11 +2931,15 @@ #define MAX_RESOURCE_STRING_LENGTH 512 TRACE("Delimiter: 0x%x\n", *szString); delimiter = *szString; p = szString + 1; - if (szString[len-1] == delimiter) - szString[len-1] = 0; while ((next_delim = strchrW(p, delimiter)) != NULL) { *next_delim = 0; + if (next_delim + 1 >= szString + len) + { + /* this may happen if delimiter == '\0' or if the last char is a + * delimiter (then it is ignored like the native does) */ + break; + } infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1)); Str_SetPtrW(&infoPtr->strings[infoPtr->nNumStrings], p);

1 0

Mikołaj Zalewski : comctl32: toolbar: Merge AddButtonsA and AddButtonsW into AddButtonsT.
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 869c3bb74b10cfc2c1d3aec173da047d4d5f4954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=869c3bb74b10cfc2c1d3aec17… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:45:24 2006 +0200 comctl32: toolbar: Merge AddButtonsA and AddButtonsW into AddButtonsT. --- dlls/comctl32/toolbar.c | 85 ++++++----------------------------------------- 1 files changed, 11 insertions(+), 74 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0de7a11..2c79051 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2858,31 +2858,19 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa static LRESULT -TOOLBAR_AddButtonsA (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_AddButtonsT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBBUTTON lpTbb = (LPTBBUTTON)lParam; INT nOldButtons, nNewButtons, nAddButtons, nCount; - TRACE("adding %d buttons!\n", wParam); + TRACE("adding %d buttons (unicode=%d)!\n", wParam, fUnicode); nAddButtons = (UINT)wParam; nOldButtons = infoPtr->nNumButtons; nNewButtons = nOldButtons + nAddButtons; - if (infoPtr->nNumButtons == 0) { - infoPtr->buttons = - Alloc (sizeof(TBUTTON_INFO) * nNewButtons); - } - else { - TBUTTON_INFO *oldButtons = infoPtr->buttons; - infoPtr->buttons = - Alloc (sizeof(TBUTTON_INFO) * nNewButtons); - memcpy (&infoPtr->buttons[0], &oldButtons[0], - nOldButtons * sizeof(TBUTTON_INFO)); - Free (oldButtons); - } - + infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO)*nNewButtons); infoPtr->nNumButtons = nNewButtons; /* insert new button data */ @@ -2893,67 +2881,16 @@ TOOLBAR_AddButtonsA (HWND hwnd, WPARAM w btnPtr->fsState = lpTbb[nCount].fsState; btnPtr->fsStyle = lpTbb[nCount].fsStyle; btnPtr->dwData = lpTbb[nCount].dwData; - if(HIWORD(lpTbb[nCount].iString) && lpTbb[nCount].iString != -1) - Str_SetPtrAtoW ((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[nCount].iString ); - else - btnPtr->iString = lpTbb[nCount].iString; btnPtr->bHot = FALSE; - - TOOLBAR_TooltipAddTool(infoPtr, btnPtr); - } - - TOOLBAR_CalcToolbar (hwnd); - TOOLBAR_AutoSize (hwnd); - - TOOLBAR_DumpToolbar (infoPtr, __LINE__); - - InvalidateRect(hwnd, NULL, TRUE); - - return TRUE; -} - - -static LRESULT -TOOLBAR_AddButtonsW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - LPTBBUTTON lpTbb = (LPTBBUTTON)lParam; - INT nOldButtons, nNewButtons, nAddButtons, nCount; - - TRACE("adding %d buttons!\n", wParam); - - nAddButtons = (UINT)wParam; - nOldButtons = infoPtr->nNumButtons; - nNewButtons = nOldButtons + nAddButtons; - - if (infoPtr->nNumButtons == 0) { - infoPtr->buttons = - Alloc (sizeof(TBUTTON_INFO) * nNewButtons); - } - else { - TBUTTON_INFO *oldButtons = infoPtr->buttons; - infoPtr->buttons = - Alloc (sizeof(TBUTTON_INFO) * nNewButtons); - memcpy (&infoPtr->buttons[0], &oldButtons[0], - nOldButtons * sizeof(TBUTTON_INFO)); - Free (oldButtons); - } - - infoPtr->nNumButtons = nNewButtons; - - /* insert new button data */ - for (nCount = 0; nCount < nAddButtons; nCount++) { - TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount]; - btnPtr->iBitmap = lpTbb[nCount].iBitmap; - btnPtr->idCommand = lpTbb[nCount].idCommand; - btnPtr->fsState = lpTbb[nCount].fsState; - btnPtr->fsStyle = lpTbb[nCount].fsStyle; - btnPtr->dwData = lpTbb[nCount].dwData; if(HIWORD(lpTbb[nCount].iString) && lpTbb[nCount].iString != -1) - Str_SetPtrW ((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[nCount].iString ); + { + if (fUnicode) + Str_SetPtrW ((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[nCount].iString ); + else + Str_SetPtrAtoW((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[nCount].iString); + } else btnPtr->iString = lpTbb[nCount].iString; - btnPtr->bHot = FALSE; TOOLBAR_TooltipAddTool(infoPtr, btnPtr); } @@ -6783,10 +6720,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, return TOOLBAR_AddBitmap (hwnd, wParam, lParam); case TB_ADDBUTTONSA: - return TOOLBAR_AddButtonsA (hwnd, wParam, lParam); + return TOOLBAR_AddButtonsT(hwnd, wParam, lParam, FALSE); case TB_ADDBUTTONSW: - return TOOLBAR_AddButtonsW (hwnd, wParam, lParam); + return TOOLBAR_AddButtonsT(hwnd, wParam, lParam, TRUE); case TB_ADDSTRINGA: return TOOLBAR_AddStringA (hwnd, wParam, lParam);

1 0

Mikołaj Zalewski : comctl32: toolbar: Create the tooltip control during WM_MOUSEMOVE so that the NM_TOOLTIPSCREATE is not sent too early .
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 81050ccaffefef41d3776abec407290561935f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81050ccaffefef41d3776abec… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:43:33 2006 +0200 comctl32: toolbar: Create the tooltip control during WM_MOUSEMOVE so that the NM_TOOLTIPSCREATE is not sent too early. --- dlls/comctl32/toolbar.c | 48 ++++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c25b01f..0de7a11 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1941,6 +1941,31 @@ static void TOOLBAR_TooltipSetRect(TOOLB } } +/* Creates the tooltip control */ +static void +TOOLBAR_TooltipCreateControl(TOOLBAR_INFO *infoPtr) +{ + int i; + NMTOOLTIPSCREATED nmttc; + + infoPtr->hwndToolTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + infoPtr->hwndSelf, 0, 0, 0); + + if (!infoPtr->hwndToolTip) + return; + + /* Send NM_TOOLTIPSCREATED notification */ + nmttc.hwndToolTips = infoPtr->hwndToolTip; + TOOLBAR_SendNotify(&nmttc.hdr, infoPtr, NM_TOOLTIPSCREATED); + + for (i = 0; i < infoPtr->nNumButtons; i++) + { + TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[i]); + TOOLBAR_TooltipSetRect(infoPtr, &infoPtr->buttons[i]); + } +} + /* keeps available button list box sorted by button id */ static void TOOLBAR_Cust_InsertAvailButton(HWND hwnd, PCUSTOMBUTTON btnInfoNew) { @@ -5516,28 +5541,10 @@ TOOLBAR_Create (HWND hwnd, WPARAM wParam GetClientRect(hwnd, &infoPtr->client_rect); infoPtr->bUnicode = infoPtr->hwndNotify && (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, (LPARAM)NF_REQUERY)); + infoPtr->hwndToolTip = NULL; /* if needed the tooltip control will be created after a WM_MOUSEMOVE */ SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - - if (dwStyle & TBSTYLE_TOOLTIPS) { - /* Create tooltip control */ - infoPtr->hwndToolTip = - CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - hwnd, 0, 0, 0); - - /* Send NM_TOOLTIPSCREATED notification */ - if (infoPtr->hwndToolTip) - { - NMTOOLTIPSCREATED nmttc; - - nmttc.hwndToolTips = infoPtr->hwndToolTip; - - TOOLBAR_SendNotify (&nmttc.hdr, infoPtr, NM_TOOLTIPSCREATED); - } - } OpenThemeData (hwnd, themeClass); @@ -6192,6 +6199,9 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wPa INT nHit; TBUTTON_INFO *btnPtr; + if ((infoPtr->dwStyle & TBSTYLE_TOOLTIPS) && (infoPtr->hwndToolTip == NULL)) + TOOLBAR_TooltipCreateControl(infoPtr); + if ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) { /* fill in the TRACKMOUSEEVENT struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);

1 0

Mikołaj Zalewski : comctl32: toolbar: Move add/remove/ setrect tooltip code to separate functions.
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 7b899eabe93722499d7a887f8402b1131d9c1f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b899eabe93722499d7a887f8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:40:37 2006 +0200 comctl32: toolbar: Move add/remove/setrect tooltip code to separate functions. --- dlls/comctl32/toolbar.c | 146 +++++++++++++++++++---------------------------- 1 files changed, 58 insertions(+), 88 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 945b40b..c25b01f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -251,6 +251,7 @@ static LRESULT TOOLBAR_LButtonDown(HWND static void TOOLBAR_SetHotItemEx (TOOLBAR_INFO *infoPtr, INT nHit, DWORD dwReason); static LRESULT TOOLBAR_AutoSize(HWND hwnd); static void TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr); +static void TOOLBAR_TooltipSetRect(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button); static LRESULT TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); @@ -1726,19 +1727,7 @@ TOOLBAR_CalcToolbar (HWND hwnd) if (infoPtr->rcBound.bottom < y + cy) infoPtr->rcBound.bottom = y + cy; - /* Set the toolTip only for non-hidden, non-separator button */ - if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & BTNS_SEP )) - { - TTTOOLINFOW ti; - - ZeroMemory (&ti, sizeof(ti)); - ti.cbSize = sizeof(ti); - ti.hwnd = hwnd; - ti.uId = btnPtr->idCommand; - ti.rect = btnPtr->rect; - SendMessageW (infoPtr->hwndToolTip, TTM_NEWTOOLRECTW, - 0, (LPARAM)&ti); - } + TOOLBAR_TooltipSetRect(infoPtr, btnPtr); /* btnPtr->nRow is zero based. The space between the rows is */ /* also considered as a row. */ @@ -1902,6 +1891,56 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); } +static void +TOOLBAR_TooltipAddTool(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button) +{ + if (infoPtr->hwndToolTip && !(button->fsStyle & BTNS_SEP)) { + TTTOOLINFOW ti; + + ZeroMemory(&ti, sizeof(TTTOOLINFOW)); + ti.cbSize = sizeof (TTTOOLINFOW); + ti.hwnd = infoPtr->hwndSelf; + ti.uId = button->idCommand; + ti.hinst = 0; + ti.lpszText = LPSTR_TEXTCALLBACKW; + /* ti.lParam = random value from the stack? */ + + SendMessageW(infoPtr->hwndToolTip, TTM_ADDTOOLW, + 0, (LPARAM)&ti); + } +} + +static void +TOOLBAR_TooltipDelTool(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button) +{ + if ((infoPtr->hwndToolTip) && !(button->fsStyle & BTNS_SEP)) { + TTTOOLINFOW ti; + + ZeroMemory(&ti, sizeof(ti)); + ti.cbSize = sizeof(ti); + ti.hwnd = infoPtr->hwndSelf; + ti.uId = button->idCommand; + + SendMessageW(infoPtr->hwndToolTip, TTM_DELTOOLW, 0, (LPARAM)&ti); + } +} + +static void TOOLBAR_TooltipSetRect(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button) +{ + /* Set the toolTip only for non-hidden, non-separator button */ + if (infoPtr->hwndToolTip && !(button->fsStyle & BTNS_SEP)) + { + TTTOOLINFOW ti; + + ZeroMemory(&ti, sizeof(ti)); + ti.cbSize = sizeof(ti); + ti.hwnd = infoPtr->hwndSelf; + ti.uId = button->idCommand; + ti.rect = button->rect; + SendMessageW(infoPtr->hwndToolTip, TTM_NEWTOOLRECTW, 0, (LPARAM)&ti); + } +} + /* keeps available button list box sorted by button id */ static void TOOLBAR_Cust_InsertAvailButton(HWND hwnd, PCUSTOMBUTTON btnInfoNew) { @@ -2835,19 +2874,7 @@ TOOLBAR_AddButtonsA (HWND hwnd, WPARAM w btnPtr->iString = lpTbb[nCount].iString; btnPtr->bHot = FALSE; - if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & BTNS_SEP)) { - TTTOOLINFOW ti; - - ZeroMemory (&ti, sizeof(ti)); - ti.cbSize = sizeof(ti); - ti.hwnd = hwnd; - ti.uId = btnPtr->idCommand; - ti.hinst = 0; - ti.lpszText = LPSTR_TEXTCALLBACKW; - - SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, - 0, (LPARAM)&ti); - } + TOOLBAR_TooltipAddTool(infoPtr, btnPtr); } TOOLBAR_CalcToolbar (hwnd); @@ -2903,20 +2930,7 @@ TOOLBAR_AddButtonsW (HWND hwnd, WPARAM w btnPtr->iString = lpTbb[nCount].iString; btnPtr->bHot = FALSE; - if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & BTNS_SEP)) { - TTTOOLINFOW ti; - - ZeroMemory (&ti, sizeof(TTTOOLINFOW)); - ti.cbSize = sizeof (TTTOOLINFOW); - ti.hwnd = hwnd; - ti.uId = btnPtr->idCommand; - ti.hinst = 0; - ti.lpszText = LPSTR_TEXTCALLBACKW; - ti.lParam = lParam; - - SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, - 0, (LPARAM)&ti); - } + TOOLBAR_TooltipAddTool(infoPtr, btnPtr); } TOOLBAR_CalcToolbar (hwnd); @@ -3251,17 +3265,7 @@ TOOLBAR_DeleteButton (HWND hwnd, WPARAM nmtb.tbButton.iString = btnPtr->iString; TOOLBAR_SendNotify(&nmtb.hdr, infoPtr, TBN_DELETINGBUTTON); - if ((infoPtr->hwndToolTip) && - !(btnPtr->fsStyle & BTNS_SEP)) { - TTTOOLINFOW ti; - - ZeroMemory (&ti, sizeof(ti)); - ti.cbSize = sizeof(ti); - ti.hwnd = hwnd; - ti.uId = infoPtr->buttons[nIndex].idCommand; - - SendMessageW (infoPtr->hwndToolTip, TTM_DELTOOLW, 0, (LPARAM)&ti); - } + TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]); if (infoPtr->nNumButtons == 1) { TRACE(" simple delete!\n"); @@ -3909,19 +3913,7 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM else infoPtr->buttons[nIndex].iString = lpTbb->iString; - if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & BTNS_SEP)) { - TTTOOLINFOW ti; - - ZeroMemory (&ti, sizeof(ti)); - ti.cbSize = sizeof (ti); - ti.hwnd = hwnd; - ti.uId = lpTbb->idCommand; - ti.hinst = 0; - ti.lpszText = LPSTR_TEXTCALLBACKW; - - SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, - 0, (LPARAM)&ti); - } + TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[nIndex]); /* post insert copy */ if (nIndex < infoPtr->nNumButtons - 1) { @@ -4010,19 +4002,7 @@ TOOLBAR_InsertButtonW (HWND hwnd, WPARAM else infoPtr->buttons[nIndex].iString = lpTbb->iString; - if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & BTNS_SEP)) { - TTTOOLINFOW ti; - - ZeroMemory (&ti, sizeof(TTTOOLINFOW)); - ti.cbSize = sizeof (TTTOOLINFOW); - ti.hwnd = hwnd; - ti.uId = lpTbb->idCommand; - ti.hinst = 0; - ti.lpszText = LPSTR_TEXTCALLBACKW; - - SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, - 0, (LPARAM)&ti); - } + TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[nIndex]); /* post insert copy */ if (nIndex < infoPtr->nNumButtons - 1) { @@ -4441,20 +4421,10 @@ static void TOOLBAR_DeleteAllButtons(TOOLBAR_INFO *infoPtr) { INT i; - TTTOOLINFOW ti; - - ZeroMemory(&ti, sizeof(ti)); - ti.cbSize = sizeof(ti); - ti.hwnd = infoPtr->hwndSelf; for (i = 0; i < infoPtr->nNumButtons; i++) { - if ((infoPtr->hwndToolTip) && - !(infoPtr->buttons[i].fsStyle & BTNS_SEP)) - { - ti.uId = infoPtr->buttons[i].idCommand; - SendMessageW(infoPtr->hwndToolTip, TTM_DELTOOLW, 0, (LPARAM)&ti); - } + TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[i]); } Free(infoPtr->buttons);

1 0

Huw Davies : oleaut32: Implement ITypeInfo_CreateInstance.
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 03ec218326dc857e926674ae737cfb2f69666a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ec218326dc857e926674ae7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 9 15:04:07 2006 +0100 oleaut32: Implement ITypeInfo_CreateInstance. --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 52ce8b4..8ebfd0e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5867,11 +5867,53 @@ static HRESULT WINAPI ITypeInfo_fnAddres * (coclass). */ static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface, - IUnknown *pUnk, REFIID riid, VOID **ppvObj) + IUnknown *pOuterUnk, REFIID riid, VOID **ppvObj) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - FIXME("(%p) stub!\n", This); - return S_OK; + HRESULT hr; + TYPEATTR *pTA; + + TRACE("(%p)->(%p, %s, %p)\n", This, pOuterUnk, debugstr_guid(riid), ppvObj); + + *ppvObj = NULL; + + if(pOuterUnk) + { + WARN("Not able to aggregate\n"); + return CLASS_E_NOAGGREGATION; + } + + hr = ITypeInfo_GetTypeAttr(iface, &pTA); + if(FAILED(hr)) return hr; + + if(pTA->typekind != TKIND_COCLASS) + { + WARN("CreateInstance on typeinfo of type %x\n", pTA->typekind); + hr = E_INVALIDARG; + goto end; + } + + hr = S_FALSE; + if(pTA->wTypeFlags & TYPEFLAG_FAPPOBJECT) + { + IUnknown *pUnk; + hr = GetActiveObject(&pTA->guid, NULL, &pUnk); + TRACE("GetActiveObject rets %08lx\n", hr); + if(hr == S_OK) + { + hr = IUnknown_QueryInterface(pUnk, riid, ppvObj); + IUnknown_Release(pUnk); + } + } + + if(hr != S_OK) + hr = CoCreateInstance(&pTA->guid, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, + riid, ppvObj); + +end: + ITypeInfo_ReleaseTypeAttr(iface, pTA); + return hr; } /* ITypeInfo::GetMops

1 0

Stefan Dösinger : ddraw: Remove the process counter.
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 4ff712c93839838b7986e8eeac488cf6a497a1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff712c93839838b7986e8eea… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Oct 9 15:29:05 2006 +0200 ddraw: Remove the process counter. --- dlls/ddraw/main.c | 114 +++++++++++++++++++++++++---------------------------- 1 files changed, 53 insertions(+), 61 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7afe210..6778c57 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -812,8 +812,6 @@ DllMain(HINSTANCE hInstDLL, DWORD Reason, void *lpv) { - static LONG counter = 0; - TRACE("(%p,%lx,%p)\n", hInstDLL, Reason, lpv); if (Reason == DLL_PROCESS_ATTACH) { @@ -865,73 +863,67 @@ DllMain(HINSTANCE hInstDLL, } DisableThreadLibraryCalls(hInstDLL); - TRACE("Attach counter: %ld\n", InterlockedIncrement(&counter)); } else if (Reason == DLL_PROCESS_DETACH) { - TRACE("Attach counter: %ld\n", InterlockedDecrement(&counter)); - - if(counter == 0) + if(!list_empty(&global_ddraw_list)) { - if(!list_empty(&global_ddraw_list)) + struct list *entry, *entry2; + WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n"); + + /* We remove elemets from this loop */ + LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list) { - struct list *entry, *entry2; - WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n"); + HRESULT hr; + DDSURFACEDESC2 desc; + int i; + IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry); + + WARN("DDraw %p has a refcount of %ld\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref2 + ddraw->ref1); + + /* Add references to each interface to avoid freeing them unexpectadely */ + IDirectDraw_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw)); + IDirectDraw2_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw2)); + IDirectDraw4_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw4)); + IDirectDraw7_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw7)); + + /* Does a D3D device exist? Destroy it + * TODO: Destroy all Vertex buffers, Lights, Materials + * and execture buffers too + */ + if(ddraw->d3ddevice) + { + WARN("DDraw %p has d3ddevice %p attached\n", ddraw, ddraw->d3ddevice); + while(IDirect3DDevice7_Release(ICOM_INTERFACE(ddraw->d3ddevice, IDirect3DDevice7))); + } - /* We remove elemets from this loop */ - LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list) + /* Try to release the objects + * Do an EnumSurfaces to find any hanging surfaces + */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + for(i = 0; i <= 1; i++) { - HRESULT hr; - DDSURFACEDESC2 desc; - int i; - IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry); - - WARN("DDraw %p has a refcount of %ld\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref2 + ddraw->ref1); - - /* Add references to each interface to avoid freeing them unexpectadely */ - IDirectDraw_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw)); - IDirectDraw2_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw2)); - IDirectDraw4_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw4)); - IDirectDraw7_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw7)); - - /* Does a D3D device exist? Destroy it - * TODO: Destroy all Vertex buffers, Lights, Materials - * and execture buffers too - */ - if(ddraw->d3ddevice) - { - WARN("DDraw %p has d3ddevice %p attached\n", ddraw, ddraw->d3ddevice); - while(IDirect3DDevice7_Release(ICOM_INTERFACE(ddraw->d3ddevice, IDirect3DDevice7))); - } - - /* Try to release the objects - * Do an EnumSurfaces to find any hanging surfaces - */ - memset(&desc, 0, sizeof(desc)); - desc.dwSize = sizeof(desc); - for(i = 0; i <= 1; i++) - { - hr = IDirectDraw7_EnumSurfaces(ICOM_INTERFACE(ddraw, IDirectDraw7), - DDENUMSURFACES_ALL, - &desc, - (void *) ddraw, - DestroyCallback); - if(hr != D3D_OK) - ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); - } - - /* Check the surface count */ - if(ddraw->surfaces > 0) - ERR("DDraw %p still has %ld surfaces attached\n", ddraw, ddraw->surfaces); - - /* Release all hanging references to destroy the objects. This - * restores the screen mode too - */ - while(IDirectDraw_Release(ICOM_INTERFACE(ddraw, IDirectDraw))); - while(IDirectDraw2_Release(ICOM_INTERFACE(ddraw, IDirectDraw2))); - while(IDirectDraw4_Release(ICOM_INTERFACE(ddraw, IDirectDraw4))); - while(IDirectDraw7_Release(ICOM_INTERFACE(ddraw, IDirectDraw7))); + hr = IDirectDraw7_EnumSurfaces(ICOM_INTERFACE(ddraw, IDirectDraw7), + DDENUMSURFACES_ALL, + &desc, + (void *) ddraw, + DestroyCallback); + if(hr != D3D_OK) + ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); } + + /* Check the surface count */ + if(ddraw->surfaces > 0) + ERR("DDraw %p still has %ld surfaces attached\n", ddraw, ddraw->surfaces); + + /* Release all hanging references to destroy the objects. This + * restores the screen mode too + */ + while(IDirectDraw_Release(ICOM_INTERFACE(ddraw, IDirectDraw))); + while(IDirectDraw2_Release(ICOM_INTERFACE(ddraw, IDirectDraw2))); + while(IDirectDraw4_Release(ICOM_INTERFACE(ddraw, IDirectDraw4))); + while(IDirectDraw7_Release(ICOM_INTERFACE(ddraw, IDirectDraw7))); } } }

1 0

Stefan Dösinger : ddraw: Protect the ddraw list.
by Alexandre Julliard Oct. 9, 2006

Oct. 9, 2006

Module: wine Branch: master Commit: 3543a070ff873f1e9d33cf18942155f94eb2d08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543a070ff873f1e9d33cf189… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Oct 9 15:18:11 2006 +0200 ddraw: Protect the ddraw list. --- dlls/ddraw/main.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 9fbcf35..7afe210 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -58,8 +58,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; +/* DDraw list and critical section */ static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); +static CRITICAL_SECTION ddraw_list_cs; +static CRITICAL_SECTION_DEBUG ddraw_list_cs_debug = +{ + 0, 0, &ddraw_list_cs, + { &ddraw_list_cs_debug.ProcessLocksList, + &ddraw_list_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": ddraw_list_cs") } +}; +static CRITICAL_SECTION ddraw_list_cs = { &ddraw_list_cs_debug, -1, 0, 0, 0, 0 }; + /*********************************************************************** * * Helper function for DirectDrawCreate and friends @@ -304,7 +315,9 @@ #undef BLIT_CAPS #undef CKEY_CAPS #undef FX_CAPS + EnterCriticalSection(&ddraw_list_cs); list_add_head(&global_ddraw_list, &This->ddraw_list_entry); + LeaveCriticalSection(&ddraw_list_cs); /* Call QueryInterface to get the pointer to the requested interface. This also initializes * The required refcount @@ -929,5 +942,7 @@ DllMain(HINSTANCE hInstDLL, void remove_ddraw_object(IDirectDrawImpl *ddraw) { + EnterCriticalSection(&ddraw_list_cs); list_remove(&ddraw->ddraw_list_entry); + LeaveCriticalSection(&ddraw_list_cs); }

1 0