wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Roderick Colenbrander : wined3d: Ask for enough RGB bits for pbuffers.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 9be5a5e9dbc4127e655ce711d950630453965472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be5a5e9dbc4127e655ce711d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 28 22:40:26 2007 +0200 wined3d: Ask for enough RGB bits for pbuffers. --- dlls/wined3d/context.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6dce228..c7622cb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -136,7 +136,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(create_pbuffer) { HDC hdc_parent = GetDC(win_handle); int iPixelFormat = 0; - short red, green, blue, alphaBits, colorBits; + short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits, stencilBits; IWineD3DSurface *StencilSurface = This->stencilBufferTarget; @@ -147,11 +147,14 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar unsigned int nFormats; /* Retrieve the specifications for the pixelformat from the backbuffer / stencilbuffer */ - getColorBits(target->resource.format, &red, &green, &blue, &alphaBits, &colorBits); + getColorBits(target->resource.format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits); getDepthStencilBits(StencilBufferFormat, &depthBits, &stencilBits); PUSH2(WGL_DRAW_TO_PBUFFER_ARB, 1); /* We need pbuffer support; doublebuffering isn't needed */ PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ PUSH2(WGL_COLOR_BITS_ARB, colorBits); + PUSH2(WGL_RED_BITS_ARB, redBits); + PUSH2(WGL_GREEN_BITS_ARB, greenBits); + PUSH2(WGL_BLUE_BITS_ARB, blueBits); PUSH2(WGL_ALPHA_BITS_ARB, alphaBits); PUSH2(WGL_DEPTH_BITS_ARB, depthBits); PUSH2(WGL_STENCIL_BITS_ARB, stencilBits);

1 0

Roderick Colenbrander : wined3d: CreateAdditionalSwapChain bugfix.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: dc7252a1f839c52b1c40702a30982d3c0aa0a240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7252a1f839c52b1c40702a3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 28 22:37:37 2007 +0200 wined3d: CreateAdditionalSwapChain bugfix. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4544bf8..044e2af 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1361,7 +1361,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) || - (pPresentationParameters->BackBufferHeight == 0))) { + (pPresentationParameters->BackBufferHeight == 0) || + (pPresentationParameters->BackBufferFormat == WINED3DFMT_UNKNOWN))) { RECT Rect; GetClientRect(object->win_handle, &Rect);

1 0

Stefan Leichter : dsound: Remove 'recursive registry key delete' function.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 6357676c54cbd858dac255a4771242cb0e4ede67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6357676c54cbd858dac255a47… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Aug 28 21:04:47 2007 +0200 dsound: Remove 'recursive registry key delete' function. --- dlls/dsound/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/dsound/regsvr.c b/dlls/dsound/regsvr.c index edea8f8..2549043 100644 --- a/dlls/dsound/regsvr.c +++ b/dlls/dsound/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -435,70 +436,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static GUID const CLSID_DirectSoundBufferConfig = {

1 0

Stefan Leichter : dswave: Remove 'recursive registry key delete' function.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 411f5f7957bf35ce6f12bcbc607e7c6fd241c064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=411f5f7957bf35ce6f12bcbc6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Aug 28 20:59:41 2007 +0200 dswave: Remove 'recursive registry key delete' function. --- dlls/dswave/regsvr.c | 77 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 69 deletions(-) diff --git a/dlls/dswave/regsvr.c b/dlls/dswave/regsvr.c index be95519..d88e4b8 100644 --- a/dlls/dswave/regsvr.c +++ b/dlls/dswave/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -411,68 +412,6 @@ error_close_progid_key: RegCloseKey(progid_key); return res; } - -/*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - /*********************************************************************** * coclass list */

1 0

tools/. winapi_stats.php
by Jeremy Newman 28 Aug '07

28 Aug '07

ChangeSet ID: 31354 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/28 14:13:28 Modified files: . : winapi_stats.php Log message: Jeremy Newman <jnewman(a)codeweavers.com> use regular tables instead of temp tables as the current query will no longer work in mysql 4.1+ Patch: http://cvs.winehq.org/patch.py?id=31354 Old revision New revision Changes Path 1.11 1.12 +4 -1 tools/winapi_stats.php Index: tools/winapi_stats.php diff -u -p tools/winapi_stats.php:1.11 tools/winapi_stats.php:1.12 --- tools/winapi_stats.php:1.11 28 Aug 2007 19:13:28 -0000 +++ tools/winapi_stats.php 28 Aug 2007 19:13:28 -0000 @@ -27,7 +27,7 @@ mysql_connect ($MYSQL_SERVER, $MYSQL_USE mysql_select_db($MYSQL_DB); // CREATE TABLE -mysql_query('CREATE TEMPORARY TABLE `winapi` ( +mysql_query('CREATE TABLE `winapi` ( `module` VARCHAR('.MODULE_LENGTH.') NOT NULL , `stubs` INT NOT NULL , `total_func` INT NOT NULL , @@ -157,5 +157,8 @@ print ' printf('<p>last modified: %s</p>', date("D M j G:i:s T Y",time())); print "\n\n"; +// drop the table +mysql_query('DROP TABLE `winapi`;'); + // done ?>

1 0

Alexander Nicolaysen Sørnes : notepad: Add program icon.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 29b69c54b0ddf7469b1046f0ea94983ff4a42620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b69c54b0ddf7469b1046f0e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 25 18:26:15 2007 +0200 notepad: Add program icon. --- programs/notepad/dialog.c | 3 ++- programs/notepad/main.c | 2 +- programs/notepad/notepad.ico | Bin 0 -> 2238 bytes programs/notepad/notepad_res.h | 2 ++ programs/notepad/rsrc.rc | 3 +++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ad1e9a4..0a62c5e 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -791,9 +791,10 @@ VOID DIALOG_HelpAboutWine(VOID) { static const WCHAR notepadW[] = { 'N','o','t','e','p','a','d','\n',0 }; WCHAR szNotepad[MAX_STRING_LEN]; + HICON icon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); - ShellAbout(Globals.hMainWnd, szNotepad, notepadW, 0); + ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index c7b961f..18500df 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -647,7 +647,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.cbSize = sizeof(class); class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon(0, IDI_APPLICATION); + class.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); class.hCursor = LoadCursor(0, IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); diff --git a/programs/notepad/notepad.ico b/programs/notepad/notepad.ico new file mode 100644 index 0000000..002bbba Binary files /dev/null and b/programs/notepad/notepad.ico differ diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 16f5c14..d95239a 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -23,6 +23,8 @@ #define DIALOG_PAGESETUP 0x202 #define ID_ACCEL 0x203 +#define IDI_NOTEPAD 0x300 + /* Commands */ #define CMD_NEW 0x100 #define CMD_OPEN 0x101 diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index 51ce7a9..119ede1 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -44,6 +44,9 @@ ID_ACCEL ACCELERATORS VK_INSERT, CMD_PASTE, VIRTKEY, SHIFT } +/* @makedep: notepad.ico */ +IDI_NOTEPAD ICON "notepad.ico" + #include "Bg.rc" #include "Cs.rc" #include "Da.rc"

