October 2006 - Wine-Commits

Jacek Caban : shdocvw: Added WebBrowser::Navigate implementation.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 13c886d9fc75aaa5fb665c903136f26bbc9692f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c886d9fc75aaa5fb665c903… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 23:15:53 2006 +0200 shdocvw: Added WebBrowser::Navigate implementation. --- dlls/shdocvw/ie.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index e4400ec..4091323 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -150,9 +150,11 @@ static HRESULT WINAPI InternetExplorer_N VARIANT *PostData, VARIANT *Headers) { InternetExplorer *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, + + TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, PostData, Headers); - return E_NOTIMPL; + + return navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface)

1 0

Karsten Elfenbein : wined3d: Fix the FrontBuffer content capturing.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 4ada8a5e26723e25c646b3590f23381ff1ffa0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ada8a5e26723e25c646b3590… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Thu Oct 19 19:13:14 2006 +0200 wined3d: Fix the FrontBuffer content capturing. --- dlls/wined3d/swapchain.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b0bc657..287153d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -428,34 +428,20 @@ #endif static HRESULT WINAPI IWineD3DSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface, IWineD3DSurface *pDestSurface) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - WINED3DFORMAT d3dformat; - UINT width; - UINT height; - WINED3DSURFACE_DESC desc; - glDescriptor *glDescription; + POINT start; TRACE("(%p) : iface(%p) pDestSurface(%p)\n", This, iface, pDestSurface); - ENTER_GL(); - memset(&desc, 0, sizeof(desc)); - desc.Width = &width; - desc.Height = &height; - desc.Format = &d3dformat; + + start.x = 0; + start.y = 0; + + if (This->presentParms.Windowed) { + MapWindowPoints(This->win_handle, NULL, &start, 1); + } #if 0 /* TODO: make sure that this swapchains context is active */ IWineD3DDevice_ActivateSwapChainContext(This->wineD3DDevice, iface); #endif - IWineD3DSurface_GetDesc(pDestSurface, &desc); - /* make sure that the front buffer is the active read buffer */ - glReadBuffer(GL_FRONT); - /* Read the pixels from the buffer into the surfaces memory */ - IWineD3DSurface_GetGlDesc(pDestSurface, &glDescription); - glReadPixels(glDescription->target, - glDescription->level, - width, - height, - glDescription->glFormat, - glDescription->glType, - (void *)IWineD3DSurface_GetData(pDestSurface)); - LEAVE_GL(); + IWineD3DSurface_BltFast(pDestSurface, start.x, start.y, This->frontBuffer, NULL, 0); return WINED3D_OK; }

1 0

Karsten Elfenbein : wined3d: Correct the software cursor position if the app is running in windowed mode .
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 3447c21f227c200e3a99a11a4adb28609948a611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447c21f227c200e3a99a11a4… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Thu Oct 19 18:45:17 2006 +0200 wined3d: Correct the software cursor position if the app is running in windowed mode. --- dlls/wined3d/swapchain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ccec8dc..b0bc657 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -175,6 +175,9 @@ static HRESULT WINAPI IWineD3DSwapChainI /* DDBLT_KEYSRC will cause BltOverride to enable the alpha test with GL_NOTEQUAL, 0.0, * which is exactly what we want :-) */ + if (This->presentParms.Windowed) { + MapWindowPoints(NULL, This->win_handle, (LPPOINT)&destRect, 2); + } IWineD3DSurface_Blt(This->backBuffer[0], &destRect, (IWineD3DSurface *) &cursor, NULL, DDBLT_KEYSRC, NULL); }

1 0

Karsten Elfenbein : wined3d: BltOverride: Make sure that the content of the source rect is
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 1635da4b4664c59a37bc902fa108252932bb829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1635da4b4664c59a37bc902fa… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Thu Oct 19 17:32:28 2006 +0200 wined3d: BltOverride: Make sure that the content of the source rect is copied to the correct position in the destination rect. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1242bbc..7a3fcb2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2637,9 +2637,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOv } else { glCopyTexSubImage2D(GL_TEXTURE_2D, 0, /* level */ - rect.x1, This->currentDesc.Height - row - 1, /* xoffset, yoffset */ - srect.x1, Src->currentDesc.Height - srect.y2 + row * yrel, - rect.x2, 1); + rect.x1, rect.y2 + rect.y1 - row - 1, /* xoffset, yoffset */ + srect.x1, row - rect.y1, + rect.x2-rect.x1, 1); } }

