wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Stefan Dösinger : direct3d: Add a fixed function fog test.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 4b445124d36d051c15ec7910c9e414085aa2e62d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b445124d36d051c15ec7910c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 14 18:04:56 2007 +0100 direct3d: Add a fixed function fog test. --- dlls/d3d8/tests/visual.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 137 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 128 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 25 +++++++- 4 files changed, 421 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b445124d36d051c15ec7…

1 0

Stefan Dösinger : wined3d: Blitting to offscreen target.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 0b46254b57d329c3f0892877a916c2c1fc13eec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b46254b57d329c3f0892877a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 14 22:00:31 2007 +0100 wined3d: Blitting to offscreen target. Fix the NULL deref that occured when blitting to offscreen targets and select the proper gl drawing buffer instead. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 460a255..9223b55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -690,7 +690,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U object->pow2Height = pow2Height; /* Flags */ - object->Flags = 0; /* We start without flags set */ + object->Flags = SFLAG_DYNLOCK; object->Flags |= (pow2Width != Width || pow2Height != Height) ? SFLAG_NONPOW2 : 0; object->Flags |= Discard ? SFLAG_DISCARD : 0; object->Flags |= (WINED3DFMT_D16_LOCKABLE == Format) ? SFLAG_LOCKABLE : 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 30ae169..a295bc7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2637,7 +2637,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * DWORD oldCKeyFlags = Src->CKeyFlags; DDCOLORKEY oldBltCKey = This->SrcBltCKey; RECT SourceRectangle; - GLint oldDraw; TRACE("Blt from surface %p to rendertarget %p\n", Src, This); @@ -2687,11 +2686,17 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Activate the destination context, set it up for blitting */ ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); - glGetIntegerv(GL_DRAW_BUFFER, &oldDraw); - if(This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer) { + if(!dstSwapchain) { + TRACE("Drawing to offscreen buffer\n"); + glDrawBuffer(myDevice->offscreenBuffer); + } else if(This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer) { TRACE("Drawing to front buffer\n"); glDrawBuffer(GL_FRONT); checkGLcall("glDrawBuffer GL_FRONT"); + } else { + TRACE("Drawing to back buffer\n"); + glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer GL_BACK"); } /* Bind the texture */ @@ -2722,7 +2727,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } /* Draw a textured quad - */ + */ glBegin(GL_QUADS); glColor3d(1.0f, 1.0f, 1.0f); @@ -2755,8 +2760,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glBindTexture(GL_TEXTURE_2D, 0); checkGLcall("glEnable glBindTexture"); - if(This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer && oldDraw == GL_BACK) { - glDrawBuffer(oldDraw); + /* The draw buffer should only need to be restored if we were drawing to the front buffer, and there is a back buffer. + * otherwise the context manager should choose between GL_BACK / offscreenDrawBuffer + */ + if(dstSwapchain && This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer && dstSwapchain->backBuffer) { + glDrawBuffer(GL_BACK); } /* Restore the color key parameters */ Src->CKeyFlags = oldCKeyFlags;

1 0

Mikołaj Zalewski : comctl32: Register all the controls in DllMain.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: a66784c7d1e46dbbd4b08e8d58a0a8e672b8f81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66784c7d1e46dbbd4b08e8d5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Mar 14 12:04:47 2007 +0100 comctl32: Register all the controls in DllMain. --- dlls/comctl32/commctrl.c | 95 ++++++++++----------------------------------- 1 files changed, 21 insertions(+), 74 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 9cfdc9b..c21cae3 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -29,8 +29,6 @@ * * TODO * -- implement GetMUILanguage + InitMUILanguage - * -- LibMain => DLLMain ("DLLMain takes over the functionality of both the - * LibMain and the WEP function.", MSDN) * -- finish NOTES for MenuHelp, GetEffectiveClientRect and GetStatusTextW * -- FIXMEs + BUGS (search for them) * @@ -129,13 +127,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* Get all the colors at DLL load */ COMCTL32_RefreshSysColors(); - /* register all Win95 common control classes */ + /* like comctl32 5.82+ register all the common control classes */ ANIMATE_Register (); + COMBOEX_Register (); + DATETIME_Register (); FLATSB_Register (); HEADER_Register (); HOTKEY_Register (); + IPADDRESS_Register (); LISTVIEW_Register (); + MONTHCAL_Register (); + NATIVEFONT_Register (); + PAGER_Register (); PROGRESS_Register (); + REBAR_Register (); STATUS_Register (); SYSLINK_Register (); TAB_Register (); @@ -593,9 +598,8 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy, * No return values. * * NOTES - * This function is just a dummy. - * The Win95 controls are registered at the DLL's initialization. - * To register other controls InitCommonControlsEx() must be used. + * This function is just a dummy - all the controls are registered at + * the DLL's initialization. See InitCommonContolsEx for details. */ VOID WINAPI @@ -617,81 +621,24 @@ InitCommonControls (void) * Failure: FALSE * * NOTES - * Only the additional common controls are registered by this function. - * The Win95 controls are registered at the DLL's initialization. - * - * FIXME - * implement the following control classes: - * ICC_LINK_CLASS - * ICC_STANDARD_CLASSES + * Probaly all versions of comctl32 initializes the Win95 controls in DllMain + * during DLL initializaiton. Starting from comctl32 v5.82 all the controls + * are initialized there. We follow this behaviour and this function is just + * a dummy. + * + * Note: when writing programs under Windows, if you don't call any function + * from comctl32 the linker may not link this DLL. If InitCommonControlsEx + * was the only comctl32 function you were calling and you remove it you may + * have a false impression that InitCommonControlsEx actually did something. */ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls) { - INT cCount; - DWORD dwMask; - - if (!lpInitCtrls) - return FALSE; - if (lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX)) - return FALSE; + if (!lpInitCtrls || lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX)) + return FALSE; TRACE("(0x%08x)\n", lpInitCtrls->dwICC); - - for (cCount = 0; cCount < 32; cCount++) { - dwMask = 1 << cCount; - if (!(lpInitCtrls->dwICC & dwMask)) - continue; - - switch (lpInitCtrls->dwICC & dwMask) { - /* dummy initialization */ - case ICC_ANIMATE_CLASS: - case ICC_BAR_CLASSES: - case ICC_LISTVIEW_CLASSES: - case ICC_TREEVIEW_CLASSES: - case ICC_TAB_CLASSES: - case ICC_UPDOWN_CLASS: - case ICC_PROGRESS_CLASS: - case ICC_HOTKEY_CLASS: - break; - - /* advanced classes - not included in Win95 */ - case ICC_DATE_CLASSES: - MONTHCAL_Register (); - DATETIME_Register (); - break; - - case ICC_USEREX_CLASSES: - COMBOEX_Register (); - break; - - case ICC_COOL_CLASSES: - REBAR_Register (); - break; - - case ICC_INTERNET_CLASSES: - IPADDRESS_Register (); - break; - - case ICC_PAGESCROLLER_CLASS: - PAGER_Register (); - break; - - case ICC_NATIVEFNTCTL_CLASS: - NATIVEFONT_Register (); - break; - - case ICC_LINK_CLASS: - SYSLINK_Register (); - break; - - default: - FIXME("Unknown class! dwICC=0x%X\n", dwMask); - break; - } - } - return TRUE; }