1 0

Jason Edmeades : comctl32: toolbar: Implemented SetRows.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 881c204c027d3d972c0d13531cd7dee0a5177db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881c204c027d3d972c0d13531… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Aug 27 21:30:16 2007 +0100 comctl32: toolbar: Implemented SetRows. --- dlls/comctl32/tests/toolbar.c | 56 ++++++++++++++++++++++ dlls/comctl32/toolbar.c | 104 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 150 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index b46ef0d..5e619ee 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1032,6 +1032,61 @@ static void test_dispinfo(void) g_dwExpectedDispInfoMask = 0; } +typedef struct +{ + int nRows; + BOOL bLarger; + int expectedRows; +} tbrows_result_t; + +static tbrows_result_t tbrows_results[] = +{ + {1, TRUE, 1}, /* 0: Simple case 9 in a row */ + {2, TRUE, 2}, /* 1: Another simple case 5 on one row, 4 on another*/ + {3, FALSE, 3}, /* 2: 3 lines - should be 3 lines of 3 buttons */ + {8, FALSE, 5}, /* 3: 8 lines - should be 5 lines of 2 buttons */ + {8, TRUE, 9}, /* 4: 8 lines but grow - should be 9 lines */ + {1, TRUE, 1} /* 5: Back to simple case */ +}; + +static void test_setrows(void) +{ + TBBUTTON buttons[9]; + HWND hToolbar; + int i; + + for (i=0; i<9; i++) + MakeButton(buttons+i, 1000+i, TBSTYLE_FLAT | TBSTYLE_CHECKGROUP, 0); + + /* Test 1 - 9 buttons */ + hToolbar = CreateToolbarEx(hMainWnd, + WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD | CCS_NORESIZE | CCS_NOPARENTALIGN + | CCS_NOMOVEY | CCS_TOP, + 0, + 0, NULL, (UINT)0, + buttons, sizeof(buttons)/sizeof(buttons[0]), + 20, 20, 0, 0, sizeof(TBBUTTON)); + ok(hToolbar != NULL, "Toolbar creation\n"); + ok(SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); + + /* test setting rows to each of 1-10 with bLarger true and false */ + for (i=0; i<(sizeof(tbrows_results) / sizeof(tbrows_result_t)); i++) { + RECT rc; + int rows; + + memset(&rc, 0xCC, sizeof(rc)); + SendMessageA(hToolbar, TB_SETROWS, + MAKELONG(tbrows_results[i].nRows, tbrows_results[i].bLarger), + (LONG) &rc); + + rows = SendMessageA(hToolbar, TB_GETROWS, MAKELONG(0,0), MAKELONG(0,0)); + ok(rows == tbrows_results[i].expectedRows, + "[%d] Unexpected number of rows %d (expected %d)\n", i, rows, + tbrows_results[i].expectedRows); + } + + DestroyWindow(hToolbar); +} START_TEST(toolbar) { @@ -1066,6 +1121,7 @@ START_TEST(toolbar) test_getbuttoninfo(); test_createtoolbarex(); test_dispinfo(); + test_setrows(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 275d3d5..8ca4e6b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -44,7 +44,7 @@ * - TBN_GETOBJECT * - TBN_SAVE * - Button wrapping (under construction). - * - Fix TB_SETROWS. + * - Fix TB_SETROWS and Separators. * - iListGap custom draw support. * * Testing: @@ -3637,10 +3637,7 @@ TOOLBAR_GetRows (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - if (infoPtr->dwStyle & TBSTYLE_WRAPABLE) - return infoPtr->nRows; - else - return 1; + return infoPtr->nRows; } @@ -4947,20 +4944,107 @@ TOOLBAR_SetRows (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPRECT lprc = (LPRECT)lParam; + int rows = LOWORD(wParam); + BOOL bLarger = HIWORD(wParam); TRACE("\n"); - if (LOWORD(wParam) > 1) { - FIXME("multiple rows not supported!\n"); - } + TRACE("Setting rows to %d (%d)\n", rows, bLarger); - if(infoPtr->nRows != LOWORD(wParam)) + if(infoPtr->nRows != rows) { - infoPtr->nRows = LOWORD(wParam); + TBUTTON_INFO *btnPtr = infoPtr->buttons; + int curColumn = 0; /* Current column */ + int curRow = 0; /* Current row */ + int hidden = 0; /* Number of hidden buttons */ + int seps = 0; /* Number of separators */ + int idealWrap = 0; /* Ideal wrap point */ + int i; + BOOL wrap; + + /* + Calculate new size and wrap points - Under windows, setrows will + change the dimensions if needed to show the number of requested + rows (if CCS_NORESIZE is set), or will take up the whole window + (if no CCS_NORESIZE). + + Basic algorithum - If N buttons, and y rows requested, each row + contains N/y buttons. + + FIXME: Handling of separators not obvious from testing results + FIXME: Take width of window into account? + */ + + /* Loop through the buttons one by one counting key items */ + for (i = 0; i < infoPtr->nNumButtons; i++ ) + { + btnPtr[i].fsState &= ~TBSTATE_WRAP; + if (btnPtr[i].fsState & TBSTATE_HIDDEN) + hidden++; + else if (btnPtr[i].fsStyle & BTNS_SEP) + seps++; + } + + /* FIXME: Separators make this quite complex */ + if (seps) FIXME("Separators unhandled\n"); + + /* Round up so more per line, ie less rows */ + idealWrap = (infoPtr->nNumButtons - hidden + (rows-1)) / rows; + + /* Calculate ideal wrap point if we are allowed to grow, but cannot + achieve the requested number of rows. */ + if (bLarger && idealWrap > 1) + { + int resRows = (infoPtr->nNumButtons + (idealWrap-1)) / idealWrap; + int moreRows = (infoPtr->nNumButtons + (idealWrap-2)) / (idealWrap-1); + + if (resRows < rows && moreRows > rows) + { + idealWrap--; + TRACE("Changing idealWrap due to bLarger (now %d)\n", idealWrap); + } + } + + curColumn = curRow = 0; + wrap = FALSE; + TRACE("Trying to wrap at %d (%d,%d,%d)\n", idealWrap, + infoPtr->nNumButtons, hidden, rows); + + for (i = 0; i < infoPtr->nNumButtons; i++ ) + { + if (btnPtr[i].fsState & TBSTATE_HIDDEN) + continue; + + /* Step on, wrap if necessary or flag next to wrap */ + if (!wrap) { + curColumn++; + } else { + wrap = FALSE; + curColumn = 1; + curRow++; + } + + if (curColumn > (idealWrap-1)) { + wrap = TRUE; + btnPtr[i].fsState |= TBSTATE_WRAP; + } + } + + TRACE("Result - %d rows\n", curRow + 1); /* recalculate toolbar */ TOOLBAR_CalcToolbar (hwnd); + /* Resize if necessary (Only if NORESIZE is set - odd, but basically + if NORESIZE is NOT set, then the toolbar will always be resized to + take up the whole window. With it set, sizing needs to be manual. */ + if (infoPtr->dwStyle & CCS_NORESIZE) { + SetWindowPos(hwnd, NULL, 0, 0, + infoPtr->rcBound.right - infoPtr->rcBound.left, + infoPtr->rcBound.bottom - infoPtr->rcBound.top, + SWP_NOMOVE); + } + /* repaint toolbar */ InvalidateRect(hwnd, NULL, TRUE); }

1 0

Aric Stewart : ole32: Properly update the SmallBlockDepotCount when adding more blocks.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 2d8cd767b239eedee879270f26dcf300e4503c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8cd767b239eedee879270f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 28 18:11:14 2007 +0900 ole32: Properly update the SmallBlockDepotCount when adding more blocks. --- dlls/ole32/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 584b132..c627a43 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5194,6 +5194,8 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( This->parentStorage->base.rootPropertySetIndex, &rootProp); } + else + StorageImpl_SaveFileHeader(This->parentStorage); } }