1 0

Andrew Talbot : cabinet: Cast-qual warnings fix.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 49e8797de2407dcbd8771b318b992c05c6b72b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e8797de2407dcbd8771b318… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Oct 19 20:47:17 2006 +0100 cabinet: Cast-qual warnings fix. --- dlls/cabinet/fdi.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index e3b12c2..0cb319c 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -945,7 +945,7 @@ static void fdi_Ziphuft_free(HFDI hfdi, /********************************************************* * fdi_Ziphuft_build (internal) */ -static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, +static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, const cab_UWORD *d, const cab_UWORD *e, struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) { cab_ULONG a; /* counter for codes of length k */ @@ -1272,16 +1272,14 @@ static cab_LONG fdi_Zipinflate_fixed(fdi for(; i < 288; i++) /* make a complete, but wrong code set */ l[i] = 8; fixed_bl = 7; - if((i = fdi_Ziphuft_build(l, 288, 257, (cab_UWORD *) Zipcplens, - (cab_UWORD *) Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) + if((i = fdi_Ziphuft_build(l, 288, 257, Zipcplens, Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) return i; /* distance table */ for(i = 0; i < 30; i++) /* make an incomplete code set */ l[i] = 5; fixed_bd = 5; - if((i = fdi_Ziphuft_build(l, 30, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &fixed_td, &fixed_bd, decomp_state)) > 1) + if((i = fdi_Ziphuft_build(l, 30, 0, Zipcpdist, Zipcpdext, &fixed_td, &fixed_bd, decomp_state)) > 1) { fdi_Ziphuft_free(CAB(hfdi), fixed_tl); return i; @@ -1409,16 +1407,14 @@ static cab_LONG fdi_Zipinflate_dynamic(f /* build the decoding tables for literal/length and distance codes */ bl = ZIPLBITS; - if((i = fdi_Ziphuft_build(ll, nl, 257, (cab_UWORD *) Zipcplens, (cab_UWORD *) Zipcplext, - &tl, &bl, decomp_state)) != 0) + if((i = fdi_Ziphuft_build(ll, nl, 257, Zipcplens, Zipcplext, &tl, &bl, decomp_state)) != 0) { if(i == 1) fdi_Ziphuft_free(CAB(hfdi), tl); return i; /* incomplete code set */ } bd = ZIPDBITS; - fdi_Ziphuft_build(ll + nl, nd, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &td, &bd, decomp_state); + fdi_Ziphuft_build(ll + nl, nd, 0, Zipcpdist, Zipcpdext, &td, &bd, decomp_state); /* decompress until an end-of-block code */ if(fdi_Zipinflate_codes(tl, td, bl, bd, decomp_state))

1 0

James Hawkins : msi: Add tests for the InstallServices action.
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

Module: wine Branch: master Commit: d6632dd0fbcdcfc9e8b36d3e2dc048ae3c37cfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6632dd0fbcdcfc9e8b36d3e2… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 18 16:22:40 2006 -0700 msi: Add tests for the InstallServices action. --- dlls/msi/tests/install.c | 58 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 06805e3..36d9240 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -72,7 +72,8 @@ static const CHAR component_dat[] = "Com "Three\t{010B6ADD-B27D-4EDD-9B3D-34C4F7D61684}\tCHANGEDDIR\t2\t\tthree.txt\n" "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" - "component\t\tTARGETDIR\t0\t1\tfile"; + "component\t\tMSITESTDIR\t0\t1\tfile\n" + "service_comp\t\tMSITESTDIR\t0\t1\tservice_file"; static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -93,7 +94,8 @@ static const CHAR feature_dat[] = "Featu "One\t\tOne\tThe One Feature\t1\t3\tMSITESTDIR\t0\n" "Three\t\tThree\tThe Three Feature\t3\t3\tCHANGEDDIR\t0\n" "Two\t\tTwo\tThe Two Feature\t2\t3\tFIRSTDIR\t0\n" - "feature\t\t\t\t2\t1\tTARGETDIR\t0"; + "feature\t\t\t\t2\t1\tTARGETDIR\t0\n" + "service_feature\t\t\t\t2\t1\tTARGETDIR\t0"; static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -103,7 +105,8 @@ static const CHAR feature_comp_dat[] = " "One\tOne\n" "Three\tThree\n" "Two\tTwo\n" - "feature\tcomponent"; + "feature\tcomponent\n" + "service_feature\tservice_comp\n"; static const CHAR file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -113,7 +116,8 @@ static const CHAR file_dat[] = "File\tCo "one.txt\tOne\tone.txt\t1000\t\t\t0\t1\n" "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" - "file\tcomponent\tfilename\t100\t\t\t8192\t1"; + "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" + "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -123,6 +127,7 @@ static const CHAR install_exec_seq_dat[] "CostInitialize\t\t800\n" "FileCost\t\t900\n" "InstallFiles\t\t4000\n" + "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" "InstallValidate\t\t1400\n" @@ -160,6 +165,17 @@ static const CHAR registry_dat[] = "Regi "regdata\t2\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n" "OrderTest\t2\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent"; +static const CHAR service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" + "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" + "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" + "ServiceInstall\tServiceInstall\n" + "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t"; + +static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" + "s72\tl255\ti2\tL255\tI2\ts72\n" + "ServiceControl\tServiceControl\n" + "ServiceControl\tTestService\t8\t\t0\tservice_comp"; + typedef struct _msi_table { const CHAR *filename; @@ -181,7 +197,9 @@ static const msi_table tables[] = ADD_TABLE(install_exec_seq), ADD_TABLE(media), ADD_TABLE(property), - ADD_TABLE(registry) + ADD_TABLE(registry), + ADD_TABLE(service_install), + ADD_TABLE(service_control) }; /* cabinet definitions */ @@ -491,7 +509,8 @@ static void create_test_files(void) create_file("five.txt"); create_cab_file("msitest.cab"); - create_file("filename"); + create_file("msitest\\filename"); + create_file("msitest\\service.exe"); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -513,12 +532,13 @@ static BOOL delete_pf(const CHAR *rel_pa static void delete_test_files(void) { - DeleteFileA("filename"); DeleteFileA("msitest.msi"); DeleteFileA("msitest.cab"); DeleteFileA("msitest\\second\\three.txt"); DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); + DeleteFileA("msitest\\service.exe"); + DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\second"); RemoveDirectoryA("msitest\\first"); RemoveDirectoryA("msitest"); @@ -593,6 +613,27 @@ static void create_database(const CHAR * MsiCloseHandle(db); } +static void check_service_is_installed(void) +{ + SC_HANDLE scm, service; + BOOL res; + + scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(scm != NULL, "Failed to open the SC Manager\n"); + + service = OpenService(scm, "TestService", SC_MANAGER_ALL_ACCESS); + todo_wine + { + ok(service != NULL, "Failed to open TestService\n"); + } + + res = DeleteService(service); + todo_wine + { + ok(res, "Failed to delete TestService\n"); + } +} + static void test_MsiInstallProduct(void) { UINT r; @@ -618,6 +659,8 @@ static void test_MsiInstallProduct(void) ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); } @@ -650,6 +693,7 @@ static void test_MsiInstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(!lstrcmpA(path, "OrderTestValue"), "Expected imaname, got %s\n", path); + check_service_is_installed(); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Mikołaj Zalewski : comctl32: toolbar: Fix the tests and handling of TB_SETHOTITEM on a disabled button.
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

Module: wine Branch: master Commit: 39c4bbe56aa535f4d37e8e60115bbe2e9149e622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c4bbe56aa535f4d37e8e601… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 18 16:06:42 2006 +0200 comctl32: toolbar: Fix the tests and handling of TB_SETHOTITEM on a disabled button. --- dlls/comctl32/tests/toolbar.c | 45 +++++++++++++++++++++++++++++++++-------- dlls/comctl32/toolbar.c | 25 ++++++++++++++--------- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 110e8cb..217874d 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -35,7 +35,11 @@ #include "wine/test.h" HWND hMainWnd; BOOL g_fBlockHotItemChange; BOOL g_fReceivedHotItemChange; +BOOL g_fExpectedHotItemOld; +BOOL g_fExpectedHotItemNew; +#define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); + static void MakeButton(TBBUTTON *p, int idCommand, int fsStyle, int nString) { p->iBitmap = -2; p->idCommand = idCommand; @@ -47,10 +51,17 @@ static void MakeButton(TBBUTTON *p, int LRESULT MyWnd_Notify(hWnd, wParam, lParam) { NMHDR *hdr = (NMHDR *)lParam; + NMTBHOTITEM *nmhi; switch (hdr->code) { case TBN_HOTITEMCHANGE: + nmhi = (NMTBHOTITEM *)lParam; g_fReceivedHotItemChange = TRUE; + if (g_fExpectedHotItemOld != g_fExpectedHotItemNew) + { + compare(nmhi->idOld, g_fExpectedHotItemOld, "%d"); + compare(nmhi->idNew, g_fExpectedHotItemNew, "%d"); + } if (g_fBlockHotItemChange) return 1; break; @@ -422,6 +433,17 @@ void test_add_string() CHECK_STRING_TABLE(14, ret7); } +static void expect_hot_notify(int idold, int idnew) +{ + g_fExpectedHotItemOld = idold; + g_fExpectedHotItemNew = idnew; + g_fReceivedHotItemChange = FALSE; +} + +#define check_hot_notify() \ + ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); \ + g_fExpectedHotItemOld = g_fExpectedHotItemNew = 0; + void test_hotitem() { HWND hToolbar = NULL; @@ -452,10 +474,10 @@ void test_hotitem() ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); ok(ret == -1, "Hot item: %lx, expected -1\n", ret); - g_fReceivedHotItemChange = FALSE; + expect_hot_notify(0, 7); ret = SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); - ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); + check_hot_notify(); ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); ok(ret == 3, "Hot item: %lx, expected 3\n", ret); g_fBlockHotItemChange = TRUE; @@ -475,22 +497,27 @@ void test_hotitem() ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); ok(g_fReceivedHotItemChange == FALSE, "TBN_HOTITEMCHANGE received after a duplication\n"); + expect_hot_notify(7, 0); ret = SendMessage(hToolbar, TB_SETHOTITEM, -0xbeaf, 0); ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); - ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); + check_hot_notify(); SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); - /* setting disabled buttons as hot failed and generates no notify */ - g_fReceivedHotItemChange = FALSE; + /* setting disabled buttons will generate a notify with the button id but no button will be hot */ + expect_hot_notify(7, 9); ret = SendMessage(hToolbar, TB_SETHOTITEM, 4, 0); ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); - ok(!g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE received\n"); + check_hot_notify(); ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == 3, "Hot item: %lx, expected 3\n", ret); + ok(ret == -1, "Hot item: %lx, expected -1\n", ret); + /* enabling the button won't change that */ + SendMessage(hToolbar, TB_ENABLEBUTTON, 9, TRUE); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); - /* but disabling a hot button works */ + /* disabling a hot button works */ ret = SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); - ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); g_fReceivedHotItemChange = FALSE; SendMessage(hToolbar, TB_ENABLEBUTTON, 7, FALSE); ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index da41486..fa3eee4 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4783,40 +4783,45 @@ TOOLBAR_SetHotItemEx (TOOLBAR_INFO *info NMTBHOTITEM nmhotitem; TBUTTON_INFO *btnPtr = NULL, *oldBtnPtr = NULL; + nmhotitem.dwFlags = dwReason; if(infoPtr->nHotItem >= 0) { oldBtnPtr = &infoPtr->buttons[infoPtr->nHotItem]; nmhotitem.idOld = oldBtnPtr->idCommand; } else + { nmhotitem.dwFlags |= HICF_ENTERING; + nmhotitem.idOld = 0; + } if (nHit >= 0) { btnPtr = &infoPtr->buttons[nHit]; nmhotitem.idNew = btnPtr->idCommand; - /* setting disabled buttons as hot fails */ - if (!(btnPtr->fsState & TBSTATE_ENABLED)) - return; } else + { nmhotitem.dwFlags |= HICF_LEAVING; - - nmhotitem.dwFlags = dwReason; + nmhotitem.idNew = 0; + } /* now change the hot and invalidate the old and new buttons - if the * parent agrees */ if (!TOOLBAR_SendNotify(&nmhotitem.hdr, infoPtr, TBN_HOTITEMCHANGE)) { - infoPtr->nHotItem = nHit; - if (btnPtr) { - btnPtr->bHot = TRUE; - InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); - } if (oldBtnPtr) { oldBtnPtr->bHot = FALSE; InvalidateRect(infoPtr->hwndSelf, &oldBtnPtr->rect, TRUE); } + /* setting disabled buttons as hot fails even if the notify contains the button id */ + if (btnPtr && (btnPtr->fsState & TBSTATE_ENABLED)) { + btnPtr->bHot = TRUE; + InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + infoPtr->nHotItem = nHit; + } + else + infoPtr->nHotItem = -1; } } }

1 0

Oleg Krylov : comctl32: toolbar: Create tooltip on TB_GETTOOLTIPS message if not yet created.
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

Module: wine Branch: master Commit: 2d6b9cafc6fd9ec09edb4ad49aa0006ffa551346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6b9cafc6fd9ec09edb4ad49… Author: Oleg Krylov <oleg.krylov(a)gmail.com> Date: Wed Oct 18 15:46:52 2006 +0300 comctl32: toolbar: Create tooltip on TB_GETTOOLTIPS message if not yet created. --- dlls/comctl32/toolbar.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 92ded23..da41486 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3726,6 +3726,8 @@ TOOLBAR_GetToolTips (HWND hwnd, WPARAM w { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); + if ((infoPtr->dwStyle & TBSTYLE_TOOLTIPS) && (infoPtr->hwndToolTip == NULL)) + TOOLBAR_TooltipCreateControl(infoPtr); return (LRESULT)infoPtr->hwndToolTip; }

1 0

Mike McCormack : msi: Allow rows in the _Columns table to be unordered.
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

Module: wine Branch: master Commit: 8ecd34b97132bde3638c56f7e71dd0213af0159d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ecd34b97132bde3638c56f7e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 20 01:53:51 2006 +0900 msi: Allow rows in the _Columns table to be unordered. --- dlls/msi/table.c | 74 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 15f4da2..8d416f2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -34,6 +34,7 @@ #include "objidl.h" #include "winnls.h" #include "msipriv.h" #include "query.h" +#include "assert.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -81,7 +82,7 @@ #define MAX_STREAM_NAME 0x1f static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO **pcols, UINT *pcount ); -static UINT get_tablecolumns( MSIDATABASE *db, +static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); @@ -926,12 +927,14 @@ static LPWSTR msi_makestring( MSIDATABAS return strdupW(msi_string_lookup_id( db->strings, stringid )); } -static UINT get_tablecolumns( MSIDATABASE *db, +static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz) { UINT r, i, n=0, table_id, count, maxcount = *sz; MSITABLE *table = NULL; + TRACE("%s\n", debugstr_w(szTableName)); + /* first check if there is a default table with that name */ r = get_defaulttablecolumns( szTableName, colinfo, sz ); if( ( r == ERROR_SUCCESS ) && *sz ) @@ -954,6 +957,8 @@ static UINT get_tablecolumns( MSIDATABAS TRACE("Table id is %d, row count is %d\n", table_id, table->row_count); + /* if maxcount is non-zero, assume it's exactly right for this table */ + memset( colinfo, 0, maxcount*sizeof(*colinfo) ); count = table->row_count; for( i=0; i<count; i++ ) { @@ -962,32 +967,53 @@ static UINT get_tablecolumns( MSIDATABAS if( colinfo ) { UINT id = table->data[ i ] [ 2 ]; - colinfo[n].tablename = msi_makestring( db, table_id ); - colinfo[n].number = table->data[ i ][ 1 ] - (1<<15); - colinfo[n].colname = msi_makestring( db, id ); - colinfo[n].type = table->data[ i ] [ 3 ] ^ 0x8000; - colinfo[n].hash_table = NULL; - /* this assumes that columns are in order in the table */ - if( n ) - colinfo[n].offset = colinfo[n-1].offset - + bytes_per_column( &colinfo[n-1] ); - else - colinfo[n].offset = 0; - TRACE("table %s column %d is [%s] (%d) with type %08x " - "offset %d at row %d\n", debugstr_w(szTableName), - colinfo[n].number, debugstr_w(colinfo[n].colname), - id, colinfo[n].type, colinfo[n].offset, i); - if( n != (colinfo[n].number-1) ) + UINT col = table->data[ i ][ 1 ] - (1<<15); + + /* check the column number is in range */ + if (col<1 || col>maxcount) { - ERR("oops. data in the _Columns table isn't in the right " - "order for table %s\n", debugstr_w(szTableName)); - msi_free_colinfo(colinfo, n+1 ); - return ERROR_FUNCTION_FAILED; + ERR("column %d out of range\n", col); + continue; } + + /* check if this column was already set */ + if (colinfo[ col - 1 ].number) + { + ERR("duplicate column %d\n", col); + continue; + } + + colinfo[ col - 1 ].tablename = msi_makestring( db, table_id ); + colinfo[ col - 1 ].number = col; + colinfo[ col - 1 ].colname = msi_makestring( db, id ); + colinfo[ col - 1 ].type = table->data[ i ] [ 3 ] - (1<<15); + colinfo[ col - 1 ].offset = 0; + colinfo[ col - 1 ].hash_table = NULL; } n++; - if( colinfo && ( n >= maxcount ) ) - break; + } + + TRACE("%s has %d columns\n", debugstr_w(szTableName), n); + + if (maxcount && n != maxcount) + { + ERR("missing column in table %s\n", debugstr_w(szTableName)); + msi_free_colinfo(colinfo, maxcount ); + return ERROR_FUNCTION_FAILED; + } + + /* calculate the offsets */ + for( i=0; maxcount && (i<maxcount); i++ ) + { + assert( (i+1) == colinfo[ i ].number ); + if (i) + colinfo[i].offset = colinfo[ i - 1 ].offset + + bytes_per_column( &colinfo[ i - 1 ] ); + else + colinfo[i].offset = 0; + TRACE("column %d is [%s] with type %08x ofs %d\n", + colinfo[i].number, debugstr_w(colinfo[i].colname), + colinfo[i].type, colinfo[i].offset); } *sz = n;

1 0

Mike McCormack : msi: Reset the column number for each new table in a transform.
by Alexandre Julliard Oct. 19, 2006

Oct. 19, 2006

Module: wine Branch: master Commit: f2c207fa0356c094c6e5c9ecde3083e9fc07bbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c207fa0356c094c6e5c9ecd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 20 01:53:32 2006 +0900 msi: Reset the column number for each new table in a transform. --- dlls/msi/table.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 087f407..15f4da2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1860,7 +1860,9 @@ static UINT msi_table_load_transform( MS UINT r, n, sz, i, mask; MSIRECORD *rec = NULL; UINT colcol = 0; + WCHAR coltable[32]; + coltable[0] = 0; TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); /* read the transform data */ @@ -1937,10 +1939,20 @@ static UINT msi_table_load_transform( MS */ if (!lstrcmpW(name, szColumns)) { - if ( MSI_RecordIsNull( rec, 2 ) ) - MSI_RecordSetInteger( rec, 2, ++colcol ); - else - ERR("_Columns has non-null data...\n"); + WCHAR table[32]; + DWORD sz = 32; + + MSI_RecordGetStringW( rec, 1, table, &sz ); + + /* reset the column number on a new table */ + if ( lstrcmpW(coltable, table) ) + { + colcol = 0; + lstrcpyW( coltable, table ); + } + + /* fix nul column numbers */ + MSI_RecordSetInteger( rec, 2, ++colcol ); } r = TABLE_insert_row( &tv->view, rec );

1 0