1 0

Jeremy White : sane.ds: Dynamically load libsane.so.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 16f33d8b436aabf3b9e3ba810b68b596d9ddd687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f33d8b436aabf3b9e3ba810… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Mar 14 13:10:03 2007 -0500 sane.ds: Dynamically load libsane.so. This change was triggered because of a bug in libsane-hpaio.so, namely that it relies on libsane.so being dlopen'd RTLD_GLOBAL so that sanei_init_debug can be resolved. --- configure | 76 ++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + dlls/sane.ds/Makefile.in | 1 - dlls/sane.ds/ds_ctrl.c | 2 +- dlls/sane.ds/ds_image.c | 48 ++++++++++++++-------------- dlls/sane.ds/sane_i.h | 18 +++++++++++ dlls/sane.ds/sane_main.c | 74 +++++++++++++++++++++++++++++++++++++++++---- dlls/sane.ds/ui.c | 40 ++++++++++++------------ include/config.h.in | 3 ++ 9 files changed, 211 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16f33d8b436aabf3b9e3b…

1 0

Ken Thomases : shell32: Avoid W->A conversion in RenderHDROP.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 8f5f3f5b8ea1f1e44dc85e7dc3e5edc2c4e624ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5f3f5b8ea1f1e44dc85e7dc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 14 13:17:29 2007 -0500 shell32: Avoid W->A conversion in RenderHDROP. --- dlls/shell32/clipboard.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 6972caf..7e8c920 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -60,9 +60,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) { UINT i; - int rootsize = 0,size = 0; - char szRootPath[MAX_PATH]; - char szFileName[MAX_PATH]; + int rootlen = 0,size = 0; + WCHAR wszRootPath[MAX_PATH]; + WCHAR wszFileName[MAX_PATH]; HGLOBAL hGlobal; DROPFILES *pDropFiles; int offset; @@ -72,39 +72,38 @@ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) /* get the size needed */ size = sizeof(DROPFILES); - SHGetPathFromIDListA(pidlRoot, szRootPath); - PathAddBackslashA(szRootPath); - rootsize = strlen(szRootPath); + SHGetPathFromIDListW(pidlRoot, wszRootPath); + PathAddBackslashW(wszRootPath); + rootlen = strlenW(wszRootPath); for (i=0; i<cidl;i++) { - _ILSimpleGetText(apidl[i], szFileName, MAX_PATH); - size += rootsize + strlen(szFileName) + 1; + _ILSimpleGetTextW(apidl[i], wszFileName, MAX_PATH); + size += (rootlen + strlenW(wszFileName) + 1) * sizeof(WCHAR); } - size++; + size += sizeof(WCHAR); /* Fill the structure */ hGlobal = GlobalAlloc(GHND|GMEM_SHARE, size); if(!hGlobal) return hGlobal; pDropFiles = (DROPFILES *)GlobalLock(hGlobal); - pDropFiles->pFiles = sizeof(DROPFILES); - pDropFiles->fWide = FALSE; + offset = (sizeof(DROPFILES) + sizeof(WCHAR) - 1) / sizeof(WCHAR); + pDropFiles->pFiles = offset * sizeof(WCHAR); + pDropFiles->fWide = TRUE; - offset = pDropFiles->pFiles; - strcpy(szFileName, szRootPath); + strcpyW(wszFileName, wszRootPath); for (i=0; i<cidl;i++) { - _ILSimpleGetText(apidl[i], szFileName + rootsize, MAX_PATH - rootsize); - size = strlen(szFileName) + 1; - strcpy(((char*)pDropFiles)+offset, szFileName); - offset += size; + _ILSimpleGetTextW(apidl[i], wszFileName + rootlen, MAX_PATH - rootlen); + strcpyW(((WCHAR*)pDropFiles)+offset, wszFileName); + offset += strlenW(wszFileName) + 1; } - ((char*)pDropFiles)[offset] = 0; + ((WCHAR*)pDropFiles)[offset] = 0; GlobalUnlock(hGlobal); return hGlobal;