1 0

Juan Lang : wintrust: Use common memory functions.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 492518d03729179ccc05d9315b4fa3bb4f314e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=492518d03729179ccc05d9315… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 27 16:20:16 2007 -0700 wintrust: Use common memory functions. --- dlls/wintrust/register.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 6d425c8..1f0054b 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -89,9 +89,9 @@ static void WINTRUST_InitRegStructs(void) { #define WINTRUST_INITREGENTRY( action, dllname, functionname ) \ action.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); \ - action.pwszDLLName = HeapAlloc(GetProcessHeap(), 0, sizeof(dllname)); \ + action.pwszDLLName = WINTRUST_Alloc(sizeof(dllname)); \ lstrcpyW(action.pwszDLLName, dllname); \ - action.pwszFunctionName = HeapAlloc(GetProcessHeap(), 0, sizeof(functionname)); \ + action.pwszFunctionName = WINTRUST_Alloc(sizeof(functionname)); \ lstrcpyW(action.pwszFunctionName, functionname); WINTRUST_INITREGENTRY(SoftpubInitialization, SP_POLICY_PROVIDER_DLL_NAME, SP_INIT_FUNCTION) @@ -125,8 +125,8 @@ static void WINTRUST_InitRegStructs(void) static void WINTRUST_FreeRegStructs(void) { #define WINTRUST_FREEREGENTRY( action ) \ - HeapFree(GetProcessHeap(), 0, action.pwszDLLName); \ - HeapFree(GetProcessHeap(), 0, action.pwszFunctionName); + WINTRUST_Free(action.pwszDLLName); \ + WINTRUST_Free(action.pwszFunctionName); WINTRUST_FREEREGENTRY(SoftpubInitialization); WINTRUST_FREEREGENTRY(SoftpubMessage); @@ -380,11 +380,11 @@ static LONG WINTRUST_WriteSingleUsageEntry(LPCSTR OID, /* Turn OID into a wide-character string */ Len = MultiByteToWideChar( CP_ACP, 0, OID, -1, NULL, 0 ); - OIDW = HeapAlloc( GetProcessHeap(), 0, Len * sizeof(WCHAR) ); + OIDW = WINTRUST_Alloc( Len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, OID, -1, OIDW, Len ); /* Allocate the needed space for UsageKey */ - UsageKey = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(Trust) + lstrlenW(Usages) + Len) * sizeof(WCHAR)); + UsageKey = WINTRUST_Alloc((lstrlenW(Trust) + lstrlenW(Usages) + Len) * sizeof(WCHAR)); /* Create the key string */ lstrcpyW(UsageKey, Trust); lstrcatW(UsageKey, Usages); @@ -399,8 +399,8 @@ static LONG WINTRUST_WriteSingleUsageEntry(LPCSTR OID, } RegCloseKey(Key); - HeapFree(GetProcessHeap(), 0, OIDW); - HeapFree(GetProcessHeap(), 0, UsageKey); + WINTRUST_Free(OIDW); + WINTRUST_Free(UsageKey); return Res; } @@ -586,7 +586,7 @@ static BOOL WINTRUST_RegisterHttpsProv(void) SoftpubLoadUsage, SoftpubFreeUsage }; - DefUsage.pwszDllName = HeapAlloc(GetProcessHeap(), 0, sizeof(SP_POLICY_PROVIDER_DLL_NAME)); + DefUsage.pwszDllName = WINTRUST_Alloc(sizeof(SP_POLICY_PROVIDER_DLL_NAME)); lstrcpyW(DefUsage.pwszDllName, SP_POLICY_PROVIDER_DLL_NAME); if (!WintrustAddDefaultForUsage(szOID_PKIX_KP_SERVER_AUTH, &DefUsage)) @@ -598,7 +598,7 @@ static BOOL WINTRUST_RegisterHttpsProv(void) if (!WintrustAddDefaultForUsage(szOID_SGC_NETSCAPE, &DefUsage)) RegisteredOK = FALSE; - HeapFree(GetProcessHeap(), 0, DefUsage.pwszDllName); + WINTRUST_Free(DefUsage.pwszDllName); if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) RegisteredOK = FALSE; @@ -739,26 +739,26 @@ BOOL WINAPI WintrustAddDefaultForUsage(const char *pszUsageOID, WCHAR* CallbackW; Len = MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszLoadCallbackDataFunctionName, -1, NULL, 0 ); - CallbackW = HeapAlloc( GetProcessHeap(), 0, Len * sizeof(WCHAR) ); + CallbackW = WINTRUST_Alloc( Len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszLoadCallbackDataFunctionName, -1, CallbackW, Len ); Res = WINTRUST_WriteSingleUsageEntry(pszUsageOID, CBAlloc, CallbackW); if (Res != ERROR_SUCCESS) WriteUsageError = Res; - HeapFree(GetProcessHeap(), 0, CallbackW); + WINTRUST_Free(CallbackW); } if (psDefUsage->pwszFreeCallbackDataFunctionName) { WCHAR* CallbackW; Len = MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszFreeCallbackDataFunctionName, -1, NULL, 0 ); - CallbackW = HeapAlloc( GetProcessHeap(), 0, Len * sizeof(WCHAR) ); + CallbackW = WINTRUST_Alloc( Len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszFreeCallbackDataFunctionName, -1, CallbackW, Len ); Res = WINTRUST_WriteSingleUsageEntry(pszUsageOID, CBFree, CallbackW); if (Res != ERROR_SUCCESS) WriteUsageError = Res; - HeapFree(GetProcessHeap(), 0, CallbackW); + WINTRUST_Free(CallbackW); } WINTRUST_Guid2Wstr(psDefUsage->pgActionID, GuidString); @@ -876,7 +876,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) /* Clear and initialize the structure */ memset(&NewProv, 0, sizeof(SIP_ADD_NEWPROVIDER)); NewProv.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); - NewProv.pwszDLLFileName = HeapAlloc(GetProcessHeap(), 0, sizeof(SP_POLICY_PROVIDER_DLL_NAME)); + NewProv.pwszDLLFileName = WINTRUST_Alloc(sizeof(SP_POLICY_PROVIDER_DLL_NAME)); /* Fill the structure */ NewProv.pgSubject = Subject; lstrcpyW(NewProv.pwszDLLFileName, SP_POLICY_PROVIDER_DLL_NAME); @@ -891,7 +891,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) Ret = CryptSIPAddProvider(&NewProv); - HeapFree(GetProcessHeap(), 0, NewProv.pwszDLLFileName); + WINTRUST_Free(NewProv.pwszDLLFileName); return Ret; }

1 0

Juan Lang : wintrust: Move mem alloc functions to wintrust_main.c.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 6f8b296fb18d904ea5f064dd4209df7bdfcebed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8b296fb18d904ea5f064dd4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 27 16:19:36 2007 -0700 wintrust: Move mem alloc functions to wintrust_main.c. --- dlls/wintrust/register.c | 12 +----------- dlls/wintrust/wintrust_main.c | 18 +++++++++++++++++- dlls/wintrust/wintrust_priv.h | 25 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 517359f..6d425c8 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -31,7 +31,7 @@ #include "wintrust.h" #include "softpub.h" #include "mssip.h" - +#include "wintrust_priv.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -812,16 +812,6 @@ error_close_key: return Func; } -static void * WINAPI WINTRUST_Alloc(DWORD cb) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); -} - -static void WINAPI WINTRUST_Free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} - /*********************************************************************** * WintrustLoadFunctionPointers (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 5e025d9..4b0c8ff 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -29,7 +29,7 @@ #include "softpub.h" #include "mscat.h" #include "objbase.h" - +#include "wintrust_priv.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -214,3 +214,19 @@ BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags) if (r) SetLastError(r); return r == ERROR_SUCCESS; } + +/* Utility functions */ +void * WINAPI WINTRUST_Alloc(DWORD cb) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); +} + +void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb); +} + +void WINAPI WINTRUST_Free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h new file mode 100644 index 0000000..dc6a873 --- /dev/null +++ b/dlls/wintrust/wintrust_priv.h @@ -0,0 +1,25 @@ +/* + * Copyright 2007 Juan Lang + * + * 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. + * + * 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. + * + * 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 + */ +#ifndef __WINTRUST_PRIV_H__ +#define __WINTRUST_PRIV_H__ + +void * WINAPI WINTRUST_Alloc(DWORD cb); +void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb); +void WINAPI WINTRUST_Free(void *p); + +#endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007