1 0

Paul Vriens : crypt32/tests: No need to check return value of GetModuleHandle.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 5faa3d0a59e5af8c89f7bfb408cca8e04cb89d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5faa3d0a59e5af8c89f7bfb40… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 14 18:36:00 2007 +0100 crypt32/tests: No need to check return value of GetModuleHandle. --- dlls/crypt32/tests/base64.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 1610288..4dd7c5f 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -441,21 +441,18 @@ START_TEST(base64) { HMODULE lib = GetModuleHandleA("crypt32"); - if (lib) - { - pCryptBinaryToStringA = (CryptBinaryToStringAFunc)GetProcAddress(lib, - "CryptBinaryToStringA"); - pCryptStringToBinaryA = (CryptStringToBinaryAFunc)GetProcAddress(lib, - "CryptStringToBinaryA"); + pCryptBinaryToStringA = (CryptBinaryToStringAFunc)GetProcAddress(lib, + "CryptBinaryToStringA"); + pCryptStringToBinaryA = (CryptStringToBinaryAFunc)GetProcAddress(lib, + "CryptStringToBinaryA"); - if (pCryptBinaryToStringA) - testBinaryToStringA(); - else - skip("CryptBinaryToStringA is not available\n"); + if (pCryptBinaryToStringA) + testBinaryToStringA(); + else + skip("CryptBinaryToStringA is not available\n"); - if (pCryptStringToBinaryA) - testStringToBinaryA(); - else - skip("CryptStringToBinaryA is not available\n"); - } + if (pCryptStringToBinaryA) + testStringToBinaryA(); + else + skip("CryptStringToBinaryA is not available\n"); }

1 0

Paul Vriens : advapi32/tests: No need to check return value of GetModuleHandle.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: b4c33d5f99bdcd0b9b5c67712f69fcdcc6e5ff44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c33d5f99bdcd0b9b5c67712… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 14 18:35:54 2007 +0100 advapi32/tests: No need to check return value of GetModuleHandle. --- dlls/advapi32/tests/crypt_md4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index 4370b4e..15a594b 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -147,7 +147,7 @@ START_TEST(crypt_md4) { HMODULE module; - if (!(module = GetModuleHandleA( "advapi32.dll" ))) return; + module = GetModuleHandleA( "advapi32.dll" ); pMD4Init = (fnMD4Init)GetProcAddress( module, "MD4Init" ); pMD4Update = (fnMD4Update)GetProcAddress( module, "MD4Update" );

1 0

Eric Pouech : dbghelp: Rewrote SymEnumerateModules with Unicode basis, and implemented SymEnumerateModulesW64.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: f1436139fc5fa6c36861d382b3c816da0ec6e343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1436139fc5fa6c36861d382b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Mar 13 17:26:39 2007 +0100 dbghelp: Rewrote SymEnumerateModules with Unicode basis, and implemented SymEnumerateModulesW64. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/module.c | 66 +++++++++++++++++++++++++++++++++++--------- include/dbghelp.h | 2 + 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 63bb5af..b023f3d 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -46,7 +46,7 @@ @ stdcall SymEnumTypesW(ptr double ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) -@ stub SymEnumerateModulesW64 +@ stdcall SymEnumerateModulesW64(long ptr ptr) @ stdcall SymEnumerateSymbols(long long ptr ptr) @ stub SymEnumerateSymbols64 @ stub SymEnumerateSymbolsW diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 40e09b8..5b8718d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -632,34 +632,72 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) * SymEnumerateModules (DBGHELP.@) * */ +struct enum_modW64_32 +{ + PSYM_ENUMMODULES_CALLBACK cb; + PVOID user; + char module[MAX_PATH]; +}; + +static BOOL CALLBACK enum_modW64_32(PWSTR name, DWORD64 base, PVOID user) +{ + struct enum_modW64_32* x = user; + + WideCharToMultiByte(CP_ACP, 0, name, -1, x->module, sizeof(x->module), NULL, NULL); + return x->cb(x->module, (DWORD)base, x->user); +} + BOOL WINAPI SymEnumerateModules(HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK EnumModulesCallback, PVOID UserContext) { - struct process* pcs = process_find_by_handle(hProcess); - struct module* module; + struct enum_modW64_32 x; - if (!pcs) return FALSE; - - for (module = pcs->lmodules; module; module = module->next) - { - if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type == DMT_ELF) - continue; - if (!EnumModulesCallback(module->module_name, - module->module.BaseOfImage, UserContext)) - break; - } - return TRUE; + x.cb = EnumModulesCallback; + x.user = UserContext; + + return SymEnumerateModulesW64(hProcess, enum_modW64_32, &x); } /****************************************************************** * SymEnumerateModules64 (DBGHELP.@) * */ +struct enum_modW64_64 +{ + PSYM_ENUMMODULES_CALLBACK64 cb; + PVOID user; + char module[MAX_PATH]; +}; + +static BOOL CALLBACK enum_modW64_64(PWSTR name, DWORD64 base, PVOID user) +{ + struct enum_modW64_64* x = user; + + WideCharToMultiByte(CP_ACP, 0, name, -1, x->module, sizeof(x->module), NULL, NULL); + return x->cb(x->module, base, x->user); +} + BOOL WINAPI SymEnumerateModules64(HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK64 EnumModulesCallback, PVOID UserContext) { + struct enum_modW64_64 x; + + x.cb = EnumModulesCallback; + x.user = UserContext; + + return SymEnumerateModulesW64(hProcess, enum_modW64_64, &x); +} + +/****************************************************************** + * SymEnumerateModulesW64 (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, + PSYM_ENUMMODULES_CALLBACKW64 EnumModulesCallback, + PVOID UserContext) +{ struct process* pcs = process_find_by_handle(hProcess); struct module* module; @@ -669,7 +707,7 @@ BOOL WINAPI SymEnumerateModules64(HANDLE hProcess, { if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type == DMT_ELF) continue; - if (!EnumModulesCallback(module->module_name, + if (!EnumModulesCallback(module->module.ModuleName, module->module.BaseOfImage, UserContext)) break; } diff --git a/include/dbghelp.h b/include/dbghelp.h index eb2442a..e818096 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -764,6 +764,8 @@ typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, ULONG, PVOID); BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PSTR, DWORD64, PVOID); BOOL WINAPI SymEnumerateModules64(HANDLE, PSYM_ENUMMODULES_CALLBACK64, PVOID); +typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)(PWSTR, DWORD64, PVOID); +BOOL WINAPI SymEnumerateModulesW64(HANDLE, PSYM_ENUMMODULES_CALLBACKW64, PVOID); BOOL WINAPI SymGetModuleInfo(HANDLE, DWORD, PIMAGEHLP_MODULE); BOOL WINAPI SymGetModuleInfoW(HANDLE, DWORD, PIMAGEHLP_MODULEW); BOOL WINAPI SymGetModuleInfo64(HANDLE, DWORD64, PIMAGEHLP_MODULE64);

1 0

Leslie Choong : comctl32: updown: Added message sequencing tests.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 851197f80c904c15c2fe69ee5df5f12e15fa0b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=851197f80c904c15c2fe69ee5… Author: Leslie Choong <septikus(a)gmail.com> Date: Tue Mar 13 20:22:03 2007 -0800 comctl32: updown: Added message sequencing tests. --- dlls/comctl32/tests/updown.c | 109 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index c8f944f..fb1a522 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -110,6 +110,86 @@ static const struct message get_edit_text_seq[] = { { 0 } }; +static const struct message test_updown_pos_seq[] = { + { UDM_SETRANGE, sent|lparam, 0, MAKELONG(100,0) }, + { UDM_GETRANGE, sent}, + { UDM_SETPOS, sent|lparam, 0, 5}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, 0}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, MAKELONG(-1,0)}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, 100}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, 101}, + { UDM_GETPOS, sent}, + { 0 } +}; + +static const struct message test_updown_pos32_seq[] = { + { UDM_SETRANGE32, sent|lparam, 0, 1000 }, + { UDM_GETRANGE32, sent}, /* Cannot check wparam and lparam as they are ptrs */ + { UDM_SETPOS32, sent|lparam, 0, 500 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, 0 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, -1 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, 1000 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, 1001 }, + { UDM_GETPOS32, sent}, + { 0 } +}; + +static const struct message test_updown_buddy_seq[] = { + { UDM_GETBUDDY, sent }, + { UDM_SETBUDDY, sent }, + { WM_STYLECHANGING, sent|defwinproc }, + { WM_STYLECHANGED, sent|defwinproc }, + { WM_STYLECHANGING, sent|defwinproc }, + { WM_STYLECHANGED, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|optional|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|defwinproc }, + { WM_MOVE, sent|defwinproc }, + { UDM_GETBUDDY, sent }, + { 0 } +}; + +static const struct message test_updown_base_seq[] = { + { UDM_SETBASE, sent|wparam, 10 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 80 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 16 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 80 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 10 }, + { UDM_GETBASE, sent }, + { 0 } +}; + +static const struct message test_updown_unicode_seq[] = { + { UDM_SETUNICODEFORMAT, sent|wparam, 0 }, + { UDM_GETUNICODEFORMAT, sent }, + { UDM_SETUNICODEFORMAT, sent|wparam, 1 }, + { UDM_GETUNICODEFORMAT, sent }, + { UDM_SETUNICODEFORMAT, sent|wparam, 0 }, + { UDM_GETUNICODEFORMAT, sent }, + { 0 } +}; + +static const struct message test_updown_destroy_seq[] = { + { WM_SHOWWINDOW, sent|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent}, + { WM_WINDOWPOSCHANGED, sent}, + { WM_DESTROY, sent}, + { WM_NCDESTROY, sent}, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static long defwndproc_counter = 0; @@ -239,7 +319,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - add_message(sequences, EDIT_SEQ_INDEX, &msg); + add_message(sequences, UPDOWN_SEQ_INDEX, &msg); defwndproc_counter++; ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); @@ -279,6 +359,8 @@ static void test_updown_pos(void) { int r; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* Set Range from 0 to 100 */ SendMessage(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) ); r = SendMessage(updown, UDM_GETRANGE, 0,0); @@ -324,6 +406,8 @@ static void test_updown_pos(void) r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); expect(100,LOWORD(r)); expect(1,HIWORD(r)); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos_seq , "test updown pos", FALSE); } static void test_updown_pos32(void) @@ -331,6 +415,8 @@ static void test_updown_pos32(void) int r; int low, high; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* Set the position to 0 to 1000 */ SendMessage(updown, UDM_SETRANGE32, 0 , 1000 ); @@ -374,20 +460,35 @@ static void test_updown_pos32(void) r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); expect(1000,r); expect(1,high); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos32_seq, "test updown pos32", FALSE); } static void test_updown_buddy(void) { HWND buddyReturn; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); ok(buddyReturn == edit, "Expected edit handle\n"); + + buddyReturn = (HWND)SendMessage(updown, UDM_SETBUDDY, (WPARAM) edit, 0); + ok(buddyReturn == edit, "Expected edit handle\n"); + + buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); + ok(buddyReturn == edit, "Expected edit handle\n"); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_buddy_seq, "test updown buddy", TRUE); + ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "test updown buddy_edit", FALSE); } static void test_updown_base(void) { int r; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessage(updown, UDM_SETBASE, 10 , 0); r = SendMessage(updown, UDM_GETBASE, 0 , 0); expect(10,r); @@ -415,12 +516,16 @@ static void test_updown_base(void) expect(16,r); r = SendMessage(updown, UDM_GETBASE, 0 , 0); expect(10,r); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_base_seq, "test updown base", FALSE); } static void test_updown_unicode(void) { int r; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* Set it to ANSI, don't check return as we don't know previous state */ SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); @@ -437,6 +542,8 @@ static void test_updown_unicode(void) expect(1,r); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); expect(0,r); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_unicode_seq, "test updown unicode", FALSE); }

1 0

Leslie Choong : comctl32: updown: Expect macro and spelling errors.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 4e337ad8d5f392594710691c93769dc60017359d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e337ad8d5f392594710691c9… Author: Leslie Choong <septikus(a)gmail.com> Date: Tue Mar 13 20:22:03 2007 -0800 comctl32: updown: Expect macro and spelling errors. --- dlls/comctl32/tests/updown.c | 101 +++++++++++++++++++++--------------------- 1 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 5546ab5..c8f944f 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -41,7 +41,6 @@ * - check UDM_GETPOS, for up-down control with a buddy window, position is the caption of the buddy window, so change the * caption of the buddy window then call UDM_GETPOS * - check UDM_SETRANGE, max can be less than min, so clicking the up arrow decreases the current position - * - check UDM_GETRANGE * - more stuff to test */ @@ -53,6 +52,8 @@ #include "wine/test.h" #include "msg.h" +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + #define NUM_MSG_SEQUENCES 3 #define PARENT_SEQ_INDEX 0 #define EDIT_SEQ_INDEX 1 @@ -281,48 +282,48 @@ static void test_updown_pos(void) /* Set Range from 0 to 100 */ SendMessage(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) ); r = SendMessage(updown, UDM_GETRANGE, 0,0); - ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r)); - ok(HIWORD(r) == 0, "Expected 0, got %d\n", HIWORD(r)); + expect(100,LOWORD(r)); + expect(0,HIWORD(r)); /* Set the position to 5, return is not checked as it was set before func call */ SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(5,0) ); /* Since UDM_SETBUDDYINT was not set at creation HIWORD(r) will always be 1 as a return from UDM_GETPOS */ /* Get the position, which should be 5 */ r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); - ok(LOWORD(r) == 5, "Expected 5, got %d\n", LOWORD(r)); - ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + expect(5,LOWORD(r)); + expect(1,HIWORD(r)); /* Set the position to 0, return should be 5 */ r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(0,0) ); - ok(r == 5, "Expected 5, got %d\n", r); + expect(5,r); /* Get the position, which should be 0 */ r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); - ok(LOWORD(r) == 0, "Expected 0, got %d\n", LOWORD(r)); - ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + expect(0,LOWORD(r)); + expect(1,HIWORD(r)); /* Set the position to -1, return should be 0 */ r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(-1,0) ); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); /* Get the position, which should be 0 */ r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); - ok(LOWORD(r) == 0, "Expected 0, got %d\n", LOWORD(r)); - ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + expect(0,LOWORD(r)); + expect(1,HIWORD(r)); /* Set the position to 100, return should be 0 */ r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(100,0) ); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); /* Get the position, which should be 100 */ r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); - ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r)); - ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + expect(100,LOWORD(r)); + expect(1,HIWORD(r)); /* Set the position to 101, return should be 100 */ r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(101,0) ); - ok(r == 100, "Expected 100, got %d\n", r); + expect(100,r); /* Get the position, which should be 100 */ r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); - ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r)); - ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + expect(100,LOWORD(r)); + expect(1,HIWORD(r)); } static void test_updown_pos32(void) @@ -334,45 +335,45 @@ static void test_updown_pos32(void) SendMessage(updown, UDM_SETRANGE32, 0 , 1000 ); r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high ); - ok(low == 0, "Expected 0, got %d\n", low); - ok(high == 1000, "Expected 1000, got %d\n", high); + expect(0,low); + expect(1000,high); /* Set position to 500, don't check return since it is unset*/ - r = SendMessage(updown, UDM_SETPOS32, 0 , 500 ); + SendMessage(updown, UDM_SETPOS32, 0 , 500 ); /* Since UDM_SETBUDDYINT was not set at creation bRet will always be true as a return from UDM_GETPOS32 */ r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); - ok(r == 500, "Expected 500, got %d\n", r); - ok(high == 1 , "Expected 0, got %d\n", high); + expect(500,r); + expect(1,high); /* Set position to 0, return should be 500 */ r = SendMessage(updown, UDM_SETPOS32, 0 , 0 ); - ok(r == 500, "Expected 500, got %d\n", r); + expect(500,r); r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); - ok(r == 0, "Expected 0, got %d\n", r); - ok(high == 1 , "Expected 0, got %d\n", high); + expect(0,r); + expect(1,high); - /* Set position to -1 which sohuld become 0, return should be 0 */ + /* Set position to -1 which should become 0, return should be 0 */ r = SendMessage(updown, UDM_SETPOS32, 0 , -1 ); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); - ok(r == 0, "Expected 0, got %d\n", r); - ok(high == 1 , "Expected 0, got %d\n", high); + expect(0,r); + expect(1,high); /* Set position to 1000, return should be 0 */ r = SendMessage(updown, UDM_SETPOS32, 0 , 1000 ); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); - ok(r == 1000, "Expected 1000, got %d\n", r); - ok(high == 1 , "Expected 0, got %d\n", high); + expect(1000,r); + expect(1,high); - /* Set position to 1001 which sohuld become 1000, return should be 1000 */ + /* Set position to 1001 which should become 1000, return should be 1000 */ r = SendMessage(updown, UDM_SETPOS32, 0 , 1001 ); - ok(r == 1000, "Expected 1000, got %d\n", r); + expect(1000,r); r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); - ok(r == 1000, "Expected 0, got %d\n", r); - ok(high == 1 , "Expected 0, got %d\n", high); + expect(1000,r); + expect(1,high); } static void test_updown_buddy(void) @@ -389,31 +390,31 @@ static void test_updown_base(void) SendMessage(updown, UDM_SETBASE, 10 , 0); r = SendMessage(updown, UDM_GETBASE, 0 , 0); - ok(r == 10, "Expected 10, got %d\n", r); + expect(10,r); /* Set base to an invalid value, should return 0 and stay at 10 */ r = SendMessage(updown, UDM_SETBASE, 80 , 0); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); r = SendMessage(updown, UDM_GETBASE, 0 , 0); - ok(r == 10, "Expected 10, got %d\n", r); + expect(10,r); /* Set base to 16 now, should get 16 as the return */ r = SendMessage(updown, UDM_SETBASE, 16 , 0); - ok(r == 10, "Expected 10, got %d\n", r); + expect(10,r); r = SendMessage(updown, UDM_GETBASE, 0 , 0); - ok(r == 16, "Expected 16, got %d\n", r); + expect(16,r); /* Set base to an invalid value, should return 0 and stay at 16 */ r = SendMessage(updown, UDM_SETBASE, 80 , 0); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); r = SendMessage(updown, UDM_GETBASE, 0 , 0); - ok(r == 16, "Expected 16, got %d\n", r); + expect(16,r); /* Set base back to 10, return should be 16 */ r = SendMessage(updown, UDM_SETBASE, 10 , 0); - ok(r == 16, "Expected 16, got %d\n", r); + expect(16,r); r = SendMessage(updown, UDM_GETBASE, 0 , 0); - ok(r == 10, "Expected 10, got %d\n", r); + expect(10,r); } static void test_updown_unicode(void) @@ -423,19 +424,19 @@ static void test_updown_unicode(void) /* Set it to ANSI, don't check return as we don't know previous state */ SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); /* Now set it to Unicode format */ r = SendMessage(updown, UDM_SETUNICODEFORMAT, 1 , 0); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); - ok(r == 1, "Expected 1, got %d\n", r); + expect(1,r); /* And now set it back to ANSI */ r = SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0); - ok(r == 1, "Expected 1, got %d\n", r); + expect(1,r); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); - ok(r == 0, "Expected 0, got %d\n", r); + expect(0,r); }

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
85
Older →

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 March 2007